Merge branch 'master' into kf6

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

diff --git a/src/settings/general/previewssettingspage.cpp b/src/settings/general/previewssettingspage.cpp
index 5d176f465ad0f8ae150f75c5a14d82c2e17c3b9e..7c63e94ba079a610dc6e6b54f9cbf86dc691214e 100644 (file)
--- a/src/settings/general/previewssettingspage.cpp
+++ b/src/settings/general/previewssettingspage.cpp
@@ -7,60 +7,54 @@
 #include "previewssettingspage.h"
 
 #include "dolphin_generalsettings.h"
 #include "previewssettingspage.h"
 
 #include "dolphin_generalsettings.h"

-#include "configurepreviewplugindialog.h"

 #include "settings/serviceitemdelegate.h"
 #include "settings/servicemodel.h"
 
 #include <KIO/PreviewJob>
 #include <KLocalizedString>
 #include "settings/serviceitemdelegate.h"
 #include "settings/servicemodel.h"
 
 #include <KIO/PreviewJob>
 #include <KLocalizedString>

-#include <KServiceTypeTrader>
+#include <KPluginMetaData>

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

-#include <QPainter>

 #include <QScroller>
 #include <QShowEvent>
 #include <QSortFilterProxyModel>
 #include <QSpinBox>
 
 // default settings
 #include <QScroller>
 #include <QShowEvent>
 #include <QSortFilterProxyModel>
 #include <QSpinBox>
 
 // default settings

-namespace {
-    const int DefaultMaxLocalPreviewSize = 0; // 0 MB
-    const int DefaultMaxRemotePreviewSize = 0; // 0 MB
+namespace
+{
+const int DefaultMaxLocalPreviewSize = 0; // 0 MB
+const int DefaultMaxRemotePreviewSize = 0; // 0 MB

 }
 
 }
 

-PreviewsSettingsPage::PreviewsSettingsPage(QWidget* parent) :
-    SettingsPageBase(parent),
-    m_initialized(false),
-    m_listView(nullptr),
-    m_enabledPreviewPlugins(),
-    m_localFileSizeBox(nullptr),
-    m_remoteFileSizeBox(nullptr)
+PreviewsSettingsPage::PreviewsSettingsPage(QWidget *parent)
+    : SettingsPageBase(parent)
+    , m_initialized(false)
+    , m_listView(nullptr)
+    , m_enabledPreviewPlugins()
+    , 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 in the view for:"), this);
+    QLabel *showPreviewsLabel = new QLabel(i18nc("@title:group", "Show previews in the view for:"), this);

 
     m_listView = new QListView(this);
     QScroller::grabGesture(m_listView->viewport(), QScroller::TouchGesture);
 
 
     m_listView = new QListView(this);
     QScroller::grabGesture(m_listView->viewport(), QScroller::TouchGesture);
 

-    ServiceItemDelegate* delegate = new ServiceItemDelegate(m_listView, m_listView);
-    connect(delegate, &ServiceItemDelegate::requestServiceConfiguration,
-            this, &PreviewsSettingsPage::configureService);
-
-    ServiceModel* serviceModel = new ServiceModel(this);
-    QSortFilterProxyModel* proxyModel = new QSortFilterProxyModel(this);
+    ServiceModel *serviceModel = new ServiceModel(this);
+    QSortFilterProxyModel *proxyModel = new QSortFilterProxyModel(this);

     proxyModel->setSourceModel(serviceModel);
     proxyModel->setSortRole(Qt::DisplayRole);
     proxyModel->setSortCaseSensitivity(Qt::CaseInsensitive);
 
     m_listView->setModel(proxyModel);
     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->setUniformItemSizes(true);
 
     m_listView->setVerticalScrollMode(QListView::ScrollPerPixel);
     m_listView->setUniformItemSizes(true);
 

-    QLabel* localFileSizeLabel = new QLabel(i18n("Skip previews for local files above:"), this);
+    QLabel *localFileSizeLabel = new QLabel(i18n("Skip previews for local files above:"), this);

 
     m_localFileSizeBox = new QSpinBox(this);
     m_localFileSizeBox->setSingleStep(1);
 
     m_localFileSizeBox = new QSpinBox(this);
     m_localFileSizeBox->setSingleStep(1);


