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

minor style changes

Browse source
This commit is contained in:
fourtf 2018-01-29 13:22:22 +01:00
parent 2391ad7d16
commit 0d417dfa2d
5 changed files with 2 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
chatterino.pro
View file

@ -115,7 +115,6 @@ SOURCES += \
src/singletons/emotemanager.cpp \ src/singletons/emotemanager.cpp \
src/messages/messagebuilder.cpp \ src/messages/messagebuilder.cpp \
src/twitch/twitchmessagebuilder.cpp \ src/twitch/twitchmessagebuilder.cpp \
src/widgets/titlebar.cpp \
src/singletons/accountmanager.cpp \ src/singletons/accountmanager.cpp \
src/twitch/twitchuser.cpp \ src/twitch/twitchuser.cpp \
src/ircaccount.cpp \ src/ircaccount.cpp \

6
src/widgets/split.cpp
View file

@ -1,4 +1,5 @@
#include "widgets/split.hpp" #include "widgets/split.hpp"
#include "singletons/channelmanager.hpp" #include "singletons/channelmanager.hpp"
#include "singletons/settingsmanager.hpp" #include "singletons/settingsmanager.hpp"
#include "singletons/thememanager.hpp" #include "singletons/thememanager.hpp"
@ -137,11 +138,6 @@ ChannelPtr Split::getChannel() const
return this->channel; return this->channel;
} }
ChannelPtr &Split::getChannelRef()
{
return this->channel;
}
void Split::setChannel(ChannelPtr _newChannel) void Split::setChannel(ChannelPtr _newChannel)
{ {
this->view.setChannel(_newChannel); this->view.setChannel(_newChannel);

1
src/widgets/split.hpp
View file

@ -56,7 +56,6 @@ public:
const std::string &getUUID() const; const std::string &getUUID() const;
ChannelPtr getChannel() const; ChannelPtr getChannel() const;
ChannelPtr &getChannelRef();
void setFlexSizeX(double x); void setFlexSizeX(double x);
double getFlexSizeX(); double getFlexSizeX();
void setFlexSizeY(double y); void setFlexSizeY(double y);

13
src/widgets/titlebar.cpp
View file

@ -1,13 +0,0 @@
#include "titlebar.hpp"
namespace chatterino {
namespace widgets {
TitleBar::TitleBar(QWidget *parent)
: QWidget(parent)
{
setFixedHeight(32);
}
} // namespace widgets
} // namespace chatterino

9
src/widgets/window.cpp
View file

@ -47,11 +47,6 @@ Window::Window(const QString &windowName, singletons::ThemeManager &_themeManage
QVBoxLayout *layout = new QVBoxLayout(this); QVBoxLayout *layout = new QVBoxLayout(this);
// add titlebar
// if (SettingsManager::getInstance().useCustomWindowFrame.get()) {
// layout->addWidget(&_titleBar);
// }
layout->addWidget(&this->notebook); layout->addWidget(&this->notebook);
this->getLayoutContainer()->setLayout(layout); this->getLayoutContainer()->setLayout(layout);
@ -64,9 +59,7 @@ Window::Window(const QString &windowName, singletons::ThemeManager &_themeManage
/// Initialize program-wide hotkeys /// Initialize program-wide hotkeys
// CTRL+P: Open Settings Dialog // CTRL+P: Open Settings Dialog
CreateWindowShortcut(this, "CTRL+P", [] { CreateWindowShortcut(this, "CTRL+P", [] { SettingsDialog::showDialog(); });
SettingsDialog::showDialog(); //
});
// CTRL+Number: Switch to n'th tab // CTRL+Number: Switch to n'th tab
CreateWindowShortcut(this, "CTRL+1", [this] { this->notebook.selectIndex(0); }); CreateWindowShortcut(this, "CTRL+1", [this] { this->notebook.selectIndex(0); });