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

[dolphin.git] / src / settings / general / previewssettingspage.cpp

diff --git a/src/settings/general/previewssettingspage.cpp b/src/settings/general/previewssettingspage.cpp
index bd087f1ea2c9c70e35353e861b93d2a5e3e02e3b..3e435b53c8b46d07475ca34c6e40358a09d74f8b 100644 (file)
--- a/src/settings/general/previewssettingspage.cpp
+++ b/src/settings/general/previewssettingspage.cpp
@@ -21,46 +21,38 @@
 
 #include "dolphin_generalsettings.h"
 #include "configurepreviewplugindialog.h"
 
 #include "dolphin_generalsettings.h"
 #include "configurepreviewplugindialog.h"

+#include "settings/serviceitemdelegate.h"
+#include "settings/servicemodel.h"

 
 

-#include <KConfigGroup>
-#include <KDialog>
-#include <KGlobal>
+#include <KIO/PreviewJob>

 #include <KLocalizedString>
 #include <KLocalizedString>

-#include <KNumInput>

 #include <KServiceTypeTrader>
 #include <KServiceTypeTrader>

-#include <KService>

 
 

-#include <settings/serviceitemdelegate.h>
-#include <settings/servicemodel.h>
-
-#include <QCheckBox>
-#include <QGroupBox>

 #include <QHBoxLayout>
 #include <QLabel>
 #include <QListView>
 #include <QPainter>
 #include <QHBoxLayout>
 #include <QLabel>
 #include <QListView>
 #include <QPainter>

-#include <QScrollBar>

 #include <QShowEvent>
 #include <QShowEvent>

-#include <QSlider>

 #include <QSortFilterProxyModel>
 #include <QSortFilterProxyModel>

-#include <QVBoxLayout>
+#include <QSpinBox>

 
 // default settings
 namespace {
 
 // default settings
 namespace {

-    const bool UseThumbnails = true;
-    const int MaxRemotePreviewSize = 0; // 0 MB
+    const int DefaultMaxLocalPreviewSize = 0; // 0 MB
+    const int DefaultMaxRemotePreviewSize = 0; // 0 MB

 }
 
 PreviewsSettingsPage::PreviewsSettingsPage(QWidget* parent) :
     SettingsPageBase(parent),
     m_initialized(false),
 }
 
 PreviewsSettingsPage::PreviewsSettingsPage(QWidget* parent) :
     SettingsPageBase(parent),
     m_initialized(false),

-    m_listView(0),
+    m_listView(nullptr),

     m_enabledPreviewPlugins(),
     m_enabledPreviewPlugins(),

