added qt version number to about tab

This commit is contained in:
fourtf 2018-08-09 06:22:55 +02:00
parent 94813fe3df
commit e1f180ac28
12 changed files with 57 additions and 11 deletions

View file

@ -250,7 +250,8 @@ SOURCES += \
src/util/FormatTime.cpp \ src/util/FormatTime.cpp \
src/util/FunctionEventFilter.cpp \ src/util/FunctionEventFilter.cpp \
src/widgets/helper/EffectLabel.cpp \ src/widgets/helper/EffectLabel.cpp \
src/widgets/helper/Button.cpp src/widgets/helper/Button.cpp \
src/messages/MessageContainer.cpp
HEADERS += \ HEADERS += \
src/Application.hpp \ src/Application.hpp \
@ -449,7 +450,8 @@ HEADERS += \
src/util/FunctionEventFilter.hpp \ src/util/FunctionEventFilter.hpp \
src/widgets/helper/EffectLabel.hpp \ src/widgets/helper/EffectLabel.hpp \
src/util/LayoutHelper.hpp \ src/util/LayoutHelper.hpp \
src/widgets/helper/Button.hpp src/widgets/helper/Button.hpp \
src/messages/MessageContainer.hpp
RESOURCES += \ RESOURCES += \
resources/resources.qrc \ resources/resources.qrc \

View file

@ -0,0 +1,12 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Generator: Adobe Illustrator 21.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
viewBox="0 0 100 100" style="enable-background:new 0 0 100 100;" xml:space="preserve">
<style type="text/css">
.st0{fill:#FFFFFF;}
</style>
<path class="st0" d="M50,100c27.7,0,50-22.3,50-50S77.7,0,50,0S0,22.3,0,50S22.3,100,50,100z M33.3,46.2c4.2,0,8.3-3.3,8.3-8.3
s-4.2-8.3-8.3-8.3S25,32.9,25,37.9S29.2,46.2,33.3,46.2z M50,91.7C27,91.7,8.3,73,8.3,50S27,8.3,50,8.3S91.7,27,91.7,50
S73,91.7,50,91.7z M23.3,63.1c16.2,10.3,37.1,10.4,53.2,0.1l-4.3-7c-13.7,8.5-31,8.4-44.5-0.1L23.3,63.1z M67.1,46.2
c4.2,0,8.3-3.3,8.3-8.3s-4.2-8.3-8.3-8.3s-8.3,3.3-8.3,8.3S62.9,46.2,67.1,46.2z"/>
</svg>

After

Width:  |  Height:  |  Size: 847 B

View file

@ -0,0 +1,9 @@
#include "MessageContainer.hpp"
namespace chatterino {
MessageContainer::MessageContainer()
{
}
} // namespace chatterino

View file

@ -0,0 +1,13 @@
#pragma once
#include <deque>
namespace chatterino {
class MessageContainer
{
public:
MessageContainer();
};
} // namespace chatterino

View file

@ -104,8 +104,6 @@ void BaseWindow::init()
QSizePolicy policy(QSizePolicy::Ignored, QSizePolicy policy(QSizePolicy::Ignored,
QSizePolicy::Preferred); QSizePolicy::Preferred);
policy.setHorizontalStretch(1); policy.setHorizontalStretch(1);
// title->setBaseSize(0, 0);
// title->setScaledContents(true);
title->setSizePolicy(policy); title->setSizePolicy(policy);
buttonLayout->addWidget(title); buttonLayout->addWidget(title);
this->ui_.titleLabel = title; this->ui_.titleLabel = title;

View file

@ -17,7 +17,7 @@
namespace chatterino { namespace chatterino {
AboutPage::AboutPage() AboutPage::AboutPage()
: SettingsPage("About", ":/images/about.svg") : SettingsPage("About", ":/settings/about.svg")
{ {
LayoutCreator<AboutPage> layoutCreator(this); LayoutCreator<AboutPage> layoutCreator(this);
@ -179,6 +179,18 @@ AboutPage::AboutPage()
} }
} }
auto buildInfo = QStringList();
buildInfo += "Qt " QT_VERSION_STR;
#ifdef USEWINSDK
buildInfo += "Windows SDK";
#endif
#ifdef _MSC_FULL_VER
buildInfo += "MSVC " + QString::number(_MSC_FULL_VER, 10);
#endif
auto buildText = QString("Built with " + buildInfo.join(", "));
layout.emplace<QLabel>(buildText);
layout->addStretch(1); layout->addStretch(1);
} }

View file

@ -17,7 +17,7 @@
namespace chatterino { namespace chatterino {
AccountsPage::AccountsPage() AccountsPage::AccountsPage()
: SettingsPage("Accounts", ":/images/accounts.svg") : SettingsPage("Accounts", ":/settings/accounts.svg")
{ {
auto *app = getApp(); auto *app = getApp();

View file

@ -27,7 +27,7 @@
namespace chatterino { namespace chatterino {
CommandPage::CommandPage() CommandPage::CommandPage()
: SettingsPage("Commands", ":/images/commands.svg") : SettingsPage("Commands", ":/settings/commands.svg")
{ {
auto app = getApp(); auto app = getApp();

View file

@ -5,7 +5,7 @@
namespace chatterino { namespace chatterino {
EmotesPage::EmotesPage() EmotesPage::EmotesPage()
: SettingsPage("Emotes", ":/images/emote.svg") : SettingsPage("Emotes", ":/settings/emote.svg")
{ {
// SettingManager &settings = SettingManager::getInstance(); // SettingManager &settings = SettingManager::getInstance();
// LayoutCreator<EmotesPage> layoutCreator(this); // LayoutCreator<EmotesPage> layoutCreator(this);

View file

@ -18,7 +18,7 @@
namespace chatterino { namespace chatterino {
FeelPage::FeelPage() FeelPage::FeelPage()
: SettingsPage("Feel", ":/images/behave.svg") : SettingsPage("Feel", ":/settings/behave.svg")
{ {
auto app = getApp(); auto app = getApp();
LayoutCreator<FeelPage> layoutCreator(this); LayoutCreator<FeelPage> layoutCreator(this);

View file

@ -30,7 +30,7 @@
namespace chatterino { namespace chatterino {
HighlightingPage::HighlightingPage() HighlightingPage::HighlightingPage()
: SettingsPage("Highlights", ":/images/notifications.svg") : SettingsPage("Highlights", ":/settings/notifications.svg")
{ {
auto app = getApp(); auto app = getApp();
LayoutCreator<HighlightingPage> layoutCreator(this); LayoutCreator<HighlightingPage> layoutCreator(this);

View file

@ -37,7 +37,7 @@
namespace chatterino { namespace chatterino {
LookPage::LookPage() LookPage::LookPage()
: SettingsPage("Look", ":/images/theme.svg") : SettingsPage("Look", ":/settings/theme.svg")
{ {
this->initializeUi(); this->initializeUi();
} }