add action "Close Tab" to the file menu, so that users get the chance to discover...

svn path=/trunk/KDE/kdebase/apps/; revision=909450

diff --git a/src/dolphinmainwindow.cpp b/src/dolphinmainwindow.cpp
index 6b0b30bb8261d1ad9b9a82f052d8ce6a8281d91f..a69e1a37ae14605d93ca79c88c58dd98377cece5 100644 (file)
--- a/src/dolphinmainwindow.cpp
+++ b/src/dolphinmainwindow.cpp
@@ -976,11 +976,12 @@ void DolphinMainWindow::setupActions()
     newTab->setShortcut(KShortcut(Qt::CTRL | Qt::SHIFT | Qt::Key_N, Qt::CTRL | Qt::Key_T));
     connect(newTab, SIGNAL(triggered()), this, SLOT(openNewTab()));
 
-    QAction* closeTab = new QAction(KIcon("tab-close"), i18nc("@action:inmenu File", "Close Tab"), this);
+    QAction* closeTab = actionCollection()->addAction("close_tab");
+    closeTab->setIcon(KIcon("tab-close"));
+    closeTab->setText(i18nc("@action:inmenu File", "Close Tab"));
     closeTab->setShortcut(Qt::CTRL | Qt::Key_W);
     closeTab->setEnabled(false);
     connect(closeTab, SIGNAL(triggered()), this, SLOT(closeTab()));
-    actionCollection()->addAction("close_tab", closeTab);
 
     KStandardAction::quit(this, SLOT(quit()), actionCollection());
 
@@ -1074,13 +1075,13 @@ void DolphinMainWindow::setupActions()
     KStandardAction::preferences(this, SLOT(editSettings()), actionCollection());
 
     // not in menu actions
-    KAction* activateNextTab = actionCollection()->addAction("activatenexttab");
+    KAction* activateNextTab = actionCollection()->addAction("activate_next_tab");
     activateNextTab->setText(i18nc("@action:inmenu", "Activate Next Tab"));
     connect(activateNextTab, SIGNAL(triggered()), SLOT(activateNextTab()));
     activateNextTab->setShortcuts(QApplication::isRightToLeft() ? KStandardShortcut::tabPrev() :
                                                                   KStandardShortcut::tabNext());
 
-    KAction* activatePrevTab = actionCollection()->addAction("activateprevtab");
+    KAction* activatePrevTab = actionCollection()->addAction("activate_prev_tab");
     activatePrevTab->setText(i18nc("@action:inmenu", "Activate Previous Tab"));
     connect(activatePrevTab, SIGNAL(triggered()), SLOT(activatePrevTab()));
     activatePrevTab->setShortcuts(QApplication::isRightToLeft() ? KStandardShortcut::tabNext() :

diff --git a/src/dolphinui.rc b/src/dolphinui.rc
index 5fdd9242d390c1a19f7f2c53e35bc0e4d82bc888..f325b75a1f530438bb43a1a1a7a1f2685a06a17a 100644 (file)
--- a/src/dolphinui.rc
+++ b/src/dolphinui.rc
@@ -1,10 +1,11 @@
 <!DOCTYPE kpartgui SYSTEM "kpartgui.dtd">
-<kpartgui name="dolphin" version="6">
+<kpartgui name="dolphin" version="7">
  <MenuBar>
   <Menu name="file">
    <Action name="create_new" />
    <Action name="new_window" />
    <Action name="new_tab" />
+   <Action name="close_tab" />
    <Separator/>
    <Action name="rename" />
    <Action name="move_to_trash" />