-rw-r--r-- | core/applets/volumeapplet/volume.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/applets/volumeapplet/volume.cpp b/core/applets/volumeapplet/volume.cpp index 11ba2f6..7f0aca5 100644 --- a/core/applets/volumeapplet/volume.cpp +++ b/core/applets/volumeapplet/volume.cpp | |||
@@ -494,49 +494,49 @@ void VolumeControl::buttonChanged ( ) | |||
494 | else | 494 | else |
495 | rateTimer-> stop ( ); | 495 | rateTimer-> stop ( ); |
496 | } | 496 | } |
497 | 497 | ||
498 | void VolumeControl::rateTimerDone ( ) | 498 | void VolumeControl::rateTimerDone ( ) |
499 | { | 499 | { |
500 | if ( upButton-> isDown ( )) | 500 | if ( upButton-> isDown ( )) |
501 | volSlider-> setValue ( volSlider-> value ( ) - 2 ); | 501 | volSlider-> setValue ( volSlider-> value ( ) - 2 ); |
502 | else // if ( downButton-> isDown ( )) | 502 | else // if ( downButton-> isDown ( )) |
503 | volSlider-> setValue ( volSlider-> value ( ) + 2 ); | 503 | volSlider-> setValue ( volSlider-> value ( ) + 2 ); |
504 | } | 504 | } |
505 | 505 | ||
506 | void VolumeControl::show ( bool /*showMic*/ ) | 506 | void VolumeControl::show ( bool /*showMic*/ ) |
507 | { | 507 | { |
508 | readConfig ( ); | 508 | readConfig ( ); |
509 | 509 | ||
510 | QPoint curPos = m_icon-> mapToGlobal ( QPoint ( 0, 0 )); | 510 | QPoint curPos = m_icon-> mapToGlobal ( QPoint ( 0, 0 )); |
511 | 511 | ||
512 | int w = sizeHint ( ). width ( ); | 512 | int w = sizeHint ( ). width ( ); |
513 | int x = curPos.x ( ) - ( w / 2 ); | 513 | int x = curPos.x ( ) - ( w / 2 ); |
514 | 514 | ||
515 | if (( x + w ) > QPEApplication::desktop ( )-> width ( )) | 515 | if (( x + w ) > QPEApplication::desktop ( )-> width ( )) |
516 | x = QPEApplication::desktop ( )-> width ( ) - w; | 516 | x = QPEApplication::desktop ( )-> width ( ) - w; |
517 | 517 | ||
518 | move ( x, curPos. y ( ) - sizeHint ( ). height ( )); | 518 | move ( QMAX(x,0), curPos. y ( ) - sizeHint ( ). height ( )); |
519 | QFrame::show ( ); | 519 | QFrame::show ( ); |
520 | 520 | ||
521 | } | 521 | } |
522 | 522 | ||
523 | void VolumeControl::readConfig ( bool force ) | 523 | void VolumeControl::readConfig ( bool force ) |
524 | { | 524 | { |
525 | Config cfg ( "qpe" ); | 525 | Config cfg ( "qpe" ); |
526 | cfg. setGroup ( "Volume" ); | 526 | cfg. setGroup ( "Volume" ); |
527 | 527 | ||
528 | int old_vp = m_vol_percent; | 528 | int old_vp = m_vol_percent; |
529 | int old_mp = m_mic_percent; | 529 | int old_mp = m_mic_percent; |
530 | int old_bass = m_bass_percent; | 530 | int old_bass = m_bass_percent; |
531 | int old_treble = m_treble_percent; | 531 | int old_treble = m_treble_percent; |
532 | bool old_vm = m_vol_muted; | 532 | bool old_vm = m_vol_muted; |
533 | bool old_mm = m_mic_muted; | 533 | bool old_mm = m_mic_muted; |
534 | bool old_sk = m_snd_key; | 534 | bool old_sk = m_snd_key; |
535 | bool old_st = m_snd_touch; | 535 | bool old_st = m_snd_touch; |
536 | bool old_sa = m_snd_alarm; | 536 | bool old_sa = m_snd_alarm; |
537 | int old_ap = m_alarm_percent; | 537 | int old_ap = m_alarm_percent; |
538 | 538 | ||
539 | m_vol_percent = cfg. readNumEntry ( "VolumePercent", 50 ); | 539 | m_vol_percent = cfg. readNumEntry ( "VolumePercent", 50 ); |
540 | m_mic_percent = cfg. readNumEntry ( "Mic", 50 ); | 540 | m_mic_percent = cfg. readNumEntry ( "Mic", 50 ); |
541 | m_bass_percent = cfg. readNumEntry ( "BassPercent", 50 ); | 541 | m_bass_percent = cfg. readNumEntry ( "BassPercent", 50 ); |
542 | m_treble_percent = cfg. readNumEntry ( "TreblePercent", 50 ); | 542 | m_treble_percent = cfg. readNumEntry ( "TreblePercent", 50 ); |