/***************************************************************************
- * Copyright (C) 2005-08 by the Quassel Project *
+ * Copyright (C) 2005-09 by the Quassel Project *
* devel@quassel-irc.org *
* *
* This program is free software; you can redistribute it and/or modify *
_chatView(parent),
_idString(idString),
_model(model),
- _singleBufferScene(false),
+ _singleBufferId(BufferId()),
_sceneRect(0, 0, width, 0),
_firstLineRow(-1),
_viewportHeight(0),
_leftButtonPressed(false)
{
MessageFilter *filter = qobject_cast<MessageFilter*>(model);
- if(filter) {
- _singleBufferScene = filter->isSingleBufferFilter();
+ if(filter && filter->isSingleBufferFilter()) {
+ _singleBufferId = filter->singleBufferId();
}
ChatViewSettings defaultSettings;
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(10000);
- connect(&webPreview.deleteTimer, SIGNAL(timeout()), this, SLOT(deleteWebPreviewEvent()));
+ webPreview.timer.setSingleShot(true);
+ connect(&webPreview.timer, SIGNAL(timeout()), this, SLOT(webPreviewNextStep()));
#endif
_showWebPreview = defaultSettings.showWebPreview();
defaultSettings.notify("ShowWebPreview", this, SLOT(showWebPreviewChanged()));
ChatItem *item = chatItemAt(pos);
if(item)
item->addActionsToMenu(&menu, item->mapFromScene(pos));
+ else
+ // no item -> default scene actions
+ Client::mainUi()->actionProvider()->addActions(&menu, filter(), BufferId());
menu.exec(event->screenPos());
clearSelection();
}
if(_clickMode != NoClick && _clickTimer.isActive()) {
- _clickMode = (ClickMode)(_clickMode == TripleClick ? DoubleClick : _clickMode + 1);
+ switch(_clickMode) {
+ case NoClick: _clickMode = SingleClick; break;
+ case SingleClick: _clickMode = DoubleClick; break;
+ case DoubleClick: _clickMode = TripleClick; break;
+ case TripleClick: _clickMode = DoubleClick; break;
+ case DragStartClick: break;
+ }
handleClick(Qt::LeftButton, _clickPos);
} else {
_clickMode = SingleClick;
}
void ChatScene::mouseReleaseEvent(QGraphicsSceneMouseEvent *event) {
- if(!event->buttons() & Qt::LeftButton) {
+ if(event->button() == Qt::LeftButton && _leftButtonPressed) {
_leftButtonPressed = false;
if(_clickMode != NoClick) {
if(_clickMode == SingleClick)
return QGraphicsScene::event(e);
}
-/******** WEB PREVIEW *****************************************************************************/
-
+// ========================================
+// Webkit Only stuff
+// ========================================
+#ifdef HAVE_WEBKIT
void ChatScene::loadWebPreview(ChatItem *parentItem, const QString &url, const QRectF &urlRect) {
-#ifndef HAVE_WEBKIT
- Q_UNUSED(parentItem)
- Q_UNUSED(url)
- Q_UNUSED(urlRect)
-#else
if(!_showWebPreview)
return;
+ if(webPreview.urlRect != urlRect)
+ webPreview.urlRect = urlRect;
+
if(webPreview.parentItem != parentItem)
webPreview.parentItem = parentItem;
if(webPreview.url != url) {
webPreview.url = url;
- // load a new web view and delete the old one (if exists)
+ // prepare to load a different URL
if(webPreview.previewItem && webPreview.previewItem->scene()) {
removeItem(webPreview.previewItem);
delete webPreview.previewItem;
+ webPreview.previewItem = 0;
}
- webPreview.previewItem = new WebPreviewItem(url);
- webPreview.delayTimer.start(2000);
- webPreview.deleteTimer.stop();
- } else if(webPreview.previewItem && !webPreview.previewItem->scene()) {
- // we just have to readd the item to the scene
- webPreview.delayTimer.start(2000);
- webPreview.deleteTimer.stop();
- }
- if(webPreview.urlRect != urlRect) {
- webPreview.urlRect = urlRect;
- qreal previewY = urlRect.bottom();
- qreal previewX = urlRect.x();
- if(previewY + webPreview.previewItem->boundingRect().height() > sceneRect().bottom())
- previewY = urlRect.y() - webPreview.previewItem->boundingRect().height();
-
- if(previewX + webPreview.previewItem->boundingRect().width() > sceneRect().width())
- previewX = sceneRect().right() - webPreview.previewItem->boundingRect().width();
-
- webPreview.previewItem->setPos(previewX, previewY);
+ webPreview.previewState = WebPreview::NoPreview;
}
-#endif
-}
-void ChatScene::showWebPreviewEvent() {
-#ifdef HAVE_WEBKIT
- if(webPreview.previewItem)
- addItem(webPreview.previewItem);
-#endif
-}
+ if(webPreview.url.isEmpty())
+ return;
-void ChatScene::clearWebPreview(ChatItem *parentItem) {
-#ifndef HAVE_WEBKIT
- Q_UNUSED(parentItem)
-#else
- if(parentItem == 0 || webPreview.parentItem == parentItem) {
- if(webPreview.previewItem && webPreview.previewItem->scene()) {
+ // qDebug() << Q_FUNC_INFO << webPreview.previewState;
+ switch(webPreview.previewState) {
+ case WebPreview::NoPreview:
+ webPreview.previewState = WebPreview::NewPreview;
+ webPreview.timer.start(500);
+ break;
+ case WebPreview::NewPreview:
+ case WebPreview::DelayPreview:
+ case WebPreview::ShowPreview:
+ // we're already waiting for the next step or showing the preview
+ break;
+ case WebPreview::HidePreview:
+ // we still have a valid preview
+ webPreview.previewState = WebPreview::DelayPreview;
+ webPreview.timer.start(1000);
+ break;
+ }
+ // qDebug() << " new State:" << webPreview.previewState << webPreview.timer.isActive();
+}
+
+void ChatScene::webPreviewNextStep() {
+ // qDebug() << Q_FUNC_INFO << webPreview.previewState;
+ switch(webPreview.previewState) {
+ case WebPreview::NoPreview:
+ break;
+ case WebPreview::NewPreview:
+ Q_ASSERT(!webPreview.previewItem);
+ webPreview.previewItem = new WebPreviewItem(webPreview.url);
+ webPreview.previewState = WebPreview::DelayPreview;
+ webPreview.timer.start(1000);
+ break;
+ case WebPreview::DelayPreview:
+ Q_ASSERT(webPreview.previewItem);
+ // calc position and show
+ {
+ qreal previewY = webPreview.urlRect.bottom();
+ qreal previewX = webPreview.urlRect.x();
+ if(previewY + webPreview.previewItem->boundingRect().height() > sceneRect().bottom())
+ previewY = webPreview.urlRect.y() - webPreview.previewItem->boundingRect().height();
+
+ if(previewX + webPreview.previewItem->boundingRect().width() > sceneRect().width())
+ previewX = sceneRect().right() - webPreview.previewItem->boundingRect().width();
+
+ webPreview.previewItem->setPos(previewX, previewY);
+ }
+ addItem(webPreview.previewItem);
+ webPreview.previewState = WebPreview::ShowPreview;
+ break;
+ case WebPreview::ShowPreview:
+ qWarning() << "ChatScene::webPreviewNextStep() called while in ShowPreview Step!";
+ qWarning() << "removing preview";
+ if(webPreview.previewItem && webPreview.previewItem->scene())
removeItem(webPreview.previewItem);
- webPreview.deleteTimer.start();
+ // Fall through to deletion!
+ case WebPreview::HidePreview:
+ if(webPreview.previewItem) {
+ delete webPreview.previewItem;
+ webPreview.previewItem = 0;
}
- webPreview.delayTimer.stop();
+ webPreview.parentItem = 0;
+ webPreview.url = QString();
+ webPreview.urlRect = QRectF();
+ webPreview.previewState = WebPreview::NoPreview;
}
-#endif
+ // qDebug() << " new State:" << webPreview.previewState << webPreview.timer.isActive();
}
-void ChatScene::deleteWebPreviewEvent() {
-#ifdef HAVE_WEBKIT
- if(webPreview.previewItem) {
- delete webPreview.previewItem;
- webPreview.previewItem = 0;
- }
- webPreview.parentItem = 0;
- webPreview.url = QString();
- webPreview.urlRect = QRectF();
-#endif
+void ChatScene::clearWebPreview(ChatItem *parentItem) {
+ // qDebug() << Q_FUNC_INFO << webPreview.previewState;
+ switch(webPreview.previewState) {
+ case WebPreview::NewPreview:
+ webPreview.previewState = WebPreview::NoPreview; // we haven't loaded anything yet
+ break;
+ case WebPreview::ShowPreview:
+ if(parentItem == 0 || webPreview.parentItem == parentItem) {
+ if(webPreview.previewItem && webPreview.previewItem->scene())
+ removeItem(webPreview.previewItem);
+ }
+ // fall through into to set hidden state
+ case WebPreview::DelayPreview:
+ // we're just loading, so haven't shown the preview yet.
+ webPreview.previewState = WebPreview::HidePreview;
+ webPreview.timer.start(5000);
+ break;
+ case WebPreview::NoPreview:
+ case WebPreview::HidePreview:
+ break;
+ }
+ // qDebug() << " new State:" << webPreview.previewState << webPreview.timer.isActive();
}
+#endif
+
+// ========================================
+// end of webkit only
+// ========================================
void ChatScene::showWebPreviewChanged() {
ChatViewSettings settings;
projects / quassel.git / blobdiff