[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [rekonq/frameworks] src/settings: Fix Settings Dialog
From:       Andrea Diamantini <adjam7 () gmail ! com>
Date:       2014-07-13 22:19:36
Message-ID: E1X6S7M-0000Ko-0Q () scm ! kde ! org
[Download RAW message or body]

Git commit 8a0e05aea29c767d45042b50630085f24469dab8 by Andrea Diamantini.
Committed on 13/07/2014 at 22:20.
Pushed by adjam into branch 'frameworks'.

Fix Settings Dialog

M  +10   -10   src/settings/settingsdialog.cpp
M  +2    -0    src/settings/settingsdialog.h

http://commits.kde.org/rekonq/8a0e05aea29c767d45042b50630085f24469dab8

diff --git a/src/settings/settingsdialog.cpp b/src/settings/settingsdialog.cpp
index a2a7d69..681b9e8 100644
--- a/src/settings/settingsdialog.cpp
+++ b/src/settings/settingsdialog.cpp
@@ -140,7 +140,6 @@ SettingsDialog::SettingsDialog(QWidget *parent)
     : KConfigDialog(parent, QL1S("rekonfig"), ReKonfig::self())
     , d(new Private(this))
 {
-//     showButtonSeparator(false);
     setWindowTitle(i18nc("Window title of the settings dialog", "Configure – rekonq"));
 
     // update buttons
@@ -152,10 +151,7 @@ SettingsDialog::SettingsDialog(QWidget *parent)
     connect(d->advancedWidg,    SIGNAL(changed(bool)), this, SLOT(updateButtons()));
     connect(d->privacyWidg,     SIGNAL(changed(bool)), this, SLOT(updateButtons()));
 
-    // save settings
-    connect(this, SIGNAL(applyClicked()), this, SLOT(saveSettings()));
-    connect(this, SIGNAL(okClicked()),    this, SLOT(saveSettings()));
-//     setHelp( QL1S("Config-rekonq"), QL1S("rekonq") );
+    setHelp( QL1S("Config-rekonq"), QL1S("rekonq") );
 }
 
 
@@ -166,11 +162,16 @@ SettingsDialog::~SettingsDialog()
 }
 
 
+void SettingsDialog::updateSettings()
+{
+    saveSettings();
+    updateButtons();
+}
+
+
 // we need this function to SAVE settings in rc file..
 void SettingsDialog::saveSettings()
 {
-    ReKonfig::self()->save();
-
     d->generalWidg->save();
     d->tabsWidg->save();
     d->appearanceWidg->save();
@@ -179,12 +180,11 @@ void SettingsDialog::saveSettings()
     d->privacyWidg->save();
     d->ebrowsingModule->save();
 
+    ReKonfig::self()->save();
+
     d->privacyWidg->reload();
 
     SearchEngine::reload();
-
-    updateButtons();
-    emit settingsChanged( QL1S("ReKonfig") );
 }
 
 
diff --git a/src/settings/settingsdialog.h b/src/settings/settingsdialog.h
index 6fd8908..aaf6261 100644
--- a/src/settings/settingsdialog.h
+++ b/src/settings/settingsdialog.h
@@ -53,6 +53,8 @@ public:
 protected:
     virtual bool isDefault();
 
+    virtual void updateSettings();
+
 private:
     Private* const d;
 
[prev in list] [next in list] [prev in thread] [next in thread]