Merge branch 'master' into frameworks

[dolphin.git] / src / views / tooltips / tooltipmanager.cpp

diff --git a/src/views/tooltips/tooltipmanager.cpp b/src/views/tooltips/tooltipmanager.cpp
index a2b717b91dd476874c761c6dcbc81793d8045c0d..c005979d56f3ec375ef8295007fbb9c2b957349b 100644 (file)
--- a/src/views/tooltips/tooltipmanager.cpp
+++ b/src/views/tooltips/tooltipmanager.cpp
@@ -21,129 +21,94 @@
 
 #include "filemetadatatooltip.h"
 #include <KIcon>
 
 #include "filemetadatatooltip.h"
 #include <KIcon>

+#include <KIO/JobUiDelegate>

 #include <KIO/PreviewJob>
 #include <KIO/PreviewJob>

+#include <KJobWidgets>

 
 #include <QApplication>
 #include <QDesktopWidget>
 
 #include <QApplication>
 #include <QDesktopWidget>

+#include <QLayout>

 #include <QScrollArea>
 #include <QScrollBar>
 #include <QScrollArea>
 #include <QScrollBar>

+#include <QStyle>

 #include <QTimer>
 
 #include <QTimer>
 

-#include <views/dolphinmodel.h>
-#include <views/dolphinsortfilterproxymodel.h>
-
-ToolTipManager::ToolTipManager(QAbstractItemView* parent,
-                               DolphinSortFilterProxyModel* model) :
+ToolTipManager::ToolTipManager(QWidget* parent) :

     QObject(parent),
     QObject(parent),

-    m_view(parent),
-    m_dolphinModel(0),
-    m_proxyModel(model),

     m_showToolTipTimer(0),
     m_contentRetrievalTimer(0),
     m_fileMetaDataToolTip(0),
     m_toolTipRequested(false),
     m_metaDataRequested(false),
     m_showToolTipTimer(0),
     m_contentRetrievalTimer(0),
     m_fileMetaDataToolTip(0),
     m_toolTipRequested(false),
     m_metaDataRequested(false),

+    m_appliedWaitCursor(false),
+    m_margin(4),

     m_item(),
     m_itemRect()
 {
     m_item(),
     m_itemRect()
 {

-    static FileMetaDataToolTip* sharedToolTip = 0;
-    if (sharedToolTip == 0) {
-        sharedToolTip = new FileMetaDataToolTip();
-        // TODO: Using K_GLOBAL_STATIC would be preferable to maintain the
-        // instance, but the cleanup of KFileMetaDataWidget at this stage does
-        // not work.
+    if (parent) {
+        m_margin = qMax(m_margin, parent->style()->pixelMetric(QStyle::PM_ToolTipLabelFrameWidth));

     }
     }

-    m_fileMetaDataToolTip = sharedToolTip;
-    connect(m_fileMetaDataToolTip, SIGNAL(metaDataRequestFinished(KFileItemList)),
-            this, SLOT(slotMetaDataRequestFinished()));
-
-    m_dolphinModel = static_cast<DolphinModel*>(m_proxyModel->sourceModel());
-    connect(parent, SIGNAL(entered(const QModelIndex&)),
-            this, SLOT(requestToolTip(const QModelIndex&)));
-    connect(parent, SIGNAL(viewportEntered()),
-            this, SLOT(hideToolTip()));

 
 

-    // Initialize timers

     m_showToolTipTimer = new QTimer(this);
     m_showToolTipTimer->setSingleShot(true);
     m_showToolTipTimer->setInterval(500);
     m_showToolTipTimer = new QTimer(this);
     m_showToolTipTimer->setSingleShot(true);
     m_showToolTipTimer->setInterval(500);

-    connect(m_showToolTipTimer, SIGNAL(timeout()), this, SLOT(showToolTip()));
+    connect(m_showToolTipTimer, &QTimer::timeout, this, static_cast<void(ToolTipManager::*)()>(&ToolTipManager::showToolTip));

 
     m_contentRetrievalTimer = new QTimer(this);
     m_contentRetrievalTimer->setSingleShot(true);
     m_contentRetrievalTimer->setInterval(200);
 
     m_contentRetrievalTimer = new QTimer(this);
     m_contentRetrievalTimer->setSingleShot(true);
     m_contentRetrievalTimer->setInterval(200);

-    connect(m_contentRetrievalTimer, SIGNAL(timeout()), this, SLOT(startContentRetrieval()));
+    connect(m_contentRetrievalTimer, &QTimer::timeout, this, &ToolTipManager::startContentRetrieval);

 
     Q_ASSERT(m_contentRetrievalTimer->interval() < m_showToolTipTimer->interval());
 
     Q_ASSERT(m_contentRetrievalTimer->interval() < m_showToolTipTimer->interval());

-
-    // When the mousewheel is used, the items don't get a hovered indication
-    // (Qt-issue #200665). To assure that the tooltip still gets hidden,
-    // the scrollbars are observed.
-    connect(parent->horizontalScrollBar(), SIGNAL(valueChanged(int)),
-            this, SLOT(hideToolTip()));
-    connect(parent->verticalScrollBar(), SIGNAL(valueChanged(int)),
-            this, SLOT(hideToolTip()));
-
-    m_view->viewport()->installEventFilter(this);
-    m_view->installEventFilter(this);

 }
 
 ToolTipManager::~ToolTipManager()
 {
 }
 
 ToolTipManager::~ToolTipManager()
 {

+    delete m_fileMetaDataToolTip;
+    m_fileMetaDataToolTip = 0;

 }
 
 }
 

