author | llornkcor <llornkcor> | 2002-05-23 02:36:05 (UTC) |
---|---|---|
committer | llornkcor <llornkcor> | 2002-05-23 02:36:05 (UTC) |
commit | 375cce9ad697f99d54f3e1c60c6d197b535ed04e (patch) (side-by-side diff) | |
tree | 299200dba1ca7ebf626e57585c5a7e8ca0c82492 /noncore/settings/sound/soundsettings.cpp | |
parent | d295491048567c8424643b983a21dc503857d91a (diff) | |
download | opie-375cce9ad697f99d54f3e1c60c6d197b535ed04e.zip opie-375cce9ad697f99d54f3e1c60c6d197b535ed04e.tar.gz opie-375cce9ad697f99d54f3e1c60c6d197b535ed04e.tar.bz2 |
moved screen, key, and alarm sound settings to volumeapplet, changed config to new place, changed from ui
Diffstat (limited to 'noncore/settings/sound/soundsettings.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | noncore/settings/sound/soundsettings.cpp | 84 |
1 files changed, 46 insertions, 38 deletions
diff --git a/noncore/settings/sound/soundsettings.cpp b/noncore/settings/sound/soundsettings.cpp index c1918de..cdee87c 100644 --- a/noncore/settings/sound/soundsettings.cpp +++ b/noncore/settings/sound/soundsettings.cpp @@ -8,160 +8,168 @@ ** Foundation and appearing in the file LICENSE.GPL included in the ** packaging of this file. ** ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. ** ** See http://www.trolltech.com/gpl/ for GPL licensing information. ** ** Contact info@trolltech.com if any conditions of this licensing are ** not clear to you. ** **********************************************************************/ + #include "soundsettings.h" #include <qpe/config.h> #include <qpe/qcopenvelope_qws.h> #include <qpe/storage.h> #include <qapplication.h> #include <qslider.h> #include <qcheckbox.h> #include <qlineedit.h> #include <qcombobox.h> SoundSettings::SoundSettings( QWidget* parent, const char* name, WFlags fl ) : SoundSettingsBase( parent, name, TRUE, fl ) { - Config config( "Sound" ); - config.setGroup( "System" ); - volume->setValue(100-config.readNumEntry("Volume")); + Config config( "qpe"); + config.setGroup( "Volume" ); + volume->setValue(100-config.readNumEntry("VolumePercent")); mic->setValue(100-config.readNumEntry("Mic")); - touchsound->setChecked(config.readBoolEntry("Touch")); - keysound->setChecked(config.readBoolEntry("Key")); - AlertCheckBox->setChecked(config.readBoolEntry("Alert")); +// touchsound->setChecked(config.readBoolEntry("TouchSound")); +// keysound->setChecked(config.readBoolEntry("KeySound")); + Config cfg("Vmemo"); + AlertCheckBox->setChecked(cfg.readBoolEntry("Alert")); - config.setGroup("Record"); + cfg.setGroup("Record"); int rate=config.readNumEntry("SampleRate", 22050); - if(rate == 11025) + if(rate == 8000) sampleRate->setCurrentItem(0); - else if(rate == 22050) + else if(rate == 11025) sampleRate->setCurrentItem(1); - else if(rate == 32000) + else if(rate == 22050) sampleRate->setCurrentItem(2); + else if(rate == 33075) + sampleRate->setCurrentItem(3); else if(rate==44100) - sampleRate->setCurrentItem(2); + sampleRate->setCurrentItem(4); - stereoCheckBox->setChecked(config.readNumEntry("Stereo", 0)); - sixteenBitCheckBox->setChecked(config.readNumEntry("SixteenBit", 1)); + stereoCheckBox->setChecked(cfg.readNumEntry("Stereo", 0)); + sixteenBitCheckBox->setChecked(cfg.readNumEntry("SixteenBit", 1)); updateStorageCombo(); connect(volume, SIGNAL(valueChanged(int)), this, SLOT(setVolume(int))); connect(mic, SIGNAL(valueChanged(int)), this, SLOT(setMic(int))); connect(qApp, SIGNAL( volumeChanged(bool) ), this, SLOT( volumeChanged(bool) ) ); connect(qApp, SIGNAL( micChanged(bool) ), this, SLOT ( micChanged(bool) ) ); connect( LocationComboBox,SIGNAL(activated(const QString &)),this,SLOT( setLocation(const QString &))); // connect( qApp,SIGNAL( aboutToQuit()),SLOT( cleanUp()) ); } void SoundSettings::reject() { - Config config( "Sound" ); - config.setGroup( "System" ); + Config config( "qpe"); + config.setGroup( "Volume"); - setVolume(100-config.readNumEntry("Volume")); + setVolume(100-config.readNumEntry("VolumePercent")); setMic(100-config.readNumEntry("Mic")); // config.setGroup("Record"); // int rate=config.readNumEntry("SampleRate", 11025); // if(rate == 11025) // sampleRate->setCurrentItem(0); // else if(rate == 22050) // sampleRate->setCurrentItem(1); // else if(rate == 32000) // sampleRate->setCurrentItem(2); // else if(rate==44100) // sampleRate->setCurrentItem(3); // stereoCheckBox->setChecked(config.readNumEntry("Stereo", 0)); // sixteenBitCheckBox->setChecked(config.readNumEntry("SixteenBit", 0)); QDialog::reject(); } void SoundSettings::accept() { - Config config( "Sound" ); - config.setGroup( "System" ); - config.writeEntry("Volume",100-volume->value()); + Config config( "qpe" ); + config.setGroup( "Volume" ); + config.writeEntry("VolumePercent",100-volume->value()); config.writeEntry("Mic",100-mic->value()); - config.writeEntry("Touch",touchsound->isChecked()); - config.writeEntry("Key",keysound->isChecked()); - config.writeEntry("Alert",AlertCheckBox->isChecked()); +// config.writeEntry("TouchSound",touchsound->isChecked()); +// config.writeEntry("KeySound",keysound->isChecked()); + + Config cfg("Vmemo"); + cfg.writeEntry("Alert",AlertCheckBox->isChecked()); setVolume(volume->value()); setMic(mic->value()); - config.setGroup("Record"); - config.writeEntry("SampleRate",sampleRate->currentText()); - config.writeEntry("Stereo",stereoCheckBox->isChecked()); - config.writeEntry("SixteenBit",sixteenBitCheckBox->isChecked()); - + cfg.setGroup("Record"); + cfg.writeEntry("SampleRate",sampleRate->currentText()); + cfg.writeEntry("Stereo",stereoCheckBox->isChecked()); + cfg.writeEntry("SixteenBit",sixteenBitCheckBox->isChecked()); +// Config cfg( "VMemo" ); +// cfg.setGroup( "Defaults" ); +// cfg.writeEntry( "hideIcon", HideIcon_CheckBox->isChecked()); QDialog::accept(); } void SoundSettings::setVolume(int v) { - Config config( "Sound" ); - config.setGroup( "System" ); - config.writeEntry("Volume",100-v); + Config config( "qpe" ); + config.setGroup( "Volume" ); + config.writeEntry("VolumePercent",100-v); #if ( defined Q_WS_QWS || defined(_WS_QWS_) ) && !defined(QT_NO_COP) QCopEnvelope( "QPE/System", "volumeChange(bool)" ) << FALSE; #endif } void SoundSettings::setMic(int m) { - Config config( "Sound" ); - config.setGroup( "System" ); + Config config( "qpe" ); + config.setGroup( "Volume" ); config.writeEntry("Mic",100-m); #if ( defined Q_WS_QWS || defined(_WS_QWS_) ) && !defined(QT_NO_COP) QCopEnvelope( "QPE/System", "micChange(bool)" ) << FALSE; #endif } void SoundSettings::volumeChanged( bool ) { - Config config( "Sound" ); - config.setGroup( "System" ); - volume->setValue(100-config.readNumEntry("Volume")); + Config config( "qpe" ); + config.setGroup( "Volume" ); + volume->setValue(100-config.readNumEntry("VolumePercent")); } void SoundSettings::micChanged( bool ) { - Config config( "Sound" ); - config.setGroup( "System" ); + Config config( "qpe" ); + config.setGroup( "Volume" ); mic->setValue(100-config.readNumEntry("Mic")); } void SoundSettings::updateStorageCombo() { StorageInfo storageInfo; QString sName, sPath; QStringList list; const QList<FileSystem> &fs = storageInfo.fileSystems(); QListIterator<FileSystem> it ( fs ); for( ; it.current(); ++it ){ const QString name = (*it)->name(); const QString path = (*it)->path(); qDebug("storage name "+name +" storage path is "+path); list << name + ": " +path; // if(dit.current()->file().find(path) != -1 ) storage=name; } LocationComboBox->insertStringList(list); } void SoundSettings::setLocation(const QString & string) { - Config config( "Sound" ); + Config config( "Vmemo" ); config.setGroup( "System" ); config.writeEntry("RecLocation",string); } |