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

renamed AppearancePage and BehaviourPage

Browse source
This commit is contained in:
fourtf 2018-07-03 17:39:20 +02:00
parent 78dede21f4
commit cd57b2b518
7 changed files with 12 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
chatterino.pro
View file

@ -192,8 +192,6 @@ SOURCES += \
src/widgets/Scrollbar.cpp \
src/widgets/settingspages/AboutPage.cpp \
src/widgets/settingspages/AccountsPage.cpp \
src/widgets/settingspages/AppearancePage.cpp \
src/widgets/settingspages/BehaviourPage.cpp \
src/widgets/settingspages/BrowserExtensionPage.cpp \
src/widgets/settingspages/CommandPage.cpp \
src/widgets/settingspages/EmotesPage.cpp \
@ -224,7 +222,9 @@ SOURCES += \
src/singletons/Settings.cpp \
src/singletons/Updates.cpp \
src/singletons/Theme.cpp \
src/controllers/moderationactions/ModerationActionModel.cpp
src/controllers/moderationactions/ModerationActionModel.cpp \
src/widgets/settingspages/LookPage.cpp \
src/widgets/settingspages/FeelPage.cpp
HEADERS += \
src/Application.hpp \
@ -358,8 +358,6 @@ HEADERS += \
src/widgets/Scrollbar.hpp \
src/widgets/settingspages/AboutPage.hpp \
src/widgets/settingspages/AccountsPage.hpp \
src/widgets/settingspages/AppearancePage.hpp \
src/widgets/settingspages/BehaviourPage.hpp \
src/widgets/settingspages/BrowserExtensionPage.hpp \
src/widgets/settingspages/CommandPage.hpp \
src/widgets/settingspages/EmotesPage.hpp \
@ -395,7 +393,9 @@ HEADERS += \
src/common/SimpleSignalVector.hpp \
src/common/SignalVector.hpp \
src/common/Singleton.hpp \
src/controllers/moderationactions/ModerationActionModel.hpp
src/controllers/moderationactions/ModerationActionModel.hpp \
src/widgets/settingspages/LookPage.hpp \
src/widgets/settingspages/FeelPage.hpp
RESOURCES += \
resources/resources.qrc \

4
src/widgets/dialogs/SettingsDialog.cpp
View file

@ -5,16 +5,16 @@
#include "widgets/helper/SettingsDialogTab.hpp"
#include "widgets/settingspages/AboutPage.hpp"
#include "widgets/settingspages/AccountsPage.hpp"
#include "widgets/settingspages/AppearancePage.hpp"
#include "widgets/settingspages/BehaviourPage.hpp"
#include "widgets/settingspages/BrowserExtensionPage.hpp"
#include "widgets/settingspages/CommandPage.hpp"
#include "widgets/settingspages/EmotesPage.hpp"
#include "widgets/settingspages/ExternalToolsPage.hpp"
#include "widgets/settingspages/FeelPage.hpp"
#include "widgets/settingspages/HighlightingPage.hpp"
#include "widgets/settingspages/IgnoreusersPage.hpp"
#include "widgets/settingspages/KeyboardSettingsPage.hpp"
#include "widgets/settingspages/LogsPage.hpp"
#include "widgets/settingspages/LookPage.hpp"
#include "widgets/settingspages/ModerationPage.hpp"
#include "widgets/settingspages/SpecialChannelsPage.hpp"

1
src/widgets/helper/SearchPopup.cpp
View file

@ -2,6 +2,7 @@
#include <QHBoxLayout>
#include <QLineEdit>
#include <QPushButton>
#include <QVBoxLayout>
#include "common/Channel.hpp"

2
src/widgets/settingspages/BehaviourPage.cpp → src/widgets/settingspages/FeelPage.cpp
View file

@ -1,4 +1,4 @@
#include "BehaviourPage.hpp"
#include "FeelPage.hpp"
#include "Application.hpp"
#include "util/LayoutCreator.hpp"

0
src/widgets/settingspages/BehaviourPage.hpp → src/widgets/settingspages/FeelPage.hpp
View file

4
src/widgets/settingspages/AppearancePage.cpp → src/widgets/settingspages/LookPage.cpp
View file

@ -1,4 +1,4 @@
#include "AppearancePage.hpp"
#include "LookPage.hpp"
#include "Application.hpp"
#include "singletons/WindowManager.hpp"
@ -164,7 +164,7 @@ void AppearancePage::addEmotesGroup(QVBoxLayout &layout)
*/
box.append(this->createCheckBox("Animated emotes", getSettings()->enableGifAnimations));
auto scaleBox = box.emplace<QHBoxLayout>();
auto scaleBox = box.emplace<QHBoxLayout>().withoutMargin();
{
scaleBox.emplace<QLabel>("Size:");

0
src/widgets/settingspages/AppearancePage.hpp → src/widgets/settingspages/LookPage.hpp
View file