#include "dolphinsettingsdialog.h"
-#include <dolphinapplication.h>
-#include <dolphinmainwindow.h>
-#include "generalsettingspage.h"
-#include "navigationsettingspage.h"
-#include "servicessettingspage.h"
-#include "startupsettingspage.h"
-#include "viewsettingspage.h"
-
-#include <klocale.h>
-#include <kmessagebox.h>
-#include <kicon.h>
-
-DolphinSettingsDialog::DolphinSettingsDialog(const KUrl& url, QWidget* parent) :
+#include "dolphin_generalsettings.h"
+#include "dolphinmainwindow.h"
+#include "general/generalsettingspage.h"
+#include "navigation/navigationsettingspage.h"
+#include "services/servicessettingspage.h"
+#include "startup/startupsettingspage.h"
+#include "trash/trashsettingspage.h"
+#include "viewmodes/viewsettingspage.h"
+
+#include <KAuthorized>
+#include <KLocalizedString>
+#include <KWindowConfig>
+
+#include <QPushButton>
+
+DolphinSettingsDialog::DolphinSettingsDialog(const QUrl& url, QWidget* parent) :
KPageDialog(parent),
m_pages()
setMinimumSize(QSize(512, minSize.height()));
setFaceType(List);
- setCaption(i18nc("@title:window", "Dolphin Preferences"));
- setButtons(Ok | Apply | Cancel | Default);
- enableButtonApply(false);
- setDefaultButton(Ok);
+ setWindowTitle(i18nc("@title:window", "Dolphin Preferences"));
+ 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);
+
+ connect(box->button(QDialogButtonBox::Ok), &QAbstractButton::clicked, this, &DolphinSettingsDialog::applySettings);
+ connect(box->button(QDialogButtonBox::Apply), &QAbstractButton::clicked, this, &DolphinSettingsDialog::applySettings);
+ 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"));
+ generalSettingsFrame->setIcon(QIcon::fromTheme(QStringLiteral("view-preview")));
+ connect(generalSettingsPage, &GeneralSettingsPage::changed, this, &DolphinSettingsDialog::enableApply);
// Startup
StartupSettingsPage* startupSettingsPage = new StartupSettingsPage(url, this);
KPageWidgetItem* startupSettingsFrame = addPage(startupSettingsPage,
i18nc("@title:group", "Startup"));
- startupSettingsFrame->setIcon(KIcon("go-home"));
- connect(startupSettingsPage, SIGNAL(changed()), this, SLOT(enableApply()));
+ startupSettingsFrame->setIcon(QIcon::fromTheme(QStringLiteral("go-home")));
+ connect(startupSettingsPage, &StartupSettingsPage::changed, this, &DolphinSettingsDialog::enableApply);
// View Modes
ViewSettingsPage* viewSettingsPage = new ViewSettingsPage(this);
KPageWidgetItem* viewSettingsFrame = addPage(viewSettingsPage,
i18nc("@title:group", "View Modes"));
- viewSettingsFrame->setIcon(KIcon("view-choose"));
- connect(viewSettingsPage, SIGNAL(changed()), this, SLOT(enableApply()));
+ viewSettingsFrame->setIcon(QIcon::fromTheme(QStringLiteral("view-choose")));
+ connect(viewSettingsPage, &ViewSettingsPage::changed, this, &DolphinSettingsDialog::enableApply);
// Navigation
NavigationSettingsPage* navigationSettingsPage = new NavigationSettingsPage(this);
KPageWidgetItem* navigationSettingsFrame = addPage(navigationSettingsPage,
i18nc("@title:group", "Navigation"));
- navigationSettingsFrame->setIcon(KIcon("input-mouse"));
- connect(navigationSettingsPage, SIGNAL(changed()), this, SLOT(enableApply()));
+ navigationSettingsFrame->setIcon(QIcon::fromTheme(QStringLiteral("edit-select")));
+ connect(navigationSettingsPage, &NavigationSettingsPage::changed, this, &DolphinSettingsDialog::enableApply);
// Services
ServicesSettingsPage* servicesSettingsPage = new ServicesSettingsPage(this);
KPageWidgetItem* servicesSettingsFrame = addPage(servicesSettingsPage,
i18nc("@title:group", "Services"));
- servicesSettingsFrame->setIcon(KIcon("services"));
- connect(servicesSettingsPage, SIGNAL(changed()), this, SLOT(enableApply()));
-
- // General
- GeneralSettingsPage* generalSettingsPage = new GeneralSettingsPage(url, this);
- KPageWidgetItem* generalSettingsFrame = addPage(generalSettingsPage,
- i18nc("@title:group General settings", "General"));
- generalSettingsFrame->setIcon(KIcon("system-run"));
- connect(generalSettingsPage, SIGNAL(changed()), this, SLOT(enableApply()));
-
- const KConfigGroup dialogConfig(KSharedConfig::openConfig("dolphinrc"), "SettingsDialog");
- restoreDialogSize(dialogConfig);
+ servicesSettingsFrame->setIcon(QIcon::fromTheme(QStringLiteral("flag")));
+ connect(servicesSettingsPage, &ServicesSettingsPage::changed, this, &DolphinSettingsDialog::enableApply);
+
+ // Trash
+ auto* trashSettingsPage = createTrashSettingsPage(this);
+ if (trashSettingsPage) {
+ KPageWidgetItem* trashSettingsFrame = addPage(trashSettingsPage,
+ i18nc("@title:group", "Trash"));
+ trashSettingsFrame->setIcon(QIcon::fromTheme(QStringLiteral("trash-empty")));
+ connect(trashSettingsPage, &TrashSettingsPage::changed, this, &DolphinSettingsDialog::enableApply);
+ }
+ m_pages.append(generalSettingsPage);
m_pages.append(startupSettingsPage);
m_pages.append(viewSettingsPage);
m_pages.append(navigationSettingsPage);
m_pages.append(servicesSettingsPage);
- m_pages.append(generalSettingsPage);
-}
+ if (trashSettingsPage) {
+ m_pages.append(trashSettingsPage);
+ }
-DolphinSettingsDialog::~DolphinSettingsDialog()
-{
- KConfigGroup dialogConfig(KSharedConfig::openConfig("dolphinrc"), "SettingsDialog");
- saveDialogSize(dialogConfig);
+ const KConfigGroup dialogConfig(KSharedConfig::openConfig(QStringLiteral("dolphinrc")), "SettingsDialog");
+ KWindowConfig::restoreWindowSize(windowHandle(), dialogConfig);
}
-void DolphinSettingsDialog::slotButtonClicked(int button)
+DolphinSettingsDialog::~DolphinSettingsDialog()
{
- if ((button == Ok) || (button == Apply)) {
- applySettings();
- } else if (button == Default) {
- const QString text(i18nc("@info", "All settings will be reset to default values. Do you want to continue?"));
- if (KMessageBox::questionYesNo(this, text) == KMessageBox::Yes) {
- restoreDefaults();
- }
- }
-
- KPageDialog::slotButtonClicked(button);
+ KConfigGroup dialogConfig(KSharedConfig::openConfig(QStringLiteral("dolphinrc")), "SettingsDialog");
+ KWindowConfig::saveWindowSize(windowHandle(), dialogConfig);
}
void DolphinSettingsDialog::enableApply()
{
- enableButtonApply(true);
+ buttonBox()->button(QDialogButtonBox::Apply)->setEnabled(true);
}
void DolphinSettingsDialog::applySettings()
foreach (SettingsPageBase* page, m_pages) {
page->applySettings();
}
- DolphinApplication::app()->refreshMainWindows();
+
+ emit settingsChanged();
+
+ 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().
+ settings->setModifiedStartupSettings(false);
+ settings->save();
+ }
+ buttonBox()->button(QDialogButtonBox::Apply)->setEnabled(false);
}
void DolphinSettingsDialog::restoreDefaults()
foreach (SettingsPageBase* page, m_pages) {
page->restoreDefaults();
}
- DolphinApplication::app()->refreshMainWindows();
}
-#include "dolphinsettingsdialog.moc"
+SettingsPageBase *DolphinSettingsDialog::createTrashSettingsPage(QWidget *parent)
+{
+ if (!KAuthorized::authorizeControlModule(QStringLiteral("kcmtrash.desktop"))) {
+ return nullptr;
+ }
+
+ return new TrashSettingsPage(parent);
+}
projects / dolphin.git / blobdiff