SVN_SILENT made messages (.desktop file) - always resolve ours

[dolphin.git] / src / dolphincontextmenu.cpp

diff --git a/src/dolphincontextmenu.cpp b/src/dolphincontextmenu.cpp
index ed6db0c124becb54106c94b24c8d4b4d7165a271..65545c52cf9702a4752e5bdfbde96c9d3a51bb38 100644 (file)
--- a/src/dolphincontextmenu.cpp
+++ b/src/dolphincontextmenu.cpp
@@ -20,8 +20,8 @@
 #include "views/viewmodecontroller.h"
 
 #include <KActionCollection>
 #include "views/viewmodecontroller.h"
 
 #include <KActionCollection>

-#include <KFileItemActions>

 #include <KFileItemListProperties>
 #include <KFileItemListProperties>

+#include <KHamburgerMenu>

 #include <KIO/EmptyTrashJob>
 #include <KIO/JobUiDelegate>
 #include <KIO/Paste>
 #include <KIO/EmptyTrashJob>
 #include <KIO/JobUiDelegate>
 #include <KIO/Paste>


@@ -30,7 +30,6 @@
 #include <KLocalizedString>
 #include <KNewFileMenu>
 #include <KPluginMetaData>
 #include <KLocalizedString>
 #include <KNewFileMenu>
 #include <KPluginMetaData>

-#include <KService>

 #include <KStandardAction>
 #include <KToolBar>
 
 #include <KStandardAction>
 #include <KToolBar>
 


@@ -43,7 +42,8 @@
 DolphinContextMenu::DolphinContextMenu(DolphinMainWindow* parent,
                                        const QPoint& pos,
                                        const KFileItem& fileInfo,
 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),
     QMenu(parent),
     m_pos(pos),
     m_mainWindow(parent),


@@ -56,14 +56,18 @@ DolphinContextMenu::DolphinContextMenu(DolphinMainWindow* parent,
     m_copyToMenu(parent),
     m_customActions(),
     m_command(None),
     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.
     const DolphinView* view = m_mainWindow->activeViewContainer()->view();
     m_selectedItems = view->selectedItems();
 
 {
     // The context menu either accesses the URLs of the selected items
     // or the items itself. To increase the performance both lists are cached.
     const DolphinView* view = m_mainWindow->activeViewContainer()->view();
     m_selectedItems = view->selectedItems();
 

-    installEventFilter(this);
+    QApplication::instance()->installEventFilter(this);
+
+    static_cast<KHamburgerMenu *>(m_mainWindow->actionCollection()->
+                action(QStringLiteral("hamburger_menu")))->addToMenu(this);

 }
 
 DolphinContextMenu::~DolphinContextMenu()
 }
 
 DolphinContextMenu::~DolphinContextMenu()


@@ -112,28 +116,23 @@ DolphinContextMenu::Command DolphinContextMenu::open()
     return m_command;
 }
 
     return m_command;
 }
 

-void DolphinContextMenu::childEvent(QChildEvent* event)
+bool DolphinContextMenu::eventFilter(QObject* object, QEvent* event)

 {
 {

-    if(event->added()) {
-        event->child()->installEventFilter(this);
-    }
-    QMenu::childEvent(event);
-}
+    Q_UNUSED(object)

 
 

-bool DolphinContextMenu::eventFilter(QObject* dest, QEvent* event)
-{

     if(event->type() == QEvent::KeyPress || event->type() == QEvent::KeyRelease) {
         QKeyEvent* keyEvent = static_cast<QKeyEvent*>(event);
     if(event->type() == QEvent::KeyPress || event->type() == QEvent::KeyRelease) {
         QKeyEvent* keyEvent = static_cast<QKeyEvent*>(event);

-        if(m_removeAction && keyEvent->key() == Qt::Key_Shift) {
-            if(event->type() == QEvent::KeyPress) {
+
+        if (m_removeAction && keyEvent->key() == Qt::Key_Shift) {
+            if (event->type() == QEvent::KeyPress) {

                 m_removeAction->update(DolphinRemoveAction::ShiftState::Pressed);
             } else {
                 m_removeAction->update(DolphinRemoveAction::ShiftState::Released);
             }
                 m_removeAction->update(DolphinRemoveAction::ShiftState::Pressed);
             } else {
                 m_removeAction->update(DolphinRemoveAction::ShiftState::Released);
             }

-            return true;

         }
     }
         }
     }

-    return QMenu::eventFilter(dest, event);
+
+    return false;

 }
 
 void DolphinContextMenu::openTrashContextMenu()
 }
 
 void DolphinContextMenu::openTrashContextMenu()


