Bypass a temporary (?) regression (?) with the current Qt 4.4 beta version: it seems...

[dolphin.git] / src / iconmanager.cpp

diff --git a/src/iconmanager.cpp b/src/iconmanager.cpp
index 77e7731679d61e2360cf62bc536c5ff10b23287b..5940c909e44e6307a620676d73dae832289d1ba6 100644 (file)
--- a/src/iconmanager.cpp
+++ b/src/iconmanager.cpp
@@ -20,6 +20,7 @@
 #include "iconmanager.h"
 
 #include "dolphinmodel.h"
+#include "dolphinsortfilterproxymodel.h"
 
 #include <kiconeffect.h>
 #include <kio/previewjob.h>
@@ -28,18 +29,25 @@
 #include <konqmimedata.h>
 
 #include <QApplication>
+#include <QAbstractItemView>
 #include <QClipboard>
+#include <QColor>
 #include <QIcon>
 
-IconManager::IconManager(QObject* parent, DolphinModel* model) :
+IconManager::IconManager(QAbstractItemView* parent, DolphinSortFilterProxyModel* model) :
     QObject(parent),
     m_showPreview(false),
+    m_view(parent),
     m_previewJobs(),
-    m_dolphinModel(model),
+    m_dolphinModel(0),
+    m_proxyModel(model),
     m_cutItemsCache()
 {
-    connect(model->dirLister(), SIGNAL(newItems(const KFileItemList&)),
-            this, SLOT(generatePreviews(const KFileItemList&)));
+    Q_ASSERT(m_view->iconSize().isValid());  // each view must provide its current icon size
+
+    m_dolphinModel = static_cast<DolphinModel*>(m_proxyModel->sourceModel());
+    connect(m_dolphinModel->dirLister(), SIGNAL(newItems(const KFileItemList&)),
+            this, SLOT(updateIcons(const KFileItemList&)));
 
     QClipboard* clipboard = QApplication::clipboard();
     connect(clipboard, SIGNAL(dataChanged()),
@@ -65,13 +73,38 @@ void IconManager::setShowPreview(bool show)
     }
 }
 
-void IconManager::generatePreviews(const KFileItemList& items)
+void IconManager::updateIcons(const KFileItemList& items)
 {
+    // make the icons of all hidden files semitransparent
+    foreach (KFileItem item, items) {
+        if (item.isHidden()) {
+            applyHiddenItemEffect(item);
+        }
+    }
+
     if (!m_showPreview) {
         return;
     }
 
-    KIO::PreviewJob* job = KIO::filePreview(items, 128);
+    // generate previews
+    const QRect visibleArea = m_view->viewport()->rect();
+
+    // Order the items in a way that the preview for the visible items
+    // is generated first, as this improves the feeled performance a lot.
+    KFileItemList orderedItems;
+    foreach (KFileItem item, items) {
+        const QModelIndex dirIndex = m_dolphinModel->indexForItem(item);
+        const QModelIndex proxyIndex = m_proxyModel->mapFromSource(dirIndex);
+        const QRect itemRect = m_view->visualRect(proxyIndex);
+        if (itemRect.intersects(visibleArea)) {
+            orderedItems.insert(0, item);
+        } else {
+            orderedItems.append(item);
+        }
+    }
+
+    const QSize size = m_view->iconSize();
+    KIO::PreviewJob* job = KIO::filePreview(orderedItems, size.width(), size.height());
     connect(job, SIGNAL(gotPreview(const KFileItem&, const QPixmap&)),
             this, SLOT(replaceIcon(const KFileItem&, const QPixmap&)));
     connect(job, SIGNAL(finished(KJob*)),
@@ -93,18 +126,28 @@ void IconManager::replaceIcon(const KFileItem& item, const QPixmap& pixmap)
 
     const QModelIndex idx = m_dolphinModel->indexForItem(item);
     if (idx.isValid() && (idx.column() == 0)) {
+        QPixmap icon = pixmap;
+        if (item.isHidden()) {
+            if (!icon.hasAlpha()) {
+                // the semitransparent operation requires having an alpha mask
+                QPixmap alphaMask(icon.width(), icon.height());
+                alphaMask.fill();
+                icon.setAlphaChannel(alphaMask);
+            }
+            KIconEffect::semiTransparent(icon);
+        }
+
         const QMimeData* mimeData = QApplication::clipboard()->mimeData();
         if (KonqMimeData::decodeIsCutSelection(mimeData) && isCutItem(item)) {
             KIconEffect iconEffect;
-            const QPixmap cutPixmap = iconEffect.apply(pixmap, KIconLoader::Desktop, KIconLoader::DisabledState);
-            m_dolphinModel->setData(idx, QIcon(cutPixmap), Qt::DecorationRole);
+            icon = iconEffect.apply(icon, KIconLoader::Desktop, KIconLoader::DisabledState);
+            m_dolphinModel->setData(idx, QIcon(icon), Qt::DecorationRole);
         } else {
-            m_dolphinModel->setData(idx, QIcon(pixmap), Qt::DecorationRole);
+            m_dolphinModel->setData(idx, QIcon(icon), Qt::DecorationRole);
         }
     }
 }
 
-
 void IconManager::slotPreviewJobFinished(KJob* job)
 {
     const int index = m_previewJobs.indexOf(job);
@@ -156,7 +199,7 @@ void IconManager::applyCutItemEffect()
             const QVariant value = m_dolphinModel->data(index, Qt::DecorationRole);
             if (value.type() == QVariant::Icon) {
                 const QIcon icon(qvariant_cast<QIcon>(value));
-                QPixmap pixmap = icon.pixmap(128, 128);
+                QPixmap pixmap = icon.pixmap(m_view->iconSize());
 
                 // remember current pixmap for the item to be able
                 // to restore it when other items get cut
@@ -174,4 +217,16 @@ void IconManager::applyCutItemEffect()
     }
 }
 
+void IconManager::applyHiddenItemEffect(const KFileItem& hiddenItem)
+{
+    const QModelIndex index = m_dolphinModel->indexForItem(hiddenItem);
+    const QVariant value = m_dolphinModel->data(index, Qt::DecorationRole);
+    if (value.type() == QVariant::Icon) {
+        const QIcon icon(qvariant_cast<QIcon>(value));
+        QPixmap pixmap = icon.pixmap(m_view->iconSize());
+        KIconEffect::semiTransparent(pixmap);
+        m_dolphinModel->setData(index, QIcon(pixmap), Qt::DecorationRole);
+    }
+}
+
 #include "iconmanager.moc"