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

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

SVN commit 575758 by helio:

- Setting module to use system defaults

 M  +11 -12    kcmlaunch.cpp  
 M  +1 -0      kcmlaunch.h  


--- branches/KDE/3.5/kdebase/kcontrol/launch/kcmlaunch.cpp #575757:575758
@@ -146,11 +146,19 @@
     sb_taskbarTimeout->setEnabled( b );
 }
 
-  void
+void
 LaunchConfig::load()
 {
+	load( false );
+}
+
+void
+LaunchConfig::load(bool useDefaults)
+{
   KConfig c("klaunchrc", false, false);
 
+  c.setReadDefaults( useDefaults );
+
   c.setGroup("FeedbackStyle");
 
   bool busyCursor =
@@ -180,7 +188,7 @@
   slotBusyCursor( cb_busyCursor->currentItem() );
   slotTaskbarButton( taskbarButton );
 
-  emit changed( false );
+  emit changed( useDefaults );
 }
 
   void
@@ -214,16 +222,7 @@
   void
 LaunchConfig::defaults()
 {
-  cb_busyCursor->setCurrentItem(2);
-  cb_taskbarButton->setChecked(Default & TaskbarButton);
-
-  sb_cursorTimeout->setValue( 30 );
-  sb_taskbarTimeout->setValue( 30 );
-
-  slotBusyCursor( 2 );
-  slotTaskbarButton( Default & TaskbarButton );
- 
-  checkChanged();
+	load( true );
 }
 
   void
--- branches/KDE/3.5/kdebase/kcontrol/launch/kcmlaunch.h #575757:575758
@@ -37,6 +37,7 @@
     virtual ~LaunchConfig();
 
     void load();
+    void load(bool useDefaults);
     void save();
     void defaults();
 
[prev in list] [next in list] [prev in thread] [next in thread]