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

Reformat

Browse source
This commit is contained in:
Rasmus Karlsson 2019-07-28 13:20:22 +02:00
parent 954b1b138a
commit 3679125e2f
3 changed files with 10 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/widgets/Window.cpp
View file

@ -350,7 +350,8 @@ void Window::addMenuBar()
mainMenu->addMenu(menu); mainMenu->addMenu(menu);
QAction *prefs = menu->addAction(QString()); QAction *prefs = menu->addAction(QString());
prefs->setMenuRole(QAction::PreferencesRole); prefs->setMenuRole(QAction::PreferencesRole);
connect(prefs, &QAction::triggered, this, [] { SettingsDialog::showDialog(); }); connect(prefs, &QAction::triggered, this,
[] { SettingsDialog::showDialog(); });
} }
#define UGLYMACROHACK1(s) #s #define UGLYMACROHACK1(s) #s

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

@ -278,11 +278,11 @@ void GeneralPage::initLayout(SettingsLayout &layout)
layout.addCheckbox("Double click links to open", s.linksDoubleClickOnly); layout.addCheckbox("Double click links to open", s.linksDoubleClickOnly);
layout.addCheckbox("Unshorten links", s.unshortLinks); layout.addCheckbox("Unshorten links", s.unshortLinks);
layout.addCheckbox("Show live indicator in tabs", s.showTabLive); layout.addCheckbox("Show live indicator in tabs", s.showTabLive);
layout.addDropdown<int>("Show emote preview in tooltip on hover", layout.addDropdown<int>(
{"Don't show", "Always show", "Hold shift"}, "Show emote preview in tooltip on hover",
s.emotesTooltipPreview, {"Don't show", "Always show", "Hold shift"}, s.emotesTooltipPreview,
[](int index) { return index; }, [](int index) { return index; }, [](auto args) { return args.index; },
[](auto args) { return args.index; }, false); false);
layout.addSpacing(16); layout.addSpacing(16);
layout.addSeperator(); layout.addSeperator();

6
src/widgets/settingspages/LookPage.cpp
View file

@ -331,9 +331,9 @@ void LookPage::addBadgesTab(LayoutCreator<QVBoxLayout> layout)
layout.append(this->createCheckBox( layout.append(this->createCheckBox(
("Show authority badges (staff, admin, turbo, etc)"), ("Show authority badges (staff, admin, turbo, etc)"),
getSettings()->showBadgesGlobalAuthority)); getSettings()->showBadgesGlobalAuthority));
layout.append( layout.append(this->createCheckBox(
this->createCheckBox(("Show channel badges (broadcaster, moderator, VIP)"), ("Show channel badges (broadcaster, moderator, VIP)"),
getSettings()->showBadgesChannelAuthority)); getSettings()->showBadgesChannelAuthority));
layout.append(this->createCheckBox(("Show subscriber badges "), layout.append(this->createCheckBox(("Show subscriber badges "),
getSettings()->showBadgesSubscription)); getSettings()->showBadgesSubscription));
layout.append( layout.append(