Sync submodules with external projects

MishkaRogachev · May 8, 2019 · 8b9fdb6 · 8b9fdb6
1 parent ddc5522
commit 8b9fdb6
Show file tree

Hide file tree

Showing 8 changed files with 4 additions and 139 deletions.
diff --git a/2ndparty/industrial-controls b/2ndparty/industrial-controls
diff --git a/2ndparty/industrial-indicators b/2ndparty/industrial-indicators
diff --git a/resources/icons/bank_left.svg b/resources/icons/bank_left.svg
diff --git a/resources/icons/bank_right.svg b/resources/icons/bank_right.svg
diff --git a/resources/icons/yaw_left.svg b/resources/icons/yaw_left.svg
diff --git a/resources/icons/yaw_right.svg b/resources/icons/yaw_right.svg
diff --git 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/...sentation/qml/Dashboard/SingleVehicleDisplay/Instruments/HorizontalSituationIndicator.qml b/...sentation/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
+1 −0		Industrial/Controls/Button.qml
+1 −3		Industrial/Controls/ComboBox.qml
+30 −29		Industrial/Controls/ContentItem.qml
+0 −1		Industrial/Controls/DelayButton.qml
+27 −0		Industrial/Controls/Notification.qml
+1 −0		Industrial/Controls/qmldir
+34 −0		icons/save.svg
+1 −0		industrial_qml.qrc
+1 −0		industrial_resources.qrc
+1 −1		sources/theme_configurator.cpp
+0 −2		Industrial/Indicators/ArtificialHorizon.qml
+4 −7		Industrial/Indicators/AttitudeDirectorIndicator.qml
+3 −1		Industrial/Indicators/AttitudeIndicator.qml
+81 −78		Industrial/Indicators/Compass.qml
+1 −2		Industrial/Indicators/Ladder.qml
+2 −2		Industrial/Indicators/LadderButtons.qml
+8 −0		Industrial/Indicators/OperationalItem.qml
+1 −2		Industrial/Indicators/ValueLabel.qml
+1 −0		Industrial/Indicators/qmldir
+35 −0		icons/ind_arrow_down.svg
+35 −0		icons/ind_arrow_left.svg
+35 −0		icons/ind_arrow_right.svg
+35 −0		icons/ind_arrow_up.svg
+36 −0		icons/ind_bank_left.svg
+35 −0		icons/ind_bank_right.svg
+30 −0		icons/ind_yaw_left.svg
+30 −0		icons/ind_yaw_right.svg
+12 −0		industrial_indicators_icons.qrc
+1 −0		industrial_indicators_qml.qrc