added emote loading

2017-01-13 18:59:11 +01:00
parent 0fbc40a52a
commit 4dbe2b0254
18 changed files with 402 additions and 181 deletions
@@ -1,16 +1,19 @@
-#include "mainwindow.h"
 #include "colorscheme.h"
-#include "ircmanager.h"
 #include "emojis.h"
+#include "ircmanager.h"
+#include "mainwindow.h"
+#include "resources.h"

 #include <QApplication>
 #include <QClipboard>

-int main(int argc, char *argv[])
+int
+main(int argc, char *argv[])
 {
    QApplication a(argc, argv);

-    Emojis::initEmojis();
+    Resources::load();
+    Emojis::loadEmojis();

    ColorScheme::instance().setColors(0, -0.8);