Unverified Commit 8fec379c authored by Andreas Sturmlechner's avatar Andreas Sturmlechner
Browse files

Drop no longer available kcm_phonon 'Audio Setup' from Settings menu/systray

parent 3edd0e03
...@@ -177,11 +177,7 @@ void KMixWindow::initActions() ...@@ -177,11 +177,7 @@ void KMixWindow::initActions()
//actionCollection()->addAction(QStringLiteral( a->objectName()), a ); //actionCollection()->addAction(QStringLiteral( a->objectName()), a );
KStandardAction::preferences(this, SLOT(showSettings()), actionCollection()); KStandardAction::preferences(this, SLOT(showSettings()), actionCollection());
KStandardAction::keyBindings(guiFactory(), SLOT(configureShortcuts()), actionCollection()); KStandardAction::keyBindings(guiFactory(), SLOT(configureShortcuts()), actionCollection());
QAction* action = actionCollection()->addAction(QStringLiteral("launch_kdesoundsetup")); QAction* action = actionCollection()->addAction(QStringLiteral("hide_kmixwindow"));
action->setText(i18n("Audio Setup..."));
connect(action, SIGNAL(triggered(bool)), SLOT(slotKdeAudioSetupExec()));
action = actionCollection()->addAction(QStringLiteral("hide_kmixwindow"));
action->setText(i18n("Hide Mixer Window")); action->setText(i18n("Hide Mixer Window"));
connect(action, SIGNAL(triggered(bool)), SLOT(hideOrClose())); connect(action, SIGNAL(triggered(bool)), SLOT(hideOrClose()));
actionCollection()->setDefaultShortcut(action, Qt::Key_Escape); actionCollection()->setDefaultShortcut(action, Qt::Key_Escape);
...@@ -1210,11 +1206,6 @@ void KMixWindow::toggleMenuBar() ...@@ -1210,11 +1206,6 @@ void KMixWindow::toggleMenuBar()
menuBar()->setVisible(_actionShowMenubar->isChecked()); menuBar()->setVisible(_actionShowMenubar->isChecked());
} }
void KMixWindow::slotKdeAudioSetupExec()
{
forkExec(QStringList() << "kcmshell5" << "kcm_phonon");
}
void KMixWindow::forkExec(const QStringList& args) void KMixWindow::forkExec(const QStringList& args)
{ {
int pid = KProcess::startDetached(args); int pid = KProcess::startDetached(args);
......
...@@ -138,7 +138,6 @@ private: ...@@ -138,7 +138,6 @@ private:
void updateTabsClosable(); void updateTabsClosable();
private slots: private slots:
void slotKdeAudioSetupExec();
void slotConfigureCurrentView(); void slotConfigureCurrentView();
void plugged(const char *driverName, const QString &udi, int dev); void plugged(const char *driverName, const QString &udi, int dev);
......
...@@ -16,7 +16,6 @@ ...@@ -16,7 +16,6 @@
<Menu name="settings"> <Menu name="settings">
<Action name="toggle_channels_currentview" append="save_merge"/> <Action name="toggle_channels_currentview" append="save_merge"/>
<Action name="select_master" append="save_merge"/> <Action name="select_master" append="save_merge"/>
<Action name="launch_kdesoundsetup" append="save_merge"/>
</Menu> </Menu>
<Menu name="help" append="about_merge"><text>&amp;Help</text> <Menu name="help" append="about_merge"><text>&amp;Help</text>
<Action name="hwinfo"/> <Action name="hwinfo"/>
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment