diff options
| author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2009-12-15 20:31:18 +0000 |
|---|---|---|
| committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2009-12-15 20:31:18 +0000 |
| commit | b00800d31c59fc4dc0028143bef4392af3a7fc55 (patch) | |
| tree | e72cd3c44ad259760b87350750ce4b287d465189 /kmix/kmixdockwidget.cpp | |
| parent | e2de64d6f1beb9e492daf5b886e19933c1fa41dd (diff) | |
| download | tdemultimedia-b00800d31c59fc4dc0028143bef4392af3a7fc55.tar.gz tdemultimedia-b00800d31c59fc4dc0028143bef4392af3a7fc55.zip | |
* libtunepimp updates
* kmix fixes
* noatun automake patch
* juk configuration dialog enhancements
* hide aRTS menu entries
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdemultimedia@1062736 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'kmix/kmixdockwidget.cpp')
| -rw-r--r-- | kmix/kmixdockwidget.cpp | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/kmix/kmixdockwidget.cpp b/kmix/kmixdockwidget.cpp index 18e19af0..1a0456fe 100644 --- a/kmix/kmixdockwidget.cpp +++ b/kmix/kmixdockwidget.cpp @@ -47,7 +47,7 @@ #include "kwin.h" #include "viewdockareapopup.h" -KMixDockWidget::KMixDockWidget( Mixer *mixer, QWidget *parent, const char *name, bool volumePopup ) +KMixDockWidget::KMixDockWidget( Mixer *mixer, QWidget *parent, const char *name, bool volumePopup, bool dockIconMuting ) : KSystemTray( parent, name ), m_mixer(mixer), _dockAreaPopup(0L), @@ -55,7 +55,8 @@ KMixDockWidget::KMixDockWidget( Mixer *mixer, QWidget *parent, const char *name, _playBeepOnVolumeChange(false), // disabled due to triggering a "Bug" _oldToolTipValue(-1), _oldPixmapType('-'), - _volumePopup(volumePopup) + _volumePopup(volumePopup), + _dockIconMuting(dockIconMuting) { Mixer* preferredMasterMixer = Mixer::masterCard(); if ( preferredMasterMixer != 0 ) { @@ -294,7 +295,11 @@ KMixDockWidget::mousePressEvent(QMouseEvent *me) return; } // LeftMouseButton pressed else if ( me->button() == MidButton ) { - toggleActive(); + if ( ! _dockIconMuting ) { + toggleActive(); + } else { + dockMute(); + } return; } else { |