Provide ability to configure size cut-off for local file previews

[dolphin.git] / src / views / dolphinitemlistview.cpp

diff --git a/src/views/dolphinitemlistview.cpp b/src/views/dolphinitemlistview.cpp
index 60c8bb97c0777509b4ec41f0f4f561e7f5858b79..9e8fda650e37149f1a6d051d1514a2825ebbdb1d 100644 (file)
--- a/src/views/dolphinitemlistview.cpp
+++ b/src/views/dolphinitemlistview.cpp
@@ -19,22 +19,18 @@
 
 #include "dolphinitemlistview.h"
 
 
 #include "dolphinitemlistview.h"
 

+#include "dolphin_compactmodesettings.h"
+#include "dolphin_detailsmodesettings.h"

 #include "dolphin_generalsettings.h"
 #include "dolphin_iconsmodesettings.h"
 #include "dolphin_generalsettings.h"
 #include "dolphin_iconsmodesettings.h"

-#include "dolphin_detailsmodesettings.h"
-#include "dolphin_compactmodesettings.h"

 #include "dolphinfileitemlistwidget.h"
 #include "dolphinfileitemlistwidget.h"

-
-#include <kitemviews/kfileitemlistview.h>
-#include <kitemviews/kfileitemmodel.h>
-#include <kitemviews/kitemlistcontroller.h>
-#include <kitemviews/kitemliststyleoption.h>
-
-
-#include <views/viewmodecontroller.h>
-
+#include "kitemviews/kfileitemmodel.h"
+#include "kitemviews/kitemlistcontroller.h"
+#include "views/viewmodecontroller.h"

 #include "zoomlevelinfo.h"
 
 #include "zoomlevelinfo.h"
 

+#include <KIO/PreviewJob>
+

 
 DolphinItemListView::DolphinItemListView(QGraphicsWidget* parent) :
     KFileItemListView(parent),
 
 DolphinItemListView::DolphinItemListView(QGraphicsWidget* parent) :
     KFileItemListView(parent),


@@ -94,12 +90,8 @@ void DolphinItemListView::readSettings()
     updateGridSize();
 
     const KConfigGroup globalConfig(KSharedConfig::openConfig(), "PreviewSettings");
     updateGridSize();
 
     const KConfigGroup globalConfig(KSharedConfig::openConfig(), "PreviewSettings");

-    const QStringList plugins = globalConfig.readEntry("Plugins", QStringList()
-                                                       << "directorythumbnail"
-                                                       << "imagethumbnail"
-                                                       << "jpegthumbnail");
-    setEnabledPlugins(plugins);
-
+    setEnabledPlugins(globalConfig.readEntry("Plugins", KIO::PreviewJob::defaultPlugins()));
+    setLocalFileSizePreviewLimit(globalConfig.readEntry("MaximumSize", 0));

     endTransaction();
 }
 
     endTransaction();
 }
 


@@ -132,7 +124,7 @@ void DolphinItemListView::onItemLayoutChanged(ItemLayout current, ItemLayout pre
 
 void DolphinItemListView::onPreviewsShownChanged(bool shown)
 {
 
 void DolphinItemListView::onPreviewsShownChanged(bool shown)
 {

-    Q_UNUSED(shown);
+    Q_UNUSED(shown)

     updateGridSize();
 }
 
     updateGridSize();
 }
 


@@ -187,14 +179,6 @@ void DolphinItemListView::updateGridSize()
         const int minItemWidth = 48;
         itemWidth = minItemWidth + IconsModeSettings::textWidthIndex() * 64;
 
         const int minItemWidth = 48;
         itemWidth = minItemWidth + IconsModeSettings::textWidthIndex() * 64;
 

-        if (previewsShown()) {
-            // Optimize the width for previews with a 3:2 aspect ratio instead
-            // of a 1:1 ratio to avoid wasting too much vertical space when
-            // showing photos.
-            const int minWidth = iconSize * 3 / 2;
-            itemWidth = qMax(itemWidth, minWidth);
-        }
-

         if (itemWidth < iconSize + padding * 2) {
             itemWidth = iconSize + padding * 2;
         }
         if (itemWidth < iconSize + padding * 2) {
             itemWidth = iconSize + padding * 2;
         }