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

fixed icons in settings pages

Browse source
This commit is contained in:
fourtf 2018-01-13 00:18:18 +01:00
parent 2f0658935a
commit d16bbf6899
4 changed files with 12 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/widgets/settingsdialog.cpp
View file

@ -88,7 +88,7 @@ void SettingsDialog::addTabs()
void SettingsDialog::addTab(settingspages::SettingsPage *page, Qt::Alignment alignment)
{
auto tab = new SettingsDialogTab(this, page, "xD");
auto tab = new SettingsDialogTab(this, page, page->getIconResource());
this->ui.pageStack->addWidget(page);
this->ui.tabContainer->addWidget(tab, 0, alignment);

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

@ -17,7 +17,7 @@ namespace chatterino {
namespace widgets {
namespace settingspages {
BehaviourPage::BehaviourPage()
: SettingsPage("Behaviour", nullptr)
: SettingsPage("Behaviour", ":/images/behave.svg")
{
singletons::SettingManager &settings = singletons::SettingManager::getInstance();
util::LayoutCreator<BehaviourPage> layoutCreator(this);

9
src/widgets/settingspages/settingspage.cpp
View file

@ -6,9 +6,9 @@ namespace chatterino {
namespace widgets {
namespace settingspages {
SettingsPage::SettingsPage(const QString &_name, const QString &_resourceName)
SettingsPage::SettingsPage(const QString &_name, const QString &_iconResource)
: name(_name)
, resourceName(_resourceName)
, iconResource(_iconResource)
{
}
@ -17,6 +17,11 @@ const QString &SettingsPage::getName()
return this->name;
}
const QString &SettingsPage::getIconResource()
{
return this->iconResource;
}
void SettingsPage::cancel()
{
this->onCancel.invoke();

5
src/widgets/settingspages/settingspage.hpp
View file

@ -14,9 +14,10 @@ namespace settingspages {
class SettingsPage : public QWidget
{
public:
SettingsPage(const QString &name, const QString &resourceName);
SettingsPage(const QString &name, const QString &iconResource);
const QString &getName();
const QString &getIconResource();
void cancel();
@ -27,7 +28,7 @@ public:
protected:
QString name;
QString resourceName;
QString iconResource;
pajlada::Signals::NoArgSignal onCancel;
std::vector<pajlada::Signals::ScopedConnection> managedConnections;