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

List:       kde-commits
Subject:    [kget/kf5_port] conf: Reintroduce a resetDefaults signal
From:       Lukas Appelhans <l.appelhans () gmx ! de>
Date:       2014-10-26 13:46:11
Message-ID: E1XiO95-0004gR-8R () scm ! kde ! org
[Download RAW message or body]

Git commit 72aabf1b7b22d5af1d18c2df2fb1ec9a130f7c84 by Lukas Appelhans.
Committed on 26/10/2014 at 13:45.
Pushed by lappelhans into branch 'kf5_port'.

Reintroduce a resetDefaults signal

M  +3    -3    conf/integrationpreferences.cpp
M  +8    -0    conf/preferencesdialog.cpp
M  +4    -0    conf/preferencesdialog.h
M  +1    -1    conf/verificationpreferences.cpp

http://commits.kde.org/kget/72aabf1b7b22d5af1d18c2df2fb1ec9a130f7c84

diff --git a/conf/integrationpreferences.cpp b/conf/integrationpreferences.cpp
index 8db6434..f2610e1 100644
--- a/conf/integrationpreferences.cpp
+++ b/conf/integrationpreferences.cpp
@@ -65,9 +65,9 @@ IntegrationPreferences::IntegrationPreferences(KConfigDialog *parent, Qt::Window
     connect(ui.increase, &QPushButton::clicked, this, &IntegrationPreferences::slotIncreasePriority);
     connect(ui.decrease, &QPushButton::clicked, this, &IntegrationPreferences::slotDecreasePriority);
     connect(parent, SIGNAL(rejected()), m_model, SLOT(load()));
-    connect(parent, SIGNAL(applyClicked()), m_model, SLOT(save()));
-    connect(parent, SIGNAL(okClicked()), m_model, SLOT(save()));
-    connect(parent, SIGNAL(defaultClicked()), m_model, SLOT(resetDefaults()));
+    connect(parent, SIGNAL(settingsChanged(QString)), m_model, SLOT(save()));
+    connect(parent, SIGNAL(settingsChanged(QString)), m_model, SLOT(save()));
+    connect(parent, SIGNAL(resetDefaults()), m_model, SLOT(resetDefaults()));
 
     slotUpdateButtons();
 }
diff --git a/conf/preferencesdialog.cpp b/conf/preferencesdialog.cpp
index 90e02ce..1e9a65a 100644
--- a/conf/preferencesdialog.cpp
+++ b/conf/preferencesdialog.cpp
@@ -99,3 +99,11 @@ void PreferencesDialog::slotToggleAfterFinishAction(int state)
 {
     dlgAdv.kcfg_AfterFinishAction->setEnabled(state == Qt::Checked);
 }
+
+void PreferencesDialog::updateWidgetsDefault()
+{
+    emit resetDefaults();
+    KConfigDialog::updateWidgetsDefault();
+}
+
+
diff --git a/conf/preferencesdialog.h b/conf/preferencesdialog.h
index fece204..ce85448 100644
--- a/conf/preferencesdialog.h
+++ b/conf/preferencesdialog.h
@@ -23,10 +23,14 @@ class PreferencesDialog : public KConfigDialog
     public:
         PreferencesDialog( QWidget * parent, KConfigSkeleton * config );
 
+    signals:
+        void resetDefaults();
+
     private slots:
         void slotToggleAfterFinishAction(int state);
         void disableApplyButton();
         void enableApplyButton();
+        virtual void updateWidgetsDefault();
 
     private:
         Ui::DlgAdvanced dlgAdv;
diff --git a/conf/verificationpreferences.cpp b/conf/verificationpreferences.cpp
index f49cedc..bfc8892 100644
--- a/conf/verificationpreferences.cpp
+++ b/conf/verificationpreferences.cpp
@@ -43,7 +43,7 @@ VerificationPreferences::VerificationPreferences(KConfigDialog *parent, Qt::Wind
     connect(ui.keyservers, &KEditListWidget::changed, this, &VerificationPreferences::changed);
     connect(parent, SIGNAL(accepted()), SLOT(slotAccpeted()));
     connect(parent, SIGNAL(rejected()), SLOT(slotRejected()));
-    connect(parent, SIGNAL(defaultClicked()), SLOT(slotDefaultClicked()));
+    connect(parent, SIGNAL(resetDefaults()), SLOT(slotDefaultClicked()));
 }
 
 void VerificationPreferences::slotAccpeted()

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