Now when you click the button "Defaults" in the settings dialog, it will push the...

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

diff --git a/src/settings/behaviorsettingspage.cpp b/src/settings/behaviorsettingspage.cpp
index a5bcc63c7166b2740a0a3f4d16ab36a5621eef92..329ec586c471b56f0044a7bc4ec0c040223c5600 100644 (file)
--- 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 77f781c579a23162f4a4e5909a55d5320a9ecba7..6c59d467bfc430ba6dd7a2f0bba1b76fbf0cf177 100644 (file)
--- 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 fd6c9836c5924cf7459e53e181800243b68cbc94..e2c236354662e852c428e8c30ccdf9a6b677b902 100644 (file)
--- 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 81ca7e83acf859c4a992f88f007c4a4a048aa712..b2e0820b956fe4e60c7f372e68ed7b7f95e563c8 100644 (file)
--- 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 d0fb0ac90db168dbc0d705a4ba6f7ea9311ccce7..d9a361c8d9b83a0a9836faa5424092f4991e2a59 100644 (file)
--- 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 ee00814a9a103e0fbeff615d2803ee8f2136e30f..09a1999d955ac4754f22cd17095b198bce39b7a0 100644 (file)
--- 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 9ea5291329cddc6dd4e233d351057c110da5a3d8..6bcd9ac5cb7dd90bf182380b70f787415dc9a077 100644 (file)
--- 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 c733c0b3ade8a99dd740e78141b78100d4dd7d27..241c159c56a26ea8f1c249601d6a4833814eaba8 100644 (file)
--- 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()