zhaohuwei
/
QG4
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Pairing UI tweaks

QGC4.4
Gus Grubba 6 years ago
parent
bdaa0e3d02
commit
1211752376
1 changed files with 65 additions and 59 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 82
      src/ui/toolbar/PairingIndicator.qml

82
src/ui/toolbar/PairingIndicator.qml
Unescape View File

@ -24,9 +24,15 @@ Item { @@ -24,9 +24,15 @@ Item {
width: pairingRow.width * 1.1
anchors.top: parent.top
anchors.bottom: parent.bottom
property bool _light: qgcPal.globalTheme === QGCPalette.Light && !activeVehicle
property real _contentWidth: ScreenTools.defaultFontPixelWidth * 30
property real _contentWidth: ScreenTools.defaultFontPixelWidth * 40
property real _contentSpacing: ScreenTools.defaultFontPixelHeight * 0.5
property real _rectWidth: _contentWidth
property real _rectHeight: _contentWidth * 0.75
property string kPairingManager: qsTr("Pairing Manager")
Row {
id: pairingRow
spacing: ScreenTools.defaultFontPixelWidth
@ -49,7 +55,6 @@ Item { @@ -49,7 +55,6 @@ Item {
text: qsTr("Pair Vehicle")
width: !activeVehicle ? (ScreenTools.defaultFontPixelWidth * 12) : 0
visible: !activeVehicle
font.pointSize: ScreenTools.mediumFontPointSize
font.family: ScreenTools.demiboldFontFamily
anchors.verticalCenter: parent.verticalCenter
}
@ -96,21 +101,20 @@ Item { @@ -96,21 +101,20 @@ Item {
anchors.centerIn: parent
Item { width: 1; height: 1; }
QGCLabel {
text: qsTr("Pair New Vehicle")
font.pointSize: ScreenTools.mediumFontPointSize
text: kPairingManager
font.family: ScreenTools.demiboldFontFamily
anchors.horizontalCenter: parent.horizontalCenter
}
Item { width: 1; height: 1; }
Rectangle {
width: ScreenTools.defaultFontPixelWidth * 40
height: ScreenTools.defaultFontPixelHeight * 8
width: _rectWidth
height: _rectHeight
color: Qt.rgba(0,0,0,0)
border.color: qgcPal.text
border.width: 1
anchors.horizontalCenter: parent.horizontalCenter
QGCLabel {
text: "Graphic"
text: "Pair Graphic"
anchors.centerIn: parent
}
}
@ -171,8 +175,7 @@ Item { @@ -171,8 +175,7 @@ Item {
anchors.centerIn: parent
Item { width: 1; height: 1; }
QGCLabel {
text: qsTr("Pair New Vehicle")
font.pointSize: ScreenTools.mediumFontPointSize
text: kPairingManager
font.family: ScreenTools.demiboldFontFamily
anchors.horizontalCenter: parent.horizontalCenter
}
@ -186,14 +189,14 @@ Item { @@ -186,14 +189,14 @@ Item {
}
Item { width: 1; height: 1; }
Rectangle {
width: ScreenTools.defaultFontPixelWidth * 40
height: ScreenTools.defaultFontPixelHeight * 8
width: _rectWidth
height: _rectHeight
color: Qt.rgba(0,0,0,0)
border.color: qgcPal.text
border.width: 1
anchors.horizontalCenter: parent.horizontalCenter
QGCLabel {
text: "Graphic"
text: "Button Positioning Graphic"
anchors.centerIn: parent
}
}
@ -240,21 +243,20 @@ Item { @@ -240,21 +243,20 @@ Item {
anchors.centerIn: parent
Item { width: 1; height: 1; }
QGCLabel {
text: qsTr("Pair New Vehicle")
font.pointSize: ScreenTools.mediumFontPointSize
text: kPairingManager
font.family: ScreenTools.demiboldFontFamily
anchors.horizontalCenter: parent.horizontalCenter
}
Item { width: 1; height: 1; }
Rectangle {
width: ScreenTools.defaultFontPixelWidth * 40
height: ScreenTools.defaultFontPixelHeight * 12
width: _rectWidth
height: _rectHeight
color: Qt.rgba(0,0,0,0)
border.color: qgcPal.text
border.width: 1
anchors.horizontalCenter: parent.horizontalCenter
QGCLabel {
text: "Graphic"
text: "Vehicle and Tablet Graphic"
anchors.centerIn: parent
}
}
@ -305,15 +307,23 @@ Item { @@ -305,15 +307,23 @@ Item {
anchors.centerIn: parent
Column {
id: connectionCol
spacing: _contentSpacing * 2
spacing: _contentSpacing
anchors.centerIn: parent
Item { width: 1; height: 1; }
QGCLabel {
text: QGroundControl.pairingManager ? QGroundControl.pairingManager.pairingStatusStr : ""
font.pointSize: ScreenTools.mediumFontPointSize
text: kPairingManager
font.family: ScreenTools.demiboldFontFamily
anchors.horizontalCenter: parent.horizontalCenter
}
QGCLabel {
text: QGroundControl.pairingManager ? QGroundControl.pairingManager.pairingStatusStr : ""
anchors.horizontalCenter: parent.horizontalCenter
}
Rectangle {
width: _contentWidth
height: 1
color: qgcPal.globalTheme !== QGCPalette.Light ? Qt.rgba(1,1,1,0.25) : Qt.rgba(0,0,0,0.25)
}
Item { width: 1; height: 1; }
QGCColoredImage {
id: busyIndicator
@ -338,7 +348,6 @@ Item { @@ -338,7 +348,6 @@ Item {
QGCLabel {
text: qsTr("List Of Available Devices")
visible: QGroundControl.pairingManager ? (QGroundControl.pairingManager.pairedDeviceNameList.length > 0 && !cancelButton.visible) : false
font.pointSize: ScreenTools.mediumFontPointSize
font.family: ScreenTools.demiboldFontFamily
}
Item { width: 1; height: 1; }
@ -388,16 +397,22 @@ Item { @@ -388,16 +397,22 @@ Item {
}
}
}
Item { width: 1; height: 1; }
RowLayout {
id: connectedButtons
Item { width: 1; height: _contentSpacing; }
QGCButton {
id: connectedButton
width: _contentWidth
visible: QGroundControl.pairingManager ? (QGroundControl.pairingManager.pairingStatus === PairingManager.PairingConnected || QGroundControl.pairingManager.pairingStatus === PairingManager.PairingIdle) : false
spacing: ScreenTools.defaultFontPixelWidth * 4
text: QGroundControl.pairingManager ? (QGroundControl.pairingManager.pairingStatus === PairingManager.PairingConnected ? qsTr("Done ") : qsTr("Close")) : ""
anchors.horizontalCenter: parent.horizontalCenter
onClicked: {
connectionPopup.close()
}
}
QGCButton {
text: qsTr("Pair Another")
Layout.minimumWidth: _contentWidth * 0.333
Layout.fillWidth: true
width: _contentWidth
visible: connectedButton.visible
anchors.horizontalCenter: parent.horizontalCenter
onClicked: {
connectionPopup.close()
if(QGroundControl.pairingManager.pairingLinkTypeStrings.length > 1)
@ -408,19 +423,10 @@ Item { @@ -408,19 +423,10 @@ Item {
}
}
QGCButton {
text: QGroundControl.pairingManager ? (QGroundControl.pairingManager.pairingStatus === PairingManager.PairingConnected ? qsTr("Go And Fly") : qsTr("Close")) : ""
Layout.minimumWidth: _contentWidth * 0.333
Layout.fillWidth: true
onClicked: {
connectionPopup.close()
}
}
}
QGCButton {
id: cancelButton
width: _contentWidth
visible: QGroundControl.pairingManager ? (QGroundControl.pairingManager.pairingStatus === PairingManager.PairingActive || QGroundControl.pairingManager.pairingStatus === PairingManager.PairingConnecting) : false
text: qsTr("Cancel")
width: _contentWidth
anchors.horizontalCenter: parent.horizontalCenter
onClicked: {
if(QGroundControl.pairingManager.pairingStatus === PairingManager.PairingActive)
@ -432,7 +438,7 @@ Item { @@ -432,7 +438,7 @@ Item {
}
}
QGCButton {
visible: !cancelButton.visible && !connectedButtons.visible
visible: !cancelButton.visible && !connectedButton.visible
text: qsTr("Close")
width: _contentWidth
anchors.horizontalCenter: parent.horizontalCenter

Write Preview
Loading…
Cancel
Save