-void ToolTipManager::hideToolTip()
+void ToolTipManager::showToolTip(const KFileItem& item, const QRectF& itemRect)

 {
 {

-    QApplication::restoreOverrideCursor();
+    hideToolTip();

 
 

-    m_toolTipRequested = false;
-    m_metaDataRequested = false;
-    m_showToolTipTimer->stop();
-    m_contentRetrievalTimer->stop();
+    m_itemRect = itemRect.toRect();

 
 

-    m_fileMetaDataToolTip->setItems(KFileItemList());
-    m_fileMetaDataToolTip->hide();
-}
+    m_itemRect.adjust(-m_margin, -m_margin, m_margin, m_margin);
+    m_item = item;

 
 

-bool ToolTipManager::eventFilter(QObject* watched, QEvent* event)
-{
-    if (watched == m_view->viewport()) {
-        switch (event->type()) {
-        case QEvent::Leave:
-        case QEvent::MouseButtonPress:
-            hideToolTip();
-            break;
-        default:
-            break;
-        }
-    } else if ((watched == m_view) && (event->type() == QEvent::KeyPress)) {
-        hideToolTip();
-    }
+    // Only start the retrieving of the content, when the mouse has been over this
+    // item for 200 milliseconds. This prevents a lot of useless preview jobs and
+    // meta data retrieval, when passing rapidly over a lot of items.
+    Q_ASSERT(!m_fileMetaDataToolTip);
+    m_fileMetaDataToolTip = new FileMetaDataToolTip();
+    connect(m_fileMetaDataToolTip, &FileMetaDataToolTip::metaDataRequestFinished,
+            this, &ToolTipManager::slotMetaDataRequestFinished);

 
 

-    return QObject::eventFilter(watched, event);
+    m_contentRetrievalTimer->start();
+    m_showToolTipTimer->start();
+    m_toolTipRequested = true;
+    Q_ASSERT(!m_metaDataRequested);

 }
 
 }
 

