From b4ef4fe54d9db64999af331ca1c13e0923eaef83 Mon Sep 17 00:00:00 2001 From: apa420 <17131426+apa420@users.noreply.github.com> Date: Sun, 27 Sep 2020 00:20:15 +0200 Subject: [PATCH] Added vip and unvip buttons (#1996) Co-authored-by: fourtf --- CHANGELOG.md | 1 + resources/buttons/unvip.png | Bin 0 -> 654 bytes resources/buttons/vip.png | Bin 0 -> 890 bytes resources/resources_autogenerated.qrc | 2 ++ src/autogenerated/ResourcesAutogen.cpp | 2 ++ src/autogenerated/ResourcesAutogen.hpp | 2 ++ src/widgets/dialogs/UserInfoPopup.cpp | 12 ++++++++++++ 7 files changed, 19 insertions(+) create mode 100644 resources/buttons/unvip.png create mode 100644 resources/buttons/vip.png diff --git a/CHANGELOG.md b/CHANGELOG.md index 65c205198..90e7189c4 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 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) - Bugfix: /usercard command will now respect the "Automatically close user popup" setting (#1918) diff --git a/resources/buttons/unvip.png b/resources/buttons/unvip.png new file mode 100644 index 0000000000000000000000000000000000000000..61b3476d9c33ca2025d45a1a067527cdb9f98387 GIT binary patch literal 654 zcmeAS@N?(olHy`uVBq!ia0vp^9w5xY1|&n@ZgvM!Y)RhkE)4%caKYZ?lYt_f1s;*b z3=BHnAk4VbcG^myAbW|YuPgf#PAO4wsfjzSPBJhsNqf3DhE&{od&kg^DNx|p$NZCG z360rFPMw`%VIpc50yyLjG8ZuCuGzS7o8m(zxdYRj7Jp=jxDi>voV;M8Qc~(7w&}I+ z&+akjPv4d6@x$;>`Su&WAF}hxwom(Uy!h9zc{TQaB5Lwlfpcn>Ofq`nzv%X4`(2J) zOB~?H3drJ_98?#v-2C9VtBDu%zm$D!I{sR@Qu@lNV>jN(v;050`JY|X%?Pmo$=EA- zvo%sPf25^oW|jL+xj2>i%03yzyQ@#UblclhR!j^XhUr%s(WR+V~rSPciwZ39&#MHGALM^qPVynd?5?#KcDuhGh z+Pi=+8M*;y?k;?BF>1k$-H&fA-s*7rCev&y`OmG^7yfQ&{F$(;&|>pJ5&pw$zDvw` zS8DWK%&ZHZ;8W0}FOuwTbadk`@ov$RY{!4)*_o+C%VaN@F(Ia4PD7GI(a}P-Nj)x& z&P*zTom}la9zsH@e3}zjRI+4>7EJJvvCwf)oUo(dMnjEK;iC;qKOG(&OJslK@~QDL zYX|d5@ji0}FO~Tgag7=iY93dx7ddh@3bUMG(-iSDP!L`+!NRezOQH1`C*PEI6-IZK z3tB3g77QO3bFA}FuQ(6YMHObFV0_}waamr>+0># h*(W&tZTUINKe?%_4d4I( literal 0 HcmV?d00001 diff --git a/resources/buttons/vip.png b/resources/buttons/vip.png new file mode 100644 index 0000000000000000000000000000000000000000..43b18b1e61dd6a3d3b9a2730d395f5c7335310f6 GIT binary patch literal 890 zcmV-=1BLvFP)@~0drDELIAGL9O(c600d`2O+f$vv5yPEYoRk< z-NF8R7~yrDM?231@E8{u27WxB{76JSjF;P3%3;yYhvee{2uU)VPTNuvms@h?faI)l zz@w|u3D^jOCX4t8#6JizZ*xSv3t~OV$%-c-v=3q}@=Pu>h_XjblY{s#BuE1Z(m;YV zkRS~tNCOGdK!P+>V3F$KO1%;G5Ds1GDv7pd$M@8N|G7=PO?x@I%%~s4Tgo z!X%GU3o2XgsK}Z}sRWfZcT{A_Bdwq^=Z=ajd88Fo_S{jCHjlJ|L_Ec&GC$FeO)DsV z{skw=Ytu+Ou2dntX_B&xC-rH5QzT^_N2UwKvP&|lKl8m*w1f72`{K2cTsQa-Zh*aa+N&glvN{mN zUlGpB2x)yOn2v<_Oo&KcAuYbKar9PzP(uIq(LjPUkRS~tNP`qK2BClrxe%fcLcx5P z%pmaw#9G89(c`UY=VLO9UV``w0dd^=)fq2CdU~ac#e>d>Gd^MWXHR}u2x_4ni^=6S z%_ImpbHwiHy;i*PkhfJvTZ1NM=rY0glfAy4E#&(4XDl%5L$JP#oYft_0fD)FwLw{_ Q+yDRo07*qoM6N<$g4b`7zW@LL literal 0 HcmV?d00001 diff --git a/resources/resources_autogenerated.qrc b/resources/resources_autogenerated.qrc index 2497e6f6f..eacc6fde9 100644 --- a/resources/resources_autogenerated.qrc +++ b/resources/resources_autogenerated.qrc @@ -26,8 +26,10 @@ buttons/trashcan.svg buttons/unban.png buttons/unmod.png + buttons/unvip.png buttons/update.png buttons/updateError.png + buttons/vip.png chatterino.icns com.chatterino.chatterino.appdata.xml com.chatterino.chatterino.desktop diff --git a/src/autogenerated/ResourcesAutogen.cpp b/src/autogenerated/ResourcesAutogen.cpp index b0e5e6ce8..1728044f3 100644 --- a/src/autogenerated/ResourcesAutogen.cpp +++ b/src/autogenerated/ResourcesAutogen.cpp @@ -25,8 +25,10 @@ Resources2::Resources2() this->buttons.trashCan = QPixmap(":/buttons/trashCan.png"); this->buttons.unban = QPixmap(":/buttons/unban.png"); this->buttons.unmod = QPixmap(":/buttons/unmod.png"); + this->buttons.unvip = QPixmap(":/buttons/unvip.png"); this->buttons.update = QPixmap(":/buttons/update.png"); this->buttons.updateError = QPixmap(":/buttons/updateError.png"); + this->buttons.vip = QPixmap(":/buttons/vip.png"); this->error = QPixmap(":/error.png"); this->icon = QPixmap(":/icon.png"); this->pajaDank = QPixmap(":/pajaDank.png"); diff --git a/src/autogenerated/ResourcesAutogen.hpp b/src/autogenerated/ResourcesAutogen.hpp index cbd6c0bfb..590cc234a 100644 --- a/src/autogenerated/ResourcesAutogen.hpp +++ b/src/autogenerated/ResourcesAutogen.hpp @@ -32,8 +32,10 @@ public: QPixmap trashCan; QPixmap unban; QPixmap unmod; + QPixmap unvip; QPixmap update; QPixmap updateError; + QPixmap vip; } buttons; QPixmap error; QPixmap icon; diff --git a/src/widgets/dialogs/UserInfoPopup.cpp b/src/widgets/dialogs/UserInfoPopup.cpp index a7f3add5e..f7096c556 100644 --- a/src/widgets/dialogs/UserInfoPopup.cpp +++ b/src/widgets/dialogs/UserInfoPopup.cpp @@ -186,6 +186,12 @@ UserInfoPopup::UserInfoPopup(bool closeAutomatically) auto unmod = user.emplace