From ddc552211a798109188cd89089c754ef0299498f Mon Sep 17 00:00:00 2001 From: MishkaRogachev Date: Wed, 6 Mar 2019 16:33:01 +0300 Subject: [PATCH] Instruments and indicators update --- 2ndparty/industrial-controls | 2 +- 2ndparty/industrial-indicators | 2 +- .../qml/Dashboard/DashboardControls/ChecklistItem.qml | 2 +- .../SingleVehicleDisplay/Instruments/StatusPanel.qml | 4 ++-- .../Dashboard/SingleVehicleDisplay/SingleVehicleDisplay.qml | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/2ndparty/industrial-controls b/2ndparty/industrial-controls index c805babe..aa96928e 160000 --- a/2ndparty/industrial-controls +++ b/2ndparty/industrial-controls @@ -1 +1 @@ -Subproject commit c805babeb71ed9b296adb9f0c2553e84127221eb +Subproject commit aa96928e91c214eec3301e47479828ea71058e81 diff --git a/2ndparty/industrial-indicators b/2ndparty/industrial-indicators index f8ff7238..bfe8edd8 160000 --- a/2ndparty/industrial-indicators +++ b/2ndparty/industrial-indicators @@ -1 +1 @@ -Subproject commit f8ff723814fa14a1b5c58f87830f50ff53ac2ed2 +Subproject commit bfe8edd89142b5464880a16b6db0b9d98e9fb342 diff --git a/sources/presentation/qml/Dashboard/DashboardControls/ChecklistItem.qml b/sources/presentation/qml/Dashboard/DashboardControls/ChecklistItem.qml index 3fb551b2..2a95b587 100644 --- 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 index b67970ed..b261b4c7 100644 --- a/sources/presentation/qml/Dashboard/SingleVehicleDisplay/Instruments/StatusPanel.qml +++ b/sources/presentation/qml/Dashboard/SingleVehicleDisplay/Instruments/StatusPanel.qml @@ -54,7 +54,7 @@ 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 { @@ -62,7 +62,7 @@ BaseInstrument { 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 index 73d7b5e6..83f4fc96 100644 --- 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