From 40f3ee934d88d6d10bfd7bac6c96b6897002fd13 Mon Sep 17 00:00:00 2001
From: Michael Zanetti <michael_zanetti@gmx.net>
Date: Mon, 11 Mar 2019 14:01:23 +0100
Subject: [PATCH] Fix font settings

---
 nymea-app/main.cpp                           | 7 -------
 nymea-app/styles/dark/ApplicationWindow.qml  | 5 +++++
 nymea-app/styles/light/ApplicationWindow.qml | 6 ++++++
 nymea-app/styles/noir/ApplicationWindow.qml  | 3 +++
 nymea-app/ui/Nymea.qml                       | 2 --
 5 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/nymea-app/main.cpp b/nymea-app/main.cpp
index d51b0f8f..ab5cc1ee 100644
--- a/nymea-app/main.cpp
+++ b/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));
diff --git a/nymea-app/styles/dark/ApplicationWindow.qml b/nymea-app/styles/dark/ApplicationWindow.qml
index dd0c657d..a7a3fc46 100644
--- a/nymea-app/styles/dark/ApplicationWindow.qml
+++ b/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"
 
diff --git a/nymea-app/styles/light/ApplicationWindow.qml b/nymea-app/styles/light/ApplicationWindow.qml
index 462925dc..fa022708 100644
--- a/nymea-app/styles/light/ApplicationWindow.qml
+++ b/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"
 
diff --git a/nymea-app/styles/noir/ApplicationWindow.qml b/nymea-app/styles/noir/ApplicationWindow.qml
index e67e8f8d..5a8f9bf0 100644
--- a/nymea-app/styles/noir/ApplicationWindow.qml
+++ b/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
diff --git a/nymea-app/ui/Nymea.qml b/nymea-app/ui/Nymea.qml
index e0250a5f..79a5ecdc 100644
--- a/nymea-app/ui/Nymea.qml
+++ b/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