From: Claas Augner <git@caugner.de>
Date: Sun, 21 Jul 2019 19:37:50 +0000 (+0200)
Subject: Displays FileIgnored activities with an info icon
X-Git-Tag: archive/raspbian/3.16.7-1_deb13u1+rpi1~1^2~222^2~2^2~244^2~1
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=116c5b361fa23a41098616a38c522d2406069a77;p=nextcloud-desktop.git

Displays FileIgnored activities with an info icon

See: https://github.com/nextcloud/desktop/issues/965
Signed-off-by: Claas Augner <git@caugner.de>
---

diff --git a/client.qrc b/client.qrc
index 00db6b163..2abbd8fc8 100644
--- a/client.qrc
+++ b/client.qrc
@@ -38,6 +38,7 @@
         <file>resources/copy.svg</file>
         <file>resources/state-sync.svg</file>
         <file>resources/add.png</file>
+        <file>resources/state-info.svg</file>
     </qresource>
     <qresource prefix="/"/>
 </RCC>
diff --git a/resources/state-info.svg b/resources/state-info.svg
new file mode 100644
index 000000000..14b52e326
--- /dev/null
+++ b/resources/state-info.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 4.2333 4.2333" version="1.1" height="16" width="16"><g id="g3830" transform="matrix(.87498 0 0 .87498 .26458 -255.9)"><circle id="circle3818" stroke-width=".25066" fill="#2268ab" r="2.1167" cy="294.88" cx="2.1167" /><g id="g3828" stroke-linejoin="round" stroke-linecap="round" fill="none" /></g><path style="fill:#ffffff;stroke-width:0.17859235" d="m 1.6076619,2.1122981 c 0.027682,0.068222 0.058043,0.1232286 0.115014,0.043934 0.072686,-0.047862 0.314322,-0.2548509 0.29682,-0.061078 C 1.953774,2.4553739 1.8705497,2.8125586 1.8105428,3.1738508 1.7403561,3.3728027 1.9237704,3.5430012 2.1028984,3.4078068 2.295421,3.3181535 2.4582973,3.1779584 2.6256382,3.0488362 2.599921,2.9911507 2.5809903,2.9077482 2.5191973,2.9868644 2.4356161,3.0297263 2.2566665,3.2222491 2.2163047,3.07116 2.2725613,2.681829 2.3904322,2.3041062 2.4600833,1.9170966 2.5309844,1.7376113 2.3950755,1.5200858 2.210054,1.6736753 1.985742,1.7836882 1.8010774,1.9562083 1.6076619,2.1122981 Z M 2.4041839,0.77839186 C 2.1702279,0.77446305 2.0636081,1.1609366 2.2889917,1.2561264 2.4716917,1.3236342 2.659928,1.1286114 2.6086721,0.94358974 2.5911701,0.8467927 2.5018738,0.77035521 2.4038266,0.77749894 Z" /></svg>
\ No newline at end of file
diff --git a/src/gui/activitylistmodel.cpp b/src/gui/activitylistmodel.cpp
index ae3a7c6b3..d35fd1368 100644
--- a/src/gui/activitylistmodel.cpp
+++ b/src/gui/activitylistmodel.cpp
@@ -103,11 +103,12 @@ QVariant ActivityListModel::data(const QModelIndex &index, int role) const
                    || a._status == SyncFileItem::BlacklistedError) {
                    return QIcon(QLatin1String(":/client/resources/state-error.svg"));
                } else if(a._status == SyncFileItem::SoftError
-                         || a._status == SyncFileItem::FileIgnored
                          || a._status == SyncFileItem::Conflict
                          || a._status == SyncFileItem::Restoration
                          || a._status == SyncFileItem::FileLocked){
                    return QIcon(QLatin1String(":/client/resources/state-warning.svg"));
+               } else if(a._status == SyncFileItem::FileIgnored){
+                   return QIcon(QLatin1String(":/client/resources/state-info.svg"));
                }
                return QIcon(QLatin1String(":/client/resources/state-sync.svg"));
         }