noury/mirror-chatterino2
1
0
Fork 0
mirror of https://github.com/Chatterino/chatterino2.git synced 2024-11-13 19:49:51 +01:00
Code Issues Packages Projects Releases Wiki Activity

Create a copy icon. Change the copy button text to be an icon

Browse source
This commit is contained in:
Mm2PL 2019-08-23 19:44:56 +02:00 committed by fourtf
parent f2f5ae9c93
commit 1c242a51dd
8 changed files with 98 additions and 59 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
resources/buttons/copyDark.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 1.1 KiB

13
resources/buttons/copyDark.svg Normal file
View file

@ -0,0 +1,13 @@
<?xml version="1.0" standalone="no"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 20010904//EN" "http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd">
<!-- Created using Krita: http://krita.org -->
<svg xmlns="http://www.w3.org/2000/svg"
xmlns:xlink="http://www.w3.org/1999/xlink"
xmlns:krita="http://krita.org/namespaces/svg/krita"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
width="368.64pt"
height="368.64pt"
viewBox="0 0 368.64 368.64">
<defs/>
<path id="shape0" transform="translate(0.477297082745412, 59.3121166947556)" fill="#ffffff" fill-rule="evenodd" stroke="#000000" stroke-opacity="0" stroke-width="1" stroke-linecap="square" stroke-linejoin="bevel" d="M42.034 0.254558L43.0522 255.449L43.6262 256.827L44.1855 258.216L44.7441 259.606L45.3161 260.985L45.9154 262.341L46.5562 263.662L47.2523 264.937L48.018 266.154L48.867 267.3L49.8136 268.365L50.8717 269.336L52.0553 270.202L53.3785 270.951L54.8553 271.571L56.4997 272.05L58.3257 272.378L268.973 272.505L269.227 294.397L268.9 295.844L268.498 297.271L268.017 298.668L267.453 300.026L266.799 301.334L266.053 302.584L265.207 303.766L264.259 304.87L263.202 305.887L262.031 306.807L260.742 307.62L259.33 308.318L257.791 308.89L256.118 309.328L13.2689 309.328L11.4859 308.872L9.86178 308.304L8.38902 307.628L7.05996 306.85L5.86701 305.976L4.80256 305.011L3.85899 303.959L3.02871 302.828L2.3041 301.621L1.67756 300.345L1.14149 299.004L0.68828 297.605L0.310317 296.152L0 294.651L0.310203 14.5104L0.847067 13.1388L1.38231 11.7663L1.93671 10.4058L2.53105 9.0706L3.18609 7.77381L3.92263 6.52858L4.76143 5.34805L5.72327 4.24536L6.82893 3.23365L8.09918 2.32608L9.55481 1.53579L11.2166 0.87591L13.1053 0.3596L15.2417 0L42.034 0.254558"/><path id="shape1" transform="translate(61.0200045914134, 1.04007141771575)" fill="#f2f2f2" fill-rule="evenodd" d="M270.415 114.679L270.415 288.287L269.98 289.646L269.61 291.035L269.286 292.446L268.992 293.865L268.712 295.284L268.428 296.691L268.123 298.076L267.781 299.428L267.386 300.735L266.919 301.989L266.364 303.177L265.704 304.288L264.923 305.314L264.003 306.241L262.928 307.061L261.681 307.762L260.244 308.333L258.602 308.764L256.737 309.043L254.632 309.161L16.8749 309.798L14.0545 309.696L11.5994 309.354L9.48192 308.797L7.67441 308.049L6.14912 307.134L4.87835 306.076L3.8344 304.9L2.98956 303.63L2.31611 302.29L1.78637 300.905L1.37262 299.499L1.04715 298.095L0.78226 296.719L0.550247 295.394L0.323402 294.145L0.0740195 292.997L0 16.0599L0.288877 13.6625L0.719498 11.5587L1.28146 9.72701L1.96438 8.14583L2.75785 6.79365L3.65147 5.64893L4.63485 4.69013L5.69758 3.89572L6.82928 3.24416L8.01954 2.7139L9.25797 2.28343L10.5342 1.93118L11.8377 1.63564L13.1583 1.37525L14.4854 1.12849L15.8087 0.87381L17.1178 0.58968L18.4022 0.254558L138.172 0L138.045 97.4959L138.594 99.0696L139.153 100.628L139.731 102.16L140.334 103.656L140.97 105.104L141.646 106.495L142.369 107.817L143.147 109.06L143.987 110.213L144.896 111.266L145.883 112.208L146.954 113.028L148.116 113.716L149.377 114.261L150.744 114.653L152.225 114.88L153.827 114.933L191.897 114.85L249.265 114.725L270.415 114.679"/><path id="shape2" transform="translate(210.201627880834, 1.9091882641311)" fill="#ffffff" fill-rule="evenodd" d="M0.0636396 0L121.743 103.223L14.828 103.478C6.29306 101.355 0.80087 96.9823 0.0636396 89.0955C-0.0212132 88.5863 -0.0212132 58.8879 0.0636396 0Z"/>
</svg>
Side by side

