Merge branch 'ui-enhancements'

Preparing for 0.6.3 release

1 files changed, 10 insertions, 0 deletions

diff --git a/src/main.cpp b/src/main.cpp

index 591d348a..0c196a33 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -127,6 +127,12 @@ main(int argc, char *argv[])
         parser.addVersionOption();
         parser.process(app);
 
+        QFontDatabase::addApplicationFont(":/fonts/fonts/OpenSans/OpenSans-Regular.ttf");
+        QFontDatabase::addApplicationFont(":/fonts/fonts/OpenSans/OpenSans-Italic.ttf");
+        QFontDatabase::addApplicationFont(":/fonts/fonts/OpenSans/OpenSans-Bold.ttf");
+        QFontDatabase::addApplicationFont(":/fonts/fonts/OpenSans/OpenSans-Semibold.ttf");
+        QFontDatabase::addApplicationFont(":/fonts/fonts/EmojiOne/emojione-android.ttf");
+
         app.setWindowIcon(QIcon(":/logos/nheko.png"));
 
         http::init();
@@ -147,6 +153,10 @@ main(int argc, char *argv[])
         QSettings settings;
 
         QFont font;
+        QString userFontFamily = settings.value("user/font_family", "").toString();
+        if (!userFontFamily.isEmpty()) {
+                font.setFamily(userFontFamily);
+        }
         font.setPointSizeF(settings.value("user/font_size", font.pointSizeF()).toDouble());
 
         app.setFont(font);