@@ -68,12 +62,12 @@ PreviewsSettingsPage::PreviewsSettingsPage(QWidget* parent) :
     m_localFileSizeBox->setRange(0, 9999999); /* MB */
     m_localFileSizeBox->setSpecialValueText(i18n("No limit"));
 
     m_localFileSizeBox->setRange(0, 9999999); /* MB */
     m_localFileSizeBox->setSpecialValueText(i18n("No limit"));
 

-    QHBoxLayout* localFileSizeBoxLayout = new QHBoxLayout();
+    QHBoxLayout *localFileSizeBoxLayout = new QHBoxLayout();

     localFileSizeBoxLayout->addWidget(localFileSizeLabel);
     localFileSizeBoxLayout->addStretch(0);
     localFileSizeBoxLayout->addWidget(m_localFileSizeBox);
 
     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 QSpinBox(this);
     m_remoteFileSizeBox->setSingleStep(1);
 
     m_remoteFileSizeBox = new QSpinBox(this);
     m_remoteFileSizeBox->setSingleStep(1);


@@ -81,7 +75,7 @@ PreviewsSettingsPage::PreviewsSettingsPage(QWidget* parent) :
     m_remoteFileSizeBox->setRange(0, 9999999); /* MB */
     m_remoteFileSizeBox->setSpecialValueText(i18n("No previews"));
 
     m_remoteFileSizeBox->setRange(0, 9999999); /* MB */
     m_remoteFileSizeBox->setSpecialValueText(i18n("No previews"));
 

-    QHBoxLayout* remoteFileSizeBoxLayout = new QHBoxLayout();
+    QHBoxLayout *remoteFileSizeBoxLayout = new QHBoxLayout();

     remoteFileSizeBoxLayout->addWidget(remoteFileSizeLabel);
     remoteFileSizeBoxLayout->addStretch(0);
     remoteFileSizeBoxLayout->addWidget(m_remoteFileSizeBox);
     remoteFileSizeBoxLayout->addWidget(remoteFileSizeLabel);
     remoteFileSizeBoxLayout->addStretch(0);
     remoteFileSizeBoxLayout->addWidget(m_remoteFileSizeBox);


@@ -104,7 +98,7 @@ PreviewsSettingsPage::~PreviewsSettingsPage()
 
 void PreviewsSettingsPage::applySettings()
 {
 
 void PreviewsSettingsPage::applySettings()
 {

-    const QAbstractItemModel* model = m_listView->model();
+    const QAbstractItemModel *model = m_listView->model();

     const int rowCount = model->rowCount();
     if (rowCount > 0) {
         m_enabledPreviewPlugins.clear();
     const int rowCount = model->rowCount();
     if (rowCount > 0) {
         m_enabledPreviewPlugins.clear();


@@ -125,15 +119,11 @@ void PreviewsSettingsPage::applySettings()
         globalConfig.deleteEntry("MaximumSize", KConfigBase::Normal | KConfigBase::Global);
     } else {
         const qulonglong maximumLocalSize = static_cast<qulonglong>(m_localFileSizeBox->value()) * 1024 * 1024;
         globalConfig.deleteEntry("MaximumSize", KConfigBase::Normal | KConfigBase::Global);
     } else {
         const qulonglong maximumLocalSize = static_cast<qulonglong>(m_localFileSizeBox->value()) * 1024 * 1024;

-        globalConfig.writeEntry("MaximumSize",
-                                maximumLocalSize,
-                                KConfigBase::Normal | KConfigBase::Global);
+        globalConfig.writeEntry("MaximumSize", maximumLocalSize, KConfigBase::Normal | KConfigBase::Global);

     }
 
     const qulonglong maximumRemoteSize = static_cast<qulonglong>(m_remoteFileSizeBox->value()) * 1024 * 1024;
     }
 
     const qulonglong maximumRemoteSize = static_cast<qulonglong>(m_remoteFileSizeBox->value()) * 1024 * 1024;

-    globalConfig.writeEntry("MaximumRemoteSize",
-                            maximumRemoteSize,
-                            KConfigBase::Normal | KConfigBase::Global);
+    globalConfig.writeEntry("MaximumRemoteSize", maximumRemoteSize, KConfigBase::Normal | KConfigBase::Global);

 
     globalConfig.sync();
 }
 
     globalConfig.sync();
 }


