From 3450b1cc9d6374c1549dd18aba0aa38fe2c951f1 Mon Sep 17 00:00:00 2001 From: apa420 <17131426+apa420@users.noreply.github.com> Date: Sun, 27 Sep 2020 00:22:06 +0200 Subject: [PATCH] Added image to streamermode user popup (#1995) * Added image to streamermode user popup * Update CHANGELOG.md * swapparoo Co-authored-by: fourtf --- CHANGELOG.md | 1 + resources/resources_autogenerated.qrc | 1 + resources/streamerMode.png | Bin 0 -> 8343 bytes src/autogenerated/ResourcesAutogen.cpp | 1 + src/autogenerated/ResourcesAutogen.hpp | 1 + src/widgets/dialogs/UserInfoPopup.cpp | 6 +++++- 6 files changed, 9 insertions(+), 1 deletion(-) create mode 100644 resources/streamerMode.png diff --git a/CHANGELOG.md b/CHANGELOG.md index 90e7189c4..8aab7db7d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,7 @@ - Minor: Disable checking for updates on unsupported platforms (#1874) - Minor: User popup will now automatically display messages as they are received - Minor: Changed the English in two rate-limited system messages (#1878) +- Minor: Added image for streamer mode in the user popup icon. - Minor: Added vip and unvip buttons. - Bugfix: Fix bug preventing users from setting the highlight color of the second entry in the "User" highlights tab (#1898) - Bugfix: Fix bug where the "check user follow state" event could trigger a network request requesting the user to follow or unfollow a user. By itself its quite harmless as it just repeats to Twitch the same follow state we had, so no follows should have been lost by this but it meant there was a rogue network request that was fired that could cause a crash (#1906) diff --git a/resources/resources_autogenerated.qrc b/resources/resources_autogenerated.qrc index eacc6fde9..575639ebd 100644 --- a/resources/resources_autogenerated.qrc +++ b/resources/resources_autogenerated.qrc @@ -80,6 +80,7 @@ split/move.png split/right.png split/up.png + streamerMode.png switcher/plus.svg switcher/switch.svg tlds.txt diff --git a/resources/streamerMode.png b/resources/streamerMode.png new file mode 100644 index 0000000000000000000000000000000000000000..d084ccce91a2ae10a6ab31243c05a7c55e6c9237 GIT binary patch literal 8343 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.move = QPixmap(":/split/move.png"); this->split.right = QPixmap(":/split/right.png"); this->split.up = QPixmap(":/split/up.png"); + this->streamerMode = QPixmap(":/streamerMode.png"); this->twitch.admin = QPixmap(":/twitch/admin.png"); this->twitch.automod = QPixmap(":/twitch/automod.png"); this->twitch.broadcaster = QPixmap(":/twitch/broadcaster.png"); diff --git a/src/autogenerated/ResourcesAutogen.hpp b/src/autogenerated/ResourcesAutogen.hpp index 590cc234a..f108be954 100644 --- a/src/autogenerated/ResourcesAutogen.hpp +++ b/src/autogenerated/ResourcesAutogen.hpp @@ -55,6 +55,7 @@ public: QPixmap right; QPixmap up; } split; + QPixmap streamerMode; struct { QPixmap admin; QPixmap automod; diff --git a/src/widgets/dialogs/UserInfoPopup.cpp b/src/widgets/dialogs/UserInfoPopup.cpp index f7096c556..3ac37ef23 100644 --- a/src/widgets/dialogs/UserInfoPopup.cpp +++ b/src/widgets/dialogs/UserInfoPopup.cpp @@ -577,7 +577,11 @@ void UserInfoPopup::updateUserData() [] { // failure }); - if (!isInStreamerMode()) + if (isInStreamerMode()) + { + this->ui_.avatarButton->setPixmap(getResources().streamerMode); + } + else { this->loadAvatar(user.profileImageUrl); }