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

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

SVN commit 575776 by helio:

- Setting module to use system defaults

 M  +8 -8      kcmsmserver.cpp  
 M  +1 -0      kcmsmserver.h  


--- branches/KDE/3.5/kdebase/kcontrol/smserver/kcmsmserver.cpp #575775:575776
@@ -58,7 +58,13 @@
 
 void SMServerConfig::load()
 {
+	load( false );
+}
+
+void SMServerConfig::load(bool useDefaults )
+{
   KConfig *c = new KConfig("ksmserverrc", false, false);
+  c->setReadDefaults( useDefaults );
   c->setGroup("General");
   dialog->confirmLogoutCheck->setChecked(c->readBoolEntry("confirmLogout", true));
   bool en = c->readBoolEntry("offerShutdown", true);
@@ -88,7 +94,7 @@
 
   delete c;
 
-  emit changed(false);
+  emit changed(useDefaults);
 }
 
 void SMServerConfig::save()
@@ -121,13 +127,7 @@
 
 void SMServerConfig::defaults()
 {
-  dialog->previousSessionRadio->setChecked(true);
-  dialog->confirmLogoutCheck->setChecked(true);
-  dialog->offerShutdownCheck->setChecked(true);
-  dialog->sdGroup->setEnabled(true);
-  dialog->logoutRadio->setChecked(true);
-  dialog->excludeLineedit->setText("");
-
+	load( true );
 }
 
 #include "kcmsmserver.moc"
--- branches/KDE/3.5/kdebase/kcontrol/smserver/kcmsmserver.h #575775:575776
@@ -34,6 +34,7 @@
   SMServerConfig( QWidget *parent=0, const char* name=0, const QStringList &list=QStringList() );
 
   void load();
+  void load(bool useDefaults);
   void save();
   void defaults();
 
[prev in list] [next in list] [prev in thread] [next in thread]