Commit bdaa0e3d authored by Gus Grubba's avatar Gus Grubba

Pairing in toolbar when not connected (to the right of toolbar)

parent 5bd09707
...@@ -34,7 +34,6 @@ Item { ...@@ -34,7 +34,6 @@ Item {
anchors.left: parent.left anchors.left: parent.left
QGCColoredImage { QGCColoredImage {
id: menuEdge id: menuEdge
visible: !QGroundControl.supportsPairing || !QGroundControl.settingsManager.appSettings.usePairing.rawValue
anchors.verticalCenter: parent.verticalCenter anchors.verticalCenter: parent.verticalCenter
height: ScreenTools.defaultFontPixelHeight height: ScreenTools.defaultFontPixelHeight
width: height width: height
...@@ -44,14 +43,23 @@ Item { ...@@ -44,14 +43,23 @@ Item {
color: qgcPal.buttonText color: qgcPal.buttonText
} }
QGCLabel { QGCLabel {
visible: menuEdge.visible
anchors.verticalCenter: parent.verticalCenter anchors.verticalCenter: parent.verticalCenter
text: qsTr("Waiting for a vehicle") text: qsTr("Waiting for a vehicle")
font.pointSize: ScreenTools.mediumFontPointSize font.pointSize: ScreenTools.mediumFontPointSize
font.family: ScreenTools.demiboldFontFamily 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 { Loader {
visible: !menuEdge.visible
anchors.top: parent.top anchors.top: parent.top
anchors.bottom: parent.bottom anchors.bottom: parent.bottom
anchors.margins: _indicatorMargins anchors.margins: _indicatorMargins
......
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