author | llornkcor <llornkcor> | 2002-06-23 19:46:28 (UTC) |
---|---|---|
committer | llornkcor <llornkcor> | 2002-06-23 19:46:28 (UTC) |
commit | 4e1cc7a828c8b56f75f03cd037ec3b5a893b9188 (patch) (unidiff) | |
tree | 56757ef2c8c352ab170e8c67e203b1b8728c6cbe | |
parent | 7c4524d0ff6d329c1f5f76fa2e7a727e553d51c8 (diff) | |
download | opie-4e1cc7a828c8b56f75f03cd037ec3b5a893b9188.zip opie-4e1cc7a828c8b56f75f03cd037ec3b5a893b9188.tar.gz opie-4e1cc7a828c8b56f75f03cd037ec3b5a893b9188.tar.bz2 |
fixed config handling
-rw-r--r-- | noncore/settings/sound/soundsettings.cpp | 11 |
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 | |||
@@ -57,99 +57,100 @@ SoundSettings::SoundSettings( QWidget* parent, const char* objname, WFlags fl ) | |||
57 | int rate=config.readNumEntry("SampleRate", 22050); | 57 | int rate=config.readNumEntry("SampleRate", 22050); |
58 | if(rate == 8000) | 58 | if(rate == 8000) |
59 | sampleRate->setCurrentItem(0); | 59 | sampleRate->setCurrentItem(0); |
60 | else if(rate == 11025) | 60 | else if(rate == 11025) |
61 | sampleRate->setCurrentItem(1); | 61 | sampleRate->setCurrentItem(1); |
62 | else if(rate == 22050) | 62 | else if(rate == 22050) |
63 | sampleRate->setCurrentItem(2); | 63 | sampleRate->setCurrentItem(2); |
64 | else if(rate == 33075) | 64 | else if(rate == 33075) |
65 | sampleRate->setCurrentItem(3); | 65 | sampleRate->setCurrentItem(3); |
66 | else if(rate==44100) | 66 | else if(rate==44100) |
67 | sampleRate->setCurrentItem(4); | 67 | sampleRate->setCurrentItem(4); |
68 | 68 | ||
69 | stereoCheckBox->setChecked(cfg.readNumEntry("Stereo", 0)); //TODO hide if zaurus- mono only | 69 | stereoCheckBox->setChecked(cfg.readNumEntry("Stereo", 0)); //TODO hide if zaurus- mono only |
70 | struct utsname name; /* check for embedix kernel running on the zaurus*/ | 70 | struct utsname name; /* check for embedix kernel running on the zaurus*/ |
71 | if (uname(&name) != -1) { | 71 | if (uname(&name) != -1) { |
72 | QString release=name.release; | 72 | QString release=name.release; |
73 | 73 | ||
74 | if( release.find("embedix",0,TRUE) !=-1) | 74 | if( release.find("embedix",0,TRUE) !=-1) |
75 | stereoCheckBox->hide(); | 75 | stereoCheckBox->hide(); |
76 | } | 76 | } |
77 | // else | 77 | // else |
78 | // stereoCheckBox->hide(); | 78 | // stereoCheckBox->hide(); |
79 | int sRate=cfg.readNumEntry("SizeLimit", 30); | 79 | int sRate=cfg.readNumEntry("SizeLimit", 30); |
80 | qDebug("%d",sRate); | 80 | qDebug("%d",sRate); |
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)); |
132 | // qDebug("QDialog::reject();"); | 133 | // qDebug("QDialog::reject();"); |
133 | // ::exit(-1); | 134 | // ::exit(-1); |
134 | // } | 135 | // } |
135 | 136 | ||
136 | // void SoundSettings::accept() | 137 | // void SoundSettings::accept() |
137 | // { | 138 | // { |
138 | // qDebug("accept"); | 139 | // qDebug("accept"); |
139 | // Config config( "qpe" ); | 140 | // Config config( "qpe" ); |
140 | // config.setGroup( "Volume" ); | 141 | // config.setGroup( "Volume" ); |
141 | // config.writeEntry("VolumePercent",100-volume->value()); | 142 | // config.writeEntry("VolumePercent",100-volume->value()); |
142 | // config.writeEntry("Mic",100-mic->value()); | 143 | // config.writeEntry("Mic",100-mic->value()); |
143 | // // config.writeEntry("TouchSound",touchsound->isChecked()); | 144 | // // config.writeEntry("TouchSound",touchsound->isChecked()); |
144 | // // config.writeEntry("KeySound",keysound->isChecked()); | 145 | // // config.writeEntry("KeySound",keysound->isChecked()); |
145 | 146 | ||
146 | // Config cfg("Vmemo"); | 147 | // Config cfg("Vmemo"); |
147 | // cfg.writeEntry("Alert",AlertCheckBox->isChecked()); | 148 | // cfg.writeEntry("Alert",AlertCheckBox->isChecked()); |
148 | // setVolume(volume->value()); | 149 | // setVolume(volume->value()); |
149 | // setMic(mic->value()); | 150 | // setMic(mic->value()); |
150 | 151 | ||
151 | // cfg.setGroup("Record"); | 152 | // cfg.setGroup("Record"); |
152 | // cfg.writeEntry("SampleRate",sampleRate->currentText()); | 153 | // cfg.writeEntry("SampleRate",sampleRate->currentText()); |
153 | // cfg.writeEntry("Stereo",stereoCheckBox->isChecked()); | 154 | // cfg.writeEntry("Stereo",stereoCheckBox->isChecked()); |
154 | // cfg.writeEntry("SixteenBit",sixteenBitCheckBox->isChecked()); | 155 | // cfg.writeEntry("SixteenBit",sixteenBitCheckBox->isChecked()); |
155 | // // Config cfg( "VMemo" ); | 156 | // // Config cfg( "VMemo" ); |
@@ -211,62 +212,68 @@ int set=0; | |||
211 | qDebug("storage name "+name +" storage path is "+path); | 212 | qDebug("storage name "+name +" storage path is "+path); |
212 | list << name + ": " +path; | 213 | list << name + ": " +path; |
213 | if( loc.find( path,0,TRUE) != -1) | 214 | if( loc.find( path,0,TRUE) != -1) |
214 | set = i; | 215 | set = i; |
215 | // if(dit.current()->file().find(path) != -1 ) storage=name; | 216 | // if(dit.current()->file().find(path) != -1 ) storage=name; |
216 | i++; | 217 | i++; |
217 | } | 218 | } |
218 | LocationComboBox->insertStringList(list); | 219 | LocationComboBox->insertStringList(list); |
219 | qDebug("set item %d", set); | 220 | qDebug("set item %d", set); |
220 | LocationComboBox->setCurrentItem(set); | 221 | LocationComboBox->setCurrentItem(set); |
221 | } | 222 | } |
222 | 223 | ||
223 | void SoundSettings::setLocation(const QString & string) { | 224 | void SoundSettings::setLocation(const QString & string) { |
224 | Config config( "Vmemo" ); | 225 | Config config( "Vmemo" ); |
225 | config.setGroup( "System" ); | 226 | config.setGroup( "System" ); |
226 | config.writeEntry("RecLocation",string); | 227 | config.writeEntry("RecLocation",string); |
227 | qDebug("set location "+string); | 228 | qDebug("set location "+string); |
228 | config.write(); | 229 | config.write(); |
229 | } | 230 | } |
230 | 231 | ||
231 | void SoundSettings::cleanUp() { | 232 | void SoundSettings::cleanUp() { |
232 | qDebug("cleanup"); | 233 | qDebug("cleanup"); |
233 | Config config( "qpe" ); | 234 | Config config( "qpe" ); |
234 | config.setGroup( "Volume" ); | 235 | config.setGroup( "Volume" ); |
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 | ||
254 | void SoundSettings::setKeyButton(const QString &name) { | 255 | void 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 | ||
262 | void SoundSettings::updateLocationCombo() { | 269 | void SoundSettings::updateLocationCombo() { |
263 | 270 | ||
264 | } | 271 | } |
265 | 272 | ||
266 | void SoundSettings::setSizeLimitButton(const QString &index) { | 273 | void 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 | } |