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

List:       kde-commits
Subject:    KDE/kdebase/apps/dolphin/src
From:       Peter Penz <peter.penz19 () gmail ! com>
Date:       2010-11-17 19:10:23
Message-ID: 20101117191023.9C2D5AC8A0 () svn ! kde ! org
[Download RAW message or body]

SVN commit 1198181 by ppenz:

Move the "Show Menubar" entry from the top to the bottom. For users that have hidden the \
menubar on purpose having this as first item makes no sense.

BUG: 257089
FIXED-IN: 4.6.0


 M  +6 -5      dolphincontextmenu.cpp  


--- trunk/KDE/kdebase/apps/dolphin/src/dolphincontextmenu.cpp #1198180:1198181
@@ -165,8 +165,6 @@
 {
     Q_ASSERT(m_context & TrashContext);
 
-    addShowMenubarAction();
-
     QAction* emptyTrashAction = new QAction(KIcon("trash-empty"), i18nc("@action:inmenu", \
"Empty Trash"), m_popup);  KConfig trashConfig("trashrc", KConfig::SimpleConfig);
     emptyTrashAction->setEnabled(!trashConfig.group("Status").readEntry("Empty", true));
@@ -185,6 +183,8 @@
     QAction* propertiesAction = m_mainWindow->actionCollection()->action("properties");
     m_popup->addAction(propertiesAction);
 
+    addShowMenubarAction();
+
     QAction *action = m_popup->exec(QCursor::pos());
     if (action == emptyTrashAction) {
         const QString text(i18nc("@info", "Do you really want to empty the Trash? All items \
will be deleted.")); @@ -322,8 +322,6 @@
 
 void DolphinContextMenu::openViewportContextMenu()
 {
-    addShowMenubarAction();
-
     // setup 'Create New' menu
     KNewFileMenu* newFileMenu = m_mainWindow->newFileMenu();
     const DolphinView* view = m_mainWindow->activeViewContainer()->view();
@@ -365,6 +363,9 @@
 
     QAction* propertiesAction = m_popup->addAction(i18nc("@action:inmenu", "Properties"));
     propertiesAction->setIcon(KIcon("document-properties"));
+
+    addShowMenubarAction();
+
     QAction* action = m_popup->exec(QCursor::pos());
     if (action == propertiesAction) {
         const KUrl& url = m_mainWindow->activeViewContainer()->url();
@@ -409,8 +410,8 @@
 {
     KAction* showMenuBar = m_mainWindow->showMenuBarAction();
     if (!m_mainWindow->menuBar()->isVisible()) {
+        m_popup->addSeparator();
         m_popup->addAction(showMenuBar);
-        m_popup->addSeparator();
     }
 }
 


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