From 82ddddcc76d3b0ebdf6bb95bd501777b3c74768f Mon Sep 17 00:00:00 2001
From: Sascha Peilicke <sasch.pe@gmx.de>
Date: Sun, 2 May 2010 19:43:43 +0000
Subject: [PATCH] Menubar and actions revamp, see
 http://reviewboard.kde.org/r/3110/ for details.

svn path=/trunk/KDE/kdebase/apps/konsole/; revision=1121952
---
 desktop/konsoleui.rc      | 28 +++++++-----------
 desktop/partui.rc         | 10 +++----
 desktop/sessionui.rc      | 41 ++++++++++++--------------
 src/MainWindow.cpp        | 27 ++++++++++++-----
 src/MainWindow.h          |  4 +++
 src/Part.cpp              |  4 +--
 src/SessionController.cpp | 61 ++++++++++++---------------------------
 7 files changed, 78 insertions(+), 97 deletions(-)

diff --git a/desktop/konsoleui.rc b/desktop/konsoleui.rc
index 1e3d7e072..02b910cf1 100644
--- a/desktop/konsoleui.rc
+++ b/desktop/konsoleui.rc
@@ -1,23 +1,19 @@
 <!DOCTYPE kpartgui>
 
-<kpartgui name="konsole" version="1">
+<kpartgui name="konsole" version="3">
     <MenuBar>
         <Menu name="file"><text>File</text>
-            <Action name="new-tab"/>
             <Action name="new-window"/>
+            <Action name="new-tab"/>
+            <DefineGroup name="session-tab-operations"/>
             <!-- <Action name="remote-connection"/> !-->
             <Separator/>
-            <ActionList name="favorite-profiles"/>
-            <Separator/>
             <DefineGroup name="session-operations"/>
             <Action name="exit"/>
         </Menu>
         <Menu name="edit"><text>Edit</text>
             <DefineGroup name="session-edit-operations"/>
         </Menu>
-        <Menu name="history"><text>Scrollback</text>
-            <DefineGroup name="session-history-operations"/>
-        </Menu>
         <Menu name="view"><text>View</text>
             <Menu name="view-split"><text>Split View</text>
             <Action name="split-view-left-right"/>
@@ -31,28 +27,24 @@
             <Action name="detach-view"/>
             <Action name="merge-windows"/>
             <Separator/>
-            <Action name="show-menubar"/>
-            <Action name="view-full-screen"/>
-            <Separator/>
             <DefineGroup name="session-view-operations"/>
         </Menu>
         <Action name="bookmark"/>
         <Menu name="settings"><text>Settings</text>
-            <DefineGroup name="session-settings"/>
-            <Action name="manage-profiles"/>
+            <Action name="show-menubar"/>
+            <Separator/>
+            <Action name="view-full-screen"/>
             <Separator/>
             <Action name="configure-notifications"/>
             <Action name="configure-shortcuts"/>
+            <Action name="configure-profiles"/>
         </Menu>
         <Menu name="help"><text>Help</text>
-
         </Menu>
     </MenuBar>
-
-    <Menu name="new-session-popup">
-        <Action name="new-tab" />
-        <Action name="new-window"/>
+    <Menu name="new-tab"><text>New &amp;Tab</text>
+        <Action name="default-profile"/>
         <Separator/>
-        <ActionList name="new-session-types"/>
+        <ActionList name="favorite-profiles"/>
     </Menu>
 </kpartgui>
diff --git a/desktop/partui.rc b/desktop/partui.rc
index f25fd3605..802364288 100644
--- a/desktop/partui.rc
+++ b/desktop/partui.rc
@@ -1,13 +1,13 @@
 <!DOCTYPE kpartgui>
 
-<kpartgui name="konsolepart" version="2">
+<kpartgui name="konsolepart" version="3">
     <Menu name="session-popup-menu">
-        <Action name="copy"/>
-        <Action name="paste"/>
+        <Action name="edit_copy"/>
+        <Action name="edit_paste"/>
         <Menu name="history"><text>S&amp;crollback</text>
-            <Action name="save-history" group="session-history-operations"/>
+            <Action name="file_save_as" group="session-history-operations"/>
             <Separator group="session-history-operations"/>
-            <Action name="history-options" group="session-history-operations"/>
+            <Action name="configure-history" group="session-history-operations"/>
             <Separator group="session-history-operations"/>
             <Action name="clear-history" group="session-history-operations"/>
             <Action name="clear-history-and-reset" group="session-history-operations"/>
diff --git a/desktop/sessionui.rc b/desktop/sessionui.rc
index 5efb49e23..74e961993 100644
--- a/desktop/sessionui.rc
+++ b/desktop/sessionui.rc
@@ -1,48 +1,44 @@
 <!DOCTYPE kpartgui>
 
