From 2301ab5b81a2a4c274e4665653ba8b754be45ea4 Mon Sep 17 00:00:00 2001
From: Jekyll Wu <adaptee@gmail.com>
Date: Sat, 11 Feb 2012 03:13:59 +0800
Subject: [PATCH] Rearrange the 'File' menu

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

REVIEW:103920
---
 desktop/konsoleui.rc | 8 ++++----
 desktop/sessionui.rc | 4 ++--
 src/MainWindow.cpp   | 7 ++++---
 3 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/desktop/konsoleui.rc b/desktop/konsoleui.rc
index 07c410d37..c1bfeb577 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 8b3e0f65b..6f873a4ec 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 79d6f0b48..e44e4c8b5 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);