feat: Added a right click option to activity items to allow file observation features

Signed-off-by: brkgbr <[email protected]>
Signed-off-by: brkgbr <->

Author: brkgbr

src/gui/tray/ActivityList.qml

@@ -26,6 +26,7 @@ ScrollView {
     }
 
     signal openFile(string filePath)
+    signal showInFileManager(int index)
     signal activityItemClicked(int index)
 
     contentWidth: availableWidth
@@ -51,6 +52,14 @@ ScrollView {
     ListView {
         id: activityList
 
+        function openFileOrLink(index) {
+            if (model.isCurrentUserFileActivity && model.openablePath) {
+                openFile("file://" + model.openablePath);
+            } else {
+                activityItemClicked(index);
+            }
+        }
+
         Accessible.role: Accessible.List
         Accessible.name: qsTr("Activity list")
 
@@ -117,11 +126,25 @@ ScrollView {
 
                 forceActiveFocus();
             }
-            onClicked: {
-                if (model.isCurrentUserFileActivity && model.openablePath) {
-                    openFile("file://" + model.openablePath);
-                } else {
-                    activityItemClicked(model.activityIndex)
+
+            MouseArea {
+                anchors.fill: parent
+                acceptedButtons: Qt.LeftButton | Qt.RightButton
+                onClicked: (mouse)=> {
+                    switch (mouse.button) {
+                    case Qt.LeftButton:
+                        activityList.openFileOrLink(activityList.currentIndex)
+                        break;
+                    case Qt.RightButton:
+                        // We only want to allow the context menu for actual files
+                        if (model.showFileDetails) {
+                            contextMenu.x = mouse.x;
+                            contextMenu.y = mouse.y;
+                            contextMenu.selectedItem = activityList.currentIndex
+                            contextMenu.open();
+                        }
+                        break;
+                    }
                 }
             }
         }
@@ -148,6 +171,26 @@ ScrollView {
             visible: !controlRoot.atYBeginning && controlRoot.contentHeight > controlRoot.height
         }
 
+        Menu {
+            id: contextMenu
+            property int selectedItem
+
+            MenuItem {
+                text: qsTr("Open local file")
+                onTriggered: {
+                    activityList.currentIndex = contextMenu.selectedItem
+                    activityList.openFileOrLink(contextMenu.selectedItem);
+                }
+            }
+            MenuItem {
+                text: qsTr("Show in file manager")
+                onTriggered: {
+                    activityList.currentIndex = contextMenu.selectedItem
+                    showInFileManager(contextMenu.selectedItem);
+                }
+            }
+        }
+
         Column {
             id: placeholderColumn
             width: parent.width * 0.8

src/gui/tray/MainWindow.qml

@@ -486,9 +486,8 @@ ApplicationWindow {
             activeFocusOnTab: true
             model: activityModel
             onOpenFile: Qt.openUrlExternally(filePath);
-            onActivityItemClicked: {
-                model.slotTriggerDefaultAction(index)
-            }
+            onShowInFileManager: index => model.slotTriggerShowInFileManager(index)
+            onActivityItemClicked: index => model.slotTriggerDefaultAction(index)
             Connections {
                 target: activityModel
                 function onInteractiveActivityReceived() {

src/gui/tray/activitylistmodel.cpp

@@ -17,6 +17,8 @@
 #include "caseclashfilenamedialog.h"
 #include "activitydata.h"
 #include "systray.h"
+#include "openfilemanager.h"
+#include "filesystem.h"
 
 #include <QtCore>
 #include <QAbstractListModel>
@@ -862,6 +864,20 @@ void ActivityListModel::slotTriggerDismiss(const int activityIndex)
     emit sendNotificationRequest(activity._accName, Utility::concatUrlPath(accountState()->account()->url(), "ocs/v2.php/apps/notifications/api/v2/notifications/" + QString::number(activity._id)).toString(), deleteVerb, activityIndex);
 }
 
+void ActivityListModel::slotTriggerShowInFileManager(const int activityIndex)
+{
+    if (activityIndex < 0 || activityIndex >= _finalList.size()) {
+        qCWarning(lcActivity) << "Couldn't trigger show in file manager at index" << activityIndex << "/ final list size:" << _finalList.size();
+        return;
+    }
+
+    const auto modelIndex = index(activityIndex);
+    const auto path = data(modelIndex, PathRole).toString();
+    if (FileSystem::fileExists(path)) {
+        showInFileManager(path);
+    }
+}
+
 AccountState *ActivityListModel::accountState() const
 {
     return _accountState;

src/gui/tray/activitylistmodel.h

@@ -120,6 +120,7 @@ public slots:
     void slotTriggerDefaultAction(const int activityIndex);
     void slotTriggerAction(const int activityIndex, const int actionIndex);
     void slotTriggerDismiss(const int activityIndex);
+    void slotTriggerShowInFileManager(const int activityIndex);
 
     void addNotificationToActivityList(const OCC::Activity &activity);
     void addErrorToActivityList(const OCC::Activity &activity, const OCC::ActivityListModel::ErrorType type);