From 17048c9cc4b3f9ee58924637e57573e285ffa8ee Mon Sep 17 00:00:00 2001 From: Anthony Bilinski Date: Tue, 7 May 2019 15:44:33 -0700 Subject: [PATCH] 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. --- ...skbar_event.svg => taskbar_away_event.svg} | 2 +- img/taskbar/dark/taskbar_busy_event.svg | 51 ++++++++++++++++++ img/taskbar/dark/taskbar_invisible_event.svg | 52 +++++++++++++++++++ img/taskbar/dark/taskbar_offline_event.svg | 12 +++++ .../taskbar_online_event.svg} | 2 +- img/taskbar/light/taskbar_away_event.svg | 10 ++++ img/taskbar/light/taskbar_busy_event.svg | 51 ++++++++++++++++++ img/taskbar/light/taskbar_invisible_event.svg | 48 +++++++++++++++++ img/taskbar/light/taskbar_offline_event.svg | 12 +++++ img/taskbar/light/taskbar_online_event.svg | 8 +++ res.qrc | 10 +++- src/widget/widget.cpp | 5 +- 12 files changed, 257 insertions(+), 6 deletions(-) rename img/taskbar/dark/{taskbar_event.svg => taskbar_away_event.svg} (93%) create mode 100644 img/taskbar/dark/taskbar_busy_event.svg create mode 100644 img/taskbar/dark/taskbar_invisible_event.svg create mode 100644 img/taskbar/dark/taskbar_offline_event.svg rename img/taskbar/{light/taskbar_event.svg => dark/taskbar_online_event.svg} (93%) create mode 100644 img/taskbar/light/taskbar_away_event.svg create mode 100644 img/taskbar/light/taskbar_busy_event.svg create mode 100644 img/taskbar/light/taskbar_invisible_event.svg create mode 100644 img/taskbar/light/taskbar_offline_event.svg create mode 100644 img/taskbar/light/taskbar_online_event.svg diff --git a/img/taskbar/dark/taskbar_event.svg b/img/taskbar/dark/taskbar_away_event.svg similarity index 93% rename from img/taskbar/dark/taskbar_event.svg rename to img/taskbar/dark/taskbar_away_event.svg index 022a3acb2..bc3cf0469 100644 --- a/img/taskbar/dark/taskbar_event.svg +++ b/img/taskbar/dark/taskbar_away_event.svg @@ -4,5 +4,5 @@ - + diff --git a/img/taskbar/dark/taskbar_busy_event.svg b/img/taskbar/dark/taskbar_busy_event.svg new file mode 100644 index 000000000..5947d520c --- /dev/null +++ b/img/taskbar/dark/taskbar_busy_event.svg @@ -0,0 +1,51 @@ + + + +image/svg+xml diff --git a/img/taskbar/dark/taskbar_invisible_event.svg b/img/taskbar/dark/taskbar_invisible_event.svg new file mode 100644 index 000000000..cb47851e7 --- /dev/null +++ b/img/taskbar/dark/taskbar_invisible_event.svg @@ -0,0 +1,52 @@ + + + + + + + image/svg+xml + + + + + + + + + + + diff --git a/img/taskbar/dark/taskbar_offline_event.svg b/img/taskbar/dark/taskbar_offline_event.svg new file mode 100644 index 000000000..ed1c8684f --- /dev/null +++ b/img/taskbar/dark/taskbar_offline_event.svg @@ -0,0 +1,12 @@ + + + + + + + + + + + diff --git a/img/taskbar/light/taskbar_event.svg b/img/taskbar/dark/taskbar_online_event.svg similarity index 93% rename from img/taskbar/light/taskbar_event.svg rename to img/taskbar/dark/taskbar_online_event.svg index 022a3acb2..c7072723f 100644 --- a/img/taskbar/light/taskbar_event.svg +++ b/img/taskbar/dark/taskbar_online_event.svg @@ -4,5 +4,5 @@ - + diff --git a/img/taskbar/light/taskbar_away_event.svg b/img/taskbar/light/taskbar_away_event.svg new file mode 100644 index 000000000..38d35c5db --- /dev/null +++ b/img/taskbar/light/taskbar_away_event.svg @@ -0,0 +1,10 @@ + + + + + + + + + diff --git a/img/taskbar/light/taskbar_busy_event.svg b/img/taskbar/light/taskbar_busy_event.svg new file mode 100644 index 000000000..5947d520c --- /dev/null +++ b/img/taskbar/light/taskbar_busy_event.svg @@ -0,0 +1,51 @@ + + + +image/svg+xml diff --git a/img/taskbar/light/taskbar_invisible_event.svg b/img/taskbar/light/taskbar_invisible_event.svg new file mode 100644 index 000000000..0df4598dc --- /dev/null +++ b/img/taskbar/light/taskbar_invisible_event.svg @@ -0,0 +1,48 @@ + + + + + + + image/svg+xml + + + + + + + + + + diff --git a/img/taskbar/light/taskbar_offline_event.svg b/img/taskbar/light/taskbar_offline_event.svg new file mode 100644 index 000000000..ed1c8684f --- /dev/null +++ b/img/taskbar/light/taskbar_offline_event.svg @@ -0,0 +1,12 @@ + + + + + + + + + + + diff --git a/img/taskbar/light/taskbar_online_event.svg b/img/taskbar/light/taskbar_online_event.svg new file mode 100644 index 000000000..c7072723f --- /dev/null +++ b/img/taskbar/light/taskbar_online_event.svg @@ -0,0 +1,8 @@ + + + + + + + diff --git a/res.qrc b/res.qrc index d68eca438..0b7a562fb 100644 --- a/res.qrc +++ b/res.qrc @@ -31,15 +31,21 @@ img/status/online.svg img/status/online_notification.svg img/taskbar/dark/taskbar_online.svg + img/taskbar/dark/taskbar_online_event.svg img/taskbar/dark/taskbar_away.svg + img/taskbar/dark/taskbar_away_event.svg img/taskbar/dark/taskbar_busy.svg + img/taskbar/dark/taskbar_busy_event.svg img/taskbar/dark/taskbar_offline.svg - img/taskbar/dark/taskbar_event.svg + img/taskbar/dark/taskbar_offline_event.svg img/taskbar/light/taskbar_online.svg + img/taskbar/light/taskbar_online_event.svg img/taskbar/light/taskbar_away.svg + img/taskbar/light/taskbar_away_event.svg img/taskbar/light/taskbar_busy.svg + img/taskbar/light/taskbar_busy_event.svg img/taskbar/light/taskbar_offline.svg - img/taskbar/light/taskbar_event.svg + img/taskbar/light/taskbar_offline_event.svg img/transfer.svg themes/dark/palette.ini themes/dark/fileTransferWidget/fileDone.svg diff --git a/src/widget/widget.cpp b/src/widget/widget.cpp index e454dec07..9f4f94df0 100644 --- 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(ui->statusButton->property("status").toInt())); + const QString assetSuffix = + Status::getAssetSuffix(static_cast(ui->statusButton->property("status").toInt())) + + (eventIcon ? "_event" : ""); // Some builds of Qt appear to have a bug in icon loading: