From: Peter Penz <peter.penz19@gmail.com>
Date: Sun, 27 Mar 2011 15:41:30 +0000 (+0200)
Subject: Don't use a submenu for the settings
X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/commitdiff_plain/bbef0013a1bf6d8e041cae49a7f08d7b221708de

Don't use a submenu for the settings

If the toolbar-menu is used just put the settings-related entries
directly to the root instead of collecting them in a sub-menu.
---

diff --git a/src/dolphinmainwindow.cpp b/src/dolphinmainwindow.cpp
index e4bc9353c..1f3e99f76 100644
--- a/src/dolphinmainwindow.cpp
+++ b/src/dolphinmainwindow.cpp
@@ -1393,12 +1393,10 @@ void DolphinMainWindow::updateToolBarMenu()
     toolsMenu->addAction(ac->action("change_remote_encoding"));
     menu->addMenu(toolsMenu);
 
-    // Add "Settings" menu
-    KMenu* settingsMenu = new KMenu(i18nc("@action:inmenu", "Settings"), menu);
-    settingsMenu->addAction(ac->action(KStandardAction::name(KStandardAction::KeyBindings)));
-    settingsMenu->addAction(ac->action(KStandardAction::name(KStandardAction::ConfigureToolbars)));
-    settingsMenu->addAction(ac->action(KStandardAction::name(KStandardAction::Preferences)));
-    menu->addMenu(settingsMenu);
+    // Add "Settings" menu entries
+    addActionToMenu(ac->action(KStandardAction::name(KStandardAction::KeyBindings)), menu);
+    addActionToMenu(ac->action(KStandardAction::name(KStandardAction::ConfigureToolbars)), menu);
+    addActionToMenu(ac->action(KStandardAction::name(KStandardAction::Preferences)), menu);
 
     // Add "Help" menu
     KMenu* helpMenu = new KMenu(i18nc("@action:inmenu", "Help"), menu);