Port to new KStandardAction slot syntax

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

diff --git a/src/views/dolphinitemlistview.cpp b/src/views/dolphinitemlistview.cpp
index eb61ccb21fa4986eff79fe6645379b0d1f473ff5..a3740cb261c92be1d5fc77d6f61641a2551d7f08 100644 (file)
--- a/src/views/dolphinitemlistview.cpp
+++ b/src/views/dolphinitemlistview.cpp
@@ -30,7 +30,6 @@
 #include <kitemviews/kitemlistcontroller.h>
 #include <kitemviews/kitemliststyleoption.h>
 
 #include <kitemviews/kitemlistcontroller.h>
 #include <kitemviews/kitemliststyleoption.h>
 

-#include <KGlobalSettings>

 
 #include <views/viewmodecontroller.h>
 
 
 #include <views/viewmodecontroller.h>
 


@@ -94,11 +93,11 @@ void DolphinItemListView::readSettings()
     updateFont();
     updateGridSize();
 
     updateFont();
     updateGridSize();
 

-    const KConfigGroup globalConfig(KGlobal::config(), "PreviewSettings");
+    const KConfigGroup globalConfig(KSharedConfig::openConfig(), "PreviewSettings");

     const QStringList plugins = globalConfig.readEntry("Plugins", QStringList()
     const QStringList plugins = globalConfig.readEntry("Plugins", QStringList()

-                                                       << "directorythumbnail"
-                                                       << "imagethumbnail"
-                                                       << "jpegthumbnail");
+                                                       << QStringLiteral("directorythumbnail")
+                                                       << QStringLiteral("imagethumbnail")
+                                                       << QStringLiteral("jpegthumbnail"));

     setEnabledPlugins(plugins);
 
     endTransaction();
     setEnabledPlugins(plugins);
 
     endTransaction();


@@ -106,9 +105,9 @@ void DolphinItemListView::readSettings()
 
 void DolphinItemListView::writeSettings()
 {
 
 void DolphinItemListView::writeSettings()
 {

-    IconsModeSettings::self()->writeConfig();
-    CompactModeSettings::self()->writeConfig();
-    DetailsModeSettings::self()->writeConfig();
+    IconsModeSettings::self()->save();
+    CompactModeSettings::self()->save();
+    DetailsModeSettings::self()->save();

 }
 
 KItemListWidgetCreatorBase* DolphinItemListView::defaultWidgetCreator() const
 }
 
 KItemListWidgetCreatorBase* DolphinItemListView::defaultWidgetCreator() const


@@ -180,7 +179,8 @@ void DolphinItemListView::updateGridSize()
     // Calculate the item-width and item-height
     int itemWidth;
     int itemHeight;
     // Calculate the item-width and item-height
     int itemWidth;
     int itemHeight;

-    QSize maxTextSize;
+    int maxTextLines = 0;
+    int maxTextWidth = 0;

 
     switch (itemLayout()) {
     case KFileItemListView::IconsLayout: {
 
     switch (itemLayout()) {
     case KFileItemListView::IconsLayout: {


@@ -200,16 +200,10 @@ void DolphinItemListView::updateGridSize()
         }
 
         itemHeight = padding * 3 + iconSize + option.fontMetrics.lineSpacing();
         }
 
         itemHeight = padding * 3 + iconSize + option.fontMetrics.lineSpacing();

-        if (IconsModeSettings::maximumTextLines() > 0) {
-            // A restriction is given for the maximum number of textlines (0 means
-            // having no restriction)
-            const int additionalInfoCount = visibleRoles().count() - 1;
-            const int maxAdditionalLines = additionalInfoCount + IconsModeSettings::maximumTextLines();
-            maxTextSize.rheight() = option.fontMetrics.lineSpacing() * maxAdditionalLines;
-        }

 
         horizontalMargin = 4;
         verticalMargin = 8;
 
         horizontalMargin = 4;
         verticalMargin = 8;

+        maxTextLines = IconsModeSettings::maximumTextLines();

         break;
     }
     case KFileItemListView::CompactLayout: {
         break;
     }
     case KFileItemListView::CompactLayout: {


@@ -220,8 +214,7 @@ void DolphinItemListView::updateGridSize()
         if (CompactModeSettings::maximumTextWidthIndex() > 0) {
             // A restriction is given for the maximum width of the text (0 means
             // having no restriction)
         if (CompactModeSettings::maximumTextWidthIndex() > 0) {
             // A restriction is given for the maximum width of the text (0 means
             // having no restriction)

-            maxTextSize.rwidth() = option.fontMetrics.height() * 10 *
-                                   CompactModeSettings::maximumTextWidthIndex();
+            maxTextWidth = option.fontMetrics.height() * 10 * CompactModeSettings::maximumTextWidthIndex();

         }
 
         horizontalMargin = 8;
         }
 
         horizontalMargin = 8;


@@ -244,7 +237,8 @@ void DolphinItemListView::updateGridSize()
     option.horizontalMargin = horizontalMargin;
     option.verticalMargin = verticalMargin;
     option.iconSize = iconSize;
     option.horizontalMargin = horizontalMargin;
     option.verticalMargin = verticalMargin;
     option.iconSize = iconSize;

-    option.maxTextSize = maxTextSize;
+    option.maxTextLines = maxTextLines;
+    option.maxTextWidth = maxTextWidth;

     beginTransaction();
     setStyleOption(option);
     setItemSize(QSizeF(itemWidth, itemHeight));
     beginTransaction();
     setStyleOption(option);
     setItemSize(QSizeF(itemWidth, itemHeight));


@@ -267,4 +261,3 @@ ViewModeSettings::ViewMode DolphinItemListView::viewMode() const
     return mode;
 }
 
     return mode;
 }
 

-#include "dolphinitemlistview.moc"