diff --git a/resources/buttons/copyDark.png b/resources/buttons/copyDark.png new file mode 100644 index 00000000..2a663bfd Binary files /dev/null and b/resources/buttons/copyDark.png differ 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 00000000..a0b633ee Binary files /dev/null and b/resources/buttons/copyLight.png differ diff --git a/resources/buttons/copyLight.svg b/resources/buttons/copyLight.svg new file mode 100644 index 00000000..5fddace4 --- /dev/null +++ b/resources/buttons/copyLight.svg @@ -0,0 +1,13 @@ + + + + + + + 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