X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/d93d198db6eef9186177aa5a918b300a6b749627..8eb9b508ca87fb1d634d8b8ba62c054ed04466d2:/src/settings/general/previewssettingspage.cpp

diff --git a/src/settings/general/previewssettingspage.cpp b/src/settings/general/previewssettingspage.cpp
index 1059e8547..1333df5e9 100644
--- a/src/settings/general/previewssettingspage.cpp
+++ b/src/settings/general/previewssettingspage.cpp
@@ -21,13 +21,13 @@
 
 #include "dolphin_generalsettings.h"
 
-#include <kconfiggroup.h>
-#include <kdialog.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <KConfigGroup>
+#include <KDialog>
+#include <KGlobal>
+#include <KLocale>
 #include <KNumInput>
 #include <kservicetypetrader.h>
-#include <kservice.h>
+#include <KService>
 
 #include <settings/dolphinsettings.h>
 
@@ -65,8 +65,6 @@ PreviewsSettingsPage::PreviewsSettingsPage(QWidget* parent) :
     m_previewPluginsList = new QListWidget(this);
     m_previewPluginsList->setSortingEnabled(true);
     m_previewPluginsList->setSelectionMode(QAbstractItemView::NoSelection);
-    connect(m_previewPluginsList, SIGNAL(itemClicked(QListWidgetItem*)),
-            this, SIGNAL(changed()));
 
     QVBoxLayout* listBoxLayout = new QVBoxLayout(listBox);
     listBoxLayout->addWidget(m_previewPluginsList);
@@ -81,8 +79,6 @@ PreviewsSettingsPage::PreviewsSettingsPage(QWidget* parent) :
     m_localFileSizeBox->setSingleStep(1);
     m_localFileSizeBox->setSuffix(QLatin1String(" MB"));
     m_localFileSizeBox->setRange(0, 9999); /* MB */
-    connect(m_localFileSizeBox, SIGNAL(valueChanged(int)),
-            this, SIGNAL(changed()));
 
     QLabel* remoteFileSizeLabel = new QLabel(i18nc("@label Don't create previews for: <Remote files above:> XX MByte",
                                                    "Remote files above:"), this);
@@ -91,8 +87,6 @@ PreviewsSettingsPage::PreviewsSettingsPage(QWidget* parent) :
     m_remoteFileSizeBox->setSingleStep(1);
     m_remoteFileSizeBox->setSuffix(QLatin1String(" MB"));
     m_remoteFileSizeBox->setRange(0, 9999); /* MB */
-    connect(m_remoteFileSizeBox, SIGNAL(valueChanged(int)),
-            this, SIGNAL(changed()));
 
     QGridLayout* fileSizeBoxLayout = new QGridLayout(fileSizeBox);
     fileSizeBoxLayout->addWidget(localFileSizeLabel, 0, 0, Qt::AlignRight);
@@ -104,6 +98,10 @@ PreviewsSettingsPage::PreviewsSettingsPage(QWidget* parent) :
     topLayout->addWidget(fileSizeBox);
 
     loadSettings();
+
+    connect(m_previewPluginsList, SIGNAL(itemClicked(QListWidgetItem*)), this, SIGNAL(changed()));
+    connect(m_localFileSizeBox, SIGNAL(valueChanged(int)), this, SIGNAL(changed()));
+    connect(m_remoteFileSizeBox, SIGNAL(valueChanged(int)), this, SIGNAL(changed()));
 }
 
 
@@ -113,13 +111,15 @@ PreviewsSettingsPage::~PreviewsSettingsPage()
 
 void PreviewsSettingsPage::applySettings()
 {
-    m_enabledPreviewPlugins.clear();
     const int count = m_previewPluginsList->count();
-    for (int i = 0; i < count; ++i) {
-        const QListWidgetItem* item = m_previewPluginsList->item(i);
-        if (item->checkState() == Qt::Checked) {
-            const QString enabledPlugin = item->data(Qt::UserRole).toString();
-            m_enabledPreviewPlugins.append(enabledPlugin);
+    if (count > 0) {
+        m_enabledPreviewPlugins.clear();
+        for (int i = 0; i < count; ++i) {
+            const QListWidgetItem* item = m_previewPluginsList->item(i);
+            if (item->checkState() == Qt::Checked) {
+                const QString enabledPlugin = item->data(Qt::UserRole).toString();
+                m_enabledPreviewPlugins.append(enabledPlugin);
+            }
         }
     }
 
@@ -168,7 +168,7 @@ void PreviewsSettingsPage::loadSettings()
     m_enabledPreviewPlugins = globalConfig.readEntry("Plugins", QStringList()
                                                      << QLatin1String("directorythumbnail")
                                                      << QLatin1String("imagethumbnail")
-                                                     << QLatin1String("jpegthumbnail"));
+                                                     << QLatin1String("jpegrotatedthumbnail"));
 
     const int maxLocalByteSize = globalConfig.readEntry("MaximumSize", MaxLocalPreviewSize * 1024 * 1024);
     const int maxLocalMByteSize = maxLocalByteSize / (1024 * 1024);