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

List:       kde-commits
Subject:    branches/KDE/3.5/kdemultimedia/kioslave/audiocd/kcmaudiocd
From:       Helio Chissini de Castro <helio () conectiva ! com ! br>
Date:       2006-08-22 5:00:14
Message-ID: 1156222814.106125.4323.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 575789 by helio:

- Setting module to use system defaults

 M  +10 -17    kcmaudiocd.cpp  
 M  +1 -0      kcmaudiocd.h  


--- branches/KDE/3.5/kdemultimedia/kioslave/audiocd/kcmaudiocd/kcmaudiocd.cpp #575788:575789
@@ -100,23 +100,7 @@
 }
 
 void KAudiocdModule::defaults() {
-	cd_specify_device->setChecked(false);
-	cd_device_string->setText("/dev/cdrom");
-
-	ec_enable_check->setChecked(true);
-	ec_skip_check->setChecked(false);
-	niceLevel->setValue(0);
-	
-	kcfg_replaceInput->setText("");
-	kcfg_replaceOutput->setText("");
-	example->setText(i18n("Cool artist - example audio file.wav"));
-	KConfigDialogManager *widget;
-	for ( widget = encoderSettings.first(); widget; widget = encoderSettings.next() ){
-		widget->updateWidgetsDefault();
-	}
-
-	fileNameLineEdit->setText("%{albumartist} - %{number} - %{title}");
-	albumNameLineEdit->setText("%{albumartist} - %{albumtitle}");
+	load( false );
 }
 
 void KAudiocdModule::save() {
@@ -157,10 +141,17 @@
 }
 
 void KAudiocdModule::load() {
+	load( false );
+}
 
+void KAudiocdModule::load(bool useDefaults) {
+
+	config->setReadDefaults( useDefaults );
+
   {
     KConfigGroupSaver saver(config, "CDDA");
 
+
     // Specify <=> not autosearch, as explained above in ::save()
     cd_specify_device->setChecked( !(config->readBoolEntry("autosearch",true)) );
     cd_device_string->setText(config->readEntry("device","/dev/cdrom"));
@@ -182,6 +173,8 @@
   for ( widget = encoderSettings.first(); widget; widget = encoderSettings.next() ){
     widget->updateWidgets();
   }
+
+  emit changed( useDefaults );
 }
 
 void KAudiocdModule::slotModuleChanged() {
--- branches/KDE/3.5/kdemultimedia/kioslave/audiocd/kcmaudiocd/kcmaudiocd.h #575788:575789
@@ -44,6 +44,7 @@
   void defaults();
   void save();
   void load();
+  void load(bool useDefaults);
 
 private slots:
   void updateExample();
[prev in list] [next in list] [prev in thread] [next in thread]