@@ -149,8 +148,6 @@ void DolphinContextMenu::openTrashContextMenu()
     QAction* propertiesAction = m_mainWindow->actionCollection()->action(QStringLiteral("properties"));
     addAction(propertiesAction);
 
     QAction* propertiesAction = m_mainWindow->actionCollection()->action(QStringLiteral("properties"));
     addAction(propertiesAction);
 

-    addShowMenuBarAction();
-

     if (exec(m_pos) == emptyTrashAction) {
         Trash::empty(m_mainWindow);
     }
     if (exec(m_pos) == emptyTrashAction) {
         Trash::empty(m_mainWindow);
     }


@@ -183,7 +180,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();
 {
     // insert 'Open in new window' and 'Open in new tab' entries
     const KFileItemListProperties& selectedItemsProps = selectedItemsProperties();


@@ -195,7 +192,7 @@ void DolphinContextMenu::addDirectoryItemContextMenu(KFileItemActions &fileItemA
     }
 
     // Insert 'Open With' entries
     }
 
     // Insert 'Open With' entries

-    addOpenWithActions(fileItemActions);
+    addOpenWithActions();

 
     // set up 'Create New' menu
     DolphinNewFileMenu* newFileMenu = new DolphinNewFileMenu(m_mainWindow->actionCollection(), m_mainWindow);
 
     // set up 'Create New' menu
     DolphinNewFileMenu* newFileMenu = new DolphinNewFileMenu(m_mainWindow->actionCollection(), m_mainWindow);


@@ -209,7 +206,7 @@ void DolphinContextMenu::addDirectoryItemContextMenu(KFileItemActions &fileItemA
 
     QMenu* menu = newFileMenu->menu();
     menu->setTitle(i18nc("@title:menu Create new folder, file, link, etc.", "Create New"));
 
     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();
     addMenu(menu);
 
     addSeparator();


@@ -224,16 +221,15 @@ void DolphinContextMenu::openItemContextMenu()
     QAction* openParentInNewTabAction = nullptr;
     const KFileItemListProperties& selectedItemsProps = selectedItemsProperties();
 
     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()) {
 
     if (m_selectedItems.count() == 1) {
         // single files
         if (m_fileInfo.isDir()) {

-            addDirectoryItemContextMenu(fileItemActions);
+            addDirectoryItemContextMenu();

         } else if (m_context & TimelineContext || m_context & SearchContext) {
         } else if (m_context & TimelineContext || m_context & SearchContext) {

-            addOpenWithActions(fileItemActions);
+            addOpenWithActions();

 
             openParentAction = new QAction(QIcon::fromTheme(QStringLiteral("document-open-folder")),
                                            i18nc("@action:inmenu",
 
             openParentAction = new QAction(QIcon::fromTheme(QStringLiteral("document-open-folder")),
                                            i18nc("@action:inmenu",


@@ -256,7 +252,7 @@ void DolphinContextMenu::openItemContextMenu()
             addSeparator();
         } else {
             // Insert 'Open With" entries
             addSeparator();
         } else {
             // Insert 'Open With" entries

-            addOpenWithActions(fileItemActions);
+            addOpenWithActions();

         }
         if (m_fileInfo.isLink()) {
             addAction(m_mainWindow->actionCollection()->action(QStringLiteral("show_target")));
         }
         if (m_fileInfo.isLink()) {
             addAction(m_mainWindow->actionCollection()->action(QStringLiteral("show_target")));


@@ -278,12 +274,12 @@ void DolphinContextMenu::openItemContextMenu()
             addAction(m_mainWindow->actionCollection()->action(QStringLiteral("open_in_new_tabs")));
         }
         // Insert 'Open With" entries
             addAction(m_mainWindow->actionCollection()->action(QStringLiteral("open_in_new_tabs")));
         }
         // Insert 'Open With" entries

-        addOpenWithActions(fileItemActions);
+        addOpenWithActions();

     }
 
     insertDefaultItemActions(selectedItemsProps);
 
     }
 
     insertDefaultItemActions(selectedItemsProps);
 

-    addAdditionalActions(fileItemActions, selectedItemsProps);
+    addAdditionalActions(selectedItemsProps);

 
     // insert 'Copy To' and 'Move To' sub menus
     if (ContextMenuSettings::showCopyMoveMenu()) {
 
     // insert 'Copy To' and 'Move To' sub menus
     if (ContextMenuSettings::showCopyMoveMenu()) {


@@ -315,9 +311,7 @@ void DolphinContextMenu::openViewportContextMenu()
     const DolphinView* view = m_mainWindow->activeViewContainer()->view();
 
     const KFileItemListProperties baseUrlProperties(KFileItemList() << baseFileItem());
     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();
 
     // Set up and insert 'Create New' menu
     KNewFileMenu* newFileMenu = m_mainWindow->newFileMenu();


@@ -328,7 +322,7 @@ void DolphinContextMenu::openViewportContextMenu()
 
     // 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
 
     // 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) {
 
     QAction* pasteAction = createPasteAction();
     if (pasteAction) {


@@ -353,7 +347,7 @@ void DolphinContextMenu::openViewportContextMenu()
         addSeparator();
     }
 
         addSeparator();
     }
 

-    addAdditionalActions(fileItemActions, baseUrlProperties);
+    addAdditionalActions(baseUrlProperties);

     addCustomActions();
 
     addSeparator();
     addCustomActions();
 
     addSeparator();


@@ -361,8 +355,6 @@ void DolphinContextMenu::openViewportContextMenu()
     QAction* propertiesAction = m_mainWindow->actionCollection()->action(QStringLiteral("properties"));
     addAction(propertiesAction);
 
     QAction* propertiesAction = m_mainWindow->actionCollection()->action(QStringLiteral("properties"));
     addAction(propertiesAction);
 

-    addShowMenuBarAction();
-

     exec(m_pos);
 }
 
     exec(m_pos);
 }
 


@@ -423,16 +415,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();
 bool DolphinContextMenu::placeExists(const QUrl& url) const
 {
     const KFilePlacesModel* placesModel = DolphinPlacesModelSingleton::instance().placesModel();


@@ -492,10 +474,10 @@ KFileItem DolphinContextMenu::baseFileItem()
     return *m_baseFileItem;
 }
 
     return *m_baseFileItem;
 }
 

-void DolphinContextMenu::addOpenWithActions(KFileItemActions& fileItemActions)
+void DolphinContextMenu::addOpenWithActions()

 {
     // insert 'Open With...' action or sub menu
 {
     // 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()
 }
 
 void DolphinContextMenu::addCustomActions()


@@ -503,7 +485,7 @@ void DolphinContextMenu::addCustomActions()
     addActions(m_customActions);
 }
 
     addActions(m_customActions);
 }
 

-void DolphinContextMenu::addAdditionalActions(KFileItemActions &fileItemActions, const KFileItemListProperties &props)
+void DolphinContextMenu::addAdditionalActions(const KFileItemListProperties &props)

 {
     addSeparator();
 
 {
     addSeparator();
 


@@ -511,7 +493,7 @@ void DolphinContextMenu::addAdditionalActions(KFileItemActions &fileItemActions,
     if (props.isDirectory() && props.isLocal() && ContextMenuSettings::showOpenTerminal()) {
         additionalActions << m_mainWindow->actionCollection()->action(QStringLiteral("open_terminal"));
     }
     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<QAction*> versionControlActions = view->versionControlActions(m_selectedItems);
 
     const DolphinView* view = m_mainWindow->activeViewContainer()->view();
     const QList<QAction*> versionControlActions = view->versionControlActions(m_selectedItems);