Merge PR #160: Fix font settings

nymea-app/main.cpp

@@ -76,13 +76,6 @@ int main(int argc, char *argv[])
         QFontDatabase::addApplicationFont(fi.absoluteFilePath());
     }
 
-    QFont applicationFont;
-//    applicationFont.setFamily("Oswald");
-    applicationFont.setCapitalization(QFont::MixedCase);
-    applicationFont.setPixelSize(16);
-    applicationFont.setWeight(QFont::Normal);
-    QApplication::setFont(applicationFont);
-
     QTranslator qtTranslator;    
     qtTranslator.load("qt_" + QLocale::system().name(),
             QLibraryInfo::location(QLibraryInfo::TranslationsPath));

nymea-app/styles/dark/ApplicationWindow.qml

@@ -5,6 +5,11 @@ import QtQuick.Controls.Material 2.2
 ApplicationWindow {
     Material.theme: Material.Dark
 
+    font.pixelSize: 16
+    font.weight: Font.Normal
+    font.capitalization: Font.MixedCase
+    font.family: "Ubuntu"
+
     // The system (box) name.
     property string systemName: "nymea"
 

nymea-app/styles/light/ApplicationWindow.qml

@@ -3,6 +3,12 @@ import QtQuick.Templates 2.2
 import QtQuick.Controls.Material 2.2
 
 ApplicationWindow {
+
+    font.pixelSize: 16
+    font.weight: Font.Normal
+    font.capitalization: Font.MixedCase
+    font.family: "Ubuntu"
+
     // The system (box) name.
     property string systemName: "nymea"
 

nymea-app/styles/noir/ApplicationWindow.qml

@@ -9,6 +9,9 @@ ApplicationWindow {
     // Main background color
     Material.background: "#50514f"
 
+    font.pixelSize: 16
+    font.weight: Font.Normal
+    font.capitalization: Font.MixedCase
     font.family: "Oswald"
 
     // The header background color

nymea-app/ui/Nymea.qml

@@ -14,8 +14,6 @@ ApplicationWindow {
     minimumWidth: 360
     minimumHeight: 480
     visibility: ApplicationWindow.AutomaticVisibility
-//    font: Qt.application.font
-
 
     // Those variables must be present in the Style
     title: appName