X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/67ebd66f94356b4e66005b1072919cb7b5e858bb..465e06138e8baaefb967d32a2eaccf67daef8285:/src/settings/dolphinsettingsdialog.cpp diff --git a/src/settings/dolphinsettingsdialog.cpp b/src/settings/dolphinsettingsdialog.cpp index a99b9c3d0..9d8fb032a 100644 --- a/src/settings/dolphinsettingsdialog.cpp +++ b/src/settings/dolphinsettingsdialog.cpp @@ -14,6 +14,11 @@ #include "startup/startupsettingspage.h" #include "trash/trashsettingspage.h" #include "viewmodes/viewsettingspage.h" +#include "config-kuserfeedback.h" +#ifdef HAVE_KUSERFEEDBACK +#include "userfeedback/dolphinfeedbackprovider.h" +#include "userfeedback/userfeedbacksettingspage.h" +#endif #include #include @@ -80,7 +85,10 @@ DolphinSettingsDialog::DolphinSettingsDialog(const QUrl& url, QWidget* parent) : connect(servicesSettingsPage, &ServicesSettingsPage::changed, this, &DolphinSettingsDialog::enableApply); // Trash - auto* trashSettingsPage = createTrashSettingsPage(this); + SettingsPageBase* trashSettingsPage = nullptr; +#ifndef Q_OS_WIN + trashSettingsPage = createTrashSettingsPage(this); +#endif if (trashSettingsPage) { KPageWidgetItem* trashSettingsFrame = addPage(trashSettingsPage, i18nc("@title:group", "Trash")); @@ -88,6 +96,17 @@ DolphinSettingsDialog::DolphinSettingsDialog(const QUrl& url, QWidget* parent) : connect(trashSettingsPage, &TrashSettingsPage::changed, this, &DolphinSettingsDialog::enableApply); } +#ifdef HAVE_KUSERFEEDBACK + // User Feedback + UserFeedbackSettingsPage* feedbackSettingsPage = nullptr; + if (DolphinFeedbackProvider::instance()->isEnabled()) { + feedbackSettingsPage = new UserFeedbackSettingsPage(this); + auto feedbackSettingsFrame = addPage(feedbackSettingsPage, i18nc("@title:group", "User Feedback")); + feedbackSettingsFrame->setIcon(QIcon::fromTheme(QStringLiteral("preferences-desktop-locale"))); + connect(feedbackSettingsPage, &UserFeedbackSettingsPage::changed, this, &DolphinSettingsDialog::enableApply); + } +#endif + m_pages.append(generalSettingsPage); m_pages.append(startupSettingsPage); m_pages.append(viewSettingsPage); @@ -96,6 +115,11 @@ DolphinSettingsDialog::DolphinSettingsDialog(const QUrl& url, QWidget* parent) : if (trashSettingsPage) { m_pages.append(trashSettingsPage); } +#ifdef HAVE_KUSERFEEDBACK + if (feedbackSettingsPage) { + m_pages.append(feedbackSettingsPage); + } +#endif const KConfigGroup dialogConfig(KSharedConfig::openConfig(QStringLiteral("dolphinrc")), "SettingsDialog"); KWindowConfig::restoreWindowSize(windowHandle(), dialogConfig); @@ -115,11 +139,11 @@ void DolphinSettingsDialog::enableApply() void DolphinSettingsDialog::applySettings() { - foreach (SettingsPageBase* page, m_pages) { + for (SettingsPageBase* page : qAsConst(m_pages)) { page->applySettings(); } - emit settingsChanged(); + Q_EMIT settingsChanged(); GeneralSettings* settings = GeneralSettings::self(); if (settings->modifiedStartupSettings()) { @@ -134,7 +158,7 @@ void DolphinSettingsDialog::applySettings() void DolphinSettingsDialog::restoreDefaults() { - foreach (SettingsPageBase* page, m_pages) { + for (SettingsPageBase* page : qAsConst(m_pages)) { page->restoreDefaults(); } }