[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [konsole] /: Rearrange the 'File' menu
From:       Jekyll Wu <adaptee () gmail ! com>
Date:       2012-02-11 16:50:25
Message-ID: 20120211165025.7FC54A60A6 () git ! kde ! org
[Download RAW message or body]

Git commit 2301ab5b81a2a4c274e4665653ba8b754be45ea4 by Jekyll Wu.
Committed on 10/02/2012 at 20:13.
Pushed by jekyllwu into branch 'master'.

Rearrange the 'File' menu

  * Rename "Quit" to "Close Window" for accuracy
  * Move "Close Tab" downwards to be adjacent to "Close Window"

REVIEW:103920

M  +4    -4    desktop/konsoleui.rc
M  +2    -2    desktop/sessionui.rc
M  +4    -3    src/MainWindow.cpp

http://commits.kde.org/konsole/2301ab5b81a2a4c274e4665653ba8b754be45ea4

diff --git a/desktop/konsoleui.rc b/desktop/konsoleui.rc
index 07c410d..c1bfeb5 100644
--- a/desktop/konsoleui.rc
+++ b/desktop/konsoleui.rc
@@ -1,16 +1,16 @@
 <!DOCTYPE kpartgui>
 
-<kpartgui name="konsole" version="9">
+<kpartgui name="konsole" version="10">
     <MenuBar>
         <Menu name="file"><text>File</text>
             <Action name="new-window"/>
             <Action name="new-tab"/>
             <Action name="clone-tab"/>
             <Separator/>
-            <DefineGroup name="session-tab-operations"/>
-            <Separator/>
             <DefineGroup name="session-operations"/>
-            <Action name="exit"/>
+            <Separator/>
+            <DefineGroup name="session-tab-operations"/>
+            <Action name="close-window"/>
         </Menu>
         <Menu name="edit"><text>Edit</text>
             <DefineGroup name="session-edit-operations"/>
diff --git a/desktop/sessionui.rc b/desktop/sessionui.rc
index 8b3e0f6..6f873a4 100644
--- a/desktop/sessionui.rc
+++ b/desktop/sessionui.rc
@@ -1,12 +1,12 @@
 <!DOCTYPE kpartgui>
 
-<kpartgui name="session" version="16">
+<kpartgui name="session" version="17">
     <MenuBar>
         <Menu name="file">
-            <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"/>
+            <Action name="close-session" group="session-tab-operations"/>
         </Menu>
         <Menu name="edit">
             <Action name="edit_copy" group="session-edit-operations"/>
diff --git a/src/MainWindow.cpp b/src/MainWindow.cpp
index 79d6f0b..e44e4c8 100644
--- a/src/MainWindow.cpp
+++ b/src/MainWindow.cpp
@@ -274,10 +274,11 @@ void MainWindow::setupActions()
     action->setAutoRepeat(false);
     connect(action , SIGNAL(triggered()) , this , SLOT(newWindow()));
 
-    action = KStandardAction::quit(this , SLOT(close()) , collection);
-    // the default shortcut for quit is typically Ctrl+[Some Letter, usually Q]
-    // but that is reserved for use by terminal applications
+    action = collection->addAction("close-window");
+    action->setIcon(KIcon("window-close"));
+    action->setText(i18n("Close Window"));
     action->setShortcut(QKeySequence(Qt::CTRL + Qt::SHIFT + Qt::Key_Q));
+    connect(action , SIGNAL(triggered()) , this , SLOT(close()));
 
     // Bookmark Menu
     KActionMenu* bookmarkMenu = new KActionMenu(i18n("&Bookmarks") , collection);
[prev in list] [next in list] [prev in thread] [next in thread]