noury/mirror-chatterino2
1
0
Fork 0
mirror of https://github.com/Chatterino/chatterino2.git synced 2024-11-21 22:24:07 +01:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #929 from apa420/apa-move-turbo-badge

Browse source 
Moved turbo badge to vanity
This commit is contained in:
pajlada 2019-01-24 11:44:38 +01:00 committed by GitHub
commit 7b51123dad
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/providers/twitch/TwitchMessageBuilder.cpp
View file

@ -1123,13 +1123,6 @@ void TwitchMessageBuilder::appendTwitchBadges()
MessageElementFlag::BadgeChannelAuthority)
->setTooltip("Twitch Channel Moderator");
}
else if (badge == "turbo/1")
{
this->emplace<ImageElement>(
Image::fromPixmap(app->resources->twitch.turbo),
MessageElementFlag::BadgeGlobalAuthority)
->setTooltip("Twitch Turbo Subscriber");
}
else if (badge == "broadcaster/1")
{
this->emplace<ImageElement>(
@ -1137,6 +1130,13 @@ void TwitchMessageBuilder::appendTwitchBadges()
MessageElementFlag::BadgeChannelAuthority)
->setTooltip("Twitch Broadcaster");
}
else if (badge == "turbo/1")
{
this->emplace<ImageElement>(
Image::fromPixmap(app->resources->twitch.turbo),
MessageElementFlag::BadgeVanity)
->setTooltip("Twitch Turbo Subscriber");
}
else if (badge == "premium/1")
{
this->emplace<ImageElement>(

2
src/widgets/settingspages/GeneralPage.cpp
View file

@ -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);