KStandardItemListWidget: don't double up the expansion offset

[dolphin.git] / src / dolphincontextmenu.cpp

diff --git a/src/dolphincontextmenu.cpp b/src/dolphincontextmenu.cpp
index 47f0cdd407f7991e2a4bf33f065efac2db334a84..340af6bd0223be8e0c68e81725cda0719cd62c4c 100644 (file)
--- a/src/dolphincontextmenu.cpp
+++ b/src/dolphincontextmenu.cpp
@@ -13,14 +13,11 @@
 #include "dolphinplacesmodelsingleton.h"
 #include "dolphinremoveaction.h"
 #include "dolphinviewcontainer.h"
 #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 <KActionCollection>
 #include "trash/dolphintrash.h"
 #include "views/dolphinview.h"
 #include "views/viewmodecontroller.h"
 
 #include <KActionCollection>

-#include <KFileItemActions>

 #include <KFileItemListProperties>
 #include <KHamburgerMenu>
 #include <KIO/EmptyTrashJob>
 #include <KFileItemListProperties>
 #include <KHamburgerMenu>
 #include <KIO/EmptyTrashJob>


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

-#include <KService>

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


@@ -44,7 +40,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),


@@ -57,14 +54,15 @@ 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);
 
     static_cast<KHamburgerMenu *>(m_mainWindow->actionCollection()->
                 action(QStringLiteral("hamburger_menu")))->addToMenu(this);


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


@@ -192,12 +190,11 @@ 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);
     const DolphinView* view = m_mainWindow->activeViewContainer()->view();
 
     // 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<QUrl>() << m_fileInfo.url());
     newFileMenu->setEnabled(selectedItemsProps.supportsWriting());
     newFileMenu->checkUpToDate();
     newFileMenu->setPopupFiles(QList<QUrl>() << m_fileInfo.url());
     newFileMenu->setEnabled(selectedItemsProps.supportsWriting());


@@ -221,16 +218,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",


@@ -253,7 +249,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")));


@@ -275,12 +271,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()) {


@@ -312,20 +308,17 @@ 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();

-    newFileMenu->setViewShowsHiddenFiles(view->hiddenFilesShown());

     newFileMenu->checkUpToDate();
     newFileMenu->setPopupFiles(QList<QUrl>() << 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
     newFileMenu->checkUpToDate();
     newFileMenu->setPopupFiles(QList<QUrl>() << 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) {
 
     QAction* pasteAction = createPasteAction();
     if (pasteAction) {


@@ -350,7 +343,7 @@ void DolphinContextMenu::openViewportContextMenu()
         addSeparator();
     }
 
         addSeparator();
     }
 

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

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


@@ -477,10 +470,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()


@@ -488,7 +481,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();
 


@@ -496,7 +489,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);