author | sandman <sandman> | 2002-09-30 21:10:05 (UTC) |
---|---|---|
committer | sandman <sandman> | 2002-09-30 21:10:05 (UTC) |
commit | f49ad5cf3bdc1d1c06be4615a649b6be6f179b83 (patch) (unidiff) | |
tree | 77ad6928937375e116529fab2e5a746fce5ba936 | |
parent | 3ff016b281a3c059e6ecb728c60fd6847756f291 (diff) | |
download | opie-f49ad5cf3bdc1d1c06be4615a649b6be6f179b83.zip opie-f49ad5cf3bdc1d1c06be4615a649b6be6f179b83.tar.gz opie-f49ad5cf3bdc1d1c06be4615a649b6be6f179b83.tar.bz2 |
- small cleanup
- changed to work with the new ODevice API
-rw-r--r-- | core/applets/volumeapplet/volume.cpp | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/core/applets/volumeapplet/volume.cpp b/core/applets/volumeapplet/volume.cpp index eedc749..aec346b 100644 --- a/core/applets/volumeapplet/volume.cpp +++ b/core/applets/volumeapplet/volume.cpp | |||
@@ -1,111 +1,113 @@ | |||
1 | /********************************************************************** | 1 | /********************************************************************** |
2 | ** Copyright (C) 2000 Trolltech AS. All rights reserved. | 2 | ** Copyright (C) 2000 Trolltech AS. All rights reserved. |
3 | ** | 3 | ** |
4 | ** This file is part of Qtopia Environment. | 4 | ** This file is part of Qtopia Environment. |
5 | ** | 5 | ** |
6 | ** This file may be distributed and/or modified under the terms of the | 6 | ** This file may be distributed and/or modified under the terms of the |
7 | ** GNU General Public License version 2 as published by the Free Software | 7 | ** GNU General Public License version 2 as published by the Free Software |
8 | ** Foundation and appearing in the file LICENSE.GPL included in the | 8 | ** Foundation and appearing in the file LICENSE.GPL included in the |
9 | ** packaging of this file. | 9 | ** packaging of this file. |
10 | ** | 10 | ** |
11 | ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE | 11 | ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE |
12 | ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. | 12 | ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. |
13 | ** | 13 | ** |
14 | ** See http://www.trolltech.com/gpl/ for GPL licensing information. | 14 | ** See http://www.trolltech.com/gpl/ for GPL licensing information. |
15 | ** | 15 | ** |
16 | ** Contact info@trolltech.com if any conditions of this licensing are | 16 | ** Contact info@trolltech.com if any conditions of this licensing are |
17 | ** not clear to you. | 17 | ** not clear to you. |
18 | ** | 18 | ** |
19 | **********************************************************************/ | 19 | **********************************************************************/ |
20 | 20 | ||
21 | #include <stdio.h> | 21 | #include <stdio.h> |
22 | 22 | ||
23 | #include "volume.h" | 23 | #include "volume.h" |
24 | 24 | ||
25 | #include <qpe/resource.h> | 25 | #include <qpe/resource.h> |
26 | #include <qpe/qpeapplication.h> | 26 | #include <qpe/qpeapplication.h> |
27 | #include <qpe/config.h> | 27 | #include <qpe/config.h> |
28 | #if ( defined Q_WS_QWS || defined(_WS_QWS_) ) && !defined(QT_NO_COP) | 28 | #if ( defined Q_WS_QWS || defined(_WS_QWS_) ) && !defined(QT_NO_COP) |
29 | #include <qpe/qcopenvelope_qws.h> | 29 | #include <qpe/qcopenvelope_qws.h> |
30 | #endif | 30 | #endif |
31 | 31 | ||
32 | #include <qpainter.h> | 32 | #include <qpainter.h> |
33 | #include <qcheckbox.h> | 33 | #include <qcheckbox.h> |
34 | #include <qslider.h> | 34 | #include <qslider.h> |
35 | #include <qlayout.h> | 35 | #include <qlayout.h> |
36 | #include <qframe.h> | 36 | #include <qframe.h> |
37 | #include <qpixmap.h> | 37 | #include <qpixmap.h> |
38 | #include <qlabel.h> | 38 | #include <qlabel.h> |
39 | 39 | ||
40 | #include <qtoolbutton.h> | 40 | #include <qtoolbutton.h> |
41 | #include <qpushbutton.h> | 41 | #include <qpushbutton.h> |
42 | #include <qtimer.h> | 42 | #include <qtimer.h> |
43 | 43 | ||
44 | #include <opie/odevice.h> | 44 | #include <opie/odevice.h> |
45 | 45 | ||
46 | #include "oledbox.h" | 46 | #include "oledbox.h" |
47 | 47 | ||
48 | using namespace Opie; | ||
49 | |||
48 | #define RATE_TIMER_INTERVAL 100 | 50 | #define RATE_TIMER_INTERVAL 100 |
49 | // Ten times per second is fine (RATE_TIMER_INTERVAL 100). A shorter time | 51 | // Ten times per second is fine (RATE_TIMER_INTERVAL 100). A shorter time |
50 | // results in "hanging" buttons on the iPAQ due to quite high CPU consumption. | 52 | // results in "hanging" buttons on the iPAQ due to quite high CPU consumption. |
51 | 53 | ||
52 | 54 | ||
53 | /* XPM */ | 55 | /* XPM */ |
54 | static const char * vol_xpm[] = { | 56 | static const char * vol_xpm[] = { |
55 | "20 20 3 1", | 57 | "20 20 3 1", |
56 | " c None", | 58 | " c None", |
57 | ". c #0000FF", | 59 | ". c #0000FF", |
58 | "+ c #000000", | 60 | "+ c #000000", |
59 | " ", | 61 | " ", |
60 | " . ", | 62 | " . ", |
61 | " . . . . ", | 63 | " . . . . ", |
62 | " . . . . . . ", | 64 | " . . . . . . ", |
63 | " . . . . . . . ", | 65 | " . . . . . . . ", |
64 | " . . ..... . . ", | 66 | " . . ..... . . ", |
65 | " . ... ..... ... ", | 67 | " . ... ..... ... ", |
66 | " ........... .... ", | 68 | " ........... .... ", |
67 | " ................. ", | 69 | " ................. ", |
68 | "++++++++++++++++++++", | 70 | "++++++++++++++++++++", |
69 | " .................. ", | 71 | " .................. ", |
70 | " . ............. . ", | 72 | " . ............. . ", |
71 | " . ..... ....... ", | 73 | " . ..... ....... ", |
72 | " . ... ..... . ", | 74 | " . ... ..... . ", |
73 | " . ... ..... . ", | 75 | " . ... ..... . ", |
74 | " . ... ..... ", | 76 | " . ... ..... ", |
75 | " . . . . . ", | 77 | " . . . . . ", |
76 | " . . . ", | 78 | " . . . ", |
77 | " . . . ", | 79 | " . . . ", |
78 | " "}; | 80 | " "}; |
79 | /* XPM */ | 81 | /* XPM */ |
80 | static const char * mic_xpm[] = { | 82 | static const char * mic_xpm[] = { |
81 | "20 20 21 1", | 83 | "20 20 21 1", |
82 | " c None", | 84 | " c None", |
83 | ". c #000000", | 85 | ". c #000000", |
84 | "+ c #EEEEEE", | 86 | "+ c #EEEEEE", |
85 | "@ c #B4B6B4", | 87 | "@ c #B4B6B4", |
86 | "# c #8B8D8B", | 88 | "# c #8B8D8B", |
87 | "$ c #D5D6D5", | 89 | "$ c #D5D6D5", |
88 | "% c #E6E6E6", | 90 | "% c #E6E6E6", |
89 | "& c #9C9D9C", | 91 | "& c #9C9D9C", |
90 | "* c #6A696A", | 92 | "* c #6A696A", |
91 | "= c #E6E2E6", | 93 | "= c #E6E2E6", |
92 | "- c #F6F2F6", | 94 | "- c #F6F2F6", |
93 | "; c #CDC6CD", | 95 | "; c #CDC6CD", |
94 | "> c #737573", | 96 | "> c #737573", |
95 | ", c #4A484A", | 97 | ", c #4A484A", |
96 | "' c #DEDEDE", | 98 | "' c #DEDEDE", |
97 | ") c #F6EEF6", | 99 | ") c #F6EEF6", |
98 | "! c #414041", | 100 | "! c #414041", |
99 | "~ c #202020", | 101 | "~ c #202020", |
100 | "{ c #ACAEAC", | 102 | "{ c #ACAEAC", |
101 | "] c #838583", | 103 | "] c #838583", |
102 | "^ c #6A656A", | 104 | "^ c #6A656A", |
103 | " ", | 105 | " ", |
104 | " .... ", | 106 | " .... ", |
105 | " .+@+#. ", | 107 | " .+@+#. ", |
106 | " ..$%&%*. ", | 108 | " ..$%&%*. ", |
107 | " .=-.;=>=,. ", | 109 | " .=-.;=>=,. ", |
108 | " .'+).&+!+. ", | 110 | " .'+).&+!+. ", |
109 | " .+;+;.~+~. ", | 111 | " .+;+;.~+~. ", |
110 | " ..%{%,.... ", | 112 | " ..%{%,.... ", |
111 | " ..&=>=~.. ", | 113 | " ..&=>=~.. ", |
@@ -125,131 +127,133 @@ static const char * mic_xpm[] = { | |||
125 | static const char * alarm_xpm[] = { | 127 | static const char * alarm_xpm[] = { |
126 | "20 20 33 1", | 128 | "20 20 33 1", |
127 | " c None", | 129 | " c None", |
128 | ". c #080602", | 130 | ". c #080602", |
129 | "+ c #AAA602", | 131 | "+ c #AAA602", |
130 | "@ c #252002", | 132 | "@ c #252002", |
131 | "# c #434202", | 133 | "# c #434202", |
132 | "$ c #795602", | 134 | "$ c #795602", |
133 | "% c #C3C20D", | 135 | "% c #C3C20D", |
134 | "& c #DADAC2", | 136 | "& c #DADAC2", |
135 | "* c #826002", | 137 | "* c #826002", |
136 | "= c #740502", | 138 | "= c #740502", |
137 | "- c #D6D602", | 139 | "- c #D6D602", |
138 | "; c #322E02", | 140 | "; c #322E02", |
139 | "> c #826A02", | 141 | "> c #826A02", |
140 | ", c #F1F195", | 142 | ", c #F1F195", |
141 | "' c #959215", | 143 | "' c #959215", |
142 | ") c #423602", | 144 | ") c #423602", |
143 | "! c #4B0302", | 145 | "! c #4B0302", |
144 | "~ c #844315", | 146 | "~ c #844315", |
145 | "{ c #AAAA2A", | 147 | "{ c #AAAA2A", |
146 | "] c #E2DE42", | 148 | "] c #E2DE42", |
147 | "^ c #BA7E04", | 149 | "^ c #BA7E04", |
148 | "/ c #7F7502", | 150 | "/ c #7F7502", |
149 | "( c #828276", | 151 | "( c #828276", |
150 | "_ c #FEFE4E", | 152 | "_ c #FEFE4E", |
151 | ": c #7D1902", | 153 | ": c #7D1902", |
152 | "< c #989656", | 154 | "< c #989656", |
153 | "[ c #260B02", | 155 | "[ c #260B02", |
154 | "} c #F7F7D8", | 156 | "} c #F7F7D8", |
155 | "| c #DCDA5A", | 157 | "| c #DCDA5A", |
156 | "1 c #823102", | 158 | "1 c #823102", |
157 | "2 c #B1AC6B", | 159 | "2 c #B1AC6B", |
158 | "3 c #F7F710", | 160 | "3 c #F7F710", |
159 | "4 c #838204", | 161 | "4 c #838204", |
160 | " ", | 162 | " ", |
161 | " ", | 163 | " ", |
162 | " 4'4/ ", | 164 | " 4'4/ ", |
163 | " /-^= ", | 165 | " /-^= ", |
164 | " 42{4>4 ", | 166 | " 42{4>4 ", |
165 | " '2|+*$44 ", | 167 | " '2|+*$44 ", |
166 | " +2&3+$1*44 ", | 168 | " +2&3+$1*44 ", |
167 | " (%_}_+/$:>/4 ", | 169 | " (%_}_+/$:>/4 ", |
168 | " 4%_}3+#;>:*4 ", | 170 | " 4%_}3+#;>:*4 ", |
169 | " 4%_}&+#[1$/4 ", | 171 | " 4%_}&+#[1$/4 ", |
170 | " 4%_,2')[~~>4 ", | 172 | " 4%_,2')[~~>4 ", |
171 | " 4%33'4#@~1>4 ", | 173 | " 4%33'4#@~1>4 ", |
172 | " 4%3344#[:>/4 ", | 174 | " 4%3344#[:>/4 ", |
173 | " 42&_3'4#@>:*44 ", | 175 | " 42&_3'4#@>:*44 ", |
174 | " 42|}}3'4#[;$)$44 ", | 176 | " 42|}}3'4#[;$)$44 ", |
175 | "444{]]2^~~:!!#.@##/ ", | 177 | "444{]]2^~~:!!#.@##/ ", |
176 | "4444-%*:==!!=...../ ", | 178 | "4444-%*:==!!=...../ ", |
177 | " /:[.. ", | 179 | " /:[.. ", |
178 | " /@. ", | 180 | " /@. ", |
179 | " "}; | 181 | " "}; |
180 | 182 | ||
181 | VolumeControl::VolumeControl ( VolumeApplet *icon, bool /*showMic*/, QWidget *parent, const char *name ) | 183 | VolumeControl::VolumeControl ( VolumeApplet *icon, bool /*showMic*/, QWidget *parent, const char *name ) |
182 | : QFrame ( parent, name, WStyle_StaysOnTop | WType_Popup ) | 184 | : QFrame ( parent, name, WStyle_StaysOnTop | WType_Popup ) |
183 | { | 185 | { |
184 | m_icon = icon; | 186 | m_icon = icon; |
185 | 187 | ||
186 | bool has_wav_alarm = true; | 188 | bool has_wav_alarm = true; |
187 | 189 | ||
188 | switch ( ODevice::inst ( )-> model ( )) { // we need to add other devices eventually | 190 | switch ( ODevice::inst ( )-> model ( )) { // we need to add other devices eventually |
189 | case OMODEL_Zaurus_SL5000: | 191 | case Model_Zaurus_SL5000: |
190 | has_wav_alarm = false; //poor guys probably feeling left out... | 192 | has_wav_alarm = false; //poor guys probably feeling left out... |
191 | break; | 193 | break; |
194 | default: | ||
195 | break; | ||
192 | } | 196 | } |
193 | 197 | ||
194 | 198 | ||
195 | setFrameStyle ( QFrame::PopupPanel | QFrame::Raised ); | 199 | setFrameStyle ( QFrame::PopupPanel | QFrame::Raised ); |
196 | 200 | ||
197 | QGridLayout *grid = new QGridLayout ( this, 1, 1, 6, 4 ); | 201 | QGridLayout *grid = new QGridLayout ( this, 1, 1, 6, 4 ); |
198 | grid-> setSpacing ( 4 ); | 202 | grid-> setSpacing ( 4 ); |
199 | grid-> setMargin ( 6 ); | 203 | grid-> setMargin ( 6 ); |
200 | 204 | ||
201 | QVBoxLayout *vbox; | 205 | QVBoxLayout *vbox; |
202 | QLabel *l; | 206 | QLabel *l; |
203 | 207 | ||
204 | vbox = new QVBoxLayout ( ); | 208 | vbox = new QVBoxLayout ( ); |
205 | vbox-> setSpacing ( 4 ); | 209 | vbox-> setSpacing ( 4 ); |
206 | grid-> addLayout ( vbox, 1, 0 ); | 210 | grid-> addLayout ( vbox, 1, 0 ); |
207 | 211 | ||
208 | upButton = new QPushButton ( this ); | 212 | upButton = new QPushButton ( this ); |
209 | upButton-> setSizePolicy ( QSizePolicy ( QSizePolicy::Minimum, QSizePolicy::Expanding )); | 213 | upButton-> setSizePolicy ( QSizePolicy ( QSizePolicy::Minimum, QSizePolicy::Expanding )); |
210 | upButton-> setPixmap ( Resource::loadPixmap ( "up" )); | 214 | upButton-> setPixmap ( Resource::loadPixmap ( "up" )); |
211 | upButton-> setFocusPolicy ( QWidget::NoFocus ); | 215 | upButton-> setFocusPolicy ( QWidget::NoFocus ); |
212 | 216 | ||
213 | vbox-> addWidget ( upButton ); | 217 | vbox-> addWidget ( upButton ); |
214 | 218 | ||
215 | downButton = new QPushButton ( this ); | 219 | downButton = new QPushButton ( this ); |
216 | downButton-> setSizePolicy ( QSizePolicy ( QSizePolicy::Minimum, QSizePolicy::Expanding )); | 220 | downButton-> setSizePolicy ( QSizePolicy ( QSizePolicy::Minimum, QSizePolicy::Expanding )); |
217 | downButton-> setPixmap ( Resource::loadPixmap ( "down" )); | 221 | downButton-> setPixmap ( Resource::loadPixmap ( "down" )); |
218 | downButton-> setFocusPolicy ( QWidget::NoFocus ); | 222 | downButton-> setFocusPolicy ( QWidget::NoFocus ); |
219 | 223 | ||
220 | vbox-> addWidget ( downButton ); | 224 | vbox-> addWidget ( downButton ); |
221 | 225 | ||
222 | volSlider = new QSlider ( this ); | 226 | volSlider = new QSlider ( this ); |
223 | volSlider-> setRange ( 0, 100 ); | 227 | volSlider-> setRange ( 0, 100 ); |
224 | volSlider-> setTickmarks ( QSlider::Both ); | 228 | volSlider-> setTickmarks ( QSlider::Both ); |
225 | volSlider-> setTickInterval ( 20 ); | 229 | volSlider-> setTickInterval ( 20 ); |
226 | volSlider-> setFocusPolicy ( QWidget::NoFocus ); | 230 | volSlider-> setFocusPolicy ( QWidget::NoFocus ); |
227 | 231 | ||
228 | l = new QLabel ( this ); | 232 | l = new QLabel ( this ); |
229 | l-> setPixmap ( QPixmap ( vol_xpm )); | 233 | l-> setPixmap ( QPixmap ( vol_xpm )); |
230 | 234 | ||
231 | grid-> addWidget ( l, 0, 1, AlignCenter ); | 235 | grid-> addWidget ( l, 0, 1, AlignCenter ); |
232 | grid-> addWidget ( volSlider, 1, 1, AlignCenter ); | 236 | grid-> addWidget ( volSlider, 1, 1, AlignCenter ); |
233 | 237 | ||
234 | volLed = new OLedBox ( green, this ); | 238 | volLed = new OLedBox ( green, this ); |
235 | volLed-> setFocusPolicy ( QWidget::NoFocus ); | 239 | volLed-> setFocusPolicy ( QWidget::NoFocus ); |
236 | volLed-> setFixedSize ( 16, 16 ); | 240 | volLed-> setFixedSize ( 16, 16 ); |
237 | 241 | ||
238 | grid-> addWidget ( volLed, 2, 1, AlignCenter ); | 242 | grid-> addWidget ( volLed, 2, 1, AlignCenter ); |
239 | 243 | ||
240 | micSlider = new QSlider ( this ); | 244 | micSlider = new QSlider ( this ); |
241 | micSlider-> setRange ( 0, 100 ); | 245 | micSlider-> setRange ( 0, 100 ); |
242 | micSlider-> setTickmarks ( QSlider::Both ); | 246 | micSlider-> setTickmarks ( QSlider::Both ); |
243 | micSlider-> setTickInterval ( 20 ); | 247 | micSlider-> setTickInterval ( 20 ); |
244 | micSlider-> setFocusPolicy ( QWidget::NoFocus ); | 248 | micSlider-> setFocusPolicy ( QWidget::NoFocus ); |
245 | 249 | ||
246 | l = new QLabel ( this ); | 250 | l = new QLabel ( this ); |
247 | l-> setPixmap ( QPixmap ( mic_xpm )); | 251 | l-> setPixmap ( QPixmap ( mic_xpm )); |
248 | 252 | ||
249 | grid-> addWidget ( l, 0, 2, AlignCenter ); | 253 | grid-> addWidget ( l, 0, 2, AlignCenter ); |
250 | grid-> addWidget ( micSlider, 1, 2, AlignCenter ); | 254 | grid-> addWidget ( micSlider, 1, 2, AlignCenter ); |
251 | 255 | ||
252 | micLed = new OLedBox ( red, this ); | 256 | micLed = new OLedBox ( red, this ); |
253 | micLed-> setFocusPolicy ( QWidget::NoFocus ); | 257 | micLed-> setFocusPolicy ( QWidget::NoFocus ); |
254 | micLed-> setFixedSize ( 16, 16 ); | 258 | micLed-> setFixedSize ( 16, 16 ); |
255 | 259 | ||
@@ -396,129 +400,129 @@ void VolumeControl::rateTimerDone ( ) | |||
396 | 400 | ||
397 | void VolumeControl::show ( bool /*showMic*/ ) | 401 | void VolumeControl::show ( bool /*showMic*/ ) |
398 | { | 402 | { |
399 | readConfig ( ); | 403 | readConfig ( ); |
400 | 404 | ||
401 | QPoint curPos = m_icon-> mapToGlobal ( QPoint ( 0, 0 )); | 405 | QPoint curPos = m_icon-> mapToGlobal ( QPoint ( 0, 0 )); |
402 | 406 | ||
403 | int w = sizeHint ( ). width ( ); | 407 | int w = sizeHint ( ). width ( ); |
404 | int x = curPos.x ( ) - ( w / 2 ); | 408 | int x = curPos.x ( ) - ( w / 2 ); |
405 | 409 | ||
406 | if (( x + w ) > QPEApplication::desktop ( )-> width ( )) | 410 | if (( x + w ) > QPEApplication::desktop ( )-> width ( )) |
407 | x = QPEApplication::desktop ( )-> width ( ) - w; | 411 | x = QPEApplication::desktop ( )-> width ( ) - w; |
408 | 412 | ||
409 | move ( x, curPos. y ( ) - sizeHint ( ). height ( )); | 413 | move ( x, curPos. y ( ) - sizeHint ( ). height ( )); |
410 | QFrame::show ( ); | 414 | QFrame::show ( ); |
411 | 415 | ||
412 | } | 416 | } |
413 | 417 | ||
414 | void VolumeControl::readConfig ( bool force ) | 418 | void VolumeControl::readConfig ( bool force ) |
415 | { | 419 | { |
416 | Config cfg ( "qpe" ); | 420 | Config cfg ( "qpe" ); |
417 | cfg. setGroup ( "Volume" ); | 421 | cfg. setGroup ( "Volume" ); |
418 | 422 | ||
419 | int old_vp = m_vol_percent; | 423 | int old_vp = m_vol_percent; |
420 | int old_mp = m_mic_percent; | 424 | int old_mp = m_mic_percent; |
421 | bool old_vm = m_vol_muted; | 425 | bool old_vm = m_vol_muted; |
422 | bool old_mm = m_mic_muted; | 426 | bool old_mm = m_mic_muted; |
423 | bool old_sk = m_snd_key; | 427 | bool old_sk = m_snd_key; |
424 | bool old_st = m_snd_touch; | 428 | bool old_st = m_snd_touch; |
425 | bool old_sa = m_snd_alarm; | 429 | bool old_sa = m_snd_alarm; |
426 | int old_ap = m_alarm_percent; | 430 | int old_ap = m_alarm_percent; |
427 | 431 | ||
428 | m_vol_percent = cfg. readNumEntry ( "VolumePercent", 50 ); | 432 | m_vol_percent = cfg. readNumEntry ( "VolumePercent", 50 ); |
429 | m_mic_percent = cfg. readNumEntry ( "Mic", 50 ); | 433 | m_mic_percent = cfg. readNumEntry ( "Mic", 50 ); |
430 | m_vol_muted = cfg. readBoolEntry ( "Mute", 0 ); | 434 | m_vol_muted = cfg. readBoolEntry ( "Mute", 0 ); |
431 | m_mic_muted = cfg. readBoolEntry ( "MicMute", 0 ); | 435 | m_mic_muted = cfg. readBoolEntry ( "MicMute", 0 ); |
432 | m_snd_key = cfg. readBoolEntry ( "KeySound", 0 ); | 436 | m_snd_key = cfg. readBoolEntry ( "KeySound", 0 ); |
433 | m_snd_touch = cfg. readBoolEntry ( "TouchSound", 0 ); | 437 | m_snd_touch = cfg. readBoolEntry ( "TouchSound", 0 ); |
434 | m_snd_alarm = cfg. readBoolEntry ( "AlarmSound", 1 ); | 438 | m_snd_alarm = cfg. readBoolEntry ( "AlarmSound", 1 ); |
435 | m_alarm_percent = cfg. readNumEntry ( "AlarmPercent", 65 ); | 439 | m_alarm_percent = cfg. readNumEntry ( "AlarmPercent", 65 ); |
436 | 440 | ||
437 | if ( force || ( m_vol_percent != old_vp )) | 441 | if ( force || ( m_vol_percent != old_vp )) |
438 | volSlider-> setValue ( 100 - m_vol_percent ); | 442 | volSlider-> setValue ( 100 - m_vol_percent ); |
439 | if ( force || ( m_mic_percent != old_mp )) | 443 | if ( force || ( m_mic_percent != old_mp )) |
440 | micSlider-> setValue ( 100 - m_mic_percent ); | 444 | micSlider-> setValue ( 100 - m_mic_percent ); |
441 | if ( force || ( m_alarm_percent != old_ap )) | 445 | if ( force || ( m_alarm_percent != old_ap )) |
442 | alarmSlider-> setValue ( 100 - m_alarm_percent ); | 446 | alarmSlider-> setValue ( 100 - m_alarm_percent ); |
443 | 447 | ||
444 | if ( force || ( m_vol_muted != old_vm )) | 448 | if ( force || ( m_vol_muted != old_vm )) |
445 | volLed-> setOn ( !m_vol_muted ); | 449 | volLed-> setOn ( !m_vol_muted ); |
446 | if ( force || ( m_mic_muted != old_mm )) | 450 | if ( force || ( m_mic_muted != old_mm )) |
447 | micLed-> setOn ( !m_mic_muted ); | 451 | micLed-> setOn ( !m_mic_muted ); |
448 | if ( force || ( m_snd_alarm != old_sa )) | 452 | if ( force || ( m_snd_alarm != old_sa )) |
449 | alarmLed-> setOn ( m_snd_alarm ); | 453 | alarmLed-> setOn ( m_snd_alarm ); |
450 | 454 | ||
451 | if ( force || ( m_snd_key != old_sk )) | 455 | if ( force || ( m_snd_key != old_sk )) |
452 | keyBox-> setChecked ( m_snd_key ); | 456 | keyBox-> setChecked ( m_snd_key ); |
453 | if ( force || ( m_snd_touch != old_st )) | 457 | if ( force || ( m_snd_touch != old_st )) |
454 | tapBox-> setChecked ( m_snd_touch ); | 458 | tapBox-> setChecked ( m_snd_touch ); |
455 | if ( force || ( m_snd_alarm != old_sa )) | 459 | if ( force || ( m_snd_alarm != old_sa )) |
456 | alarmBox-> setChecked ( m_snd_alarm ); | 460 | alarmBox-> setChecked ( m_snd_alarm ); |
457 | } | 461 | } |
458 | 462 | ||
459 | 463 | ||
460 | void VolumeControl::volumeChanged ( bool nowMuted ) | 464 | void VolumeControl::volumeChanged ( bool /*nowMuted*/ ) |
461 | { | 465 | { |
462 | int prevVol = m_vol_percent; | 466 | int prevVol = m_vol_percent; |
463 | bool prevMute = m_vol_muted; | 467 | bool prevMute = m_vol_muted; |
464 | 468 | ||
465 | readConfig ( ); | 469 | readConfig ( ); |
466 | 470 | ||
467 | // Handle case where muting it toggled | 471 | // Handle case where muting it toggled |
468 | if ( m_vol_muted != prevMute ) | 472 | if ( m_vol_muted != prevMute ) |
469 | m_icon-> redraw ( true ); | 473 | m_icon-> redraw ( true ); |
470 | else if ( prevVol != m_vol_percent ) // Avoid over repainting | 474 | else if ( prevVol != m_vol_percent ) // Avoid over repainting |
471 | m_icon-> redraw ( false ); | 475 | m_icon-> redraw ( false ); |
472 | } | 476 | } |
473 | 477 | ||
474 | void VolumeControl::micChanged ( bool nowMuted ) | 478 | void VolumeControl::micChanged ( bool nowMuted ) |
475 | { | 479 | { |
476 | if ( !nowMuted ) | 480 | if ( !nowMuted ) |
477 | readConfig ( ); | 481 | readConfig ( ); |
478 | m_mic_muted = nowMuted; | 482 | m_mic_muted = nowMuted; |
479 | } | 483 | } |
480 | 484 | ||
481 | void VolumeControl::screenTapToggled ( bool b ) | 485 | void VolumeControl::screenTapToggled ( bool b ) |
482 | { | 486 | { |
483 | m_snd_touch = b; | 487 | m_snd_touch = b; |
484 | writeConfigEntry ( "TouchSound", m_snd_touch, UPD_Vol ); | 488 | writeConfigEntry ( "TouchSound", m_snd_touch, UPD_Vol ); |
485 | } | 489 | } |
486 | 490 | ||
487 | void VolumeControl::keyClickToggled ( bool b ) | 491 | void VolumeControl::keyClickToggled ( bool b ) |
488 | { | 492 | { |
489 | m_snd_key = b; | 493 | m_snd_key = b; |
490 | writeConfigEntry ( "KeySound", m_snd_key, UPD_Vol ); | 494 | writeConfigEntry ( "KeySound", m_snd_key, UPD_Vol ); |
491 | } | 495 | } |
492 | 496 | ||
493 | void VolumeControl::alarmSoundToggled ( bool b ) | 497 | void VolumeControl::alarmSoundToggled ( bool b ) |
494 | { | 498 | { |
495 | m_snd_alarm = b; | 499 | m_snd_alarm = b; |
496 | writeConfigEntry ( "AlarmSound", m_snd_alarm, UPD_Vol ); | 500 | writeConfigEntry ( "AlarmSound", m_snd_alarm, UPD_Vol ); |
497 | } | 501 | } |
498 | 502 | ||
499 | void VolumeControl::volMuteToggled ( bool b ) | 503 | void VolumeControl::volMuteToggled ( bool b ) |
500 | { | 504 | { |
501 | m_vol_muted = !b; | 505 | m_vol_muted = !b; |
502 | 506 | ||
503 | m_icon-> redraw ( true ); | 507 | m_icon-> redraw ( true ); |
504 | 508 | ||
505 | writeConfigEntry ( "Mute", m_vol_muted, UPD_Vol ); | 509 | writeConfigEntry ( "Mute", m_vol_muted, UPD_Vol ); |
506 | } | 510 | } |
507 | 511 | ||
508 | void VolumeControl::micMuteToggled ( bool b ) | 512 | void VolumeControl::micMuteToggled ( bool b ) |
509 | { | 513 | { |
510 | m_mic_muted = !b; | 514 | m_mic_muted = !b; |
511 | writeConfigEntry ( "MicMute", m_mic_muted, UPD_Mic ); | 515 | writeConfigEntry ( "MicMute", m_mic_muted, UPD_Mic ); |
512 | } | 516 | } |
513 | 517 | ||
514 | 518 | ||
515 | void VolumeControl::volMoved ( int percent ) | 519 | void VolumeControl::volMoved ( int percent ) |
516 | { | 520 | { |
517 | m_vol_percent = 100 - percent; | 521 | m_vol_percent = 100 - percent; |
518 | 522 | ||
519 | // clamp volume percent to be between 0 and 100 | 523 | // clamp volume percent to be between 0 and 100 |
520 | m_vol_percent = ( m_vol_percent < 0 ) ? 0 : (( m_vol_percent > 100 ) ? 100 : m_vol_percent ); | 524 | m_vol_percent = ( m_vol_percent < 0 ) ? 0 : (( m_vol_percent > 100 ) ? 100 : m_vol_percent ); |
521 | // repaint just the little volume rectangle | 525 | // repaint just the little volume rectangle |
522 | m_icon-> redraw ( false ); | 526 | m_icon-> redraw ( false ); |
523 | 527 | ||
524 | writeConfigEntry ( "VolumePercent", m_vol_percent, UPD_Vol ); | 528 | writeConfigEntry ( "VolumePercent", m_vol_percent, UPD_Vol ); |