-    m_remoteFileSizeBox(0)
+    m_localFileSizeBox(nullptr),
+    m_remoteFileSizeBox(nullptr)

 {
     QVBoxLayout* topLayout = new QVBoxLayout(this);
 
 {
     QVBoxLayout* topLayout = new QVBoxLayout(this);
 

-    QLabel* showPreviewsLabel = new QLabel(i18nc("@title:group", "Show previews for:"), this);
+    QLabel* showPreviewsLabel = new QLabel(i18nc("@title:group", "Show previews in the view for:"), this);

 
     m_listView = new QListView(this);
 
 
     m_listView = new QListView(this);
 


@@ -72,31 +64,48 @@ PreviewsSettingsPage::PreviewsSettingsPage(QWidget* parent) :
     QSortFilterProxyModel* proxyModel = new QSortFilterProxyModel(this);
     proxyModel->setSourceModel(serviceModel);
     proxyModel->setSortRole(Qt::DisplayRole);
     QSortFilterProxyModel* proxyModel = new QSortFilterProxyModel(this);
     proxyModel->setSourceModel(serviceModel);
     proxyModel->setSortRole(Qt::DisplayRole);

+    proxyModel->setSortCaseSensitivity(Qt::CaseInsensitive);

 
     m_listView->setModel(proxyModel);
     m_listView->setItemDelegate(delegate);
     m_listView->setVerticalScrollMode(QListView::ScrollPerPixel);
 
 
     m_listView->setModel(proxyModel);
     m_listView->setItemDelegate(delegate);
     m_listView->setVerticalScrollMode(QListView::ScrollPerPixel);
 

+    QLabel* localFileSizeLabel = new QLabel(i18n("Skip previews for local files above:"), this);
+
+    m_localFileSizeBox = new QSpinBox(this);
+    m_localFileSizeBox->setSingleStep(1);
+    m_localFileSizeBox->setSuffix(QStringLiteral(" MB"));
+    m_localFileSizeBox->setRange(0, 9999999); /* MB */
+    m_localFileSizeBox->setSpecialValueText(tr("No limit"));
+
+    QHBoxLayout* localFileSizeBoxLayout = new QHBoxLayout();
+    localFileSizeBoxLayout->addWidget(localFileSizeLabel);
+    localFileSizeBoxLayout->addStretch(0);
+    localFileSizeBoxLayout->addWidget(m_localFileSizeBox);
+

     QLabel* remoteFileSizeLabel = new QLabel(i18nc("@label", "Skip previews for remote files above:"), this);
 
     QLabel* remoteFileSizeLabel = new QLabel(i18nc("@label", "Skip previews for remote files above:"), this);
 

-    m_remoteFileSizeBox = new KIntSpinBox(this);
+    m_remoteFileSizeBox = new QSpinBox(this);

     m_remoteFileSizeBox->setSingleStep(1);
     m_remoteFileSizeBox->setSingleStep(1);

-    m_remoteFileSizeBox->setSuffix(QLatin1String(" MB"));
+    m_remoteFileSizeBox->setSuffix(QStringLiteral(" MB"));

     m_remoteFileSizeBox->setRange(0, 9999999); /* MB */
     m_remoteFileSizeBox->setRange(0, 9999999); /* MB */

+    m_remoteFileSizeBox->setSpecialValueText(tr("No previews"));

 
 

-    QHBoxLayout* fileSizeBoxLayout = new QHBoxLayout(this);
-    fileSizeBoxLayout->addWidget(remoteFileSizeLabel, 0, Qt::AlignRight);
-    fileSizeBoxLayout->addWidget(m_remoteFileSizeBox);
+    QHBoxLayout* remoteFileSizeBoxLayout = new QHBoxLayout();
+    remoteFileSizeBoxLayout->addWidget(remoteFileSizeLabel);
+    remoteFileSizeBoxLayout->addStretch(0);
+    remoteFileSizeBoxLayout->addWidget(m_remoteFileSizeBox);

 
 

-    topLayout->addSpacing(KDialog::spacingHint());

     topLayout->addWidget(showPreviewsLabel);
     topLayout->addWidget(m_listView);
     topLayout->addWidget(showPreviewsLabel);
     topLayout->addWidget(m_listView);

-    topLayout->addLayout(fileSizeBoxLayout);
+    topLayout->addLayout(localFileSizeBoxLayout);
+    topLayout->addLayout(remoteFileSizeBoxLayout);

 
     loadSettings();
 
     connect(m_listView, &QListView::clicked, this, &PreviewsSettingsPage::changed);
 
     loadSettings();
 
     connect(m_listView, &QListView::clicked, this, &PreviewsSettingsPage::changed);

-    connect(m_remoteFileSizeBox, static_cast<void(KIntSpinBox::*)(int)>(&KIntSpinBox::valueChanged), this, &PreviewsSettingsPage::changed);
+    connect(m_localFileSizeBox, QOverload<int>::of(&QSpinBox::valueChanged), this, &PreviewsSettingsPage::changed);
+    connect(m_remoteFileSizeBox, QOverload<int>::of(&QSpinBox::valueChanged), this, &PreviewsSettingsPage::changed);

 }
 
 PreviewsSettingsPage::~PreviewsSettingsPage()
 }
 
 PreviewsSettingsPage::~PreviewsSettingsPage()


@@ -119,9 +128,14 @@ void PreviewsSettingsPage::applySettings()
         }
     }
 
         }
     }
 

-    KConfigGroup globalConfig(KSharedConfig::openConfig(), QLatin1String("PreviewSettings"));
+    KConfigGroup globalConfig(KSharedConfig::openConfig(), QStringLiteral("PreviewSettings"));

     globalConfig.writeEntry("Plugins", m_enabledPreviewPlugins);
 
     globalConfig.writeEntry("Plugins", m_enabledPreviewPlugins);
 