After

Width:  |  Height:  |  Size: 3.3 KiB

BIN
resources/buttons/copyLight.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 1,004 B

13
resources/buttons/copyLight.svg Normal file
View file

@ -0,0 +1,13 @@
<?xml version="1.0" standalone="no"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 20010904//EN" "http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd">
<!-- Created using Krita: http://krita.org -->
<svg xmlns="http://www.w3.org/2000/svg"
xmlns:xlink="http://www.w3.org/1999/xlink"
xmlns:krita="http://krita.org/namespaces/svg/krita"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
width="368.64pt"
height="368.64pt"
viewBox="0 0 368.64 368.64">
<defs/>
<path id="shape0" transform="translate(0.477297082745412, 59.3121166947556)" fill="#000000" fill-rule="evenodd" d="M42.034 0.254558L43.0522 255.449L43.6262 256.827L44.1855 258.216L44.7441 259.606L45.3161 260.985L45.9154 262.341L46.5562 263.662L47.2523 264.937L48.018 266.154L48.867 267.3L49.8136 268.365L50.8717 269.336L52.0553 270.202L53.3785 270.951L54.8553 271.571L56.4997 272.05L58.3257 272.378L268.973 272.505L269.227 294.397L268.9 295.844L268.498 297.271L268.017 298.668L267.453 300.026L266.799 301.334L266.053 302.584L265.207 303.766L264.259 304.87L263.202 305.887L262.031 306.807L260.742 307.62L259.33 308.318L257.791 308.89L256.118 309.328L13.2689 309.328L11.4859 308.872L9.86178 308.304L8.38902 307.628L7.05996 306.85L5.86701 305.976L4.80256 305.011L3.85899 303.959L3.02871 302.828L2.3041 301.621L1.67756 300.345L1.14149 299.004L0.68828 297.605L0.310317 296.152L0 294.651L0.310203 14.5104L0.847067 13.1388L1.38231 11.7663L1.93671 10.4058L2.53105 9.0706L3.18609 7.77381L3.92263 6.52858L4.76143 5.34805L5.72327 4.24536L6.82893 3.23365L8.09918 2.32608L9.55481 1.53579L11.2166 0.87591L13.1053 0.3596L15.2417 0L42.034 0.254558"/><path id="shape1" transform="translate(61.0200045914134, 1.04007141771575)" fill="#000000" fill-rule="evenodd" d="M270.415 114.679L270.415 288.287L269.98 289.646L269.61 291.035L269.286 292.446L268.992 293.865L268.712 295.284L268.428 296.691L268.123 298.076L267.781 299.428L267.386 300.735L266.919 301.989L266.364 303.177L265.704 304.288L264.923 305.314L264.003 306.241L262.928 307.061L261.681 307.762L260.244 308.333L258.602 308.764L256.737 309.043L254.632 309.161L16.8749 309.798L14.0545 309.696L11.5994 309.354L9.48192 308.797L7.67441 308.049L6.14912 307.134L4.87835 306.076L3.8344 304.9L2.98956 303.63L2.31611 302.29L1.78637 300.905L1.37262 299.499L1.04715 298.095L0.78226 296.719L0.550247 295.394L0.323402 294.145L0.0740195 292.997L0 16.0599L0.288877 13.6625L0.719498 11.5587L1.28146 9.72701L1.96438 8.14583L2.75785 6.79365L3.65147 5.64893L4.63485 4.69013L5.69758 3.89572L6.82928 3.24416L8.01954 2.7139L9.25797 2.28343L10.5342 1.93118L11.8377 1.63564L13.1583 1.37525L14.4854 1.12849L15.8087 0.87381L17.1178 0.58968L18.4022 0.254558L138.172 0L138.045 97.4959L138.594 99.0696L139.153 100.628L139.731 102.16L140.334 103.656L140.97 105.104L141.646 106.495L142.369 107.817L143.147 109.06L143.987 110.213L144.896 111.266L145.883 112.208L146.954 113.028L148.116 113.716L149.377 114.261L150.744 114.653L152.225 114.88L153.827 114.933L191.897 114.85L249.265 114.725L270.415 114.679"/><path id="shape2" transform="translate(210.201627880834, 1.9091882641311)" fill="#000000" fill-rule="evenodd" d="M0.0636396 0L121.743 103.223L14.828 103.478C6.29306 101.355 0.80087 96.9823 0.0636396 89.0955C-0.0212132 88.5863 -0.0212132 58.8879 0.0636396 0Z"/>
</svg>
Side by side