-<kpartgui name="session" version="9">
+<kpartgui name="session" version="10">
     <MenuBar>
         <Menu name="file">
-            <Action name="close-session" group="session-operations"/>
+            <Action name="close-session" group="session-tab-operations"/>
+            <Action name="file_save_as" group="session-operations"/>
+            <Separator group="session-operations"/>
             <Action name="open-browser" group="session-operations"/>
         </Menu>
         <Menu name="edit">
-            <Action name="copy" group="session-edit-operations"/>
-            <Action name="paste" group="session-edit-operations"/>
-            <Action name="rename-session" group="session-edit-operations"/>
+            <Action name="edit_copy" group="session-edit-operations"/>
+            <Action name="edit_paste" group="session-edit-operations"/>
             <Separator group="session-edit-operations"/>
             <Menu name="edit-copy-input-to" group="session-edit-operations"><text>Copy Input To</text>
                 <Action name="copy-input-to-all-tabs"/>
                 <Action name="copy-input-to-selected-tabs"/>
                 <Action name="copy-input-to-none"/>
             </Menu>
+            <Action name="rename-session" group="session-edit-operations"/>
             <Action name="zmodem-upload" group="session-edit-operations"/>
             <Separator group="session-edit-operations"/>
-            <Action name="clear" group="session-edit-operations"/>
-            <Action name="clear-and-reset" group="session-edit-operations"/>
-        </Menu>
-        <Menu name="history">
-            <Action name="search-history" group="session-history-operations"/>
-            <Action name="find-next" group="session-history-operations"/>
-            <Action name="find-previous" group="session-history-operations"/>
-            <Action name="save-history" group="session-history-operations"/>
-            <Separator group="session-history-operations"/>
-            <Action name="history-options" group="session-history-operations"/>
-            <Separator group="session-history-operations"/>
-            <Action name="clear-history" group="session-history-operations"/>
-            <Action name="clear-history-and-reset" group="session-history-operations"/>
+            <Action name="edit_find" group="session-edit-operations"/>
+            <Action name="edit_find_next" group="session-edit-operations"/>
+            <Action name="edit_find_prev" group="session-edit-operations"/>
         </Menu>
         <Menu name="view">
             <Action name="monitor-silence" group="session-view-operations"/>
             <Action name="monitor-activity" group="session-view-operations"/>
             <Separator group="session-view-operations"/>
             <Action name="character-encoding"  group="session-view-operations"/>
-            <Action name="increase-text-size"  group="session-view-operations"/>
-            <Action name="decrease-text-size"  group="session-view-operations"/>
+            <Action name="view_zoom_in"  group="session-view-operations"/>
+            <Action name="view_zoom_out"  group="session-view-operations"/>
+            <Separator group="session-view-operations"/>
+            <Action name="clear" group="session-view-operations"/>
+            <Action name="clear-and-reset" group="session-view-operations"/>
+            <Action name="clear-history" group="session-view-operations"/>
+            <Action name="clear-history-and-reset" group="session-view-operations"/>
         </Menu>
         <Menu name="settings">
-            <Action name="change-profile" group="session-settings"/>
-            <Action name="edit-current-profile" group="session-settings"/>
+            <Action name="configure-history"/> 
         </Menu>
         <!--<Menu name="debug"><text>Debug</text>
             <Action name="debug-process"/>
@@ -56,6 +52,7 @@
         <Separator/>
         <Action name="change-profile"/>
         <Action name="edit-current-profile"/>
+        <Action name="configure-history"/> 
         <Separator/>
         <Action name="show-menubar"/>
         <Action name="character-encoding"/>
diff --git a/src/MainWindow.cpp b/src/MainWindow.cpp
index ee0471b02..3ab693605 100644
--- a/src/MainWindow.cpp
+++ b/src/MainWindow.cpp
@@ -230,11 +230,14 @@ void MainWindow::setupActions()
     KActionCollection* collection = actionCollection();
 
     // File Menu
-    KAction* newTabAction = collection->addAction("new-tab");
-    newTabAction->setIcon( KIcon("tab-new") );
-    newTabAction->setText( i18n("New &Tab") );
-    newTabAction->setShortcut( QKeySequence(Qt::CTRL+Qt::SHIFT+Qt::Key_N) );
-    connect( newTabAction , SIGNAL(triggered()) , this , SLOT(newTab()) );
+    _newTabMenuAction = new KActionMenu(KIcon("tab-new"), i18n("New &Tab"), collection);
+    collection->addAction("new-tab", _newTabMenuAction);
+
+    _defaultProfileAction = collection->addAction("default-profile");
+    _defaultProfileAction->setIcon(KIcon("utilities-terminal"));
+    _defaultProfileAction->setText(i18n("&Default Profile"));
+    _defaultProfileAction->setShortcut(QKeySequence(Qt::CTRL + Qt::SHIFT + Qt::Key_N));
+    connect(_defaultProfileAction, SIGNAL(triggered()), this, SLOT(newTab()));
 
     KAction* newWindowAction = collection->addAction("new-window");
     newWindowAction->setIcon( KIcon("window-new") );
