Layout adjustments & also show remote path in activitylist

Signed-off-by: Dominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com>

diff --git a/src/gui/tray/ActivityListModel.cpp b/src/gui/tray/ActivityListModel.cpp
index 964b1f7acd1d78b8eb99a32d7661f41d53f0644d..6baf302d09329e988864c186d74480e13756c7a8 100644 (file)
--- a/src/gui/tray/ActivityListModel.cpp
+++ b/src/gui/tray/ActivityListModel.cpp
@@ -76,7 +76,11 @@ QVariant ActivityListModel::data(const QModelIndex &index, int role) const
             }
             list = FolderMan::instance()->findFileInLocalFolders(relPath, ast->account());
             if (list.count() > 0) {
-                return list.at(0);
+                if (relPath.startsWith('/') || relPath.startsWith('\\')) {
+                    return relPath.remove(0,1);
+                } else {
+                    return relPath;
+                }
             }
         }
         return QString();

diff --git a/src/gui/tray/Window.qml b/src/gui/tray/Window.qml
index 1cf9576efab52ab33b5edc1bb089a2e692da7277..d16faaddaef1441a5f9041c13973ad5a53c334c2 100644 (file)
--- a/src/gui/tray/Window.qml
+++ b/src/gui/tray/Window.qml
@@ -496,6 +496,7 @@ Window {
                 Image {\r
                     id: activityIcon\r
                     Layout.leftMargin: 8\r
+                    Layout.rightMargin: 8\r
                     Layout.preferredWidth: activityButton1.icon.width\r
                     Layout.preferredHeight: activityButton1.icon.height\r
                     verticalAlignment: Qt.AlignCenter\r
@@ -506,7 +507,6 @@ Window {
                 }\r
                 Column {\r
                     id: activityTextColumn\r
-                    Layout.leftMargin: 4\r
                     spacing: 4\r
                     Layout.alignment: Qt.AlignLeft\r
                     Text {\r