From bf6b4a2dd8162eaa494c860310b6f91e53391450 Mon Sep 17 00:00:00 2001 From: Don Gagne Date: Mon, 6 Jun 2016 19:09:23 -0700 Subject: [PATCH] Small screen updates --- src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml | 16 ++++++++-------- src/QmlControls/ModeSwitchDisplay.qml | 1 + 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml b/src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml index 653d07d..ef9a979 100644 --- a/src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml +++ b/src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml @@ -29,19 +29,19 @@ Item { //property var qgcView - QGCView control //property var qgcViewPanel - QGCViewPanel control - readonly property int monitorThresholdCharWidth: 8 // Character width of Monitor and Threshold labels + readonly property bool _shortText: ScreenTools.isTinyScreen // User visible strings readonly property string title: qsTr("FLIGHT MODES") - - property string topHelpText: qsTr("Assign Flight Modes to radio control channels and adjust the thresholds for triggering them. ") + - qsTr("You can assign multiple flight modes to a single channel. ") + - qsTr("Turn your radio control on to test switch settings. ") + - qsTr("The following channels: ") + controller.reservedChannels + - qsTr(" are not available for Flight Modes since they are already in use for other functions.") - + property string topHelpText: ScreenTools.isTinyScreen ? + qsTr("Assign Flight Modes to radio control channels and adjust the thresholds for triggering them.") : + (qsTr("Assign Flight Modes to radio control channels and adjust the thresholds for triggering them. ") + + qsTr("You can assign multiple flight modes to a single channel. ") + + qsTr("Turn your radio control on to test switch settings. ") + + qsTr("The following channels: ") + controller.reservedChannels + + qsTr(" are not available for Flight Modes since they are already in use for other functions.")) readonly property string fwManualModeName: qsTr("Manual/Main") readonly property string mrManualModeName: qsTr("Stabilized/Main") diff --git a/src/QmlControls/ModeSwitchDisplay.qml b/src/QmlControls/ModeSwitchDisplay.qml index 7c48ce2..8e651bf 100644 --- a/src/QmlControls/ModeSwitchDisplay.qml +++ b/src/QmlControls/ModeSwitchDisplay.qml @@ -80,6 +80,7 @@ Rectangle { width: parent.width - x wrapMode: Text.WordWrap text: flightModeDescription + visible: !ScreenTools.isTinyScreen } }