X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/5bb6bf8d1eec5c720dfd4a090aa535c1f0e8f8b4..863ee3a87cee8b1f22a311d6a6a62e56714b5eae:/src/settings/dolphinsettingsdialog.cpp diff --git a/src/settings/dolphinsettingsdialog.cpp b/src/settings/dolphinsettingsdialog.cpp index d699ef894..af3dbc865 100644 --- a/src/settings/dolphinsettingsdialog.cpp +++ b/src/settings/dolphinsettingsdialog.cpp @@ -6,32 +6,34 @@ #include "dolphinsettingsdialog.h" +#include "config-dolphin.h" +#include "contextmenu/contextmenusettingspage.h" #include "dolphin_generalsettings.h" #include "dolphinmainwindow.h" #include "general/generalsettingspage.h" #include "navigation/navigationsettingspage.h" -#include "contextmenu/contextmenusettingspage.h" #include "startup/startupsettingspage.h" #include "trash/trashsettingspage.h" #include "viewmodes/viewsettingspage.h" -#include "config-kuserfeedback.h" -#ifdef HAVE_KUSERFEEDBACK +#if HAVE_KUSERFEEDBACK #include "userfeedback/dolphinfeedbackprovider.h" #include "userfeedback/userfeedbacksettingspage.h" #endif #include #include -#include #include +#include + +#include #include #include -DolphinSettingsDialog::DolphinSettingsDialog(const QUrl& url, QWidget* parent, KActionCollection* actions) : - KPageDialog(parent), - m_pages(), - m_unsavedChanges(false) +DolphinSettingsDialog::DolphinSettingsDialog(const QUrl &url, QWidget *parent, KActionCollection *actions) + : KPageDialog(parent) + , m_pages() + , m_unsavedChanges(false) { const QSize minSize = minimumSize(); @@ -39,8 +41,7 @@ DolphinSettingsDialog::DolphinSettingsDialog(const QUrl& url, QWidget* parent, K setFaceType(List); setWindowTitle(i18nc("@title:window", "Configure")); - QDialogButtonBox* box = new QDialogButtonBox(QDialogButtonBox::Ok - | QDialogButtonBox::Apply | QDialogButtonBox::Cancel | QDialogButtonBox::RestoreDefaults); + QDialogButtonBox *box = new QDialogButtonBox(QDialogButtonBox::Ok | QDialogButtonBox::Apply | QDialogButtonBox::Cancel | QDialogButtonBox::RestoreDefaults); box->button(QDialogButtonBox::Apply)->setEnabled(false); box->button(QDialogButtonBox::Ok)->setDefault(true); setButtonBox(box); @@ -50,64 +51,60 @@ DolphinSettingsDialog::DolphinSettingsDialog(const QUrl& url, QWidget* parent, K connect(box->button(QDialogButtonBox::RestoreDefaults), &QAbstractButton::clicked, this, &DolphinSettingsDialog::restoreDefaults); // General - GeneralSettingsPage* generalSettingsPage = new GeneralSettingsPage(url, this); - KPageWidgetItem* generalSettingsFrame = addPage(generalSettingsPage, - i18nc("@title:group General settings", "General")); + GeneralSettingsPage *generalSettingsPage = new GeneralSettingsPage(url, this); + KPageWidgetItem *generalSettingsFrame = addPage(generalSettingsPage, i18nc("@title:group General settings", "General")); generalSettingsFrame->setIcon(QIcon::fromTheme(QStringLiteral("system-file-manager"))); connect(generalSettingsPage, &GeneralSettingsPage::changed, this, &DolphinSettingsDialog::enableApply); // Startup - StartupSettingsPage* startupSettingsPage = new StartupSettingsPage(url, this); - KPageWidgetItem* startupSettingsFrame = addPage(startupSettingsPage, - i18nc("@title:group", "Startup")); + StartupSettingsPage *startupSettingsPage = new StartupSettingsPage(url, this); + KPageWidgetItem *startupSettingsFrame = addPage(startupSettingsPage, i18nc("@title:group", "Startup")); startupSettingsFrame->setIcon(QIcon::fromTheme(QStringLiteral("preferences-desktop-launch-feedback"))); connect(startupSettingsPage, &StartupSettingsPage::changed, this, &DolphinSettingsDialog::enableApply); // View Modes - ViewSettingsPage* viewSettingsPage = new ViewSettingsPage(this); - KPageWidgetItem* viewSettingsFrame = addPage(viewSettingsPage, - i18nc("@title:group", "View Modes")); + ViewSettingsPage *viewSettingsPage = new ViewSettingsPage(this); + KPageWidgetItem *viewSettingsFrame = addPage(viewSettingsPage, i18nc("@title:group", "View Modes")); viewSettingsFrame->setIcon(QIcon::fromTheme(QStringLiteral("preferences-desktop-icons"))); connect(viewSettingsPage, &ViewSettingsPage::changed, this, &DolphinSettingsDialog::enableApply); // Navigation - NavigationSettingsPage* navigationSettingsPage = new NavigationSettingsPage(this); - KPageWidgetItem* navigationSettingsFrame = addPage(navigationSettingsPage, - i18nc("@title:group", "Navigation")); + NavigationSettingsPage *navigationSettingsPage = new NavigationSettingsPage(this); + KPageWidgetItem *navigationSettingsFrame = addPage(navigationSettingsPage, i18nc("@title:group", "Navigation")); navigationSettingsFrame->setIcon(QIcon::fromTheme(QStringLiteral("preferences-desktop-navigation"))); connect(navigationSettingsPage, &NavigationSettingsPage::changed, this, &DolphinSettingsDialog::enableApply); // Context Menu - auto contextMenuSettingsPage = new ContextMenuSettingsPage(this, actions, { - QStringLiteral("add_to_places"), - QStringLiteral("sort"), - QStringLiteral("view_mode"), - QStringLiteral("open_in_new_tab"), - QStringLiteral("open_in_new_window"), - QStringLiteral("copy_location"), - QStringLiteral("duplicate"), - QStringLiteral("open_terminal"), - }); - KPageWidgetItem* contextMenuSettingsFrame = addPage(contextMenuSettingsPage, - i18nc("@title:group", "Context Menu")); + auto contextMenuSettingsPage = new ContextMenuSettingsPage(this, + actions, + {QStringLiteral("add_to_places"), + QStringLiteral("sort"), + QStringLiteral("view_mode"), + QStringLiteral("open_in_new_tab"), + QStringLiteral("open_in_new_window"), + QStringLiteral("copy_location"), + QStringLiteral("duplicate"), + QStringLiteral("open_terminal_here"), + QStringLiteral("copy_to_inactive_split_view"), + QStringLiteral("move_to_inactive_split_view")}); + KPageWidgetItem *contextMenuSettingsFrame = addPage(contextMenuSettingsPage, i18nc("@title:group", "Context Menu")); contextMenuSettingsFrame->setIcon(QIcon::fromTheme(QStringLiteral("preferences-desktop-menu-edit"))); connect(contextMenuSettingsPage, &ContextMenuSettingsPage::changed, this, &DolphinSettingsDialog::enableApply); // Trash - SettingsPageBase* trashSettingsPage = nullptr; + SettingsPageBase *trashSettingsPage = nullptr; #ifndef Q_OS_WIN trashSettingsPage = createTrashSettingsPage(this); #endif if (trashSettingsPage) { - trashSettings = addPage(trashSettingsPage, - i18nc("@title:group", "Trash")); + trashSettings = addPage(trashSettingsPage, i18nc("@title:group", "Trash")); trashSettings->setIcon(QIcon::fromTheme(QStringLiteral("user-trash"))); connect(trashSettingsPage, &TrashSettingsPage::changed, this, &DolphinSettingsDialog::enableApply); } -#ifdef HAVE_KUSERFEEDBACK +#if HAVE_KUSERFEEDBACK // User Feedback - UserFeedbackSettingsPage* feedbackSettingsPage = nullptr; + UserFeedbackSettingsPage *feedbackSettingsPage = nullptr; if (DolphinFeedbackProvider::instance()->isEnabled()) { feedbackSettingsPage = new UserFeedbackSettingsPage(this); auto feedbackSettingsFrame = addPage(feedbackSettingsPage, i18nc("@title:group", "User Feedback")); @@ -124,7 +121,7 @@ DolphinSettingsDialog::DolphinSettingsDialog(const QUrl& url, QWidget* parent, K if (trashSettingsPage) { m_pages.append(trashSettingsPage); } -#ifdef HAVE_KUSERFEEDBACK +#if HAVE_KUSERFEEDBACK if (feedbackSettingsPage) { m_pages.append(feedbackSettingsPage); } @@ -148,13 +145,13 @@ void DolphinSettingsDialog::enableApply() void DolphinSettingsDialog::applySettings() { - for (SettingsPageBase* page : qAsConst(m_pages)) { + for (SettingsPageBase *page : qAsConst(m_pages)) { page->applySettings(); } Q_EMIT settingsChanged(); - GeneralSettings* settings = GeneralSettings::self(); + GeneralSettings *settings = GeneralSettings::self(); if (settings->modifiedStartupSettings()) { // Reset the modified startup settings hint. The changed startup settings // have been applied already due to emitting settingsChanged(). @@ -167,40 +164,51 @@ void DolphinSettingsDialog::applySettings() void DolphinSettingsDialog::restoreDefaults() { - for (SettingsPageBase* page : qAsConst(m_pages)) { + for (SettingsPageBase *page : qAsConst(m_pages)) { page->restoreDefaults(); } } -void DolphinSettingsDialog::closeEvent(QCloseEvent* event) +void DolphinSettingsDialog::closeEvent(QCloseEvent *event) { if (!m_unsavedChanges) { event->accept(); return; } +#if KWIDGETSADDONS_VERSION >= QT_VERSION_CHECK(5, 100, 0) + const auto response = KMessageBox::warningTwoActionsCancel(this, +#else const auto response = KMessageBox::warningYesNoCancel(this, - i18n("You have unsaved changes. Do you want to apply the changes or discard them?"), - i18n("Warning"), - KStandardGuiItem::save(), - KStandardGuiItem::discard(), - KStandardGuiItem::cancel()); +#endif + i18n("You have unsaved changes. Do you want to apply the changes or discard them?"), + i18n("Warning"), + KStandardGuiItem::save(), + KStandardGuiItem::discard(), + KStandardGuiItem::cancel()); switch (response) { - case KMessageBox::Yes: - applySettings(); - Q_FALLTHROUGH(); - case KMessageBox::No: - event->accept(); - break; - case KMessageBox::Cancel: - event->ignore(); - break; - default: - break; +#if KWIDGETSADDONS_VERSION >= QT_VERSION_CHECK(5, 100, 0) + case KMessageBox::PrimaryAction: +#else + case KMessageBox::Yes: +#endif + applySettings(); + Q_FALLTHROUGH(); +#if KWIDGETSADDONS_VERSION >= QT_VERSION_CHECK(5, 100, 0) + case KMessageBox::SecondaryAction: +#else + case KMessageBox::No: +#endif + event->accept(); + break; + case KMessageBox::Cancel: + event->ignore(); + break; + default: + break; } } - SettingsPageBase *DolphinSettingsDialog::createTrashSettingsPage(QWidget *parent) { if (!KAuthorized::authorizeControlModule(QStringLiteral("kcmtrash.desktop"))) {