author | llornkcor <llornkcor> | 2002-03-17 13:08:37 (UTC) |
---|---|---|
committer | llornkcor <llornkcor> | 2002-03-17 13:08:37 (UTC) |
commit | 2f18edca6cc3539298deccee89e6f4dd7a2570a2 (patch) (side-by-side diff) | |
tree | 58eefa2b254a4c30a266681bd077e0e8029384e3 /noncore/settings/sound/soundsettings.cpp | |
parent | 578725ca25862c0b06b1991a7bc8ffc2ad8ae13e (diff) | |
download | opie-2f18edca6cc3539298deccee89e6f4dd7a2570a2.zip opie-2f18edca6cc3539298deccee89e6f4dd7a2570a2.tar.gz opie-2f18edca6cc3539298deccee89e6f4dd7a2570a2.tar.bz2 |
changed line edit to combo, and changed labels and layout
Diffstat (limited to 'noncore/settings/sound/soundsettings.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | noncore/settings/sound/soundsettings.cpp | 51 |
1 files changed, 33 insertions, 18 deletions
diff --git a/noncore/settings/sound/soundsettings.cpp b/noncore/settings/sound/soundsettings.cpp index 17dbdc0..c2bf405 100644 --- a/noncore/settings/sound/soundsettings.cpp +++ b/noncore/settings/sound/soundsettings.cpp @@ -16,88 +16,103 @@ ** 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 <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")); - mic->setValue(100-config.readNumEntry("Mic")); + mic->setValue(100-config.readNumEntry("Mic")); touchsound->setChecked(config.readBoolEntry("Touch")); keysound->setChecked(config.readBoolEntry("Key")); - config.setGroup("Record"); - sampleRate->setText(config.readEntry("SampleRate", "11025")); - stereoCheckBox->setChecked(config.readNumEntry("Stereo", 0)); - sixteenBitCheckBox->setChecked(config.readNumEntry("SixteenBit", 0)); + 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==44100) + sampleRate->setCurrentItem(2); + + stereoCheckBox->setChecked(config.readNumEntry("Stereo", 0)); + sixteenBitCheckBox->setChecked(config.readNumEntry("SixteenBit", 0)); 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(qApp, SIGNAL( micChanged(bool) ), this, SLOT ( micChanged(bool) ) ); } void SoundSettings::reject() { Config config( "Sound" ); config.setGroup( "System" ); setVolume(100-config.readNumEntry("Volume")); - setMic(100-config.readNumEntry("Mic")); + setMic(100-config.readNumEntry("Mic")); - config.setGroup("Record"); - sampleRate->setText(config.readEntry("SampleRate", "11025")); - stereoCheckBox->setChecked(config.readNumEntry("Stereo", 0)); - sixteenBitCheckBox->setChecked(config.readNumEntry("SixteenBit", 0)); + 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==44100) + sampleRate->setCurrentItem(2); + 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.writeEntry("Mic",100-mic->value()); config.writeEntry("Touch",touchsound->isChecked()); config.writeEntry("Key",keysound->isChecked()); setVolume(volume->value()); - setMic(mic->value()); + setMic(mic->value()); - config.setGroup("Record"); - config.writeEntry("SampleRate",sampleRate->text()); - config.writeEntry("Stereo",stereoCheckBox->isChecked()); - config.writeEntry("SixteenBit",sixteenBitCheckBox->isChecked()); - + config.setGroup("Record"); + config.writeEntry("SampleRate",sampleRate->currentText()); + config.writeEntry("Stereo",stereoCheckBox->isChecked()); + config.writeEntry("SixteenBit",sixteenBitCheckBox->isChecked()); + QDialog::accept(); } void SoundSettings::setVolume(int v) { Config config( "Sound" ); config.setGroup( "System" ); config.writeEntry("Volume",100-v); #if ( defined Q_WS_QWS || defined(_WS_QWS_) ) && !defined(QT_NO_COP) - QCopEnvelope( "QPE/System", "volumeChange(bool)" ) << FALSE; + QCopEnvelope( "QPE/System", "volumeChange(bool)" ) << FALSE; #endif } void SoundSettings::setMic(int m) { Config config( "Sound" ); config.setGroup( "System" ); config.writeEntry("Mic",100-m); #if ( defined Q_WS_QWS || defined(_WS_QWS_) ) && !defined(QT_NO_COP) QCopEnvelope( "QPE/System", "micChange(bool)" ) << FALSE; #endif } |