Ported KIcon to QIcon

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

diff --git a/src/views/tooltips/tooltipmanager.cpp b/src/views/tooltips/tooltipmanager.cpp
index 8f18dbde4062aa0daa84e8ecb84b005d602d82f3..25fa8e0ed450cf2b49a01c4e734f5257c412b810 100644 (file)
--- a/src/views/tooltips/tooltipmanager.cpp
+++ b/src/views/tooltips/tooltipmanager.cpp
@@ -20,63 +20,75 @@
 #include "tooltipmanager.h"
 
 #include "filemetadatatooltip.h"
 #include "tooltipmanager.h"
 
 #include "filemetadatatooltip.h"

-#include <KIcon>
+#include <QIcon>
+#include <KIO/JobUiDelegate>

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

-#include <KSharedConfig>
+#include <KJobWidgets>

 
 #include <QApplication>
 #include <QDesktopWidget>
 #include <QLayout>
 #include <QScrollArea>
 #include <QScrollBar>
 
 #include <QApplication>
 #include <QDesktopWidget>
 #include <QLayout>
 #include <QScrollArea>
 #include <QScrollBar>

+#include <QStyle>

 #include <QTimer>
 
 ToolTipManager::ToolTipManager(QWidget* parent) :
     QObject(parent),
 #include <QTimer>
 
 ToolTipManager::ToolTipManager(QWidget* parent) :
     QObject(parent),

-    m_view(parent),

     m_showToolTipTimer(0),
     m_contentRetrievalTimer(0),
     m_fileMetaDataToolTip(0),
     m_toolTipRequested(false),
     m_metaDataRequested(false),
     m_appliedWaitCursor(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()
 {

-    //m_dolphinModel = static_cast<DolphinModel*>(m_proxyModel->sourceModel());
-    //connect(parent, SIGNAL(entered(QModelIndex)),
-    //        this, SLOT(requestToolTip(QModelIndex)));
-    //connect(parent, SIGNAL(viewportEntered()),
-    //        this, SLOT(hideToolTip()));
+    if (parent) {
+        m_margin = qMax(m_margin, parent->style()->pixelMetric(QStyle::PM_ToolTipLabelFrameWidth));
+    }

 
 

-    // 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()));*/
-
-    Q_ASSERT(m_view);
-    //m_view->viewport()->installEventFilter(this);
-    //m_view->installEventFilter(this);

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

+    delete m_fileMetaDataToolTip;
+    m_fileMetaDataToolTip = 0;
+}
+
+void ToolTipManager::showToolTip(const KFileItem& item, const QRectF& itemRect)
+{
+    hideToolTip();
+
+    m_itemRect = itemRect.toRect();
+
+    m_itemRect.adjust(-m_margin, -m_margin, m_margin, m_margin);
+    m_item = item;
+
+    // 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);
+
+    m_contentRetrievalTimer->start();
+    m_showToolTipTimer->start();
+    m_toolTipRequested = true;
+    Q_ASSERT(!m_metaDataRequested);

 }
 
 void ToolTipManager::hideToolTip()
 }
 
 void ToolTipManager::hideToolTip()


@@ -91,56 +103,12 @@ void ToolTipManager::hideToolTip()
     m_showToolTipTimer->stop();
     m_contentRetrievalTimer->stop();
 
     m_showToolTipTimer->stop();
     m_contentRetrievalTimer->stop();
 

-    delete m_fileMetaDataToolTip;
-    m_fileMetaDataToolTip = 0;
-}
-
-
-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();
-    }*/
-
-    return QObject::eventFilter(watched, event);
-}
-
-void ToolTipManager::requestToolTip(const QModelIndex& index)
-{
-    Q_UNUSED(index);
-    hideToolTip();
-
-    // 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 (!(QApplication::mouseButtons() & Qt::LeftButton)) {
-        m_itemRect = QRect(); //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.
-        Q_ASSERT(!m_fileMetaDataToolTip);
-        m_fileMetaDataToolTip = new FileMetaDataToolTip(m_view);
-        connect(m_fileMetaDataToolTip, SIGNAL(metaDataRequestFinished(KFileItemList)),
-                this, SLOT(slotMetaDataRequestFinished()));
-
-        m_contentRetrievalTimer->start();
-        m_showToolTipTimer->start();
-        m_toolTipRequested = true;
-        Q_ASSERT(!m_metaDataRequested);
+    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;

     }
 }
 
     }
 }
 


