X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/445f0b64bdd34e39f0565ef870937ebd3d5dfa61..7bdfc2600908b72fbf790e6b96f8ca6de997931a:/src/dolphinsettingsdialog.cpp

diff --git a/src/dolphinsettingsdialog.cpp b/src/dolphinsettingsdialog.cpp
index cf66af3b2..1bbbbde55 100644
--- a/src/dolphinsettingsdialog.cpp
+++ b/src/dolphinsettingsdialog.cpp
@@ -19,47 +19,58 @@
  ***************************************************************************/
 
 #include "dolphinsettingsdialog.h"
-#include <klocale.h>
-#include <kicon.h>
-#include "generalsettingspage.h"
-#include "viewsettingspage.h"
-#include "bookmarkssettingspage.h"
+
 #include "dolphinapplication.h"
 #include "dolphinmainwindow.h"
-//Added by qt3to4:
-#include <QFrame>
+#include "generalsettingspage.h"
+#include "viewsettingspage.h"
+
+#include <klocale.h>
+#include <kmessagebox.h>
+#include <kicon.h>
 
 DolphinSettingsDialog::DolphinSettingsDialog(DolphinMainWindow* mainWindow) :
-    KPageDialog(),
-    m_mainWindow(mainWindow)
+    KPageDialog(mainWindow)
 {
-    setFaceType( List);
-    setCaption(i18n("Dolphin Preferences"));
-    setButtons(Ok|Apply|Cancel);
+    const QSize minSize = minimumSize();
+    setMinimumSize(QSize(512, minSize.height()));
+
+    setFaceType(List);
+    setCaption(i18nc("@title:window", "Dolphin Preferences"));
+    setButtons(Ok | Apply | Cancel | Default);
     setDefaultButton(Ok);
 
     m_generalSettingsPage = new GeneralSettingsPage(mainWindow, this);
-    KPageWidgetItem* generalSettingsFrame = addPage(m_generalSettingsPage, i18n("General"));
-    generalSettingsFrame->setIcon(KIcon("exec"));
+    KPageWidgetItem* generalSettingsFrame = addPage(m_generalSettingsPage,
+                                                    i18nc("@title:group", "General"));
+    generalSettingsFrame->setIcon(KIcon("system-run"));
 
     m_viewSettingsPage = new ViewSettingsPage(mainWindow, this);
-    KPageWidgetItem* viewSettingsFrame = addPage(m_viewSettingsPage, i18n("View Modes"));
-    viewSettingsFrame->setIcon(KIcon("view_choose"));
+    KPageWidgetItem* viewSettingsFrame = addPage(m_viewSettingsPage,
+                                                 i18nc("@title:group", "View Modes"));
+    viewSettingsFrame->setIcon(KIcon("view-choose"));
 
-    m_bookmarksSettingsPage = new BookmarksSettingsPage(mainWindow, this);
-    KPageWidgetItem* bookmarksSettingsFrame = addPage(m_bookmarksSettingsPage, i18n("Bookmarks"));
-    bookmarksSettingsFrame->setIcon(KIcon("bookmark"));
+    const KConfigGroup dialogConfig(KSharedConfig::openConfig("dolphinrc"), "SettingsDialog");
+    restoreDialogSize(dialogConfig);
 }
 
 DolphinSettingsDialog::~DolphinSettingsDialog()
 {
+    KConfigGroup dialogConfig(KSharedConfig::openConfig("dolphinrc"), "SettingsDialog");
+    saveDialogSize(dialogConfig);
 }
 
 void DolphinSettingsDialog::slotButtonClicked(int button)
 {
-    if (button==Ok || button==Apply) {
+    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);
 }
 
@@ -67,7 +78,13 @@ void DolphinSettingsDialog::applySettings()
 {
     m_generalSettingsPage->applySettings();
     m_viewSettingsPage->applySettings();
-    m_bookmarksSettingsPage->applySettings();
+    DolphinApplication::app()->refreshMainWindows();
+}
+
+void DolphinSettingsDialog::restoreDefaults()
+{
+    m_generalSettingsPage->restoreDefaults();
+    m_viewSettingsPage->restoreDefaults();
     DolphinApplication::app()->refreshMainWindows();
 }