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

1 files changed, 1 insertions, 5 deletions

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"