feat(ui): add event icons for all statuses

Before we would alternate between status icon and online event icon. Now each status has its own event version, so status doesn't appear to alternate between online and the correct status.
qTox · May 20, 2019 · 17048c9 · 17048c9
1 parent 0f6e992
commit 17048c9
Show file tree

Hide file tree

Showing 12 changed files with 257 additions and 6 deletions.
diff --git a/img/taskbar/dark/taskbar_event.svg → img/taskbar/dark/taskbar_away_event.svg b/img/taskbar/dark/taskbar_event.svg → img/taskbar/dark/taskbar_away_event.svg
diff --git a/img/taskbar/dark/taskbar_busy_event.svg b/img/taskbar/dark/taskbar_busy_event.svg
diff --git a/img/taskbar/dark/taskbar_invisible_event.svg b/img/taskbar/dark/taskbar_invisible_event.svg
diff --git a/img/taskbar/dark/taskbar_offline_event.svg b/img/taskbar/dark/taskbar_offline_event.svg
diff --git a/img/taskbar/light/taskbar_event.svg → img/taskbar/dark/taskbar_online_event.svg b/img/taskbar/light/taskbar_event.svg → img/taskbar/dark/taskbar_online_event.svg
diff --git a/img/taskbar/light/taskbar_away_event.svg b/img/taskbar/light/taskbar_away_event.svg
diff --git a/img/taskbar/light/taskbar_busy_event.svg b/img/taskbar/light/taskbar_busy_event.svg
diff --git a/img/taskbar/light/taskbar_invisible_event.svg b/img/taskbar/light/taskbar_invisible_event.svg
diff --git a/img/taskbar/light/taskbar_offline_event.svg b/img/taskbar/light/taskbar_offline_event.svg
diff --git a/img/taskbar/light/taskbar_online_event.svg b/img/taskbar/light/taskbar_online_event.svg
diff --git a/res.qrc b/res.qrc
@@ -31,15 +31,21 @@
         <file>img/status/online.svg</file>
         <file>img/status/online_notification.svg</file>
         <file>img/taskbar/dark/taskbar_online.svg</file>
+        <file>img/taskbar/dark/taskbar_online_event.svg</file>
         <file>img/taskbar/dark/taskbar_away.svg</file>
+        <file>img/taskbar/dark/taskbar_away_event.svg</file>
         <file>img/taskbar/dark/taskbar_busy.svg</file>
+        <file>img/taskbar/dark/taskbar_busy_event.svg</file>
         <file>img/taskbar/dark/taskbar_offline.svg</file>
-        <file>img/taskbar/dark/taskbar_event.svg</file>
+        <file>img/taskbar/dark/taskbar_offline_event.svg</file>
         <file>img/taskbar/light/taskbar_online.svg</file>
+        <file>img/taskbar/light/taskbar_online_event.svg</file>
         <file>img/taskbar/light/taskbar_away.svg</file>
+        <file>img/taskbar/light/taskbar_away_event.svg</file>
         <file>img/taskbar/light/taskbar_busy.svg</file>
+        <file>img/taskbar/light/taskbar_busy_event.svg</file>
         <file>img/taskbar/light/taskbar_offline.svg</file>
-        <file>img/taskbar/light/taskbar_event.svg</file>
+        <file>img/taskbar/light/taskbar_offline_event.svg</file>
         <file>img/transfer.svg</file>
         <file>themes/dark/palette.ini</file>
         <file>themes/dark/fileTransferWidget/fileDone.svg</file>

diff --git a/src/widget/widget.cpp b/src/widget/widget.cpp
@@ -440,8 +440,9 @@ void Widget::updateIcons()
         return;
     }
 
-    const QString assetSuffix = eventIcon ? "event" :
-        Status::getAssetSuffix(static_cast<Status::Status>(ui->statusButton->property("status").toInt()));
+    const QString assetSuffix =
+        Status::getAssetSuffix(static_cast<Status::Status>(ui->statusButton->property("status").toInt()))
+        + (eventIcon ? "_event" : "");
 
 
     // Some builds of Qt appear to have a bug in icon loading: