renamed Themes to Theme

This commit is contained in:
fourtf
2018-06-28 20:03:04 +02:00
parent c01d1ed732
commit 86347dc63e
29 changed files with 45 additions and 45 deletions
+1 -1
View File
@@ -3,7 +3,7 @@
#include "Application.hpp"
#include "debug/Log.hpp"
#include "singletons/Settings.hpp"
#include "singletons/Themes.hpp"
#include "singletons/Theme.hpp"
#include "widgets/BaseWindow.hpp"
#include <QChildEvent>
+2 -2
View File
@@ -6,7 +6,7 @@
namespace chatterino {
class Themes;
class Theme;
class BaseWindow;
class BaseWidget : public QWidget
@@ -41,7 +41,7 @@ protected:
void setScale(float value);
Themes *themeManager;
Theme *themeManager;
private:
void init();
+1 -1
View File
@@ -2,7 +2,7 @@
#include "Application.hpp"
#include "debug/Log.hpp"
#include "singletons/Themes.hpp"
#include "singletons/Theme.hpp"
#include "singletons/WindowManager.hpp"
#include "widgets/Window.hpp"
#include "widgets/dialogs/SettingsDialog.hpp"
+1 -1
View File
@@ -1,7 +1,7 @@
#include "widgets/Scrollbar.hpp"
#include "Application.hpp"
#include "singletons/Themes.hpp"
#include "singletons/Theme.hpp"
#include "widgets/helper/ChannelView.hpp"
#include <QDebug>
+1 -1
View File
@@ -2,7 +2,7 @@
#include "Application.hpp"
#include "singletons/Fonts.hpp"
#include "singletons/Themes.hpp"
#include "singletons/Theme.hpp"
#include <QDebug>
#include <QDesktopWidget>
+1 -1
View File
@@ -5,7 +5,7 @@
#include "controllers/accounts/AccountController.hpp"
#include "providers/twitch/TwitchServer.hpp"
#include "singletons/Settings.hpp"
#include "singletons/Themes.hpp"
#include "singletons/Theme.hpp"
#include "singletons/WindowManager.hpp"
#include "widgets/AccountSwitchPopupWidget.hpp"
#include "widgets/Notebook.hpp"
+1 -1
View File
@@ -13,7 +13,7 @@
namespace chatterino {
class Themes;
class Theme;
class Window : public BaseWindow
{
+1 -1
View File
@@ -8,7 +8,7 @@
#include "messages/layouts/MessageLayout.hpp"
#include "providers/twitch/TwitchServer.hpp"
#include "singletons/Settings.hpp"
#include "singletons/Themes.hpp"
#include "singletons/Theme.hpp"
#include "singletons/WindowManager.hpp"
#include "util/DistanceBetweenPoints.hpp"
#include "widgets/TooltipWidget.hpp"
+1 -1
View File
@@ -1,6 +1,6 @@
#include "widgets/helper/DropPreview.hpp"
#include "Application.hpp"
#include "singletons/Themes.hpp"
#include "singletons/Theme.hpp"
#include <QDebug>
#include <QPainter>
+1 -1
View File
@@ -1,5 +1,5 @@
#include "widgets/helper/NotebookButton.hpp"
#include "singletons/Themes.hpp"
#include "singletons/Theme.hpp"
#include "widgets/Notebook.hpp"
#include "widgets/helper/RippleEffectButton.hpp"
#include "widgets/splits/SplitContainer.hpp"
+3 -3
View File
@@ -4,7 +4,7 @@
#include "common/Common.hpp"
#include "debug/Log.hpp"
#include "singletons/Settings.hpp"
#include "singletons/Themes.hpp"
#include "singletons/Theme.hpp"
#include "util/Clamp.hpp"
#include "util/Helpers.hpp"
#include "widgets/Notebook.hpp"
@@ -221,8 +221,8 @@ void NotebookTab::paintEvent(QPaintEvent *)
// int fullHeight = (int)(scale * 48);
// select the right tab colors
Themes::TabColors colors;
Themes::TabColors regular = this->themeManager->tabs.regular;
Theme::TabColors colors;
Theme::TabColors regular = this->themeManager->tabs.regular;
if (this->selected_) {
colors = this->themeManager->tabs.selected;
+1 -1
View File
@@ -3,7 +3,7 @@
#include <QDebug>
#include <QPainter>
#include "singletons/Themes.hpp"
#include "singletons/Theme.hpp"
namespace chatterino {
+1 -1
View File
@@ -1,5 +1,5 @@
#include "widgets/helper/RippleEffectLabel.hpp"
#include "singletons/Themes.hpp"
#include "singletons/Theme.hpp"
#include "widgets/splits/SplitHeader.hpp"
#include <QBrush>
+1 -1
View File
@@ -1,5 +1,5 @@
#include "widgets/helper/ScrollbarHighlight.hpp"
#include "singletons/Themes.hpp"
#include "singletons/Theme.hpp"
#include "widgets/Scrollbar.hpp"
namespace chatterino {
+1 -1
View File
@@ -1,6 +1,6 @@
#include "TitlebarButton.hpp"
#include "singletons/Themes.hpp"
#include "singletons/Theme.hpp"
namespace chatterino {
+1 -1
View File
@@ -8,7 +8,7 @@
#include "providers/twitch/TwitchMessageBuilder.hpp"
#include "providers/twitch/TwitchServer.hpp"
#include "singletons/Settings.hpp"
#include "singletons/Themes.hpp"
#include "singletons/Theme.hpp"
#include "singletons/WindowManager.hpp"
#include "util/StreamLink.hpp"
#include "widgets/Window.hpp"
+1 -1
View File
@@ -2,7 +2,7 @@
#include "Application.hpp"
#include "common/Common.hpp"
#include "debug/AssertInGuiThread.hpp"
#include "singletons/Themes.hpp"
#include "singletons/Theme.hpp"
#include "singletons/WindowManager.hpp"
#include "util/Helpers.hpp"
#include "util/LayoutCreator.hpp"
+1 -1
View File
@@ -5,7 +5,7 @@
#include "providers/twitch/TwitchChannel.hpp"
#include "providers/twitch/TwitchServer.hpp"
#include "singletons/Resources.hpp"
#include "singletons/Themes.hpp"
#include "singletons/Theme.hpp"
#include "util/LayoutCreator.hpp"
#include "widgets/Label.hpp"
#include "widgets/TooltipWidget.hpp"
+1 -1
View File
@@ -6,7 +6,7 @@
#include "providers/twitch/TwitchChannel.hpp"
#include "providers/twitch/TwitchServer.hpp"
#include "singletons/Settings.hpp"
#include "singletons/Themes.hpp"
#include "singletons/Theme.hpp"
#include "util/LayoutCreator.hpp"
#include "widgets/Notebook.hpp"
#include "widgets/splits/Split.hpp"