@@ -286,8 +289,8 @@ void MainWindow::setupActions()
     KStandardAction::configureNotifications( this , SLOT(configureNotifications()) , collection  );
     KStandardAction::keyBindings( this , SLOT(showShortcutsDialog()) , collection  );
 
-    KAction* manageProfilesAction = collection->addAction("manage-profiles");
-    manageProfilesAction->setText( i18n("Manage Profiles...") );
+    KAction* manageProfilesAction = collection->addAction("configure-profiles");
+    manageProfilesAction->setText( i18n("Configure Profiles...") );
     manageProfilesAction->setIcon( KIcon("configure") );
     connect( manageProfilesAction , SIGNAL(triggered()) , this , SLOT(showManageProfilesDialog()) );
 
@@ -321,6 +324,16 @@ void MainWindow::sessionListChanged(const QList<QAction*>& actions)
 {
     unplugActionList("favorite-profiles");
     plugActionList("favorite-profiles",actions);
+
+    // Update the 'New Tab' KActionMenu
+    KMenu *newTabMenu = _newTabMenuAction->menu();
+    newTabMenu->clear();
+    newTabMenu->addAction(_defaultProfileAction);
+    newTabMenu->setDefaultAction(_defaultProfileAction);
+    newTabMenu->addSeparator();
+    foreach (QAction *action, actions) {
+        newTabMenu->addAction(action);
+    }
 }
 
 QString MainWindow::activeSessionDir() const
diff --git a/src/MainWindow.h b/src/MainWindow.h
index 4f6177566..576017dc9 100644
--- a/src/MainWindow.h
+++ b/src/MainWindow.h
@@ -30,6 +30,8 @@
 // Local
 #include "Profile.h"
 
+class KAction;
+class KActionMenu;
 class KToggleAction;
 
 namespace Konsole
@@ -184,6 +186,8 @@ class MainWindow : public KXmlGuiWindow
         ViewManager*  _viewManager;
         BookmarkHandler* _bookmarkHandler;
         KToggleAction* _toggleMenuBarAction;
+        KActionMenu *_newTabMenuAction;
+        KAction *_defaultProfileAction;
 
         QPointer<SessionController> _pluggedController;
 
