Instruments and indicators update

MishkaRogachev · Mar 6, 2019 · ddc5522 · ddc5522
1 parent 51bf08d
commit ddc5522
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 6 deletions.
diff --git a/2ndparty/industrial-controls b/2ndparty/industrial-controls
diff --git a/2ndparty/industrial-indicators b/2ndparty/industrial-indicators
diff --git a/sources/presentation/qml/Dashboard/DashboardControls/ChecklistItem.qml b/sources/presentation/qml/Dashboard/DashboardControls/ChecklistItem.qml
@@ -35,7 +35,7 @@ RowLayout {
         State {
             name: "BAD"
             PropertyChanges { target: icon; color: Indicators.Theme.dangerColor }
-            PropertyChanges { target: icon; source: "qrc:/icons/remove.svg" }
+            PropertyChanges { target: icon; source: "qrc:/icons/close.svg" }
         },
         State {
             name: "UNACTIVE"

diff --git a/sources/presentation/qml/Dashboard/SingleVehicleDisplay/Instruments/StatusPanel.qml b/sources/presentation/qml/Dashboard/SingleVehicleDisplay/Instruments/StatusPanel.qml
@@ -54,15 +54,15 @@ BaseInstrument {
                 text: qsTr("Lat.: ") + (dmsFormat ?
                            Controls.Helper.degreesToDmsString(vehicle.satellite.coordinate.latitude, false, 2) :
                            Controls.Helper.degreesToString(vehicle.satellite.coordinate.latitude, 6))
-                font.pixelSize: industrial.fontSize * 0.6
+                font.pixelSize: industrial.auxFontSize * 0.75
             }
 
             DashboardControls.Label {
                 color: snsIcon.color
                 text: qsTr("Lon.: ") + (dmsFormat ?
                            Controls.Helper.degreesToDmsString(vehicle.satellite.coordinate.longitude, true, 2) :
                            Controls.Helper.degreesToString(vehicle.satellite.coordinate.longitude, 6))
-                font.pixelSize: industrial.fontSize * 0.6
+                font.pixelSize: industrial.auxFontSize * 0.75
             }
         }
 

diff --git a/sources/presentation/qml/Dashboard/SingleVehicleDisplay/SingleVehicleDisplay.qml b/sources/presentation/qml/Dashboard/SingleVehicleDisplay/SingleVehicleDisplay.qml
@@ -97,7 +97,7 @@ BaseDisplay {
         anchors.right: parent.right
         anchors.rightMargin: industrial.margins
         width: dashboardWidth
-        height: Math.min(parent.height - topBarDelegate.height - industrial.spacing, contentHeight)
+        height: Math.min(main.height - topBarDelegate.height - industrial.spacing, contentHeight)
         flickableDirection: Flickable.AutoFlickIfNeeded
         boundsBehavior: Flickable.StopAtBounds
         spacing: industrial.spacing
+2 −2		example/CMakeLists.txt
+34 −0		icons/savenexit.svg
+1 −0		industrial_resources.qrc
+1 −1		Industrial/Indicators/Theme.qml
+1 −3		Industrial/Indicators/YawIndicator.qml