A lot of changes

Remove unused constructor of messages::Message
Fixed LimitedQueueSnapshot _-prefixes
Changed LimitedQueueSnapshot's usage of int to std::size_t
ColorScheme is no longer a singleton
Created a "BaseWidget" class which is pretty much a QWidget except it
has a reference of ColorScheme since most widgets will need a reference
to the style they should use.
BaseWidget can be implemented either with a BaseWidget parent (which
will copy the ColorScheme reference from the parent) or with a
normal QWidget parent and an explicit ColorScheme reference.
Save main window geometry on close
Fix font changing in the Settings Dialog
Update settings library version
This commit is contained in:
Rasmus Karlsson
2017-06-26 16:41:20 +02:00
parent c2e67e4b90
commit 7df7da70cb
56 changed files with 933 additions and 650 deletions
+10 -8
View File
@@ -1,5 +1,6 @@
#pragma once
#include "widgets/basewidget.hpp"
#include "widgets/notebookbutton.hpp"
#include "widgets/notebookpage.hpp"
#include "widgets/notebooktab.hpp"
@@ -11,17 +12,18 @@
namespace chatterino {
class ChannelManager;
class ColorScheme;
namespace widgets {
class Notebook : public QWidget
class Notebook : public BaseWidget
{
Q_OBJECT
public:
enum HighlightType { none, highlighted, newMessage };
Notebook(ChannelManager &_channelManager, QWidget *parent);
explicit Notebook(ChannelManager &_channelManager, BaseWidget *parent);
NotebookPage *addPage(bool select = false);
@@ -30,7 +32,7 @@ public:
NotebookPage *getSelectedPage()
{
return _selectedPage;
return selectedPage;
}
void performLayout(bool animate = true);
@@ -51,13 +53,13 @@ public slots:
private:
ChannelManager &channelManager;
QList<NotebookPage *> _pages;
QList<NotebookPage *> pages;
NotebookButton _addButton;
NotebookButton _settingsButton;
NotebookButton _userButton;
NotebookButton addButton;
NotebookButton settingsButton;
NotebookButton userButton;
NotebookPage *_selectedPage;
NotebookPage *selectedPage;
public:
void load(const boost::property_tree::ptree &tree);