From 8b9fdb6305a85c3f37201887a317a856093bf249 Mon Sep 17 00:00:00 2001
From: Mikhail Rogachev <mishkarogachev@gmail.com>
Date: Wed, 8 May 2019 15:03:52 +0300
Subject: [PATCH] Sync submodules with external projects

---
 2ndparty/industrial-controls                  |  2 +-
 2ndparty/industrial-indicators                |  2 +-
 resources/icons/bank_left.svg                 | 36 -------------------
 resources/icons/bank_right.svg                | 35 ------------------
 resources/icons/yaw_left.svg                  | 30 ----------------
 resources/icons/yaw_right.svg                 | 30 ----------------
 resources/resources.qrc                       |  4 ---
 .../HorizontalSituationIndicator.qml          |  4 +--
 8 files changed, 4 insertions(+), 139 deletions(-)
 delete mode 100644 resources/icons/bank_left.svg
 delete mode 100644 resources/icons/bank_right.svg
 delete mode 100644 resources/icons/yaw_left.svg
 delete mode 100644 resources/icons/yaw_right.svg

diff --git a/2ndparty/industrial-controls b/2ndparty/industrial-controls
index aa96928e..3da26e82 160000
--- a/2ndparty/industrial-controls
+++ b/2ndparty/industrial-controls
@@ -1 +1 @@
-Subproject commit aa96928e91c214eec3301e47479828ea71058e81
+Subproject commit 3da26e821e929c19477d50f3918c563d1156ba0a
diff --git a/2ndparty/industrial-indicators b/2ndparty/industrial-indicators
index bfe8edd8..695047dd 160000
--- a/2ndparty/industrial-indicators
+++ b/2ndparty/industrial-indicators
@@ -1 +1 @@
-Subproject commit bfe8edd89142b5464880a16b6db0b9d98e9fb342
+Subproject commit 695047ddbbaec9dccdf8d5ff1432a991dd8af43f
diff --git a/resources/icons/bank_left.svg b/resources/icons/bank_left.svg
deleted file mode 100644
index 5537b89a..00000000
--- a/resources/icons/bank_left.svg
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   width="38.4pt"
-   height="38.4pt"
-   id="svg2"
-   version="1.1">
-  <metadata
-     id="metadata11">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs4" />
-  <g
-     id="layer1"
-     style="fill:#f6f5f0"
-     transform="matrix(-0.70710678,0.70710679,0.70710679,0.70710678,17.606288,-1.2110164)">
-    <path
-       id="path8"
-       transform="matrix(-0.70710677,0.70710678,0.70710678,0.70710677,13.305843,-11.593208)"
-       d="M 11.244141,29.199219 7.2363281,21.248047 4.6152344,40.904297 24.271484,38.283203 16.044922,33.703125 C 24.875003,24.24703 31.585383,20.450712 46.389912,20.531592 l -0.145771,-3.404639 c -16.042544,-0.971026 -25.573485,3.13362 -35,12.072266 z"
-       style="fill:#f6f5f0;fill-rule:evenodd;stroke:#000000;stroke-width:0;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:2.01260185" />
-  </g>
-</svg>
diff --git a/resources/icons/bank_right.svg b/resources/icons/bank_right.svg
deleted file mode 100644
index e8df751e..00000000
--- a/resources/icons/bank_right.svg
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   width="38.4pt"
-   height="38.4pt"
-   id="svg2"
-   version="1.1">
-  <metadata
-     id="metadata11">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs4" />
-  <g
-     id="layer1"
-     style="fill:#f6f5f0"
-     transform="matrix(-0.70710678,0.70710679,0.70710679,0.70710678,17.606288,-1.2110164)">
-    <path
-       id="path8"
-       d="M 5.837533,37.169034 -2.6187462,34.380658 9.4269283,50.133118 21.472602,34.380658 12.41694,36.959111 C 11.974281,24.028832 14.034834,16.599475 24.560408,6.1882828 L 22.049889,3.8839152 C 10.019478,14.541088 6.1825084,24.182904 5.837533,37.169034 Z"
-       style="fill:#f6f5f0;fill-rule:evenodd;stroke:#000000;stroke-width:0;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:2.01260185" />
-  </g>
-</svg>
diff --git a/resources/icons/yaw_left.svg b/resources/icons/yaw_left.svg
deleted file mode 100644
index d8bf9346..00000000
--- a/resources/icons/yaw_left.svg
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   width="38.4pt"
-   height="38.4pt"
-   id="svg2"
-   version="1.1">
-  <metadata
-     id="metadata11">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs4" />
-  <path
-     id="path8"
-     d="M 23.384766 8.5488281 L 7.6328125 20.595703 L 23.384766 32.640625 L 20.830078 23.664062 C 27.557404 23.943013 34.944854 26.290125 35.433594 37.027344 L 38.957031 37.056641 C 39.20511 27.872888 34.108675 17.456666 20.597656 17.001953 L 23.384766 8.5488281 z "
-     style="fill:#f6f5f0;fill-rule:evenodd;stroke:#000000;stroke-width:0;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:2.01260185" />
-</svg>
diff --git a/resources/icons/yaw_right.svg b/resources/icons/yaw_right.svg
deleted file mode 100644
index 827102b5..00000000
--- a/resources/icons/yaw_right.svg
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   width="38.4pt"
-   height="38.4pt"
-   id="svg2"
-   version="1.1">
-  <metadata
-     id="metadata11">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs4" />
-  <path
-     id="path8"
-     d="M 23.213673,8.5488281 38.965626,20.595703 23.213673,32.640625 25.768361,23.664062 c -6.727326,0.278951 -14.114776,2.626063 -14.603516,13.363282 l -3.5234374,0.0293 C 7.3933286,27.872888 12.489764,17.456666 26.000783,17.001953 l -2.78711,-8.4531249 z"
-     style="fill:#f6f5f0;fill-rule:evenodd;stroke:#000000;stroke-width:0;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:2.01260185" />
-</svg>
diff --git a/resources/resources.qrc b/resources/resources.qrc
index 8d1f2a29..4c05b4de 100644
--- a/resources/resources.qrc
+++ b/resources/resources.qrc
@@ -52,10 +52,6 @@
         <file>icons/left_left.svg</file>
         <file>icons/right.svg</file>
         <file>icons/right_right.svg</file>
