diff --git a/src/widgets/dialogs/SettingsDialog.cpp b/src/widgets/dialogs/SettingsDialog.cpp index 48a987a7d..c8da017fe 100644 --- a/src/widgets/dialogs/SettingsDialog.cpp +++ b/src/widgets/dialogs/SettingsDialog.cpp @@ -82,8 +82,8 @@ void SettingsDialog::addTabs() this->ui_.tabContainer->addSpacing(16); - this->addTab(new AppearancePage); - this->addTab(new BehaviourPage); + this->addTab(new LookPage); + this->addTab(new FeelPage); this->ui_.tabContainer->addSpacing(16); diff --git a/src/widgets/settingspages/FeelPage.cpp b/src/widgets/settingspages/FeelPage.cpp index 8e961629d..0cae12edd 100644 --- a/src/widgets/settingspages/FeelPage.cpp +++ b/src/widgets/settingspages/FeelPage.cpp @@ -21,11 +21,11 @@ namespace chatterino { -BehaviourPage::BehaviourPage() +FeelPage::FeelPage() : SettingsPage("Feel", ":/images/behave.svg") { auto app = getApp(); - LayoutCreator layoutCreator(this); + LayoutCreator layoutCreator(this); auto layout = layoutCreator.setLayoutType(); @@ -113,7 +113,7 @@ BehaviourPage::BehaviourPage() layout->addStretch(1); } -QSlider *BehaviourPage::createMouseScrollSlider() +QSlider *FeelPage::createMouseScrollSlider() { auto app = getApp(); auto slider = new QSlider(Qt::Horizontal); diff --git a/src/widgets/settingspages/FeelPage.hpp b/src/widgets/settingspages/FeelPage.hpp index 6e95acbba..362248e64 100644 --- a/src/widgets/settingspages/FeelPage.hpp +++ b/src/widgets/settingspages/FeelPage.hpp @@ -6,10 +6,10 @@ namespace chatterino { -class BehaviourPage : public SettingsPage +class FeelPage : public SettingsPage { public: - BehaviourPage(); + FeelPage(); private: QSlider *createMouseScrollSlider(); diff --git a/src/widgets/settingspages/LookPage.cpp b/src/widgets/settingspages/LookPage.cpp index 1611654f5..cc606766a 100644 --- a/src/widgets/settingspages/LookPage.cpp +++ b/src/widgets/settingspages/LookPage.cpp @@ -30,10 +30,10 @@ namespace chatterino { -AppearancePage::AppearancePage() +LookPage::LookPage() : SettingsPage("Look", ":/images/theme.svg") { - LayoutCreator layoutCreator(this); + LayoutCreator layoutCreator(this); auto xd = layoutCreator.emplace().withoutMargin(); @@ -59,7 +59,7 @@ AppearancePage::AppearancePage() layout.addStretch(1); } -void AppearancePage::addApplicationGroup(QVBoxLayout &layout) +void LookPage::addApplicationGroup(QVBoxLayout &layout) { auto box = LayoutCreator(&layout) .emplace("Application") @@ -97,7 +97,7 @@ void AppearancePage::addApplicationGroup(QVBoxLayout &layout) "", this->createCheckBox(SCROLL_NEWMSG, getSettings()->enableSmoothScrollingNewMessages)); } -void AppearancePage::addMessagesGroup(QVBoxLayout &layout) +void LookPage::addMessagesGroup(QVBoxLayout &layout) { auto box = LayoutCreator(&layout).emplace("Messages").emplace(); @@ -147,7 +147,7 @@ void AppearancePage::addMessagesGroup(QVBoxLayout &layout) getSettings()->alternateMessageBackground)); } -void AppearancePage::addEmotesGroup(QVBoxLayout &layout) +void LookPage::addEmotesGroup(QVBoxLayout &layout) { auto box = LayoutCreator(&layout) .emplace("Emotes") @@ -205,7 +205,7 @@ void AppearancePage::addEmotesGroup(QVBoxLayout &layout) } } -ChannelPtr AppearancePage::createPreviewChannel() +ChannelPtr LookPage::createPreviewChannel() { auto channel = ChannelPtr(new Channel("preview", Channel::Misc)); @@ -235,7 +235,7 @@ ChannelPtr AppearancePage::createPreviewChannel() return channel; } -QLayout *AppearancePage::createThemeColorChanger() +QLayout *LookPage::createThemeColorChanger() { auto app = getApp(); QHBoxLayout *layout = new QHBoxLayout; @@ -274,7 +274,7 @@ QLayout *AppearancePage::createThemeColorChanger() return layout; } -QLayout *AppearancePage::createFontChanger() +QLayout *LookPage::createFontChanger() { auto app = getApp(); @@ -314,7 +314,7 @@ QLayout *AppearancePage::createFontChanger() return layout; } -QLayout *AppearancePage::createUiScaleSlider() +QLayout *LookPage::createUiScaleSlider() { auto layout = new QHBoxLayout(); auto slider = new QSlider(Qt::Horizontal); diff --git a/src/widgets/settingspages/LookPage.hpp b/src/widgets/settingspages/LookPage.hpp index ca7ea1102..f412d6437 100644 --- a/src/widgets/settingspages/LookPage.hpp +++ b/src/widgets/settingspages/LookPage.hpp @@ -10,10 +10,10 @@ class QVBoxLayout; namespace chatterino { -class AppearancePage : public SettingsPage +class LookPage : public SettingsPage { public: - AppearancePage(); + LookPage(); void addApplicationGroup(QVBoxLayout &layout); void addMessagesGroup(QVBoxLayout &layout);