X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/32298bba66fe57a6a42a1b92ae9aec002a637483..629ec98952bcf38bc99f2b11bc37bdc2ec7aabcc:/src/iconmanager.cpp

diff --git a/src/iconmanager.cpp b/src/iconmanager.cpp
index d2169cb9e..002f4e86d 100644
--- a/src/iconmanager.cpp
+++ b/src/iconmanager.cpp
@@ -25,6 +25,7 @@
 #include <kiconeffect.h>
 #include <kio/previewjob.h>
 #include <kdirlister.h>
+#include <kmimetyperesolver.h>
 #include <konqmimedata.h>
 
 #include <QApplication>
@@ -45,6 +46,7 @@ IconManager::IconManager(QAbstractItemView* parent, DolphinSortFilterProxyModel*
     m_previewJobs(),
     m_dolphinModel(0),
     m_proxyModel(model),
+    m_mimeTypeResolver(0),
     m_cutItemsCache(),
     m_previews(),
     m_pendingItems(),
@@ -84,6 +86,10 @@ IconManager::~IconManager()
     killPreviewJobs();
     m_pendingItems.clear();
     m_dispatchedItems.clear();
+    if (m_mimeTypeResolver != 0) {
+        m_mimeTypeResolver->deleteLater();
+        m_mimeTypeResolver = 0;
+    }
 }
 
 
@@ -97,6 +103,16 @@ void IconManager::setShowPreview(bool show)
             updatePreviews();
         }
     }
+
+    if (show && (m_mimeTypeResolver != 0)) {
+        // don't resolve the MIME types if the preview is turned on
+        m_mimeTypeResolver->deleteLater();
+        m_mimeTypeResolver = 0;
+    } else if (!show && (m_mimeTypeResolver == 0)) {
+        // the preview is turned off: resolve the MIME-types so that
+        // the icons gets updated
+        m_mimeTypeResolver = new KMimeTypeResolver(m_view, m_dolphinModel);
+    }
 }
 
 void IconManager::updatePreviews()
@@ -122,6 +138,14 @@ void IconManager::updatePreviews()
     updateCutItems();
 }
 
+void IconManager::cancelPreviews()
+{
+    killPreviewJobs();
+    m_cutItemsCache.clear();
+    m_pendingItems.clear();
+    m_dispatchedItems.clear();
+}
+
 void IconManager::generatePreviews(const KFileItemList& items)
 {
     applyCutItemEffect();
@@ -132,18 +156,25 @@ void IconManager::generatePreviews(const KFileItemList& items)
 
     // Order the items in a way that the preview for the visible items
     // is generated first, as this improves the feeled performance a lot.
+    // Implementation note: using KDirModel::itemForUrl() would lead to a more
+    // readable code, but it is a lot slower in comparison to itemListContains().
     const QRect visibleArea = m_view->viewport()->rect();
     KFileItemList orderedItems;
-    foreach (const KFileItem& item, items) {
-        const QModelIndex dirIndex = m_dolphinModel->indexForItem(item);
-        const QModelIndex proxyIndex = m_proxyModel->mapFromSource(dirIndex);
+    const int rowCount = m_proxyModel->rowCount();
+    for (int row = 0; row < rowCount; ++row) {
+        const QModelIndex proxyIndex = m_proxyModel->index(row, 0);
         const QRect itemRect = m_view->visualRect(proxyIndex);
-        if (itemRect.intersects(visibleArea)) {
-            orderedItems.insert(0, item);
-            m_pendingItems.insert(0, item.url());
-        } else {
-            orderedItems.append(item);
-            m_pendingItems.append(item.url());
+        const QModelIndex dirIndex = m_proxyModel->mapToSource(proxyIndex);
+        KFileItem item = m_dolphinModel->itemForIndex(dirIndex);
+        const KUrl url = item.url();
+        if (itemListContains(items, url)) {
+            if (itemRect.intersects(visibleArea)) {
+                orderedItems.insert(0, item);
+                m_pendingItems.insert(0, url);
+            } else {
+                orderedItems.append(item);
+                m_pendingItems.append(url);
+            }
         }
     }
 
@@ -253,17 +284,25 @@ void IconManager::resumePreviews()
     // Create a new preview job for the remaining items.
     // Order the items in a way that the preview for the visible items
     // is generated first, as this improves the feeled performance a lot.
+    // Implementation note: using KDirModel::itemForUrl() would lead to a more
+    // readable code, but it is a lot slower in comparison
+    // to m_pendingItems.contains().
     const QRect visibleArea = m_view->viewport()->rect();
     KFileItemList orderedItems;
-    foreach (const KUrl& url, m_pendingItems) {
-        const QModelIndex dirIndex = m_dolphinModel->indexForUrl(url);
-        const KFileItem item = m_dolphinModel->itemForIndex(dirIndex);
-        const QModelIndex proxyIndex = m_proxyModel->mapFromSource(dirIndex);
+
+    const int rowCount = m_proxyModel->rowCount();
+    for (int row = 0; row < rowCount; ++row) {
+        const QModelIndex proxyIndex = m_proxyModel->index(row, 0);
         const QRect itemRect = m_view->visualRect(proxyIndex);
-        if (itemRect.intersects(visibleArea)) {
-            orderedItems.insert(0, item);
-        } else {
-            orderedItems.append(item);
+        const QModelIndex dirIndex = m_proxyModel->mapToSource(proxyIndex);
+        KFileItem item = m_dolphinModel->itemForIndex(dirIndex);
+        const KUrl url = item.url();
+        if (m_pendingItems.contains(url)) {
+            if (itemRect.intersects(visibleArea)) {
+                orderedItems.insert(0, item);
+            } else {
+                orderedItems.append(item);
+            }
         }
     }
 
@@ -481,4 +520,14 @@ void IconManager::killPreviewJobs()
     m_previewJobs.clear();
 }
 
+bool IconManager::itemListContains(const KFileItemList& items, const KUrl& url) const
+{
+    foreach (const KFileItem& item, items) {
+        if (url == item.url()) {
+            return true;
+        }
+    }
+    return false;
+}
+
 #include "iconmanager.moc"