From: Shaun Reich <shaun.reich@kdemail.net>
Date: Sun, 1 Feb 2009 20:43:26 +0000 (+0000)
Subject: Now when you click the button "Defaults" in the settings dialog, it will push the... 
X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/commitdiff_plain/9f7c2424d9c6df1a8461e24a8865552629fcda1a

Now when you click the button "Defaults" in the settings dialog, it will push the settings to the UI, then the user can apply, cancel, or modify them from there. Also removed the message box prompt. Use settings->useDefaults(true), then set it back to false after you are done loading settings in the restoreDefaults() method calls. Don't use ->setDefaults() normally, anymore.

svn path=/trunk/KDE/kdebase/apps/; revision=919897
---

diff --git a/src/settings/behaviorsettingspage.cpp b/src/settings/behaviorsettingspage.cpp
index a5bcc63c7..329ec586c 100644
--- a/src/settings/behaviorsettingspage.cpp
+++ b/src/settings/behaviorsettingspage.cpp
@@ -133,11 +133,10 @@ void BehaviorSettingsPage::applySettings()
 void BehaviorSettingsPage::restoreDefaults()
 {
     GeneralSettings* settings = DolphinSettings::instance().generalSettings();
-    settings->setDefaults();
-
-    // TODO: reset default settings for trash and show delete command...
-
+    //TODO: Reset default settings for both trash and show delete commands (confirmations).
+    settings->useDefaults(true);
     loadSettings();
+    settings->useDefaults(false);
 }
 
 void BehaviorSettingsPage::loadSettings()
diff --git a/src/settings/contextmenusettingspage.cpp b/src/settings/contextmenusettingspage.cpp
index 77f781c57..6c59d467b 100644
--- a/src/settings/contextmenusettingspage.cpp
+++ b/src/settings/contextmenusettingspage.cpp
@@ -71,8 +71,9 @@ void ContextMenuSettingsPage::applySettings()
 void ContextMenuSettingsPage::restoreDefaults()
 {
     GeneralSettings* settings = DolphinSettings::instance().generalSettings();
-    settings->setDefaults();
+    settings->useDefaults(true);
     loadSettings();
+    settings->useDefaults(false);
 }
 
 void ContextMenuSettingsPage::loadSettings()
diff --git a/src/settings/dolphinsettingsdialog.cpp b/src/settings/dolphinsettingsdialog.cpp
index fd6c9836c..e2c236354 100644
--- a/src/settings/dolphinsettingsdialog.cpp
+++ b/src/settings/dolphinsettingsdialog.cpp
@@ -102,10 +102,7 @@ void DolphinSettingsDialog::slotButtonClicked(int button)
     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();
-        }
+        restoreDefaults();
     }
 
     KPageDialog::slotButtonClicked(button);
@@ -130,7 +127,6 @@ void DolphinSettingsDialog::restoreDefaults()
     foreach (SettingsPageBase* page, m_pages) {
         page->restoreDefaults();
     }
-    DolphinApplication::app()->refreshMainWindows();
 }
 
 #include "dolphinsettingsdialog.moc"
diff --git a/src/settings/navigationsettingspage.cpp b/src/settings/navigationsettingspage.cpp
index 81ca7e83a..b2e0820b9 100644
--- a/src/settings/navigationsettingspage.cpp
+++ b/src/settings/navigationsettingspage.cpp
@@ -94,8 +94,9 @@ void NavigationSettingsPage::applySettings()
 void NavigationSettingsPage::restoreDefaults()
 {
     GeneralSettings* settings = DolphinSettings::instance().generalSettings();
-    settings->setDefaults();
+    settings->useDefaults(true);
     loadSettings();
+    settings->useDefaults(false);
 }
 
 void NavigationSettingsPage::loadSettings()
diff --git a/src/settings/previewssettingspage.cpp b/src/settings/previewssettingspage.cpp
index d0fb0ac90..d9a361c8d 100644
--- a/src/settings/previewssettingspage.cpp
+++ b/src/settings/previewssettingspage.cpp
@@ -99,8 +99,9 @@ void PreviewsSettingsPage::applySettings()
 void PreviewsSettingsPage::restoreDefaults()
 {
     GeneralSettings* settings = DolphinSettings::instance().generalSettings();
-    settings->setDefaults();
+    settings->useDefaults(true);
     loadSettings();
+    settings->useDefaults(false);
 }
 
 void PreviewsSettingsPage::loadSettings()
diff --git a/src/settings/servicessettingspage.cpp b/src/settings/servicessettingspage.cpp
index ee00814a9..09a1999d9 100644
--- a/src/settings/servicessettingspage.cpp
+++ b/src/settings/servicessettingspage.cpp
@@ -44,8 +44,9 @@ void ServicesSettingsPage::applySettings()
 void ServicesSettingsPage::restoreDefaults()
 {
     GeneralSettings* settings = DolphinSettings::instance().generalSettings();
-    settings->setDefaults();
+    settings->useDefaults(true);
     loadSettings();
+    settings->useDefaults(false);
 }
 
 void ServicesSettingsPage::loadSettings()
diff --git a/src/settings/startupsettingspage.cpp b/src/settings/startupsettingspage.cpp
index 9ea529132..6bcd9ac5c 100644
--- a/src/settings/startupsettingspage.cpp
+++ b/src/settings/startupsettingspage.cpp
@@ -131,8 +131,9 @@ void StartupSettingsPage::applySettings()
 void StartupSettingsPage::restoreDefaults()
 {
     GeneralSettings* settings = DolphinSettings::instance().generalSettings();
-    settings->setDefaults();
+    settings->useDefaults(true);
     loadSettings();
+    settings->useDefaults(false);
 }
 
 void StartupSettingsPage::selectHomeUrl()
diff --git a/src/settings/statusbarsettingspage.cpp b/src/settings/statusbarsettingspage.cpp
index c733c0b3a..241c159c5 100644
--- a/src/settings/statusbarsettingspage.cpp
+++ b/src/settings/statusbarsettingspage.cpp
@@ -67,8 +67,9 @@ void StatusBarSettingsPage::applySettings()
 void StatusBarSettingsPage::restoreDefaults()
 {
     GeneralSettings* settings = DolphinSettings::instance().generalSettings();
-    settings->setDefaults();
+    settings->useDefaults(true);
     loadSettings();
+    settings->useDefaults(false);
 }
 
 void StatusBarSettingsPage::loadSettings()