summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/settings/sound/soundsettings.cpp11
1 files changed, 9 insertions, 2 deletions
diff --git a/noncore/settings/sound/soundsettings.cpp b/noncore/settings/sound/soundsettings.cpp
index 759a469..5cb59c5 100644
--- a/noncore/settings/sound/soundsettings.cpp
+++ b/noncore/settings/sound/soundsettings.cpp
@@ -81,51 +81,52 @@ SoundSettings::SoundSettings( QWidget* parent, const char* objname, WFlags fl )
81 81
82 if(sRate ==30) 82 if(sRate ==30)
83 timeLimitComboBox->setCurrentItem(0); 83 timeLimitComboBox->setCurrentItem(0);
84 else if(sRate==20) 84 else if(sRate==20)
85 timeLimitComboBox->setCurrentItem(1); 85 timeLimitComboBox->setCurrentItem(1);
86 else if(sRate == 15) 86 else if(sRate == 15)
87 timeLimitComboBox->setCurrentItem(2); 87 timeLimitComboBox->setCurrentItem(2);
88 else if(sRate == 10) 88 else if(sRate == 10)
89 timeLimitComboBox->setCurrentItem(3); 89 timeLimitComboBox->setCurrentItem(3);
90 else 90 else
91 timeLimitComboBox->setCurrentItem(4); 91 timeLimitComboBox->setCurrentItem(4);
92 92
93 93
94 sixteenBitCheckBox->setChecked(cfg.readNumEntry("SixteenBit", 1)); 94 sixteenBitCheckBox->setChecked(cfg.readNumEntry("SixteenBit", 1));
95 95
96 cfg.setGroup("Defaults"); 96 cfg.setGroup("Defaults");
97 keyComboBox->setCurrentItem(cfg.readNumEntry("toggleKey") ); 97 keyComboBox->setCurrentItem(cfg.readNumEntry("toggleKey") );
98 98
99 updateStorageCombo(); 99 updateStorageCombo();
100 100
101 connect(volume, SIGNAL(valueChanged(int)), this, SLOT(setVolume(int))); 101 connect(volume, SIGNAL(valueChanged(int)), this, SLOT(setVolume(int)));
102 connect(mic, SIGNAL(valueChanged(int)), this, SLOT(setMic(int))); 102 connect(mic, SIGNAL(valueChanged(int)), this, SLOT(setMic(int)));
103 connect(qApp, SIGNAL( volumeChanged(bool) ), this, SLOT( volumeChanged(bool) ) ); 103 connect(qApp, SIGNAL( volumeChanged(bool) ), this, SLOT( volumeChanged(bool) ) );
104 connect(qApp, SIGNAL( micChanged(bool) ), this, SLOT ( micChanged(bool) ) ); 104 connect(qApp, SIGNAL( micChanged(bool) ), this, SLOT ( micChanged(bool) ) );
105
105 connect( LocationComboBox,SIGNAL(activated(const QString &)),this,SLOT( setLocation(const QString &))); 106 connect( LocationComboBox,SIGNAL(activated(const QString &)),this,SLOT( setLocation(const QString &)));
106 connect( keyComboBox,SIGNAL(activated(const QString &)),this,SLOT(setKeyButton(const QString &))); 107 connect( keyComboBox,SIGNAL(activated(const QString &)),this,SLOT( setKeyButton(const QString &)));
107 connect( timeLimitComboBox,SIGNAL(activated( const QString &)),this,SLOT(setSizeLimitButton(const QString &))); 108 connect( timeLimitComboBox,SIGNAL(activated( const QString &)),this,SLOT( setSizeLimitButton(const QString &)));
108// connect( qApp,SIGNAL( aboutToQuit()),SLOT( cleanUp()) ); 109// connect( qApp,SIGNAL( aboutToQuit()),SLOT( cleanUp()) );
109} 110}
110 111
111// void SoundSettings::reject() 112// void SoundSettings::reject()
112// { 113// {
113// qDebug("reject"); 114// qDebug("reject");
114// Config config( "qpe"); 115// Config config( "qpe");
115// config.setGroup( "Volume"); 116// config.setGroup( "Volume");
116 117
117// setVolume(100-config.readNumEntry("VolumePercent")); 118// setVolume(100-config.readNumEntry("VolumePercent"));
118// setMic(100-config.readNumEntry("Mic")); 119// setMic(100-config.readNumEntry("Mic"));
119 120
120// // config.setGroup("Record"); 121// // config.setGroup("Record");
121// // int rate=config.readNumEntry("SampleRate", 11025); 122// // int rate=config.readNumEntry("SampleRate", 11025);
122// // if(rate == 11025) 123// // if(rate == 11025)
123// // sampleRate->setCurrentItem(0); 124// // sampleRate->setCurrentItem(0);
124// // else if(rate == 22050) 125// // else if(rate == 22050)
125// // sampleRate->setCurrentItem(1); 126// // sampleRate->setCurrentItem(1);
126// // else if(rate == 32000) 127// // else if(rate == 32000)
127// // sampleRate->setCurrentItem(2); 128// // sampleRate->setCurrentItem(2);
128// // else if(rate==44100) 129// // else if(rate==44100)
129// // sampleRate->setCurrentItem(3); 130// // sampleRate->setCurrentItem(3);
130// // stereoCheckBox->setChecked(config.readNumEntry("Stereo", 0)); 131// // stereoCheckBox->setChecked(config.readNumEntry("Stereo", 0));
131// // sixteenBitCheckBox->setChecked(config.readNumEntry("SixteenBit", 0)); 132// // sixteenBitCheckBox->setChecked(config.readNumEntry("SixteenBit", 0));
@@ -235,38 +236,44 @@ void SoundSettings::cleanUp() {
235 config.writeEntry("VolumePercent",100-volume->value()); 236 config.writeEntry("VolumePercent",100-volume->value());
236 config.writeEntry("Mic",100-mic->value()); 237 config.writeEntry("Mic",100-mic->value());
237// config.writeEntry("TouchSound",touchsound->isChecked()); 238// config.writeEntry("TouchSound",touchsound->isChecked());
238// config.writeEntry("KeySound",keysound->isChecked()); 239// config.writeEntry("KeySound",keysound->isChecked());
239 240
240 Config cfg("Vmemo"); 241 Config cfg("Vmemo");
241 cfg.writeEntry("Alert",AlertCheckBox->isChecked()); 242 cfg.writeEntry("Alert",AlertCheckBox->isChecked());
242 setVolume(volume->value()); 243 setVolume(volume->value());
243 setMic(mic->value()); 244 setMic(mic->value());
244 245
245 cfg.setGroup("Record"); 246 cfg.setGroup("Record");
246 cfg.writeEntry("SampleRate",sampleRate->currentText()); 247 cfg.writeEntry("SampleRate",sampleRate->currentText());
247 cfg.writeEntry("Stereo",stereoCheckBox->isChecked()); 248 cfg.writeEntry("Stereo",stereoCheckBox->isChecked());
248 cfg.writeEntry("SixteenBit",sixteenBitCheckBox->isChecked()); 249 cfg.writeEntry("SixteenBit",sixteenBitCheckBox->isChecked());
249 250
250 if(keyReset) QCopEnvelope ("QPE/System", "restart()"); 251 if(keyReset) QCopEnvelope ("QPE/System", "restart()");
251 252
252} 253}
253 254
254void SoundSettings::setKeyButton(const QString &name) { 255void SoundSettings::setKeyButton(const QString &name) {
255 Config cfg("Vmemo"); 256 Config cfg("Vmemo");
256 cfg.setGroup("Defaults"); 257 cfg.setGroup("Defaults");
257 cfg.writeEntry( "toggleKey", keyComboBox->currentItem() ); 258 cfg.writeEntry( "toggleKey", keyComboBox->currentItem() );
258 keyReset = TRUE; 259 keyReset = TRUE;
260 if(keyComboBox->currentItem() == 1)
261 cfg.writeEntry( "hideIcon", 0 );
262 else
263 cfg.writeEntry( "hideIcon", 1);
264
265
259 cfg.write(); 266 cfg.write();
260} 267}
261 268
262void SoundSettings::updateLocationCombo() { 269void SoundSettings::updateLocationCombo() {
263 270
264} 271}
265 272
266void SoundSettings::setSizeLimitButton(const QString &index) { 273void SoundSettings::setSizeLimitButton(const QString &index) {
267 274
268 Config cfg("Vmemo"); 275 Config cfg("Vmemo");
269 cfg.setGroup("Record"); 276 cfg.setGroup("Record");
270 cfg.writeEntry("SizeLimit", index); 277 cfg.writeEntry("SizeLimit", index);
271 cfg.write(); 278 cfg.write();
272} 279}