From e6f7106ec350e52e576144477c50b585bda821d4 Mon Sep 17 00:00:00 2001
From: uwolfer <uwolfer@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>
Date: Sun, 7 Sep 2008 20:37:29 +0000
Subject: [PATCH] Use KDE standards for settings menu. Credits go to tsdgeos :)

git-svn-id: svn://anonsvn.kde.org/home/kde/trunk/KDE/kdenetwork@858342 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
---
 krdc/krdcui.rc      | 10 +---------
 krdc/mainwindow.cpp | 11 +++--------
 2 files changed, 4 insertions(+), 17 deletions(-)

diff --git a/krdc/krdcui.rc b/krdc/krdcui.rc
index 37014236c..10df735e4 100644
--- a/krdc/krdcui.rc
+++ b/krdc/krdcui.rc
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE kpartgui SYSTEM "kpartgui.dtd">
-<gui name="krdc" version="2">
+<gui name="krdc" version="3">
 <MenuBar>
     <Menu noMerge="1" name="file"><text>&amp;File</text>
         <Action name="new_vnc_connection" />
@@ -22,14 +22,6 @@
     <Action name="bookmark" />
     <Menu name="settings"><text>&amp;Settings</text>
         <Action name="remote_desktop_dockwidget" />
-        <Separator/>
-        <Action name="configure_notifications" />
-        <Action name="configure_keys" />
-        <Action name="configure_toolbars" />
-        <Separator/>
-        <Action name="preferences" />
-        <Separator/>
-        <Action name="settings_showmenubar" append="show_merge" />
     </Menu>
     <Menu name="help"><text>&amp;Help</text>
     </Menu>
diff --git a/krdc/mainwindow.cpp b/krdc/mainwindow.cpp
index 5f51df231..6146f89b1 100644
--- a/krdc/mainwindow.cpp
+++ b/krdc/mainwindow.cpp
@@ -225,18 +225,13 @@ void MainWindow::setupActions()
 
     QAction *quitAction = KStandardAction::quit(this, SLOT(quit()), actionCollection());
     actionCollection()->addAction("quit", quitAction);
-    QAction *preferencesAction = KStandardAction::preferences(this, SLOT(preferences()), actionCollection());
-    actionCollection()->addAction("preferences", preferencesAction);
-    QAction *configToolbarAction = KStandardAction::configureToolbars(this, SLOT(configureToolbars()), actionCollection());
-    actionCollection()->addAction("configure_toolbars", configToolbarAction);
-    QAction *keyBindingsAction = KStandardAction::keyBindings(this, SLOT(configureKeys()), actionCollection());
-    actionCollection()->addAction("configure_keys", keyBindingsAction);
+    KStandardAction::preferences(this, SLOT(preferences()), actionCollection());
+    KStandardAction::configureToolbars(this, SLOT(configureToolbars()), actionCollection());
+    KStandardAction::keyBindings(this, SLOT(configureKeys()), actionCollection());
     QAction *cinfigNotifyAction = KStandardAction::configureNotifications(this, SLOT(configureNotifications()), actionCollection());
     cinfigNotifyAction->setVisible(false);
-    actionCollection()->addAction("configure_notifications", cinfigNotifyAction);
     m_menubarAction = KStandardAction::showMenubar(this, SLOT(showMenubar()), actionCollection());
     m_menubarAction->setChecked(!menuBar()->isHidden());
-    actionCollection()->addAction("settings_showmenubar", m_menubarAction);
 
     QString initialProtocol;
 #ifdef BUILD_RDP
-- 
2.11.4.GIT