| -rw-r--r-- | noncore/settings/sound/sound.pro | 2 | ||||
| -rw-r--r-- | noncore/settings/sound/soundsettings.cpp | 6 | ||||
| -rw-r--r-- | noncore/settings/sound/soundsettingsbase.ui | 6 |
3 files changed, 12 insertions, 2 deletions
diff --git a/noncore/settings/sound/sound.pro b/noncore/settings/sound/sound.pro index 8b33ff2..fa87b86 100644 --- a/noncore/settings/sound/sound.pro +++ b/noncore/settings/sound/sound.pro @@ -1,12 +1,12 @@ TEMPLATE = app CONFIG += qt warn_on release DESTDIR = ../../bin HEADERS = soundsettings.h SOURCES = soundsettings.cpp main.cpp INTERFACES = soundsettingsbase.ui INCLUDEPATH += $(OPIEDIR)/include DEPENDPATH += ../$(OPIEDIR)/include LIBS += -lqpe TARGET = sound -TRANSLATIONS = ../../i18n/pt_BR/sound.ts +TRANSLATIONS += ../../i18n/pt_BR/sound.ts diff --git a/noncore/settings/sound/soundsettings.cpp b/noncore/settings/sound/soundsettings.cpp index 55f6c99..467f23e 100644 --- a/noncore/settings/sound/soundsettings.cpp +++ b/noncore/settings/sound/soundsettings.cpp @@ -31,59 +31,63 @@ 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")); touchsound->setChecked(config.readBoolEntry("Touch")); keysound->setChecked(config.readBoolEntry("Key")); 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(2); stereoCheckBox->setChecked(config.readNumEntry("Stereo", 0)); sixteenBitCheckBox->setChecked(config.readNumEntry("SixteenBit", 1)); 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) ) ); } void SoundSettings::reject() { Config config( "Sound" ); config.setGroup( "System" ); setVolume(100-config.readNumEntry("Volume")); 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==44100) + 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.writeEntry("Mic",100-mic->value()); config.writeEntry("Touch",touchsound->isChecked()); config.writeEntry("Key",keysound->isChecked()); setVolume(volume->value()); diff --git a/noncore/settings/sound/soundsettingsbase.ui b/noncore/settings/sound/soundsettingsbase.ui index 0351fd8..97bea2d 100644 --- a/noncore/settings/sound/soundsettingsbase.ui +++ b/noncore/settings/sound/soundsettingsbase.ui @@ -113,32 +113,38 @@ <class>QComboBox</class> <item> <property> <name>text</name> <string>11025</string> </property> </item> <item> <property> <name>text</name> <string>22050</string> </property> </item> <item> <property> <name>text</name> + <string>32000</string> + </property> + </item> + <item> + <property> + <name>text</name> <string>44100</string> </property> </item> <property stdset="1"> <name>name</name> <cstring>sampleRate</cstring> </property> </widget> <widget> <class>QCheckBox</class> <property stdset="1"> <name>name</name> <cstring>stereoCheckBox</cstring> </property> <property stdset="1"> <name>text</name> |