Diffstat (limited to 'noncore/settings/sound/soundsettings.cpp') (more/less context) (show whitespace changes)
-rw-r--r-- | noncore/settings/sound/soundsettings.cpp | 71 |
1 files changed, 41 insertions, 30 deletions
diff --git a/noncore/settings/sound/soundsettings.cpp b/noncore/settings/sound/soundsettings.cpp index d55a751..df3def5 100644 --- a/noncore/settings/sound/soundsettings.cpp +++ b/noncore/settings/sound/soundsettings.cpp @@ -40,21 +40,24 @@ using namespace Opie::Core; #include <sys/types.h> #include <unistd.h> #include <sys/stat.h> SoundSettings::SoundSettings( QWidget* parent, const char* objname, WFlags fl ) - : SoundSettingsBase( parent, objname, TRUE, fl ) + : SoundSettingsBase( parent, objname, true, fl ) { - keyReset=FALSE; + keyReset=false; noWarning=false; Config config( "qpe"); config.setGroup( "Volume" ); Config cfg("Vmemo"); - connect( qApp,SIGNAL( aboutToQuit()),SLOT( cleanUp()) ); - AlertCheckBox->setChecked(cfg.readBoolEntry("Alert")); + + +// connect(qApp,SIGNAL(aboutToQuit()),SLOT(cleanUp())); + + AlertCheckBox->setChecked( cfg.readBoolEntry("Alert", 1)); cfg.setGroup("Record"); int rate=config.readNumEntry("SampleRate", 22050); if(rate == 8000) sampleRate->setCurrentItem(0); else if(rate == 11025) @@ -69,26 +72,26 @@ SoundSettings::SoundSettings( QWidget* parent, const char* objname, WFlags fl ) stereoCheckBox->setChecked(cfg.readNumEntry("Stereo", 0)); //TODO hide if zaurus- mono only #if defined(QT_QWS_IPAQ) || defined(QT_QWS_SL5XXX) //since ipaq and zaurus have particular //devices - bool systemZaurus=FALSE; + bool systemZaurus=false; struct utsname name; /* check for embedix kernel running on the zaurus*/ if (uname(&name) != -1) {// TODO change this here,... QString release=name.release; - if( release.find("embedix",0,TRUE) != -1) { + if( release.find("embedix",0,true) != -1) { odebug << "IS System Zaurus" << oendl; - systemZaurus=TRUE; + systemZaurus=true; } } if(!systemZaurus) { - stereoCheckBox->setChecked(TRUE); + stereoCheckBox->setChecked(true); } - stereoCheckBox->setEnabled(FALSE); - sixteenBitCheckBox->setEnabled(FALSE); + stereoCheckBox->setEnabled(false); + sixteenBitCheckBox->setEnabled(false); #else #endif int sRate=cfg.readNumEntry("SizeLimit", 30); odebug << "" << sRate << "" << oendl; if(sRate ==30) @@ -104,30 +107,26 @@ SoundSettings::SoundSettings( QWidget* parent, const char* objname, WFlags fl ) else timeLimitComboBox->setCurrentItem(5); sixteenBitCheckBox->setChecked(cfg.readNumEntry("SixteenBit", 1)); cfg.setGroup("Defaults"); - keyComboBox->setCurrentItem(cfg.readNumEntry("toggleKey") ); + recordKey = cfg.readNumEntry("toggleKey"); + keyComboBox->setCurrentItem( recordKey); updateStorageCombo(); Config vmCfg("Vmemo"); vmCfg.setGroup("Defaults"); adpcmCheckBox->setChecked( vmCfg.readBoolEntry("use_ADPCM", 0)); - connect( LocationComboBox,SIGNAL(activated(const QString&)), this, - SLOT( setLocation(const QString&))); - connect( keyComboBox,SIGNAL(activated(int)), this, - SLOT( setKeyButton(int))); - connect( timeLimitComboBox,SIGNAL(activated(const QString&)), this, - SLOT( setSizeLimitButton(const QString&))); - connect( restartCheckBox,SIGNAL( toggled(bool)), this, - SLOT( restartOpie(bool))); - connect( adpcmCheckBox,SIGNAL( toggled(bool)), this, - SLOT( slotAdpcm(bool))); + connect(LocationComboBox,SIGNAL(activated(const QString&)),this,SLOT(setLocation(const QString&))); + connect(keyComboBox,SIGNAL(activated(int)),this,SLOT(setKeyButton(int))); + connect(timeLimitComboBox,SIGNAL(activated(const QString&)),this,SLOT(setSizeLimitButton(const QString&))); + connect(restartCheckBox,SIGNAL( toggled(bool)),this,SLOT(restartOpie(bool))); + connect(adpcmCheckBox,SIGNAL( toggled(bool)),this,SLOT(slotAdpcm(bool))); // connect( qApp,SIGNAL( aboutToQuit()),SLOT( cleanUp()) ); } void SoundSettings::updateStorageCombo() { @@ -146,13 +145,13 @@ void SoundSettings::updateStorageCombo() { QListIterator<FileSystem> it ( fs ); for( ; it.current(); ++it ){ const QString name = (*it)->name(); const QString path = (*it)->path(); odebug << "storage name "+name +" storage path is "+path << oendl; list << name + ": " +path; - if( loc.find( path,0,TRUE) != -1) + if( loc.find( path,0,true) != -1) set = i; // if(dit.current()->file().find(path) != -1 ) storage=name; i++; } LocationComboBox->insertStringList(list); @@ -165,50 +164,62 @@ void SoundSettings::setLocation(const QString & string) { config.setGroup( "System" ); config.writeEntry("RecLocation",string); odebug << "set location "+string << oendl; config.write(); } + void SoundSettings::accept() { + cleanUp(); + qApp->quit(); +} + + void SoundSettings::cleanUp() { + Config cfg("Vmemo"); cfg.writeEntry("Alert",AlertCheckBox->isChecked()); cfg.setGroup("Record"); cfg.writeEntry("SampleRate",sampleRate->currentText()); cfg.writeEntry("Stereo",stereoCheckBox->isChecked()); cfg.writeEntry("SixteenBit",sixteenBitCheckBox->isChecked()); if(keyReset && noWarning) { QCopEnvelope ("QPE/System", "restart()"); } + cfg.setGroup("Defaults"); + cfg.writeEntry( "toggleKey", recordKey); + if( recordKey == 1) { + cfg.writeEntry( "hideIcon", 0 ); + } + else { + cfg.writeEntry( "hideIcon", 1); + } + cfg.write(); } void SoundSettings::setKeyButton( int index) { - Config cfg("Vmemo"); - cfg.setGroup("Defaults"); - cfg.writeEntry( "toggleKey", index ); - keyReset = TRUE; + recordKey = index; + restartCheckBox->setChecked(true); + keyReset = true; if( index == 1) { - cfg.writeEntry( "hideIcon", 0 ); keyLabel->setText(tr("Shows icon")); } else { - cfg.writeEntry( "hideIcon", 1); keyLabel->setText(tr("Hides icon")); } - cfg.write(); } void SoundSettings::updateLocationCombo() { } void SoundSettings::setSizeLimitButton(const QString &index) { Config cfg("Vmemo"); cfg.setGroup("Record"); - if(index.find("Unlimited",0,TRUE) != -1) + if(index.find("Unlimited",0,true) != -1) cfg.writeEntry("SizeLimit", -1); else cfg.writeEntry("SizeLimit", index); cfg.write(); } |