@@ -162,12 +130,16 @@ void ToolTipManager::startContentRetrieval()
     // 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, QSize(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(KFileItem,QPixmap)),
-            this, SLOT(setPreviewPix(KFileItem,QPixmap)));
-    connect(job, SIGNAL(failed(KFileItem)),
-            this, SLOT(previewFailed()));
+    connect(job, &KIO::PreviewJob::gotPreview,
+            this, &ToolTipManager::setPreviewPix);
+    connect(job, &KIO::PreviewJob::failed,
+            this, &ToolTipManager::previewFailed);

 }
 
 
 }
 
 


@@ -195,7 +167,7 @@ void ToolTipManager::previewFailed()
         return;
     }
 
         return;
     }
 

-    const QPixmap pixmap = KIcon(m_item.iconName()).pixmap(128, 128);
+    const QPixmap pixmap = QIcon::fromTheme(m_item.iconName()).pixmap(128, 128);

     m_fileMetaDataToolTip->setPreview(pixmap);
     if (!m_showToolTipTimer->isActive()) {
         showToolTip();
     m_fileMetaDataToolTip->setPreview(pixmap);
     if (!m_showToolTipTimer->isActive()) {
         showToolTip();


@@ -223,10 +195,6 @@ void ToolTipManager::showToolTip()
         m_appliedWaitCursor = false;
     }
 
         m_appliedWaitCursor = false;
     }
 

-    if (QApplication::mouseButtons() & Qt::LeftButton) {
-        return;
-    }
-

     if (m_fileMetaDataToolTip->preview().isNull() || m_metaDataRequested) {
         Q_ASSERT(!m_appliedWaitCursor);
         QApplication::setOverrideCursor(QCursor(Qt::WaitCursor));
     if (m_fileMetaDataToolTip->preview().isNull() || m_metaDataRequested) {
         Q_ASSERT(!m_appliedWaitCursor);
         QApplication::setOverrideCursor(QCursor(Qt::WaitCursor));


@@ -259,11 +227,10 @@ void ToolTipManager::showToolTip()
     // 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 int margin = 3;
-    const bool hasRoomToLeft  = (m_itemRect.left()   - size.width()  - margin >= screen.left());
-    const bool hasRoomToRight = (m_itemRect.right()  + size.width()  + margin <= screen.right());
-    const bool hasRoomAbove   = (m_itemRect.top()    - size.height() - margin >= screen.top());
-    const bool hasRoomBelow   = (m_itemRect.bottom() + size.height() + margin <= 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;
     }
     if (!hasRoomAbove && !hasRoomBelow && !hasRoomToLeft && !hasRoomToRight) {
         return;
     }


@@ -275,16 +242,16 @@ void ToolTipManager::showToolTip()
             x = screen.right() - size.width() + 1;
         }
         if (hasRoomBelow) {
             x = screen.right() - size.width() + 1;
         }
         if (hasRoomBelow) {

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

         } else {
         } else {

-            y = m_itemRect.top() - size.height() - margin;
+            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() + margin;
+            x = m_itemRect.right() + m_margin;

         } else {
         } else {

-            x = m_itemRect.left() - size.width() - margin;
+            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.


@@ -300,4 +267,3 @@ void ToolTipManager::showToolTip()
     m_toolTipRequested = false;
 }
 
     m_toolTipRequested = false;
 }
 

-#include "tooltipmanager.moc"