From 1c242a51dde0fe9f74080e0275e78458f8f2c7a3 Mon Sep 17 00:00:00 2001 From: Mm2PL Date: Fri, 23 Aug 2019 19:44:56 +0200 Subject: [PATCH] Create a copy icon. Change the copy button text to be an icon --- resources/buttons/copyDark.png | Bin 0 -> 1157 bytes resources/buttons/copyDark.svg | 13 +++ resources/buttons/copyLight.png | Bin 0 -> 1004 bytes resources/buttons/copyLight.svg | 13 +++ resources/resources_autogenerated.qrc | 116 +++++++++++++------------ src/autogenerated/ResourcesAutogen.cpp | 4 +- src/autogenerated/ResourcesAutogen.hpp | 4 +- src/widgets/dialogs/UserInfoPopup.cpp | 7 +- 8 files changed, 98 insertions(+), 59 deletions(-) create mode 100644 resources/buttons/copyDark.png create mode 100644 resources/buttons/copyDark.svg create mode 100644 resources/buttons/copyLight.png create mode 100644 resources/buttons/copyLight.svg diff --git a/resources/buttons/copyDark.png b/resources/buttons/copyDark.png new file mode 100644 index 0000000000000000000000000000000000000000..2a663bfd6d9d5dcdb81ded3e4f469c6c5eb90d18 GIT binary patch literal 1157 zcmV;01bX|4P)EjHnU+1RKSeMD9q$FZAN??d=|uyPfxDvU|r&ZU-ha z^SoI9#6KF3(>T$GpVdFGt3+=)z`vyB13Oy$J0*%{ak@mB!hl%1NLv<(1umeY~m1~X3q z!WC5Y3`xg2thfX~`@zu&lYG2~ItCDo&#Z>3{MRJ_ByTT4U>YE7mjrG2J^?^+okX1j z2o;+kIa%KTpjh^yz5xh_xWG(#E&-rB1L9)Y3E~TYa5j!?E~rb$`fd4}QadXjUaQFt_jI4%H$U$)*+ z3S489I&$r0=G!Ri92B1e1WFC7LI4ah8r=k7Lt9w!{V@7;IMN|$T%<#=n*bO)%?MV& zqst^cP#F~hfD2LuDCr6rIRv4k^U#gb3_!SOGNBq^oID3koO~Lz`4o)gVPgUy+(D(j zwm1U-9NimwNmrihsNchJlIALuAHz0X-eU{h2XL#*@nQ`oAP(cDO9hv*kFYTcr^nFJ z-5#YxlolK5L%nYYYAm1x09U#RKpthr&C|ll z%F1W-Bk-FoKneQvelhIRxXBOu(HO%oq#ikpw7Wg(=z~oa9hqOsB=6;%-?Rd1BA8f`5hqb5CK2;*%TnR$|^6q8*@J@ z3lF6gRspau>yKy#0M?3IWsc|1GBciLJAeU)SUs@=xF9*6fSn)gECqyh>WLk|1*Gk#5fcxud@1eBCn>)bXv>zJADd0yq_FiT?K)@_Z z0RbTI*;xt*OPHmA0Fd|WUP*yP-AYLSsQj-wBOcIS>wKgDxja{SbCCU`GvqM6hHnGj z>HIVPKmtE#T3%gUJ&$LiTQEky=AaThAmRV@^sE#;EK%FhKFx)%NrE}Td3E!B!N(Lg z;Gg~rQW#hyBbqWEgt?jjAn+wk@I?NEx@9xRuO4!7aqa@~avWo`&?tGA5X=A*5arh- z>U-2E*CO%OG0|ITt>ZYEIGUulh}?ccib)CqunYtA9i4Aw9stnq3lkM71rizWurm7z ztm)ht06^-eDO!%n>96e;j?xZDe2`eom!{}cD#maKmQWv|{zdhn{Dza`sM1}m5kCI` Xi4^|Bn-M_R00000NkvXXu0mjfsDKLh literal 0 HcmV?d00001 diff --git a/resources/buttons/copyDark.svg b/resources/buttons/copyDark.svg new file mode 100644 index 00000000..ed30f70a --- /dev/null +++ b/resources/buttons/copyDark.svg @@ -0,0 +1,13 @@ + + + + + + + diff --git a/resources/buttons/copyLight.png b/resources/buttons/copyLight.png new file mode 100644 index 0000000000000000000000000000000000000000..a0b633eec4f5420f4d98abba1a4f73ae312b87a2 GIT binary patch literal 1004 zcmVVF8Ju_s_LGq zue*9?VRm#ROxD4D3fKaS7ehx&ExSf%Uu(J}U&ta`w(o?JI$6iL|B)98RfAp~#-^i$U2W)FdVZQeA5fHvds&AkMM z+rV+aK0|!|!TOj8;Mw95#&{mM2#mQL>gZx3K+EGO9PR+iHOCNpN(3;kJ-{3=!A=vB z8Uf6CBk&m5%1&L0i2&aj;L33oln;OdE@Oz!94dP;XbRw|`y2REw3pD%0x`;B1a%$Q z0GtLw2!#88Aptvqdquz8+=XJctc&8N- z?tS>8#53)PaF2PDo#4FEx{%1R+#0=n*1&8FF~=3)9KdU@#6-aQB1%4arhzX-zfN-k zgKq+SygOwKT4|Lfn{&b%O1_Is055?Kz#l(++ha+XvgqX+!$(#EPC`k5B>g0STlFfi zANUM>0{G*nRf&lJCb|Q73%mvl`F2~rX5XcQx=VN-bh{w)yydWJ`+ZE<@CgwLM9h>#LUAf50K^A1or%O#)?l)O2YfU<YM` a(d8fNrTT57zW%-d0000 + + + + + + diff --git a/resources/resources_autogenerated.qrc b/resources/resources_autogenerated.qrc index 3b86592c..d8cb2b59 100644 --- a/resources/resources_autogenerated.qrc +++ b/resources/resources_autogenerated.qrc @@ -1,79 +1,87 @@ - chatterino.icns - contributors.txt - emoji.json + icon.png emojidata.txt + chatterino.desktop error.png - icon.ico - icon.png - pajaDank.png + .gitignore tlds.txt - avatars/fourtf.png - avatars/pajlada.png - buttons/addSplit.png - buttons/addSplitDark.png - buttons/ban.png - buttons/banRed.png - buttons/emote.svg - buttons/emoteDark.svg - buttons/menuDark.png - buttons/menuLight.png + Makefile + contributors.txt + pajaDank.png + chatterino.icns + icon.ico + emoji.json buttons/mod.png + buttons/copyDark.svg buttons/modModeDisabled.png - buttons/modModeDisabled2.png - buttons/modModeEnabled.png - buttons/modModeEnabled2.png + buttons/unmod.png + buttons/addSplitDark.png buttons/timeout.png buttons/trashCan.png - buttons/unban.png - buttons/unmod.png + buttons/trashcan.svg + buttons/modModeEnabled.png + buttons/copyLight.svg + buttons/modModeEnabled2.png + buttons/banRed.png + buttons/ban.png + buttons/emoteDark.svg + buttons/menuLight.png + buttons/emote.svg buttons/update.png + buttons/addSplit.png + buttons/menuDark.png buttons/updateError.png + buttons/unban.png + buttons/copyLight.png + buttons/modModeDisabled2.png + buttons/copyDark.png examples/moving.gif examples/splitting.gif - licenses/boost_boost.txt - licenses/emoji-data-source.txt - licenses/fmt_bsd2.txt - licenses/libcommuni_BSD3.txt - licenses/openssl.txt - licenses/pajlada_settings.txt - licenses/pajlada_signals.txt + twitch/prime.png + twitch/vip.png + twitch/cheer1.png + twitch/admin.png + twitch/broadcaster.png + twitch/verified.png + twitch/moderator.png + twitch/globalmod.png + twitch/automod.png + twitch/subscriber.png + twitch/staff.png + twitch/turbo.png licenses/qt_lgpl-3.0.txt + licenses/emoji-data-source.txt + licenses/pajlada_settings.txt + licenses/openssl.txt + licenses/pajlada_signals.txt licenses/rapidjson.txt + licenses/libcommuni_BSD3.txt + licenses/boost_boost.txt licenses/websocketpp.txt - qss/settings.qss - settings/about.svg + licenses/fmt_bsd2.txt settings/aboutlogo.png - settings/accounts.svg - settings/advanced.svg - settings/behave.svg - settings/browser.svg - settings/commands.svg - settings/emote.svg - settings/externaltools.svg settings/ignore.svg + settings/notification2.svg + settings/theme.svg + settings/externaltools.svg + settings/advanced.svg + settings/about.svg + settings/notifications.svg + settings/behave.svg + settings/accounts.svg + settings/emote.svg + settings/commands.svg settings/keybinds.svg settings/moderation.svg - settings/notification2.svg - settings/notifications.svg - settings/theme.svg + settings/browser.svg + avatars/pajlada.png + avatars/fourtf.png + qss/settings.qss sounds/ping2.wav - split/down.png split/left.png split/move.png split/right.png + split/down.png split/up.png - twitch/admin.png - twitch/automod.png - twitch/broadcaster.png - twitch/cheer1.png - twitch/globalmod.png - twitch/moderator.png - twitch/prime.png - twitch/staff.png - twitch/subscriber.png - twitch/turbo.png - twitch/verified.png - twitch/vip.png - + \ No newline at end of file diff --git a/src/autogenerated/ResourcesAutogen.cpp b/src/autogenerated/ResourcesAutogen.cpp index d77d620d..8075ca02 100644 --- a/src/autogenerated/ResourcesAutogen.cpp +++ b/src/autogenerated/ResourcesAutogen.cpp @@ -10,6 +10,8 @@ Resources2::Resources2() this->buttons.addSplitDark = QPixmap(":/buttons/addSplitDark.png"); this->buttons.ban = QPixmap(":/buttons/ban.png"); this->buttons.banRed = QPixmap(":/buttons/banRed.png"); + this->buttons.copyDark = QPixmap(":/buttons/copyDark.png"); + this->buttons.copyLight = QPixmap(":/buttons/copyLight.png"); this->buttons.menuDark = QPixmap(":/buttons/menuDark.png"); this->buttons.menuLight = QPixmap(":/buttons/menuLight.png"); this->buttons.mod = QPixmap(":/buttons/mod.png"); @@ -46,4 +48,4 @@ Resources2::Resources2() this->twitch.vip = QPixmap(":/twitch/vip.png"); } -} // namespace chatterino +} // namespace chatterino \ No newline at end of file diff --git a/src/autogenerated/ResourcesAutogen.hpp b/src/autogenerated/ResourcesAutogen.hpp index 214bbdad..467cbed9 100644 --- a/src/autogenerated/ResourcesAutogen.hpp +++ b/src/autogenerated/ResourcesAutogen.hpp @@ -17,6 +17,8 @@ public: QPixmap addSplitDark; QPixmap ban; QPixmap banRed; + QPixmap copyDark; + QPixmap copyLight; QPixmap menuDark; QPixmap menuLight; QPixmap mod; @@ -60,4 +62,4 @@ public: } twitch; }; -} // namespace chatterino +} // namespace chatterino \ No newline at end of file diff --git a/src/widgets/dialogs/UserInfoPopup.cpp b/src/widgets/dialogs/UserInfoPopup.cpp index 34008b43..b4b4ff93 100644 --- a/src/widgets/dialogs/UserInfoPopup.cpp +++ b/src/widgets/dialogs/UserInfoPopup.cpp @@ -62,10 +62,11 @@ UserInfoPopup::UserInfoPopup() name_box.withoutMargin(); auto name = name_box.emplace