Adapt Dolphin Nepomuk support to namespace changes.

[dolphin.git] / src / dolphinsettingsdialog.cpp

diff --git a/src/dolphinsettingsdialog.cpp b/src/dolphinsettingsdialog.cpp
index a9766078765bdb8bcdd0acf33d175e1771e43530..998f6b4d26cd3c7a750528c9b20a749893ef97e0 100644 (file)
--- a/src/dolphinsettingsdialog.cpp
+++ b/src/dolphinsettingsdialog.cpp
@@ -19,15 +19,15 @@
  ***************************************************************************/
 
 #include "dolphinsettingsdialog.h"
  ***************************************************************************/
 
 #include "dolphinsettingsdialog.h"

-#include <klocale.h>
-#include <kicon.h>
-#include "generalsettingspage.h"
-#include "viewsettingspage.h"
-#include "bookmarkssettingspage.h"
+

 #include "dolphinapplication.h"
 #include "dolphinmainwindow.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(),
 
 DolphinSettingsDialog::DolphinSettingsDialog(DolphinMainWindow* mainWindow) :
     KPageDialog(),


@@ -36,9 +36,9 @@ DolphinSettingsDialog::DolphinSettingsDialog(DolphinMainWindow* mainWindow) :
     const QSize minSize = minimumSize();
     setMinimumSize(QSize(512, minSize.height()));
 
     const QSize minSize = minimumSize();
     setMinimumSize(QSize(512, minSize.height()));
 

-    setFaceType( List);
+    setFaceType(List);

     setCaption(i18n("Dolphin Preferences"));
     setCaption(i18n("Dolphin Preferences"));

-    setButtons(Ok|Apply|Cancel);
+    setButtons(Ok | Apply | Cancel | Default);

     setDefaultButton(Ok);
 
     m_generalSettingsPage = new GeneralSettingsPage(mainWindow, this);
     setDefaultButton(Ok);
 
     m_generalSettingsPage = new GeneralSettingsPage(mainWindow, this);


@@ -49,20 +49,27 @@ DolphinSettingsDialog::DolphinSettingsDialog(DolphinMainWindow* mainWindow) :
     KPageWidgetItem* viewSettingsFrame = addPage(m_viewSettingsPage, i18n("View Modes"));
     viewSettingsFrame->setIcon(KIcon("view-choose"));
 
     KPageWidgetItem* viewSettingsFrame = addPage(m_viewSettingsPage, i18n("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()
 {
 }
 
 DolphinSettingsDialog::~DolphinSettingsDialog()
 {

+    KConfigGroup dialogConfig(KSharedConfig::openConfig("dolphinrc"), "SettingsDialog");
+    saveDialogSize(dialogConfig, KConfigFlags::Persistent);

 }
 
 void DolphinSettingsDialog::slotButtonClicked(int button)
 {
 }
 
 void DolphinSettingsDialog::slotButtonClicked(int button)
 {

-    if (button==Ok || button==Apply) {
+    if ((button == Ok) || (button == Apply)) {

         applySettings();
         applySettings();

+    } else if (button == Default) {
+        const QString text(i18n("All settings will be reset to default values. Do you want to continue?"));
+        if (KMessageBox::questionYesNo(this, text) == KMessageBox::Yes) {
+            restoreDefaults();
+        }

     }
     }

+

     KPageDialog::slotButtonClicked(button);
 }
 
     KPageDialog::slotButtonClicked(button);
 }
 


@@ -70,7 +77,13 @@ void DolphinSettingsDialog::applySettings()
 {
     m_generalSettingsPage->applySettings();
     m_viewSettingsPage->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();
 }
 
     DolphinApplication::app()->refreshMainWindows();
 }