setHandleXLimits();
connect(model, SIGNAL(rowsInserted(const QModelIndex &, int, int)),
- this, SLOT(rowsInserted(const QModelIndex &, int, int)));
+ this, SLOT(rowsInserted(const QModelIndex &, int, int)));
connect(model, SIGNAL(rowsAboutToBeRemoved(const QModelIndex &, int, int)),
- this, SLOT(rowsAboutToBeRemoved(const QModelIndex &, int, int)));
+ this, SLOT(rowsAboutToBeRemoved(const QModelIndex &, int, int)));
if(model->rowCount() > 0)
rowsInserted(QModelIndex(), 0, model->rowCount() - 1);
#ifdef HAVE_WEBKIT
webPreview.delayTimer.setSingleShot(true);
connect(&webPreview.delayTimer, SIGNAL(timeout()), this, SLOT(showWebPreviewEvent()));
- webPreview.deleteTimer.setInterval(600000);
+ //webPreview.deleteTimer.setInterval(600000);
+ webPreview.deleteTimer.setInterval(10000);
connect(&webPreview.deleteTimer, SIGNAL(timeout()), this, SLOT(deleteWebPreviewEvent()));
#endif
void ChatScene::rowsInserted(const QModelIndex &index, int start, int end) {
Q_UNUSED(index);
-// QModelIndex sidx = model()->index(start, 0);
-// QModelIndex eidx = model()->index(end, 0);
-// qDebug() << "rowsInserted" << start << end << "-" << sidx.data(MessageModel::MsgIdRole).value<MsgId>() << eidx.data(MessageModel::MsgIdRole).value<MsgId>();
+
+
+// QModelIndex sidx = model()->index(start, 2);
+// QModelIndex eidx = model()->index(end, 2);
+// qDebug() << "rowsInserted:";
+// if(start > 0) {
+// QModelIndex ssidx = model()->index(start - 1, 2);
+// qDebug() << "Start--:" << start - 1 << ssidx.data(MessageModel::MsgIdRole).value<MsgId>()
+// << ssidx.data(Qt::DisplayRole).toString();
+// }
+// qDebug() << "Start:" << start << sidx.data(MessageModel::MsgIdRole).value<MsgId>()
+// << sidx.data(Qt::DisplayRole).toString();
+// qDebug() << "End:" << end << eidx.data(MessageModel::MsgIdRole).value<MsgId>()
+// << eidx.data(Qt::DisplayRole).toString();
+// if(end + 1 < model()->rowCount()) {
+// QModelIndex eeidx = model()->index(end + 1, 2);
+// qDebug() << "End++:" << end + 1 << eeidx.data(MessageModel::MsgIdRole).value<MsgId>()
+// << eeidx.data(Qt::DisplayRole).toString();
+// }
qreal h = 0;
qreal y = 0;
if(atTop) {
for(int i = end; i >= start; i--) {
ChatLine *line = new ChatLine(i, model(),
- width,
- timestampWidth, senderWidth, contentsWidth,
- senderPos, contentsPos);
+ width,
+ timestampWidth, senderWidth, contentsWidth,
+ senderPos, contentsPos);
h += line->height();
line->setPos(0, y-h);
_lines.insert(start, line);
} else {
for(int i = start; i <= end; i++) {
ChatLine *line = new ChatLine(i, model(),
- width,
- timestampWidth, senderWidth, contentsWidth,
- senderPos, contentsPos);
+ width,
+ timestampWidth, senderWidth, contentsWidth,
+ senderPos, contentsPos);
line->setPos(0, y+h);
h += line->height();
_lines.insert(i, line);
// update selection
if(_selectionStart >= 0) {
int offset = end - start + 1;
- if(_selectionStart >= start) _selectionStart += offset;
- if(_selectionEnd >= start) _selectionEnd += offset;
- if(_firstSelectionRow >= start) _firstSelectionRow += offset;
- if(_lastSelectionRow >= start) _lastSelectionRow += offset;
+ int oldStart = _selectionStart;
+ if(_selectionStart >= start)
+ _selectionStart += offset;
+ if(_selectionEnd >= start) {
+ _selectionEnd += offset;
+ if(_selectionStart == oldStart)
+ for(int i = start; i < start + offset; i++)
+ _lines[i]->setSelected(true);
+ }
+ if(_firstSelectionRow >= start)
+ _firstSelectionRow += offset;
}
// neither pre- or append means we have to do dirty work: move items...
if(start < _firstLineRow) {
int prevFirstLineRow = _firstLineRow + (end - start + 1);
for(int i = end + 1; i < prevFirstLineRow; i++) {
- _lines.at(i)->show();
+ _lines.at(i)->show();
}
}
// force new search for first proper line
bool atBottom = (end == _lines.count() - 1);
bool moveTop = false;
+ // clear selection
+ if(_selectingItem) {
+ int row = _selectingItem->row();
+ if(row >= start && row <= end)
+ setSelectingItem(0);
+ }
+
// remove items from scene
QList<ChatLine *>::iterator lineIter = _lines.begin() + start;
int lineCount = start;
if(_selectionStart >= 0) {
int offset = end - start + 1;
if(_selectionStart >= start)
- _selectionStart -= offset;
+ _selectionStart = qMax(_selectionStart -= offset, start);
if(_selectionEnd >= start)
_selectionEnd -= offset;
if(_firstSelectionRow >= start)
_firstSelectionRow -= offset;
- if(_lastSelectionRow >= start)
- _lastSelectionRow -= offset;
+
+ if(_selectionEnd < _selectionStart) {
+ _isSelecting = false;
+ _selectionStart = -1;
+ }
}
// neither removing at bottom or top means we have to move items...
updateSceneRect(width);
setHandleXLimits();
+ emit layoutChanged();
// clock_t endT = clock();
// qDebug() << "resized" << _lines.count() << "in" << (float)(endT - startT) / CLOCKS_PER_SEC << "sec";
}
//setItemIndexMethod(QGraphicsScene::BspTreeIndex);
+ updateSceneRect();
setHandleXLimits();
+ emit layoutChanged();
// clock_t endT = clock();
// qDebug() << "resized" << _lines.count() << "in" << (float)(endT - startT) / CLOCKS_PER_SEC << "sec";
}
void ChatScene::startGlobalSelection(ChatItem *item, const QPointF &itemPos) {
- _selectionStart = _selectionEnd = _lastSelectionRow = _firstSelectionRow = item->row();
+ _selectionStart = _selectionEnd = _firstSelectionRow = item->row();
_selectionStartCol = _selectionMinCol = item->column();
_isSelecting = true;
_lines[_selectionStart]->setSelected(true, (ChatLineModel::ColumnType)_selectionMinCol);
_selectionStart = newstart;
_selectionEnd = newend;
- _lastSelectionRow = curRow;
if(newstart == newend && minColumn == ChatLineModel::ContentsColumn) {
if(!_selectingItem) {
- qWarning() << "WARNING: ChatScene::updateSelection() has a null _selectingItem, this should never happen! Please report.";
+ // _selectingItem has been removed already
return;
}
_lines[curRow]->setSelected(false);
}
}
+bool ChatScene::isScrollingAllowed() const {
+ if(_isSelecting)
+ return false;
+
+ // TODO: Handle clicks and single-item selections too
+
+ return true;
+}
+
void ChatScene::mouseMoveEvent(QGraphicsSceneMouseEvent *event) {
if(_isSelecting && event->buttons() == Qt::LeftButton) {
updateSelection(event->scenePos());
+ emit mouseMoveWhileSelecting(event->scenePos());
event->accept();
} else {
QGraphicsScene::mouseMoveEvent(event);
}
void ChatScene::mousePressEvent(QGraphicsSceneMouseEvent *event) {
- if(event->buttons() == Qt::LeftButton && _selectionStart >= 0) {
+ if(_selectionStart >= 0 && event->buttons() == Qt::LeftButton) {
for(int l = qMin(_selectionStart, _selectionEnd); l <= qMax(_selectionStart, _selectionEnd); l++) {
_lines[l]->setSelected(false);
}
+ _isSelecting = false;
_selectionStart = -1;
QGraphicsScene::mousePressEvent(event); // so we can start a new local selection
} else {
while(_firstLineRow < numRows) {
firstLineIdx = model()->index(_firstLineRow, 0);
if((Message::Type)(model()->data(firstLineIdx, MessageModel::TypeRole).toInt()) != Message::DayChange)
- break;
+ break;
_lines.at(_firstLineRow)->hide();
_firstLineRow++;
}