After

Width:  |  Height:  |  Size: 3.2 KiB

114
resources/resources_autogenerated.qrc
View file

@ -1,79 +1,87 @@
<RCC> <RCC>
<qresource prefix="/"> <file>chatterino.icns</file> <qresource prefix="/"> <file>icon.png</file>
<file>contributors.txt</file>
<file>emoji.json</file>
<file>emojidata.txt</file> <file>emojidata.txt</file>
<file>chatterino.desktop</file>
<file>error.png</file> <file>error.png</file>
<file>icon.ico</file> <file>.gitignore</file>
<file>icon.png</file>
<file>pajaDank.png</file>
<file>tlds.txt</file> <file>tlds.txt</file>
<file>avatars/fourtf.png</file> <file>Makefile</file>
<file>avatars/pajlada.png</file> <file>contributors.txt</file>
<file>buttons/addSplit.png</file> <file>pajaDank.png</file>
<file>buttons/addSplitDark.png</file> <file>chatterino.icns</file>
<file>buttons/ban.png</file> <file>icon.ico</file>
<file>buttons/banRed.png</file> <file>emoji.json</file>
<file>buttons/emote.svg</file>
<file>buttons/emoteDark.svg</file>
<file>buttons/menuDark.png</file>
<file>buttons/menuLight.png</file>
<file>buttons/mod.png</file> <file>buttons/mod.png</file>
<file>buttons/copyDark.svg</file>
<file>buttons/modModeDisabled.png</file> <file>buttons/modModeDisabled.png</file>
<file>buttons/modModeDisabled2.png</file> <file>buttons/unmod.png</file>
<file>buttons/modModeEnabled.png</file> <file>buttons/addSplitDark.png</file>
<file>buttons/modModeEnabled2.png</file>
<file>buttons/timeout.png</file> <file>buttons/timeout.png</file>
<file>buttons/trashCan.png</file> <file>buttons/trashCan.png</file>
<file>buttons/unban.png</file> <file>buttons/trashcan.svg</file>
<file>buttons/unmod.png</file> <file>buttons/modModeEnabled.png</file>
<file>buttons/copyLight.svg</file>
<file>buttons/modModeEnabled2.png</file>
<file>buttons/banRed.png</file>
<file>buttons/ban.png</file>
<file>buttons/emoteDark.svg</file>
<file>buttons/menuLight.png</file>
<file>buttons/emote.svg</file>
<file>buttons/update.png</file> <file>buttons/update.png</file>
<file>buttons/addSplit.png</file>
<file>buttons/menuDark.png</file>
<file>buttons/updateError.png</file> <file>buttons/updateError.png</file>
<file>buttons/unban.png</file>
<file>buttons/copyLight.png</file>
<file>buttons/modModeDisabled2.png</file>
<file>buttons/copyDark.png</file>
<file>examples/moving.gif</file> <file>examples/moving.gif</file>
<file>examples/splitting.gif</file> <file>examples/splitting.gif</file>
<file>licenses/boost_boost.txt</file> <file>twitch/prime.png</file>
<file>licenses/emoji-data-source.txt</file> <file>twitch/vip.png</file>
<file>licenses/fmt_bsd2.txt</file> <file>twitch/cheer1.png</file>
<file>licenses/libcommuni_BSD3.txt</file> <file>twitch/admin.png</file>
<file>licenses/openssl.txt</file> <file>twitch/broadcaster.png</file>
<file>licenses/pajlada_settings.txt</file> <file>twitch/verified.png</file>
<file>licenses/pajlada_signals.txt</file> <file>twitch/moderator.png</file>
<file>twitch/globalmod.png</file>
<file>twitch/automod.png</file>
<file>twitch/subscriber.png</file>
<file>twitch/staff.png</file>
<file>twitch/turbo.png</file>
<file>licenses/qt_lgpl-3.0.txt</file> <file>licenses/qt_lgpl-3.0.txt</file>
<file>licenses/emoji-data-source.txt</file>
<file>licenses/pajlada_settings.txt</file>
<file>licenses/openssl.txt</file>
<file>licenses/pajlada_signals.txt</file>
<file>licenses/rapidjson.txt</file> <file>licenses/rapidjson.txt</file>
<file>licenses/libcommuni_BSD3.txt</file>
<file>licenses/boost_boost.txt</file>
<file>licenses/websocketpp.txt</file> <file>licenses/websocketpp.txt</file>
<file>qss/settings.qss</file> <file>licenses/fmt_bsd2.txt</file>
<file>settings/about.svg</file>
<file>settings/aboutlogo.png</file> <file>settings/aboutlogo.png</file>
<file>settings/accounts.svg</file>
<file>settings/advanced.svg</file>
<file>settings/behave.svg</file>
<file>settings/browser.svg</file>
<file>settings/commands.svg</file>
<file>settings/emote.svg</file>
<file>settings/externaltools.svg</file>
<file>settings/ignore.svg</file> <file>settings/ignore.svg</file>
<file>settings/notification2.svg</file>
<file>settings/theme.svg</file>
<file>settings/externaltools.svg</file>
<file>settings/advanced.svg</file>
<file>settings/about.svg</file>
<file>settings/notifications.svg</file>
<file>settings/behave.svg</file>
<file>settings/accounts.svg</file>
<file>settings/emote.svg</file>
<file>settings/commands.svg</file>
<file>settings/keybinds.svg</file> <file>settings/keybinds.svg</file>
<file>settings/moderation.svg</file> <file>settings/moderation.svg</file>
<file>settings/notification2.svg</file> <file>settings/browser.svg</file>
<file>settings/notifications.svg</file> <file>avatars/pajlada.png</file>
<file>settings/theme.svg</file> <file>avatars/fourtf.png</file>
<file>qss/settings.qss</file>
<file>sounds/ping2.wav</file> <file>sounds/ping2.wav</file>
<file>split/down.png</file>
<file>split/left.png</file> <file>split/left.png</file>
<file>split/move.png</file> <file>split/move.png</file>
<file>split/right.png</file> <file>split/right.png</file>
<file>split/down.png</file>
<file>split/up.png</file> <file>split/up.png</file>
<file>twitch/admin.png</file>
<file>twitch/automod.png</file>
<file>twitch/broadcaster.png</file>
<file>twitch/cheer1.png</file>
<file>twitch/globalmod.png</file>
<file>twitch/moderator.png</file>
<file>twitch/prime.png</file>
<file>twitch/staff.png</file>
<file>twitch/subscriber.png</file>
<file>twitch/turbo.png</file>
<file>twitch/verified.png</file>
<file>twitch/vip.png</file>
</qresource> </qresource>
</RCC> </RCC>

