Skip to content

Q
qgroundcontrol
Commit 6abc3443 authored by dogmaphobic's avatar dogmaphobic
Browse files
Options

Component Summary window margins

parent e1d73b08
Hide whitespace changes
Inline Side-by-side
Showing with 5 additions and 21 deletions
src/AutoPilotPlugins/APM/APMAirframeComponentSummary.qml
View file @ 6abc3443
...@@ -22,7 +22,6 @@ FactPanel { ...@@ -22,7 +22,6 @@ FactPanel {
Column { Column {
anchors.fill: parent anchors.fill: parent
anchors.margins: ScreenTools.defaultFontPixelWidth
VehicleSummaryRow { VehicleSummaryRow {
id: nameRow; id: nameRow;
labelText: qsTr("Frame Type:") labelText: qsTr("Frame Type:")
......
src/AutoPilotPlugins/APM/APMCameraComponentSummary.qml
View file @ 6abc3443
...@@ -24,7 +24,6 @@ FactPanel { ...@@ -24,7 +24,6 @@ FactPanel {
Column { Column {
anchors.fill: parent anchors.fill: parent
anchors.margins: ScreenTools.defaultFontPixelWidth
VehicleSummaryRow { VehicleSummaryRow {
visible: _mountTypeExists visible: _mountTypeExists
......
src/AutoPilotPlugins/APM/APMFlightModesComponentSummary.qml
View file @ 6abc3443
...@@ -23,7 +23,6 @@ FactPanel { ...@@ -23,7 +23,6 @@ FactPanel {
Column { Column {
anchors.fill: parent anchors.fill: parent
anchors.margins: ScreenTools.defaultFontPixelWidth
VehicleSummaryRow { VehicleSummaryRow {
labelText: qsTr("Flight Mode 1:") labelText: qsTr("Flight Mode 1:")
......
src/AutoPilotPlugins/APM/APMPowerComponentSummary.qml
View file @ 6abc3443
...@@ -42,7 +42,6 @@ FactPanel { ...@@ -42,7 +42,6 @@ FactPanel {
Column { Column {
anchors.fill: parent anchors.fill: parent
anchors.margins: ScreenTools.defaultFontPixelWidth
VehicleSummaryRow { VehicleSummaryRow {
labelText: qsTr("Battery monitor:") labelText: qsTr("Battery monitor:")
......
src/AutoPilotPlugins/APM/APMRadioComponentSummary.qml
View file @ 6abc3443
...@@ -21,7 +21,6 @@ FactPanel { ...@@ -21,7 +21,6 @@ FactPanel {
Column { Column {
anchors.fill: parent anchors.fill: parent
anchors.margins: ScreenTools.defaultFontPixelWidth
VehicleSummaryRow { VehicleSummaryRow {
labelText: qsTr("Roll:") labelText: qsTr("Roll:")
......
src/AutoPilotPlugins/APM/APMSafetyComponentSummaryCopter.qml
View file @ 6abc3443
...@@ -85,7 +85,6 @@ FactPanel { ...@@ -85,7 +85,6 @@ FactPanel {
Column { Column {
anchors.fill: parent anchors.fill: parent
anchors.margins: ScreenTools.defaultFontPixelWidth
VehicleSummaryRow { VehicleSummaryRow {
labelText: qsTr("Arming Checks:") labelText: qsTr("Arming Checks:")
......
src/AutoPilotPlugins/APM/APMSafetyComponentSummaryPlane.qml
View file @ 6abc3443
...@@ -24,7 +24,6 @@ FactPanel { ...@@ -24,7 +24,6 @@ FactPanel {
Column { Column {
anchors.fill: parent anchors.fill: parent
anchors.margins: ScreenTools.defaultFontPixelWidth
VehicleSummaryRow { VehicleSummaryRow {
labelText: qsTr("Throttle failsafe:") labelText: qsTr("Throttle failsafe:")
......
src/AutoPilotPlugins/APM/APMSensorsComponentSummary.qml
View file @ 6abc3443
...@@ -46,7 +46,6 @@ FactPanel { ...@@ -46,7 +46,6 @@ FactPanel {
Column { Column {
anchors.fill: parent anchors.fill: parent
anchors.margins: ScreenTools.defaultFontPixelWidth
VehicleSummaryRow { VehicleSummaryRow {
labelText: qsTr("Compass 1:") labelText: qsTr("Compass 1:")
......
src/AutoPilotPlugins/Common/ESP8266ComponentSummary.qml
View file @ 6abc3443
...@@ -29,7 +29,6 @@ FactPanel { ...@@ -29,7 +29,6 @@ FactPanel {
Column { Column {
anchors.fill: parent anchors.fill: parent
anchors.margins: ScreenTools.defaultFontPixelWidth
VehicleSummaryRow { VehicleSummaryRow {
labelText: qsTr("Firmware Version:") labelText: qsTr("Firmware Version:")
valueText: esp8266.version valueText: esp8266.version
......
src/AutoPilotPlugins/PX4/AirframeComponentSummary.qml
View file @ 6abc3443
...@@ -10,7 +10,6 @@ import QGroundControl.Palette 1.0 ...@@ -10,7 +10,6 @@ import QGroundControl.Palette 1.0
FactPanel { FactPanel {
id: panel id: panel
anchors.fill: parent anchors.fill: parent
anchors.margins: ScreenTools.defaultFontPixelWidth
color: qgcPal.windowShadeDark color: qgcPal.windowShadeDark
QGCPalette { id: qgcPal; colorGroupEnabled: enabled } QGCPalette { id: qgcPal; colorGroupEnabled: enabled }
......
src/AutoPilotPlugins/PX4/CameraComponentSummary.qml
View file @ 6abc3443
...@@ -22,7 +22,6 @@ FactPanel { ...@@ -22,7 +22,6 @@ FactPanel {
Column { Column {
anchors.fill: parent anchors.fill: parent
anchors.margins: ScreenTools.defaultFontPixelWidth
VehicleSummaryRow { VehicleSummaryRow {
labelText: qsTr("Trigger mode:") labelText: qsTr("Trigger mode:")
......
src/AutoPilotPlugins/PX4/FlightModesComponentSummary.qml
View file @ 6abc3443
...@@ -22,7 +22,6 @@ FactPanel { ...@@ -22,7 +22,6 @@ FactPanel {
Loader { Loader {
anchors.fill: parent anchors.fill: parent
anchors.margins: ScreenTools.defaultFontPixelWidth
sourceComponent: _simpleMode ? simple : advanced sourceComponent: _simpleMode ? simple : advanced
} }
......
src/AutoPilotPlugins/PX4/PX4RadioComponentSummary.qml
View file @ 6abc3443
...@@ -24,7 +24,6 @@ FactPanel { ...@@ -24,7 +24,6 @@ FactPanel {
Column { Column {
anchors.fill: parent anchors.fill: parent
anchors.margins: ScreenTools.defaultFontPixelWidth
VehicleSummaryRow { VehicleSummaryRow {
labelText: qsTr("Roll:") labelText: qsTr("Roll:")
......
src/AutoPilotPlugins/PX4/PowerComponentSummary.qml
View file @ 6abc3443
...@@ -47,7 +47,6 @@ FactPanel { ...@@ -47,7 +47,6 @@ FactPanel {
Column { Column {
anchors.fill: parent anchors.fill: parent
anchors.margins: ScreenTools.defaultFontPixelWidth
VehicleSummaryRow { VehicleSummaryRow {
labelText: qsTr("Battery Full:") labelText: qsTr("Battery Full:")
......
src/AutoPilotPlugins/PX4/SafetyComponentSummary.qml
View file @ 6abc3443
...@@ -24,7 +24,6 @@ FactPanel { ...@@ -24,7 +24,6 @@ FactPanel {
Column { Column {
anchors.fill: parent anchors.fill: parent
anchors.margins: ScreenTools.defaultFontPixelWidth
VehicleSummaryRow { VehicleSummaryRow {
labelText: qsTr("RTL min alt:") labelText: qsTr("RTL min alt:")
......
src/AutoPilotPlugins/PX4/SensorsComponentSummary.qml
View file @ 6abc3443
...@@ -27,7 +27,6 @@ FactPanel { ...@@ -27,7 +27,6 @@ FactPanel {
Column { Column {
anchors.fill: parent anchors.fill: parent
anchors.margins: 8
VehicleSummaryRow { VehicleSummaryRow {
labelText: qsTr("Compass 0:") labelText: qsTr("Compass 0:")
......
src/AutoPilotPlugins/PX4/SensorsComponentSummaryFixedWing.qml
View file @ 6abc3443
...@@ -25,7 +25,6 @@ FactPanel { ...@@ -25,7 +25,6 @@ FactPanel {
Column { Column {
anchors.fill: parent anchors.fill: parent
anchors.margins: ScreenTools.defaultFontPixelWidth
VehicleSummaryRow { VehicleSummaryRow {
labelText: qsTr("Compass:") labelText: qsTr("Compass:")
......
src/QmlControls/QGCComboBox.qml
View file @ 6abc3443
...@@ -9,7 +9,7 @@ import QGroundControl.ScreenTools 1.0 ...@@ -9,7 +9,7 @@ import QGroundControl.ScreenTools 1.0
ComboBox { ComboBox {
property var _qgcPal: QGCPalette { colorGroupEnabled: enabled } property var _qgcPal: QGCPalette { colorGroupEnabled: enabled }
property bool _showHighlight: pressed | hovered property bool _showHighlight: pressed | hovered
property bool _showBorder: _qgcPal.globalTheme == QGCPalette.Light property bool _showBorder: _qgcPal.globalTheme === QGCPalette.Light
style: ComboBoxStyle { style: ComboBoxStyle {
font.pointSize: ScreenTools.defaultFontPointSize font.pointSize: ScreenTools.defaultFontPointSize
......
src/QmlControls/QGCTextField.qml
View file @ 6abc3443
...@@ -20,7 +20,7 @@ TextField { ...@@ -20,7 +20,7 @@ TextField {
property var __qgcPal: QGCPalette { colorGroupEnabled: enabled } property var __qgcPal: QGCPalette { colorGroupEnabled: enabled }
textColor: __qgcPal.textFieldText textColor: __qgcPal.textFieldText
height: Math.max(25, Math.round(TextSingleton.implicitHeight * 1.2)) height: Math.max(25, Math.round(unitsLabel.implicitHeight * 1.2))
Label { Label {
id: unitsLabelWidthGenerator id: unitsLabelWidthGenerator
......
src/VehicleSetup/VehicleSummary.qml
View file @ 6abc3443
...@@ -151,8 +151,9 @@ Rectangle { ...@@ -151,8 +151,9 @@ Rectangle {
anchors.top: titleBar.bottom anchors.top: titleBar.bottom
width: parent.width width: parent.width
Loader { Loader {
anchors.fill: parent anchors.fill: parent
source: modelData.summaryQmlSource anchors.margins: ScreenTools.defaultFontPixelWidth
source: modelData.summaryQmlSource
} }
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment