X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/c173de4c9ba5cd56a2fa0c2d37b63da5639f817a..48b58f830a585b773435c9af5ee2fe8f0c7c641d:/src/settings/general/previewssettingspage.cpp diff --git a/src/settings/general/previewssettingspage.cpp b/src/settings/general/previewssettingspage.cpp index 3c3211d47..1d6e922c8 100644 --- a/src/settings/general/previewssettingspage.cpp +++ b/src/settings/general/previewssettingspage.cpp @@ -21,58 +21,41 @@ #include "dolphin_generalsettings.h" #include "configurepreviewplugindialog.h" +#include "settings/serviceitemdelegate.h" +#include "settings/servicemodel.h" -#include -#include -#include -#include -#include +#include +#include #include -#include -#include -#include -#include - -#include -#include +#include #include #include #include -#include -#include -#include #include -#include -#include +#include // default settings namespace { - const bool UseThumbnails = true; - const int MaxLocalPreviewSize = 5; // 5 MB const int MaxRemotePreviewSize = 0; // 0 MB } PreviewsSettingsPage::PreviewsSettingsPage(QWidget* parent) : SettingsPageBase(parent), m_initialized(false), - m_listView(0), + m_listView(nullptr), m_enabledPreviewPlugins(), - m_localFileSizeBox(0), - m_remoteFileSizeBox(0) + m_remoteFileSizeBox(nullptr) { 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 +66,25 @@ PreviewsSettingsPage::PreviewsSettingsPage(QWidget* parent) : m_listView->setItemDelegate(delegate); m_listView->setVerticalScrollMode(QListView::ScrollPerPixel); - QVBoxLayout* listBoxLayout = new QVBoxLayout(listBox); - listBoxLayout->addWidget(m_listView); - - // 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: XX MByte", - "Local files above:"), this); - - m_localFileSizeBox = new KIntSpinBox(this); - m_localFileSizeBox->setSingleStep(1); - m_localFileSizeBox->setSuffix(QLatin1String(" MB")); - m_localFileSizeBox->setRange(0, 9999999); /* MB */ + QLabel* remoteFileSizeLabel = new QLabel(i18nc("@label", "Skip previews for remote files above:"), this); - QLabel* remoteFileSizeLabel = new QLabel(i18nc("@label Don't create previews for: 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->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(&QSpinBox::valueChanged), this, &PreviewsSettingsPage::changed); } PreviewsSettingsPage::~PreviewsSettingsPage() @@ -141,13 +107,9 @@ void PreviewsSettingsPage::applySettings() } } - KConfigGroup globalConfig(KGlobal::config(), QLatin1String("PreviewSettings")); + KConfigGroup globalConfig(KSharedConfig::openConfig(), QStringLiteral("PreviewSettings")); globalConfig.writeEntry("Plugins", m_enabledPreviewPlugins); - const qulonglong maximumLocalSize = static_cast(m_localFileSizeBox->value()) * 1024 * 1024; - globalConfig.writeEntry("MaximumSize", - maximumLocalSize, - KConfigBase::Normal | KConfigBase::Global); const qulonglong maximumRemoteSize = static_cast(m_remoteFileSizeBox->value()) * 1024 * 1024; globalConfig.writeEntry("MaximumRemoteSize", maximumRemoteSize, @@ -157,7 +119,6 @@ void PreviewsSettingsPage::applySettings() void PreviewsSettingsPage::restoreDefaults() { - m_localFileSizeBox->setValue(MaxLocalPreviewSize); m_remoteFileSizeBox->setValue(MaxRemotePreviewSize); } @@ -185,9 +146,9 @@ void PreviewsSettingsPage::loadPreviewPlugins() { QAbstractItemModel* model = m_listView->model(); - const KService::List plugins = KServiceTypeTrader::self()->query(QLatin1String("ThumbCreator")); - foreach (const KSharedPtr& 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()); model->insertRow(0); @@ -203,29 +164,8 @@ void PreviewsSettingsPage::loadPreviewPlugins() void PreviewsSettingsPage::loadSettings() { - KConfigGroup globalConfig(KGlobal::config(), "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 qulonglong defaultLocalPreview = static_cast(MaxLocalPreviewSize) * 1024 * 1024; - const qulonglong maxLocalByteSize = globalConfig.readEntry("MaximumSize", defaultLocalPreview); - const int maxLocalMByteSize = maxLocalByteSize / (1024 * 1024); - m_localFileSizeBox->setValue(maxLocalMByteSize); + const KConfigGroup globalConfig(KSharedConfig::openConfig(), QStringLiteral("PreviewSettings")); + m_enabledPreviewPlugins = globalConfig.readEntry("Plugins", KIO::PreviewJob::defaultPlugins()); const qulonglong defaultRemotePreview = static_cast(MaxRemotePreviewSize) * 1024 * 1024; const qulonglong maxRemoteByteSize = globalConfig.readEntry("MaximumRemoteSize", defaultRemotePreview); @@ -233,4 +173,3 @@ void PreviewsSettingsPage::loadSettings() m_remoteFileSizeBox->setValue(maxRemoteMByteSize); } -#include "previewssettingspage.moc"