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

List:       kde-commits
Subject:    branches/KDE/3.5/kdebase/kcontrol/knotify
From:       Helio Chissini de Castro <helio () conectiva ! com ! br>
Date:       2006-08-21 23:44:47
Message-ID: 1156203887.074486.15295.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 575729 by helio:

- Setting module to use system defaults

 M  +11 -4     knotify.cpp  
 M  +2 -1      knotify.h  


--- branches/KDE/3.5/kdebase/kcontrol/knotify/knotify.cpp #575728:575729
@@ -147,12 +147,17 @@
 void KCMKNotify::defaults()
 {
     m_notifyWidget->resetDefaults( true ); // ask user
+	 load( true );
 }
 
 void KCMKNotify::load()
 {
+	load( false );
+}
+
+void KCMKNotify::load( bool useDefaults )
+{
     setEnabled( false );
-    // setCursor( KCursor::waitCursor() );
 
     m_appCombo->clear();
     m_notifyWidget->clear();
@@ -169,6 +174,7 @@
     m_notifyWidget->setEnabled( !allApps.isEmpty() );
 
     KConfig config( "knotifyrc", true, false );
+	 config.setReadDefaults( useDefaults );
     config.setGroup( "Misc" );
     QString select = config.readEntry( "LastConfiguredApp" );
     if( select.isEmpty())
@@ -193,7 +199,7 @@
 
     // unsetCursor(); // unsetting doesn't work. sigh.
     setEnabled( true );
-    emit changed( false );
+    emit changed( useDefaults );
 }
 
 void KCMKNotify::save()
@@ -221,7 +227,7 @@
     m_ui = new PlayerSettingsUI(frame);
     topLayout->addWidget(m_ui);
 
-    load();
+    load( false );
     dataChanged = false;
     enableButton(Apply, false);
 
@@ -231,9 +237,10 @@
     connect( m_ui->reqExternal, SIGNAL( textChanged( const QString& ) ), this, SLOT( slotChanged() ) );
 }
 
-void PlayerSettingsDialog::load()
+void PlayerSettingsDialog::load( bool useDefaults )
 {
     KConfig config( "knotifyrc", true, false );
+	 config.setReadDefaults( useDefaults );
     config.setGroup( "Misc" );
     bool useExternal = config.readBoolEntry( "Use external player", false );
     m_ui->cbExternal->setChecked( useExternal );
--- branches/KDE/3.5/kdebase/kcontrol/knotify/knotify.h #575728:575729
@@ -54,6 +54,7 @@
 
     virtual void defaults();
     virtual void save();
+    virtual void load(bool useDefaults );
 
 public slots:
     virtual void load();
@@ -77,7 +78,7 @@
 
 public:
     PlayerSettingsDialog( QWidget *parent, bool modal );
-    void load();
+    void load( bool useDefaults );
     void save();
 
 protected slots:
[prev in list] [next in list] [prev in thread] [next in thread]