Merge branch 'Applications/18.04'

[dolphin.git] / src / kitemviews / kfileitemmodelrolesupdater.cpp

diff --git a/src/kitemviews/kfileitemmodelrolesupdater.cpp b/src/kitemviews/kfileitemmodelrolesupdater.cpp
index 6e1c3d3ddd08a62d423665b2db6b2d1a446348f7..544d88040c8a52246b306b5e9487ee922add2362 100644 (file)
--- a/src/kitemviews/kfileitemmodelrolesupdater.cpp
+++ b/src/kitemviews/kfileitemmodelrolesupdater.cpp
@@ -20,35 +20,30 @@
 #include "kfileitemmodelrolesupdater.h"
 
 #include "kfileitemmodel.h"
 #include "kfileitemmodelrolesupdater.h"
 
 #include "kfileitemmodel.h"

+#include "private/kdirectorycontentscounter.h"
+#include "private/kpixmapmodifier.h"

 
 #include <KConfig>
 #include <KConfigGroup>
 
 #include <KConfig>
 #include <KConfigGroup>

-#include <KSharedConfig>
-#include <KFileItem>
-#include <KIconLoader>
-#include <KJobWidgets>

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

-#include <KPluginLoader>
+#include <KIconLoader>
+#include <KJobWidgets>

 #include <KOverlayIconPlugin>
 #include <KOverlayIconPlugin>

+#include <KPluginLoader>
+#include <KSharedConfig>

 
 

-#include "private/kpixmapmodifier.h"
-#include "private/kdirectorycontentscounter.h"
+#ifdef HAVE_BALOO
+#include "private/kbaloorolesprovider.h"
+#include <Baloo/File>
+#include <Baloo/FileMonitor>
+#endif

 
 #include <QApplication>
 #include <QPainter>
 
 #include <QApplication>
 #include <QPainter>

-#include <QPixmap>

 #include <QElapsedTimer>
 #include <QTimer>
 
 #include <QElapsedTimer>
 #include <QTimer>
 

-#include <algorithm>
-
-#ifdef HAVE_BALOO
-    #include "private/kbaloorolesprovider.h"
-    #include <Baloo/File>
-    #include <Baloo/FileMonitor>
-#endif
-

 
 // #define KFILEITEMMODELROLESUPDATER_DEBUG
 
 
 // #define KFILEITEMMODELROLESUPDATER_DEBUG
 


@@ -88,21 +83,18 @@ KFileItemModelRolesUpdater::KFileItemModelRolesUpdater(KFileItemModel* model, QO
     m_pendingIndexes(),
     m_pendingPreviewItems(),
     m_previewJob(),
     m_pendingIndexes(),
     m_pendingPreviewItems(),
     m_previewJob(),

-    m_recentlyChangedItemsTimer(0),
+    m_recentlyChangedItemsTimer(nullptr),

     m_recentlyChangedItems(),
     m_changedItems(),
     m_recentlyChangedItems(),
     m_changedItems(),

-    m_directoryContentsCounter(0)
+    m_directoryContentsCounter(nullptr)

   #ifdef HAVE_BALOO
   #ifdef HAVE_BALOO

-  , m_balooFileMonitor(0)
+  , m_balooFileMonitor(nullptr)

   #endif
 {
     Q_ASSERT(model);
 
     const KConfigGroup globalConfig(KSharedConfig::openConfig(), "PreviewSettings");
   #endif
 {
     Q_ASSERT(model);
 
     const KConfigGroup globalConfig(KSharedConfig::openConfig(), "PreviewSettings");

-    m_enabledPlugins = globalConfig.readEntry("Plugins", QStringList()
-                                                         << QStringLiteral("directorythumbnail")
-                                                         << QStringLiteral("imagethumbnail")
-                                                         << QStringLiteral("jpegthumbnail"));
+    m_enabledPlugins = globalConfig.readEntry("Plugins", KIO::PreviewJob::defaultPlugins());

 
     connect(m_model, &KFileItemModel::itemsInserted,
             this,    &KFileItemModelRolesUpdater::slotItemsInserted);
 
     connect(m_model, &KFileItemModel::itemsInserted,
             this,    &KFileItemModelRolesUpdater::slotItemsInserted);


@@ -299,7 +291,7 @@ void KFileItemModelRolesUpdater::setRoles(const QSet<QByteArray>& roles)
                     this, &KFileItemModelRolesUpdater::applyChangedBalooRoles);
         } else if (!hasBalooRole && m_balooFileMonitor) {
             delete m_balooFileMonitor;
                     this, &KFileItemModelRolesUpdater::applyChangedBalooRoles);
         } else if (!hasBalooRole && m_balooFileMonitor) {
             delete m_balooFileMonitor;

-            m_balooFileMonitor = 0;
+            m_balooFileMonitor = nullptr;

         }
 #endif
 
         }
 #endif
 


@@ -505,8 +497,12 @@ void KFileItemModelRolesUpdater::slotGotPreview(const KFileItem& item, const QPi
 
     const QString mimeType = item.mimetype();
     const int slashIndex = mimeType.indexOf(QLatin1Char('/'));
 
     const QString mimeType = item.mimetype();
     const int slashIndex = mimeType.indexOf(QLatin1Char('/'));

-    const QString mimeTypeGroup = mimeType.left(slashIndex);
-    if (mimeTypeGroup == QLatin1String("image")) {
+    const bool isFontPreview = mimeType.rightRef(slashIndex).contains(QLatin1String("font"));
+    const bool isFolderPreview = item.isDir();
+    const bool isWindowsExePreview = mimeType == QLatin1String("application/x-ms-dos-executable") ||
+                                     mimeType == QLatin1String("application/x-msdownload");
+
+    if (!isFolderPreview && !isFontPreview && !isWindowsExePreview) {

         if (m_enlargeSmallPreviews) {
             KPixmapModifier::applyFrame(scaledPixmap, m_iconSize);
         } else {
         if (m_enlargeSmallPreviews) {
             KPixmapModifier::applyFrame(scaledPixmap, m_iconSize);
         } else {


@@ -593,7 +589,7 @@ void KFileItemModelRolesUpdater::slotPreviewFailed(const KFileItem& item)
 
 void KFileItemModelRolesUpdater::slotPreviewJobFinished()
 {
 
 void KFileItemModelRolesUpdater::slotPreviewJobFinished()
 {

-    m_previewJob = 0;
+    m_previewJob = nullptr;

 
     if (m_state != PreviewJobRunning) {
         return;
 
     if (m_state != PreviewJobRunning) {
         return;


@@ -1137,7 +1133,7 @@ void KFileItemModelRolesUpdater::killPreviewJob()
         disconnect(m_previewJob,  &KIO::PreviewJob::finished,
                    this, &KFileItemModelRolesUpdater::slotPreviewJobFinished);
         m_previewJob->kill();
         disconnect(m_previewJob,  &KIO::PreviewJob::finished,
                    this, &KFileItemModelRolesUpdater::slotPreviewJobFinished);
         m_previewJob->kill();

-        m_previewJob = 0;
+        m_previewJob = nullptr;

         m_pendingPreviewItems.clear();
     }
 }
         m_pendingPreviewItems.clear();
     }
 }