Solved TODO: KWindowConfig::saveWindowSize/restoreWindowSize in DolphinSettingsDialog

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

diff --git a/src/settings/dolphinsettingsdialog.cpp b/src/settings/dolphinsettingsdialog.cpp
index 533a7f0890181ce5478de9017041c4adb2c70cf7..3b72ed45c1c4aa483033610de9969481e791b82a 100644 (file)
--- a/src/settings/dolphinsettingsdialog.cpp
+++ b/src/settings/dolphinsettingsdialog.cpp
@@ -30,14 +30,14 @@
 #include "viewmodes/viewsettingspage.h"
 #include "trash/trashsettingspage.h"
 
 #include "viewmodes/viewsettingspage.h"
 #include "trash/trashsettingspage.h"
 

-#include <KLocale>
-#include <KMessageBox>
+#include <KWindowConfig>
+#include <KLocalizedString>

 #include <QIcon>
 
 #include <QPushButton>
 #include <QDialogButtonBox>
 
 #include <QIcon>
 
 #include <QPushButton>
 #include <QDialogButtonBox>
 

-DolphinSettingsDialog::DolphinSettingsDialog(const KUrl& url, QWidget* parent) :
+DolphinSettingsDialog::DolphinSettingsDialog(const QUrl& url, QWidget* parent) :

     KPageDialog(parent),
     m_pages()
 
     KPageDialog(parent),
     m_pages()
 


@@ -99,23 +99,21 @@ DolphinSettingsDialog::DolphinSettingsDialog(const KUrl& url, QWidget* parent) :
     generalSettingsFrame->setIcon(QIcon::fromTheme("system-run"));
     connect(generalSettingsPage, &GeneralSettingsPage::changed, this, &DolphinSettingsDialog::enableApply);
 
     generalSettingsFrame->setIcon(QIcon::fromTheme("system-run"));
     connect(generalSettingsPage, &GeneralSettingsPage::changed, this, &DolphinSettingsDialog::enableApply);
 

-    const KConfigGroup dialogConfig(KSharedConfig::openConfig("dolphinrc"), "SettingsDialog");
-#pragma message("TODO: port")
-    //restoreDialogSize(dialogConfig);
-

     m_pages.append(startupSettingsPage);
     m_pages.append(viewSettingsPage);
     m_pages.append(navigationSettingsPage);
     m_pages.append(servicesSettingsPage);
     m_pages.append(trashSettingsPage);
     m_pages.append(generalSettingsPage);
     m_pages.append(startupSettingsPage);
     m_pages.append(viewSettingsPage);
     m_pages.append(navigationSettingsPage);
     m_pages.append(servicesSettingsPage);
     m_pages.append(trashSettingsPage);
     m_pages.append(generalSettingsPage);

+
+    const KConfigGroup dialogConfig(KSharedConfig::openConfig("dolphinrc"), "SettingsDialog");
+    KWindowConfig::restoreWindowSize(windowHandle(), dialogConfig);

 }
 
 DolphinSettingsDialog::~DolphinSettingsDialog()
 {
     KConfigGroup dialogConfig(KSharedConfig::openConfig("dolphinrc"), "SettingsDialog");
 }
 
 DolphinSettingsDialog::~DolphinSettingsDialog()
 {
     KConfigGroup dialogConfig(KSharedConfig::openConfig("dolphinrc"), "SettingsDialog");

-#pragma message("TODO: port")
-    //saveDialogSize(dialogConfig);
+    KWindowConfig::saveWindowSize(windowHandle(), dialogConfig);

 }
 
 void DolphinSettingsDialog::enableApply()
 }
 
 void DolphinSettingsDialog::enableApply()


@@ -136,7 +134,7 @@ void DolphinSettingsDialog::applySettings()
         // Reset the modified startup settings hint. The changed startup settings
         // have been applied already due to emitting settingsChanged().
         settings->setModifiedStartupSettings(false);
         // Reset the modified startup settings hint. The changed startup settings
         // have been applied already due to emitting settingsChanged().
         settings->setModifiedStartupSettings(false);

-        settings->writeConfig();
+        settings->save();

     }
     buttonBox()->button(QDialogButtonBox::Apply)->setEnabled(false);
 }
     }
     buttonBox()->button(QDialogButtonBox::Apply)->setEnabled(false);
 }