From 6abc3443c3f72ed4fe4124e52646b39d96b4dd83 Mon Sep 17 00:00:00 2001 From: dogmaphobic Date: Wed, 4 May 2016 20:39:42 -0400 Subject: [PATCH] Component Summary window margins --- src/AutoPilotPlugins/APM/APMAirframeComponentSummary.qml | 1 - src/AutoPilotPlugins/APM/APMCameraComponentSummary.qml | 1 - src/AutoPilotPlugins/APM/APMFlightModesComponentSummary.qml | 1 - src/AutoPilotPlugins/APM/APMPowerComponentSummary.qml | 1 - src/AutoPilotPlugins/APM/APMRadioComponentSummary.qml | 1 - src/AutoPilotPlugins/APM/APMSafetyComponentSummaryCopter.qml | 1 - src/AutoPilotPlugins/APM/APMSafetyComponentSummaryPlane.qml | 1 - src/AutoPilotPlugins/APM/APMSensorsComponentSummary.qml | 1 - src/AutoPilotPlugins/Common/ESP8266ComponentSummary.qml | 1 - src/AutoPilotPlugins/PX4/AirframeComponentSummary.qml | 1 - src/AutoPilotPlugins/PX4/CameraComponentSummary.qml | 1 - src/AutoPilotPlugins/PX4/FlightModesComponentSummary.qml | 1 - src/AutoPilotPlugins/PX4/PX4RadioComponentSummary.qml | 1 - src/AutoPilotPlugins/PX4/PowerComponentSummary.qml | 1 - src/AutoPilotPlugins/PX4/SafetyComponentSummary.qml | 1 - src/AutoPilotPlugins/PX4/SensorsComponentSummary.qml | 1 - .../PX4/SensorsComponentSummaryFixedWing.qml | 1 - src/QmlControls/QGCComboBox.qml | 2 +- src/QmlControls/QGCTextField.qml | 2 +- src/VehicleSetup/VehicleSummary.qml | 5 +++-- 20 files changed, 5 insertions(+), 21 deletions(-) diff --git a/src/AutoPilotPlugins/APM/APMAirframeComponentSummary.qml b/src/AutoPilotPlugins/APM/APMAirframeComponentSummary.qml index 59b62957a..b9aeead2f 100644 --- a/src/AutoPilotPlugins/APM/APMAirframeComponentSummary.qml +++ b/src/AutoPilotPlugins/APM/APMAirframeComponentSummary.qml @@ -22,7 +22,6 @@ FactPanel { Column { anchors.fill: parent - anchors.margins: ScreenTools.defaultFontPixelWidth VehicleSummaryRow { id: nameRow; labelText: qsTr("Frame Type:") diff --git a/src/AutoPilotPlugins/APM/APMCameraComponentSummary.qml b/src/AutoPilotPlugins/APM/APMCameraComponentSummary.qml index 4d083b238..92fc33afa 100644 --- a/src/AutoPilotPlugins/APM/APMCameraComponentSummary.qml +++ b/src/AutoPilotPlugins/APM/APMCameraComponentSummary.qml @@ -24,7 +24,6 @@ FactPanel { Column { anchors.fill: parent - anchors.margins: ScreenTools.defaultFontPixelWidth VehicleSummaryRow { visible: _mountTypeExists diff --git a/src/AutoPilotPlugins/APM/APMFlightModesComponentSummary.qml b/src/AutoPilotPlugins/APM/APMFlightModesComponentSummary.qml index da3db3c7e..645f0590b 100644 --- a/src/AutoPilotPlugins/APM/APMFlightModesComponentSummary.qml +++ b/src/AutoPilotPlugins/APM/APMFlightModesComponentSummary.qml @@ -23,7 +23,6 @@ FactPanel { Column { anchors.fill: parent - anchors.margins: ScreenTools.defaultFontPixelWidth VehicleSummaryRow { labelText: qsTr("Flight Mode 1:") diff --git a/src/AutoPilotPlugins/APM/APMPowerComponentSummary.qml b/src/AutoPilotPlugins/APM/APMPowerComponentSummary.qml index 70e998d56..7cbb7b6e1 100644 --- a/src/AutoPilotPlugins/APM/APMPowerComponentSummary.qml +++ b/src/AutoPilotPlugins/APM/APMPowerComponentSummary.qml @@ -42,7 +42,6 @@ FactPanel { Column { anchors.fill: parent - anchors.margins: ScreenTools.defaultFontPixelWidth VehicleSummaryRow { labelText: qsTr("Battery monitor:") diff --git a/src/AutoPilotPlugins/APM/APMRadioComponentSummary.qml b/src/AutoPilotPlugins/APM/APMRadioComponentSummary.qml index af02fff05..93ed47622 100644 --- a/src/AutoPilotPlugins/APM/APMRadioComponentSummary.qml +++ b/src/AutoPilotPlugins/APM/APMRadioComponentSummary.qml @@ -21,7 +21,6 @@ FactPanel { Column { anchors.fill: parent - anchors.margins: ScreenTools.defaultFontPixelWidth VehicleSummaryRow { labelText: qsTr("Roll:") diff --git a/src/AutoPilotPlugins/APM/APMSafetyComponentSummaryCopter.qml b/src/AutoPilotPlugins/APM/APMSafetyComponentSummaryCopter.qml index bb3cd9dd1..2ef5c9638 100644 --- a/src/AutoPilotPlugins/APM/APMSafetyComponentSummaryCopter.qml +++ b/src/AutoPilotPlugins/APM/APMSafetyComponentSummaryCopter.qml @@ -85,7 +85,6 @@ FactPanel { Column { anchors.fill: parent - anchors.margins: ScreenTools.defaultFontPixelWidth VehicleSummaryRow { labelText: qsTr("Arming Checks:") diff --git a/src/AutoPilotPlugins/APM/APMSafetyComponentSummaryPlane.qml b/src/AutoPilotPlugins/APM/APMSafetyComponentSummaryPlane.qml index ad1f1aa8d..d0063be97 100644 --- a/src/AutoPilotPlugins/APM/APMSafetyComponentSummaryPlane.qml +++ b/src/AutoPilotPlugins/APM/APMSafetyComponentSummaryPlane.qml @@ -24,7 +24,6 @@ FactPanel { Column { anchors.fill: parent - anchors.margins: ScreenTools.defaultFontPixelWidth VehicleSummaryRow { labelText: qsTr("Throttle failsafe:") diff --git a/src/AutoPilotPlugins/APM/APMSensorsComponentSummary.qml b/src/AutoPilotPlugins/APM/APMSensorsComponentSummary.qml index 8cab03f2e..37d0738ff 100644 --- a/src/AutoPilotPlugins/APM/APMSensorsComponentSummary.qml +++ b/src/AutoPilotPlugins/APM/APMSensorsComponentSummary.qml @@ -46,7 +46,6 @@ FactPanel { Column { anchors.fill: parent - anchors.margins: ScreenTools.defaultFontPixelWidth VehicleSummaryRow { labelText: qsTr("Compass 1:") diff --git a/src/AutoPilotPlugins/Common/ESP8266ComponentSummary.qml b/src/AutoPilotPlugins/Common/ESP8266ComponentSummary.qml index a45bee2c5..5165384a1 100644 --- a/src/AutoPilotPlugins/Common/ESP8266ComponentSummary.qml +++ b/src/AutoPilotPlugins/Common/ESP8266ComponentSummary.qml @@ -29,7 +29,6 @@ FactPanel { Column { anchors.fill: parent - anchors.margins: ScreenTools.defaultFontPixelWidth VehicleSummaryRow { labelText: qsTr("Firmware Version:") valueText: esp8266.version diff --git a/src/AutoPilotPlugins/PX4/AirframeComponentSummary.qml b/src/AutoPilotPlugins/PX4/AirframeComponentSummary.qml index babb1379a..2494f5581 100644 --- a/src/AutoPilotPlugins/PX4/AirframeComponentSummary.qml +++ b/src/AutoPilotPlugins/PX4/AirframeComponentSummary.qml @@ -10,7 +10,6 @@ import QGroundControl.Palette 1.0 FactPanel { id: panel anchors.fill: parent - anchors.margins: ScreenTools.defaultFontPixelWidth color: qgcPal.windowShadeDark QGCPalette { id: qgcPal; colorGroupEnabled: enabled } diff --git a/src/AutoPilotPlugins/PX4/CameraComponentSummary.qml b/src/AutoPilotPlugins/PX4/CameraComponentSummary.qml index 32130f2cc..565ec1fc2 100644 --- a/src/AutoPilotPlugins/PX4/CameraComponentSummary.qml +++ b/src/AutoPilotPlugins/PX4/CameraComponentSummary.qml @@ -22,7 +22,6 @@ FactPanel { Column { anchors.fill: parent - anchors.margins: ScreenTools.defaultFontPixelWidth VehicleSummaryRow { labelText: qsTr("Trigger mode:") diff --git a/src/AutoPilotPlugins/PX4/FlightModesComponentSummary.qml b/src/AutoPilotPlugins/PX4/FlightModesComponentSummary.qml index 6744b5401..b779080c0 100644 --- a/src/AutoPilotPlugins/PX4/FlightModesComponentSummary.qml +++ b/src/AutoPilotPlugins/PX4/FlightModesComponentSummary.qml @@ -22,7 +22,6 @@ FactPanel { Loader { anchors.fill: parent - anchors.margins: ScreenTools.defaultFontPixelWidth sourceComponent: _simpleMode ? simple : advanced } diff --git a/src/AutoPilotPlugins/PX4/PX4RadioComponentSummary.qml b/src/AutoPilotPlugins/PX4/PX4RadioComponentSummary.qml index 13b08b038..17eb6fefb 100644 --- a/src/AutoPilotPlugins/PX4/PX4RadioComponentSummary.qml +++ b/src/AutoPilotPlugins/PX4/PX4RadioComponentSummary.qml @@ -24,7 +24,6 @@ FactPanel { Column { anchors.fill: parent - anchors.margins: ScreenTools.defaultFontPixelWidth VehicleSummaryRow { labelText: qsTr("Roll:") diff --git a/src/AutoPilotPlugins/PX4/PowerComponentSummary.qml b/src/AutoPilotPlugins/PX4/PowerComponentSummary.qml index 426605ee8..a3bd3244e 100644 --- a/src/AutoPilotPlugins/PX4/PowerComponentSummary.qml +++ b/src/AutoPilotPlugins/PX4/PowerComponentSummary.qml @@ -47,7 +47,6 @@ FactPanel { Column { anchors.fill: parent - anchors.margins: ScreenTools.defaultFontPixelWidth VehicleSummaryRow { labelText: qsTr("Battery Full:") diff --git a/src/AutoPilotPlugins/PX4/SafetyComponentSummary.qml b/src/AutoPilotPlugins/PX4/SafetyComponentSummary.qml index b7a534056..6b61ad245 100644 --- a/src/AutoPilotPlugins/PX4/SafetyComponentSummary.qml +++ b/src/AutoPilotPlugins/PX4/SafetyComponentSummary.qml @@ -24,7 +24,6 @@ FactPanel { Column { anchors.fill: parent - anchors.margins: ScreenTools.defaultFontPixelWidth VehicleSummaryRow { labelText: qsTr("RTL min alt:") diff --git a/src/AutoPilotPlugins/PX4/SensorsComponentSummary.qml b/src/AutoPilotPlugins/PX4/SensorsComponentSummary.qml index 28c4af97e..606d94819 100644 --- a/src/AutoPilotPlugins/PX4/SensorsComponentSummary.qml +++ b/src/AutoPilotPlugins/PX4/SensorsComponentSummary.qml @@ -27,7 +27,6 @@ FactPanel { Column { anchors.fill: parent - anchors.margins: 8 VehicleSummaryRow { labelText: qsTr("Compass 0:") diff --git a/src/AutoPilotPlugins/PX4/SensorsComponentSummaryFixedWing.qml b/src/AutoPilotPlugins/PX4/SensorsComponentSummaryFixedWing.qml index 6851b1883..0f353ead6 100644 --- a/src/AutoPilotPlugins/PX4/SensorsComponentSummaryFixedWing.qml +++ b/src/AutoPilotPlugins/PX4/SensorsComponentSummaryFixedWing.qml @@ -25,7 +25,6 @@ FactPanel { Column { anchors.fill: parent - anchors.margins: ScreenTools.defaultFontPixelWidth VehicleSummaryRow { labelText: qsTr("Compass:") diff --git a/src/QmlControls/QGCComboBox.qml b/src/QmlControls/QGCComboBox.qml index 0101d07c2..f91a12d5a 100644 --- a/src/QmlControls/QGCComboBox.qml +++ b/src/QmlControls/QGCComboBox.qml @@ -9,7 +9,7 @@ import QGroundControl.ScreenTools 1.0 ComboBox { property var _qgcPal: QGCPalette { colorGroupEnabled: enabled } property bool _showHighlight: pressed | hovered - property bool _showBorder: _qgcPal.globalTheme == QGCPalette.Light + property bool _showBorder: _qgcPal.globalTheme === QGCPalette.Light style: ComboBoxStyle { font.pointSize: ScreenTools.defaultFontPointSize diff --git a/src/QmlControls/QGCTextField.qml b/src/QmlControls/QGCTextField.qml index 9fb593e99..1f6990bb9 100644 --- a/src/QmlControls/QGCTextField.qml +++ b/src/QmlControls/QGCTextField.qml @@ -20,7 +20,7 @@ TextField { property var __qgcPal: QGCPalette { colorGroupEnabled: enabled } textColor: __qgcPal.textFieldText - height: Math.max(25, Math.round(TextSingleton.implicitHeight * 1.2)) + height: Math.max(25, Math.round(unitsLabel.implicitHeight * 1.2)) Label { id: unitsLabelWidthGenerator diff --git a/src/VehicleSetup/VehicleSummary.qml b/src/VehicleSetup/VehicleSummary.qml index 8cc150ba8..ae430eccf 100644 --- a/src/VehicleSetup/VehicleSummary.qml +++ b/src/VehicleSetup/VehicleSummary.qml @@ -151,8 +151,9 @@ Rectangle { anchors.top: titleBar.bottom width: parent.width Loader { - anchors.fill: parent - source: modelData.summaryQmlSource + anchors.fill: parent + anchors.margins: ScreenTools.defaultFontPixelWidth + source: modelData.summaryQmlSource } } } -- 2.22.0