-rw-r--r-- | noncore/settings/sound/soundsettings.cpp | 21 | ||||
-rw-r--r-- | noncore/settings/sound/soundsettingsbase.ui | 319 |
2 files changed, 235 insertions, 105 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 | |||
@@ -35,8 +35,11 @@ SoundSettings::SoundSettings( QWidget* parent, const char* name, WFlags fl ) | |||
35 | mic->setValue(100-config.readNumEntry("Mic")); | 35 | mic->setValue(100-config.readNumEntry("Mic")); |
36 | touchsound->setChecked(config.readBoolEntry("Touch")); | 36 | touchsound->setChecked(config.readBoolEntry("Touch")); |
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 | ||
41 | connect(volume, SIGNAL(valueChanged(int)), this, SLOT(setVolume(int))); | 44 | connect(volume, SIGNAL(valueChanged(int)), this, SLOT(setVolume(int))); |
42 | connect(mic, SIGNAL(valueChanged(int)), this, SLOT(setMic(int))); | 45 | connect(mic, SIGNAL(valueChanged(int)), this, SLOT(setMic(int))); |
@@ -51,6 +54,11 @@ void SoundSettings::reject() | |||
51 | setVolume(100-config.readNumEntry("Volume")); | 54 | setVolume(100-config.readNumEntry("Volume")); |
52 | setMic(100-config.readNumEntry("Mic")); | 55 | setMic(100-config.readNumEntry("Mic")); |
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(); |
55 | } | 63 | } |
56 | 64 | ||
@@ -62,8 +70,15 @@ void SoundSettings::accept() | |||
62 | config.writeEntry("Mic",100-mic->value()); | 70 | config.writeEntry("Mic",100-mic->value()); |
63 | config.writeEntry("Touch",touchsound->isChecked()); | 71 | config.writeEntry("Touch",touchsound->isChecked()); |
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(); |
68 | } | 83 | } |
69 | 84 | ||
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 | |||
@@ -11,7 +11,7 @@ | |||
11 | <rect> | 11 | <rect> |
12 | <x>0</x> | 12 | <x>0</x> |
13 | <y>0</y> | 13 | <y>0</y> |
14 | <width>376</width> | 14 | <width>372</width> |
15 | <height>441</height> | 15 | <height>441</height> |
16 | </rect> | 16 | </rect> |
17 | </property> | 17 | </property> |
@@ -38,7 +38,22 @@ | |||
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>Layout8</cstring> | 41 | <cstring>Layout30</cstring> |
42 | </property> | ||
43 | <hbox> | ||
44 | <property stdset="1"> | ||
45 | <name>margin</name> | ||
46 | <number>0</number> | ||
47 | </property> | ||
48 | <property stdset="1"> | ||
49 | <name>spacing</name> | ||
50 | <number>6</number> | ||
51 | </property> | ||
52 | <widget> | ||
53 | <class>QLayoutWidget</class> | ||
54 | <property stdset="1"> | ||
55 | <name>name</name> | ||
56 | <cstring>Layout24</cstring> | ||
42 | </property> | 57 | </property> |
43 | <vbox> | 58 | <vbox> |
44 | <property stdset="1"> | 59 | <property stdset="1"> |
@@ -53,51 +68,114 @@ | |||
53 | <class>QCheckBox</class> | 68 | <class>QCheckBox</class> |
54 | <property stdset="1"> | 69 | <property stdset="1"> |
55 | <name>name</name> | 70 | <name>name</name> |
56 | <cstring>keysound</cstring> | 71 | <cstring>touchsound</cstring> |
57 | </property> | 72 | </property> |
58 | <property stdset="1"> | 73 | <property stdset="1"> |
59 | <name>text</name> | 74 | <name>text</name> |
60 | <string>Keyboard sound</string> | 75 | <string>Screen sound</string> |
61 | </property> | 76 | </property> |
62 | </widget> | 77 | </widget> |
63 | <widget> | 78 | <widget> |
64 | <class>QCheckBox</class> | 79 | <class>QCheckBox</class> |
65 | <property stdset="1"> | 80 | <property stdset="1"> |
66 | <name>name</name> | 81 | <name>name</name> |
67 | <cstring>touchsound</cstring> | 82 | <cstring>keysound</cstring> |
68 | </property> | 83 | </property> |
69 | <property stdset="1"> | 84 | <property stdset="1"> |
70 | <name>text</name> | 85 | <name>text</name> |
71 | <string>Screen sound</string> | 86 | <string>Keyboard sound</string> |
72 | </property> | 87 | </property> |
73 | </widget> | 88 | </widget> |
74 | <widget> | 89 | <widget> |
90 | <class>QLayoutWidget</class> | ||
91 | <property stdset="1"> | ||
92 | <name>name</name> | ||
93 | <cstring>Layout11</cstring> | ||
94 | </property> | ||
95 | <hbox> | ||
96 | <property stdset="1"> | ||
97 | <name>margin</name> | ||
98 | <number>0</number> | ||
99 | </property> | ||
100 | <property stdset="1"> | ||
101 | <name>spacing</name> | ||
102 | <number>6</number> | ||
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> | ||
125 | <widget> | ||
75 | <class>QLabel</class> | 126 | <class>QLabel</class> |
76 | <property stdset="1"> | 127 | <property stdset="1"> |
77 | <name>name</name> | 128 | <name>name</name> |
78 | <cstring>dblClickLabel</cstring> | 129 | <cstring>PixmapLabel1_2</cstring> |
79 | </property> | 130 | </property> |
80 | <property stdset="1"> | 131 | <property stdset="1"> |
81 | <name>text</name> | 132 | <name>pixmap</name> |
82 | <string>Double Click Volume runs:</string> | 133 | <pixmap>image0</pixmap> |
134 | </property> | ||
135 | <property stdset="1"> | ||
136 | <name>scaledContents</name> | ||
137 | <bool>false</bool> | ||
83 | </property> | 138 | </property> |
84 | </widget> | 139 | </widget> |
85 | <widget> | 140 | <widget> |
86 | <class>QLineEdit</class> | 141 | <class>QLabel</class> |
87 | <property stdset="1"> | 142 | <property stdset="1"> |
88 | <name>name</name> | 143 | <name>name</name> |
89 | <cstring>dblClickRuns</cstring> | 144 | <cstring>TextLabel1_2</cstring> |
90 | </property> | 145 | </property> |
91 | <property stdset="1"> | 146 | <property stdset="1"> |
92 | <name>text</name> | 147 | <name>text</name> |
93 | <string></string> | 148 | <string>Loud</string> |
94 | </property> | 149 | </property> |
95 | </widget> | 150 | </widget> |
151 | <spacer> | ||
152 | <property> | ||
153 | <name>name</name> | ||
154 | <cstring>Spacer3_2</cstring> | ||
155 | </property> | ||
156 | <property stdset="1"> | ||
157 | <name>orientation</name> | ||
158 | <enum>Horizontal</enum> | ||
159 | </property> | ||
160 | <property stdset="1"> | ||
161 | <name>sizeType</name> | ||
162 | <enum>Expanding</enum> | ||
163 | </property> | ||
164 | <property> | ||
165 | <name>sizeHint</name> | ||
166 | <size> | ||
167 | <width>20</width> | ||
168 | <height>20</height> | ||
169 | </size> | ||
170 | </property> | ||
171 | </spacer> | ||
172 | </hbox> | ||
173 | </widget> | ||
96 | <widget> | 174 | <widget> |
97 | <class>QLayoutWidget</class> | 175 | <class>QLayoutWidget</class> |
98 | <property stdset="1"> | 176 | <property stdset="1"> |
99 | <name>name</name> | 177 | <name>name</name> |
100 | <cstring>Layout14</cstring> | 178 | <cstring>Layout11</cstring> |
101 | </property> | 179 | </property> |
102 | <hbox> | 180 | <hbox> |
103 | <property stdset="1"> | 181 | <property stdset="1"> |
@@ -163,44 +241,14 @@ | |||
163 | </widget> | 241 | </widget> |
164 | </vbox> | 242 | </vbox> |
165 | </widget> | 243 | </widget> |
166 | <widget> | ||
167 | <class>QLayoutWidget</class> | ||
168 | <property stdset="1"> | ||
169 | <name>name</name> | ||
170 | <cstring>Layout13</cstring> | ||
171 | </property> | ||
172 | <vbox> | ||
173 | <property stdset="1"> | ||
174 | <name>margin</name> | ||
175 | <number>0</number> | ||
176 | </property> | ||
177 | <property stdset="1"> | ||
178 | <name>spacing</name> | ||
179 | <number>6</number> | ||
180 | </property> | ||
181 | <widget> | ||
182 | <class>QLayoutWidget</class> | ||
183 | <property stdset="1"> | ||
184 | <name>name</name> | ||
185 | <cstring>Layout11</cstring> | ||
186 | </property> | ||
187 | <hbox> | ||
188 | <property stdset="1"> | ||
189 | <name>margin</name> | ||
190 | <number>0</number> | ||
191 | </property> | ||
192 | <property stdset="1"> | ||
193 | <name>spacing</name> | ||
194 | <number>6</number> | ||
195 | </property> | ||
196 | <spacer> | 244 | <spacer> |
197 | <property> | 245 | <property> |
198 | <name>name</name> | 246 | <name>name</name> |
199 | <cstring>Spacer3_2_2</cstring> | 247 | <cstring>Spacer5_2</cstring> |
200 | </property> | 248 | </property> |
201 | <property stdset="1"> | 249 | <property stdset="1"> |
202 | <name>orientation</name> | 250 | <name>orientation</name> |
203 | <enum>Horizontal</enum> | 251 | <enum>Vertical</enum> |
204 | </property> | 252 | </property> |
205 | <property stdset="1"> | 253 | <property stdset="1"> |
206 | <name>sizeType</name> | 254 | <name>sizeType</name> |
@@ -215,75 +263,62 @@ | |||
215 | </property> | 263 | </property> |
216 | </spacer> | 264 | </spacer> |
217 | <widget> | 265 | <widget> |
218 | <class>QLabel</class> | 266 | <class>QLayoutWidget</class> |
219 | <property stdset="1"> | 267 | <property stdset="1"> |
220 | <name>name</name> | 268 | <name>name</name> |
221 | <cstring>PixmapLabel1_2</cstring> | 269 | <cstring>Layout8</cstring> |
222 | </property> | 270 | </property> |
271 | <vbox> | ||
223 | <property stdset="1"> | 272 | <property stdset="1"> |
224 | <name>pixmap</name> | 273 | <name>margin</name> |
225 | <pixmap>image0</pixmap> | 274 | <number>0</number> |
226 | </property> | 275 | </property> |
227 | <property stdset="1"> | 276 | <property stdset="1"> |
228 | <name>scaledContents</name> | 277 | <name>spacing</name> |
229 | <bool>false</bool> | 278 | <number>6</number> |
230 | </property> | 279 | </property> |
231 | </widget> | ||
232 | <widget> | 280 | <widget> |
233 | <class>QLabel</class> | 281 | <class>QLabel</class> |
234 | <property stdset="1"> | 282 | <property stdset="1"> |
235 | <name>name</name> | 283 | <name>name</name> |
236 | <cstring>TextLabel1_2</cstring> | 284 | <cstring>micLabel</cstring> |
237 | </property> | 285 | </property> |
238 | <property stdset="1"> | 286 | <property stdset="1"> |
239 | <name>text</name> | 287 | <name>text</name> |
240 | <string>Loud</string> | 288 | <string>Microphone</string> |
241 | </property> | 289 | </property> |
242 | </widget> | 290 | </widget> |
243 | <spacer> | 291 | <widget> |
244 | <property> | 292 | <class>QSlider</class> |
293 | <property stdset="1"> | ||
245 | <name>name</name> | 294 | <name>name</name> |
246 | <cstring>Spacer3_2</cstring> | 295 | <cstring>mic</cstring> |
247 | </property> | 296 | </property> |
248 | <property stdset="1"> | 297 | <property stdset="1"> |
249 | <name>orientation</name> | 298 | <name>maxValue</name> |
250 | <enum>Horizontal</enum> | 299 | <number>100</number> |
251 | </property> | 300 | </property> |
252 | <property stdset="1"> | 301 | <property stdset="1"> |
253 | <name>sizeType</name> | 302 | <name>value</name> |
254 | <enum>Expanding</enum> | 303 | <number>50</number> |
255 | </property> | ||
256 | <property> | ||
257 | <name>sizeHint</name> | ||
258 | <size> | ||
259 | <width>20</width> | ||
260 | <height>20</height> | ||
261 | </size> | ||
262 | </property> | ||
263 | </spacer> | ||
264 | </hbox> | ||
265 | </widget> | ||
266 | <spacer> | ||
267 | <property> | ||
268 | <name>name</name> | ||
269 | <cstring>Spacer5_2</cstring> | ||
270 | </property> | 304 | </property> |
271 | <property stdset="1"> | 305 | <property stdset="1"> |
272 | <name>orientation</name> | 306 | <name>orientation</name> |
273 | <enum>Vertical</enum> | 307 | <enum>Vertical</enum> |
274 | </property> | 308 | </property> |
275 | <property stdset="1"> | 309 | <property stdset="1"> |
276 | <name>sizeType</name> | 310 | <name>tickmarks</name> |
277 | <enum>Expanding</enum> | 311 | <enum>Right</enum> |
278 | </property> | 312 | </property> |
279 | <property> | 313 | <property stdset="1"> |
280 | <name>sizeHint</name> | 314 | <name>tickInterval</name> |
281 | <size> | 315 | <number>5</number> |
282 | <width>20</width> | ||
283 | <height>20</height> | ||
284 | </size> | ||
285 | </property> | 316 | </property> |
286 | </spacer> | 317 | </widget> |
318 | </vbox> | ||
319 | </widget> | ||
320 | </hbox> | ||
321 | </widget> | ||
287 | <widget> | 322 | <widget> |
288 | <class>QLayoutWidget</class> | 323 | <class>QLayoutWidget</class> |
289 | <property stdset="1"> | 324 | <property stdset="1"> |
@@ -375,7 +410,41 @@ | |||
375 | <class>QLayoutWidget</class> | 410 | <class>QLayoutWidget</class> |
376 | <property stdset="1"> | 411 | <property stdset="1"> |
377 | <name>name</name> | 412 | <name>name</name> |
378 | <cstring>Layout8</cstring> | 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> | ||
445 | <property stdset="1"> | ||
446 | <name>name</name> | ||
447 | <cstring>Layout28</cstring> | ||
379 | </property> | 448 | </property> |
380 | <vbox> | 449 | <vbox> |
381 | <property stdset="1"> | 450 | <property stdset="1"> |
@@ -390,46 +459,92 @@ | |||
390 | <class>QLabel</class> | 459 | <class>QLabel</class> |
391 | <property stdset="1"> | 460 | <property stdset="1"> |
392 | <name>name</name> | 461 | <name>name</name> |
393 | <cstring>micLabel</cstring> | 462 | <cstring>sampleRateLabel</cstring> |
394 | </property> | 463 | </property> |
395 | <property stdset="1"> | 464 | <property stdset="1"> |
396 | <name>text</name> | 465 | <name>text</name> |
397 | <string>Microphone</string> | 466 | <string>Rate (5k-44k)</string> |
398 | </property> | 467 | </property> |
399 | </widget> | 468 | </widget> |
400 | <widget> | 469 | <widget> |
401 | <class>QSlider</class> | 470 | <class>QLineEdit</class> |
402 | <property stdset="1"> | 471 | <property stdset="1"> |
403 | <name>name</name> | 472 | <name>name</name> |
404 | <cstring>mic</cstring> | 473 | <cstring>sampleRate</cstring> |
405 | </property> | 474 | </property> |
475 | </widget> | ||
476 | <widget> | ||
477 | <class>QCheckBox</class> | ||
406 | <property stdset="1"> | 478 | <property stdset="1"> |
407 | <name>maxValue</name> | 479 | <name>name</name> |
408 | <number>100</number> | 480 | <cstring>stereoCheckBox</cstring> |
409 | </property> | 481 | </property> |
410 | <property stdset="1"> | 482 | <property stdset="1"> |
411 | <name>value</name> | 483 | <name>text</name> |
412 | <number>50</number> | 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> | ||
499 | </widget> | ||
500 | </grid> | ||
501 | </widget> | ||
502 | <spacer> | ||
503 | <property> | ||
504 | <name>name</name> | ||
505 | <cstring>Spacer9</cstring> | ||
413 | </property> | 506 | </property> |
414 | <property stdset="1"> | 507 | <property stdset="1"> |
415 | <name>orientation</name> | 508 | <name>orientation</name> |
416 | <enum>Vertical</enum> | 509 | <enum>Vertical</enum> |
417 | </property> | 510 | </property> |
418 | <property stdset="1"> | 511 | <property stdset="1"> |
419 | <name>tickmarks</name> | 512 | <name>sizeType</name> |
420 | <enum>Right</enum> | 513 | <enum>Expanding</enum> |
421 | </property> | 514 | </property> |
422 | <property stdset="1"> | 515 | <property> |
423 | <name>tickInterval</name> | 516 | <name>sizeHint</name> |
424 | <number>5</number> | 517 | <size> |
518 | <width>20</width> | ||
519 | <height>20</height> | ||
520 | </size> | ||
425 | </property> | 521 | </property> |
426 | </widget> | 522 | </spacer> |
427 | </vbox> | 523 | </vbox> |
428 | </widget> | 524 | </widget> |
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> | ||
429 | </hbox> | 546 | </hbox> |
430 | </widget> | 547 | </widget> |
431 | </vbox> | ||
432 | </widget> | ||
433 | </grid> | 548 | </grid> |
434 | </widget> | 549 | </widget> |
435 | <images> | 550 | <images> |