From 9af429cae1ad040e48679360189fdb5f36de740e Mon Sep 17 00:00:00 2001 From: Peter Penz Date: Sat, 26 Mar 2011 23:22:21 +0100 Subject: Provide toolbar-menu when the menubar is hidden Use a similar default UI like in Rekonq and other browsers: Hide the menubar and add access to all actions by a button in the toolbar. Of course it is still possible to show the menubar so that the same UI is given like before. --- src/dolphincontextmenu.cpp | 13 ------------- 1 file changed, 13 deletions(-) (limited to 'src/dolphincontextmenu.cpp') diff --git a/src/dolphincontextmenu.cpp b/src/dolphincontextmenu.cpp index d73f62bea..07c934e33 100644 --- a/src/dolphincontextmenu.cpp +++ b/src/dolphincontextmenu.cpp @@ -184,8 +184,6 @@ void DolphinContextMenu::openTrashContextMenu() 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.")); @@ -367,8 +365,6 @@ void DolphinContextMenu::openViewportContextMenu() 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,15 +405,6 @@ void DolphinContextMenu::insertDefaultItemActions() } } -void DolphinContextMenu::addShowMenubarAction() -{ - KAction* showMenuBar = m_mainWindow->showMenuBarAction(); - if (!m_mainWindow->menuBar()->isVisible()) { - m_popup->addSeparator(); - m_popup->addAction(showMenuBar); - } -} - QString DolphinContextMenu::placesName(const KUrl& url) const { QString name = url.fileName(); -- cgit v1.3