@@ -144,7 +134,7 @@ void PreviewsSettingsPage::restoreDefaults()
     m_remoteFileSizeBox->setValue(DefaultMaxRemotePreviewSize);
 }
 
     m_remoteFileSizeBox->setValue(DefaultMaxRemotePreviewSize);
 }
 

-void PreviewsSettingsPage::showEvent(QShowEvent* event)
+void PreviewsSettingsPage::showEvent(QShowEvent *event)

 {
     if (!event->spontaneous() && !m_initialized) {
         loadPreviewPlugins();
 {
     if (!event->spontaneous() && !m_initialized) {
         loadPreviewPlugins();


@@ -153,32 +143,19 @@ void PreviewsSettingsPage::showEvent(QShowEvent* event)
     SettingsPageBase::showEvent(event);
 }
 
     SettingsPageBase::showEvent(event);
 }
 

-void PreviewsSettingsPage::configureService(const QModelIndex& index)
-{
-    const QAbstractItemModel* model = index.model();
-    const QString pluginName = model->data(index).toString();
-    const QString desktopEntryName = model->data(index, ServiceModel::DesktopEntryNameRole).toString();
-
-    ConfigurePreviewPluginDialog* dialog = new ConfigurePreviewPluginDialog(pluginName, desktopEntryName, this);
-    dialog->setAttribute(Qt::WA_DeleteOnClose);
-    dialog->show();
-}
-

 void PreviewsSettingsPage::loadPreviewPlugins()
 {
 void PreviewsSettingsPage::loadPreviewPlugins()
 {

-    QAbstractItemModel* model = m_listView->model();
+    QAbstractItemModel *model = m_listView->model();

 
 

-    const KService::List plugins = KServiceTypeTrader::self()->query(QStringLiteral("ThumbCreator"));
-    for (const KService::Ptr& service : plugins) {
-        const bool configurable = service->property(QStringLiteral("Configurable"), QVariant::Bool).toBool();
-        const bool show = m_enabledPreviewPlugins.contains(service->desktopEntryName());
+    const QVector<KPluginMetaData> plugins = KIO::PreviewJob::availableThumbnailerPlugins();
+    for (const KPluginMetaData &plugin : plugins) {
+        const bool show = m_enabledPreviewPlugins.contains(plugin.pluginId());

 
         model->insertRow(0);
         const QModelIndex index = model->index(0, 0);
         model->setData(index, show, Qt::CheckStateRole);
 
         model->insertRow(0);
         const QModelIndex index = model->index(0, 0);
         model->setData(index, show, Qt::CheckStateRole);

-        model->setData(index, configurable, ServiceModel::ConfigurableRole);
-        model->setData(index, service->name(), Qt::DisplayRole);
-        model->setData(index, service->desktopEntryName(), ServiceModel::DesktopEntryNameRole);
+        model->setData(index, plugin.name(), Qt::DisplayRole);
+        model->setData(index, plugin.pluginId(), ServiceModel::DesktopEntryNameRole);

     }
 
     model->sort(Qt::DisplayRole);
     }
 
     model->sort(Qt::DisplayRole);


@@ -199,3 +176,5 @@ void PreviewsSettingsPage::loadSettings()
     const int maxRemoteMByteSize = maxRemoteByteSize / (1024 * 1024);
     m_remoteFileSizeBox->setValue(maxRemoteMByteSize);
 }
     const int maxRemoteMByteSize = maxRemoteByteSize / (1024 * 1024);
     m_remoteFileSizeBox->setValue(maxRemoteMByteSize);
 }

+
+#include "moc_previewssettingspage.cpp"