diff --git a/src/Part.cpp b/src/Part.cpp
index 1df43698a..9577debfb 100644
--- a/src/Part.cpp
+++ b/src/Part.cpp
@@ -113,13 +113,13 @@ Part::~Part()
 }
 void Part::createGlobalActions()
 {
-    _manageProfilesAction = new QAction(i18n("Manage Profiles..."),this);
+    _manageProfilesAction = new QAction(i18n("Configure Profiles..."),this);
     connect(_manageProfilesAction,SIGNAL(triggered()),this,SLOT(showManageProfilesDialog()));
 }
 void Part::setupActionsForSession(SessionController* session)
 {
     KActionCollection* collection = session->actionCollection();
-    collection->addAction("manage-profiles",_manageProfilesAction);
+    collection->addAction("configure-profiles",_manageProfilesAction);
 }
 bool Part::openFile()
 {
diff --git a/src/SessionController.cpp b/src/SessionController.cpp
index 297e8c6b7..04bd698be 100644
--- a/src/SessionController.cpp
+++ b/src/SessionController.cpp
@@ -403,23 +403,14 @@ void SessionController::setupActions()
     connect( action, SIGNAL(triggered()), this, SLOT(openBrowser()) );
 
     // Copy and Paste
-    action = collection->addAction("copy");
-    action->setIcon( KIcon("edit-copy") );
-    action->setText( i18n("&Copy") );
+    action = KStandardAction::copy(this, SLOT(copy()), collection);
     action->setShortcut( QKeySequence(Qt::CTRL+Qt::SHIFT+Qt::Key_C) );
-    connect( action , SIGNAL(triggered()) , this , SLOT(copy()) );
 
-    KAction* pasteAction = new KAction( i18n("&Paste") , this );
-    pasteAction->setIcon( KIcon("edit-paste") );
-
-    KShortcut pasteShortcut = pasteAction->shortcut();
+    action = KStandardAction::paste(this, SLOT(paste()), collection);
+    KShortcut pasteShortcut = action->shortcut();
     pasteShortcut.setPrimary( QKeySequence(Qt::CTRL+Qt::SHIFT+Qt::Key_V) );
     pasteShortcut.setAlternate( QKeySequence(Qt::SHIFT+Qt::Key_Insert) );
-    pasteAction->setShortcut(pasteShortcut);
-
-    collection->addAction("paste",pasteAction);
-
-    connect( pasteAction , SIGNAL(triggered()) , this , SLOT(paste()) );
+    action->setShortcut(pasteShortcut);
 
     action = collection->addAction("paste-selection");
     action->setText( i18n("Paste Selection") );
@@ -484,52 +475,36 @@ void SessionController::setupActions()
     connect( _codecAction , SIGNAL(triggered(QTextCodec*)) , this , SLOT(changeCodec(QTextCodec*)) );
 
     // Text Size
-    action = collection->addAction("increase-text-size");
-    action->setText( i18n("Increase Text Size") );
-    action->setIcon( KIcon("zoom-in") );
-    action->setShortcut( QKeySequence(Qt::CTRL+Qt::Key_Plus) );
-    connect( action , SIGNAL(triggered()) , this , SLOT(increaseTextSize()) );
+    action = KStandardAction::zoomIn(this, SLOT(increaseTextSize()), collection);
+    action->setText(i18n("Enlarge Font"));
 
-    action = collection->addAction("decrease-text-size");
-    action->setText( i18n("Decrease Text Size") );
-    action->setIcon( KIcon("zoom-out") );
-    action->setShortcut( QKeySequence(Qt::CTRL+Qt::Key_Minus) );
-    connect( action , SIGNAL(triggered()) , this , SLOT(decreaseTextSize()) );
+    action = KStandardAction::zoomOut(this, SLOT(decreaseTextSize()), collection);
+    action->setText(i18n("Shrink Font"));
 
     // Scrollback
-    _searchToggleAction = new KAction(i18n("Search Output..."),this);
-    _searchToggleAction->setShortcut( QKeySequence(Qt::CTRL+Qt::SHIFT+Qt::Key_F) );
-    _searchToggleAction->setIcon( KIcon("edit-find") );
+    _searchToggleAction = KStandardAction::find(this, NULL, collection);
+    _searchToggleAction->setShortcut(QKeySequence(Qt::CTRL + Qt::SHIFT + Qt::Key_F));
     _searchToggleAction->setCheckable(true);
-    action = collection->addAction("search-history" , _searchToggleAction);
-    connect( action , SIGNAL(toggled(bool)) , this , SLOT(searchHistory(bool)) );
+    connect(_searchToggleAction, SIGNAL(toggled(bool)), this, SLOT(searchHistory(bool)));
 
-    _findNextAction = collection->addAction("find-next");
-    _findNextAction->setIcon( KIcon("go-down-search") );
-    _findNextAction->setText( i18n("Find Next") );
-    _findNextAction->setShortcut( QKeySequence(Qt::Key_F3) );
+    _findNextAction = KStandardAction::findNext(this, SLOT(findNextInHistory()), collection);
     _findNextAction->setEnabled(false);
-    connect( _findNextAction , SIGNAL(triggered()) , this , SLOT(findNextInHistory()) );
 
-    _findPreviousAction = collection->addAction("find-previous");
-    _findPreviousAction->setIcon( KIcon("go-up-search") );
-    _findPreviousAction->setText( i18n("Find Previous") );
-    _findPreviousAction->setShortcut( QKeySequence(Qt::SHIFT + Qt::Key_F3) );
+    _findPreviousAction = KStandardAction::findPrev(this, SLOT(findPreviousInHistory()), collection);
+    _findPreviousAction->setShortcut(QKeySequence(Qt::SHIFT + Qt::Key_F3));
     _findPreviousAction->setEnabled(false);
-    connect( _findPreviousAction , SIGNAL(triggered()) , this , SLOT(findPreviousInHistory()) );
 
-    action = collection->addAction("save-history");
-    action->setText( i18n("Save Output...") );
-    action->setIcon( KIcon("document-save-as") );
-    connect( action , SIGNAL(triggered()) , this , SLOT(saveHistory()) );
+    action = KStandardAction::saveAs(this, SLOT(saveHistory()), collection);
+    action->setText(i18n("Save Output As..."));
 
-    action = collection->addAction("history-options");
+    action = collection->addAction("configure-history");
     action->setText( i18n("Scrollback Options") );
     action->setIcon( KIcon("configure") );
     connect( action , SIGNAL(triggered()) , this , SLOT(showHistoryOptions()) );
 
     action = collection->addAction("clear-history-and-reset");
     action->setText( i18n("Clear Scrollback and Reset") );
+    action->setIcon( KIcon("edit-clear-history") );
     action->setShortcut( QKeySequence(Qt::CTRL+Qt::SHIFT+Qt::Key_X) );
     connect( action , SIGNAL(triggered()) , this , SLOT(clearHistoryAndReset()) );