Skip to content

Q
qgroundcontrol
Commit e5d6dbfa authored by Gus Grubba's avatar Gus Grubba
Browse files
Options

UI Sizing

parent fe59583d
Hide whitespace changes
Inline Side-by-side
Showing with 21 additions and 20 deletions
src/ui/toolbar/PairingIndicator.qml
View file @ e5d6dbfa
...@@ -439,10 +439,11 @@ Item { ...@@ -439,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 + ' ' + QGroundControl.pairingManager.pairedDeviceNameList.length
Layout.row: index Layout.row: index
Layout.column: 0 Layout.column: 0
Layout.minimumWidth:ScreenTools.defaultFontPixelWidth * 14 Layout.minimumWidth:ScreenTools.defaultFontPixelWidth * 14
...@@ -450,8 +451,8 @@ Item { ...@@ -450,8 +451,8 @@ 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
...@@ -463,27 +464,27 @@ Item { ...@@ -463,27 +464,27 @@ Item {
} }
} }
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: {
removePrompt.open() removePrompt.open()
} }
} }
MessageDialog { MessageDialog {
id: removePrompt id: removePrompt
title: qsTr("Remove Paired Vehicle") title: qsTr("Remove Paired Vehicle")
text: qsTr("Confirm removing %1?").arg(modelData) text: qsTr("Confirm removing %1?").arg(modelData)
standardButtons: StandardButton.Yes | StandardButton.No standardButtons: StandardButton.Yes | StandardButton.No
onNo: removePrompt.close() onNo: removePrompt.close()
onYes: { onYes: {
QGroundControl.pairingManager.removePairedDevice(modelData) QGroundControl.pairingManager.removePairedDevice(modelData)
removePrompt.close() removePrompt.close()
......
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