Index: kmix.cpp =================================================================== --- kmix.cpp (revision 903236) +++ kmix.cpp (working copy) @@ -57,6 +57,7 @@ #include "kmixtoolbox.h" #include "version.h" #include "viewdockareapopup.h" +#include "dialogselectmaster.h" //#include "osd.h" // Postponed to KDE4.1 @@ -123,6 +124,9 @@ action = actionCollection()->addAction("toggle_channels_currentview"); action->setText(i18n("Configure &Channels...")); connect(action, SIGNAL(triggered(bool) ), SLOT(slotConfigureCurrentView())); + action = actionCollection()->addAction( "select_master" ); + action->setText( i18n("Select Master Channel...") ); + connect(action, SIGNAL(triggered(bool) ), SLOT(slotSelectMaster())); KAction* globalAction = actionCollection()->addAction("increase_volume"); globalAction->setText(i18n("Increase Volume")); @@ -771,6 +775,12 @@ if (view) view->configureView(); } +void KMixWindow::slotSelectMaster() +{ + DialogSelectMaster* dsm = new DialogSelectMaster(Mixer::getGlobalMasterMixer()); + if (dsm) dsm->show(); +} + void KMixWindow::newMixerShown(int /*tabIndex*/ ) { KMixerWidget* mw = (KMixerWidget*)m_wsMixers->currentWidget(); if (mw) { Index: kmix.h =================================================================== --- kmix.h (revision 903236) +++ kmix.h (working copy) @@ -126,6 +126,7 @@ void saveConfig(); void slotHWInfo(); void slotConfigureCurrentView(); + void slotSelectMaster(); void addMixerWidget(const QString&); void plugged( const char* driverName, const QString& udi, QString& dev); void unplugged( const QString& udi); Index: kmixui.rc =================================================================== --- kmixui.rc (revision 903236) +++ kmixui.rc (working copy) @@ -15,6 +15,7 @@