diff --git a/src/dolphincontextmenu.cpp b/src/dolphincontextmenu.cpp
--- a/src/dolphincontextmenu.cpp
+++ b/src/dolphincontextmenu.cpp
@@ -207,31 +207,24 @@
// Insert 'Open With' entries
addOpenWithActions(fileItemActions);
- // insert 'Add to Places' entry
- if (!placeExists(m_fileInfo.url())) {
- addAction(m_mainWindow->actionCollection()->action(QStringLiteral("add_to_places")));
- }
-
- addSeparator();
-
// set up 'Create New' menu
- DolphinNewFileMenu* newFileMenu = new DolphinNewFileMenu(m_mainWindow->actionCollection(), m_mainWindow);
- const DolphinView* view = m_mainWindow->activeViewContainer()->view();
- newFileMenu->setViewShowsHiddenFiles(view->hiddenFilesShown());
- newFileMenu->checkUpToDate();
- newFileMenu->setPopupFiles(m_fileInfo.url());
- newFileMenu->setEnabled(selectedItemsProps.supportsWriting());
- connect(newFileMenu, &DolphinNewFileMenu::fileCreated, newFileMenu, &DolphinNewFileMenu::deleteLater);
- connect(newFileMenu, &DolphinNewFileMenu::directoryCreated, newFileMenu, &DolphinNewFileMenu::deleteLater);
-
- QMenu* menu = newFileMenu->menu();
- menu->setTitle(i18nc("@title:menu Create new folder, file, link, etc.", "Create New"));
- menu->setIcon(QIcon::fromTheme(QStringLiteral("document-new")));
- addMenu(menu);
-
- addSeparator();
+ DolphinNewFileMenu* newFileMenu = new DolphinNewFileMenu(m_mainWindow->actionCollection(), m_mainWindow);
+ const DolphinView* view = m_mainWindow->activeViewContainer()->view();
+ newFileMenu->setViewShowsHiddenFiles(view->hiddenFilesShown());
+ newFileMenu->checkUpToDate();
+ newFileMenu->setPopupFiles(m_fileInfo.url());
+ newFileMenu->setEnabled(selectedItemsProps.supportsWriting());
+ connect(newFileMenu, &DolphinNewFileMenu::fileCreated, newFileMenu, &DolphinNewFileMenu::deleteLater);
+ connect(newFileMenu, &DolphinNewFileMenu::directoryCreated, newFileMenu, &DolphinNewFileMenu::deleteLater);
+
+ QMenu* menu = newFileMenu->menu();
+ menu->setTitle(i18nc("@title:menu Create new folder, file, link, etc.", "Create New"));
+ menu->setIcon(QIcon::fromTheme(QStringLiteral("document-new")));
+ addMenu(menu);
+
+ addSeparator();
} else if (m_baseUrl.scheme().contains(QLatin1String("search")) || m_baseUrl.scheme().contains(QLatin1String("timeline"))) {
- addOpenWithActions(fileItemActions);
+// addOpenWithActions(fileItemActions);
openParentAction = new QAction(QIcon::fromTheme(QStringLiteral("document-open-folder")),
i18nc("@action:inmenu",
@@ -251,15 +244,6 @@
this);
addAction(openParentInNewTabAction);
- addSeparator();
- } else if (!DolphinView::openItemAsFolderUrl(m_fileInfo).isEmpty()) {
- // Insert 'Open With" entries
- addOpenWithActions(fileItemActions);
-
- // insert 'Open in new window' and 'Open in new tab' entries
- addAction(m_mainWindow->actionCollection()->action(QStringLiteral("open_in_new_window")));
- addAction(m_mainWindow->actionCollection()->action(QStringLiteral("open_in_new_tab")));
-
addSeparator();
} else {
// Insert 'Open With" entries
@@ -289,6 +273,15 @@
insertDefaultItemActions(selectedItemsProps);
+ // insert 'Add to Places' entry if appropriate
+ if (m_selectedItems.count() == 1) {
+ if (m_fileInfo.isDir()) {
+ if (!placeExists(m_fileInfo.url())) {
+ addAction(m_mainWindow->actionCollection()->action(QStringLiteral("add_to_places")));
+ }
+ }
+ }
+
addSeparator();
fileItemActions.addServiceActionsTo(this);
@@ -323,14 +316,7 @@
void DolphinContextMenu::openViewportContextMenu()
{
- // setup 'Create New' menu
- KNewFileMenu* newFileMenu = m_mainWindow->newFileMenu();
const DolphinView* view = m_mainWindow->activeViewContainer()->view();
- newFileMenu->setViewShowsHiddenFiles(view->hiddenFilesShown());
- newFileMenu->checkUpToDate();
- newFileMenu->setPopupFiles(m_baseUrl);
- addMenu(newFileMenu->menu());
- addSeparator();
// Insert 'Open With' entries
KFileItem baseItem = view->rootItem();
@@ -349,20 +335,20 @@
addOpenWithActions(fileItemActions);
}
- // Insert 'New Window' and 'New Tab' entries. Don't use "open_in_new_window" and
- // "open_in_new_tab" here, as the current selection should get ignored.
- addAction(m_mainWindow->actionCollection()->action(QStringLiteral("file_new")));
- addAction(m_mainWindow->actionCollection()->action(QStringLiteral("new_tab")));
+ // Set up and insert 'Create New' menu
+ KNewFileMenu* newFileMenu = m_mainWindow->newFileMenu();
+ newFileMenu->setViewShowsHiddenFiles(view->hiddenFilesShown());
+ newFileMenu->checkUpToDate();
+ newFileMenu->setPopupFiles(m_baseUrl);
+ addMenu(newFileMenu->menu());
+
+ QAction* pasteAction = createPasteAction();
+ addAction(pasteAction);
- // Insert 'Add to Places' entry if exactly one item is selected
+ // Insert 'Add to Places' entry if it's not already in the places panel
if (!placeExists(m_mainWindow->activeViewContainer()->url())) {
addAction(m_mainWindow->actionCollection()->action(QStringLiteral("add_to_places")));
}
-
- addSeparator();
-
- QAction* pasteAction = createPasteAction();
- addAction(pasteAction);
addSeparator();
// Insert 'Sort By' and 'View Mode'
@@ -379,6 +365,8 @@
addCustomActions();
+ addSeparator();
+
QAction* propertiesAction = m_mainWindow->actionCollection()->action(QStringLiteral("properties"));
addAction(propertiesAction);
diff --git a/src/dolphinmainwindow.cpp b/src/dolphinmainwindow.cpp
--- a/src/dolphinmainwindow.cpp
+++ b/src/dolphinmainwindow.cpp
@@ -997,15 +997,15 @@
// Add "Create New" menu
menu->addMenu(m_newFileMenu->menu());
- menu->addSeparator();
+ // Add 'New Window' and 'New Tab' entries.
+ addActionToMenu(ac->action(QStringLiteral("file_new")), menu);
+ addActionToMenu(ac->action(QStringLiteral("new_tab")), menu);
+ addActionToMenu(ac->action(QStringLiteral("closed_tabs")), menu);
- // Overwrite Find action to Search action
- QAction *searchAction = ac->action(KStandardAction::name(KStandardAction::Find));
- searchAction->setText(i18n("Search..."));
+ menu->addSeparator();
// Add "Edit" actions
bool added = addActionToMenu(ac->action(KStandardAction::name(KStandardAction::Undo)), menu) |
- addActionToMenu(searchAction, menu) |
addActionToMenu(ac->action(KStandardAction::name(KStandardAction::SelectAll)), menu) |
addActionToMenu(ac->action(QStringLiteral("invert_selection")), menu);
@@ -1021,62 +1021,33 @@
menu->addSeparator();
}
- added = addActionToMenu(ac->action(QStringLiteral("sort")), menu) |
- addActionToMenu(ac->action(QStringLiteral("view_mode")), menu) |
- addActionToMenu(ac->action(QStringLiteral("additional_info")), menu) |
- addActionToMenu(ac->action(QStringLiteral("show_preview")), menu) |
+ added = addActionToMenu(ac->action(QStringLiteral("show_preview")), menu) |
addActionToMenu(ac->action(QStringLiteral("show_in_groups")), menu) |
- addActionToMenu(ac->action(QStringLiteral("show_hidden_files")), menu);
-
- if (added) {
- menu->addSeparator();
- }
-
- added = addActionToMenu(ac->action(QStringLiteral("split_view")), menu) |
- addActionToMenu(ac->action(KStandardAction::name(KStandardAction::Redisplay)), menu) |
+ addActionToMenu(ac->action(QStringLiteral("show_hidden_files")), menu) |
+ addActionToMenu(ac->action(QStringLiteral("additional_info")), menu) |
+ addActionToMenu(ac->action(QStringLiteral("panels")), menu) |
addActionToMenu(ac->action(QStringLiteral("view_properties")), menu);
+
if (added) {
menu->addSeparator();
}
- addActionToMenu(ac->action(QStringLiteral("panels")), menu);
- QMenu* locationBarMenu = new QMenu(i18nc("@action:inmenu", "Location Bar"), menu);
- locationBarMenu->addAction(ac->action(QStringLiteral("editable_location")));
- locationBarMenu->addAction(ac->action(QStringLiteral("replace_location")));
- menu->addMenu(locationBarMenu);
-
- menu->addSeparator();
-
- // Add "Go" menu
- QMenu* goMenu = new QMenu(i18nc("@action:inmenu", "Go"), menu);
- goMenu->addAction(ac->action(KStandardAction::name(KStandardAction::Back)));
- goMenu->addAction(ac->action(KStandardAction::name(KStandardAction::Forward)));
- goMenu->addAction(ac->action(KStandardAction::name(KStandardAction::Up)));
- goMenu->addAction(ac->action(KStandardAction::name(KStandardAction::Home)));
- goMenu->addAction(ac->action(QStringLiteral("closed_tabs")));
- KActionMenu *bookmarkMenu = new KActionMenu(i18nc("@title:menu", "&Bookmarks"), goMenu);
- m_bookmarkHandler->fillControlMenu(bookmarkMenu->menu(), ac);
- goMenu->addAction(bookmarkMenu);
- menu->addMenu(goMenu);
-
- // Add "Tool" menu
- QMenu* toolsMenu = new QMenu(i18nc("@action:inmenu", "Tools"), menu);
- toolsMenu->addAction(ac->action(QStringLiteral("show_filter_bar")));
- toolsMenu->addAction(ac->action(QStringLiteral("compare_files")));
- toolsMenu->addAction(ac->action(QStringLiteral("open_terminal")));
- toolsMenu->addAction(ac->action(QStringLiteral("change_remote_encoding")));
- menu->addMenu(toolsMenu);
+ // Add a curated assortment of items from the "Tools" menu
+ addActionToMenu(ac->action(QStringLiteral("show_filter_bar")), menu);
+ addActionToMenu(ac->action(QStringLiteral("compare_files")), menu);
+ addActionToMenu(ac->action(QStringLiteral("open_terminal")), menu);
// Add "Settings" menu entries
+ menu->addSeparator();
addActionToMenu(ac->action(KStandardAction::name(KStandardAction::KeyBindings)), menu);
addActionToMenu(ac->action(KStandardAction::name(KStandardAction::ConfigureToolbars)), menu);
addActionToMenu(ac->action(KStandardAction::name(KStandardAction::Preferences)), menu);
+ addActionToMenu(ac->action(KStandardAction::name(KStandardAction::ShowMenubar)), menu);
// Add "Help" menu
- menu->addMenu(m_helpMenu->menu());
-
- menu->addSeparator();
- addActionToMenu(ac->action(KStandardAction::name(KStandardAction::ShowMenubar)), menu);
+ auto helpMenu = m_helpMenu->menu();
+ helpMenu->setIcon(QIcon::fromTheme(QStringLiteral("system-help")));
+ menu->addMenu(helpMenu);
}
void DolphinMainWindow::updateToolBar()
@@ -1696,8 +1667,9 @@
" to display it again.") + panelWhatsThis);
// Add actions into the "Panels" menu
- KActionMenu* panelsMenu = new KActionMenu(i18nc("@action:inmenu View", "Panels"), this);
+ KActionMenu* panelsMenu = new KActionMenu(i18nc("@action:inmenu View", "Show Panels"), this);
actionCollection()->addAction(QStringLiteral("panels"), panelsMenu);
+ panelsMenu->setIcon(QIcon::fromTheme(QStringLiteral("view-sidetree")));
panelsMenu->setDelayed(false);
const KActionCollection* ac = actionCollection();
panelsMenu->addAction(ac->action(QStringLiteral("show_places_panel")));
diff --git a/src/dolphinui.rc b/src/dolphinui.rc
--- a/src/dolphinui.rc
+++ b/src/dolphinui.rc
@@ -40,7 +40,7 @@