X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/dc3beae3ab2c55cd3501e17f93b51e93e876a177..49726ad591eca7ac7d11da48a058c512726126d4:/src/dolphincontextmenu.cpp diff --git a/src/dolphincontextmenu.cpp b/src/dolphincontextmenu.cpp index 2b216ce03..340af6bd0 100644 --- a/src/dolphincontextmenu.cpp +++ b/src/dolphincontextmenu.cpp @@ -13,15 +13,13 @@ #include "dolphinplacesmodelsingleton.h" #include "dolphinremoveaction.h" #include "dolphinviewcontainer.h" -#include "panels/places/placesitem.h" -#include "panels/places/placesitemmodel.h" #include "trash/dolphintrash.h" #include "views/dolphinview.h" #include "views/viewmodecontroller.h" #include -#include #include +#include #include #include #include @@ -30,7 +28,6 @@ #include #include #include -#include #include #include @@ -43,7 +40,8 @@ DolphinContextMenu::DolphinContextMenu(DolphinMainWindow* parent, const QPoint& pos, const KFileItem& fileInfo, - const QUrl& baseUrl) : + const QUrl& baseUrl, + KFileItemActions *fileItemActions) : QMenu(parent), m_pos(pos), m_mainWindow(parent), @@ -56,7 +54,8 @@ DolphinContextMenu::DolphinContextMenu(DolphinMainWindow* parent, m_copyToMenu(parent), m_customActions(), m_command(None), - m_removeAction(nullptr) + m_removeAction(nullptr), + m_fileItemActions(fileItemActions) { // The context menu either accesses the URLs of the selected items // or the items itself. To increase the performance both lists are cached. @@ -64,6 +63,9 @@ DolphinContextMenu::DolphinContextMenu(DolphinMainWindow* parent, m_selectedItems = view->selectedItems(); QApplication::instance()->installEventFilter(this); + + static_cast(m_mainWindow->actionCollection()-> + action(QStringLiteral("hamburger_menu")))->addToMenu(this); } DolphinContextMenu::~DolphinContextMenu() @@ -144,8 +146,6 @@ void DolphinContextMenu::openTrashContextMenu() QAction* propertiesAction = m_mainWindow->actionCollection()->action(QStringLiteral("properties")); addAction(propertiesAction); - addShowMenuBarAction(); - if (exec(m_pos) == emptyTrashAction) { Trash::empty(m_mainWindow); } @@ -178,7 +178,7 @@ void DolphinContextMenu::openTrashItemContextMenu() } } -void DolphinContextMenu::addDirectoryItemContextMenu(KFileItemActions &fileItemActions) +void DolphinContextMenu::addDirectoryItemContextMenu() { // insert 'Open in new window' and 'Open in new tab' entries const KFileItemListProperties& selectedItemsProps = selectedItemsProperties(); @@ -190,12 +190,11 @@ void DolphinContextMenu::addDirectoryItemContextMenu(KFileItemActions &fileItemA } // Insert 'Open With' entries - addOpenWithActions(fileItemActions); + addOpenWithActions(); // 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(QList() << m_fileInfo.url()); newFileMenu->setEnabled(selectedItemsProps.supportsWriting()); @@ -204,7 +203,7 @@ void DolphinContextMenu::addDirectoryItemContextMenu(KFileItemActions &fileItemA QMenu* menu = newFileMenu->menu(); menu->setTitle(i18nc("@title:menu Create new folder, file, link, etc.", "Create New")); - menu->setIcon(QIcon::fromTheme(QStringLiteral("document-new"))); + menu->setIcon(QIcon::fromTheme(QStringLiteral("list-add"))); addMenu(menu); addSeparator(); @@ -219,16 +218,15 @@ void DolphinContextMenu::openItemContextMenu() QAction* openParentInNewTabAction = nullptr; const KFileItemListProperties& selectedItemsProps = selectedItemsProperties(); - KFileItemActions fileItemActions; - fileItemActions.setParentWidget(m_mainWindow); - fileItemActions.setItemListProperties(selectedItemsProps); + + m_fileItemActions->setItemListProperties(selectedItemsProps); if (m_selectedItems.count() == 1) { // single files if (m_fileInfo.isDir()) { - addDirectoryItemContextMenu(fileItemActions); + addDirectoryItemContextMenu(); } else if (m_context & TimelineContext || m_context & SearchContext) { - addOpenWithActions(fileItemActions); + addOpenWithActions(); openParentAction = new QAction(QIcon::fromTheme(QStringLiteral("document-open-folder")), i18nc("@action:inmenu", @@ -251,7 +249,7 @@ void DolphinContextMenu::openItemContextMenu() addSeparator(); } else { // Insert 'Open With" entries - addOpenWithActions(fileItemActions); + addOpenWithActions(); } if (m_fileInfo.isLink()) { addAction(m_mainWindow->actionCollection()->action(QStringLiteral("show_target"))); @@ -273,12 +271,12 @@ void DolphinContextMenu::openItemContextMenu() addAction(m_mainWindow->actionCollection()->action(QStringLiteral("open_in_new_tabs"))); } // Insert 'Open With" entries - addOpenWithActions(fileItemActions); + addOpenWithActions(); } insertDefaultItemActions(selectedItemsProps); - addAdditionalActions(fileItemActions, selectedItemsProps); + addAdditionalActions(selectedItemsProps); // insert 'Copy To' and 'Move To' sub menus if (ContextMenuSettings::showCopyMoveMenu()) { @@ -310,20 +308,17 @@ void DolphinContextMenu::openViewportContextMenu() const DolphinView* view = m_mainWindow->activeViewContainer()->view(); const KFileItemListProperties baseUrlProperties(KFileItemList() << baseFileItem()); - KFileItemActions fileItemActions; - fileItemActions.setParentWidget(m_mainWindow); - fileItemActions.setItemListProperties(baseUrlProperties); + m_fileItemActions->setItemListProperties(baseUrlProperties); // Set up and insert 'Create New' menu KNewFileMenu* newFileMenu = m_mainWindow->newFileMenu(); - newFileMenu->setViewShowsHiddenFiles(view->hiddenFilesShown()); newFileMenu->checkUpToDate(); newFileMenu->setPopupFiles(QList() << m_baseUrl); addMenu(newFileMenu->menu()); // Show "open with" menu items even if the dir is empty, because there are legitimate // use cases for this, such as opening an empty dir in Kate or VSCode or something - addOpenWithActions(fileItemActions); + addOpenWithActions(); QAction* pasteAction = createPasteAction(); if (pasteAction) { @@ -348,7 +343,7 @@ void DolphinContextMenu::openViewportContextMenu() addSeparator(); } - addAdditionalActions(fileItemActions, baseUrlProperties); + addAdditionalActions(baseUrlProperties); addCustomActions(); addSeparator(); @@ -356,8 +351,6 @@ void DolphinContextMenu::openViewportContextMenu() QAction* propertiesAction = m_mainWindow->actionCollection()->action(QStringLiteral("properties")); addAction(propertiesAction); - addShowMenuBarAction(); - exec(m_pos); } @@ -418,16 +411,6 @@ void DolphinContextMenu::insertDefaultItemActions(const KFileItemListProperties& } } -void DolphinContextMenu::addShowMenuBarAction() -{ - const KActionCollection* ac = m_mainWindow->actionCollection(); - QAction* showMenuBar = ac->action(KStandardAction::name(KStandardAction::ShowMenubar)); - if (!m_mainWindow->menuBar()->isVisible() && !m_mainWindow->toolBar()->isVisible()) { - addSeparator(); - addAction(showMenuBar); - } -} - bool DolphinContextMenu::placeExists(const QUrl& url) const { const KFilePlacesModel* placesModel = DolphinPlacesModelSingleton::instance().placesModel(); @@ -487,10 +470,10 @@ KFileItem DolphinContextMenu::baseFileItem() return *m_baseFileItem; } -void DolphinContextMenu::addOpenWithActions(KFileItemActions& fileItemActions) +void DolphinContextMenu::addOpenWithActions() { // insert 'Open With...' action or sub menu - fileItemActions.addOpenWithActionsTo(this, QStringLiteral("DesktopEntryName != '%1'").arg(qApp->desktopFileName())); + m_fileItemActions->insertOpenWithActionsTo(nullptr, this, QStringList{qApp->desktopFileName()}); } void DolphinContextMenu::addCustomActions() @@ -498,15 +481,15 @@ void DolphinContextMenu::addCustomActions() addActions(m_customActions); } -void DolphinContextMenu::addAdditionalActions(KFileItemActions &fileItemActions, const KFileItemListProperties &props) +void DolphinContextMenu::addAdditionalActions(const KFileItemListProperties &props) { addSeparator(); QList additionalActions; - if (props.isDirectory() && props.isLocal()) { + if (props.isDirectory() && props.isLocal() && ContextMenuSettings::showOpenTerminal()) { additionalActions << m_mainWindow->actionCollection()->action(QStringLiteral("open_terminal")); } - fileItemActions.addActionsTo(this, KFileItemActions::MenuActionSource::All, additionalActions); + m_fileItemActions->addActionsTo(this, KFileItemActions::MenuActionSource::All, additionalActions); const DolphinView* view = m_mainWindow->activeViewContainer()->view(); const QList versionControlActions = view->versionControlActions(m_selectedItems);