From bb840da98835265ba0d39c5b2e244cdc2425e0ce Mon Sep 17 00:00:00 2001 From: apa420 Date: Wed, 23 Jan 2019 17:52:53 +0100 Subject: [PATCH] Moved turbo badge to vanity --- src/providers/twitch/TwitchMessageBuilder.cpp | 14 +++++++------- src/widgets/settingspages/GeneralPage.cpp | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/providers/twitch/TwitchMessageBuilder.cpp b/src/providers/twitch/TwitchMessageBuilder.cpp index cf0423ff8..b8c34cc65 100644 --- a/src/providers/twitch/TwitchMessageBuilder.cpp +++ b/src/providers/twitch/TwitchMessageBuilder.cpp @@ -1123,13 +1123,6 @@ void TwitchMessageBuilder::appendTwitchBadges() MessageElementFlag::BadgeChannelAuthority) ->setTooltip("Twitch Channel Moderator"); } - else if (badge == "turbo/1") - { - this->emplace( - Image::fromPixmap(app->resources->twitch.turbo), - MessageElementFlag::BadgeGlobalAuthority) - ->setTooltip("Twitch Turbo Subscriber"); - } else if (badge == "broadcaster/1") { this->emplace( @@ -1137,6 +1130,13 @@ void TwitchMessageBuilder::appendTwitchBadges() MessageElementFlag::BadgeChannelAuthority) ->setTooltip("Twitch Broadcaster"); } + else if (badge == "turbo/1") + { + this->emplace( + Image::fromPixmap(app->resources->twitch.turbo), + MessageElementFlag::BadgeVanity) + ->setTooltip("Twitch Turbo Subscriber"); + } else if (badge == "premium/1") { this->emplace( diff --git a/src/widgets/settingspages/GeneralPage.cpp b/src/widgets/settingspages/GeneralPage.cpp index f370765e4..f02d750b8 100644 --- a/src/widgets/settingspages/GeneralPage.cpp +++ b/src/widgets/settingspages/GeneralPage.cpp @@ -230,7 +230,7 @@ void GeneralPage::initLayout(SettingsLayout &layout) s.emojiSet); layout.addTitle("Badges"); - layout.addCheckbox("Show authority badges (staff, admin, turbo, etc)", + layout.addCheckbox("Show authority badges (staff, admin)", getSettings()->showBadgesGlobalAuthority); layout.addCheckbox("Show channel badges (broadcaster, moderator)", getSettings()->showBadgesChannelAuthority);