From e107e593879bc899d067bad83655cdfb1d46f31b Mon Sep 17 00:00:00 2001
From: dogmaphobic <mavlink@grubba.com>
Date: Tue, 5 Apr 2016 23:01:49 -0400
Subject: [PATCH] Fix gearThingy

---
 qgcresources.qrc                              |  3 ++-
 resources/gear-black.svg                      | 17 +++++++++++++++++
 resources/gear-white.svg                      | 20 ++++++++++++++++++++
 resources/gear.svg                            | 17 -----------------
 src/FlightMap/Widgets/QGCInstrumentWidget.qml |  2 +-
 5 files changed, 40 insertions(+), 19 deletions(-)
 create mode 100644 resources/gear-black.svg
 create mode 100644 resources/gear-white.svg
 delete mode 100644 resources/gear.svg

diff --git a/qgcresources.qrc b/qgcresources.qrc
index 61a6be1..e6667ed 100644
--- a/qgcresources.qrc
+++ b/qgcresources.qrc
@@ -140,7 +140,8 @@
         <file alias="buttonLeft.svg">resources/buttonLeft.svg</file>
         <file alias="buttonRight.svg">resources/buttonRight.svg</file>
         <file alias="cancel.svg">resources/cancel.svg</file>
-        <file alias="gear.svg">resources/gear.svg</file>
+        <file alias="gear-black.svg">resources/gear-black.svg</file>
+        <file alias="gear-white.svg">resources/gear-white.svg</file>
         <file alias="JoystickBezel.png">resources/JoystickBezel.png</file>
         <file alias="JoystickBezelLight.png">resources/JoystickBezelLight.png</file>
         <file alias="notile.png">resources/notile.png</file>