-void ToolTipManager::requestToolTip(const QModelIndex& index)
+void ToolTipManager::hideToolTip()

 {
 {

-    hideToolTip();
+    if (m_appliedWaitCursor) {
+        QApplication::restoreOverrideCursor();
+        m_appliedWaitCursor = false;
+    }

 
 

-    // Only request a tooltip for the name column and when no selection or
-    // drag & drop operation is done (indicated by the left mouse button)
-    if ((index.column() == DolphinModel::Name) && !(QApplication::mouseButtons() & Qt::LeftButton)) {
-        m_itemRect = m_view->visualRect(index);
-        const QPoint pos = m_view->viewport()->mapToGlobal(m_itemRect.topLeft());
-        m_itemRect.moveTo(pos);
-
-        const QModelIndex dirIndex = m_proxyModel->mapToSource(index);
-        m_item = m_dolphinModel->itemForIndex(dirIndex);
-
-        // Only start the retrieving of the content, when the mouse has been over this
-        // item for 200 milliseconds. This prevents a lot of useless preview jobs and
-        // meta data retrieval, when passing rapidly over a lot of items.
-        m_contentRetrievalTimer->start();
-        m_showToolTipTimer->start();
-        m_toolTipRequested = true;
-        Q_ASSERT(!m_metaDataRequested);
+    m_toolTipRequested = false;
+    m_metaDataRequested = false;
+    m_showToolTipTimer->stop();
+    m_contentRetrievalTimer->stop();
+
+    if (m_fileMetaDataToolTip) {
+        m_fileMetaDataToolTip->hide();
+        // Do not delete the tool tip immediately to prevent crashes when
+        // QCoreApplication tries to deliver an 'Enter' event to it, see bug 310579.
+        m_fileMetaDataToolTip->deleteLater();
+        m_fileMetaDataToolTip = 0;

     }
 }
 
     }
 }
 


@@ -160,16 +125,21 @@ void ToolTipManager::startContentRetrieval()
     // meta-data have been received.
     m_metaDataRequested = true;
     m_fileMetaDataToolTip->setItems(KFileItemList() << m_item);
     // meta-data have been received.
     m_metaDataRequested = true;
     m_fileMetaDataToolTip->setItems(KFileItemList() << m_item);

+    m_fileMetaDataToolTip->adjustSize();

 
     // Request a preview of the item
     m_fileMetaDataToolTip->setPreview(QPixmap());
 
 
     // Request a preview of the item
     m_fileMetaDataToolTip->setPreview(QPixmap());
 

-    KIO::PreviewJob* job = KIO::filePreview(KFileItemList() << m_item, 256, 256);
+    KIO::PreviewJob* job = new KIO::PreviewJob(KFileItemList() << m_item, QSize(256, 256));
+    job->setIgnoreMaximumSize(m_item.isLocalFile());
+    if (job->ui()) {
+        KJobWidgets::setWindow(job, qApp->activeWindow());
+    }

 
 

-    connect(job, SIGNAL(gotPreview(const KFileItem&, const QPixmap&)),
-            this, SLOT(setPreviewPix(const KFileItem&, const QPixmap&)));
-    connect(job, SIGNAL(failed(const KFileItem&)),
-            this, SLOT(previewFailed()));
+    connect(job, &KIO::PreviewJob::gotPreview,
+            this, &ToolTipManager::setPreviewPix);
+    connect(job, &KIO::PreviewJob::failed,
+            this, &ToolTipManager::previewFailed);

 }
 
 
 }
 
 


@@ -211,6 +181,7 @@ void ToolTipManager::slotMetaDataRequestFinished()
     }
 
     m_metaDataRequested = false;
     }
 
     m_metaDataRequested = false;

+

     if (!m_showToolTipTimer->isActive()) {
         showToolTip();
     }
     if (!m_showToolTipTimer->isActive()) {
         showToolTip();
     }


@@ -219,14 +190,15 @@ void ToolTipManager::slotMetaDataRequestFinished()
 void ToolTipManager::showToolTip()
 {
     Q_ASSERT(m_toolTipRequested);
 void ToolTipManager::showToolTip()
 {
     Q_ASSERT(m_toolTipRequested);

-    QApplication::restoreOverrideCursor();
-
-    if (QApplication::mouseButtons() & Qt::LeftButton) {
-        return;
+    if (m_appliedWaitCursor) {
+        QApplication::restoreOverrideCursor();
+        m_appliedWaitCursor = false;

     }
 
     if (m_fileMetaDataToolTip->preview().isNull() || m_metaDataRequested) {
     }
 
     if (m_fileMetaDataToolTip->preview().isNull() || m_metaDataRequested) {

+        Q_ASSERT(!m_appliedWaitCursor);

         QApplication::setOverrideCursor(QCursor(Qt::WaitCursor));
         QApplication::setOverrideCursor(QCursor(Qt::WaitCursor));

+        m_appliedWaitCursor = true;

         return;
     }
 
         return;
     }
 


@@ -251,35 +223,35 @@ void ToolTipManager::showToolTip()
     }
 
     // m_itemRect defines the area of the item, where the tooltip should be
     }
 
     // m_itemRect defines the area of the item, where the tooltip should be

