-rw-r--r-- | core/applets/volumeapplet/volume.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/core/applets/volumeapplet/volume.cpp b/core/applets/volumeapplet/volume.cpp index 276f47f..6a14d07 100644 --- a/core/applets/volumeapplet/volume.cpp +++ b/core/applets/volumeapplet/volume.cpp | |||
@@ -204,102 +204,101 @@ static const char * alarm_xpm[] = { | |||
204 | "_ c #FEFE4E", | 204 | "_ c #FEFE4E", |
205 | ": c #7D1902", | 205 | ": c #7D1902", |
206 | "< c #989656", | 206 | "< c #989656", |
207 | "[ c #260B02", | 207 | "[ c #260B02", |
208 | "} c #F7F7D8", | 208 | "} c #F7F7D8", |
209 | "| c #DCDA5A", | 209 | "| c #DCDA5A", |
210 | "1 c #823102", | 210 | "1 c #823102", |
211 | "2 c #B1AC6B", | 211 | "2 c #B1AC6B", |
212 | "3 c #F7F710", | 212 | "3 c #F7F710", |
213 | "4 c #838204", | 213 | "4 c #838204", |
214 | " ", | 214 | " ", |
215 | " ", | 215 | " ", |
216 | " 4'4/ ", | 216 | " 4'4/ ", |
217 | " /-^= ", | 217 | " /-^= ", |
218 | " 42{4>4 ", | 218 | " 42{4>4 ", |
219 | " '2|+*$44 ", | 219 | " '2|+*$44 ", |
220 | " +2&3+$1*44 ", | 220 | " +2&3+$1*44 ", |
221 | " (%_}_+/$:>/4 ", | 221 | " (%_}_+/$:>/4 ", |
222 | " 4%_}3+#;>:*4 ", | 222 | " 4%_}3+#;>:*4 ", |
223 | " 4%_}&+#[1$/4 ", | 223 | " 4%_}&+#[1$/4 ", |
224 | " 4%_,2')[~~>4 ", | 224 | " 4%_,2')[~~>4 ", |
225 | " 4%33'4#@~1>4 ", | 225 | " 4%33'4#@~1>4 ", |
226 | " 4%3344#[:>/4 ", | 226 | " 4%3344#[:>/4 ", |
227 | " 42&_3'4#@>:*44 ", | 227 | " 42&_3'4#@>:*44 ", |
228 | " 42|}}3'4#[;$)$44 ", | 228 | " 42|}}3'4#[;$)$44 ", |
229 | "444{]]2^~~:!!#.@##/ ", | 229 | "444{]]2^~~:!!#.@##/ ", |
230 | "4444-%*:==!!=...../ ", | 230 | "4444-%*:==!!=...../ ", |
231 | " /:[.. ", | 231 | " /:[.. ", |
232 | " /@. ", | 232 | " /@. ", |
233 | " "}; | 233 | " "}; |
234 | 234 | ||
235 | VolumeControl::VolumeControl ( VolumeApplet *icon, bool /*showMic*/, QWidget *parent, const char *name ) | 235 | VolumeControl::VolumeControl ( VolumeApplet *icon, bool /*showMic*/, QWidget *parent, const char *name ) |
236 | : QFrame ( parent, name, WStyle_StaysOnTop | WType_Popup ) | 236 | : QFrame ( parent, name, WStyle_StaysOnTop | WType_Popup ) |
237 | { | 237 | { |
238 | m_icon = icon; | 238 | m_icon = icon; |
239 | 239 | ||
240 | bool has_wav_alarm = true; | 240 | bool has_wav_alarm = true; |
241 | bool has_bass = true; | 241 | bool has_bass = true; |
242 | bool has_treble = true; | 242 | bool has_treble = true; |
243 | 243 | ||
244 | switch ( ODevice::inst ( )-> model ( )) { // we need to add other devices eventually | 244 | switch ( ODevice::inst ( )-> model ( )) { // we need to add other devices eventually |
245 | case Model_Zaurus_SL5000: | 245 | case Model_Zaurus_SL5000: |
246 | has_wav_alarm = false; //poor guys probably feeling left out... | 246 | has_wav_alarm = false; //poor guys probably feeling left out... |
247 | break; | 247 | break; |
248 | default: | 248 | default: |
249 | break; | 249 | break; |
250 | } | 250 | } |
251 | 251 | ||
252 | if ( !ODevice::inst ( )-> series ( ) == Model_iPAQ ) { | 252 | if ( !ODevice::inst()->modelString().contains( "Model_iPAQ" )) { |
253 | has_bass = false; | 253 | has_bass = false; |
254 | has_treble = false; | 254 | has_treble = false; |
255 | } | 255 | } |
256 | 256 | ||
257 | |||
258 | setFrameStyle ( QFrame::PopupPanel | QFrame::Raised ); | 257 | setFrameStyle ( QFrame::PopupPanel | QFrame::Raised ); |
259 | 258 | ||
260 | QGridLayout *grid = new QGridLayout ( this, 1, 1, 6, 4 ); | 259 | QGridLayout *grid = new QGridLayout ( this, 1, 1, 6, 4 ); |
261 | grid-> setSpacing ( 4 ); | 260 | grid-> setSpacing ( 4 ); |
262 | grid-> setMargin ( 6 ); | 261 | grid-> setMargin ( 6 ); |
263 | 262 | ||
264 | QVBoxLayout *vbox; | 263 | QVBoxLayout *vbox; |
265 | QLabel *l; | 264 | QLabel *l; |
266 | 265 | ||
267 | vbox = new QVBoxLayout ( ); | 266 | vbox = new QVBoxLayout ( ); |
268 | vbox-> setSpacing ( 4 ); | 267 | vbox-> setSpacing ( 4 ); |
269 | grid-> addLayout ( vbox, 1, 0 ); | 268 | grid-> addLayout ( vbox, 1, 0 ); |
270 | 269 | ||
271 | upButton = new QPushButton ( this ); | 270 | upButton = new QPushButton ( this ); |
272 | upButton-> setSizePolicy ( QSizePolicy ( QSizePolicy::Minimum, QSizePolicy::Expanding )); | 271 | upButton-> setSizePolicy ( QSizePolicy ( QSizePolicy::Minimum, QSizePolicy::Expanding )); |
273 | upButton-> setPixmap ( Resource::loadPixmap ( "up" )); | 272 | upButton-> setPixmap ( Resource::loadPixmap ( "up" )); |
274 | upButton-> setFocusPolicy ( QWidget::NoFocus ); | 273 | upButton-> setFocusPolicy ( QWidget::NoFocus ); |
275 | 274 | ||
276 | vbox-> addWidget ( upButton ); | 275 | vbox-> addWidget ( upButton ); |
277 | 276 | ||
278 | downButton = new QPushButton ( this ); | 277 | downButton = new QPushButton ( this ); |
279 | downButton-> setSizePolicy ( QSizePolicy ( QSizePolicy::Minimum, QSizePolicy::Expanding )); | 278 | downButton-> setSizePolicy ( QSizePolicy ( QSizePolicy::Minimum, QSizePolicy::Expanding )); |
280 | downButton-> setPixmap ( Resource::loadPixmap ( "down" )); | 279 | downButton-> setPixmap ( Resource::loadPixmap ( "down" )); |
281 | downButton-> setFocusPolicy ( QWidget::NoFocus ); | 280 | downButton-> setFocusPolicy ( QWidget::NoFocus ); |
282 | 281 | ||
283 | vbox-> addWidget ( downButton ); | 282 | vbox-> addWidget ( downButton ); |
284 | 283 | ||
285 | volSlider = new QSlider ( this ); | 284 | volSlider = new QSlider ( this ); |
286 | volSlider-> setRange ( 0, 100 ); | 285 | volSlider-> setRange ( 0, 100 ); |
287 | volSlider-> setTickmarks ( QSlider::Both ); | 286 | volSlider-> setTickmarks ( QSlider::Both ); |
288 | volSlider-> setTickInterval ( 20 ); | 287 | volSlider-> setTickInterval ( 20 ); |
289 | volSlider-> setFocusPolicy ( QWidget::NoFocus ); | 288 | volSlider-> setFocusPolicy ( QWidget::NoFocus ); |
290 | 289 | ||
291 | l = new QLabel ( this ); | 290 | l = new QLabel ( this ); |
292 | l-> setPixmap ( QPixmap ( vol_xpm )); | 291 | l-> setPixmap ( QPixmap ( vol_xpm )); |
293 | 292 | ||
294 | grid-> addWidget ( l, 0, 1, AlignCenter ); | 293 | grid-> addWidget ( l, 0, 1, AlignCenter ); |
295 | grid-> addWidget ( volSlider, 1, 1, AlignCenter ); | 294 | grid-> addWidget ( volSlider, 1, 1, AlignCenter ); |
296 | 295 | ||
297 | volLed = new OLedBox ( green, this ); | 296 | volLed = new OLedBox ( green, this ); |
298 | volLed-> setFocusPolicy ( QWidget::NoFocus ); | 297 | volLed-> setFocusPolicy ( QWidget::NoFocus ); |
299 | volLed-> setFixedSize ( 16, 16 ); | 298 | volLed-> setFixedSize ( 16, 16 ); |
300 | 299 | ||
301 | grid-> addWidget ( volLed, 2, 1, AlignCenter ); | 300 | grid-> addWidget ( volLed, 2, 1, AlignCenter ); |
302 | 301 | ||
303 | QVBox *basstrebleBox = new QVBox( this ); | 302 | QVBox *basstrebleBox = new QVBox( this ); |
304 | 303 | ||
305 | trebleSlider = new QSlider ( basstrebleBox ); | 304 | trebleSlider = new QSlider ( basstrebleBox ); |