DolphinView: use correct slot as trashjob results

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

diff --git a/src/views/dolphinitemlistview.cpp b/src/views/dolphinitemlistview.cpp
index a24e3134774cd86dbb05ffa27c321337af84b5de..8529f23a769965252bbc8a1d4c844a5a12b62f90 100644 (file)
--- a/src/views/dolphinitemlistview.cpp
+++ b/src/views/dolphinitemlistview.cpp
@@ -7,6 +7,7 @@
 #include "dolphinitemlistview.h"
 
 #include "dolphin_compactmodesettings.h"
+#include "dolphin_contentdisplaysettings.h"
 #include "dolphin_detailsmodesettings.h"
 #include "dolphin_generalsettings.h"
 #include "dolphin_iconsmodesettings.h"
@@ -21,7 +22,7 @@ DolphinItemListView::DolphinItemListView(QGraphicsWidget *parent)
     : KFileItemListView(parent)
     , m_zoomLevel(0)
 {
-    updateFont();
+    DolphinItemListView::updateFont();
     updateGridSize();
 }
 
@@ -81,6 +82,8 @@ void DolphinItemListView::readSettings()
     CompactModeSettings::self()->load();
     DetailsModeSettings::self()->load();
 
+    ContentDisplaySettings::self()->load();
+
     beginTransaction();
 
     setEnabledSelectionToggles(m_selectionTogglesEnabled);
@@ -90,7 +93,7 @@ void DolphinItemListView::readSettings()
     updateFont();
     updateGridSize();
 
-    const KConfigGroup globalConfig(KSharedConfig::openConfig(), "PreviewSettings");
+    const KConfigGroup globalConfig(KSharedConfig::openConfig(), QStringLiteral("PreviewSettings"));
     setEnabledPlugins(globalConfig.readEntry("Plugins", KIO::PreviewJob::defaultPlugins()));
     setLocalFileSizePreviewLimit(globalConfig.readEntry("MaximumSize", 0));
     endTransaction();
@@ -191,8 +194,9 @@ void DolphinItemListView::updateGridSize()
 
         itemHeight = padding * 3 + iconSize + option.fontMetrics.lineSpacing();
 
-        horizontalMargin = 4;
-        verticalMargin = 8;
+        const auto margin = style()->pixelMetric(QStyle::PM_SizeGripSize);
+        horizontalMargin = margin;
+        verticalMargin = margin;
         maxTextLines = IconsModeSettings::maximumTextLines();
         break;
     }
@@ -234,3 +238,5 @@ void DolphinItemListView::updateGridSize()
     setItemSize(QSizeF(itemWidth, itemHeight));
     endTransaction();
 }
+
+#include "moc_dolphinitemlistview.cpp"