2
src/autogenerated/ResourcesAutogen.cpp
View file

@ -10,6 +10,8 @@ Resources2::Resources2()
this->buttons.addSplitDark = QPixmap(":/buttons/addSplitDark.png"); this->buttons.addSplitDark = QPixmap(":/buttons/addSplitDark.png");
this->buttons.ban = QPixmap(":/buttons/ban.png"); this->buttons.ban = QPixmap(":/buttons/ban.png");
this->buttons.banRed = QPixmap(":/buttons/banRed.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.menuDark = QPixmap(":/buttons/menuDark.png");
this->buttons.menuLight = QPixmap(":/buttons/menuLight.png"); this->buttons.menuLight = QPixmap(":/buttons/menuLight.png");
this->buttons.mod = QPixmap(":/buttons/mod.png"); this->buttons.mod = QPixmap(":/buttons/mod.png");

2
src/autogenerated/ResourcesAutogen.hpp
View file

@ -17,6 +17,8 @@ public:
QPixmap addSplitDark; QPixmap addSplitDark;
QPixmap ban; QPixmap ban;
QPixmap banRed; QPixmap banRed;
QPixmap copyDark;
QPixmap copyLight;
QPixmap menuDark; QPixmap menuDark;
QPixmap menuLight; QPixmap menuLight;
QPixmap mod; QPixmap mod;

7
src/widgets/dialogs/UserInfoPopup.cpp
View file

@ -62,10 +62,11 @@ UserInfoPopup::UserInfoPopup()
name_box.withoutMargin(); name_box.withoutMargin();
auto name = name_box.emplace<Label>().assign(&this->ui_.nameLabel); auto name = name_box.emplace<Label>().assign(&this->ui_.nameLabel);
LayoutCreator<EffectLabel2> copy_user_name = name_box.emplace<EffectLabel2>(this); LayoutCreator<EffectLabel2> copy_user_name = name_box.emplace<EffectLabel2>(this);
copy_user_name->getLabel().setText("Copy"); copy_user_name->setPixmap(app->resources->buttons.copyDark);
copy_user_name->getLabel().setCentered(true); // TODO(mm2pl): change this when the card get themed.
copy_user_name->setScaleIndependantSize(32, 32);
auto font = name->font(); auto font = name->font();
font.setBold(true); font.setBold(true);