X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/565bd3bf23dfb9b139de089d3c4f8b57e124f7ee..2dc23d4e6dc8a3b5d9e4f816fe9ddab13f957cc6:/src/tooltips/tooltipmanager.cpp

diff --git a/src/tooltips/tooltipmanager.cpp b/src/tooltips/tooltipmanager.cpp
index baefee095..b085e6861 100644
--- a/src/tooltips/tooltipmanager.cpp
+++ b/src/tooltips/tooltipmanager.cpp
@@ -22,16 +22,12 @@
 #include "dolphinmodel.h"
 #include "dolphinsortfilterproxymodel.h"
 
+#include "filemetadatatooltip.h"
 #include <kicon.h>
 #include <kio/previewjob.h>
 
-#include "panels/information/kmetadatawidget.h"
-#include "tooltips/ktooltip.h"
-
 #include <QApplication>
 #include <QDesktopWidget>
-#include <QHBoxLayout>
-#include <QLabel>
 #include <QScrollArea>
 #include <QScrollBar>
 #include <QTimer>
@@ -45,6 +41,7 @@ ToolTipManager::ToolTipManager(QAbstractItemView* parent,
     m_timer(0),
     m_previewTimer(0),
     m_waitOnPreviewTimer(0),
+    m_fileMetaDataToolTip(0),
     m_item(),
     m_itemRect(),
     m_generatingPreview(false),
@@ -82,6 +79,15 @@ ToolTipManager::ToolTipManager(QAbstractItemView* parent,
 
     m_view->viewport()->installEventFilter(this);
     m_view->installEventFilter(this);
+
+    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 KMetaDataWidget at this stage does
+        // not work.
+    }
+    m_fileMetaDataToolTip = sharedToolTip;
 }
 
 ToolTipManager::~ToolTipManager()
@@ -113,11 +119,11 @@ bool ToolTipManager::eventFilter(QObject* watched, QEvent* event)
 
 void ToolTipManager::requestToolTip(const QModelIndex& index)
 {
-    // only request a tooltip for the name column and when no selection or
+    // 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_waitOnPreviewTimer->stop();
-        KToolTip::hideTip();
+        hideToolTip();
 
         m_itemRect = m_view->visualRect(index);
         const QPoint pos = m_view->viewport()->mapToGlobal(m_itemRect.topLeft());
@@ -126,8 +132,8 @@ void ToolTipManager::requestToolTip(const QModelIndex& index)
         const QModelIndex dirIndex = m_proxyModel->mapToSource(index);
         m_item = m_dolphinModel->itemForIndex(dirIndex);
 
-        // only start the previewJob when the mouse has been over this item for 200 milliseconds,
-        // this prevents a lot of useless preview jobs when passing rapidly over a lot of items
+        // Only start the previewJob when the mouse has been over this item for 200 milliseconds.
+        // This prevents a lot of useless preview jobs when passing rapidly over a lot of items.
         m_previewTimer->start(200);
         m_previewPixmap = QPixmap();
         m_hasDefaultIcon = false;
@@ -143,7 +149,9 @@ void ToolTipManager::hideToolTip()
     m_timer->stop();
     m_previewTimer->stop();
     m_waitOnPreviewTimer->stop();
-    KToolTip::hideTip();
+
+    m_fileMetaDataToolTip->hide();
+    m_fileMetaDataToolTip->setItems(KFileItemList());
 }
 
 void ToolTipManager::prepareToolTip()
@@ -177,7 +185,7 @@ void ToolTipManager::setPreviewPix(const KFileItem& item,
                                    const QPixmap& pixmap)
 {
     if ((m_item.url() != item.url()) || pixmap.isNull()) {
-        // an old preview or an invalid preview has been received
+        // An old preview or an invalid preview has been received
         previewFailed();
     } else {
         m_previewPixmap = pixmap;
@@ -197,10 +205,12 @@ void ToolTipManager::showToolTip(const QPixmap& pixmap)
         return;
     }
 
-    QWidget* tip = createTipContent(pixmap);
+    m_fileMetaDataToolTip->setPreview(pixmap);
+    m_fileMetaDataToolTip->setName(m_item.text());
+    m_fileMetaDataToolTip->setItems(KFileItemList() << m_item);
 
-    // calculate the x- and y-position of the tooltip
-    const QSize size = tip->sizeHint();
+    // Calculate the x- and y-position of the tooltip
+    const QSize size = m_fileMetaDataToolTip->sizeHint();
     const QRect desktop = QApplication::desktop()->screenGeometry(m_itemRect.bottomRight());
 
     // m_itemRect defines the area of the item, where the tooltip should be
@@ -213,8 +223,6 @@ void ToolTipManager::showToolTip(const QPixmap& pixmap)
     const bool hasRoomAbove   = (m_itemRect.top()    - size.height() >= desktop.top());
     const bool hasRoomBelow   = (m_itemRect.bottom() + size.height() <= desktop.bottom());
     if (!hasRoomAbove && !hasRoomBelow && !hasRoomToLeft && !hasRoomToRight) {
-        delete tip;
-        tip = 0;
         return;
     }
 
@@ -235,28 +243,8 @@ void ToolTipManager::showToolTip(const QPixmap& pixmap)
         y = desktop.bottom() - size.height();
     }
 
-    // the ownership of tip is transferred to KToolTip
-    KToolTip::showTip(QPoint(x, y), tip);
-}
-
-QWidget* ToolTipManager::createTipContent(const QPixmap& pixmap) const
-{
-    QWidget* tipContent = new QWidget();
-
-    QLabel* pixmapLabel = new QLabel(tipContent);
-    pixmapLabel->setPixmap(pixmap);
-    pixmapLabel->setFixedSize(pixmap.size());
-
-    KMetaDataWidget* metaDataWidget = new KMetaDataWidget(tipContent);
-    metaDataWidget->setItem(m_item);
-    metaDataWidget->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed);
-
-    QHBoxLayout* tipLayout = new QHBoxLayout(tipContent);
-    tipLayout->setMargin(0);
-    tipLayout->addWidget(pixmapLabel);
-    tipLayout->addWidget(metaDataWidget);
-
-    return tipContent;
+    m_fileMetaDataToolTip->move(x, y);
+    m_fileMetaDataToolTip->show();
 }
 
 #include "tooltipmanager.moc"