From fd091a62bbff62ad7f4bcbe7480241d17e31147c Mon Sep 17 00:00:00 2001 From: Don Gagne Date: Mon, 6 Jun 2016 13:19:21 -0700 Subject: [PATCH] Small screen updates --- src/ui/preferences/GeneralSettings.qml | 128 ++++++++++++++----------- 1 file changed, 70 insertions(+), 58 deletions(-) diff --git a/src/ui/preferences/GeneralSettings.qml b/src/ui/preferences/GeneralSettings.qml index 4ba389f21..12a5d0c43 100644 --- a/src/ui/preferences/GeneralSettings.qml +++ b/src/ui/preferences/GeneralSettings.qml @@ -28,8 +28,7 @@ Rectangle { anchors.margins: ScreenTools.defaultFontPixelWidth property Fact _percentRemainingAnnounce: QGroundControl.multiVehicleManager.disconnectedVehicle.battery.percentRemainingAnnounce - property real _firstLabelWidth: ScreenTools.defaultFontPixelWidth * 16 - property real _editFieldWidth: ScreenTools.defaultFontPixelWidth * 22 + property real _editFieldWidth: ScreenTools.defaultFontPixelWidth * 15 QGCPalette { id: qgcPal } @@ -48,11 +47,13 @@ Rectangle { text: qsTr("General Settings") font.pointSize: ScreenTools.mediumFontPointSize } + Rectangle { height: 1 width: parent.width - color: qgcPal.button + color: qgcPal.text } + Item { height: ScreenTools.defaultFontPixelHeight / 2 width: parent.width @@ -61,64 +62,64 @@ Rectangle { //----------------------------------------------------------------- //-- Base UI Font Point Size Row { - spacing: ScreenTools.defaultFontPixelWidth + spacing: ScreenTools.defaultFontPixelWidth + QGCLabel { - width: _firstLabelWidth - text: qsTr("Base UI font size:") + id: baseFontLabel + text: qsTr("Base UI font size:") anchors.verticalCenter: parent.verticalCenter } + Row { + id: baseFontRow + spacing: ScreenTools.defaultFontPixelWidth / 2 anchors.verticalCenter: parent.verticalCenter - Rectangle { - width: baseFontEdit.height - height: width - color: qgcPal.button - QGCLabel { - text: "-" - anchors.centerIn: parent - } - MouseArea { - anchors.fill: parent - onClicked: { - if(ScreenTools.defaultFontPointSize > 6) - QGroundControl.baseFontPointSize = QGroundControl.baseFontPointSize - 1 + + QGCButton { + id: decrementButton + width: height + height: baseFontEdit.height + text: "-" + + onClicked: { + if(ScreenTools.defaultFontPointSize > 6) { + QGroundControl.baseFontPointSize = QGroundControl.baseFontPointSize - 1 } } } + QGCTextField { - id: baseFontEdit - width: _editFieldWidth - (height * 2) - text: QGroundControl.baseFontPointSize - showUnits: true - unitsLabel: "pt" - maximumLength: 6 - validator: DoubleValidator {bottom: 6.0; top: 48.0; decimals: 2;} + id: baseFontEdit + width: _editFieldWidth - (decrementButton.width * 2) - (baseFontRow.spacing * 2) + text: QGroundControl.baseFontPointSize + showUnits: true + unitsLabel: "pt" + maximumLength: 6 + validator: DoubleValidator {bottom: 6.0; top: 48.0; decimals: 2;} + onEditingFinished: { var point = parseFloat(text) if(point >= 6.0 && point <= 48.0) QGroundControl.baseFontPointSize = point; } } - Rectangle { - width: baseFontEdit.height - height: width - color: qgcPal.button - QGCLabel { - text: "+" - anchors.centerIn: parent - } - MouseArea { - anchors.fill: parent - onClicked: { - if(ScreenTools.defaultFontPointSize < 49) - QGroundControl.baseFontPointSize = QGroundControl.baseFontPointSize + 1 + + QGCButton { + width: height + height: baseFontEdit.height + text: "+" + + onClicked: { + if(ScreenTools.defaultFontPointSize < 49) { + QGroundControl.baseFontPointSize = QGroundControl.baseFontPointSize + 1 } } } } + QGCLabel { anchors.verticalCenter: parent.verticalCenter - text: qsTr("(requires reboot to take affect)") + text: qsTr("(requires app restart)") } } @@ -129,7 +130,7 @@ Rectangle { spacing: ScreenTools.defaultFontPixelWidth QGCLabel { - width: _firstLabelWidth + width: baseFontLabel.width anchors.baseline: distanceUnitsCombo.baseline text: qsTr("Distance units:") } @@ -143,7 +144,7 @@ Rectangle { QGCLabel { anchors.baseline: distanceUnitsCombo.baseline - text: qsTr("(requires reboot to take affect)") + text: qsTr("(requires app restart)") } } @@ -152,8 +153,8 @@ Rectangle { spacing: ScreenTools.defaultFontPixelWidth QGCLabel { + width: baseFontLabel.width anchors.baseline: speedUnitsCombo.baseline - width: _firstLabelWidth text: qsTr("Speed units:") } @@ -166,10 +167,15 @@ Rectangle { QGCLabel { anchors.baseline: speedUnitsCombo.baseline - text: qsTr("(requires reboot to take affect)") + text: qsTr("(requires app restart)") } } + Item { + height: ScreenTools.defaultFontPixelHeight / 2 + width: parent.width + } + //----------------------------------------------------------------- //-- Scale on Flight View QGCCheckBox { @@ -246,7 +252,7 @@ Rectangle { QGCCheckBox { id: announcePercentCheckbox anchors.baseline: announcePercent.baseline - text: qsTr("Announce battery percent lower than:") + text: qsTr("Announce battery lower than:") checked: _percentRemainingAnnounce.value != 0 onClicked: { @@ -259,9 +265,9 @@ Rectangle { } FactTextField { - id: announcePercent - fact: _percentRemainingAnnounce - enabled: announcePercentCheckbox.checked + id: announcePercent + fact: _percentRemainingAnnounce + enabled: announcePercentCheckbox.checked } } @@ -269,15 +275,18 @@ Rectangle { height: ScreenTools.defaultFontPixelHeight / 2 width: parent.width } + //----------------------------------------------------------------- //-- Map Providers Row { - spacing: ScreenTools.defaultFontPixelWidth + spacing: ScreenTools.defaultFontPixelWidth + QGCLabel { + id: mapProvidersLabel anchors.baseline: mapProviders.baseline - width: _firstLabelWidth text: qsTr("Map Providers:") } + QGCComboBox { id: mapProviders width: _editFieldWidth @@ -302,17 +311,20 @@ Rectangle { //----------------------------------------------------------------- //-- Palette Styles Row { - spacing: ScreenTools.defaultFontPixelWidth + spacing: ScreenTools.defaultFontPixelWidth + QGCLabel { + width: mapProvidersLabel.width anchors.baseline: paletteCombo.baseline - width: _firstLabelWidth text: qsTr("Style:") } + QGCComboBox { - id: paletteCombo - width: _editFieldWidth - model: [ qsTr("Indoor"), qsTr("Outdoor") ] - currentIndex: QGroundControl.isDarkStyle ? 0 : 1 + id: paletteCombo + width: _editFieldWidth + model: [ qsTr("Indoor"), qsTr("Outdoor") ] + currentIndex: QGroundControl.isDarkStyle ? 0 : 1 + onActivated: { if (index != -1) { currentIndex = index @@ -392,13 +404,13 @@ Rectangle { spacing: ScreenTools.defaultFontPixelWidth QGCLabel { - text: qsTr("Offline mission editing vehicle type:") + text: qsTr("Offline mission editing:") anchors.baseline: offlineTypeCombo.baseline } FactComboBox { id: offlineTypeCombo - width: ScreenTools.defaultFontPixelWidth * 25 + width: ScreenTools.defaultFontPixelWidth * 18 fact: QGroundControl.offlineEditingFirmwareType indexModel: false } -- 2.22.0