+    const qulonglong maximumLocalSize = static_cast<qulonglong>(m_localFileSizeBox->value()) * 1024 * 1024;
+    globalConfig.writeEntry("MaximumSize",
+                            maximumLocalSize,
+                            KConfigBase::Normal | KConfigBase::Global);
+

     const qulonglong maximumRemoteSize = static_cast<qulonglong>(m_remoteFileSizeBox->value()) * 1024 * 1024;
     globalConfig.writeEntry("MaximumRemoteSize",
                             maximumRemoteSize,
     const qulonglong maximumRemoteSize = static_cast<qulonglong>(m_remoteFileSizeBox->value()) * 1024 * 1024;
     globalConfig.writeEntry("MaximumRemoteSize",
                             maximumRemoteSize,


@@ -131,7 +145,8 @@ void PreviewsSettingsPage::applySettings()
 
 void PreviewsSettingsPage::restoreDefaults()
 {
 
 void PreviewsSettingsPage::restoreDefaults()
 {

-    m_remoteFileSizeBox->setValue(MaxRemotePreviewSize);
+    m_localFileSizeBox->setValue(DefaultMaxLocalPreviewSize);
+    m_remoteFileSizeBox->setValue(DefaultMaxRemotePreviewSize);

 }
 
 void PreviewsSettingsPage::showEvent(QShowEvent* event)
 }
 
 void PreviewsSettingsPage::showEvent(QShowEvent* event)


@@ -158,9 +173,9 @@ void PreviewsSettingsPage::loadPreviewPlugins()
 {
     QAbstractItemModel* model = m_listView->model();
 
 {
     QAbstractItemModel* model = m_listView->model();
 

-    const KService::List plugins = KServiceTypeTrader::self()->query(QLatin1String("ThumbCreator"));
+    const KService::List plugins = KServiceTypeTrader::self()->query(QStringLiteral("ThumbCreator"));

     foreach (const KService::Ptr& service, plugins) {
     foreach (const KService::Ptr& service, plugins) {

-        const bool configurable = service->property("Configurable", QVariant::Bool).toBool();
+        const bool configurable = service->property(QStringLiteral("Configurable"), QVariant::Bool).toBool();

         const bool show = m_enabledPreviewPlugins.contains(service->desktopEntryName());
 
         model->insertRow(0);
         const bool show = m_enabledPreviewPlugins.contains(service->desktopEntryName());
 
         model->insertRow(0);


@@ -176,28 +191,16 @@ void PreviewsSettingsPage::loadPreviewPlugins()
 
 void PreviewsSettingsPage::loadSettings()
 {
 
 void PreviewsSettingsPage::loadSettings()
 {

-    KConfigGroup globalConfig(KSharedConfig::openConfig(), "PreviewSettings");
-    m_enabledPreviewPlugins = globalConfig.readEntry("Plugins", QStringList()
-                                                     << QLatin1String("directorythumbnail")
-                                                     << QLatin1String("imagethumbnail")
-                                                     << QLatin1String("jpegthumbnail"));
-
-    // If the user is upgrading from KDE <= 4.6, we must check if he had the 'jpegrotatedthumbnail' plugin enabled.
-    // This plugin does not exist any more in KDE >= 4.7, so we have to replace it with the 'jpegthumbnail' plugin.
-    //
-    // Note that the upgrade to the correct plugin is done already in KFilePreviewGenerator. However, if Konqueror is
-    // opened in web browsing mode and the Settings dialog is opened, we might end up here before KFilePreviewGenerator's
-    // constructor is ever called -> the plugin replacement should be done here as well.
-    if (m_enabledPreviewPlugins.contains(QLatin1String("jpegrotatedthumbnail"))) {
-        m_enabledPreviewPlugins.removeAll(QLatin1String("jpegrotatedthumbnail"));
-        m_enabledPreviewPlugins.append(QLatin1String("jpegthumbnail"));
-        globalConfig.writeEntry("Plugins", m_enabledPreviewPlugins);
-        globalConfig.sync();
-    }
+    const KConfigGroup globalConfig(KSharedConfig::openConfig(), QStringLiteral("PreviewSettings"));
+    m_enabledPreviewPlugins = globalConfig.readEntry("Plugins", KIO::PreviewJob::defaultPlugins());

 
 

-    const qulonglong defaultRemotePreview = static_cast<qulonglong>(MaxRemotePreviewSize) * 1024 * 1024;
+    const qulonglong defaultLocalPreview = static_cast<qulonglong>(DefaultMaxLocalPreviewSize) * 1024 * 1024;
+    const qulonglong maxLocalByteSize = globalConfig.readEntry("MaximumSize", defaultLocalPreview);
+    const int maxLocalMByteSize = maxLocalByteSize / (1024 * 1024);
+    m_localFileSizeBox->setValue(maxLocalMByteSize);
+
+    const qulonglong defaultRemotePreview = static_cast<qulonglong>(DefaultMaxRemotePreviewSize) * 1024 * 1024;

     const qulonglong maxRemoteByteSize = globalConfig.readEntry("MaximumRemoteSize", defaultRemotePreview);
     const int maxRemoteMByteSize = maxRemoteByteSize / (1024 * 1024);
     m_remoteFileSizeBox->setValue(maxRemoteMByteSize);
 }
     const qulonglong maxRemoteByteSize = globalConfig.readEntry("MaximumRemoteSize", defaultRemotePreview);
     const int maxRemoteMByteSize = maxRemoteByteSize / (1024 * 1024);
     m_remoteFileSizeBox->setValue(maxRemoteMByteSize);
 }

-