Commit e5d6dbfa authored by Gus Grubba's avatar Gus Grubba

UI Sizing

parent fe59583d
...@@ -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,10 +464,10 @@ Item { ...@@ -463,10 +464,10 @@ 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
......
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