summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/settings/sound/soundsettings.cpp21
-rw-r--r--noncore/settings/sound/soundsettingsbase.ui499
2 files changed, 325 insertions, 195 deletions
diff --git a/noncore/settings/sound/soundsettings.cpp b/noncore/settings/sound/soundsettings.cpp
index 1143e82..17dbdc0 100644
--- a/noncore/settings/sound/soundsettings.cpp
+++ b/noncore/settings/sound/soundsettings.cpp
@@ -37,4 +37,7 @@ SoundSettings::SoundSettings( QWidget* parent, const char* name, WFlags fl )
37 keysound->setChecked(config.readBoolEntry("Key")); 37 keysound->setChecked(config.readBoolEntry("Key"));
38 dblClickRuns->setText(config.readEntry("DblClickVolumeRuns", 38
39 "/opt/QtPalmtop/bin/vmemomanager")); 39 config.setGroup("Record");
40 sampleRate->setText(config.readEntry("SampleRate", "11025"));
41 stereoCheckBox->setChecked(config.readNumEntry("Stereo", 0));
42 sixteenBitCheckBox->setChecked(config.readNumEntry("SixteenBit", 0));
40 43
@@ -53,2 +56,7 @@ void SoundSettings::reject()
53 56
57 config.setGroup("Record");
58 sampleRate->setText(config.readEntry("SampleRate", "11025"));
59 stereoCheckBox->setChecked(config.readNumEntry("Stereo", 0));
60 sixteenBitCheckBox->setChecked(config.readNumEntry("SixteenBit", 0));
61
54 QDialog::reject(); 62 QDialog::reject();
@@ -64,4 +72,11 @@ void SoundSettings::accept()
64 config.writeEntry("Key",keysound->isChecked()); 72 config.writeEntry("Key",keysound->isChecked());
65 config.writeEntry("DblClickVolumeRuns", dblClickRuns->text()); 73
66 setVolume(volume->value()); 74 setVolume(volume->value());
75 setMic(mic->value());
76
77 config.setGroup("Record");
78 config.writeEntry("SampleRate",sampleRate->text());
79 config.writeEntry("Stereo",stereoCheckBox->isChecked());
80 config.writeEntry("SixteenBit",sixteenBitCheckBox->isChecked());
81
67 QDialog::accept(); 82 QDialog::accept();
diff --git a/noncore/settings/sound/soundsettingsbase.ui b/noncore/settings/sound/soundsettingsbase.ui
index 0b2b2be..f47f77e 100644
--- a/noncore/settings/sound/soundsettingsbase.ui
+++ b/noncore/settings/sound/soundsettingsbase.ui
@@ -13,3 +13,3 @@
13 <y>0</y> 13 <y>0</y>
14 <width>376</width> 14 <width>372</width>
15 <height>441</height> 15 <height>441</height>
@@ -40,5 +40,5 @@
40 <name>name</name> 40 <name>name</name>
41 <cstring>Layout8</cstring> 41 <cstring>Layout30</cstring>
42 </property> 42 </property>
43 <vbox> 43 <hbox>
44 <property stdset="1"> 44 <property stdset="1">
@@ -52,46 +52,2 @@
52 <widget> 52 <widget>
53 <class>QCheckBox</class>
54 <property stdset="1">
55 <name>name</name>
56 <cstring>keysound</cstring>
57 </property>
58 <property stdset="1">
59 <name>text</name>
60 <string>Keyboard sound</string>
61 </property>
62 </widget>
63 <widget>
64 <class>QCheckBox</class>
65 <property stdset="1">
66 <name>name</name>
67 <cstring>touchsound</cstring>
68 </property>
69 <property stdset="1">
70 <name>text</name>
71 <string>Screen sound</string>
72 </property>
73 </widget>
74 <widget>
75 <class>QLabel</class>
76 <property stdset="1">
77 <name>name</name>
78 <cstring>dblClickLabel</cstring>
79 </property>
80 <property stdset="1">
81 <name>text</name>
82 <string>Double Click Volume runs:</string>
83 </property>
84 </widget>
85 <widget>
86 <class>QLineEdit</class>
87 <property stdset="1">
88 <name>name</name>
89 <cstring>dblClickRuns</cstring>
90 </property>
91 <property stdset="1">
92 <name>text</name>
93 <string></string>
94 </property>
95 </widget>
96 <widget>
97 <class>QLayoutWidget</class> 53 <class>QLayoutWidget</class>
@@ -99,5 +55,5 @@
99 <name>name</name> 55 <name>name</name>
100 <cstring>Layout14</cstring> 56 <cstring>Layout24</cstring>
101 </property> 57 </property>
102 <hbox> 58 <vbox>
103 <property stdset="1"> 59 <property stdset="1">
@@ -111,2 +67,24 @@
111 <widget> 67 <widget>
68 <class>QCheckBox</class>
69 <property stdset="1">
70 <name>name</name>
71 <cstring>touchsound</cstring>
72 </property>
73 <property stdset="1">
74 <name>text</name>
75 <string>Screen sound</string>
76 </property>
77 </widget>
78 <widget>
79 <class>QCheckBox</class>
80 <property stdset="1">
81 <name>name</name>
82 <cstring>keysound</cstring>
83 </property>
84 <property stdset="1">
85 <name>text</name>
86 <string>Keyboard sound</string>
87 </property>
88 </widget>
89 <widget>
112 <class>QLayoutWidget</class> 90 <class>QLayoutWidget</class>
@@ -114,5 +92,5 @@
114 <name>name</name> 92 <name>name</name>
115 <cstring>Layout7</cstring> 93 <cstring>Layout11</cstring>
116 </property> 94 </property>
117 <vbox> 95 <hbox>
118 <property stdset="1"> 96 <property stdset="1">
@@ -125,2 +103,23 @@
125 </property> 103 </property>
104 <spacer>
105 <property>
106 <name>name</name>
107 <cstring>Spacer3_2_2</cstring>
108 </property>
109 <property stdset="1">
110 <name>orientation</name>
111 <enum>Horizontal</enum>
112 </property>
113 <property stdset="1">
114 <name>sizeType</name>
115 <enum>Expanding</enum>
116 </property>
117 <property>
118 <name>sizeHint</name>
119 <size>
120 <width>20</width>
121 <height>20</height>
122 </size>
123 </property>
124 </spacer>
126 <widget> 125 <widget>
@@ -129,7 +128,11 @@
129 <name>name</name> 128 <name>name</name>
130 <cstring>volLabel</cstring> 129 <cstring>PixmapLabel1_2</cstring>
131 </property> 130 </property>
132 <property stdset="1"> 131 <property stdset="1">
133 <name>text</name> 132 <name>pixmap</name>
134 <string>Volume</string> 133 <pixmap>image0</pixmap>
134 </property>
135 <property stdset="1">
136 <name>scaledContents</name>
137 <bool>false</bool>
135 </property> 138 </property>
@@ -137,14 +140,16 @@
137 <widget> 140 <widget>
138 <class>QSlider</class> 141 <class>QLabel</class>
139 <property stdset="1"> 142 <property stdset="1">
140 <name>name</name> 143 <name>name</name>
141 <cstring>volume</cstring> 144 <cstring>TextLabel1_2</cstring>
142 </property> 145 </property>
143 <property stdset="1"> 146 <property stdset="1">
144 <name>maxValue</name> 147 <name>text</name>
145 <number>100</number> 148 <string>Loud</string>
146 </property> 149 </property>
147 <property stdset="1"> 150 </widget>
148 <name>value</name> 151 <spacer>
149 <number>50</number> 152 <property>
153 <name>name</name>
154 <cstring>Spacer3_2</cstring>
150 </property> 155 </property>
@@ -152,14 +157,17 @@
152 <name>orientation</name> 157 <name>orientation</name>
153 <enum>Vertical</enum> 158 <enum>Horizontal</enum>
154 </property> 159 </property>
155 <property stdset="1"> 160 <property stdset="1">
156 <name>tickmarks</name> 161 <name>sizeType</name>
157 <enum>Right</enum> 162 <enum>Expanding</enum>
158 </property> 163 </property>
159 <property stdset="1"> 164 <property>
160 <name>tickInterval</name> 165 <name>sizeHint</name>
161 <number>5</number> 166 <size>
167 <width>20</width>
168 <height>20</height>
169 </size>
162 </property> 170 </property>
163 </widget> 171 </spacer>
164 </vbox> 172 </hbox>
165 </widget> 173 </widget>
@@ -169,5 +177,5 @@
169 <name>name</name> 177 <name>name</name>
170 <cstring>Layout13</cstring> 178 <cstring>Layout11</cstring>
171 </property> 179 </property>
172 <vbox> 180 <hbox>
173 <property stdset="1"> 181 <property stdset="1">
@@ -184,5 +192,5 @@
184 <name>name</name> 192 <name>name</name>
185 <cstring>Layout11</cstring> 193 <cstring>Layout7</cstring>
186 </property> 194 </property>
187 <hbox> 195 <vbox>
188 <property stdset="1"> 196 <property stdset="1">
@@ -195,23 +203,2 @@
195 </property> 203 </property>
196 <spacer>
197 <property>
198 <name>name</name>
199 <cstring>Spacer3_2_2</cstring>
200 </property>
201 <property stdset="1">
202 <name>orientation</name>
203 <enum>Horizontal</enum>
204 </property>
205 <property stdset="1">
206 <name>sizeType</name>
207 <enum>Expanding</enum>
208 </property>
209 <property>
210 <name>sizeHint</name>
211 <size>
212 <width>20</width>
213 <height>20</height>
214 </size>
215 </property>
216 </spacer>
217 <widget> 204 <widget>
@@ -220,11 +207,7 @@
220 <name>name</name> 207 <name>name</name>
221 <cstring>PixmapLabel1_2</cstring> 208 <cstring>volLabel</cstring>
222 </property> 209 </property>
223 <property stdset="1"> 210 <property stdset="1">
224 <name>pixmap</name> 211 <name>text</name>
225 <pixmap>image0</pixmap> 212 <string>Volume</string>
226 </property>
227 <property stdset="1">
228 <name>scaledContents</name>
229 <bool>false</bool>
230 </property> 213 </property>
@@ -232,16 +215,14 @@
232 <widget> 215 <widget>
233 <class>QLabel</class> 216 <class>QSlider</class>
234 <property stdset="1"> 217 <property stdset="1">
235 <name>name</name> 218 <name>name</name>
236 <cstring>TextLabel1_2</cstring> 219 <cstring>volume</cstring>
237 </property> 220 </property>
238 <property stdset="1"> 221 <property stdset="1">
239 <name>text</name> 222 <name>maxValue</name>
240 <string>Loud</string> 223 <number>100</number>
241 </property> 224 </property>
242 </widget> 225 <property stdset="1">
243 <spacer> 226 <name>value</name>
244 <property> 227 <number>50</number>
245 <name>name</name>
246 <cstring>Spacer3_2</cstring>
247 </property> 228 </property>
@@ -249,17 +230,14 @@
249 <name>orientation</name> 230 <name>orientation</name>
250 <enum>Horizontal</enum> 231 <enum>Vertical</enum>
251 </property> 232 </property>
252 <property stdset="1"> 233 <property stdset="1">
253 <name>sizeType</name> 234 <name>tickmarks</name>
254 <enum>Expanding</enum> 235 <enum>Right</enum>
255 </property> 236 </property>
256 <property> 237 <property stdset="1">
257 <name>sizeHint</name> 238 <name>tickInterval</name>
258 <size> 239 <number>5</number>
259 <width>20</width>
260 <height>20</height>
261 </size>
262 </property> 240 </property>
263 </spacer> 241 </widget>
264 </hbox> 242 </vbox>
265 </widget> 243 </widget>
@@ -290,5 +268,5 @@
290 <name>name</name> 268 <name>name</name>
291 <cstring>Layout12</cstring> 269 <cstring>Layout8</cstring>
292 </property> 270 </property>
293 <hbox> 271 <vbox>
294 <property stdset="1"> 272 <property stdset="1">
@@ -301,23 +279,2 @@
301 </property> 279 </property>
302 <spacer>
303 <property>
304 <name>name</name>
305 <cstring>Spacer3_2_3</cstring>
306 </property>
307 <property stdset="1">
308 <name>orientation</name>
309 <enum>Horizontal</enum>
310 </property>
311 <property stdset="1">
312 <name>sizeType</name>
313 <enum>Expanding</enum>
314 </property>
315 <property>
316 <name>sizeHint</name>
317 <size>
318 <width>20</width>
319 <height>20</height>
320 </size>
321 </property>
322 </spacer>
323 <widget> 280 <widget>
@@ -326,11 +283,7 @@
326 <name>name</name> 283 <name>name</name>
327 <cstring>PixmapLabel2_2</cstring> 284 <cstring>micLabel</cstring>
328 </property>
329 <property stdset="1">
330 <name>pixmap</name>
331 <pixmap>image1</pixmap>
332 </property> 285 </property>
333 <property stdset="1"> 286 <property stdset="1">
334 <name>scaledContents</name> 287 <name>text</name>
335 <bool>false</bool> 288 <string>Microphone</string>
336 </property> 289 </property>
@@ -338,16 +291,14 @@
338 <widget> 291 <widget>
339 <class>QLabel</class> 292 <class>QSlider</class>
340 <property stdset="1"> 293 <property stdset="1">
341 <name>name</name> 294 <name>name</name>
342 <cstring>TextLabel2_2</cstring> 295 <cstring>mic</cstring>
343 </property> 296 </property>
344 <property stdset="1"> 297 <property stdset="1">
345 <name>text</name> 298 <name>maxValue</name>
346 <string>Silent</string> 299 <number>100</number>
347 </property> 300 </property>
348 </widget> 301 <property stdset="1">
349 <spacer> 302 <name>value</name>
350 <property> 303 <number>50</number>
351 <name>name</name>
352 <cstring>Spacer2_2</cstring>
353 </property> 304 </property>
@@ -355,19 +306,16 @@
355 <name>orientation</name> 306 <name>orientation</name>
356 <enum>Horizontal</enum> 307 <enum>Vertical</enum>
357 </property> 308 </property>
358 <property stdset="1"> 309 <property stdset="1">
359 <name>sizeType</name> 310 <name>tickmarks</name>
360 <enum>Expanding</enum> 311 <enum>Right</enum>
361 </property> 312 </property>
362 <property> 313 <property stdset="1">
363 <name>sizeHint</name> 314 <name>tickInterval</name>
364 <size> 315 <number>5</number>
365 <width>20</width>
366 <height>20</height>
367 </size>
368 </property> 316 </property>
369 </spacer> 317 </widget>
370 </hbox> 318 </vbox>
371 </widget> 319 </widget>
372 </vbox> 320 </hbox>
373 </widget> 321 </widget>
@@ -377,5 +325,5 @@
377 <name>name</name> 325 <name>name</name>
378 <cstring>Layout8</cstring> 326 <cstring>Layout12</cstring>
379 </property> 327 </property>
380 <vbox> 328 <hbox>
381 <property stdset="1"> 329 <property stdset="1">
@@ -388,2 +336,23 @@
388 </property> 336 </property>
337 <spacer>
338 <property>
339 <name>name</name>
340 <cstring>Spacer3_2_3</cstring>
341 </property>
342 <property stdset="1">
343 <name>orientation</name>
344 <enum>Horizontal</enum>
345 </property>
346 <property stdset="1">
347 <name>sizeType</name>
348 <enum>Expanding</enum>
349 </property>
350 <property>
351 <name>sizeHint</name>
352 <size>
353 <width>20</width>
354 <height>20</height>
355 </size>
356 </property>
357 </spacer>
389 <widget> 358 <widget>
@@ -392,7 +361,11 @@
392 <name>name</name> 361 <name>name</name>
393 <cstring>micLabel</cstring> 362 <cstring>PixmapLabel2_2</cstring>
394 </property> 363 </property>
395 <property stdset="1"> 364 <property stdset="1">
396 <name>text</name> 365 <name>pixmap</name>
397 <string>Microphone</string> 366 <pixmap>image1</pixmap>
367 </property>
368 <property stdset="1">
369 <name>scaledContents</name>
370 <bool>false</bool>
398 </property> 371 </property>
@@ -400,14 +373,16 @@
400 <widget> 373 <widget>
401 <class>QSlider</class> 374 <class>QLabel</class>
402 <property stdset="1"> 375 <property stdset="1">
403 <name>name</name> 376 <name>name</name>
404 <cstring>mic</cstring> 377 <cstring>TextLabel2_2</cstring>
405 </property> 378 </property>
406 <property stdset="1"> 379 <property stdset="1">
407 <name>maxValue</name> 380 <name>text</name>
408 <number>100</number> 381 <string>Silent</string>
409 </property> 382 </property>
410 <property stdset="1"> 383 </widget>
411 <name>value</name> 384 <spacer>
412 <number>50</number> 385 <property>
386 <name>name</name>
387 <cstring>Spacer2_2</cstring>
413 </property> 388 </property>
@@ -415,18 +390,158 @@
415 <name>orientation</name> 390 <name>orientation</name>
416 <enum>Vertical</enum> 391 <enum>Horizontal</enum>
417 </property> 392 </property>
418 <property stdset="1"> 393 <property stdset="1">
419 <name>tickmarks</name> 394 <name>sizeType</name>
420 <enum>Right</enum> 395 <enum>Expanding</enum>
421 </property> 396 </property>
397 <property>
398 <name>sizeHint</name>
399 <size>
400 <width>20</width>
401 <height>20</height>
402 </size>
403 </property>
404 </spacer>
405 </hbox>
406 </widget>
407 </vbox>
408 </widget>
409 <widget>
410 <class>QLayoutWidget</class>
411 <property stdset="1">
412 <name>name</name>
413 <cstring>Layout29</cstring>
414 </property>
415 <vbox>
416 <property stdset="1">
417 <name>margin</name>
418 <number>0</number>
419 </property>
420 <property stdset="1">
421 <name>spacing</name>
422 <number>6</number>
423 </property>
424 <widget>
425 <class>QGroupBox</class>
426 <property stdset="1">
427 <name>name</name>
428 <cstring>GroupBox1</cstring>
429 </property>
430 <property stdset="1">
431 <name>title</name>
432 <string>Record Defaults</string>
433 </property>
434 <grid>
435 <property stdset="1">
436 <name>margin</name>
437 <number>11</number>
438 </property>
439 <property stdset="1">
440 <name>spacing</name>
441 <number>6</number>
442 </property>
443 <widget row="0" column="0" >
444 <class>QLayoutWidget</class>
422 <property stdset="1"> 445 <property stdset="1">
423 <name>tickInterval</name> 446 <name>name</name>
424 <number>5</number> 447 <cstring>Layout28</cstring>
425 </property> 448 </property>
449 <vbox>
450 <property stdset="1">
451 <name>margin</name>
452 <number>0</number>
453 </property>
454 <property stdset="1">
455 <name>spacing</name>
456 <number>6</number>
457 </property>
458 <widget>
459 <class>QLabel</class>
460 <property stdset="1">
461 <name>name</name>
462 <cstring>sampleRateLabel</cstring>
463 </property>
464 <property stdset="1">
465 <name>text</name>
466 <string>Rate (5k-44k)</string>
467 </property>
468 </widget>
469 <widget>
470 <class>QLineEdit</class>
471 <property stdset="1">
472 <name>name</name>
473 <cstring>sampleRate</cstring>
474 </property>
475 </widget>
476 <widget>
477 <class>QCheckBox</class>
478 <property stdset="1">
479 <name>name</name>
480 <cstring>stereoCheckBox</cstring>
481 </property>
482 <property stdset="1">
483 <name>text</name>
484 <string>Stereo</string>
485 </property>
486 </widget>
487 <widget>
488 <class>QCheckBox</class>
489 <property stdset="1">
490 <name>name</name>
491 <cstring>sixteenBitCheckBox</cstring>
492 </property>
493 <property stdset="1">
494 <name>text</name>
495 <string>16 bit</string>
496 </property>
497 </widget>
498 </vbox>
426 </widget> 499 </widget>
427 </vbox> 500 </grid>
428 </widget> 501 </widget>
429 </hbox> 502 <spacer>
503 <property>
504 <name>name</name>
505 <cstring>Spacer9</cstring>
506 </property>
507 <property stdset="1">
508 <name>orientation</name>
509 <enum>Vertical</enum>
510 </property>
511 <property stdset="1">
512 <name>sizeType</name>
513 <enum>Expanding</enum>
514 </property>
515 <property>
516 <name>sizeHint</name>
517 <size>
518 <width>20</width>
519 <height>20</height>
520 </size>
521 </property>
522 </spacer>
523 </vbox>
430 </widget> 524 </widget>
431 </vbox> 525 <spacer>
526 <property>
527 <name>name</name>
528 <cstring>Spacer10</cstring>
529 </property>
530 <property stdset="1">
531 <name>orientation</name>
532 <enum>Horizontal</enum>
533 </property>
534 <property stdset="1">
535 <name>sizeType</name>
536 <enum>Expanding</enum>
537 </property>
538 <property>
539 <name>sizeHint</name>
540 <size>
541 <width>20</width>
542 <height>20</height>
543 </size>
544 </property>
545 </spacer>
546 </hbox>
432 </widget> 547 </widget>