diff --git a/resources/gear-black.svg b/resources/gear-black.svg
new file mode 100644
index 0000000..2281d50
--- /dev/null
+++ b/resources/gear-black.svg
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 19.2.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="Capa_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="160 862 72 72" style="enable-background:new 160 862 72 72;" xml:space="preserve">
+<path d="M170.781,905.108c0.575,1.97,1.372,3.87,2.381,5.653l-2.873,3.624c-0.938,1.185-0.833,2.873,0.223,3.941l4.949,4.949
+	c1.067,1.067,2.756,1.161,3.941,0.223l3.601-2.85c1.853,1.067,3.823,1.9,5.876,2.486l0.54,4.633
+	c0.176,1.501,1.443,2.627,2.944,2.627h7.002c1.501,0,2.768-1.126,2.944-2.627l0.516-4.469c2.205-0.575,4.316-1.431,6.298-2.545
+	l3.483,2.756c1.185,0.938,2.873,0.833,3.941-0.223l4.949-4.949c1.067-1.067,1.161-2.756,0.223-3.941l-2.709-3.436
+	c1.126-1.947,2.006-4.023,2.592-6.193l4.175-0.481c1.501-0.176,2.627-1.443,2.627-2.944v-7.002c0-1.501-1.126-2.768-2.627-2.944
+	l-4.117-0.481c-0.563-2.146-1.407-4.199-2.486-6.122l2.533-3.202c0.938-1.185,0.833-2.873-0.223-3.941l-4.938-4.938
+	c-1.067-1.067-2.756-1.161-3.941-0.223l-3.108,2.463c-2.017-1.185-4.175-2.088-6.439-2.698l-0.469-4.023
+	c-0.176-1.501-1.443-2.627-2.944-2.627h-7.002c-1.501,0-2.768,1.126-2.944,2.627l-0.469,4.023c-2.322,0.622-4.539,1.56-6.603,2.791
+	l-3.225-2.557c-1.185-0.938-2.873-0.833-3.941,0.223l-4.949,4.949c-1.067,1.067-1.161,2.756-0.223,3.941l2.698,3.413
+	c-1.079,1.947-1.9,4.023-2.44,6.181l-4.316,0.493c-1.501,0.176-2.627,1.443-2.627,2.944v7.002c0,1.501,1.126,2.768,2.627,2.944
+	L170.781,905.108z M196.15,886.166c6.38,0,11.576,5.196,11.576,11.576s-5.196,11.576-11.576,11.576
+	c-6.38,0-11.576-5.196-11.576-11.576S189.77,886.166,196.15,886.166z"/>
+</svg>
diff --git a/resources/gear-white.svg b/resources/gear-white.svg
new file mode 100644
index 0000000..94a5d55
--- /dev/null
+++ b/resources/gear-white.svg
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 19.2.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="Capa_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="160 862 72 72" style="enable-background:new 160 862 72 72;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:#FFFFFF;}
+</style>
+<path class="st0" d="M170.781,905.108c0.575,1.97,1.372,3.87,2.381,5.653l-2.873,3.624c-0.938,1.185-0.833,2.873,0.223,3.941
+	l4.949,4.949c1.067,1.067,2.756,1.161,3.941,0.223l3.601-2.85c1.853,1.067,3.823,1.9,5.876,2.486l0.54,4.633
+	c0.176,1.501,1.443,2.627,2.944,2.627h7.002c1.501,0,2.768-1.126,2.944-2.627l0.516-4.469c2.205-0.575,4.316-1.431,6.298-2.545
+	l3.483,2.756c1.185,0.938,2.873,0.833,3.941-0.223l4.949-4.949c1.067-1.067,1.161-2.756,0.223-3.941l-2.709-3.436
+	c1.126-1.947,2.006-4.023,2.592-6.193l4.175-0.481c1.501-0.176,2.627-1.443,2.627-2.944v-7.002c0-1.501-1.126-2.768-2.627-2.944
+	l-4.117-0.481c-0.563-2.146-1.407-4.199-2.486-6.122l2.533-3.202c0.938-1.185,0.833-2.873-0.223-3.941l-4.938-4.938
+	c-1.067-1.067-2.756-1.161-3.941-0.223l-3.108,2.463c-2.017-1.185-4.175-2.088-6.439-2.698l-0.469-4.023
+	c-0.176-1.501-1.443-2.627-2.944-2.627h-7.002c-1.501,0-2.768,1.126-2.944,2.627l-0.469,4.023c-2.322,0.622-4.539,1.56-6.603,2.791
+	l-3.225-2.557c-1.185-0.938-2.873-0.833-3.941,0.223l-4.949,4.949c-1.067,1.067-1.161,2.756-0.223,3.941l2.698,3.413
+	c-1.079,1.947-1.9,4.023-2.44,6.181l-4.316,0.493c-1.501,0.176-2.627,1.443-2.627,2.944v7.002c0,1.501,1.126,2.768,2.627,2.944
+	L170.781,905.108z M196.15,886.166c6.38,0,11.576,5.196,11.576,11.576s-5.196,11.576-11.576,11.576
+	c-6.38,0-11.576-5.196-11.576-11.576S189.77,886.166,196.15,886.166z"/>
+</svg>
diff --git a/resources/gear.svg b/resources/gear.svg
deleted file mode 100644
index 2281d50..0000000
--- a/resources/gear.svg
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 19.2.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<svg version="1.1" id="Capa_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="160 862 72 72" style="enable-background:new 160 862 72 72;" xml:space="preserve">
-<path d="M170.781,905.108c0.575,1.97,1.372,3.87,2.381,5.653l-2.873,3.624c-0.938,1.185-0.833,2.873,0.223,3.941l4.949,4.949
-	c1.067,1.067,2.756,1.161,3.941,0.223l3.601-2.85c1.853,1.067,3.823,1.9,5.876,2.486l0.54,4.633
-	c0.176,1.501,1.443,2.627,2.944,2.627h7.002c1.501,0,2.768-1.126,2.944-2.627l0.516-4.469c2.205-0.575,4.316-1.431,6.298-2.545
-	l3.483,2.756c1.185,0.938,2.873,0.833,3.941-0.223l4.949-4.949c1.067-1.067,1.161-2.756,0.223-3.941l-2.709-3.436
-	c1.126-1.947,2.006-4.023,2.592-6.193l4.175-0.481c1.501-0.176,2.627-1.443,2.627-2.944v-7.002c0-1.501-1.126-2.768-2.627-2.944
-	l-4.117-0.481c-0.563-2.146-1.407-4.199-2.486-6.122l2.533-3.202c0.938-1.185,0.833-2.873-0.223-3.941l-4.938-4.938
-	c-1.067-1.067-2.756-1.161-3.941-0.223l-3.108,2.463c-2.017-1.185-4.175-2.088-6.439-2.698l-0.469-4.023
-	c-0.176-1.501-1.443-2.627-2.944-2.627h-7.002c-1.501,0-2.768,1.126-2.944,2.627l-0.469,4.023c-2.322,0.622-4.539,1.56-6.603,2.791
-	l-3.225-2.557c-1.185-0.938-2.873-0.833-3.941,0.223l-4.949,4.949c-1.067,1.067-1.161,2.756-0.223,3.941l2.698,3.413
-	c-1.079,1.947-1.9,4.023-2.44,6.181l-4.316,0.493c-1.501,0.176-2.627,1.443-2.627,2.944v7.002c0,1.501,1.126,2.768,2.627,2.944
-	L170.781,905.108z M196.15,886.166c6.38,0,11.576,5.196,11.576,11.576s-5.196,11.576-11.576,11.576
-	c-6.38,0-11.576-5.196-11.576-11.576S189.77,886.166,196.15,886.166z"/>
-</svg>
diff --git a/src/FlightMap/Widgets/QGCInstrumentWidget.qml b/src/FlightMap/Widgets/QGCInstrumentWidget.qml
index c2261ea..829a907 100644
--- a/src/FlightMap/Widgets/QGCInstrumentWidget.qml
+++ b/src/FlightMap/Widgets/QGCInstrumentWidget.qml
@@ -104,7 +104,7 @@ Item {
                 id:                 gearThingy
                 anchors.bottom:     attitudeWidget.bottom
                 anchors.right:      attitudeWidget.right
-                source:             "/res/gear.svg"
+                source:             qgcPal.globalTheme == QGCPalette.Light ? "/res/gear-black.svg" : "/res/gear-white.svg"
                 mipmap:             true
                 opacity:            0.5
                 width:              attitudeWidget.width * 0.15