-rw-r--r-- | core/applets/volumeapplet/volume.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/core/applets/volumeapplet/volume.cpp b/core/applets/volumeapplet/volume.cpp index 344f86f..e393f0f 100644 --- a/core/applets/volumeapplet/volume.cpp +++ b/core/applets/volumeapplet/volume.cpp @@ -188,97 +188,98 @@ VolumeApplet::VolumeApplet( QWidget *parent, const char *name ) volumePixmap = Resource::loadPixmap( "volume" ); volumePercent = cfg.readNumEntry("Volume",50); micPercent = cfg.readNumEntry("Mic", 50); muted = FALSE; // ### read from pref micMuted = FALSE; // ### read from pref advancedTimer = new QTimer(this); connect( qApp, SIGNAL( volumeChanged(bool) ), this, SLOT( volumeChanged(bool) ) ); connect( qApp, SIGNAL( micChanged(bool) ), this, SLOT ( micChanged(bool) ) ); connect( advancedTimer, SIGNAL( timeout() ),this, SLOT( advVolControl()) ); writeSystemVolume(); writeSystemMic(); } VolumeApplet::~VolumeApplet() { } void VolumeApplet::keyPressEvent ( QKeyEvent * e ) { QString s; s.setNum(e->key()); qWarning(s); } void VolumeApplet::mousePressEvent( QMouseEvent * ) { advancedTimer->start( 750, TRUE ); } void VolumeApplet::mouseReleaseEvent( QMouseEvent * ) { showVolControl(FALSE); } void VolumeApplet::advVolControl() { showVolControl(TRUE); } void VolumeApplet::showVolControl(bool showMic) { Config cfg("Sound"); cfg.setGroup("System"); volumePercent = cfg.readNumEntry("Volume",50); micPercent = cfg.readNumEntry("Mic", 50); - + QString show = cfg.readEntry("ShowMic", "FALSE"); + if(show == "TRUE") showMic = TRUE; // Create a small volume control window to adjust the volume with VolumeControl *vc = new VolumeControl(showMic); vc->slider->setValue( 100 - volumePercent ); if (showMic) { vc->mic->setValue( 100 - micPercent ); connect( vc->mic, SIGNAL( valueChanged( int ) ), this, SLOT( micMoved( int ) ) ); } vc->muteBox->setChecked( muted ); connect( vc->slider, SIGNAL( valueChanged( int ) ), this, SLOT( sliderMoved( int ) ) ); connect( vc->muteBox, SIGNAL( toggled( bool ) ), this, SLOT( mute( bool ) ) ); QPoint curPos = mapToGlobal( rect().topLeft() ); vc->move( curPos.x()-(vc->sizeHint().width()-width())/2, curPos.y() - 120 ); vc->show(); advancedTimer->stop(); } void VolumeApplet::volumeChanged( bool nowMuted ) { int previousVolume = volumePercent; if ( !nowMuted ) readSystemVolume(); // Handle case where muting it toggled if ( muted != nowMuted ) { muted = nowMuted; repaint( TRUE ); return; } // Avoid over repainting if ( previousVolume != volumePercent ) repaint( 2, height() - 3, width() - 4, 2, FALSE ); } void VolumeApplet::micChanged( bool nowMuted ) { if (!nowMuted) readSystemMic(); micMuted = nowMuted; } void VolumeApplet::mute( bool toggled ) { muted = toggled; |