X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/1b2b63eb3a01025e03ff964f187adda52c62bcb3..5454283008f2:/src/settings/general/previewssettingspage.cpp

diff --git a/src/settings/general/previewssettingspage.cpp b/src/settings/general/previewssettingspage.cpp
index 679494c67..1a92cd16c 100644
--- a/src/settings/general/previewssettingspage.cpp
+++ b/src/settings/general/previewssettingspage.cpp
@@ -23,33 +23,28 @@
 #include "configurepreviewplugindialog.h"
 
 #include <KConfigGroup>
-#include <KDialog>
-#include <KGlobal>
-#include <KLocale>
-#include <KNumInput>
+#include <KLocalizedString>
 #include <KServiceTypeTrader>
 #include <KService>
 
-#include <settings/dolphinsettings.h>
 #include <settings/serviceitemdelegate.h>
 #include <settings/servicemodel.h>
 
 #include <QCheckBox>
 #include <QGroupBox>
+#include <QHBoxLayout>
 #include <QLabel>
 #include <QListView>
 #include <QPainter>
 #include <QScrollBar>
 #include <QShowEvent>
 #include <QSlider>
+#include <QSpinBox>
 #include <QSortFilterProxyModel>
-#include <QGridLayout>
 #include <QVBoxLayout>
 
 // default settings
 namespace {
-    const bool UseThumbnails = true;
-    const int MaxLocalPreviewSize = 5;  // 5 MB
     const int MaxRemotePreviewSize = 0; // 0 MB
 }
 
@@ -58,21 +53,17 @@ PreviewsSettingsPage::PreviewsSettingsPage(QWidget* parent) :
     m_initialized(false),
     m_listView(0),
     m_enabledPreviewPlugins(),
-    m_localFileSizeBox(0),
     m_remoteFileSizeBox(0)
 {
     QVBoxLayout* topLayout = new QVBoxLayout(this);
-    topLayout->setSpacing(KDialog::spacingHint());
-    topLayout->setMargin(KDialog::marginHint());
 
-    // Create group box "Show previews for:"
-    QGroupBox* listBox = new QGroupBox(i18nc("@title:group", "Show previews for"), this);
+    QLabel* showPreviewsLabel = new QLabel(i18nc("@title:group", "Show previews for:"), this);
 
     m_listView = new QListView(this);
 
     ServiceItemDelegate* delegate = new ServiceItemDelegate(m_listView, m_listView);
-    connect(delegate, SIGNAL(requestServiceConfiguration(QModelIndex)),
-            this, SLOT(configureService(QModelIndex)));
+    connect(delegate, &ServiceItemDelegate::requestServiceConfiguration,
+            this, &PreviewsSettingsPage::configureService);
 
     ServiceModel* serviceModel = new ServiceModel(this);
     QSortFilterProxyModel* proxyModel = new QSortFilterProxyModel(this);
@@ -83,42 +74,25 @@ PreviewsSettingsPage::PreviewsSettingsPage(QWidget* parent) :
     m_listView->setItemDelegate(delegate);
     m_listView->setVerticalScrollMode(QListView::ScrollPerPixel);
 
-    QVBoxLayout* listBoxLayout = new QVBoxLayout(listBox);
-    listBoxLayout->addWidget(m_listView);
+    QLabel* remoteFileSizeLabel = new QLabel(i18nc("@label", "Skip previews for remote files above:"), this);
 
-    // Create group box "Don't create previews for"
-    QGroupBox* fileSizeBox = new QGroupBox(i18nc("@title:group", "Do not create previews for"), this);
-
-    QLabel* localFileSizeLabel = new QLabel(i18nc("@label Don't create previews for: <Local files above:> XX MByte",
-                                                  "Local files above:"), this);
-
-    m_localFileSizeBox = new KIntSpinBox(this);
-    m_localFileSizeBox->setSingleStep(1);
-    m_localFileSizeBox->setSuffix(QLatin1String(" MB"));
-    m_localFileSizeBox->setRange(0, 9999); /* MB */
-
-    QLabel* remoteFileSizeLabel = new QLabel(i18nc("@label Don't create previews for: <Remote files above:> XX MByte",
-                                                   "Remote files above:"), this);
-
-    m_remoteFileSizeBox = new KIntSpinBox(this);
+    m_remoteFileSizeBox = new QSpinBox(this);
     m_remoteFileSizeBox->setSingleStep(1);
-    m_remoteFileSizeBox->setSuffix(QLatin1String(" MB"));
-    m_remoteFileSizeBox->setRange(0, 9999); /* MB */
+    m_remoteFileSizeBox->setSuffix(QStringLiteral(" MB"));
+    m_remoteFileSizeBox->setRange(0, 9999999); /* MB */
 
-    QGridLayout* fileSizeBoxLayout = new QGridLayout(fileSizeBox);
-    fileSizeBoxLayout->addWidget(localFileSizeLabel, 0, 0, Qt::AlignRight);
-    fileSizeBoxLayout->addWidget(m_localFileSizeBox, 0, 1);
-    fileSizeBoxLayout->addWidget(remoteFileSizeLabel, 1, 0, Qt::AlignRight);
-    fileSizeBoxLayout->addWidget(m_remoteFileSizeBox, 1, 1);
+    QHBoxLayout* fileSizeBoxLayout = new QHBoxLayout();
+    fileSizeBoxLayout->addWidget(remoteFileSizeLabel, 0, Qt::AlignRight);
+    fileSizeBoxLayout->addWidget(m_remoteFileSizeBox);
 
-    topLayout->addWidget(listBox);
-    topLayout->addWidget(fileSizeBox);
+    topLayout->addWidget(showPreviewsLabel);
+    topLayout->addWidget(m_listView);
+    topLayout->addLayout(fileSizeBoxLayout);
 
     loadSettings();
 
-    connect(m_listView, SIGNAL(clicked(QModelIndex)), this, SIGNAL(changed()));
-    connect(m_localFileSizeBox, SIGNAL(valueChanged(int)), this, SIGNAL(changed()));
-    connect(m_remoteFileSizeBox, SIGNAL(valueChanged(int)), this, SIGNAL(changed()));
+    connect(m_listView, &QListView::clicked, this, &PreviewsSettingsPage::changed);
+    connect(m_remoteFileSizeBox, static_cast<void(QSpinBox::*)(int)>(&QSpinBox::valueChanged), this, &PreviewsSettingsPage::changed);
 }
 
 PreviewsSettingsPage::~PreviewsSettingsPage()