-    // shown. Per default the tooltip is shown in the bottom right corner.
+    // shown. Per default the tooltip is shown centered at the bottom.

     // It must be assured that:
     // - the content is fully visible
     // - the content is not drawn inside m_itemRect
     // It must be assured that:
     // - the content is fully visible
     // - the content is not drawn inside m_itemRect

-    const bool hasRoomToLeft  = (m_itemRect.left()   - size.width()  >= screen.left());
-    const bool hasRoomToRight = (m_itemRect.right()  + size.width()  <= screen.right());
-    const bool hasRoomAbove   = (m_itemRect.top()    - size.height() >= screen.top());
-    const bool hasRoomBelow   = (m_itemRect.bottom() + size.height() <= screen.bottom());
+    const bool hasRoomToLeft  = (m_itemRect.left()   - size.width()  - m_margin >= screen.left());
+    const bool hasRoomToRight = (m_itemRect.right()  + size.width()  + m_margin <= screen.right());
+    const bool hasRoomAbove   = (m_itemRect.top()    - size.height() - m_margin >= screen.top());
+    const bool hasRoomBelow   = (m_itemRect.bottom() + size.height() + m_margin <= screen.bottom());

     if (!hasRoomAbove && !hasRoomBelow && !hasRoomToLeft && !hasRoomToRight) {
         return;
     }
 
     int x, y;
     if (hasRoomBelow || hasRoomAbove) {
     if (!hasRoomAbove && !hasRoomBelow && !hasRoomToLeft && !hasRoomToRight) {
         return;
     }
 
     int x, y;
     if (hasRoomBelow || hasRoomAbove) {

-        x = QCursor::pos().x() + 16; // TODO: use mouse pointer width instead of the magic value of 16
+        x = qMax(screen.left(), m_itemRect.center().x() - size.width() / 2);

         if (x + size.width() >= screen.right()) {
             x = screen.right() - size.width() + 1;
         }
         if (hasRoomBelow) {
         if (x + size.width() >= screen.right()) {
             x = screen.right() - size.width() + 1;
         }
         if (hasRoomBelow) {

-            y = m_itemRect.bottom() + 1;
+            y = m_itemRect.bottom() + m_margin;

         } else {
         } else {

-            y = m_itemRect.top() - size.height();
+            y = m_itemRect.top() - size.height() - m_margin;

         }
     } else {
         Q_ASSERT(hasRoomToLeft || hasRoomToRight);
         if (hasRoomToRight) {
         }
     } else {
         Q_ASSERT(hasRoomToLeft || hasRoomToRight);
         if (hasRoomToRight) {

-            x = m_itemRect.right() + 1;
+            x = m_itemRect.right() + m_margin;

         } else {
         } else {

-            x = m_itemRect.left() - size.width();
+            x = m_itemRect.left() - size.width() - m_margin;

         }
         // Put the tooltip at the bottom of the screen. The x-coordinate has already
         // been adjusted, so that no overlapping with m_itemRect occurs.
         }
         // Put the tooltip at the bottom of the screen. The x-coordinate has already
         // been adjusted, so that no overlapping with m_itemRect occurs.


@@ -289,10 +261,9 @@ void ToolTipManager::showToolTip()
     // Step #3 - Alter tooltip geometry
     m_fileMetaDataToolTip->setFixedSize(size);
     m_fileMetaDataToolTip->layout()->setSizeConstraint(QLayout::SetNoConstraint);
     // Step #3 - Alter tooltip geometry
     m_fileMetaDataToolTip->setFixedSize(size);
     m_fileMetaDataToolTip->layout()->setSizeConstraint(QLayout::SetNoConstraint);

-    m_fileMetaDataToolTip->setGeometry(x, y, size.width(), size.height());
+    m_fileMetaDataToolTip->move(QPoint(x, y));

     m_fileMetaDataToolTip->show();
 
     m_toolTipRequested = false;
 }
 
     m_fileMetaDataToolTip->show();
 
     m_toolTipRequested = false;
 }
 

-#include "tooltipmanager.moc"