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

List:       kde-commits
Subject:    branches/KDE/3.5/kdeutils/kwallet/konfigurator
From:       Helio Chissini de Castro <helio () conectiva ! com ! br>
Date:       2006-08-22 5:31:09
Message-ID: 1156224669.789854.6923.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 575800 by helio:

- Setting module to use system defaults

 M  +7 -15     konfigurator.cpp  
 M  +1 -0      konfigurator.h  


--- branches/KDE/3.5/kdeutils/kwallet/konfigurator/konfigurator.cpp #575799:575800
@@ -177,9 +177,13 @@
 	emit changed(true);
 }
 
-
 void KWalletConfig::load() {
+	load( false );
+}
+
+void KWalletConfig::load(bool useDefaults) {
 	KConfigGroup config(_cfg, "Wallet");
+	config.setReadDefaults( useDefaults );
 	_wcw->_enabled->setChecked(config.readBoolEntry("Enabled", true));
 	_wcw->_openPrompt->setChecked(config.readBoolEntry("Prompt on Open", true));
 	_wcw->_launchManager->setChecked(config.readBoolEntry("Launch Manager", true));
@@ -226,7 +230,7 @@
 			new QListViewItem(lvi, QString::null, *j, i18n("Always Deny"));
 		}
 	}
-	emit changed(false);
+	emit changed(useDefaults);
 }
 
 
@@ -287,19 +291,7 @@
 
 
 void KWalletConfig::defaults() {
-	_wcw->_enabled->setChecked(true);
-	_wcw->_openPrompt->setChecked(true);
-	_wcw->_launchManager->setChecked(true);
-	_wcw->_autocloseManager->setChecked(false);
-	_wcw->_screensaverLock->setChecked(false);
-	_wcw->_autoclose->setChecked(true);
-	_wcw->_closeIdle->setChecked(false);
-	_wcw->_idleTime->setValue(10);
-	_wcw->_defaultWallet->setCurrentItem(0);
-	_wcw->_localWalletSelected->setChecked(false);
-        _wcw->_localWallet->setCurrentItem( 0 );
-	_wcw->_accessList->clear();
-	emit changed(true);
+	load( true );
 }
 
 
--- branches/KDE/3.5/kdeutils/kwallet/konfigurator/konfigurator.h #575799:575800
@@ -33,6 +33,7 @@
 		virtual ~KWalletConfig();
 
 		void load();
+		void load( bool useDefaults );
 		void save();
 		void defaults();
 
[prev in list] [next in list] [prev in thread] [next in thread]