|
|
|
@ -10,6 +10,7 @@ |
|
|
|
import QtQuick 2.11 |
|
|
|
import QtQuick 2.11 |
|
|
|
import QtQuick.Controls 2.4 |
|
|
|
import QtQuick.Controls 2.4 |
|
|
|
import QtQuick.Layouts 1.11 |
|
|
|
import QtQuick.Layouts 1.11 |
|
|
|
|
|
|
|
import QtQuick.Dialogs 1.3 |
|
|
|
|
|
|
|
|
|
|
|
import QGroundControl 1.0 |
|
|
|
import QGroundControl 1.0 |
|
|
|
import QGroundControl.Controls 1.0 |
|
|
|
import QGroundControl.Controls 1.0 |
|
|
|
@ -24,20 +25,48 @@ Item { |
|
|
|
width: pairingRow.width * 1.1 |
|
|
|
width: pairingRow.width * 1.1 |
|
|
|
anchors.top: parent.top |
|
|
|
anchors.top: parent.top |
|
|
|
anchors.bottom: parent.bottom |
|
|
|
anchors.bottom: parent.bottom |
|
|
|
property bool _light: qgcPal.globalTheme === QGCPalette.Light && !activeVehicle |
|
|
|
|
|
|
|
property real _contentWidth: ScreenTools.defaultFontPixelWidth * 30 |
|
|
|
property bool _light: qgcPal.globalTheme === QGCPalette.Light && !activeVehicle |
|
|
|
property real _contentSpacing: ScreenTools.defaultFontPixelHeight * 0.5 |
|
|
|
property real _contentWidth: ScreenTools.defaultFontPixelWidth * 34 |
|
|
|
|
|
|
|
property real _contentSpacing: ScreenTools.defaultFontPixelHeight * 0.5 |
|
|
|
|
|
|
|
property real _rectWidth: _contentWidth |
|
|
|
|
|
|
|
property real _rectHeight: _contentWidth * 0.75 |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
property string kPairingManager: qsTr("Pairing Manager") |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
function runPairing() { |
|
|
|
|
|
|
|
QGroundControl.pairingManager.firstBoot = false |
|
|
|
|
|
|
|
if(QGroundControl.pairingManager.pairedDeviceNameList.length > 0) { |
|
|
|
|
|
|
|
connectionPopup.open() |
|
|
|
|
|
|
|
} else { |
|
|
|
|
|
|
|
mhPopup.open() |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
Connections { |
|
|
|
|
|
|
|
target: QGroundControl.pairingManager |
|
|
|
|
|
|
|
//-- Connect automatically once paired |
|
|
|
|
|
|
|
onPairingStatusChanged: { |
|
|
|
|
|
|
|
if(QGroundControl.pairingManager.pairingStatus === PairingManager.PairingSuccess) { |
|
|
|
|
|
|
|
if(QGroundControl.pairingManager.pairedVehicle !== "") { |
|
|
|
|
|
|
|
QGroundControl.pairingManager.connectToPairedDevice(QGroundControl.pairingManager.pairedVehicle) |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
Row { |
|
|
|
Row { |
|
|
|
id: pairingRow |
|
|
|
id: pairingRow |
|
|
|
spacing: ScreenTools.defaultFontPixelWidth |
|
|
|
spacing: ScreenTools.defaultFontPixelWidth |
|
|
|
anchors.top: parent.top |
|
|
|
anchors.top: parent.top |
|
|
|
anchors.bottom: parent.bottom |
|
|
|
anchors.bottom: parent.bottom |
|
|
|
anchors.horizontalCenter: parent.horizontalCenter |
|
|
|
anchors.horizontalCenter: parent.horizontalCenter |
|
|
|
Image { |
|
|
|
QGCColoredImage { |
|
|
|
id: pairingIcon |
|
|
|
id: pairingIcon |
|
|
|
height: parent.height |
|
|
|
height: parent.height |
|
|
|
width: height |
|
|
|
width: height |
|
|
|
source: _light ? "/qmlimages/PairingIconLight.svg" : "/qmlimages/PairingIcon.svg" |
|
|
|
color: qgcPal.text |
|
|
|
|
|
|
|
source: "/custom/img/PairingIcon.svg" |
|
|
|
sourceSize.width: width |
|
|
|
sourceSize.width: width |
|
|
|
fillMode: Image.PreserveAspectFit |
|
|
|
fillMode: Image.PreserveAspectFit |
|
|
|
smooth: true |
|
|
|
smooth: true |
|
|
|
@ -49,7 +78,6 @@ Item { |
|
|
|
text: qsTr("Pair Vehicle") |
|
|
|
text: qsTr("Pair Vehicle") |
|
|
|
width: !activeVehicle ? (ScreenTools.defaultFontPixelWidth * 12) : 0 |
|
|
|
width: !activeVehicle ? (ScreenTools.defaultFontPixelWidth * 12) : 0 |
|
|
|
visible: !activeVehicle |
|
|
|
visible: !activeVehicle |
|
|
|
font.pointSize: ScreenTools.mediumFontPointSize |
|
|
|
|
|
|
|
font.family: ScreenTools.demiboldFontFamily |
|
|
|
font.family: ScreenTools.demiboldFontFamily |
|
|
|
anchors.verticalCenter: parent.verticalCenter |
|
|
|
anchors.verticalCenter: parent.verticalCenter |
|
|
|
} |
|
|
|
} |
|
|
|
@ -57,90 +85,7 @@ Item { |
|
|
|
MouseArea { |
|
|
|
MouseArea { |
|
|
|
anchors.fill: parent |
|
|
|
anchors.fill: parent |
|
|
|
onClicked: { |
|
|
|
onClicked: { |
|
|
|
if(QGroundControl.pairingManager.pairedDeviceNameList.length > 1) { |
|
|
|
runPairing() |
|
|
|
connectionPopup.open() |
|
|
|
|
|
|
|
} else { |
|
|
|
|
|
|
|
if(QGroundControl.pairingManager.pairingLinkTypeStrings.length > 1) |
|
|
|
|
|
|
|
pairingPopup.open() |
|
|
|
|
|
|
|
else { |
|
|
|
|
|
|
|
mhPopup.open() |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
//------------------------------------------------------------------------- |
|
|
|
|
|
|
|
//-- Pairing |
|
|
|
|
|
|
|
Popup { |
|
|
|
|
|
|
|
id: pairingPopup |
|
|
|
|
|
|
|
width: pairingBody.width |
|
|
|
|
|
|
|
height: pairingBody.height |
|
|
|
|
|
|
|
modal: true |
|
|
|
|
|
|
|
focus: true |
|
|
|
|
|
|
|
parent: Overlay.overlay |
|
|
|
|
|
|
|
x: Math.round((mainWindow.width - width) * 0.5) |
|
|
|
|
|
|
|
y: Math.round((mainWindow.height - height) * 0.5) |
|
|
|
|
|
|
|
closePolicy: Popup.CloseOnEscape | Popup.CloseOnPressOutside |
|
|
|
|
|
|
|
background: Rectangle { |
|
|
|
|
|
|
|
anchors.fill: parent |
|
|
|
|
|
|
|
color: qgcPal.globalTheme === QGCPalette.Light ? Qt.rgba(1,1,1,0.95) : Qt.rgba(0,0,0,0.75) |
|
|
|
|
|
|
|
radius: ScreenTools.defaultFontPixelWidth * 0.25 |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
Item { |
|
|
|
|
|
|
|
id: pairingBody |
|
|
|
|
|
|
|
width: comboListCol.width + (ScreenTools.defaultFontPixelWidth * 8) |
|
|
|
|
|
|
|
height: comboListCol.height + (ScreenTools.defaultFontPixelHeight * 2) |
|
|
|
|
|
|
|
anchors.centerIn: parent |
|
|
|
|
|
|
|
Column { |
|
|
|
|
|
|
|
id: comboListCol |
|
|
|
|
|
|
|
spacing: _contentSpacing |
|
|
|
|
|
|
|
anchors.centerIn: parent |
|
|
|
|
|
|
|
Item { width: 1; height: 1; } |
|
|
|
|
|
|
|
QGCLabel { |
|
|
|
|
|
|
|
text: qsTr("Pair New Vehicle") |
|
|
|
|
|
|
|
font.pointSize: ScreenTools.mediumFontPointSize |
|
|
|
|
|
|
|
font.family: ScreenTools.demiboldFontFamily |
|
|
|
|
|
|
|
anchors.horizontalCenter: parent.horizontalCenter |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
Item { width: 1; height: 1; } |
|
|
|
|
|
|
|
Rectangle { |
|
|
|
|
|
|
|
width: ScreenTools.defaultFontPixelWidth * 40 |
|
|
|
|
|
|
|
height: ScreenTools.defaultFontPixelHeight * 8 |
|
|
|
|
|
|
|
color: Qt.rgba(0,0,0,0) |
|
|
|
|
|
|
|
border.color: qgcPal.text |
|
|
|
|
|
|
|
border.width: 1 |
|
|
|
|
|
|
|
anchors.horizontalCenter: parent.horizontalCenter |
|
|
|
|
|
|
|
QGCLabel { |
|
|
|
|
|
|
|
text: "Graphic" |
|
|
|
|
|
|
|
anchors.centerIn: parent |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
Item { width: 1; height: 1; } |
|
|
|
|
|
|
|
QGCLabel { |
|
|
|
|
|
|
|
text: qsTr("Please choose a pairing method in order to connect to a nearby device") |
|
|
|
|
|
|
|
width: _contentWidth |
|
|
|
|
|
|
|
wrapMode: Text.WordWrap |
|
|
|
|
|
|
|
horizontalAlignment: Text.AlignHCenter |
|
|
|
|
|
|
|
anchors.horizontalCenter: parent.horizontalCenter |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
Item { width: 1; height: 1; } |
|
|
|
|
|
|
|
Repeater { |
|
|
|
|
|
|
|
model: QGroundControl.pairingManager ? QGroundControl.pairingManager.pairingLinkTypeStrings : [] |
|
|
|
|
|
|
|
delegate: QGCButton { |
|
|
|
|
|
|
|
text: modelData |
|
|
|
|
|
|
|
width: _contentWidth |
|
|
|
|
|
|
|
anchors.horizontalCenter: parent.horizontalCenter |
|
|
|
|
|
|
|
onClicked: { |
|
|
|
|
|
|
|
pairingPopup.close() |
|
|
|
|
|
|
|
if (index === QGroundControl.pairingManager.nfcIndex) { |
|
|
|
|
|
|
|
nfcPopup.open() |
|
|
|
|
|
|
|
} else if (index === QGroundControl.pairingManager.microhardIndex) { |
|
|
|
|
|
|
|
mhPopup.open() |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
Item { width: 1; height: 1; } |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
//------------------------------------------------------------------------- |
|
|
|
//------------------------------------------------------------------------- |
|
|
|
@ -171,40 +116,44 @@ Item { |
|
|
|
anchors.centerIn: parent |
|
|
|
anchors.centerIn: parent |
|
|
|
Item { width: 1; height: 1; } |
|
|
|
Item { width: 1; height: 1; } |
|
|
|
QGCLabel { |
|
|
|
QGCLabel { |
|
|
|
text: qsTr("Pair New Vehicle") |
|
|
|
text: kPairingManager |
|
|
|
font.pointSize: ScreenTools.mediumFontPointSize |
|
|
|
|
|
|
|
font.family: ScreenTools.demiboldFontFamily |
|
|
|
font.family: ScreenTools.demiboldFontFamily |
|
|
|
|
|
|
|
font.pointSize: ScreenTools.mediumFontPointSize |
|
|
|
anchors.horizontalCenter: parent.horizontalCenter |
|
|
|
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; } |
|
|
|
Item { width: 1; height: 1; } |
|
|
|
QGCLabel { |
|
|
|
QGCLabel { |
|
|
|
text: qsTr("To connect to your vehicle, please click 3 times on the button in order to put the vehicle in a discovery mode") |
|
|
|
text: qsTr("To connect to your vehicle, please click on the pairing button in order to put the vehicle in discovery mode") |
|
|
|
width: _contentWidth |
|
|
|
width: _contentWidth |
|
|
|
wrapMode: Text.WordWrap |
|
|
|
wrapMode: Text.WordWrap |
|
|
|
horizontalAlignment: Text.AlignHCenter |
|
|
|
horizontalAlignment: Text.AlignHCenter |
|
|
|
anchors.horizontalCenter: parent.horizontalCenter |
|
|
|
anchors.horizontalCenter: parent.horizontalCenter |
|
|
|
} |
|
|
|
} |
|
|
|
Item { width: 1; height: 1; } |
|
|
|
Item { width: 1; height: ScreenTools.defaultFontPixelHeight * 2; } |
|
|
|
Rectangle { |
|
|
|
QGCColoredImage { |
|
|
|
width: ScreenTools.defaultFontPixelWidth * 40 |
|
|
|
height: ScreenTools.defaultFontPixelHeight * 6 |
|
|
|
height: ScreenTools.defaultFontPixelHeight * 8 |
|
|
|
width: height |
|
|
|
color: Qt.rgba(0,0,0,0) |
|
|
|
source: "/custom/img/PairingButton.svg" |
|
|
|
border.color: qgcPal.text |
|
|
|
sourceSize.height: height |
|
|
|
border.width: 1 |
|
|
|
fillMode: Image.PreserveAspectFit |
|
|
|
|
|
|
|
mipmap: true |
|
|
|
|
|
|
|
smooth: true |
|
|
|
|
|
|
|
color: qgcPal.text |
|
|
|
anchors.horizontalCenter: parent.horizontalCenter |
|
|
|
anchors.horizontalCenter: parent.horizontalCenter |
|
|
|
QGCLabel { |
|
|
|
|
|
|
|
text: "Graphic" |
|
|
|
|
|
|
|
anchors.centerIn: parent |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
} |
|
|
|
} |
|
|
|
Item { width: 1; height: 1; } |
|
|
|
Item { width: 1; height: ScreenTools.defaultFontPixelHeight * 2; } |
|
|
|
QGCButton { |
|
|
|
QGCButton { |
|
|
|
text: qsTr("Pair Via Microhard") |
|
|
|
text: qsTr("Pair a Vehicle") |
|
|
|
width: _contentWidth |
|
|
|
width: _contentWidth |
|
|
|
anchors.horizontalCenter: parent.horizontalCenter |
|
|
|
anchors.horizontalCenter: parent.horizontalCenter |
|
|
|
onClicked: { |
|
|
|
onClicked: { |
|
|
|
mhPopup.close() |
|
|
|
mhPopup.close() |
|
|
|
connectionPopup.open() |
|
|
|
progressPopup.open() |
|
|
|
QGroundControl.pairingManager.startMicrohardPairing(); |
|
|
|
QGroundControl.pairingManager.startMicrohardPairing(); |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
@ -240,21 +189,26 @@ Item { |
|
|
|
anchors.centerIn: parent |
|
|
|
anchors.centerIn: parent |
|
|
|
Item { width: 1; height: 1; } |
|
|
|
Item { width: 1; height: 1; } |
|
|
|
QGCLabel { |
|
|
|
QGCLabel { |
|
|
|
text: qsTr("Pair New Vehicle") |
|
|
|
text: kPairingManager |
|
|
|
font.pointSize: ScreenTools.mediumFontPointSize |
|
|
|
|
|
|
|
font.family: ScreenTools.demiboldFontFamily |
|
|
|
font.family: ScreenTools.demiboldFontFamily |
|
|
|
|
|
|
|
font.pointSize: ScreenTools.mediumFontPointSize |
|
|
|
anchors.horizontalCenter: parent.horizontalCenter |
|
|
|
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; } |
|
|
|
Item { width: 1; height: 1; } |
|
|
|
Rectangle { |
|
|
|
Rectangle { |
|
|
|
width: ScreenTools.defaultFontPixelWidth * 40 |
|
|
|
width: _rectWidth |
|
|
|
height: ScreenTools.defaultFontPixelHeight * 12 |
|
|
|
height: _rectHeight |
|
|
|
color: Qt.rgba(0,0,0,0) |
|
|
|
color: Qt.rgba(0,0,0,0) |
|
|
|
border.color: qgcPal.text |
|
|
|
border.color: qgcPal.text |
|
|
|
border.width: 1 |
|
|
|
border.width: 1 |
|
|
|
anchors.horizontalCenter: parent.horizontalCenter |
|
|
|
anchors.horizontalCenter: parent.horizontalCenter |
|
|
|
QGCLabel { |
|
|
|
QGCLabel { |
|
|
|
text: "Graphic" |
|
|
|
text: "Vehicle and Tablet Graphic" |
|
|
|
anchors.centerIn: parent |
|
|
|
anchors.centerIn: parent |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
@ -273,7 +227,7 @@ Item { |
|
|
|
anchors.horizontalCenter: parent.horizontalCenter |
|
|
|
anchors.horizontalCenter: parent.horizontalCenter |
|
|
|
onClicked: { |
|
|
|
onClicked: { |
|
|
|
nfcPopup.close() |
|
|
|
nfcPopup.close() |
|
|
|
connectionPopup.open() |
|
|
|
progressPopup.open() |
|
|
|
QGroundControl.pairingManager.startNFCScan(); |
|
|
|
QGroundControl.pairingManager.startNFCScan(); |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
@ -282,11 +236,11 @@ Item { |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
//------------------------------------------------------------------------- |
|
|
|
//------------------------------------------------------------------------- |
|
|
|
//-- Connection Manager |
|
|
|
//-- Pairing/Connection Progress |
|
|
|
Popup { |
|
|
|
Popup { |
|
|
|
id: connectionPopup |
|
|
|
id: progressPopup |
|
|
|
width: connectionBody.width |
|
|
|
width: progressBody.width |
|
|
|
height: connectionBody.height |
|
|
|
height: progressBody.height |
|
|
|
modal: true |
|
|
|
modal: true |
|
|
|
focus: true |
|
|
|
focus: true |
|
|
|
parent: Overlay.overlay |
|
|
|
parent: Overlay.overlay |
|
|
|
@ -299,25 +253,37 @@ Item { |
|
|
|
radius: ScreenTools.defaultFontPixelWidth * 0.25 |
|
|
|
radius: ScreenTools.defaultFontPixelWidth * 0.25 |
|
|
|
} |
|
|
|
} |
|
|
|
Item { |
|
|
|
Item { |
|
|
|
id: connectionBody |
|
|
|
id: progressBody |
|
|
|
width: connectionCol.width + (ScreenTools.defaultFontPixelWidth * 8) |
|
|
|
width: progressCol.width + (ScreenTools.defaultFontPixelWidth * 8) |
|
|
|
height: connectionCol.height + (ScreenTools.defaultFontPixelHeight * 2) |
|
|
|
height: progressCol.height + (ScreenTools.defaultFontPixelHeight * 2) |
|
|
|
anchors.centerIn: parent |
|
|
|
anchors.centerIn: parent |
|
|
|
Column { |
|
|
|
Column { |
|
|
|
id: connectionCol |
|
|
|
id: progressCol |
|
|
|
spacing: _contentSpacing * 2 |
|
|
|
spacing: _contentSpacing |
|
|
|
anchors.centerIn: parent |
|
|
|
anchors.centerIn: parent |
|
|
|
Item { width: 1; height: 1; } |
|
|
|
Item { width: 1; height: 1; } |
|
|
|
QGCLabel { |
|
|
|
QGCLabel { |
|
|
|
text: QGroundControl.pairingManager ? QGroundControl.pairingManager.pairingStatusStr : "" |
|
|
|
text: kPairingManager |
|
|
|
font.pointSize: ScreenTools.mediumFontPointSize |
|
|
|
font.family: ScreenTools.demiboldFontFamily |
|
|
|
font.family: ScreenTools.demiboldFontFamily |
|
|
|
font.pointSize: ScreenTools.mediumFontPointSize |
|
|
|
anchors.horizontalCenter: parent.horizontalCenter |
|
|
|
anchors.horizontalCenter: parent.horizontalCenter |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
QGCLabel { |
|
|
|
|
|
|
|
text: QGroundControl.pairingManager ? QGroundControl.pairingManager.pairingStatusStr : "" |
|
|
|
|
|
|
|
visible: !connectedIndicator.visible |
|
|
|
|
|
|
|
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; } |
|
|
|
Item { width: 1; height: 1; } |
|
|
|
|
|
|
|
//-- Pairing/Connecting |
|
|
|
|
|
|
|
Item { width: 1; height: ScreenTools.defaultFontPixelHeight * 3; visible: busyIndicator.visible; } |
|
|
|
QGCColoredImage { |
|
|
|
QGCColoredImage { |
|
|
|
id: busyIndicator |
|
|
|
id: busyIndicator |
|
|
|
height: ScreenTools.defaultFontPixelHeight * 2 |
|
|
|
height: ScreenTools.defaultFontPixelHeight * 4 |
|
|
|
width: height |
|
|
|
width: height |
|
|
|
source: "/qmlimages/MapSync.svg" |
|
|
|
source: "/qmlimages/MapSync.svg" |
|
|
|
sourceSize.height: height |
|
|
|
sourceSize.height: height |
|
|
|
@ -325,7 +291,7 @@ Item { |
|
|
|
mipmap: true |
|
|
|
mipmap: true |
|
|
|
smooth: true |
|
|
|
smooth: true |
|
|
|
color: qgcPal.text |
|
|
|
color: qgcPal.text |
|
|
|
visible: cancelButton.visible |
|
|
|
visible: QGroundControl.pairingManager.pairingStatus === PairingManager.PairingActive || QGroundControl.pairingManager.pairingStatus === PairingManager.PairingConnecting |
|
|
|
anchors.horizontalCenter: parent.horizontalCenter |
|
|
|
anchors.horizontalCenter: parent.horizontalCenter |
|
|
|
RotationAnimation on rotation { |
|
|
|
RotationAnimation on rotation { |
|
|
|
loops: Animation.Infinite |
|
|
|
loops: Animation.Infinite |
|
|
|
@ -335,10 +301,135 @@ Item { |
|
|
|
running: busyIndicator.visible |
|
|
|
running: busyIndicator.visible |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
Item { width: 1; height: ScreenTools.defaultFontPixelHeight * 3; visible: busyIndicator.visible; } |
|
|
|
|
|
|
|
//-- Error State |
|
|
|
|
|
|
|
Image { |
|
|
|
|
|
|
|
height: ScreenTools.defaultFontPixelHeight * 4 |
|
|
|
|
|
|
|
width: height |
|
|
|
|
|
|
|
source: "/custom/img/PairingError.svg" |
|
|
|
|
|
|
|
sourceSize.height: height |
|
|
|
|
|
|
|
fillMode: Image.PreserveAspectFit |
|
|
|
|
|
|
|
mipmap: true |
|
|
|
|
|
|
|
smooth: true |
|
|
|
|
|
|
|
visible: QGroundControl.pairingManager.errorState |
|
|
|
|
|
|
|
anchors.horizontalCenter: parent.horizontalCenter |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
//-- Connection Successful |
|
|
|
|
|
|
|
Image { |
|
|
|
|
|
|
|
id: connectedIndicator |
|
|
|
|
|
|
|
height: width * 0.2 |
|
|
|
|
|
|
|
width: _contentWidth |
|
|
|
|
|
|
|
source: "/custom/img/PairingConnected.svg" |
|
|
|
|
|
|
|
sourceSize.height: height |
|
|
|
|
|
|
|
fillMode: Image.PreserveAspectFit |
|
|
|
|
|
|
|
mipmap: true |
|
|
|
|
|
|
|
smooth: true |
|
|
|
|
|
|
|
visible: QGroundControl.pairingManager.pairingStatus === PairingManager.PairingConnected |
|
|
|
|
|
|
|
anchors.horizontalCenter: parent.horizontalCenter |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
Item { width: 1; height: _contentSpacing; visible: connectedIndicator.visible; } |
|
|
|
|
|
|
|
QGCLabel { |
|
|
|
|
|
|
|
text: QGroundControl.pairingManager.pairedVehicle |
|
|
|
|
|
|
|
visible: connectedIndicator.visible |
|
|
|
|
|
|
|
anchors.horizontalCenter: parent.horizontalCenter |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
QGCLabel { |
|
|
|
|
|
|
|
text: qsTr("Connection Successful") |
|
|
|
|
|
|
|
visible: connectedIndicator.visible |
|
|
|
|
|
|
|
anchors.horizontalCenter: parent.horizontalCenter |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
Item { width: 1; height: _contentSpacing; } |
|
|
|
|
|
|
|
//-- Buttons |
|
|
|
|
|
|
|
QGCButton { |
|
|
|
|
|
|
|
width: _contentWidth |
|
|
|
|
|
|
|
visible: QGroundControl.pairingManager ? (QGroundControl.pairingManager.pairingStatus === PairingManager.PairingConnected) : false |
|
|
|
|
|
|
|
text: qsTr("Done") |
|
|
|
|
|
|
|
anchors.horizontalCenter: parent.horizontalCenter |
|
|
|
|
|
|
|
onClicked: { |
|
|
|
|
|
|
|
progressPopup.close() |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
QGCButton { |
|
|
|
|
|
|
|
text: qsTr("Pair Another") |
|
|
|
|
|
|
|
width: _contentWidth |
|
|
|
|
|
|
|
visible: QGroundControl.pairingManager ? (QGroundControl.pairingManager.pairingStatus === PairingManager.PairingConnected) : false |
|
|
|
|
|
|
|
anchors.horizontalCenter: parent.horizontalCenter |
|
|
|
|
|
|
|
onClicked: { |
|
|
|
|
|
|
|
progressPopup.close() |
|
|
|
|
|
|
|
mhPopup.open() |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
QGCButton { |
|
|
|
|
|
|
|
text: qsTr("Try Again") |
|
|
|
|
|
|
|
width: _contentWidth |
|
|
|
|
|
|
|
visible: QGroundControl.pairingManager ? QGroundControl.pairingManager.errorState : false |
|
|
|
|
|
|
|
anchors.horizontalCenter: parent.horizontalCenter |
|
|
|
|
|
|
|
onClicked: { |
|
|
|
|
|
|
|
progressPopup.close() |
|
|
|
|
|
|
|
runPairing() |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
QGCButton { |
|
|
|
|
|
|
|
id: cancelButton |
|
|
|
|
|
|
|
width: _contentWidth |
|
|
|
|
|
|
|
visible: QGroundControl.pairingManager ? (QGroundControl.pairingManager.pairingStatus === PairingManager.PairingActive || QGroundControl.pairingManager.pairingStatus === PairingManager.PairingConnecting || QGroundControl.pairingManager.errorState) : false |
|
|
|
|
|
|
|
text: qsTr("Cancel") |
|
|
|
|
|
|
|
anchors.horizontalCenter: parent.horizontalCenter |
|
|
|
|
|
|
|
onClicked: { |
|
|
|
|
|
|
|
if(QGroundControl.pairingManager.pairingStatus === PairingManager.PairingActive) |
|
|
|
|
|
|
|
QGroundControl.pairingManager.stopPairing() |
|
|
|
|
|
|
|
else { |
|
|
|
|
|
|
|
//-- TODO: Cancel connection to paired device |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
progressPopup.close() |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
Item { width: 1; height: 1; } |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
//------------------------------------------------------------------------- |
|
|
|
|
|
|
|
//-- Connection Manager |
|
|
|
|
|
|
|
Popup { |
|
|
|
|
|
|
|
id: connectionPopup |
|
|
|
|
|
|
|
width: connectionBody.width |
|
|
|
|
|
|
|
height: connectionBody.height |
|
|
|
|
|
|
|
modal: true |
|
|
|
|
|
|
|
focus: true |
|
|
|
|
|
|
|
parent: Overlay.overlay |
|
|
|
|
|
|
|
x: Math.round((mainWindow.width - width) * 0.5) |
|
|
|
|
|
|
|
y: Math.round((mainWindow.height - height) * 0.5) |
|
|
|
|
|
|
|
closePolicy: cancelButton.visible ? Popup.NoAutoClose : (Popup.CloseOnEscape | Popup.CloseOnPressOutside) |
|
|
|
|
|
|
|
background: Rectangle { |
|
|
|
|
|
|
|
anchors.fill: parent |
|
|
|
|
|
|
|
color: qgcPal.globalTheme === QGCPalette.Light ? Qt.rgba(1,1,1,0.95) : Qt.rgba(0,0,0,0.75) |
|
|
|
|
|
|
|
radius: ScreenTools.defaultFontPixelWidth * 0.25 |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
Item { |
|
|
|
|
|
|
|
id: connectionBody |
|
|
|
|
|
|
|
width: connectionCol.width + (ScreenTools.defaultFontPixelWidth * 8) |
|
|
|
|
|
|
|
height: connectionCol.height + (ScreenTools.defaultFontPixelHeight * 2) |
|
|
|
|
|
|
|
anchors.centerIn: parent |
|
|
|
|
|
|
|
Column { |
|
|
|
|
|
|
|
id: connectionCol |
|
|
|
|
|
|
|
spacing: _contentSpacing |
|
|
|
|
|
|
|
anchors.centerIn: parent |
|
|
|
|
|
|
|
Item { width: 1; height: 1; } |
|
|
|
|
|
|
|
QGCLabel { |
|
|
|
|
|
|
|
text: kPairingManager |
|
|
|
|
|
|
|
font.family: ScreenTools.demiboldFontFamily |
|
|
|
|
|
|
|
font.pointSize: ScreenTools.mediumFontPointSize |
|
|
|
|
|
|
|
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; } |
|
|
|
QGCLabel { |
|
|
|
QGCLabel { |
|
|
|
text: qsTr("List Of Available Devices") |
|
|
|
text: qsTr("List Of Available Devices") |
|
|
|
visible: QGroundControl.pairingManager ? (QGroundControl.pairingManager.pairedDeviceNameList.length > 0 && !cancelButton.visible) : false |
|
|
|
visible: QGroundControl.pairingManager ? (QGroundControl.pairingManager.pairedDeviceNameList.length > 0 && !cancelButton.visible) : false |
|
|
|
font.pointSize: ScreenTools.mediumFontPointSize |
|
|
|
|
|
|
|
font.family: ScreenTools.demiboldFontFamily |
|
|
|
font.family: ScreenTools.demiboldFontFamily |
|
|
|
} |
|
|
|
} |
|
|
|
Item { width: 1; height: 1; } |
|
|
|
Item { width: 1; height: 1; } |
|
|
|
@ -348,10 +439,11 @@ Item { |
|
|
|
columnSpacing: ScreenTools.defaultFontPixelWidth |
|
|
|
columnSpacing: ScreenTools.defaultFontPixelWidth |
|
|
|
rowSpacing: ScreenTools.defaultFontPixelHeight * 0.25 |
|
|
|
rowSpacing: ScreenTools.defaultFontPixelHeight * 0.25 |
|
|
|
anchors.horizontalCenter: parent.horizontalCenter |
|
|
|
anchors.horizontalCenter: parent.horizontalCenter |
|
|
|
|
|
|
|
property var _pairModel: QGroundControl.pairingManager ? QGroundControl.pairingManager.pairedDeviceNameList : [] |
|
|
|
Repeater { |
|
|
|
Repeater { |
|
|
|
model: QGroundControl.pairingManager ? QGroundControl.pairingManager.pairedDeviceNameList : [] |
|
|
|
model: parent._pairModel |
|
|
|
QGCLabel { |
|
|
|
delegate: QGCLabel { |
|
|
|
text: modelData |
|
|
|
text: modelData |
|
|
|
Layout.row: index |
|
|
|
Layout.row: index |
|
|
|
Layout.column: 0 |
|
|
|
Layout.column: 0 |
|
|
|
Layout.minimumWidth:ScreenTools.defaultFontPixelWidth * 14 |
|
|
|
Layout.minimumWidth:ScreenTools.defaultFontPixelWidth * 14 |
|
|
|
@ -359,85 +451,64 @@ Item { |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
Repeater { |
|
|
|
Repeater { |
|
|
|
model: QGroundControl.pairingManager ? QGroundControl.pairingManager.pairedDeviceNameList : [] |
|
|
|
model: parent._pairModel |
|
|
|
QGCButton { |
|
|
|
delegate: QGCButton { |
|
|
|
text: qsTr("Connect") |
|
|
|
text: qsTr("Connect") |
|
|
|
Layout.row: index |
|
|
|
Layout.row: index |
|
|
|
Layout.column: 1 |
|
|
|
Layout.column: 1 |
|
|
|
onClicked: { |
|
|
|
onClicked: { |
|
|
|
QGroundControl.pairingManager.connectToPairedDevice(modelData) |
|
|
|
QGroundControl.pairingManager.connectToPairedDevice(modelData) |
|
|
|
|
|
|
|
connectionPopup.close() |
|
|
|
|
|
|
|
progressPopup.open() |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
Repeater { |
|
|
|
Repeater { |
|
|
|
model: QGroundControl.pairingManager ? QGroundControl.pairingManager.pairedDeviceNameList : [] |
|
|
|
model: parent._pairModel |
|
|
|
QGCColoredImage { |
|
|
|
delegate: QGCColoredImage { |
|
|
|
height: ScreenTools.defaultFontPixelHeight * 1.5 |
|
|
|
Layout.preferredWidth: ScreenTools.defaultFontPixelHeight * 1.5 |
|
|
|
width: height |
|
|
|
Layout.preferredHeight: ScreenTools.defaultFontPixelHeight * 1.5 |
|
|
|
sourceSize.height: height |
|
|
|
sourceSize.height: height |
|
|
|
source: "/res/TrashDelete.svg" |
|
|
|
source: "/res/TrashDelete.svg" |
|
|
|
color: qgcPal.colorRed |
|
|
|
color: qgcPal.colorRed |
|
|
|
Layout.row: index |
|
|
|
Layout.row: index |
|
|
|
Layout.column: 2 |
|
|
|
Layout.column: 2 |
|
|
|
MouseArea { |
|
|
|
MouseArea { |
|
|
|
anchors.fill: parent |
|
|
|
anchors.fill: parent |
|
|
|
onClicked: { |
|
|
|
onClicked: { |
|
|
|
//-- TODO: |
|
|
|
removePrompt.open() |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
MessageDialog { |
|
|
|
} |
|
|
|
id: removePrompt |
|
|
|
} |
|
|
|
title: qsTr("Remove Paired Vehicle") |
|
|
|
Item { width: 1; height: 1; } |
|
|
|
text: qsTr("Confirm removing %1?").arg(modelData) |
|
|
|
RowLayout { |
|
|
|
standardButtons: StandardButton.Yes | StandardButton.No |
|
|
|
id: connectedButtons |
|
|
|
onNo: removePrompt.close() |
|
|
|
visible: QGroundControl.pairingManager ? (QGroundControl.pairingManager.pairingStatus === PairingManager.PairingConnected || QGroundControl.pairingManager.pairingStatus === PairingManager.PairingIdle) : false |
|
|
|
onYes: { |
|
|
|
spacing: ScreenTools.defaultFontPixelWidth * 4 |
|
|
|
QGroundControl.pairingManager.removePairedDevice(modelData) |
|
|
|
anchors.horizontalCenter: parent.horizontalCenter |
|
|
|
removePrompt.close() |
|
|
|
QGCButton { |
|
|
|
} |
|
|
|
text: qsTr("Pair Another") |
|
|
|
|
|
|
|
Layout.minimumWidth: _contentWidth * 0.333 |
|
|
|
|
|
|
|
Layout.fillWidth: true |
|
|
|
|
|
|
|
onClicked: { |
|
|
|
|
|
|
|
connectionPopup.close() |
|
|
|
|
|
|
|
if(QGroundControl.pairingManager.pairingLinkTypeStrings.length > 1) |
|
|
|
|
|
|
|
pairingPopup.open() |
|
|
|
|
|
|
|
else { |
|
|
|
|
|
|
|
mhPopup.open() |
|
|
|
|
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
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() |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
Item { width: 1; height: _contentSpacing; } |
|
|
|
QGCButton { |
|
|
|
QGCButton { |
|
|
|
id: cancelButton |
|
|
|
width: _contentWidth |
|
|
|
visible: QGroundControl.pairingManager ? (QGroundControl.pairingManager.pairingStatus === PairingManager.PairingActive || QGroundControl.pairingManager.pairingStatus === PairingManager.PairingConnecting) : false |
|
|
|
text: qsTr("Close") |
|
|
|
text: qsTr("Cancel") |
|
|
|
anchors.horizontalCenter: parent.horizontalCenter |
|
|
|
width: _contentWidth |
|
|
|
|
|
|
|
anchors.horizontalCenter: parent.horizontalCenter |
|
|
|
|
|
|
|
onClicked: { |
|
|
|
onClicked: { |
|
|
|
if(QGroundControl.pairingManager.pairingStatus === PairingManager.PairingActive) |
|
|
|
|
|
|
|
QGroundControl.pairingManager.stopPairing() |
|
|
|
|
|
|
|
else { |
|
|
|
|
|
|
|
//-- TODO: Cancel connection to paired device |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
connectionPopup.close() |
|
|
|
connectionPopup.close() |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
QGCButton { |
|
|
|
QGCButton { |
|
|
|
visible: !cancelButton.visible && !connectedButtons.visible |
|
|
|
text: qsTr("Pair Another") |
|
|
|
text: qsTr("Close") |
|
|
|
width: _contentWidth |
|
|
|
width: _contentWidth |
|
|
|
anchors.horizontalCenter: parent.horizontalCenter |
|
|
|
anchors.horizontalCenter: parent.horizontalCenter |
|
|
|
|
|
|
|
onClicked: { |
|
|
|
onClicked: { |
|
|
|
connectionPopup.close() |
|
|
|
connectionPopup.close() |
|
|
|
|
|
|
|
mhPopup.open() |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
Item { width: 1; height: 1; } |
|
|
|
Item { width: 1; height: 1; } |
Gus Grubba
6 years ago
committed by
GitHub