@@ -141,21 +115,18 @@ void PreviewsSettingsPage::applySettings()
         }
     }
 
-    KConfigGroup globalConfig(KGlobal::config(), QLatin1String("PreviewSettings"));
+    KConfigGroup globalConfig(KSharedConfig::openConfig(), QStringLiteral("PreviewSettings"));
     globalConfig.writeEntry("Plugins", m_enabledPreviewPlugins);
 
-    globalConfig.writeEntry("MaximumSize",
-                            m_localFileSizeBox->value() * 1024 * 1024,
-                            KConfigBase::Normal | KConfigBase::Global);
+    const qulonglong maximumRemoteSize = static_cast<qulonglong>(m_remoteFileSizeBox->value()) * 1024 * 1024;
     globalConfig.writeEntry("MaximumRemoteSize",
-                            m_remoteFileSizeBox->value() * 1024 * 1024,
+                            maximumRemoteSize,
                             KConfigBase::Normal | KConfigBase::Global);
     globalConfig.sync();
 }
 
 void PreviewsSettingsPage::restoreDefaults()
 {
-    m_localFileSizeBox->setValue(MaxLocalPreviewSize);
     m_remoteFileSizeBox->setValue(MaxRemotePreviewSize);
 }
 
@@ -183,22 +154,10 @@ void PreviewsSettingsPage::loadPreviewPlugins()
 {
     QAbstractItemModel* model = m_listView->model();
 
-    const KService::List plugins = KServiceTypeTrader::self()->query(QLatin1String("ThumbCreator"));
-    foreach (const KSharedPtr<KService>& service, plugins) {
-        const bool configurable = service->property("Configurable", QVariant::Bool).toBool();
+    const KService::List plugins = KServiceTypeTrader::self()->query(QStringLiteral("ThumbCreator"));
+    foreach (const KService::Ptr& service, plugins) {
+        const bool configurable = service->property(QStringLiteral("Configurable"), QVariant::Bool).toBool();
         const bool show = m_enabledPreviewPlugins.contains(service->desktopEntryName());
-        if (service->desktopEntryName() == QLatin1String("jpegrotatedthumbnail")) {
-            // Before KDE SC 4.7 thumbnail plugins where not configurable and in addition to
-            // the jpegthumbnail-plugin a jpegrotatedthumbnail-plugin was offered. Make this
-            // plugin obsolete for users that updated from a previous KDE SC version:
-            if (show) {
-                m_enabledPreviewPlugins.removeOne(service->desktopEntryName());
-                KConfigGroup globalConfig(KGlobal::config(), QLatin1String("PreviewSettings"));
-                globalConfig.writeEntry("Plugins", m_enabledPreviewPlugins);
-                globalConfig.sync();
-            }
-            continue;
-        }
 
         model->insertRow(0);
         const QModelIndex index = model->index(0, 0);
@@ -213,19 +172,15 @@ void PreviewsSettingsPage::loadPreviewPlugins()
 
 void PreviewsSettingsPage::loadSettings()
 {
-    KConfigGroup globalConfig(KGlobal::config(), "PreviewSettings");
+    KConfigGroup globalConfig(KSharedConfig::openConfig(), "PreviewSettings");
     m_enabledPreviewPlugins = globalConfig.readEntry("Plugins", QStringList()
-                                                     << QLatin1String("directorythumbnail")
-                                                     << QLatin1String("imagethumbnail")
-                                                     << QLatin1String("jpegthumbnail"));
-
-    const int maxLocalByteSize = globalConfig.readEntry("MaximumSize", MaxLocalPreviewSize * 1024 * 1024);
-    const int maxLocalMByteSize = maxLocalByteSize / (1024 * 1024);
-    m_localFileSizeBox->setValue(maxLocalMByteSize);
+                                                     << QStringLiteral("directorythumbnail")
+                                                     << QStringLiteral("imagethumbnail")
+                                                     << QStringLiteral("jpegthumbnail"));
 
-    const int maxRemoteByteSize = globalConfig.readEntry("MaximumRemoteSize", MaxRemotePreviewSize * 1024 * 1024);
+    const qulonglong defaultRemotePreview = static_cast<qulonglong>(MaxRemotePreviewSize) * 1024 * 1024;
+    const qulonglong maxRemoteByteSize = globalConfig.readEntry("MaximumRemoteSize", defaultRemotePreview);
     const int maxRemoteMByteSize = maxRemoteByteSize / (1024 * 1024);
     m_remoteFileSizeBox->setValue(maxRemoteMByteSize);
 }
 
-#include "previewssettingspage.moc"