Merge branch 'release/22.04'

[dolphin.git] / src / dolphinpart.cpp

diff --git a/src/dolphinpart.cpp b/src/dolphinpart.cpp
index 55a11a2987378417a5b2c95df8db3a8900234f82..0f10a7769fe2513688f4da5b9ca0869d81bf9dfa 100644 (file)
--- a/src/dolphinpart.cpp
+++ b/src/dolphinpart.cpp
@@ -385,8 +385,8 @@ void DolphinPart::createNewWindow(const QUrl& url)
 
 void DolphinPart::slotOpenContextMenu(const QPoint& pos,
                                       const KFileItem& _item,
 
 void DolphinPart::slotOpenContextMenu(const QPoint& pos,
                                       const KFileItem& _item,

-                                      const QUrl &,
-                                      const QList<QAction*>& customActions)
+                                      const KFileItemList &selectedItems,
+                                      const QUrl &)

 {
     KParts::BrowserExtension::PopupFlags popupFlags = KParts::BrowserExtension::DefaultPopupItems
                                                       | KParts::BrowserExtension::ShowProperties
 {
     KParts::BrowserExtension::PopupFlags popupFlags = KParts::BrowserExtension::DefaultPopupItems
                                                       | KParts::BrowserExtension::ShowProperties


@@ -402,13 +402,11 @@ void DolphinPart::slotOpenContextMenu(const QPoint& pos,
             item.setUrl(url()); // ensure we use the view url, not the canonical path (#213799)
     }
 
             item.setUrl(url()); // ensure we use the view url, not the canonical path (#213799)
     }
 

-    // TODO: We should change the signature of the slots (and signals) for being able
-    //       to tell for which items we want a popup.

     KFileItemList items;
     KFileItemList items;

-    if (m_view->selectedItems().isEmpty()) {
+    if (selectedItems.isEmpty()) {

         items.append(item);
     } else {
         items.append(item);
     } else {

-        items = m_view->selectedItems();
+        items = selectedItems;

     }
 
     KFileItemListProperties capabilities(items);
     }
 
     KFileItemListProperties capabilities(items);


@@ -416,7 +414,6 @@ void DolphinPart::slotOpenContextMenu(const QPoint& pos,
     KParts::BrowserExtension::ActionGroupMap actionGroups;
     QList<QAction *> editActions;
     editActions += m_view->versionControlActions(m_view->selectedItems());
     KParts::BrowserExtension::ActionGroupMap actionGroups;
     QList<QAction *> editActions;
     editActions += m_view->versionControlActions(m_view->selectedItems());

-    editActions += customActions;

 
     if (!_item.isNull()) { // only for context menu on one or more items
         const bool supportsMoving = capabilities.supportsMoving();
 
     if (!_item.isNull()) { // only for context menu on one or more items
         const bool supportsMoving = capabilities.supportsMoving();


@@ -591,7 +588,6 @@ void DolphinPart::updateNewMenu()
 {
     // As requested by KNewFileMenu :
     m_newFileMenu->checkUpToDate();
 {
     // As requested by KNewFileMenu :
     m_newFileMenu->checkUpToDate();

-    m_newFileMenu->setViewShowsHiddenFiles(m_view->hiddenFilesShown());

     // And set the files that the menu apply on :
     m_newFileMenu->setPopupFiles(QList<QUrl>() << url());
 }
     // And set the files that the menu apply on :
     m_newFileMenu->setPopupFiles(QList<QUrl>() << url());
 }


@@ -608,7 +604,6 @@ void DolphinPart::updateProgress(int percent)
 
 void DolphinPart::createDirectory()
 {
 
 void DolphinPart::createDirectory()
 {

-    m_newFileMenu->setViewShowsHiddenFiles(m_view->hiddenFilesShown());

     m_newFileMenu->setPopupFiles(QList<QUrl>() << url());
     m_newFileMenu->createDirectory();
 }
     m_newFileMenu->setPopupFiles(QList<QUrl>() << url());
     m_newFileMenu->createDirectory();
 }