From 0987b82fa87d3a4f2c9150a0450c2bd3392f2080 Mon Sep 17 00:00:00 2001
From: James Turner <zakalawe@mac.com>
Date: Sun, 24 Jun 2018 11:15:01 +0100
Subject: [PATCH] Launcher styling tweaks

---
 src/GUI/qml/AddButton.qml              | 1 +
 src/GUI/qml/AdvancedSettingsToggle.qml | 1 +
 src/GUI/qml/DoubleSpinbox.qml          | 1 +
 src/GUI/qml/IntegerSpinbox.qml         | 1 +
 src/GUI/qml/LineEdit.qml               | 2 +-
 src/GUI/qml/LocationAirportView.qml    | 9 +++++----
 src/GUI/qml/LocationNavaidView.qml     | 4 ++--
 src/GUI/qml/SidebarButton.qml          | 1 +
 src/GUI/qml/TabButton.qml              | 2 +-
 9 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/src/GUI/qml/AddButton.qml b/src/GUI/qml/AddButton.qml
index e9e86804a..de488d745 100644
--- a/src/GUI/qml/AddButton.qml
+++ b/src/GUI/qml/AddButton.qml
@@ -22,6 +22,7 @@ Rectangle {
             leftMargin: Style.margin
             verticalCenter: parent.verticalCenter
         }
+        font.pixelSize: Style.baseFontPixelSize
     }
 
     Image {
diff --git a/src/GUI/qml/AdvancedSettingsToggle.qml b/src/GUI/qml/AdvancedSettingsToggle.qml
index e0fb17399..e326144a9 100644
--- a/src/GUI/qml/AdvancedSettingsToggle.qml
+++ b/src/GUI/qml/AdvancedSettingsToggle.qml
@@ -34,6 +34,7 @@ Item {
         anchors.verticalCenter: parent.verticalCenter
         color: "white"
         font.underline: mouse.containsMouse
+        font.pixelSize: Style.baseFontPixelSize
     }
 
 
diff --git a/src/GUI/qml/DoubleSpinbox.qml b/src/GUI/qml/DoubleSpinbox.qml
index 268704b7d..72c68de6f 100644
--- a/src/GUI/qml/DoubleSpinbox.qml
+++ b/src/GUI/qml/DoubleSpinbox.qml
@@ -129,6 +129,7 @@ FocusScope {
             selectByMouse: true
             width: metrics.width
             horizontalAlignment: Text.AlignRight
+            font.pixelSize: Style.baseFontPixelSize
 
             focus: true
             color: enabled ? (activeFocus ? Style.themeColor : Style.baseTextColor) : Style.disabledTextColor
diff --git a/src/GUI/qml/IntegerSpinbox.qml b/src/GUI/qml/IntegerSpinbox.qml
index e550c1d7e..c953dc791 100644
--- a/src/GUI/qml/IntegerSpinbox.qml
+++ b/src/GUI/qml/IntegerSpinbox.qml
@@ -127,6 +127,7 @@ FocusScope {
             selectByMouse: true
             width: metrics.width
             horizontalAlignment: Text.AlignRight
+            font.pixelSize: Style.baseFontPixelSize
 
             focus: true
             color: enabled ? (activeFocus ? Style.themeColor : Style.baseTextColor) : Style.disabledTextColor
diff --git a/src/GUI/qml/LineEdit.qml b/src/GUI/qml/LineEdit.qml
index ce53ea63d..75fdadbb6 100644
--- a/src/GUI/qml/LineEdit.qml
+++ b/src/GUI/qml/LineEdit.qml
@@ -55,7 +55,7 @@ FocusScope {
             selectByMouse: true
             focus: true
             color: enabled ? (activeFocus ? Style.themeColor : Style.baseTextColor) : Style.disabledTextColor
-
+            font.pixelSize: Style.baseFontPixelSize
             StyledText {
                 id: placeholder
                 visible: (edit.text.length == 0) && !edit.activeFocus
diff --git a/src/GUI/qml/LocationAirportView.qml b/src/GUI/qml/LocationAirportView.qml
index 7e40cd666..cf0faa577 100644
--- a/src/GUI/qml/LocationAirportView.qml
+++ b/src/GUI/qml/LocationAirportView.qml
@@ -83,9 +83,10 @@ Item {
             spacing: Style.margin
             width: parent.width
 
-            Text { // heading text
+            StyledText { // heading text
                 id: airportHeading
                 width: parent.width
+                font.pixelSize: Style.headingFontPixelSize
                 text: isHeliport ? qsTr("Heliport: ") + airportData.ident + " / " + airportData.name
                                  : qsTr("Airport: ") + airportData.ident + " / " + airportData.name
             }
@@ -104,7 +105,7 @@ Item {
                     }
                 }
 
-                Text {
+                StyledText {
                     text: isHeliport ? qsTr("Pad") : qsTr("Runway")
                     anchors.verticalCenter: parent.verticalCenter
                 }
@@ -185,7 +186,7 @@ Item {
                     enabled: runwayRadio.selected && onFinalToggle.checked
                 }
 
-                Text {
+                StyledText {
                     text: qsTr(" from the threshold")
                     anchors.verticalCenter: parent.verticalCenter
                 }
@@ -223,7 +224,7 @@ Item {
                     }
                 }
 
-                Text {
+                StyledText {
                     text: qsTr("Parking")
                     anchors.verticalCenter: parent.verticalCenter
                 }
diff --git a/src/GUI/qml/LocationNavaidView.qml b/src/GUI/qml/LocationNavaidView.qml
index e37473b86..2afe7c8c2 100644
--- a/src/GUI/qml/LocationNavaidView.qml
+++ b/src/GUI/qml/LocationNavaidView.qml
@@ -57,11 +57,11 @@ Item {
             spacing: Style.margin
             width: parent.width
 
-            Text { // heading text
+            StyledText { // heading text
                 id: headingText
                 width: parent.width
                 text: "format lat-lon as string!"
-
+                font.pixelSize: Style.headingFontPixelSize
                 Binding {
                     when: navaidData.valid
                     target: headingText
diff --git a/src/GUI/qml/SidebarButton.qml b/src/GUI/qml/SidebarButton.qml
index d51ef35b1..a5bd93730 100644
--- a/src/GUI/qml/SidebarButton.qml
+++ b/src/GUI/qml/SidebarButton.qml
@@ -37,6 +37,7 @@ Item {
         horizontalAlignment: Text.AlignHCenter
         anchors.top: iconImage.bottom
         anchors.topMargin: Style.margin
+        font.pixelSize: Style.baseFontPixelSize
     }
 
     MouseArea {
diff --git a/src/GUI/qml/TabButton.qml b/src/GUI/qml/TabButton.qml
index f09ecb644..5cdf6b159 100644
--- a/src/GUI/qml/TabButton.qml
+++ b/src/GUI/qml/TabButton.qml
@@ -14,7 +14,7 @@ Rectangle {
 
     color: mouse.containsMouse ? "#064989" : (active ? "#1b7ad3" : "white")
 
-    Text {
+    StyledText {
         id: buttonText
         anchors.centerIn: parent
         color: (active | mouse.containsMouse) ? "white" : "#3f3f3f"