summaryrefslogtreecommitdiff
path: root/noncore
Unidiff
Diffstat (limited to 'noncore') (more/less context) (show whitespace changes)
-rw-r--r--noncore/settings/sound/soundsettings.cpp21
-rw-r--r--noncore/settings/sound/soundsettingsbase.ui416
2 files changed, 258 insertions, 179 deletions
diff --git a/noncore/settings/sound/soundsettings.cpp b/noncore/settings/sound/soundsettings.cpp
index 17dbdc0..c2bf405 100644
--- a/noncore/settings/sound/soundsettings.cpp
+++ b/noncore/settings/sound/soundsettings.cpp
@@ -25,6 +25,8 @@
25#include <qslider.h> 25#include <qslider.h>
26#include <qcheckbox.h> 26#include <qcheckbox.h>
27#include <qlineedit.h> 27#include <qlineedit.h>
28#include <qcombobox.h>
29
28 30
29SoundSettings::SoundSettings( QWidget* parent, const char* name, WFlags fl ) 31SoundSettings::SoundSettings( QWidget* parent, const char* name, WFlags fl )
30 : SoundSettingsBase( parent, name, TRUE, fl ) 32 : SoundSettingsBase( parent, name, TRUE, fl )
@@ -37,7 +39,14 @@ SoundSettings::SoundSettings( QWidget* parent, const char* name, WFlags fl )
37 keysound->setChecked(config.readBoolEntry("Key")); 39 keysound->setChecked(config.readBoolEntry("Key"));
38 40
39 config.setGroup("Record"); 41 config.setGroup("Record");
40 sampleRate->setText(config.readEntry("SampleRate", "11025")); 42 int rate=config.readNumEntry("SampleRate", 11025);
43 if(rate == 11025)
44 sampleRate->setCurrentItem(0);
45 else if(rate == 22050)
46 sampleRate->setCurrentItem(1);
47 else if(rate==44100)
48 sampleRate->setCurrentItem(2);
49
41 stereoCheckBox->setChecked(config.readNumEntry("Stereo", 0)); 50 stereoCheckBox->setChecked(config.readNumEntry("Stereo", 0));
42 sixteenBitCheckBox->setChecked(config.readNumEntry("SixteenBit", 0)); 51 sixteenBitCheckBox->setChecked(config.readNumEntry("SixteenBit", 0));
43 52
@@ -55,7 +64,13 @@ void SoundSettings::reject()
55 setMic(100-config.readNumEntry("Mic")); 64 setMic(100-config.readNumEntry("Mic"));
56 65
57 config.setGroup("Record"); 66 config.setGroup("Record");
58 sampleRate->setText(config.readEntry("SampleRate", "11025")); 67 int rate=config.readNumEntry("SampleRate", 11025);
68 if(rate == 11025)
69 sampleRate->setCurrentItem(0);
70 else if(rate == 22050)
71 sampleRate->setCurrentItem(1);
72 else if(rate==44100)
73 sampleRate->setCurrentItem(2);
59 stereoCheckBox->setChecked(config.readNumEntry("Stereo", 0)); 74 stereoCheckBox->setChecked(config.readNumEntry("Stereo", 0));
60 sixteenBitCheckBox->setChecked(config.readNumEntry("SixteenBit", 0)); 75 sixteenBitCheckBox->setChecked(config.readNumEntry("SixteenBit", 0));
61 76
@@ -75,7 +90,7 @@ void SoundSettings::accept()
75 setMic(mic->value()); 90 setMic(mic->value());
76 91
77 config.setGroup("Record"); 92 config.setGroup("Record");
78 config.writeEntry("SampleRate",sampleRate->text()); 93 config.writeEntry("SampleRate",sampleRate->currentText());
79 config.writeEntry("Stereo",stereoCheckBox->isChecked()); 94 config.writeEntry("Stereo",stereoCheckBox->isChecked());
80 config.writeEntry("SixteenBit",sixteenBitCheckBox->isChecked()); 95 config.writeEntry("SixteenBit",sixteenBitCheckBox->isChecked());
81 96
diff --git a/noncore/settings/sound/soundsettingsbase.ui b/noncore/settings/sound/soundsettingsbase.ui
index f47f77e..0351fd8 100644
--- a/noncore/settings/sound/soundsettingsbase.ui
+++ b/noncore/settings/sound/soundsettingsbase.ui
@@ -11,8 +11,8 @@
11 <rect> 11 <rect>
12 <x>0</x> 12 <x>0</x>
13 <y>0</y> 13 <y>0</y>
14 <width>372</width> 14 <width>286</width>
15 <height>441</height> 15 <height>338</height>
16 </rect> 16 </rect>
17 </property> 17 </property>
18 <property stdset="1"> 18 <property stdset="1">
@@ -34,13 +34,13 @@
34 <name>spacing</name> 34 <name>spacing</name>
35 <number>6</number> 35 <number>6</number>
36 </property> 36 </property>
37 <widget row="0" column="0" > 37 <widget row="0" column="1" >
38 <class>QLayoutWidget</class> 38 <class>QLayoutWidget</class>
39 <property stdset="1"> 39 <property stdset="1">
40 <name>name</name> 40 <name>name</name>
41 <cstring>Layout30</cstring> 41 <cstring>Layout9</cstring>
42 </property> 42 </property>
43 <hbox> 43 <vbox>
44 <property stdset="1"> 44 <property stdset="1">
45 <name>margin</name> 45 <name>margin</name>
46 <number>0</number> 46 <number>0</number>
@@ -53,7 +53,7 @@
53 <class>QLayoutWidget</class> 53 <class>QLayoutWidget</class>
54 <property stdset="1"> 54 <property stdset="1">
55 <name>name</name> 55 <name>name</name>
56 <cstring>Layout24</cstring> 56 <cstring>Layout8</cstring>
57 </property> 57 </property>
58 <vbox> 58 <vbox>
59 <property stdset="1"> 59 <property stdset="1">
@@ -65,6 +65,102 @@
65 <number>6</number> 65 <number>6</number>
66 </property> 66 </property>
67 <widget> 67 <widget>
68 <class>QGroupBox</class>
69 <property stdset="1">
70 <name>name</name>
71 <cstring>GroupBox1</cstring>
72 </property>
73 <property stdset="1">
74 <name>title</name>
75 <string>Vmemo</string>
76 </property>
77 <grid>
78 <property stdset="1">
79 <name>margin</name>
80 <number>11</number>
81 </property>
82 <property stdset="1">
83 <name>spacing</name>
84 <number>6</number>
85 </property>
86 <widget row="0" column="0" >
87 <class>QLayoutWidget</class>
88 <property stdset="1">
89 <name>name</name>
90 <cstring>Layout15</cstring>
91 </property>
92 <vbox>
93 <property stdset="1">
94 <name>margin</name>
95 <number>0</number>
96 </property>
97 <property stdset="1">
98 <name>spacing</name>
99 <number>6</number>
100 </property>
101 <widget>
102 <class>QLabel</class>
103 <property stdset="1">
104 <name>name</name>
105 <cstring>sampleRateLabel</cstring>
106 </property>
107 <property stdset="1">
108 <name>text</name>
109 <string>Sample Rate</string>
110 </property>
111 </widget>
112 <widget>
113 <class>QComboBox</class>
114 <item>
115 <property>
116 <name>text</name>
117 <string>11025</string>
118 </property>
119 </item>
120 <item>
121 <property>
122 <name>text</name>
123 <string>22050</string>
124 </property>
125 </item>
126 <item>
127 <property>
128 <name>text</name>
129 <string>44100</string>
130 </property>
131 </item>
132 <property stdset="1">
133 <name>name</name>
134 <cstring>sampleRate</cstring>
135 </property>
136 </widget>
137 <widget>
138 <class>QCheckBox</class>
139 <property stdset="1">
140 <name>name</name>
141 <cstring>stereoCheckBox</cstring>
142 </property>
143 <property stdset="1">
144 <name>text</name>
145 <string>Stereo</string>
146 </property>
147 </widget>
148 <widget>
149 <class>QCheckBox</class>
150 <property stdset="1">
151 <name>name</name>
152 <cstring>sixteenBitCheckBox</cstring>
153 </property>
154 <property stdset="1">
155 <name>text</name>
156 <string>16 bit</string>
157 </property>
158 </widget>
159 </vbox>
160 </widget>
161 </grid>
162 </widget>
163 <widget>
68 <class>QCheckBox</class> 164 <class>QCheckBox</class>
69 <property stdset="1"> 165 <property stdset="1">
70 <name>name</name> 166 <name>name</name>
@@ -72,7 +168,7 @@
72 </property> 168 </property>
73 <property stdset="1"> 169 <property stdset="1">
74 <name>text</name> 170 <name>text</name>
75 <string>Screen sound</string> 171 <string>Screen sounds</string>
76 </property> 172 </property>
77 </widget> 173 </widget>
78 <widget> 174 <widget>
@@ -83,14 +179,73 @@
83 </property> 179 </property>
84 <property stdset="1"> 180 <property stdset="1">
85 <name>text</name> 181 <name>text</name>
86 <string>Keyboard sound</string> 182 <string>Keyboard sounds</string>
183 </property>
184 </widget>
185 </vbox>
186 </widget>
187 <spacer>
188 <property>
189 <name>name</name>
190 <cstring>Spacer10</cstring>
191 </property>
192 <property stdset="1">
193 <name>orientation</name>
194 <enum>Vertical</enum>
87 </property> 195 </property>
196 <property stdset="1">
197 <name>sizeType</name>
198 <enum>Expanding</enum>
199 </property>
200 <property>
201 <name>sizeHint</name>
202 <size>
203 <width>20</width>
204 <height>20</height>
205 </size>
206 </property>
207 </spacer>
208 </vbox>
88 </widget> 209 </widget>
210 <widget row="0" column="0" >
211 <class>QGroupBox</class>
212 <property stdset="1">
213 <name>name</name>
214 <cstring>GroupBox3</cstring>
215 </property>
216 <property stdset="1">
217 <name>title</name>
218 <string>Levels</string>
219 </property>
220 <vbox>
221 <property stdset="1">
222 <name>margin</name>
223 <number>11</number>
224 </property>
225 <property stdset="1">
226 <name>spacing</name>
227 <number>6</number>
228 </property>
229 <widget>
230 <class>QLayoutWidget</class>
231 <property stdset="1">
232 <name>name</name>
233 <cstring>Layout10</cstring>
234 </property>
235 <vbox>
236 <property stdset="1">
237 <name>margin</name>
238 <number>0</number>
239 </property>
240 <property stdset="1">
241 <name>spacing</name>
242 <number>6</number>
243 </property>
89 <widget> 244 <widget>
90 <class>QLayoutWidget</class> 245 <class>QLayoutWidget</class>
91 <property stdset="1"> 246 <property stdset="1">
92 <name>name</name> 247 <name>name</name>
93 <cstring>Layout11</cstring> 248 <cstring>Layout16</cstring>
94 </property> 249 </property>
95 <hbox> 250 <hbox>
96 <property stdset="1"> 251 <property stdset="1">
@@ -104,7 +259,7 @@
104 <spacer> 259 <spacer>
105 <property> 260 <property>
106 <name>name</name> 261 <name>name</name>
107 <cstring>Spacer3_2_2</cstring> 262 <cstring>Spacer37</cstring>
108 </property> 263 </property>
109 <property stdset="1"> 264 <property stdset="1">
110 <name>orientation</name> 265 <name>orientation</name>
@@ -151,7 +306,7 @@
151 <spacer> 306 <spacer>
152 <property> 307 <property>
153 <name>name</name> 308 <name>name</name>
154 <cstring>Spacer3_2</cstring> 309 <cstring>Spacer7</cstring>
155 </property> 310 </property>
156 <property stdset="1"> 311 <property stdset="1">
157 <name>orientation</name> 312 <name>orientation</name>
@@ -175,7 +330,7 @@
175 <class>QLayoutWidget</class> 330 <class>QLayoutWidget</class>
176 <property stdset="1"> 331 <property stdset="1">
177 <name>name</name> 332 <name>name</name>
178 <cstring>Layout11</cstring> 333 <cstring>Layout13</cstring>
179 </property> 334 </property>
180 <hbox> 335 <hbox>
181 <property stdset="1"> 336 <property stdset="1">
@@ -187,21 +342,6 @@
187 <number>6</number> 342 <number>6</number>
188 </property> 343 </property>
189 <widget> 344 <widget>
190 <class>QLayoutWidget</class>
191 <property stdset="1">
192 <name>name</name>
193 <cstring>Layout7</cstring>
194 </property>
195 <vbox>
196 <property stdset="1">
197 <name>margin</name>
198 <number>0</number>
199 </property>
200 <property stdset="1">
201 <name>spacing</name>
202 <number>6</number>
203 </property>
204 <widget>
205 <class>QLabel</class> 345 <class>QLabel</class>
206 <property stdset="1"> 346 <property stdset="1">
207 <name>name</name> 347 <name>name</name>
@@ -209,46 +349,49 @@
209 </property> 349 </property>
210 <property stdset="1"> 350 <property stdset="1">
211 <name>text</name> 351 <name>text</name>
212 <string>Volume</string> 352 <string>Output</string>
213 </property> 353 </property>
214 </widget> 354 </widget>
215 <widget> 355 <spacer>
216 <class>QSlider</class> 356 <property>
217 <property stdset="1">
218 <name>name</name> 357 <name>name</name>
219 <cstring>volume</cstring> 358 <cstring>Spacer20</cstring>
220 </property> 359 </property>
221 <property stdset="1"> 360 <property stdset="1">
222 <name>maxValue</name> 361 <name>orientation</name>
223 <number>100</number> 362 <enum>Horizontal</enum>
224 </property> 363 </property>
225 <property stdset="1"> 364 <property stdset="1">
226 <name>value</name> 365 <name>sizeType</name>
227 <number>50</number> 366 <enum>Expanding</enum>
228 </property> 367 </property>
229 <property stdset="1"> 368 <property>
230 <name>orientation</name> 369 <name>sizeHint</name>
231 <enum>Vertical</enum> 370 <size>
371 <width>20</width>
372 <height>20</height>
373 </size>
232 </property> 374 </property>
375 </spacer>
376 <widget>
377 <class>QLabel</class>
233 <property stdset="1"> 378 <property stdset="1">
234 <name>tickmarks</name> 379 <name>name</name>
235 <enum>Right</enum> 380 <cstring>micLabel</cstring>
236 </property> 381 </property>
237 <property stdset="1"> 382 <property stdset="1">
238 <name>tickInterval</name> 383 <name>text</name>
239 <number>5</number> 384 <string>Mic</string>
240 </property> 385 </property>
241 </widget> 386 </widget>
242 </vbox>
243 </widget>
244 <spacer> 387 <spacer>
245 <property> 388 <property>
246 <name>name</name> 389 <name>name</name>
247 <cstring>Spacer5_2</cstring> 390 <cstring>Spacer17</cstring>
248 </property> 391 </property>
249 <property stdset="1"> 392 <property stdset="1">
250 <name>orientation</name> 393 <name>orientation</name>
251 <enum>Vertical</enum> 394 <enum>Horizontal</enum>
252 </property> 395 </property>
253 <property stdset="1"> 396 <property stdset="1">
254 <name>sizeType</name> 397 <name>sizeType</name>
@@ -262,13 +405,15 @@
262 </size> 405 </size>
263 </property> 406 </property>
264 </spacer> 407 </spacer>
408 </hbox>
409 </widget>
265 <widget> 410 <widget>
266 <class>QLayoutWidget</class> 411 <class>QLayoutWidget</class>
267 <property stdset="1"> 412 <property stdset="1">
268 <name>name</name> 413 <name>name</name>
269 <cstring>Layout8</cstring> 414 <cstring>Layout12</cstring>
270 </property> 415 </property>
271 <vbox> 416 <hbox>
272 <property stdset="1"> 417 <property stdset="1">
273 <name>margin</name> 418 <name>margin</name>
274 <number>0</number> 419 <number>0</number>
@@ -278,21 +423,10 @@
278 <number>6</number> 423 <number>6</number>
279 </property> 424 </property>
280 <widget> 425 <widget>
281 <class>QLabel</class>
282 <property stdset="1">
283 <name>name</name>
284 <cstring>micLabel</cstring>
285 </property>
286 <property stdset="1">
287 <name>text</name>
288 <string>Microphone</string>
289 </property>
290 </widget>
291 <widget>
292 <class>QSlider</class> 426 <class>QSlider</class>
293 <property stdset="1"> 427 <property stdset="1">
294 <name>name</name> 428 <name>name</name>
295 <cstring>mic</cstring> 429 <cstring>volume</cstring>
296 </property> 430 </property>
297 <property stdset="1"> 431 <property stdset="1">
298 <name>maxValue</name> 432 <name>maxValue</name>
@@ -315,29 +449,10 @@
315 <number>5</number> 449 <number>5</number>
316 </property> 450 </property>
317 </widget> 451 </widget>
318 </vbox>
319 </widget>
320 </hbox>
321 </widget>
322 <widget>
323 <class>QLayoutWidget</class>
324 <property stdset="1">
325 <name>name</name>
326 <cstring>Layout12</cstring>
327 </property>
328 <hbox>
329 <property stdset="1">
330 <name>margin</name>
331 <number>0</number>
332 </property>
333 <property stdset="1">
334 <name>spacing</name>
335 <number>6</number>
336 </property>
337 <spacer> 452 <spacer>
338 <property> 453 <property>
339 <name>name</name> 454 <name>name</name>
340 <cstring>Spacer3_2_3</cstring> 455 <cstring>Spacer19</cstring>
341 </property> 456 </property>
342 <property stdset="1"> 457 <property stdset="1">
343 <name>orientation</name> 458 <name>orientation</name>
@@ -356,35 +471,36 @@
356 </property> 471 </property>
357 </spacer> 472 </spacer>
358 <widget> 473 <widget>
359 <class>QLabel</class> 474 <class>QSlider</class>
360 <property stdset="1"> 475 <property stdset="1">
361 <name>name</name> 476 <name>name</name>
362 <cstring>PixmapLabel2_2</cstring> 477 <cstring>mic</cstring>
363 </property> 478 </property>
364 <property stdset="1"> 479 <property stdset="1">
365 <name>pixmap</name> 480 <name>maxValue</name>
366 <pixmap>image1</pixmap> 481 <number>100</number>
367 </property> 482 </property>
368 <property stdset="1"> 483 <property stdset="1">
369 <name>scaledContents</name> 484 <name>value</name>
370 <bool>false</bool> 485 <number>50</number>
371 </property> 486 </property>
372 </widget>
373 <widget>
374 <class>QLabel</class>
375 <property stdset="1"> 487 <property stdset="1">
376 <name>name</name> 488 <name>orientation</name>
377 <cstring>TextLabel2_2</cstring> 489 <enum>Vertical</enum>
378 </property> 490 </property>
379 <property stdset="1"> 491 <property stdset="1">
380 <name>text</name> 492 <name>tickmarks</name>
381 <string>Silent</string> 493 <enum>Right</enum>
494 </property>
495 <property stdset="1">
496 <name>tickInterval</name>
497 <number>5</number>
382 </property> 498 </property>
383 </widget> 499 </widget>
384 <spacer> 500 <spacer>
385 <property> 501 <property>
386 <name>name</name> 502 <name>name</name>
387 <cstring>Spacer2_2</cstring> 503 <cstring>Spacer18</cstring>
388 </property> 504 </property>
389 <property stdset="1"> 505 <property stdset="1">
390 <name>orientation</name> 506 <name>orientation</name>
@@ -404,15 +520,13 @@
404 </spacer> 520 </spacer>
405 </hbox> 521 </hbox>
406 </widget> 522 </widget>
407 </vbox>
408 </widget>
409 <widget> 523 <widget>
410 <class>QLayoutWidget</class> 524 <class>QLayoutWidget</class>
411 <property stdset="1"> 525 <property stdset="1">
412 <name>name</name> 526 <name>name</name>
413 <cstring>Layout29</cstring> 527 <cstring>Layout17</cstring>
414 </property> 528 </property>
415 <vbox> 529 <hbox>
416 <property stdset="1"> 530 <property stdset="1">
417 <name>margin</name> 531 <name>margin</name>
418 <number>0</number> 532 <number>0</number>
@@ -421,111 +535,57 @@
421 <name>spacing</name> 535 <name>spacing</name>
422 <number>6</number> 536 <number>6</number>
423 </property> 537 </property>
424 <widget> 538 <spacer>
425 <class>QGroupBox</class> 539 <property>
426 <property stdset="1">
427 <name>name</name> 540 <name>name</name>
428 <cstring>GroupBox1</cstring> 541 <cstring>Spacer38</cstring>
429 </property> 542 </property>
430 <property stdset="1"> 543 <property stdset="1">
431 <name>title</name> 544 <name>orientation</name>
432 <string>Record Defaults</string> 545 <enum>Horizontal</enum>
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>
445 <property stdset="1">
446 <name>name</name>
447 <cstring>Layout28</cstring>
448 </property> 546 </property>
449 <vbox>
450 <property stdset="1"> 547 <property stdset="1">
451 <name>margin</name> 548 <name>sizeType</name>
452 <number>0</number> 549 <enum>Expanding</enum>
453 </property> 550 </property>
454 <property stdset="1"> 551 <property>
455 <name>spacing</name> 552 <name>sizeHint</name>
456 <number>6</number> 553 <size>
554 <width>20</width>
555 <height>20</height>
556 </size>
457 </property> 557 </property>
558 </spacer>
458 <widget> 559 <widget>
459 <class>QLabel</class> 560 <class>QLabel</class>
460 <property stdset="1"> 561 <property stdset="1">
461 <name>name</name> 562 <name>name</name>
462 <cstring>sampleRateLabel</cstring> 563 <cstring>PixmapLabel2_2</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> 564 </property>
475 </widget>
476 <widget>
477 <class>QCheckBox</class>
478 <property stdset="1"> 565 <property stdset="1">
479 <name>name</name> 566 <name>pixmap</name>
480 <cstring>stereoCheckBox</cstring> 567 <pixmap>image1</pixmap>
481 </property> 568 </property>
482 <property stdset="1"> 569 <property stdset="1">
483 <name>text</name> 570 <name>scaledContents</name>
484 <string>Stereo</string> 571 <bool>false</bool>
485 </property> 572 </property>
486 </widget> 573 </widget>
487 <widget> 574 <widget>
488 <class>QCheckBox</class> 575 <class>QLabel</class>
489 <property stdset="1"> 576 <property stdset="1">
490 <name>name</name> 577 <name>name</name>
491 <cstring>sixteenBitCheckBox</cstring> 578 <cstring>TextLabel2_2</cstring>
492 </property> 579 </property>
493 <property stdset="1"> 580 <property stdset="1">
494 <name>text</name> 581 <name>text</name>
495 <string>16 bit</string> 582 <string>Silent</string>
496 </property>
497 </widget>
498 </vbox>
499 </widget>
500 </grid>
501 </widget>
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> 583 </property>
522 </spacer>
523 </vbox>
524 </widget> 584 </widget>
525 <spacer> 585 <spacer>
526 <property> 586 <property>
527 <name>name</name> 587 <name>name</name>
528 <cstring>Spacer10</cstring> 588 <cstring>Spacer8</cstring>
529 </property> 589 </property>
530 <property stdset="1"> 590 <property stdset="1">
531 <name>orientation</name> 591 <name>orientation</name>
@@ -545,6 +605,10 @@
545 </spacer> 605 </spacer>
546 </hbox> 606 </hbox>
547 </widget> 607 </widget>
608 </vbox>
609 </widget>
610 </vbox>
611 </widget>
548 </grid> 612 </grid>
549</widget> 613</widget>
550<images> 614<images>