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

List:       kde-commits
Subject:    branches/KDE/3.5/kdebase/kcontrol/screensaver
From:       Helio Chissini de Castro <helio () conectiva ! com ! br>
Date:       2006-08-22 3:12:04
Message-ID: 1156216324.203064.29490.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 575773 by helio:

- Setting module to use system defaults

 M  +13 -22    scrnsave.cpp  
 M  +2 -1      scrnsave.h  


--- branches/KDE/3.5/kdebase/kcontrol/screensaver/scrnsave.cpp #575772:575773
@@ -111,7 +111,7 @@
                                      KGlobal::dirs()->kde_default("apps") +
                                      relPath);
 
-    readSettings();
+    readSettings( false );
 
     mSetupProc = new KProcess;
     connect(mSetupProc, SIGNAL(processExited(KProcess *)),
@@ -344,8 +344,13 @@
 //
 void KScreenSaver::load()
 {
-    readSettings();
+	load( false );
+}
 
+void KScreenSaver::load( bool useDefaults )
+{
+    readSettings( useDefaults);
+
 //with the following line, the Test and Setup buttons are not enabled correctly
 //if no saver was selected, the "Reset" and the "Enable screensaver", it is only \
called when starting and when pressing reset, aleXXX  //    mSelected = -1;
@@ -370,16 +375,18 @@
     }
 
     updateValues();
-    mChanged = false;
-    emit changed(false);
+    mChanged = useDefaults;
+    emit changed( useDefaults );
 }
 
 //------------------------------------------------------------After---------------
 //
-void KScreenSaver::readSettings()
+void KScreenSaver::readSettings( bool useDefaults )
 {
     KConfig *config = new KConfig( "kdesktoprc");
 
+	 config->setReadDefaults( useDefaults );
+
     mImmutable = config->groupIsImmutable("ScreenSaver");
 
     config->setGroup( "ScreenSaver" );
@@ -419,23 +426,7 @@
 //
 void KScreenSaver::defaults()
 {
-    if (mImmutable) return;
-
-    slotScreenSaver( 0 );
-
-    QListViewItem *item = mSaverListView->firstChild();
-    if (item) {
-        mSaverListView->setSelected( item, true );
-        mSaverListView->setCurrentItem( item );
-        mSaverListView->ensureItemVisible( item );
-    }
-    slotTimeoutChanged( 5 );
-    slotLockTimeoutChanged( 60 );
-    slotLock( false );
-
-    updateValues();
-
-    emit changed(true);
+	load( true );
 }
 
 //---------------------------------------------------------------------------
--- branches/KDE/3.5/kdebase/kcontrol/screensaver/scrnsave.h #575772:575773
@@ -39,11 +39,12 @@
     ~KScreenSaver();
 
     virtual void load();
+    virtual void load(bool useDefaults);
     virtual void save();
     virtual void defaults();
 
     void updateValues();
-    void readSettings();
+    void readSettings(bool useDefaults);
 
 protected slots:
     void slotEnable( bool );


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