Merge remote-tracking branch 'origin/master' into frameworks

[dolphin.git] / src / settings / dolphinsettingsdialog.cpp

diff --git a/src/settings/dolphinsettingsdialog.cpp b/src/settings/dolphinsettingsdialog.cpp
index 609e2ab92d69b61bc0cdb0b478fae9076b796521..8df2996b3a97e36af01eccc20977f4c713fd3d19 100644 (file)
--- a/src/settings/dolphinsettingsdialog.cpp
+++ b/src/settings/dolphinsettingsdialog.cpp
@@ -34,6 +34,9 @@
 #include <KMessageBox>
 #include <KIcon>
 
+#include <QPushButton>
+#include <QDialogButtonBox>
+
 DolphinSettingsDialog::DolphinSettingsDialog(const KUrl& url, QWidget* parent) :
     KPageDialog(parent),
     m_pages()
@@ -43,55 +46,58 @@ DolphinSettingsDialog::DolphinSettingsDialog(const KUrl& url, QWidget* parent) :
     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);
 
     // 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()));
+    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()));
+    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()));
+    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()));
+    connect(servicesSettingsPage, &ServicesSettingsPage::changed, this, &DolphinSettingsDialog::enableApply);
 
     // Trash
     TrashSettingsPage* trashSettingsPage = new TrashSettingsPage(this);
     KPageWidgetItem* trashSettingsFrame = addPage(trashSettingsPage,
                                                    i18nc("@title:group", "Trash"));
     trashSettingsFrame->setIcon(KIcon("user-trash"));
-    connect(trashSettingsPage, SIGNAL(changed()), this, SLOT(enableApply()));
+    connect(trashSettingsPage, &TrashSettingsPage::changed, this, &DolphinSettingsDialog::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()));
+    connect(generalSettingsPage, &GeneralSettingsPage::changed, this, &DolphinSettingsDialog::enableApply);
 
     const KConfigGroup dialogConfig(KSharedConfig::openConfig("dolphinrc"), "SettingsDialog");
-    restoreDialogSize(dialogConfig);
+#pragma message("TODO: port")
+    //restoreDialogSize(dialogConfig);
 
     m_pages.append(startupSettingsPage);
     m_pages.append(viewSettingsPage);
@@ -104,23 +110,25 @@ DolphinSettingsDialog::DolphinSettingsDialog(const KUrl& url, QWidget* parent) :
 DolphinSettingsDialog::~DolphinSettingsDialog()
 {
     KConfigGroup dialogConfig(KSharedConfig::openConfig("dolphinrc"), "SettingsDialog");
-    saveDialogSize(dialogConfig);
+#pragma message("TODO: port")
+    //saveDialogSize(dialogConfig);
 }
 
 void DolphinSettingsDialog::slotButtonClicked(int button)
 {
-    if ((button == Ok) || (button == Apply)) {
+    if ((button == QDialogButtonBox::Ok) || (button == QDialogButtonBox::Apply)) {
         applySettings();
-    } else if (button == Default) {
+    } else if (button == QDialogButtonBox::RestoreDefaults) {
         restoreDefaults();
     }
 
-    KPageDialog::slotButtonClicked(button);
+#pragma message("TODO: port")
+    //KPageDialog::slotButtonClicked(button);
 }
 
 void DolphinSettingsDialog::enableApply()
 {
-    enableButtonApply(true);
+    buttonBox()->button(QDialogButtonBox::Apply)->setEnabled(true);
 }
 
 void DolphinSettingsDialog::applySettings()
@@ -138,8 +146,7 @@ void DolphinSettingsDialog::applySettings()
         settings->setModifiedStartupSettings(false);
         settings->writeConfig();
     }
-
-    enableButtonApply(false);
+    buttonBox()->button(QDialogButtonBox::Apply)->setEnabled(false);
 }
 
 void DolphinSettingsDialog::restoreDefaults()