From c8d8af393d1cd7e75543b2c518c8ad099c9ca2f1 Mon Sep 17 00:00:00 2001 From: Don Gagne Date: Mon, 6 Jun 2016 21:44:18 -0700 Subject: [PATCH] Small screen fixes --- .../Common/RadioComponent.qml | 28 +++++++------------ .../Common/RadioComponentController.cc | 2 +- src/QmlControls/RCChannelMonitor.qml | 19 +++++++------ 3 files changed, 21 insertions(+), 28 deletions(-) diff --git a/src/AutoPilotPlugins/Common/RadioComponent.qml b/src/AutoPilotPlugins/Common/RadioComponent.qml index fcc49ef67..0ce13e8bc 100644 --- a/src/AutoPilotPlugins/Common/RadioComponent.qml +++ b/src/AutoPilotPlugins/Common/RadioComponent.qml @@ -433,20 +433,11 @@ QGCView { QGCLabel { text: qsTr("Additional Radio setup:") } - Row { - spacing: 10 - - QGCLabel { - anchors.baseline: bindButton.baseline - text: qsTr("Place Spektrum satellite receiver in bind mode:") - } - - QGCButton { - id: bindButton - text: qsTr("Spektrum Bind") + QGCButton { + id: bindButton + text: qsTr("Spektrum Bind") - onClicked: showDialog(spektrumBindDialogComponent, dialogTitle, qgcView.showDialogDefaultWidth, StandardButton.Ok | StandardButton.Cancel) - } + onClicked: showDialog(spektrumBindDialogComponent, dialogTitle, qgcView.showDialogDefaultWidth, StandardButton.Ok | StandardButton.Cancel) } QGCButton { @@ -488,12 +479,14 @@ QGCView { id: rightColumn anchors.top: parent.top anchors.right: parent.right - width: defaultTextWidth * 35 - spacing: 10 + width: Math.min(defaultTextWidth * 35, qgcView.width * 0.4) + spacing: ScreenTools.defaultFontPixelHeight / 2 Row { - spacing: 10 + spacing: ScreenTools.defaultFontPixelWidth + ExclusiveGroup { id: modeGroup } + QGCRadioButton { exclusiveGroup: modeGroup text: qsTr("Mode 1") @@ -513,14 +506,13 @@ QGCView { Image { width: parent.width - height: defaultTextHeight * 15 fillMode: Image.PreserveAspectFit smooth: true source: controller.imageHelp } RCChannelMonitor { - width: parent.width + width: parent.width } } // Column - Right Column } // QGCFlickable diff --git a/src/AutoPilotPlugins/Common/RadioComponentController.cc b/src/AutoPilotPlugins/Common/RadioComponentController.cc index a2263a050..ee8a3969b 100644 --- a/src/AutoPilotPlugins/Common/RadioComponentController.cc +++ b/src/AutoPilotPlugins/Common/RadioComponentController.cc @@ -123,7 +123,7 @@ RadioComponentController::~RadioComponentController() /// @brief Returns the state machine entry for the specified state. const RadioComponentController::stateMachineEntry* RadioComponentController::_getStateMachineEntry(int step) const { - static const char* msgBeginPX4 = "Lower the Throttle stick all the way down as shown in diagram.\nReset all transmitter trims to center.\n\n" + static const char* msgBeginPX4 = "Lower the Throttle stick all the way down as shown in diagram.\n\n" "It is recommended to disconnect all motors for additional safety, however, the system is designed to not arm during the calibration.\n\n" "Click Next to continue"; static const char* msgBeginAPM = "Lower the Throttle stick all the way down as shown in diagram.\nReset all transmitter trims to center.\n\n" diff --git a/src/QmlControls/RCChannelMonitor.qml b/src/QmlControls/RCChannelMonitor.qml index 8bcb6eea4..c1b6f1729 100644 --- a/src/QmlControls/RCChannelMonitor.qml +++ b/src/QmlControls/RCChannelMonitor.qml @@ -37,7 +37,6 @@ FactPanel { Item { property int rcValue: 1500 - property int __lastRcValue: 1500 readonly property int __rcValueMaxJitter: 2 property color __barColor: qgcPal.windowShade @@ -92,7 +91,7 @@ FactPanel { Column { id: monitorColumn width: parent.width - spacing: 5 + spacing: ScreenTools.defaultFontPixelHeight / 2 QGCLabel { text: "Channel Monitor" } @@ -107,12 +106,12 @@ FactPanel { } Repeater { - id: channelMonitorRepeater - model: controller.channelCount - width: parent.width + id: channelMonitorRepeater + model: controller.channelCount - Row { - spacing: 5 + Item { + width: monitorColumn.width + height: ScreenTools.defaultFontPixelHeight // Need this to get to loader from Connections above property Item loader: theLoader @@ -124,9 +123,11 @@ FactPanel { Loader { id: theLoader + anchors.leftMargin: ScreenTools.defaultFontPixelWidth / 2 + anchors.left: channelLabel.right anchors.verticalCenter: channelLabel.verticalCenter - height: qgcView.defaultTextHeight - width: 200 + height: ScreenTools.defaultFontPixelHeight + width: parent.width - anchors.leftMargin - ScreenTools.defaultFontPixelWidth sourceComponent: channelMonitorDisplayComponent property bool mapped: true -- 2.22.0