-        <file>icons/bank_left.svg</file>
-        <file>icons/bank_right.svg</file>
-        <file>icons/yaw_left.svg</file>
-        <file>icons/yaw_right.svg</file>
         <file>icons/show.svg</file>
         <file>icons/hide.svg</file>
         <file>icons/show_dashboard.svg</file>
diff --git a/sources/presentation/qml/Dashboard/SingleVehicleDisplay/Instruments/HorizontalSituationIndicator.qml b/sources/presentation/qml/Dashboard/SingleVehicleDisplay/Instruments/HorizontalSituationIndicator.qml
index 6403244f..2e56d808 100644
--- a/sources/presentation/qml/Dashboard/SingleVehicleDisplay/Instruments/HorizontalSituationIndicator.qml
+++ b/sources/presentation/qml/Dashboard/SingleVehicleDisplay/Instruments/HorizontalSituationIndicator.qml
@@ -114,7 +114,7 @@ BaseInstrument {
     Controls.Button {
         anchors.top: parent.top
         anchors.left: compass.left
-        iconSource: "qrc:/icons/yaw_left.svg"
+        iconSource: "qrc:/icons/ind_yaw_left.svg"
         flat: true
         round: true
         autoRepeat: true
@@ -126,7 +126,7 @@ BaseInstrument {
     Controls.Button {
         anchors.top: parent.top
         anchors.right: compass.right
-        iconSource: "qrc:/icons/yaw_right.svg"
+        iconSource: "qrc:/icons/ind_yaw_right.svg"
         flat: true
         round: true
         autoRepeat: true