Change "Date" to "Modified" and allow access to new "Accessed" time field

[dolphin.git] / src / dolphincontextmenu.cpp

diff --git a/src/dolphincontextmenu.cpp b/src/dolphincontextmenu.cpp
index 971ef1e35fa1f4d64257067a10b3e6a18ccb14b3..bedb4cb80fc377bff27bc3bd3d69b4494141cb09 100644 (file)
--- a/src/dolphincontextmenu.cpp
+++ b/src/dolphincontextmenu.cpp
@@ -34,6 +34,7 @@
 #include <KIO/EmptyTrashJob>
 #include <KIO/JobUiDelegate>
 #include <KIO/Paste>
 #include <KIO/EmptyTrashJob>
 #include <KIO/JobUiDelegate>
 #include <KIO/Paste>

+#include <kio_version.h>

 #include <KJobWidgets>
 #include <KMimeTypeTrader>
 #include <KNewFileMenu>
 #include <KJobWidgets>
 #include <KMimeTypeTrader>
 #include <KNewFileMenu>


@@ -159,7 +160,7 @@ void DolphinContextMenu::openTrashContextMenu()
         if (uiDelegate.askDeleteConfirmation(QList<QUrl>(), KIO::JobUiDelegate::EmptyTrash, KIO::JobUiDelegate::DefaultConfirmation)) {
             KIO::Job* job = KIO::emptyTrash();
             KJobWidgets::setWindow(job, m_mainWindow);
         if (uiDelegate.askDeleteConfirmation(QList<QUrl>(), KIO::JobUiDelegate::EmptyTrash, KIO::JobUiDelegate::DefaultConfirmation)) {
             KIO::Job* job = KIO::emptyTrash();
             KJobWidgets::setWindow(job, m_mainWindow);

-            job->ui()->setAutoErrorHandlingEnabled(true);
+            job->uiDelegate()->setAutoErrorHandlingEnabled(true);

         }
     }
 }
         }
     }
 }


@@ -283,7 +284,7 @@ void DolphinContextMenu::openItemContextMenu()
     fileItemActions.setItemListProperties(selectedItemsProps);
     addServiceActions(fileItemActions);
 
     fileItemActions.setItemListProperties(selectedItemsProps);
     addServiceActions(fileItemActions);
 

-    addFileItemPluginActions();
+    addFileItemPluginActions(fileItemActions);

 
     addVersionControlPluginActions();
 
 
     addVersionControlPluginActions();
 


@@ -306,7 +307,7 @@ void DolphinContextMenu::openItemContextMenu()
             if (selectedUrl.isValid()) {
                 PlacesItemModel model;
                 const QString text = selectedUrl.fileName();
             if (selectedUrl.isValid()) {
                 PlacesItemModel model;
                 const QString text = selectedUrl.fileName();

-                PlacesItem* item = model.createPlacesItem(text, selectedUrl);
+                PlacesItem* item = model.createPlacesItem(text, selectedUrl, KIO::iconNameForUrl(selectedUrl));

                 model.appendItemToGroup(item);
                 model.saveBookmarks();
             }
                 model.appendItemToGroup(item);
                 model.saveBookmarks();
             }


@@ -355,7 +356,7 @@ void DolphinContextMenu::openViewportContextMenu()
     fileItemActions.setItemListProperties(baseUrlProperties);
     addServiceActions(fileItemActions);
 
     fileItemActions.setItemListProperties(baseUrlProperties);
     addServiceActions(fileItemActions);
 

-    addFileItemPluginActions();
+    addFileItemPluginActions(fileItemActions);

 
     addVersionControlPluginActions();
 
 
     addVersionControlPluginActions();
 


@@ -372,7 +373,8 @@ void DolphinContextMenu::openViewportContextMenu()
         if (container->url().isValid()) {
             PlacesItemModel model;
             PlacesItem* item = model.createPlacesItem(container->placesText(),
         if (container->url().isValid()) {
             PlacesItemModel model;
             PlacesItem* item = model.createPlacesItem(container->placesText(),

-                                                      container->url());
+                                                      container->url(),
+                                                      KIO::iconNameForUrl(container->url()));

             model.appendItemToGroup(item);
             model.saveBookmarks();
         }
             model.appendItemToGroup(item);
             model.saveBookmarks();
         }


@@ -483,8 +485,12 @@ void DolphinContextMenu::addServiceActions(KFileItemActions& fileItemActions)
     fileItemActions.addServiceActionsTo(this);
 }
 
     fileItemActions.addServiceActionsTo(this);
 }
 

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

 {
 {

+#if KIO_VERSION >= QT_VERSION_CHECK(5, 27, 0)
+    fileItemActions.addPluginActionsTo(this);
+#else
+    Q_UNUSED(fileItemActions);

     KFileItemListProperties props;
     if (m_selectedItems.isEmpty()) {
         props.setItems(KFileItemList() << baseFileItem());
     KFileItemListProperties props;
     if (m_selectedItems.isEmpty()) {
         props.setItems(KFileItemList() << baseFileItem());


@@ -550,6 +556,7 @@ void DolphinContextMenu::addFileItemPluginActions()
             addedPlugins << jsonMetadata.pluginId();
         }
     }
             addedPlugins << jsonMetadata.pluginId();
         }
     }

+#endif

 }
 
 void DolphinContextMenu::addVersionControlPluginActions()
 }
 
 void DolphinContextMenu::addVersionControlPluginActions()