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

2.1.3

Browse source
This commit is contained in:
fourtf 2019-09-02 12:29:18 +02:00
parent e1e953272b
commit dc1c7cb419
3 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/common/Version.hpp
View file

@ -2,7 +2,7 @@
#include <QtGlobal> #include <QtGlobal>
#define CHATTERINO_VERSION "2.1.2" #define CHATTERINO_VERSION "2.1.3"
#if defined(Q_OS_WIN) #if defined(Q_OS_WIN)
# define CHATTERINO_OS "win" # define CHATTERINO_OS "win"

2
src/widgets/Window.cpp
View file

@ -372,6 +372,8 @@ void Window::onAccountSelected()
{ {
auto user = getApp()->accounts->twitch.getCurrent(); auto user = getApp()->accounts->twitch.getCurrent();
#undef CHATTERINO_NIGHTLY_VERSION_STRING
#ifdef CHATTERINO_NIGHTLY_VERSION_STRING #ifdef CHATTERINO_NIGHTLY_VERSION_STRING
auto windowTitleEnd = auto windowTitleEnd =
QString("Chatterino Nightly " CHATTERINO_VERSION QString("Chatterino Nightly " CHATTERINO_VERSION

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

@ -287,15 +287,16 @@ void GeneralPage::initLayout(SettingsLayout &layout)
layout.addCheckbox("Chatterino", getSettings()->showBadgesChatterino); layout.addCheckbox("Chatterino", getSettings()->showBadgesChatterino);
layout.addTitle("Chat title"); layout.addTitle("Chat title");
layout.addWidget(new QLabel("In live channels show:")); layout.addDescription("In live channels show:");
layout.addCheckbox("Uptime", s.headerUptime); layout.addCheckbox("Uptime", s.headerUptime);
layout.addCheckbox("Viewer count", s.headerViewerCount); layout.addCheckbox("Viewer count", s.headerViewerCount);
layout.addCheckbox("Category", s.headerGame); layout.addCheckbox("Category", s.headerGame);
layout.addCheckbox("Title", s.headerStreamTitle); layout.addCheckbox("Title", s.headerStreamTitle);
layout.addTitle("Beta"); layout.addTitle("Beta");
layout.addDescription("You can receive updates earlier by ticking the box " layout.addDescription(
"below. Updates are checked on startup."); "You can receive updates earlier by ticking the box below. Report "
"issues <a href='https://chatterino.com/link/issues'>here</a>.");
layout.addCheckbox("Receive beta updates", s.betaUpdates); layout.addCheckbox("Receive beta updates", s.betaUpdates);
#ifdef Q_OS_WIN #ifdef Q_OS_WIN