summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/settings/sound/soundsettings.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/noncore/settings/sound/soundsettings.cpp b/noncore/settings/sound/soundsettings.cpp
index 51522b3..c1918de 100644
--- a/noncore/settings/sound/soundsettings.cpp
+++ b/noncore/settings/sound/soundsettings.cpp
@@ -18,49 +18,50 @@
18** 18**
19**********************************************************************/ 19**********************************************************************/
20#include "soundsettings.h" 20#include "soundsettings.h"
21 21
22#include <qpe/config.h> 22#include <qpe/config.h>
23#include <qpe/qcopenvelope_qws.h> 23#include <qpe/qcopenvelope_qws.h>
24#include <qpe/storage.h> 24#include <qpe/storage.h>
25 25
26#include <qapplication.h> 26#include <qapplication.h>
27#include <qslider.h> 27#include <qslider.h>
28#include <qcheckbox.h> 28#include <qcheckbox.h>
29#include <qlineedit.h> 29#include <qlineedit.h>
30#include <qcombobox.h> 30#include <qcombobox.h>
31 31
32 32
33SoundSettings::SoundSettings( QWidget* parent, const char* name, WFlags fl ) 33SoundSettings::SoundSettings( QWidget* parent, const char* name, WFlags fl )
34 : SoundSettingsBase( parent, name, TRUE, fl ) 34 : SoundSettingsBase( parent, name, TRUE, fl )
35{ 35{
36 Config config( "Sound" ); 36 Config config( "Sound" );
37 config.setGroup( "System" ); 37 config.setGroup( "System" );
38 volume->setValue(100-config.readNumEntry("Volume")); 38 volume->setValue(100-config.readNumEntry("Volume"));
39 mic->setValue(100-config.readNumEntry("Mic")); 39 mic->setValue(100-config.readNumEntry("Mic"));
40 touchsound->setChecked(config.readBoolEntry("Touch")); 40 touchsound->setChecked(config.readBoolEntry("Touch"));
41 keysound->setChecked(config.readBoolEntry("Key")); 41 keysound->setChecked(config.readBoolEntry("Key"));
42 42 AlertCheckBox->setChecked(config.readBoolEntry("Alert"));
43
43 config.setGroup("Record"); 44 config.setGroup("Record");
44 int rate=config.readNumEntry("SampleRate", 22050); 45 int rate=config.readNumEntry("SampleRate", 22050);
45 if(rate == 11025) 46 if(rate == 11025)
46 sampleRate->setCurrentItem(0); 47 sampleRate->setCurrentItem(0);
47 else if(rate == 22050) 48 else if(rate == 22050)
48 sampleRate->setCurrentItem(1); 49 sampleRate->setCurrentItem(1);
49 else if(rate == 32000) 50 else if(rate == 32000)
50 sampleRate->setCurrentItem(2); 51 sampleRate->setCurrentItem(2);
51 else if(rate==44100) 52 else if(rate==44100)
52 sampleRate->setCurrentItem(2); 53 sampleRate->setCurrentItem(2);
53 54
54 stereoCheckBox->setChecked(config.readNumEntry("Stereo", 0)); 55 stereoCheckBox->setChecked(config.readNumEntry("Stereo", 0));
55 sixteenBitCheckBox->setChecked(config.readNumEntry("SixteenBit", 1)); 56 sixteenBitCheckBox->setChecked(config.readNumEntry("SixteenBit", 1));
56 57
57 updateStorageCombo(); 58 updateStorageCombo();
58 connect(volume, SIGNAL(valueChanged(int)), this, SLOT(setVolume(int))); 59 connect(volume, SIGNAL(valueChanged(int)), this, SLOT(setVolume(int)));
59 connect(mic, SIGNAL(valueChanged(int)), this, SLOT(setMic(int))); 60 connect(mic, SIGNAL(valueChanged(int)), this, SLOT(setMic(int)));
60 connect(qApp, SIGNAL( volumeChanged(bool) ), this, SLOT( volumeChanged(bool) ) ); 61 connect(qApp, SIGNAL( volumeChanged(bool) ), this, SLOT( volumeChanged(bool) ) );
61 connect(qApp, SIGNAL( micChanged(bool) ), this, SLOT ( micChanged(bool) ) ); 62 connect(qApp, SIGNAL( micChanged(bool) ), this, SLOT ( micChanged(bool) ) );
62 connect( LocationComboBox,SIGNAL(activated(const QString &)),this,SLOT( setLocation(const QString &))); 63 connect( LocationComboBox,SIGNAL(activated(const QString &)),this,SLOT( setLocation(const QString &)));
63// connect( qApp,SIGNAL( aboutToQuit()),SLOT( cleanUp()) ); 64// connect( qApp,SIGNAL( aboutToQuit()),SLOT( cleanUp()) );
64} 65}
65 66
66void SoundSettings::reject() 67void SoundSettings::reject()
@@ -74,49 +75,49 @@ void SoundSettings::reject()
74// config.setGroup("Record"); 75// config.setGroup("Record");
75// int rate=config.readNumEntry("SampleRate", 11025); 76// int rate=config.readNumEntry("SampleRate", 11025);
76// if(rate == 11025) 77// if(rate == 11025)
77// sampleRate->setCurrentItem(0); 78// sampleRate->setCurrentItem(0);
78// else if(rate == 22050) 79// else if(rate == 22050)
79// sampleRate->setCurrentItem(1); 80// sampleRate->setCurrentItem(1);
80// else if(rate == 32000) 81// else if(rate == 32000)
81// sampleRate->setCurrentItem(2); 82// sampleRate->setCurrentItem(2);
82// else if(rate==44100) 83// else if(rate==44100)
83// sampleRate->setCurrentItem(3); 84// sampleRate->setCurrentItem(3);
84// stereoCheckBox->setChecked(config.readNumEntry("Stereo", 0)); 85// stereoCheckBox->setChecked(config.readNumEntry("Stereo", 0));
85// sixteenBitCheckBox->setChecked(config.readNumEntry("SixteenBit", 0)); 86// sixteenBitCheckBox->setChecked(config.readNumEntry("SixteenBit", 0));
86 87
87 QDialog::reject(); 88 QDialog::reject();
88} 89}
89 90
90void SoundSettings::accept() 91void SoundSettings::accept()
91{ 92{
92 Config config( "Sound" ); 93 Config config( "Sound" );
93 config.setGroup( "System" ); 94 config.setGroup( "System" );
94 config.writeEntry("Volume",100-volume->value()); 95 config.writeEntry("Volume",100-volume->value());
95 config.writeEntry("Mic",100-mic->value()); 96 config.writeEntry("Mic",100-mic->value());
96 config.writeEntry("Touch",touchsound->isChecked()); 97 config.writeEntry("Touch",touchsound->isChecked());
97 config.writeEntry("Key",keysound->isChecked()); 98 config.writeEntry("Key",keysound->isChecked());
98 99 config.writeEntry("Alert",AlertCheckBox->isChecked());
99 setVolume(volume->value()); 100 setVolume(volume->value());
100 setMic(mic->value()); 101 setMic(mic->value());
101 102
102 config.setGroup("Record"); 103 config.setGroup("Record");
103 config.writeEntry("SampleRate",sampleRate->currentText()); 104 config.writeEntry("SampleRate",sampleRate->currentText());
104 config.writeEntry("Stereo",stereoCheckBox->isChecked()); 105 config.writeEntry("Stereo",stereoCheckBox->isChecked());
105 config.writeEntry("SixteenBit",sixteenBitCheckBox->isChecked()); 106 config.writeEntry("SixteenBit",sixteenBitCheckBox->isChecked());
106 107
107 QDialog::accept(); 108 QDialog::accept();
108} 109}
109 110
110void SoundSettings::setVolume(int v) 111void SoundSettings::setVolume(int v)
111{ 112{
112 Config config( "Sound" ); 113 Config config( "Sound" );
113 config.setGroup( "System" ); 114 config.setGroup( "System" );
114 config.writeEntry("Volume",100-v); 115 config.writeEntry("Volume",100-v);
115#if ( defined Q_WS_QWS || defined(_WS_QWS_) ) && !defined(QT_NO_COP) 116#if ( defined Q_WS_QWS || defined(_WS_QWS_) ) && !defined(QT_NO_COP)
116 QCopEnvelope( "QPE/System", "volumeChange(bool)" ) << FALSE; 117 QCopEnvelope( "QPE/System", "volumeChange(bool)" ) << FALSE;
117#endif 118#endif
118} 119}
119 120
120void SoundSettings::setMic(int m) 121void SoundSettings::setMic(int m)
121{ 122{
122 Config config( "Sound" ); 123 Config config( "Sound" );