From: Dominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com>
Date: Mon, 13 Jan 2020 08:59:34 +0000 (+0100)
Subject: Icon selection, svg path transfers, scrollbar
X-Git-Tag: archive/raspbian/3.16.7-1_deb13u1+rpi1~1^2~222^2^2~413^2~47
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=1ebcd3a0fb36df0bbaeba2353d9f790552b4552c;p=nextcloud-desktop.git

Icon selection, svg path transfers, scrollbar

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

diff --git a/client.qrc b/client.qrc
index 509f8052c..de385dfb2 100644
--- a/client.qrc
+++ b/client.qrc
@@ -2,6 +2,7 @@
     <qresource prefix="/client">
         <file>resources/settings.png</file>
         <file>resources/settings@2x.png</file>
+        <file>resources/activity.svg</file>
         <file>resources/activity.png</file>
         <file>resources/activity@2x.png</file>
         <file>resources/network.png</file>
diff --git a/src/gui/tray/ActivityListModel.cpp b/src/gui/tray/ActivityListModel.cpp
index 3c8b50839..0f0b7f4ad 100644
--- a/src/gui/tray/ActivityListModel.cpp
+++ b/src/gui/tray/ActivityListModel.cpp
@@ -15,7 +15,6 @@
 #include <QtCore>
 #include <QAbstractListModel>
 #include <QWidget>
-#include <QIcon>
 #include <QJsonObject>
 #include <QJsonDocument>
 
@@ -56,10 +55,6 @@ QVariant ActivityListModel::data(const QModelIndex &index, int role) const
 {
     Activity a;
 
-    // filter the get action here
-    // send only the text of the get action
-    // if there is more than one send the icon? the ...
-
     if (!index.isValid())
         return QVariant();
 
@@ -99,39 +94,29 @@ QVariant ActivityListModel::data(const QModelIndex &index, int role) const
         return customList;
     }
     case ActionIconRole:{
-        ActionIcon actionIcon;
         if(a._type == Activity::NotificationType){
-           QIcon cachedIcon;
-            if(!cachedIcon.isNull()) {
-               actionIcon.iconType = ActivityIconType::iconUseCached;
-               actionIcon.cachedIcon = cachedIcon;
-            } else {
-                actionIcon.iconType = ActivityIconType::iconBell;
-            }
+            return "qrc:///client/resources/bell.svg";
         } else if(a._type == Activity::SyncResultType){
-            actionIcon.iconType = ActivityIconType::iconStateError;
+            return "qrc:///client/resources/state-error.svg";
         } else if(a._type == Activity::SyncFileItemType){
                if(a._status == SyncFileItem::NormalError
                    || a._status == SyncFileItem::FatalError
                    || a._status == SyncFileItem::DetailError
                    || a._status == SyncFileItem::BlacklistedError) {
-                   actionIcon.iconType = ActivityIconType::iconStateError;
+                    return "qrc:///client/resources/state-error.svg";
                } else if(a._status == SyncFileItem::SoftError
                          || a._status == SyncFileItem::Conflict
                          || a._status == SyncFileItem::Restoration
                          || a._status == SyncFileItem::FileLocked){
-                   actionIcon.iconType = ActivityIconType::iconStateWarning;
+                        return "qrc:///client/resources/state-warning.svg";
                } else if(a._status == SyncFileItem::FileIgnored){
-                   actionIcon.iconType = ActivityIconType::iconStateInfo;
+                   return "qrc:///client/resources/state-info.svg";
                } else {
-                   actionIcon.iconType = ActivityIconType::iconStateSync;
+                   return "qrc:///client/resources/state-sync.svg";
                }
         } else {
-            actionIcon.iconType = ActivityIconType::iconActivity;
+            return "qrc:///client/resources/activity.svg";
         }
-        QVariant icn;
-        icn.setValue(actionIcon);
-        return icn;
     }
     case ObjectTypeRole:
         return a._objectType;
diff --git a/src/gui/tray/ActivityListModel.h b/src/gui/tray/ActivityListModel.h
index d633bb07f..c5976e451 100644
--- a/src/gui/tray/ActivityListModel.h
+++ b/src/gui/tray/ActivityListModel.h
@@ -38,17 +38,7 @@ class ActivityListModel : public QAbstractListModel
 {
     Q_OBJECT
 public:
-    enum ActivityIconType {
-        iconUseCached = 0,
-        iconActivity,
-        iconBell,
-        iconStateError,
-        iconStateWarning,
-        iconStateInfo,
-        iconStateSync
-    };
-
-    enum datarole {
+    enum DataRole {
     ActionIconRole = Qt::UserRole + 1,
     UserIconRole,
     AccountRole,
@@ -63,11 +53,6 @@ public:
     AccountConnectedRole,
     SyncFileStatusRole };
 
-    struct ActionIcon {
-        ActivityIconType iconType;
-        QIcon cachedIcon;
-    };
-
     explicit ActivityListModel(AccountState *accountState, QObject* parent = 0);
 
     QVariant data(const QModelIndex &index, int role) const override;
@@ -118,6 +103,4 @@ private:
 };
 }
 
-Q_DECLARE_METATYPE(OCC::ActivityListModel::ActionIcon)
-
 #endif // ACTIVITYLISTMODEL_H
diff --git a/src/gui/tray/Window.qml b/src/gui/tray/Window.qml
index dea3fbc73..e7e8c6907 100644
--- a/src/gui/tray/Window.qml
+++ b/src/gui/tray/Window.qml
@@ -445,6 +445,9 @@ Window {
             width:  trayWindowBackground.width
             height: trayWindowBackground.height - trayWindowHeaderBackground.height
             clip: true
+            ScrollBar.vertical: ScrollBar {
+                id: listViewScrollbar
+            }
 
             model: activityModel
 
@@ -460,7 +463,8 @@ Window {
                     Layout.preferredWidth: 48
                     Layout.preferredHeight: 48
                     verticalAlignment: Qt.AlignCenter
-                    source: "qrc:///client/theme/black/state-sync.svg"
+                    cache: true
+                    source: icon
                     sourceSize.height: 48
                     sourceSize.width: 48
                 }
@@ -539,8 +543,6 @@ Window {
             displaced: Transition {
                 NumberAnimation { properties: "y"; duration: 100; easing.type: Easing.Linear }
             }
-
-            focus: true
         }
 
     }       // Rectangle trayWindowBackground