diff --git a/android/res/drawable-hdpi/icon.png b/android/res/drawable-hdpi/icon.png index dcfe2f156dfda0c865a71e2f8acab79cb866e0d9..f6323cd90f2f6323161df8f449a9f811ff5a071f 100644 Binary files a/android/res/drawable-hdpi/icon.png and b/android/res/drawable-hdpi/icon.png differ diff --git a/android/res/drawable-ldpi/icon.png b/android/res/drawable-ldpi/icon.png index d2d940a38598e7b32a8012020578c652930d27f2..8676e6502c749cf0015a93c47c76c42d43b251ae 100644 Binary files a/android/res/drawable-ldpi/icon.png and b/android/res/drawable-ldpi/icon.png differ diff --git a/android/res/drawable-mdpi/icon.png b/android/res/drawable-mdpi/icon.png index add26523f3c013be39129b6453b8c322d632793a..c1c7603491eec475c6f6d6f4ad902f4b6adabffc 100644 Binary files a/android/res/drawable-mdpi/icon.png and b/android/res/drawable-mdpi/icon.png differ diff --git a/android/res/drawable-xhdpi/icon.png b/android/res/drawable-xhdpi/icon.png index d02d9c7b0c0f05858548923098d46d6800771660..58a1454d6a8c74b6edade18acc4d0e5f4fc4ce7e 100644 Binary files a/android/res/drawable-xhdpi/icon.png and b/android/res/drawable-xhdpi/icon.png differ diff --git a/android/res/drawable-xxhdpi/icon.png b/android/res/drawable-xxhdpi/icon.png index 139f14d48f7715f5b67e401bda92baa6486784c0..f74d76f41f81bf844e0b2875f36e94003acc6474 100644 Binary files a/android/res/drawable-xxhdpi/icon.png and b/android/res/drawable-xxhdpi/icon.png differ diff --git a/android/res/drawable-xxxhdpi/icon.png b/android/res/drawable-xxxhdpi/icon.png index b08f1ce792cf737130ee6e3e113a27b9a00add01..a0e11c0a49834db8f9d1acf87da18236d9c3f91f 100644 Binary files a/android/res/drawable-xxxhdpi/icon.png and b/android/res/drawable-xxxhdpi/icon.png differ diff --git a/qgcresources.qrc b/qgcresources.qrc index df0f9bc0f6de68f88b030f4a723ee8a134c8491d..36f728b9b0e779a8d633cf4da3bef136e48dd5b6 100644 --- a/qgcresources.qrc +++ b/qgcresources.qrc @@ -1,4 +1,9 @@ + + resources/fonts/OpenSans-Regular.ttf + resources/fonts/OpenSans-Semibold.ttf + + src/AutoPilotPlugins/Common/Images/AirframeComponentIcon.png diff --git a/resources/fonts/OpenSans-Regular.ttf b/resources/fonts/OpenSans-Regular.ttf new file mode 100755 index 0000000000000000000000000000000000000000..db433349b7047f72f40072630c1bc110620bf09e Binary files /dev/null and b/resources/fonts/OpenSans-Regular.ttf differ diff --git a/resources/fonts/OpenSans-Semibold.ttf b/resources/fonts/OpenSans-Semibold.ttf new file mode 100755 index 0000000000000000000000000000000000000000..1a7679e3949fb045f152f456bc4adad31e8b9f55 Binary files /dev/null and b/resources/fonts/OpenSans-Semibold.ttf differ diff --git a/src/AutoPilotPlugins/APM/APMCameraComponent.qml b/src/AutoPilotPlugins/APM/APMCameraComponent.qml index 792ecf856572f2d8ac2eb90acbf813f9bc22d2ae..d1dc03f120137378ead919a40cb501334a5f6cf4 100644 --- a/src/AutoPilotPlugins/APM/APMCameraComponent.qml +++ b/src/AutoPilotPlugins/APM/APMCameraComponent.qml @@ -211,7 +211,7 @@ QGCView { QGCLabel { id: directionLabel text: qsTr("Gimbal ") + directionTitle - font.weight: Font.DemiBold + font.family: ScreenTools.demiboldFontFamily } Rectangle { @@ -393,7 +393,7 @@ QGCView { QGCLabel { id: settingsLabel text: qsTr("Gimbal Settings") - font.weight: Font.DemiBold + font.family: ScreenTools.demiboldFontFamily } Rectangle { diff --git a/src/AutoPilotPlugins/APM/APMFlightModesComponent.qml b/src/AutoPilotPlugins/APM/APMFlightModesComponent.qml index 97365aa5ca9986c485da891cc6a4a3ebe42f5149..fcffdcf9e725733b963097c0e18b199cb3b39f7a 100644 --- a/src/AutoPilotPlugins/APM/APMFlightModesComponent.qml +++ b/src/AutoPilotPlugins/APM/APMFlightModesComponent.qml @@ -63,7 +63,7 @@ QGCView { QGCLabel { id: flightModeLabel text: qsTr("Flight Mode Settings") + (_fltmodeChExists ? "" : qsTr(" (Channel 5)")) - font.weight: Font.DemiBold + font.family: ScreenTools.demiboldFontFamily } Rectangle { @@ -141,7 +141,7 @@ QGCView { anchors.top: parent.top anchors.left: flightModeSettings.right text: qsTr("Channel Options") - font.weight: Font.DemiBold + font.family: ScreenTools.demiboldFontFamily visible: _channelOptionCount != 0 } diff --git a/src/AutoPilotPlugins/APM/APMSafetyComponentCopter.qml b/src/AutoPilotPlugins/APM/APMSafetyComponentCopter.qml index c91e7a59271325746b92bb659d01e70c7f6d3d04..2422712def267db054fff5dad56fd1471965e355 100644 --- a/src/AutoPilotPlugins/APM/APMSafetyComponentCopter.qml +++ b/src/AutoPilotPlugins/APM/APMSafetyComponentCopter.qml @@ -80,7 +80,7 @@ QGCView { QGCLabel { id: failsafeLabel text: qsTr("Failsafe Triggers") - font.weight: Font.DemiBold + font.family: ScreenTools.demiboldFontFamily } Rectangle { @@ -217,7 +217,7 @@ QGCView { anchors.left: failsafeSettings.right anchors.top: parent.top text: qsTr("GeoFence") - font.weight: Font.DemiBold + font.family: ScreenTools.demiboldFontFamily } Rectangle { @@ -342,7 +342,7 @@ QGCView { anchors.topMargin: _margins anchors.top: geoFenceSettings.bottom text: qsTr("Return to Launch") - font.weight: Font.DemiBold + font.family: ScreenTools.demiboldFontFamily } Rectangle { @@ -475,7 +475,7 @@ QGCView { anchors.left: parent.left anchors.top: rtlSettings.bottom text: qsTr("Arming Checks") - font.weight: Font.DemiBold + font.family: ScreenTools.demiboldFontFamily } Rectangle { diff --git a/src/AutoPilotPlugins/APM/APMSafetyComponentPlane.qml b/src/AutoPilotPlugins/APM/APMSafetyComponentPlane.qml index 396cb7bb6af000580ed0bcf0eb5d7191f864f7e3..b508ad9f1ac8088fdf8f49a387ebb9a67404a847 100644 --- a/src/AutoPilotPlugins/APM/APMSafetyComponentPlane.qml +++ b/src/AutoPilotPlugins/APM/APMSafetyComponentPlane.qml @@ -65,7 +65,7 @@ QGCView { QGCLabel { id: failsafeTriggersLabel text: qsTr("Failsafe Triggers") - font.weight: Font.DemiBold + font.family: ScreenTools.demiboldFontFamily } Rectangle { @@ -158,7 +158,7 @@ QGCView { anchors.leftMargin: _margins anchors.left: failsafeTriggerSettings.right text: qsTr("Return to Launch") - font.weight: Font.DemiBold + font.family: ScreenTools.demiboldFontFamily } Rectangle { diff --git a/src/AutoPilotPlugins/APM/APMTuningComponentCopter.qml b/src/AutoPilotPlugins/APM/APMTuningComponentCopter.qml index e3b6268e07ba8a05121899a341e7ab0ac4a974d5..9e63c7154ad2257629280d6263f0b2e928ce86bb 100644 --- a/src/AutoPilotPlugins/APM/APMTuningComponentCopter.qml +++ b/src/AutoPilotPlugins/APM/APMTuningComponentCopter.qml @@ -135,7 +135,7 @@ QGCView { QGCLabel { id: basicLabel text: qsTr("Basic Tuning") - font.weight: Font.DemiBold + font.family: ScreenTools.demiboldFontFamily } Rectangle { @@ -161,7 +161,7 @@ QGCView { QGCLabel { text: qsTr("Throttle Hover") - font.weight: Font.DemiBold + font.family: ScreenTools.demiboldFontFamily } QGCLabel { @@ -191,7 +191,7 @@ QGCView { QGCLabel { text: qsTr("Roll/Pitch Sensitivity") - font.weight: Font.DemiBold + font.family: ScreenTools.demiboldFontFamily } QGCLabel { @@ -224,7 +224,7 @@ QGCView { QGCLabel { text: qsTr("Climb Sensitivity") - font.weight: Font.DemiBold + font.family: ScreenTools.demiboldFontFamily } QGCLabel { @@ -256,7 +256,7 @@ QGCView { QGCLabel { text: qsTr("RC Roll/Pitch Feel") - font.weight: Font.DemiBold + font.family: ScreenTools.demiboldFontFamily } QGCLabel { @@ -287,7 +287,7 @@ QGCView { anchors.topMargin: _margins anchors.top: basicTuningRect.bottom text: qsTr("AutoTune") - font.weight: Font.DemiBold + font.family: ScreenTools.demiboldFontFamily } Rectangle { diff --git a/src/AutoPilotPlugins/Common/ESP8266Component.qml b/src/AutoPilotPlugins/Common/ESP8266Component.qml index ec6775c40cffd595326162accd51c060c69863b6..95a45a19ad402162f762b26aff56d2e399c494ec 100644 --- a/src/AutoPilotPlugins/Common/ESP8266Component.qml +++ b/src/AutoPilotPlugins/Common/ESP8266Component.qml @@ -43,8 +43,9 @@ QGCView { property real _margins: ScreenTools.defaultFontPixelHeight property real _middleRowWidth: ScreenTools.defaultFontPixelWidth * 22 property real _editFieldWidth: ScreenTools.defaultFontPixelWidth * 20 - property real _labelWidth: ScreenTools.isTinyScreen ? ScreenTools.defaultFontPixelWidth * 10 : ScreenTools.defaultFontPixelWidth * 12 - property real _statusWidth: ScreenTools.isTinyScreen ? ScreenTools.defaultFontPixelWidth * 7 : ScreenTools.defaultFontPixelWidth * 8 + property real _labelWidth: ScreenTools.defaultFontPixelWidth * 12 + property real _statusWidth: ScreenTools.defaultFontPixelWidth * 8 + property real _smallFont: ScreenTools.smallFontPixelSize readonly property string dialogTitle: qsTr("controller WiFi Bridge") property int stStatus: XMLHttpRequest.UNSENT @@ -131,7 +132,7 @@ QGCView { Item { width: 1; height: _margins * 0.5; } QGCLabel { text: qsTr("ESP WiFi Bridge Settings") - font.weight: Font.DemiBold + font.family: ScreenTools.demiboldFontFamily } Rectangle { color: palette.windowShade @@ -291,7 +292,7 @@ QGCView { } QGCLabel { text: qsTr("ESP WiFi Bridge Status") - font.weight: Font.DemiBold + font.family: ScreenTools.demiboldFontFamily } Rectangle { color: palette.windowShade @@ -318,135 +319,126 @@ QGCView { spacing: _margins QGCLabel { text: qsTr("Messages Received") - font.pixelSize: ScreenTools.smallFontPixelSize + font.pixelSize: _smallFont width: _labelWidth } QGCLabel { id: vpackets - font.pixelSize: ScreenTools.smallFontPixelSize + font.pixelSize: _smallFont width: _statusWidth horizontalAlignment: Text.AlignRight - font.family: "Monospace" } } Row { spacing: _margins QGCLabel { - font.pixelSize: ScreenTools.smallFontPixelSize + font.pixelSize: _smallFont text: qsTr("Messages Received") width: _labelWidth } QGCLabel { id: gpackets - font.pixelSize: ScreenTools.smallFontPixelSize + font.pixelSize: _smallFont width: _statusWidth horizontalAlignment: Text.AlignRight - font.family: "Monospace" } } Row { spacing: _margins QGCLabel { - font.pixelSize: ScreenTools.smallFontPixelSize + font.pixelSize: _smallFont text: qsTr("Messages Received") width: _labelWidth } QGCLabel { - font.pixelSize: ScreenTools.smallFontPixelSize + font.pixelSize: _smallFont text: controller.vehicle ? thisThingHasNoNumberLocaleSupport(controller.vehicle.messagesReceived) : 0 width: _statusWidth horizontalAlignment: Text.AlignRight - font.family: "Monospace" } } Row { spacing: _margins QGCLabel { text: qsTr("Messages Lost") - font.pixelSize: ScreenTools.smallFontPixelSize + font.pixelSize: _smallFont width: _labelWidth } QGCLabel { id: vlost width: _statusWidth horizontalAlignment: Text.AlignRight - font.pixelSize: ScreenTools.smallFontPixelSize - font.family: "Monospace" + font.pixelSize: _smallFont } } Row { spacing: _margins QGCLabel { text: qsTr("Messages Lost") - font.pixelSize: ScreenTools.smallFontPixelSize + font.pixelSize: _smallFont width: _labelWidth } QGCLabel { id: glost width: _statusWidth horizontalAlignment: Text.AlignRight - font.pixelSize: ScreenTools.smallFontPixelSize - font.family: "Monospace" + font.pixelSize: _smallFont } } Row { spacing: _margins QGCLabel { text: qsTr("Messages Lost") - font.pixelSize: ScreenTools.smallFontPixelSize + font.pixelSize: _smallFont width: _labelWidth } QGCLabel { text: controller.vehicle ? thisThingHasNoNumberLocaleSupport(controller.vehicle.messagesLost) : 0 width: _statusWidth horizontalAlignment: Text.AlignRight - font.pixelSize: ScreenTools.smallFontPixelSize - font.family: "Monospace" + font.pixelSize: _smallFont } } Row { spacing: _margins QGCLabel { text: qsTr("Messages Sent") - font.pixelSize: ScreenTools.smallFontPixelSize + font.pixelSize: _smallFont width: _labelWidth } QGCLabel { id: vsent width: _statusWidth horizontalAlignment: Text.AlignRight - font.pixelSize: ScreenTools.smallFontPixelSize - font.family: "Monospace" + font.pixelSize: _smallFont } } Row { spacing: _margins QGCLabel { text: qsTr("Messages Sent") - font.pixelSize: ScreenTools.smallFontPixelSize + font.pixelSize: _smallFont width: _labelWidth } QGCLabel { id: gsent width: _statusWidth horizontalAlignment: Text.AlignRight - font.pixelSize: ScreenTools.smallFontPixelSize - font.family: "Monospace" + font.pixelSize: _smallFont } } Row { spacing: _margins QGCLabel { text: qsTr("Messages Sent") - font.pixelSize: ScreenTools.smallFontPixelSize + font.pixelSize: _smallFont width: _labelWidth } QGCLabel { text: controller.vehicle ? thisThingHasNoNumberLocaleSupport(controller.vehicle.messagesSent) : 0 width: _statusWidth horizontalAlignment: Text.AlignRight - font.pixelSize: ScreenTools.smallFontPixelSize - font.family: "Monospace" + font.pixelSize: _smallFont } } } diff --git a/src/AutoPilotPlugins/Common/ESP8266ComponentSummary.qml b/src/AutoPilotPlugins/Common/ESP8266ComponentSummary.qml index cc58f948fad5dca63f37f4965068dbebf2958e8f..715916277224d9936e9b9af5a9ee38941d3412a0 100644 --- a/src/AutoPilotPlugins/Common/ESP8266ComponentSummary.qml +++ b/src/AutoPilotPlugins/Common/ESP8266ComponentSummary.qml @@ -50,6 +50,7 @@ FactPanel { labelText: qsTr("WiFi AP Password:") valueText: esp8266.wifiPassword } + /* Too much info makes it all crammed VehicleSummaryRow { labelText: qsTr("WiFi STA SSID:") valueText: esp8266.wifiSSIDSta @@ -58,6 +59,7 @@ FactPanel { labelText: qsTr("WiFi STA Password:") valueText: esp8266.wifiPasswordSta } + */ VehicleSummaryRow { labelText: qsTr("UART Baud Rate:") valueText: uartBaud ? uartBaud.valueString : "" diff --git a/src/AutoPilotPlugins/PX4/AirframeComponent.qml b/src/AutoPilotPlugins/PX4/AirframeComponent.qml index a6d01686107f99b2fd917540f0ab79800c5e5ac5..47e9cc030bbc040a2e5ff01e6bd7aa2ce6601a71 100644 --- a/src/AutoPilotPlugins/PX4/AirframeComponent.qml +++ b/src/AutoPilotPlugins/PX4/AirframeComponent.qml @@ -130,7 +130,7 @@ QGCView { qsTr("You've connected a %1.").arg(controller.currentVehicleName) : qsTr("Airframe is not set.")) + qsTr("To change this configuration, select the desired airframe below then click “Apply and Restart”.") - font.weight: Font.DemiBold + font.family: ScreenTools.demiboldFontFamily wrapMode: Text.WordWrap } diff --git a/src/AutoPilotPlugins/PX4/CameraComponent.qml b/src/AutoPilotPlugins/PX4/CameraComponent.qml index 45a25ddad5c98a4fb55887fda7e3d13a88363de0..3fe01882e0a6c625593be626f9238b63f4f3b553 100644 --- a/src/AutoPilotPlugins/PX4/CameraComponent.qml +++ b/src/AutoPilotPlugins/PX4/CameraComponent.qml @@ -131,7 +131,7 @@ QGCView { */ QGCLabel { text: qsTr("Camera Trigger Settings") - font.weight: Font.DemiBold + font.family: ScreenTools.demiboldFontFamily } Rectangle { id: camTrigRect @@ -213,7 +213,7 @@ QGCView { Item { width: 1; height: _margins * 0.5; } QGCLabel { text: qsTr("Hardware Settings") - font.weight: Font.DemiBold + font.family: ScreenTools.demiboldFontFamily visible: _auxPins } Rectangle { diff --git a/src/AutoPilotPlugins/PX4/FlightModesComponentSummary.qml b/src/AutoPilotPlugins/PX4/FlightModesComponentSummary.qml index 0bce908b661a06ada2f3df97292c34e3662b88a4..730c9dd859b01445af296523350a71e92ae13395 100644 --- a/src/AutoPilotPlugins/PX4/FlightModesComponentSummary.qml +++ b/src/AutoPilotPlugins/PX4/FlightModesComponentSummary.qml @@ -20,26 +20,21 @@ FactPanel { property Fact _rcMapModeSw: controller.getParameterFact(-1, "RC_MAP_MODE_SW") property bool _simpleMode: _rcMapFltmode.value > 0 || _rcMapModeSw.value == 0 - Loader { anchors.fill: parent + anchors.margins: 8 sourceComponent: _simpleMode ? simple : advanced } Component { id: simple - Column { - anchors.margins: 8 - VehicleSummaryRow { labelText: qsTr("Mode switch:") valueText: _rcMapFltmode.value === 0 ? qsTr("Setup required") : _rcMapFltmode.enumStringValue } - Repeater { model: 6 - VehicleSummaryRow { labelText: qsTr("Flight Mode %1 :").arg(index + 1) valueText: controller.getParameterFact(-1, "COM_FLTMODE" + (index + 1)).enumStringValue @@ -50,29 +45,22 @@ FactPanel { Component { id: advanced - Column { - anchors.margins: 8 - property Fact posCtlSwFact: controller.getParameterFact(-1, "RC_MAP_POSCTL_SW") property Fact loiterSwFact: controller.getParameterFact(-1, "RC_MAP_LOITER_SW") property Fact returnSwFact: controller.getParameterFact(-1, "RC_MAP_RETURN_SW") - VehicleSummaryRow { labelText: qsTr("Mode switch:") valueText: _rcMapModeSw.value === 0 ? qsTr("Setup required") : _rcMapModeSw.valueString } - VehicleSummaryRow { labelText: qsTr("Position Ctl switch:") valueText: posCtlSwFact.value === 0 ? qsTr("Disabled") : posCtlSwFact.valueString } - VehicleSummaryRow { labelText: qsTr("Loiter switch:") valueText: loiterSwFact.value === 0 ? qsTr("Disabled") : loiterSwFact.valueString } - VehicleSummaryRow { labelText: qsTr("Return switch:") valueText: returnSwFact.value === 0 ? qsTr("Disabled") : returnSwFact.valueString diff --git a/src/AutoPilotPlugins/PX4/PX4SimpleFlightModes.qml b/src/AutoPilotPlugins/PX4/PX4SimpleFlightModes.qml index 525f91e3dfc570ba2e07ab964d696a5a37fcd12f..6e06dd8dc6886e6f790ccfbedfdc7845d72156aa 100644 --- a/src/AutoPilotPlugins/PX4/PX4SimpleFlightModes.qml +++ b/src/AutoPilotPlugins/PX4/PX4SimpleFlightModes.qml @@ -71,7 +71,7 @@ Item { QGCLabel { id: flightModeLabel text: qsTr("Flight Mode Settings") - font.weight: Font.DemiBold + font.family: ScreenTools.demiboldFontFamily } Rectangle { @@ -136,7 +136,7 @@ Item { QGCLabel { text: qsTr("Switch Settings") - font.weight: Font.DemiBold + font.family: ScreenTools.demiboldFontFamily } Rectangle { diff --git a/src/AutoPilotPlugins/PX4/PowerComponent.qml b/src/AutoPilotPlugins/PX4/PowerComponent.qml index 82068919eeecd239c0e5ec4d802532a48026024f..5b1c75dfeda153f0a76689140e7b9872b7280263 100644 --- a/src/AutoPilotPlugins/PX4/PowerComponent.qml +++ b/src/AutoPilotPlugins/PX4/PowerComponent.qml @@ -123,7 +123,7 @@ QGCView { QGCLabel { text: qsTr("Battery") - font.weight: Font.DemiBold + font.family: ScreenTools.demiboldFontFamily } Rectangle { @@ -236,7 +236,7 @@ QGCView { QGCLabel { text: qsTr("ESC PWM Minimum and Maximum Calibration") - font.weight: Font.DemiBold + font.family: ScreenTools.demiboldFontFamily } Rectangle { @@ -276,7 +276,7 @@ QGCView { QGCLabel { text: qsTr("UAVCAN Bus Configuration") - font.weight: Font.DemiBold + font.family: ScreenTools.demiboldFontFamily visible: showUAVCAN.checked } @@ -306,7 +306,7 @@ QGCView { QGCLabel { text: qsTr("UAVCAN Motor Index and Direction Assignment") - font.weight: Font.DemiBold + font.family: ScreenTools.demiboldFontFamily visible: showUAVCAN.checked } @@ -358,7 +358,7 @@ QGCView { QGCLabel { text: qsTr("Advanced Power Settings") - font.weight: Font.DemiBold + font.family: ScreenTools.demiboldFontFamily visible: showAdvanced.checked } diff --git a/src/AutoPilotPlugins/PX4/SafetyComponent.qml b/src/AutoPilotPlugins/PX4/SafetyComponent.qml index 0c08fff5dd1916e866e85d56bf381e3fa4c77aa5..c8332748ff228d495282329159eb2140d375d8e5 100644 --- a/src/AutoPilotPlugins/PX4/SafetyComponent.qml +++ b/src/AutoPilotPlugins/PX4/SafetyComponent.qml @@ -44,7 +44,7 @@ QGCView { QGCPalette { id: palette; colorGroupEnabled: enabled } property real _margins: ScreenTools.defaultFontPixelHeight - property real _middleRowWidth: ScreenTools.defaultFontPixelWidth * 22 + property real _middleRowWidth: ScreenTools.defaultFontPixelWidth * 24 property real _editFieldWidth: ScreenTools.defaultFontPixelWidth * 18 property Fact _fenceAction: controller.getParameterFact(-1, "GF_ACTION") @@ -55,7 +55,7 @@ QGCView { property Fact _rcLossAction: controller.getParameterFact(-1, "NAV_RCL_ACT") property Fact _dlLossAction: controller.getParameterFact(-1, "NAV_DLL_ACT") property Fact _disarmLandDelay: controller.getParameterFact(-1, "COM_DISARM_LAND") - property Fact _landSpeedMC: controller.getParameterFact(-1, "MPC_LAND_SPEED", false) + property Fact _landSpeedMC: controller.getParameterFact(-1, "MPC_LAND_SPEED", false) QGCViewPanel { id: panel @@ -75,7 +75,7 @@ QGCView { Item { width: 1; height: _margins * 0.5; } QGCLabel { text: qsTr("Low Battery Failsafe Trigger") - font.weight: Font.DemiBold + font.family: ScreenTools.demiboldFontFamily } Rectangle { color: palette.windowShade @@ -146,7 +146,7 @@ QGCView { */ QGCLabel { text: qsTr("RC Loss Failsafe Trigger") - font.weight: Font.DemiBold + font.family: ScreenTools.demiboldFontFamily } Rectangle { color: palette.windowShade @@ -203,7 +203,7 @@ QGCView { */ QGCLabel { text: qsTr("Data Link Loss Failsafe Trigger") - font.weight: Font.DemiBold + font.family: ScreenTools.demiboldFontFamily } Rectangle { color: palette.windowShade @@ -260,7 +260,7 @@ QGCView { */ QGCLabel { text: qsTr("Geofence Failsafe Trigger") - font.weight: Font.DemiBold + font.family: ScreenTools.demiboldFontFamily } Rectangle { color: palette.windowShade @@ -340,7 +340,7 @@ QGCView { QGCLabel { id: rtlLabel text: qsTr("Return Home Settings") - font.weight: Font.DemiBold + font.family: ScreenTools.demiboldFontFamily } Rectangle { id: rtlSettings @@ -453,7 +453,7 @@ QGCView { */ QGCLabel { text: qsTr("Land Mode Settings") - font.weight: Font.DemiBold + font.family: ScreenTools.demiboldFontFamily } Rectangle { color: palette.windowShade diff --git a/src/FlightDisplay/FlightDisplayViewVideo.qml b/src/FlightDisplay/FlightDisplayViewVideo.qml index 6ca1221d32fe6f0c8e8a76a51f3b4e025b92516c..e81f580da21d054446f6f15083d32b4f701ffb86 100644 --- a/src/FlightDisplay/FlightDisplayViewVideo.qml +++ b/src/FlightDisplay/FlightDisplayViewVideo.qml @@ -43,7 +43,7 @@ Item { visible: !_controller.videoRunning QGCLabel { text: qsTr("NO VIDEO") - font.weight: Font.DemiBold + font.family: ScreenTools.demiboldFontFamily color: "white" font.pixelSize: _mainIsMap ? 12 * ScreenTools.fontHRatio : 20 * ScreenTools.fontHRatio anchors.centerIn: parent diff --git a/src/FlightMap/FlightMap.qml b/src/FlightMap/FlightMap.qml index 6b95c5192795535875943fd4227b26a345a44325..d472a36c0193fb0acbee5f80e839c85136c7fc1a 100644 --- a/src/FlightMap/FlightMap.qml +++ b/src/FlightMap/FlightMap.qml @@ -200,7 +200,7 @@ Map { QGCLabel { id: scaleText color: isSatelliteMap ? "white" : "black" - font.weight: Font.DemiBold + font.family: ScreenTools.demiboldFontFamily horizontalAlignment: Text.AlignHCenter anchors.bottom: parent.bottom anchors.right: parent.right diff --git a/src/FlightMap/Widgets/QGCCompassWidget.qml b/src/FlightMap/Widgets/QGCCompassWidget.qml index 5a7635c1e6dc94c8db4bdeeb4b0514419affaa7d..2384e21de62cc39c044c8029cfc9a7ef91d47df1 100644 --- a/src/FlightMap/Widgets/QGCCompassWidget.qml +++ b/src/FlightMap/Widgets/QGCCompassWidget.qml @@ -90,7 +90,7 @@ Item { QGCLabel { text: active ? heading.toFixed(0) : qsTr("OFF") - font.weight: active ? Font.DemiBold : Font.Light + font.family: active ? ScreenTools.demiboldFontFamily : ScreenTools.normalFontFamily font.pixelSize: _fontSize < 1 ? 1 : _fontSize; color: "white" anchors.centerIn: parent diff --git a/src/FlightMap/Widgets/QGCPitchIndicator.qml b/src/FlightMap/Widgets/QGCPitchIndicator.qml index ba461461d11d156aa794f114219be0cbaffb22d4..b3341ee493a579702d833f23abb18f0cbd1dba02 100644 --- a/src/FlightMap/Widgets/QGCPitchIndicator.qml +++ b/src/FlightMap/Widgets/QGCPitchIndicator.qml @@ -71,7 +71,7 @@ Rectangle { anchors.horizontalCenterOffset: -(_longDash * 0.8) anchors.verticalCenter: parent.verticalCenter smooth: true - font.weight: Font.DemiBold + font.family: ScreenTools.demiboldFontFamily font.pixelSize: _fontSize < 1 ? 1 : _fontSize; text: _pitch color: "white" @@ -82,7 +82,7 @@ Rectangle { anchors.horizontalCenterOffset: (_longDash * 0.8) anchors.verticalCenter: parent.verticalCenter smooth: true - font.weight: Font.DemiBold + font.family: ScreenTools.demiboldFontFamily font.pixelSize: _fontSize < 1 ? 1 : _fontSize; text: _pitch color: "white" diff --git a/src/FlightMap/Widgets/ValuesWidget.qml b/src/FlightMap/Widgets/ValuesWidget.qml index 8b55c4a7a31d952a8854a010e6b444c49d1b3998..f53f740fe54d287c69610e451a582a354ae5af4e 100644 --- a/src/FlightMap/Widgets/ValuesWidget.qml +++ b/src/FlightMap/Widgets/ValuesWidget.qml @@ -96,7 +96,7 @@ QGCFlickable { width: parent.width horizontalAlignment: Text.AlignHCenter font.pixelSize: ScreenTools.largeFontPixelSize * (largeValue ? 1.3 : 1.0) - font.weight: largeValue ? Font.ExtraBold : Font.Normal + font.family: largeValue ? ScreenTools.demiboldFontFamily : ScreenTools.normalFontFamily fontSizeMode: Text.HorizontalFit color: textColor text: fact.valueString diff --git a/src/QmlControls/AppMessages.qml b/src/QmlControls/AppMessages.qml index 454bb5099710abc80adf3001971e224380f7a2fb..75102314ddcda71b9ecf250ad7d0cefa7d079e4f 100644 --- a/src/QmlControls/AppMessages.qml +++ b/src/QmlControls/AppMessages.qml @@ -62,12 +62,13 @@ Rectangle { width: listview.width Text { + id: field + text: display + color: qgcPal.text + width: parent.width + wrapMode: Text.Wrap + font.family: ScreenTools.normalFontFamily anchors.verticalCenter: parent.verticalCenter - id: field - text: display - color: qgcPal.text - width: parent.width - wrapMode: Text.Wrap } } } diff --git a/src/QmlControls/DropButton.qml b/src/QmlControls/DropButton.qml index d01f57aaefc4c0d737056930eb9f6b2330babc7c..cc3afb975106d565a170a935427c01a491826a85 100644 --- a/src/QmlControls/DropButton.qml +++ b/src/QmlControls/DropButton.qml @@ -11,7 +11,7 @@ Item { signal clicked() property alias buttonImage: roundButton.buttonImage property alias rotateImage: roundButton.rotateImage - property real radius: ScreenTools.defaultFontPixelHeight * 1.5 + property real radius: ScreenTools.isTinyScreen ? ScreenTools.defaultFontPixelHeight * 2.5 : ScreenTools.defaultFontPixelHeight * 1.5 property int dropDirection: dropDown property alias dropDownComponent: dropDownLoader.sourceComponent property real viewportMargins: 0 diff --git a/src/QmlControls/FactSliderPanel.qml b/src/QmlControls/FactSliderPanel.qml index a1bde669ceaf1ddbb08ac22c772f953d84954726..6e1f4cc887e1797991febd07e8153eba4cd15de2 100644 --- a/src/QmlControls/FactSliderPanel.qml +++ b/src/QmlControls/FactSliderPanel.qml @@ -77,7 +77,7 @@ QGCView { QGCLabel { id: panelLabel text: panelTitle - font.weight: Font.DemiBold + font.family: ScreenTools.demiboldFontFamily } @@ -111,7 +111,7 @@ QGCView { QGCLabel { text: title - font.weight: Font.DemiBold + font.family: ScreenTools.demiboldFontFamily } QGCLabel { diff --git a/src/QmlControls/MissionCommandDialog.qml b/src/QmlControls/MissionCommandDialog.qml index 22bd172a1d7890767267561d4734050594c92e59..9a061beef548eeba84f6ac1be196c7dd01b544eb 100644 --- a/src/QmlControls/MissionCommandDialog.qml +++ b/src/QmlControls/MissionCommandDialog.qml @@ -93,7 +93,7 @@ QGCViewDialog { QGCLabel { text: mavCmdInfo.friendlyName color: textColor - font.weight: Font.DemiBold + font.family: ScreenTools.demiboldFontFamily } QGCLabel { diff --git a/src/QmlControls/ParameterEditor.qml b/src/QmlControls/ParameterEditor.qml index 2fd15d41c8a1716df96b5c50c55b8b50cae16f6c..6193d65bae0278cc7547d4ad9b68cb0d54e08409 100644 --- a/src/QmlControls/ParameterEditor.qml +++ b/src/QmlControls/ParameterEditor.qml @@ -43,7 +43,7 @@ QGCView { QGCPalette { id: __qgcPal; colorGroupEnabled: true } property Fact _editorDialogFact: Fact { } - property int _rowHeight: ScreenTools.defaultFontPixelHeight * 2 + property int _rowHeight: ScreenTools.isTinyScreen ? ScreenTools.defaultFontPixelHeight * 4 : ScreenTools.defaultFontPixelHeight * 2 property int _rowWidth: 10 // Dynamic adjusted at runtime property bool _searchFilter: false ///< true: showing results of search property var _searchResults ///< List of parameter names from search results @@ -53,7 +53,6 @@ QGCView { ParameterEditorController { id: controller; factPanel: panel - onShowErrorMessage: { showMessage(qsTr("Parameter Load Errors"), errorMsg, StandardButton.Ok) } @@ -76,7 +75,6 @@ QGCView { anchors.top: searchText.top anchors.bottom: searchText.bottom text: qsTr("Filter by:") - onClicked: { _searchResults = controller.searchParametersForComponent(-1, searchText.text) _searchFilter = true @@ -184,7 +182,7 @@ QGCView { spacing: Math.ceil(ScreenTools.defaultFontPixelHeight * 0.25) QGCLabel { text: qsTr("Component #: %1)").arg(componentId.toString()) - font.weight: Font.DemiBold + font.family: ScreenTools.demiboldFontFamily anchors.horizontalCenter: parent.horizontalCenter } ExclusiveGroup { id: groupGroup } diff --git a/src/QmlControls/QGCButton.qml b/src/QmlControls/QGCButton.qml index cdbfbc6bb4a5a6360d02a26676fb9a94d3a57d6c..4c3fa2f68874c30a6d4111d7b9dcc15e4bf1edd3 100644 --- a/src/QmlControls/QGCButton.qml +++ b/src/QmlControls/QGCButton.qml @@ -8,7 +8,7 @@ import QGroundControl.ScreenTools 1.0 Button { - property bool primary: false ///< primary button for a group of buttons + property bool primary: false ///< primary button for a group of buttons property var _qgcPal: QGCPalette { colorGroupEnabled: enabled } property bool _showHighlight: (pressed | hovered | checked) && !__forceHoverOff @@ -60,7 +60,13 @@ Button { background: Item { property bool down: control.pressed || (control.checkable && control.checked) implicitWidth: Math.round(TextSingleton.implicitHeight * 4.5) - implicitHeight: ScreenTools.isMobile ? ScreenTools.defaultFontPixelHeight * 2.5 : Math.max(25, Math.round(TextSingleton.implicitHeight * 1.2)) + implicitHeight: { + if(ScreenTools.isTinyScreen) + return ScreenTools.defaultFontPixelHeight * 3.5 + if(ScreenTools.isMobile) + return ScreenTools.defaultFontPixelHeight * 2.5 + return Math.max(25, Math.round(TextSingleton.implicitHeight * 1.2)) + } Rectangle { anchors.fill: parent @@ -103,9 +109,8 @@ Button { antialiasing: true text: control.text font.pixelSize: ScreenTools.defaultFontPixelSize - + font.family: ScreenTools.normalFontFamily anchors.verticalCenter: parent.verticalCenter - color: _showHighlight ? control._qgcPal.buttonHighlightText : (primary ? control._qgcPal.primaryButtonText : control._qgcPal.buttonText) diff --git a/src/QmlControls/QGCCheckBox.qml b/src/QmlControls/QGCCheckBox.qml index 437fb0084024291d32c7ad6734dcc2a652d14f9e..2d20c57f21bb553b72f709a9b269a86486a17bbe 100644 --- a/src/QmlControls/QGCCheckBox.qml +++ b/src/QmlControls/QGCCheckBox.qml @@ -30,8 +30,9 @@ CheckBox { text: control.text antialiasing: true font.pixelSize: ScreenTools.defaultFontPixelSize + font.family: ScreenTools.normalFontFamily + color: control.__qgcPal.text anchors.verticalCenter: parent.verticalCenter - color: control.__qgcPal.text } } } diff --git a/src/QmlControls/QGCComboBox.qml b/src/QmlControls/QGCComboBox.qml index 8107b7c167863e3181180e6aac0d3556caf8e520..ecd13579dc899e484ccdb2c3228c9015f20a7769 100644 --- a/src/QmlControls/QGCComboBox.qml +++ b/src/QmlControls/QGCComboBox.qml @@ -18,8 +18,14 @@ ComboBox { control._qgcPal.buttonText background: Item { - implicitWidth: Math.round(TextSingleton.implicitHeight * 4.5) - implicitHeight: ScreenTools.isMobile ? ScreenTools.defaultFontPixelHeight * 3 * 0.75 : Math.max(25, Math.round(TextSingleton.implicitHeight * 1.2)) + implicitWidth: Math.round(TextSingleton.implicitHeight * 4.5) + implicitHeight: { + if(ScreenTools.isTinyScreen) + return ScreenTools.defaultFontPixelHeight * 3.5 + if(ScreenTools.isMobile) + return ScreenTools.defaultFontPixelHeight * 2.5 + return Math.max(25, Math.round(TextSingleton.implicitHeight * 1.2)) + } Rectangle { anchors.fill: parent diff --git a/src/QmlControls/QGCLabel.qml b/src/QmlControls/QGCLabel.qml index 070e7c7baebdd823c63300772c15933714e75708..63faf1c6b0a4163628f9d47774662a37ada00426 100644 --- a/src/QmlControls/QGCLabel.qml +++ b/src/QmlControls/QGCLabel.qml @@ -11,6 +11,7 @@ Text { property bool enabled: true font.pixelSize: ScreenTools.defaultFontPixelSize + font.family: ScreenTools.normalFontFamily color: __qgcPal.text antialiasing: true } diff --git a/src/QmlControls/QGCRadioButton.qml b/src/QmlControls/QGCRadioButton.qml index 1894bd93a7cfa49f2286a15751b21368c9b4584f..67012e1c91e660b55c6b5402978ad44eb7a9679a 100644 --- a/src/QmlControls/QGCRadioButton.qml +++ b/src/QmlControls/QGCRadioButton.qml @@ -29,11 +29,10 @@ RadioButton { id: text text: control.text font.pixelSize: ScreenTools.defaultFontPixelSize + font.family: ScreenTools.normalFontFamily antialiasing: true - + color: control.__qgcPal.text anchors.centerIn: parent - - color: control.__qgcPal.text } } } diff --git a/src/QmlControls/QGCTextField.qml b/src/QmlControls/QGCTextField.qml index e8902a3224c684a71e244184e80d6f0e8ec40d8b..bdce66410281f06a0dd4861d276465c134fba0ee 100644 --- a/src/QmlControls/QGCTextField.qml +++ b/src/QmlControls/QGCTextField.qml @@ -19,15 +19,23 @@ TextField { property var __qgcPal: QGCPalette { colorGroupEnabled: enabled } - textColor: __qgcPal.textFieldText - height: ScreenTools.isMobile ? ScreenTools.defaultFontPixelHeight * 3 * 0.75 : implicitHeight + textColor: __qgcPal.textFieldText + + height: { + if(ScreenTools.isTinyScreen) + return ScreenTools.defaultFontPixelHeight * 3.5 + if(ScreenTools.isMobile) + return ScreenTools.defaultFontPixelHeight * 2.5 + return implicitHeight + } Label { - id: unitsLabelWidthGenerator - text: unitsLabel - width: contentWidth + ((parent.__contentHeight/3)*2) - visible: false - antialiasing: true + id: unitsLabelWidthGenerator + text: unitsLabel + width: contentWidth + ((parent.__contentHeight/3)*2) + visible: false + antialiasing: true + font.family: ScreenTools.normalFontFamily } style: TextFieldStyle { @@ -50,21 +58,22 @@ TextField { Text { id: unitsLabel - anchors.top: parent.top + anchors.top: parent.top anchors.bottom: parent.bottom - verticalAlignment: Text.AlignVCenter - horizontalAlignment: Text.AlignHCenter + verticalAlignment: Text.AlignVCenter + horizontalAlignment:Text.AlignHCenter - x: parent.width - width - width: unitsLabelWidthGenerator.width + x: parent.width - width + width: unitsLabelWidthGenerator.width - text: control.unitsLabel + text: control.unitsLabel font.pixelSize: ScreenTools.defaultFontPixelSize + font.family: ScreenTools.normalFontFamily antialiasing: true - color: control.textColor - visible: control.showUnits + color: control.textColor + visible: control.showUnits } } diff --git a/src/QmlControls/RoundButton.qml b/src/QmlControls/RoundButton.qml index 005067a50939a971fabfd832ccf5983dda033305..eee77ea5d22fd459132bb9f8139e4dbda0465c1c 100644 --- a/src/QmlControls/RoundButton.qml +++ b/src/QmlControls/RoundButton.qml @@ -10,7 +10,7 @@ Item { signal clicked() property alias buttonImage: button.source - property real radius: ScreenTools.defaultFontPixelHeight * 1.5 + property real radius: ScreenTools.isTinyScreen ? ScreenTools.defaultFontPixelHeight * 2.5 : ScreenTools.defaultFontPixelHeight * 1.5 property bool rotateImage: false property bool lightBorders: true diff --git a/src/QmlControls/ScreenTools.qml b/src/QmlControls/ScreenTools.qml index 4053ab46288709e4d023927f206b00de85ed49e8..93b88a1af91a9004fd58fbe373da1aee1b3a81b9 100644 --- a/src/QmlControls/ScreenTools.qml +++ b/src/QmlControls/ScreenTools.qml @@ -9,14 +9,16 @@ import QGroundControl.ScreenToolsController 1.0 Item { signal repaintRequested - property real availableHeight: 0 + property real availableHeight: 0 - readonly property real defaultFontPixelSize: _textMeasure.fontHeight * ScreenToolsController.defaultFontPixelSizeRatio - readonly property real defaultFontPixelHeight: defaultFontPixelSize - readonly property real defaultFontPixelWidth: _textMeasure.fontWidth * ScreenToolsController.defaultFontPixelSizeRatio - readonly property real smallFontPixelSize: defaultFontPixelSize * ScreenToolsController.smallFontPixelSizeRatio - readonly property real smallFontPixelHeight: smallFontPixelSize - readonly property real smallFontPixelWidth: defaultFontPixelWidth * ScreenToolsController.smallFontPixelSizeRatio + property real defaultFontPixelSize: 1 + property real defaultFontPixelHeight: 1 + property real defaultFontPixelWidth: 1 + property real smallFontPixelSize: 1 + property real smallFontPixelHeight: 1 + property real smallFontPixelWidth: 1 + property real mediumFontPixelSize: 1 + property real largeFontPixelSize: 1 // To proportionally scale fonts @@ -27,8 +29,8 @@ Item { // On OSX ElCapitan with Qt 5.4.0 any font pixel size above 19 shows garbage test. No idea why at this point. // Will remove Math.min when problem is figure out. - readonly property real mediumFontPixelSize: Math.min(defaultFontPixelSize * ScreenToolsController.mediumFontPixelSizeRatio, ScreenToolsController.isMobile ? 10000 : 19) - readonly property real largeFontPixelSize: Math.min(defaultFontPixelSize * ScreenToolsController.largeFontPixelSizeRatio, ScreenToolsController.isMobile ? 10000 : 19) + // readonly property real mediumFontPixelSize: Math.min(defaultFontPixelSize * ScreenToolsController.mediumFontPixelSizeRatio, ScreenToolsController.isMobile ? 10000 : 19) + // readonly property real largeFontPixelSize: Math.min(defaultFontPixelSize * ScreenToolsController.largeFontPixelSizeRatio, ScreenToolsController.isMobile ? 10000 : 19) property bool isAndroid: ScreenToolsController.isAndroid property bool isiOS: ScreenToolsController.isiOS @@ -37,6 +39,9 @@ Item { property bool isTinyScreen: (Screen.width / Screen.pixelDensity) < 120 // 120mm property bool isShortScreen: ScreenToolsController.isMobile && ((Screen.height / Screen.width) < 0.6) // Nexus 7 for example + readonly property string normalFontFamily: "opensans" + readonly property string demiboldFontFamily: "opensans-demibold" + function mouseX() { return ScreenToolsController.mouseX() } @@ -48,7 +53,29 @@ Item { Text { id: _textMeasure text: "X" - property real fontWidth: contentWidth * (ScreenToolsController.testHighDPI ? 2 : 1) - property real fontHeight: contentHeight * (ScreenToolsController.testHighDPI ? 2 : 1) + font.family: normalFontFamily + property real fontWidth: contentWidth * (ScreenToolsController.testHighDPI ? 2 : 1) + property real fontHeight: contentHeight * (ScreenToolsController.testHighDPI ? 2 : 1) + Component.onCompleted: { + var fudgeFactor = 1.0 + // Small Android Devices (Large Scaling Error) + if(ScreenToolsController.isAndroid && (Screen.width / Screen.pixelDensity) < 120) { + fudgeFactor = 0.6 + // Nexus 7 type + } else if(ScreenToolsController.isAndroid && (Screen.height / Screen.width) < 0.6) { + fudgeFactor = 0.75 + // iPhones + } else if (ScreenToolsController.isiOS && (Screen.width / Screen.pixelDensity) < 120) { + fudgeFactor = 0.75 + } + defaultFontPixelSize = _textMeasure.fontHeight * ScreenToolsController.defaultFontPixelSizeRatio * fudgeFactor + defaultFontPixelHeight = defaultFontPixelSize * fudgeFactor + defaultFontPixelWidth = _textMeasure.fontWidth * ScreenToolsController.defaultFontPixelSizeRatio * fudgeFactor + smallFontPixelSize = defaultFontPixelSize * ScreenToolsController.smallFontPixelSizeRatio * fudgeFactor + smallFontPixelHeight = smallFontPixelSize * fudgeFactor + smallFontPixelWidth = defaultFontPixelWidth * ScreenToolsController.smallFontPixelSizeRatio * fudgeFactor + mediumFontPixelSize = defaultFontPixelSize * ScreenToolsController.mediumFontPixelSizeRatio * fudgeFactor + largeFontPixelSize = defaultFontPixelSize * ScreenToolsController.largeFontPixelSizeRatio * fudgeFactor + } } } diff --git a/src/QmlControls/ScreenToolsController.cc b/src/QmlControls/ScreenToolsController.cc index 945482fd15ea3017aa580e5ef2f1d76a53604ed5..856397852d42d68f82bdfaf13a9e39d028686f4d 100644 --- a/src/QmlControls/ScreenToolsController.cc +++ b/src/QmlControls/ScreenToolsController.cc @@ -32,7 +32,9 @@ const double ScreenToolsController::_defaultFontPixelSizeRatio = 1.0; #elif __android__ const double ScreenToolsController::_defaultFontPixelSizeRatio = 1.0; #elif __ios__ -const double ScreenToolsController::_defaultFontPixelSizeRatio = 0.6; +const double ScreenToolsController::_defaultFontPixelSizeRatio = 0.8; +#elif defined Q_OS_LINUX +const double ScreenToolsController::_defaultFontPixelSizeRatio = 0.8; #else const double ScreenToolsController::_defaultFontPixelSizeRatio = 0.8; #endif diff --git a/src/QmlControls/SubMenuButton.qml b/src/QmlControls/SubMenuButton.qml index aad36aba13077845b0b76405111fb7b064b2d935..5adf22a1f984eb63d823a72476566a5de1cb2e48 100644 --- a/src/QmlControls/SubMenuButton.qml +++ b/src/QmlControls/SubMenuButton.qml @@ -14,7 +14,7 @@ Button { text: "Button" ///< Pass in your own button text checkable: true - implicitHeight: ScreenTools.isTinyScreen ? ScreenTools.defaultFontPixelHeight * 3 : ScreenTools.defaultFontPixelHeight * 2.5 + implicitHeight: ScreenTools.isTinyScreen ? ScreenTools.defaultFontPixelHeight * 5 : ScreenTools.defaultFontPixelHeight * 2.5 style: ButtonStyle { id: buttonStyle diff --git a/src/QtLocationPlugin/QMLControl/OfflineMap.qml b/src/QtLocationPlugin/QMLControl/OfflineMap.qml index beb3e60e324ec482be516e4bce43fe92b7a7dcbe..1e7de50facd4572371e22e3479c742a840fbe8b4 100644 --- a/src/QtLocationPlugin/QMLControl/OfflineMap.qml +++ b/src/QtLocationPlugin/QMLControl/OfflineMap.qml @@ -53,6 +53,10 @@ Rectangle { property real savedZoom: 3 property string savedMapType: "" + property real _newSetMiddleLabel: ScreenTools.isTinyScreen ? ScreenTools.defaultFontPixelWidth * 10 : ScreenTools.defaultFontPixelWidth * 14 + property real _newSetMiddleField: ScreenTools.isTinyScreen ? ScreenTools.defaultFontPixelWidth * 18 : ScreenTools.defaultFontPixelWidth * 20 + property real _netSetSliderWidth: ScreenTools.isTinyScreen ? ScreenTools.defaultFontPixelWidth * 12 : ScreenTools.defaultFontPixelWidth * 14 + property real oldlon0: 0 property real oldlon1: 0 property real oldlat0: 0 @@ -323,14 +327,14 @@ Rectangle { id: _cacheList width: Math.min(parent.width, (ScreenTools.defaultFontPixelWidth * 50).toFixed(0)) anchors.margins: ScreenTools.defaultFontPixelWidth - spacing: (ScreenTools.defaultFontPixelHeight * 0.5).toFixed(0) + spacing: ScreenTools.defaultFontPixelHeight * 0.5 anchors.horizontalCenter: parent.horizontalCenter OfflineMapButton { text: qsTr("Add new set") anchors.left: parent.left anchors.right: parent.right - height: (ScreenTools.defaultFontPixelHeight * 2).toFixed(0) + height: ScreenTools.isTinyScreen ? ScreenTools.defaultFontPixelHeight * 4 : ScreenTools.defaultFontPixelHeight * 2 onClicked: { _offlineMapRoot._currentSelection = null showMap() @@ -344,7 +348,7 @@ Rectangle { complete: object.complete anchors.left: parent.left anchors.right: parent.right - height: (ScreenTools.defaultFontPixelHeight * 2).toFixed(0) + height: ScreenTools.isTinyScreen ? ScreenTools.defaultFontPixelHeight * 4 : ScreenTools.defaultFontPixelHeight * 2 onClicked: { _offlineMapRoot._currentSelection = object showInfo() @@ -451,18 +455,20 @@ Rectangle { Column { anchors.verticalCenter: parent.verticalCenter Label { - text: qsTr("Min") - color: "black" - width: ScreenTools.defaultFontPixelWidth * 5 - font.pixelSize: ScreenTools.smallFontPixelSize - horizontalAlignment: Text.AlignHCenter + text: qsTr("Min") + color: "black" + width: ScreenTools.defaultFontPixelWidth * 5 + font.pixelSize: ScreenTools.smallFontPixelSize + horizontalAlignment: Text.AlignHCenter + font.family: ScreenTools.normalFontFamily } Label { - text: qsTr("Zoom") - color: "black" - width: ScreenTools.defaultFontPixelWidth * 5 - font.pixelSize: ScreenTools.smallFontPixelSize - horizontalAlignment: Text.AlignHCenter + text: qsTr("Zoom") + color: "black" + width: ScreenTools.defaultFontPixelWidth * 5 + font.family: ScreenTools.normalFontFamily + font.pixelSize: ScreenTools.smallFontPixelSize + horizontalAlignment: Text.AlignHCenter } } Slider { @@ -476,7 +482,7 @@ Rectangle { anchors.verticalCenter: parent.verticalCenter style: SliderStyle { groove: Rectangle { - implicitWidth: ScreenTools.defaultFontPixelWidth * 12 + implicitWidth: ScreenTools.defaultFontPixelWidth * 14 implicitHeight: 4 color: "gray" radius: 4 @@ -490,8 +496,9 @@ Rectangle { implicitHeight: ScreenTools.isAndroid ? 60 : 30 radius: 10 Label { - text: _slider0.value - anchors.centerIn: parent + text: _slider0.value + anchors.centerIn: parent + font.family: ScreenTools.normalFontFamily } } } @@ -515,17 +522,19 @@ Rectangle { Column { anchors.verticalCenter: parent.verticalCenter Label { - text: qsTr("Max") - color: "black" - width: ScreenTools.defaultFontPixelWidth * 5 + text: qsTr("Max") + color: "black" + width: ScreenTools.defaultFontPixelWidth * 5 font.pixelSize: ScreenTools.smallFontPixelSize + font.family: ScreenTools.normalFontFamily horizontalAlignment: Text.AlignHCenter } Label { - text: qsTr("Zoom") - color: "black" - width: ScreenTools.defaultFontPixelWidth * 5 + text: qsTr("Zoom") + color: "black" + width: ScreenTools.defaultFontPixelWidth * 5 font.pixelSize: ScreenTools.smallFontPixelSize + font.family: ScreenTools.normalFontFamily horizontalAlignment: Text.AlignHCenter } } @@ -540,7 +549,7 @@ Rectangle { anchors.verticalCenter: parent.verticalCenter style: SliderStyle { groove: Rectangle { - implicitWidth: ScreenTools.defaultFontPixelWidth * 12 + implicitWidth: ScreenTools.defaultFontPixelWidth * 14 implicitHeight: 4 color: "gray" radius: 4 @@ -554,8 +563,9 @@ Rectangle { implicitHeight: ScreenTools.isAndroid ? 60 : 30 radius: 10 Label { - text: _slider1.value - anchors.centerIn: parent + text: _slider1.value + font.family: ScreenTools.normalFontFamily + anchors.centerIn: parent } } } @@ -577,29 +587,33 @@ Rectangle { spacing: ScreenTools.defaultFontPixelHeight * 0.5 anchors.verticalCenter: parent.verticalCenter Label { - text: qsTr("Tile Count") - color: "black" - width: ScreenTools.defaultFontPixelWidth * 8 + text: qsTr("Tile Count") + color: "black" + width: ScreenTools.defaultFontPixelWidth * 12 font.pixelSize: ScreenTools.smallFontPixelSize + font.family: ScreenTools.normalFontFamily horizontalAlignment: Text.AlignHCenter } Label { - text: QGroundControl.mapEngineManager.tileCountStr - color: "black" - width: ScreenTools.defaultFontPixelWidth * 8 + text: QGroundControl.mapEngineManager.tileCountStr + color: "black" + width: ScreenTools.defaultFontPixelWidth * 12 + font.family: ScreenTools.normalFontFamily horizontalAlignment: Text.AlignHCenter } Label { - text: qsTr("Set Size (Est)") - color: "black" - width: ScreenTools.defaultFontPixelWidth * 8 + text: qsTr("Set Size (Est)") + color: "black" + width: ScreenTools.defaultFontPixelWidth * 12 font.pixelSize: ScreenTools.smallFontPixelSize + font.family: ScreenTools.normalFontFamily horizontalAlignment: Text.AlignHCenter } Label { - text: QGroundControl.mapEngineManager.tileSizeStr - color: "black" - width: ScreenTools.defaultFontPixelWidth * 8 + text: QGroundControl.mapEngineManager.tileSizeStr + color: "black" + width: ScreenTools.defaultFontPixelWidth * 12 + font.family: ScreenTools.normalFontFamily horizontalAlignment: Text.AlignHCenter } } @@ -609,45 +623,45 @@ Rectangle { anchors.verticalCenter: parent.verticalCenter spacing: ScreenTools.defaultFontPixelHeight * 0.5 Row { - spacing: ScreenTools.defaultFontPixelWidth * 2 + spacing: ScreenTools.defaultFontPixelWidth QGCLabel { text: qsTr("Name:") - width: ScreenTools.defaultFontPixelWidth * 10 + width: _newSetMiddleLabel anchors.verticalCenter: parent.verticalCenter horizontalAlignment: Text.AlignRight } QGCTextField { id: setName - width: ScreenTools.defaultFontPixelWidth * 20 + width: _newSetMiddleField anchors.verticalCenter: parent.verticalCenter } } Row { - spacing: ScreenTools.defaultFontPixelWidth * 2 + spacing: ScreenTools.defaultFontPixelWidth QGCLabel { - text: qsTr("Description:") - width: ScreenTools.defaultFontPixelWidth * 10 + text: qsTr("Description:") + width: _newSetMiddleLabel anchors.verticalCenter: parent.verticalCenter horizontalAlignment: Text.AlignRight } QGCTextField { id: setDescription text: qsTr("Description") - width: ScreenTools.defaultFontPixelWidth * 20 + width: _newSetMiddleField anchors.verticalCenter: parent.verticalCenter } } Row { - spacing: ScreenTools.defaultFontPixelWidth * 2 + spacing: ScreenTools.defaultFontPixelWidth QGCLabel { - text: qsTr("Map Type:") - width: ScreenTools.defaultFontPixelWidth * 10 + text: qsTr("Map Type:") + width: _newSetMiddleLabel anchors.verticalCenter: parent.verticalCenter horizontalAlignment: Text.AlignRight } QGCComboBox { id: mapCombo - width: ScreenTools.defaultFontPixelWidth * 20 + width: _newSetMiddleField model: QGroundControl.mapEngineManager.mapList onActivated: { mapType = textAt(index) @@ -676,7 +690,7 @@ Rectangle { QGCButton { text: qsTr("Download") enabled: setName.text.length > 0 - width: ScreenTools.defaultFontPixelWidth * 10 + width: ScreenTools.defaultFontPixelWidth * 12 onClicked: { if(QGroundControl.mapEngineManager.findName(setName.text)) { duplicateName.visible = true @@ -693,7 +707,7 @@ Rectangle { } QGCButton { text: qsTr("Cancel") - width: ScreenTools.defaultFontPixelWidth * 10 + width: ScreenTools.defaultFontPixelWidth * 12 onClicked: { showList() } @@ -1037,7 +1051,7 @@ Rectangle { QGCLabel { id: optionsLabel text: qsTr("Offline Map Options") - font.pixelSize: ScreenTools.isAndroid ? ScreenTools.mediumFontPixelSize : ScreenTools.largeFontPixelSize + font.pixelSize: ScreenTools.largeFontPixelSize anchors.centerIn: parent } } diff --git a/src/VehicleSetup/PX4FlowSensor.qml b/src/VehicleSetup/PX4FlowSensor.qml index 6d889ec41aa2d383e3eef93138b7b24a2b18c4e7..95c4309ecb99ede2acaa2be2f2a1ee5d4b3917a5 100644 --- a/src/VehicleSetup/PX4FlowSensor.qml +++ b/src/VehicleSetup/PX4FlowSensor.qml @@ -49,7 +49,7 @@ QGCView { QGCLabel { id: titleLabel text: qsTr("PX4Flow Camera") - font.weight: Font.DemiBold + font.family: ScreenTools.demiboldFontFamily } Image { diff --git a/src/VehicleSetup/VehicleSummary.qml b/src/VehicleSetup/VehicleSummary.qml index 34a0ee86e2f450d17972559c8f5fde3e1c07c7fc..ebe10e344c2f67e21765be970a547e1c09dc0e0b 100644 --- a/src/VehicleSetup/VehicleSummary.qml +++ b/src/VehicleSetup/VehicleSummary.qml @@ -35,11 +35,13 @@ import QGroundControl.Palette 1.0 Rectangle { id: _summaryRoot anchors.fill: parent + anchors.rightMargin: ScreenTools.defaultFontPixelWidth + anchors.leftMargin: ScreenTools.defaultFontPixelWidth color: qgcPal.window - property real _minSummaryW: ScreenTools.defaultFontPixelWidth * 40 + property real _minSummaryW: ScreenTools.defaultFontPixelWidth * 42 property real _summaryBoxWidth: _minSummaryW - property real _summaryBoxSpace: ScreenTools.defaultFontPixelWidth + property real _summaryBoxSpace: ScreenTools.defaultFontPixelWidth * 2 function computeSummaryBoxSize() { var sw = 0 @@ -51,7 +53,7 @@ Rectangle { } else { _summaryBoxSpace = 0 if(idx > 1) { - _summaryBoxSpace = ScreenTools.defaultFontPixelWidth + _summaryBoxSpace = ScreenTools.defaultFontPixelWidth * 2 sw = _summaryBoxSpace * (idx - 1) } rw = _summaryRoot.width - sw @@ -92,7 +94,7 @@ Rectangle { width: parent.width wrapMode: Text.WordWrap color: setupComplete ? qgcPal.text : qgcPal.warningText - font.weight: Font.DemiBold + font.family: ScreenTools.demiboldFontFamily horizontalAlignment: Text.AlignHCenter text: setupComplete ? qsTr("Below you will find a summary of the settings for your vehicle. To the left are the setup menus for each component.") : @@ -111,11 +113,16 @@ Rectangle { // Outer summary item rectangle Rectangle { width: _summaryBoxWidth - height: ScreenTools.defaultFontPixelHeight * 13 - color: qgcPal.window + height: ScreenTools.isTinyScreen ? ScreenTools.defaultFontPixelHeight * 20 : ScreenTools.defaultFontPixelHeight * 13 + color: qgcPal.windowShade visible: modelData.summaryQmlSource.toString() !== "" + border.width: 1 + border.color: qgcPal.text + Component.onCompleted: { + border.color = Qt.rgba(border.color.r, border.color.g, border.color.b, 0.1) + } - readonly property real titleHeight: ScreenTools.defaultFontPixelHeight * 2 + readonly property real titleHeight: ScreenTools.isTinyScreen ? ScreenTools.defaultFontPixelHeight * 4 : ScreenTools.defaultFontPixelHeight * 2 // Title bar QGCButton { @@ -126,21 +133,19 @@ Rectangle { // Setup indicator Rectangle { - anchors.rightMargin: ScreenTools.defaultFontPixelWidth * 0.5 + anchors.rightMargin: ScreenTools.defaultFontPixelWidth anchors.right: parent.right anchors.verticalCenter: parent.verticalCenter - width: ScreenTools.defaultFontPixelWidth * 1.5 + width: ScreenTools.defaultFontPixelWidth * 1.75 height: width radius: width / 2 color: modelData.setupComplete ? "#00d932" : "red" visible: modelData.requiresSetup } - onClicked : { setupView.showVehicleComponentPanel(modelData) } } - // Summary Qml Rectangle { anchors.top: titleBar.bottom diff --git a/src/ui/MainWindow.cc b/src/ui/MainWindow.cc index 30fd4398d63750a2aa3444b61c972e90690ab1e7..e5fdfdfc79e7e2ee2c93bda7af14d1025ad1fb5c 100644 --- a/src/ui/MainWindow.cc +++ b/src/ui/MainWindow.cc @@ -141,6 +141,14 @@ MainWindow::MainWindow() Q_ASSERT(_instance == NULL); _instance = this; + //-- Load fonts + if(QFontDatabase::addApplicationFont(":/fonts/opensans") < 0) { + qWarning() << "Could not load /fonts/opensans font"; + } + if(QFontDatabase::addApplicationFont(":/fonts/opensans-demibold") < 0) { + qWarning() << "Could not load /fonts/opensans-demibold font"; + } + // Qt 4/5 on Ubuntu does place the native menubar correctly so on Linux we revert back to in-window menu bar. #ifdef Q_OS_LINUX menuBar()->setNativeMenuBar(false); diff --git a/src/ui/MainWindowInner.qml b/src/ui/MainWindowInner.qml index acb23179763337c91f3787e80b86808b35ee5c86..5c30bb1e998577958c09e6873260d6452a366ac5 100644 --- a/src/ui/MainWindowInner.qml +++ b/src/ui/MainWindowInner.qml @@ -368,10 +368,11 @@ Item { pixelAligned: true clip: true TextEdit { - id: messageText - readOnly: true - textFormat: TextEdit.RichText - color: "white" + id: messageText + readOnly: true + textFormat: TextEdit.RichText + color: "white" + font.family: ScreenTools.normalFontFamily } } //-- Dismiss System Message @@ -379,8 +380,8 @@ Item { anchors.margins: ScreenTools.defaultFontPixelHeight anchors.top: parent.top anchors.right: parent.right - width: ScreenTools.defaultFontPixelHeight * 1.5 - height: ScreenTools.defaultFontPixelHeight * 1.5 + width: ScreenTools.isTinyScreen ? ScreenTools.defaultFontPixelHeight * 2.5 : ScreenTools.defaultFontPixelHeight * 1.5 + height: width source: "/res/XDelete.svg" fillMode: Image.PreserveAspectFit mipmap: true @@ -404,7 +405,8 @@ Item { criticalMessageText.text = "" //-- Show all messages in queue for (var i = 0; i < mainWindow.messageQueue.length; i++) { - criticalMessageText.append(mainWindow.messageQueue[i]) + var text = mainWindow.messageQueue[i] + criticalMessageText.append(text) } //-- Clear it mainWindow.messageQueue = [] @@ -449,7 +451,7 @@ Item { anchors.left: parent.left readOnly: true textFormat: TextEdit.RichText - font.weight: Font.DemiBold + font.family: ScreenTools.demiboldFontFamily wrapMode: TextEdit.WordWrap color: qgcPal.warningText } @@ -461,12 +463,11 @@ Item { anchors.margins: ScreenTools.defaultFontPixelHeight anchors.top: parent.top anchors.right: parent.right - width: ScreenTools.defaultFontPixelHeight * 1.5 - height: ScreenTools.defaultFontPixelHeight * 1.5 + width: ScreenTools.isTinyScreen ? ScreenTools.defaultFontPixelHeight * 2.5 : ScreenTools.defaultFontPixelHeight * 1.5 + height: width source: "/res/XDelete.svg" fillMode: Image.PreserveAspectFit color: qgcPal.warningText - MouseArea { anchors.fill: parent onClicked: { diff --git a/src/ui/MainWindowLeftPanel.qml b/src/ui/MainWindowLeftPanel.qml index a6a3121fc36052bbb5f02d1e38851fb061d5913c..df40417270655b08956efcbd730459192f67320a 100644 --- a/src/ui/MainWindowLeftPanel.qml +++ b/src/ui/MainWindowLeftPanel.qml @@ -133,7 +133,7 @@ Item { // This is the menu dialog panel which is anchored to the left edge Rectangle { id: __leftMenu - width: ScreenTools.defaultFontPixelWidth * 14 + width: ScreenTools.defaultFontPixelWidth * 16 anchors.left: parent.left anchors.top: __topSeparator.bottom anchors.bottom: parent.bottom @@ -193,7 +193,6 @@ Item { anchors.right: parent.right text: qsTr("Offline Maps") exclusiveGroup: panelActionGroup - visible: !ScreenTools.isTinyScreen onClicked: { if(__rightPanel.source != "OfflineMap.qml") { __rightPanel.source = "OfflineMap.qml" diff --git a/src/ui/preferences/DebugWindow.qml b/src/ui/preferences/DebugWindow.qml index 5cdd8931cb29dc96e8d2c5045a339f8e3e4203b2..dc577bce59f43302389d3bf2087dc21805fad744 100644 --- a/src/ui/preferences/DebugWindow.qml +++ b/src/ui/preferences/DebugWindow.qml @@ -44,9 +44,10 @@ QGCView { anchors.fill: parent Text { - id: _textMeasure - text: "X" - color: qgcPal.window + id: _textMeasure + text: "X" + color: qgcPal.window + font.family: ScreenTools.normalFontFamily } GridLayout { @@ -57,74 +58,92 @@ QGCView { Text { text: qsTr("Qt Platform:") color: qgcPal.text + font.family: ScreenTools.normalFontFamily } Text { text: Qt.platform.os color: qgcPal.text + font.family: ScreenTools.normalFontFamily } Text { text: qsTr("Default font width:") color: qgcPal.text + font.family: ScreenTools.normalFontFamily } Text { text: _textMeasure.contentWidth color: qgcPal.text + font.family: ScreenTools.normalFontFamily } Text { text: qsTr("Default font height:") color: qgcPal.text + font.family: ScreenTools.normalFontFamily } Text { text: _textMeasure.contentHeight color: qgcPal.text + font.family: ScreenTools.normalFontFamily } Text { text: qsTr("Default font pixel size:") color: qgcPal.text + font.family: ScreenTools.normalFontFamily } Text { text: _textMeasure.font.pixelSize color: qgcPal.text + font.family: ScreenTools.normalFontFamily } Text { text: qsTr("Default font point size:") color: qgcPal.text + font.family: ScreenTools.normalFontFamily } Text { text: _textMeasure.font.pointSize color: qgcPal.text + font.family: ScreenTools.normalFontFamily } Text { text: qsTr("QML Screen Desktop:") color: qgcPal.text + font.family: ScreenTools.normalFontFamily } Text { text: Screen.desktopAvailableWidth + " x " + Screen.desktopAvailableHeight color: qgcPal.text + font.family: ScreenTools.normalFontFamily } Text { text: qsTr("QML Screen Size:") color: qgcPal.text + font.family: ScreenTools.normalFontFamily } Text { text: Screen.width + " x " + Screen.height color: qgcPal.text + font.family: ScreenTools.normalFontFamily } Text { text: qsTr("QML Pixel Density:") color: qgcPal.text + font.family: ScreenTools.normalFontFamily } Text { text: Screen.pixelDensity color: qgcPal.text + font.family: ScreenTools.normalFontFamily } Text { text: qsTr("QML Pixel Ratio:") color: qgcPal.text + font.family: ScreenTools.normalFontFamily } Text { text: Screen.devicePixelRatio color: qgcPal.text + font.family: ScreenTools.normalFontFamily } } diff --git a/src/ui/toolbar/MainToolBar.qml b/src/ui/toolbar/MainToolBar.qml index ebd44291e25e3b097c83150eb011f77d5d6d471d..ac3b71fbcacabb3e4b40f740bca86d6404eac92f 100644 --- a/src/ui/toolbar/MainToolBar.qml +++ b/src/ui/toolbar/MainToolBar.qml @@ -134,7 +134,7 @@ Rectangle { */ - readonly property real tbFontSmall: 10 * ScreenTools.fontHRatio + readonly property real tbFontSmall: 8 * ScreenTools.fontHRatio readonly property real tbFontNormal: 12 * ScreenTools.fontHRatio readonly property real tbFontLarge: 18 * ScreenTools.fontHRatio @@ -212,9 +212,9 @@ Rectangle { anchors.centerIn: parent QGCLabel { - id: gpsLabel - text: (activeVehicle && activeVehicle.gps.count.value >= 0) ? qsTr("GPS Status") : qsTr("GPS Data Unavailable") - font.weight:Font.DemiBold + id: gpsLabel + text: (activeVehicle && activeVehicle.gps.count.value >= 0) ? qsTr("GPS Status") : qsTr("GPS Data Unavailable") + font.family: ScreenTools.demiboldFontFamily anchors.horizontalCenter: parent.horizontalCenter } @@ -266,9 +266,9 @@ Rectangle { anchors.centerIn: parent QGCLabel { - id: battLabel - text: qsTr("Battery Status") - font.weight:Font.DemiBold + id: battLabel + text: qsTr("Battery Status") + font.family: ScreenTools.demiboldFontFamily anchors.horizontalCenter: parent.horizontalCenter } @@ -313,9 +313,9 @@ Rectangle { anchors.centerIn: parent QGCLabel { - id: rssiLabel - text: activeVehicle ? (activeVehicle.rcRSSI != 255 ? qsTr("RC RSSI Status") : qsTr("RC RSSI Data Unavailable")) : qsTr("N/A", "No data avaliable") - font.weight:Font.DemiBold + id: rssiLabel + text: activeVehicle ? (activeVehicle.rcRSSI != 255 ? qsTr("RC RSSI Status") : qsTr("RC RSSI Data Unavailable")) : qsTr("N/A", "No data avaliable") + font.family: ScreenTools.demiboldFontFamily anchors.horizontalCenter: parent.horizontalCenter } @@ -361,7 +361,7 @@ Rectangle { QGCLabel { id: telemLabel text: qsTr("Telemetry RSSI Status") - font.weight: Font.DemiBold + font.family: ScreenTools.demiboldFontFamily anchors.horizontalCenter: parent.horizontalCenter } @@ -504,7 +504,7 @@ Rectangle { id: connectionLost text: qsTr("COMMUNICATION LOST") font.pixelSize: tbFontLarge - font.weight: Font.DemiBold + font.family: ScreenTools.demiboldFontFamily color: colorRed anchors.rightMargin: ScreenTools.defaultFontPixelWidth anchors.right: disconnectButton.left diff --git a/src/ui/toolbar/MainToolBarIndicators.qml b/src/ui/toolbar/MainToolBarIndicators.qml index 308f42222ca41ac3ab368fbebaf99a4dca1b8ac5..629362b3ec4ef4965afe2c884d7f7a450c718696 100644 --- a/src/ui/toolbar/MainToolBarIndicators.qml +++ b/src/ui/toolbar/MainToolBarIndicators.qml @@ -183,12 +183,13 @@ Row { QGCLabel { anchors.top: parent.top - anchors.leftMargin: gpsIcon.width - anchors.left: parent.left + //anchors.leftMargin: gpsIcon.width + //anchors.left: parent.left + anchors.right: gpsRow.right visible: activeVehicle && !isNaN(activeVehicle.gps.hdop.value) font.pixelSize: tbFontSmall color: qgcPal.buttonText - text: activeVehicle ? activeVehicle.gps.hdop.valueString : "" + text: activeVehicle ? activeVehicle.gps.hdop.value.toFixed(0) : "" } MouseArea { @@ -470,7 +471,7 @@ Row { anchors.verticalCenter: parent.verticalCenter horizontalAlignment: Text.AlignRight font.pixelSize: ScreenTools.smallFontPixelSize - font.weight: Font.DemiBold + font.family: ScreenTools.demiboldFontFamily color: colorWhite } } @@ -503,7 +504,7 @@ Row { QGCLabel { text: 'R ' font.pixelSize: ScreenTools.smallFontPixelSize - font.weight: Font.DemiBold + font.family: ScreenTools.demiboldFontFamily color: colorWhite } QGCLabel { @@ -511,7 +512,7 @@ Row { width: getProportionalDimmension(30) horizontalAlignment: Text.AlignRight font.pixelSize: ScreenTools.smallFontPixelSize - font.weight: Font.DemiBold + font.family: ScreenTools.demiboldFontFamily color: colorWhite } } @@ -520,7 +521,7 @@ Row { QGCLabel { text: 'L ' font.pixelSize: ScreenTools.smallFontPixelSize - font.weight: Font.DemiBold + font.family: ScreenTools.demiboldFontFamily color: colorWhite } QGCLabel { @@ -528,7 +529,7 @@ Row { width: getProportionalDimmension(30) horizontalAlignment: Text.AlignRight font.pixelSize: ScreenTools.smallFontPixelSize - font.weight: Font.DemiBold + font.family: ScreenTools.demiboldFontFamily color: colorWhite } }