chatterino2
Code Issues

removed that pile of garbage IrcManager

Browse Source
This commit is contained in:
fourtf
2018-06-28 19:54:40 +02:00
parent 8ced5a1e25
commit 848bbc71aa
11 changed files with 15 additions and 183 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/widgets/Window.cpp
+4 -5
View File
@@ -4,7 +4,6 @@
#include "common/Version.hpp"
#include "controllers/accounts/AccountController.hpp"
#include "providers/twitch/TwitchServer.hpp"
#include "singletons/IrcManager.hpp"
#include "singletons/Settings.hpp"
#include "singletons/Themes.hpp"
#include "singletons/WindowManager.hpp"
@@ -100,16 +99,16 @@ Window::Window(WindowType _type)
auto s = new QShortcut(QKeySequence::ZoomIn, this);
s->setContext(Qt::WindowShortcut);
QObject::connect(s, &QShortcut::activated, this, [] {
getApp()->settings->uiScale.setValue(WindowManager::clampUiScale(
getApp()->settings->uiScale.getValue() + 1));
getApp()->settings->uiScale.setValue(
WindowManager::clampUiScale(getApp()->settings->uiScale.getValue() + 1));
});
}
{
auto s = new QShortcut(QKeySequence::ZoomOut, this);
s->setContext(Qt::WindowShortcut);
QObject::connect(s, &QShortcut::activated, this, [] {
getApp()->settings->uiScale.setValue(WindowManager::clampUiScale(
getApp()->settings->uiScale.getValue() - 1));
getApp()->settings->uiScale.setValue(
WindowManager::clampUiScale(getApp()->settings->uiScale.getValue() - 1));
});
}
src/widgets/splits/SplitInput.cpp
+2 -5
View File
@@ -5,7 +5,6 @@
#include "controllers/commands/CommandController.hpp"
#include "providers/twitch/TwitchChannel.hpp"
#include "providers/twitch/TwitchServer.hpp"
#include "singletons/IrcManager.hpp"
#include "singletons/Settings.hpp"
#include "singletons/Themes.hpp"
#include "util/LayoutCreator.hpp"
@@ -66,12 +65,10 @@ void SplitInput::initLayout()
// ---- misc
// set edit font
this->ui_.textEdit->setFont(
app->fonts->getFont(Fonts::Type::ChatMedium, this->getScale()));
this->ui_.textEdit->setFont(app->fonts->getFont(Fonts::Type::ChatMedium, this->getScale()));
this->managedConnections_.push_back(app->fonts->fontChanged.connect([=]() {
this->ui_.textEdit->setFont(
app->fonts->getFont(Fonts::Type::ChatMedium, this->getScale()));
this->ui_.textEdit->setFont(app->fonts->getFont(Fonts::Type::ChatMedium, this->getScale()));
}));
// open emote popup