From bdaa0e3d022a0afdf7e8788e9565a58c822ab71b Mon Sep 17 00:00:00 2001 From: Gus Grubba Date: Mon, 26 Aug 2019 14:11:43 -0400 Subject: [PATCH] Pairing in toolbar when not connected (to the right of toolbar) --- .../MainToolbar/CustomMainToolBarIndicators.qml | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/custom-example/res/MainToolbar/CustomMainToolBarIndicators.qml b/custom-example/res/MainToolbar/CustomMainToolBarIndicators.qml index c07ee6925..8b956355d 100644 --- a/custom-example/res/MainToolbar/CustomMainToolBarIndicators.qml +++ b/custom-example/res/MainToolbar/CustomMainToolBarIndicators.qml @@ -34,7 +34,6 @@ Item { anchors.left: parent.left QGCColoredImage { id: menuEdge - visible: !QGroundControl.supportsPairing || !QGroundControl.settingsManager.appSettings.usePairing.rawValue anchors.verticalCenter: parent.verticalCenter height: ScreenTools.defaultFontPixelHeight width: height @@ -44,14 +43,23 @@ Item { color: qgcPal.buttonText } QGCLabel { - visible: menuEdge.visible anchors.verticalCenter: parent.verticalCenter text: qsTr("Waiting for a vehicle") font.pointSize: ScreenTools.mediumFontPointSize font.family: ScreenTools.demiboldFontFamily } + } + //------------------------------------------------------------------------- + //-- Pairing Indicator (not connected) + Row { + id: pairingRow + anchors.top: parent.top + anchors.bottom: parent.bottom + anchors.right: parent.right + anchors.rightMargin: ScreenTools.defaultFontPixelWidth * 2 + spacing: ScreenTools.defaultFontPixelWidth * 2 + visible: !indicatorRow.visible Loader { - visible: !menuEdge.visible anchors.top: parent.top anchors.bottom: parent.bottom anchors.margins: _indicatorMargins -- 2.22.0