X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/489b56b68bb29e81337e115c490eea4403001b71..44fe65d42110cc200bcb2ce494a026c6a6292c2d:/src/settings/interface/previewssettingspage.cpp diff --git a/src/settings/interface/previewssettingspage.cpp b/src/settings/interface/previewssettingspage.cpp index ef98d0f8d..fbdcc80f6 100644 --- a/src/settings/interface/previewssettingspage.cpp +++ b/src/settings/interface/previewssettingspage.cpp @@ -6,15 +6,16 @@ #include "previewssettingspage.h" -#include "configurepreviewplugindialog.h" #include "dolphin_generalsettings.h" -#include "settings/serviceitemdelegate.h" #include "settings/servicemodel.h" +#include #include #include #include +#include +#include #include #include #include @@ -28,6 +29,7 @@ namespace { const int DefaultMaxLocalPreviewSize = 0; // 0 MB const int DefaultMaxRemotePreviewSize = 0; // 0 MB +const bool EnableRemoteFolderThumbnail = false; } PreviewsSettingsPage::PreviewsSettingsPage(QWidget *parent) @@ -37,6 +39,7 @@ PreviewsSettingsPage::PreviewsSettingsPage(QWidget *parent) , m_enabledPreviewPlugins() , m_localFileSizeBox(nullptr) , m_remoteFileSizeBox(nullptr) + , m_enableRemoteFolderThumbnail(nullptr) { QVBoxLayout *topLayout = new QVBoxLayout(this); @@ -45,12 +48,6 @@ PreviewsSettingsPage::PreviewsSettingsPage(QWidget *parent) m_listView = new QListView(this); QScroller::grabGesture(m_listView->viewport(), QScroller::TouchGesture); -#if KIOWIDGETS_BUILD_DEPRECATED_SINCE(5, 87) - ServiceItemDelegate *delegate = new ServiceItemDelegate(m_listView, m_listView); - connect(delegate, &ServiceItemDelegate::requestServiceConfiguration, this, &PreviewsSettingsPage::configureService); - m_listView->setItemDelegate(delegate); -#endif - ServiceModel *serviceModel = new ServiceModel(this); QSortFilterProxyModel *proxyModel = new QSortFilterProxyModel(this); proxyModel->setSourceModel(serviceModel); @@ -61,42 +58,81 @@ PreviewsSettingsPage::PreviewsSettingsPage(QWidget *parent) m_listView->setVerticalScrollMode(QListView::ScrollPerPixel); m_listView->setUniformItemSizes(true); - QLabel *localFileSizeLabel = new QLabel(i18n("Skip previews for local files above:"), this); + // i18n: This label forms a full sentence together with the spinbox content. + // Depending on the option chosen in the spinbox, it reads "Show previews for [files below n MiB]" + // or "Show previews for [files of any size]". + QLabel *localFileSizeLabel = new QLabel(i18nc("@label:spinbox", "Show previews for"), this); m_localFileSizeBox = new QSpinBox(this); m_localFileSizeBox->setSingleStep(1); + m_localFileSizeBox->setPrefix(i18nc("used as a prefix in a spinbox showing e.g. 'Show previews for [files below 3 MiB]'", "files below ")); m_localFileSizeBox->setSuffix(i18nc("Mebibytes; used as a suffix in a spinbox showing e.g. '3 MiB'", " MiB")); m_localFileSizeBox->setRange(0, 9999999); /* MB */ - m_localFileSizeBox->setSpecialValueText(i18n("No limit")); + m_localFileSizeBox->setSpecialValueText(i18nc("e.g. 'Show previews for [files of any size]'", "files of any size")); 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:spinbox", "Show previews for"), this); m_remoteFileSizeBox = new QSpinBox(this); m_remoteFileSizeBox->setSingleStep(1); + m_remoteFileSizeBox->setPrefix(i18nc("used as a prefix in a spinbox showing e.g. 'Show previews for [files below 3 MiB]'", "files below ")); m_remoteFileSizeBox->setSuffix(i18nc("Mebibytes; used as a suffix in a spinbox showing e.g. '3 MiB'", " MiB")); m_remoteFileSizeBox->setRange(0, 9999999); /* MB */ - m_remoteFileSizeBox->setSpecialValueText(i18n("No previews")); + m_remoteFileSizeBox->setSpecialValueText(i18nc("e.g. 'Show previews for [no file]'", "no file")); QHBoxLayout *remoteFileSizeBoxLayout = new QHBoxLayout(); remoteFileSizeBoxLayout->addWidget(remoteFileSizeLabel); - remoteFileSizeBoxLayout->addStretch(0); remoteFileSizeBoxLayout->addWidget(m_remoteFileSizeBox); + // Enable remote folder thumbnail option + m_enableRemoteFolderThumbnail = new QCheckBox(i18nc("@option:check", "Show previews for folders"), this); + + // Make the "Enable preview for remote folder" enabled only when "Remote file limit" is superior to 0 + m_enableRemoteFolderThumbnail->setEnabled(m_remoteFileSizeBox->value() > 0); + connect(m_remoteFileSizeBox, &QSpinBox::valueChanged, this, [this](int i) { + m_enableRemoteFolderThumbnail->setEnabled(i > 0); + }); + + const auto helpButtonInfo = xi18nc("@info", + "Creating previews for remote folders is " + "very intensive in terms of network resource usage." + "Disable this if navigating remote folders in Dolphin " + "is slow or when accessing storage over metered connections."); + auto contextualHelpButton = new KContextualHelpButton{helpButtonInfo, m_enableRemoteFolderThumbnail, this}; + + QHBoxLayout *enableRemoteFolderThumbnailLayout = new QHBoxLayout(); + enableRemoteFolderThumbnailLayout->addWidget(m_enableRemoteFolderThumbnail); + enableRemoteFolderThumbnailLayout->addWidget(contextualHelpButton); + + QFormLayout *formLayout = new QFormLayout(); + + QLabel *localGroupLabel = new QLabel(i18nc("@title:group", "Local storage:")); + // Makes sure it has the same height as the labeled sizeBoxLayout + localGroupLabel->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::MinimumExpanding); + formLayout->addRow(localGroupLabel, localFileSizeBoxLayout); + + QLabel *remoteGroupLabel = new QLabel(i18nc("@title:group", "Remote storage:")); + remoteGroupLabel->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::MinimumExpanding); + formLayout->addRow(remoteGroupLabel, remoteFileSizeBoxLayout); + + formLayout->addRow(QString(), enableRemoteFolderThumbnailLayout); + topLayout->addWidget(showPreviewsLabel); topLayout->addWidget(m_listView); - topLayout->addLayout(localFileSizeBoxLayout); - topLayout->addLayout(remoteFileSizeBoxLayout); + topLayout->addLayout(formLayout); + + // So that m_listView takes up all available space + topLayout->setStretchFactor(m_listView, 1); loadSettings(); connect(m_listView, &QListView::clicked, this, &PreviewsSettingsPage::changed); connect(m_localFileSizeBox, &QSpinBox::valueChanged, this, &PreviewsSettingsPage::changed); connect(m_remoteFileSizeBox, &QSpinBox::valueChanged, this, &PreviewsSettingsPage::changed); + connect(m_enableRemoteFolderThumbnail, &QCheckBox::toggled, this, &PreviewsSettingsPage::changed); } PreviewsSettingsPage::~PreviewsSettingsPage() @@ -111,7 +147,7 @@ void PreviewsSettingsPage::applySettings() m_enabledPreviewPlugins.clear(); for (int i = 0; i < rowCount; ++i) { const QModelIndex index = model->index(i, 0); - const bool checked = model->data(index, Qt::CheckStateRole).toBool(); + const bool checked = model->data(index, Qt::CheckStateRole).value() == Qt::Checked; if (checked) { const QString enabledPlugin = model->data(index, Qt::UserRole).toString(); m_enabledPreviewPlugins.append(enabledPlugin); @@ -132,6 +168,8 @@ void PreviewsSettingsPage::applySettings() const qulonglong maximumRemoteSize = static_cast(m_remoteFileSizeBox->value()) * 1024 * 1024; globalConfig.writeEntry("MaximumRemoteSize", maximumRemoteSize, KConfigBase::Normal | KConfigBase::Global); + globalConfig.writeEntry("EnableRemoteFolderThumbnail", m_enableRemoteFolderThumbnail->isChecked(), KConfigBase::Normal | KConfigBase::Global); + globalConfig.sync(); } @@ -139,6 +177,7 @@ void PreviewsSettingsPage::restoreDefaults() { m_localFileSizeBox->setValue(DefaultMaxLocalPreviewSize); m_remoteFileSizeBox->setValue(DefaultMaxRemotePreviewSize); + m_enableRemoteFolderThumbnail->setChecked(EnableRemoteFolderThumbnail); } void PreviewsSettingsPage::showEvent(QShowEvent *event) @@ -150,19 +189,6 @@ void PreviewsSettingsPage::showEvent(QShowEvent *event) SettingsPageBase::showEvent(event); } -#if KIOWIDGETS_BUILD_DEPRECATED_SINCE(5, 87) -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(); -} -#endif - void PreviewsSettingsPage::loadPreviewPlugins() { QAbstractItemModel *model = m_listView->model(); @@ -173,14 +199,9 @@ void PreviewsSettingsPage::loadPreviewPlugins() model->insertRow(0); const QModelIndex index = model->index(0, 0); - model->setData(index, show, Qt::CheckStateRole); + model->setData(index, show ? Qt::Checked : Qt::Unchecked, Qt::CheckStateRole); model->setData(index, plugin.name(), Qt::DisplayRole); model->setData(index, plugin.pluginId(), ServiceModel::DesktopEntryNameRole); - -#if KIOWIDGETS_BUILD_DEPRECATED_SINCE(5, 87) - const bool configurable = plugin.value(QStringLiteral("Configurable"), false); - model->setData(index, configurable, ServiceModel::ConfigurableRole); -#endif } model->sort(Qt::DisplayRole); @@ -200,6 +221,8 @@ void PreviewsSettingsPage::loadSettings() const qulonglong maxRemoteByteSize = globalConfig.readEntry("MaximumRemoteSize", defaultRemotePreview); const int maxRemoteMByteSize = maxRemoteByteSize / (1024 * 1024); m_remoteFileSizeBox->setValue(maxRemoteMByteSize); + + m_enableRemoteFolderThumbnail->setChecked(globalConfig.readEntry("EnableRemoteFolderThumbnail", EnableRemoteFolderThumbnail)); } #include "moc_previewssettingspage.cpp"