Launcher: fix some missing hard-coded styles

src/GUI/qml/AddButton.qml

@@ -16,7 +16,7 @@ Rectangle {
     Text {
         id: label
         text: qsTr("Add")
-        color: Style.backgroundColor
+        color: Style.themeContrastTextColor
 
         anchors {
             left: parent.left

src/GUI/qml/AddCatalogPanel.qml

@@ -7,6 +7,7 @@ Rectangle {
     id: addCatalogPanel
     state: "start"
     height: column.height
+    color: Style.panelBackground
 
     readonly property bool isActive: (state != "start")
     Behavior on height {

src/GUI/qml/AddOns.qml

@@ -63,6 +63,7 @@ Item {
                 border.width: 1
                 border.color: Style.frameColor
                 clip: true
+                color: Style.panelBackground
 
                 Column {
                     id: catalogsColumn
@@ -129,6 +130,7 @@ Item {
                 border.width: 1
                 border.color: Style.frameColor
                 clip: true
+                color: Style.panelBackground
 
                 Column {
                     id: aircraftPathsColumn
@@ -185,6 +187,7 @@ Item {
                 border.width: 1
                 border.color: Style.frameColor
                 clip: true
+                color: Style.panelBackground
 
                 Column {
                     id: addonModulePathsColumn
@@ -252,6 +255,7 @@ Item {
                 border.width: 1
                 border.color: Style.frameColor
                 clip: true
+                color: Style.panelBackground
 
                 Column {
                     id: sceneryPathsColumn

src/GUI/qml/AdvancedSettingsToggle.qml

@@ -1,5 +1,4 @@
 import QtQuick 2.4
-import "."
 
 Item {
     id: root
@@ -32,7 +31,7 @@ Item {
         anchors.right: gearIcon.left
         anchors.rightMargin: Style.margin
         anchors.verticalCenter: parent.verticalCenter
-        color: "white"
+        color: Style.themeContrastTextColor
         font.underline: mouse.containsMouse
         font.pixelSize: Style.baseFontPixelSize
     }

src/GUI/qml/AircraftGridDelegate.qml

@@ -17,7 +17,7 @@ Item {
         height: parent.height - 4
         color: "transparent"
         border.width: 1
-        border.color: "#dfdfdf"
+        border.color: Style.minorFrameColor
     }
 
     MouseArea {
@@ -47,7 +47,7 @@ Item {
             Rectangle {
                 anchors.centerIn: parent
                 border.width: 1
-                border.color: "#7f7f7f"
+                border.color: Style.minorFrameColor
                 width: thumbnail.width
                 height: thumbnail.height
 

src/GUI/qml/AircraftList.qml

@@ -1,7 +1,6 @@
 import QtQuick 2.2
 import FlightGear.Launcher 1.0 as FG
 import FlightGear 1.0
-import "." // -> forces the qmldir to be loaded
 
 FocusScope
 {
@@ -38,6 +37,7 @@ FocusScope
         id: tabBar
         height: searchButton.height + (Style.margin * 2)
         width: parent.width
+        color: Style.backgroundColor
 
         GridToggleButton {
             id: gridModeToggle

src/GUI/qml/Checkbox.qml

@@ -17,13 +17,14 @@ Item {
         anchors.left: parent.left
         anchors.leftMargin: 8
         anchors.verticalCenter: parent.verticalCenter
+        color: Style.panelBackground
 
         Rectangle {
             width: 12
             height: 12
             anchors.centerIn: parent
             id: checkMark
-            color: Style.themeColor
+            color: mouseArea.containsMouse ? Style.activeColor : Style.themeColor
             visible: checked
         }
     }

src/GUI/qml/Launcher.qml

@@ -124,6 +124,16 @@ Item {
         }
     }
 
+    // background fill
+    Rectangle {
+        height: parent.height
+        anchors {
+            left: sidebar.right
+            right: parent.right
+        }
+        color: Style.backgroundColor
+    }
+
     Settings {
         id: settings
 

src/GUI/qml/LineEdit.qml

@@ -53,6 +53,7 @@ FocusScope {
         border.color: root.enabled ? (edit.activeFocus ? Style.frameColor : Style.minorFrameColor) : Style.disabledMinorFrameColor
         border.width: 1
         clip: true
+        color: Style.backgroundColor
         
         TextInput {
             id: edit

src/GUI/qml/Location.qml

@@ -3,7 +3,6 @@ import QtQuick.Controls 2.2
 
 import FlightGear 1.0
 import FlightGear.Launcher 1.0
-import "."
 
 Item {
     id: root
@@ -93,7 +92,7 @@ Item {
 
     Rectangle {
         anchors.fill: parent
-        color: "white"
+        color: Style.backgroundColor
     }
 
     Component {
@@ -102,6 +101,7 @@ Item {
             id: delegateRoot
             height: delegateContent.height + Style.margin
             width: searchView.width
+            color: Style.backgroundColor
 
             function itemDescription()
             {
@@ -126,10 +126,10 @@ Item {
                 height: Math.max(delegateIcon.height, delegateText.height)
                 width: parent.width
 
-                Rectangle {
+                // Rectangle {
-                    visible: delegateMouse.containsMouse
+                //     visible: delegateMouse.containsMouse
-                    color: "#cfcfcf"
+                //     color: "#cfcfcf"
-                }
+                // }
 
                 PixmapImage {
                     id: delegateIcon
@@ -180,7 +180,7 @@ Item {
         }
     }
 
-    Text {
+    StyledText {
         id: headerText
         text: qsTr("Location")
         font.pixelSize: Style.headingFontPixelSize

src/GUI/qml/LocationAirportView.qml

@@ -1,7 +1,6 @@
 import QtQuick 2.4
 import FlightGear 1.0
 import FlightGear.Launcher 1.0
-import "."
 
 Item {
     id: root
@@ -94,7 +93,7 @@ Item {
             anchors.fill: parent
             z: -1
             opacity: Style.panelOpacity
-            color: "white"
+            color: Style.panelBackground
         }
 
         Column {

src/GUI/qml/LocationCarrierView.qml

@@ -1,7 +1,6 @@
 import QtQuick 2.4
 import FlightGear 1.0
 import FlightGear.Launcher 1.0
-import "."
 
 Item {
     property alias geod: diagram.geod
@@ -53,7 +52,7 @@ Item {
             anchors.fill: parent
             z: -1
             opacity: Style.panelOpacity
-            color: "white"
+            color: Style.panelBackground
         }
 
         RadioButtonGroup {

src/GUI/qml/LocationNavaidView.qml

@@ -1,7 +1,6 @@
 import QtQuick 2.4
 import FlightGear 1.0
 import FlightGear.Launcher 1.0
-import "."
 
 Item {
     property alias location: navaidData.guid
@@ -58,7 +57,7 @@ Item {
             anchors.fill: parent
             z: -1
             opacity: Style.panelOpacity
-            color: "white"
+            color: Style.panelBackground
         }
 
         Column {

src/GUI/qml/Menu.qml

@@ -45,9 +45,9 @@ Item {
     Rectangle {
         id: menuFrame
         border.width: 1
-        border.color: Style.themeColor
+        border.color: Style.minorFrameColor
         height: contentBox.childrenRect.height + 2
-        color: "white"
+        color: Style.panelBackground
 
         // width is computed during show(), but if we don't see a valid
         // value here, the Column doesn't position the items until

src/GUI/qml/NumericalEdit.qml

@@ -191,6 +191,7 @@ FocusScope {
         radius: Style.roundRadius
         border.color: root.enable ? (edit.activeFocus ? Style.frameColor : Style.minorFrameColor) : Style.disabledMinorFrameColor
         border.width: 1
+        color: root.enabled ? Style.panelBackground : Style.backgroundColor
 
         ClickableText {
             id: prefix

src/GUI/qml/OverlayMenu.qml

@@ -1,7 +1,6 @@
 import QtQuick 2.4
 import QtQuick.Controls 2.2
 import FlightGear 1.0
-import "."
 
 Rectangle {
     id: root
@@ -12,7 +11,7 @@ Rectangle {
     property int maximumPermittedHeight: 450
     property string displayRole: "display"
 
-    color: "white"
+    color: Style.panelBackground
     border.width: 1
     border.color: Style.minorFrameColor
     width: flick.width + Style.margin

src/GUI/qml/PlainTextEditBox.qml

@@ -12,6 +12,7 @@ Rectangle {
     implicitHeight: edit.height + Style.margin
     border.color: edit.activeFocus ? Style.frameColor : Style.minorFrameColor
     border.width: 1
+    color: Style.panelBackground
     
     signal editingFinished();
 

src/GUI/qml/PopupChoice.qml

@@ -1,7 +1,6 @@
 import QtQuick 2.4
 import FlightGear.Launcher 1.0
 import FlightGear 1.0
-import "."
 
 Item {
     id: root
@@ -62,6 +61,7 @@ Item {
         border.width: 1
         height: currentChoiceText.implicitHeight + Style.margin
         clip: true
+        color: Style.backgroundColor
 
         anchors.left: label.right
         anchors.leftMargin: Style.margin

src/GUI/qml/SearchButton.qml

@@ -42,6 +42,7 @@ FocusScope
         border.width: 1
         border.color: (mouse.containsMouse | active) ? Style.themeColor: Style.minorFrameColor
         clip: true
+        color: Style.backgroundColor
         
         TextInput {
             id: buttonText

src/GUI/qml/Settings.qml

@@ -3,10 +3,16 @@ import QtQuick.Controls 2.2
 
 import FlightGear.Launcher 1.0
 import FlightGear 1.0
-import "."
 
 Item {
     id: settings
+
+    Rectangle {
+        visible: _launcher.isSearchActive
+        anchors.fill: parent
+        color: Style.backgroundColor
+    }
+
     Rectangle {
         // search 'dimming' rectangle
         visible: _launcher.isSearchActive
@@ -52,7 +58,7 @@ Item {
                 width: parent.width
                 height: headerText.height
 
-                Text {
+                StyledText {
                     id: headerText
                     text: qsTr("Settings")
                     font.pixelSize: Style.headingFontPixelSize

src/GUI/qml/Style.qml

@@ -15,6 +15,7 @@ QtObject
     readonly property string backgroundColor: "#ffffff"
     readonly property string themeColor: "#1b7ad3"
     readonly property string destructiveActionColor: "#c62703"
+    readonly property string panelBackground: "#efefef"
 
     readonly property string activeColor: Qt.darker(themeColor)
     readonly property string inverseActiveColor: "#2f2f2f"

src/GUI/qml/Summary.qml

@@ -14,11 +14,6 @@ Item {
 
     GettingStartedScope.controller: tips.controller
 
-    Rectangle {
-        anchors.fill: parent
-        color: "#7f7f7f"
-    }
-
     readonly property string __aircraftDescription: _launcher.selectedAircraftInfo.description
 
     PreviewImage {
@@ -129,7 +124,7 @@ Item {
             anchors.fill: parent
             z: -1
             opacity: Style.panelOpacity
-            color: "white"
+            color: Style.panelBackground
         }
 
         Grid {

src/GUI/qml/TabButton.qml

@@ -12,12 +12,12 @@ Rectangle {
     height: buttonText.height + (radius * 2)
     radius: 6
 
-    color: mouse.containsMouse ? "#064989" : (active ? "#1b7ad3" : "white")
+    color: mouse.containsMouse ? Style.activeColor : (active ? Style.themeColor : Style.backgroundColor)
 
     StyledText {
         id: buttonText
         anchors.centerIn: parent
-        color: (active | mouse.containsMouse) ? "white" : "#3f3f3f"
+        color: (active | mouse.containsMouse) ? Style.themeContrastTextColor : Style.baseTextColor
     }
 
     MouseArea {