File systray-popup-menu.patch of Package kmix5

From e119bc1f5daf3de6b8e85cce5c9d1e59b425fec8 Mon Sep 17 00:00:00 2001
From: Jonathan Marten <jjm@keelhaul.me.uk>
Date: Tue, 3 Jul 2018 21:01:29 +0100
Subject: System tray popup menu: Add "Configure KMix" action

---
 apps/kmix.cpp          |  2 +-
 gui/kmixdockwidget.cpp | 13 +++++++------
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/apps/kmix.cpp b/apps/kmix.cpp
index b97852c..b60f7e9 100644
--- a/apps/kmix.cpp
+++ b/apps/kmix.cpp
@@ -179,7 +179,7 @@ void KMixWindow::initActions()
 	KStandardAction::preferences(this, SLOT(showSettings()), actionCollection());
 	KStandardAction::keyBindings(guiFactory(), SLOT(configureShortcuts()), actionCollection());
 	QAction* action = actionCollection()->addAction(QStringLiteral("launch_kdesoundsetup"));
-	action->setText(i18n("Audio Setup"));
+	action->setText(i18n("Audio Setup..."));
 	connect(action, SIGNAL(triggered(bool)), SLOT(slotKdeAudioSetupExec()));
 
 	action = actionCollection()->addAction(QStringLiteral("hwinfo"));
diff --git a/gui/kmixdockwidget.cpp b/gui/kmixdockwidget.cpp
index e06bf89..f014b0d 100644
--- a/gui/kmixdockwidget.cpp
+++ b/gui/kmixdockwidget.cpp
@@ -173,15 +173,16 @@ void KMixDockWidget::createMenuActions()
     }
 
     // Put "Select Master Channel" dialog in context menu
-    QAction *action = new QAction(i18n("Select Master Channel..."), this);
-    action->setData("select_master");
-    addAction("select_master", action);
+    QAction *action = _kmixMainWindow->actionCollection()->action("select_master");
     action->setEnabled(Mixer::getGlobalMasterMixer() != 0);
-    connect(action, SIGNAL(triggered(bool)), _kmixMainWindow, SLOT(slotSelectMaster()));
-    menu->addAction( action );
+    menu->addAction(action);
 
-    //Context menu entry to access phonon settings
+    // Context menu entry to access Phonon settings
     menu->addAction(_kmixMainWindow->actionCollection()->action("launch_kdesoundsetup"));
+
+    // Context menu entry to access KMix settings
+    // action name from tier3/kconfigwidgets/src/kstandardaction_p.h
+    menu->addAction(_kmixMainWindow->actionCollection()->action("options_configure"));
 }
 
 void
-- 
cgit v0.11.2