Index: sources/gui/qml/pages/settings/SettingsBluetoothCuff.qml =================================================================== diff -u -rb252cd2777aadbce2d04aa32cc275f193de0cf52 -raeb915075b9e13e5c1aaf2800ba6db03b6c24a0b --- sources/gui/qml/pages/settings/SettingsBluetoothCuff.qml (.../SettingsBluetoothCuff.qml) (revision b252cd2777aadbce2d04aa32cc275f193de0cf52) +++ sources/gui/qml/pages/settings/SettingsBluetoothCuff.qml (.../SettingsBluetoothCuff.qml) (revision aeb915075b9e13e5c1aaf2800ba6db03b6c24a0b) @@ -62,12 +62,16 @@ height : 300 model : vBluetooth delegate: TouchRect { id: _deviceTouchrect + readonly property color selectedColor: Colors.borderButtonSelected + readonly property color pairedColor: Colors.borderButton + readonly property color normalColor: Colors.borderButtonUnselected + property bool selectedDevice: addr === vBluetooth.pairedAddr clip : true radius : 10 width : 500 - 10 // give room to scrollbar height : 70 color : Colors.transparent - border.color: pair ? Colors.borderButton : Colors.borderButtonUnselected + border.color: selectedDevice ? selectedColor : (pair ? pairedColor : normalColor) text { text: addr + '\n' + name anchors.horizontalCenter: undefined @@ -77,6 +81,25 @@ onClicked: { vBluetooth.didDeviceSelect(addr, name); } + ProgressCircle { + minimum : 0 + maximum : 100 + value : vBluetooth.pairedBatt + color : _deviceTouchrect.border.color + visible : selectedDevice + diameter : 25 + anchors.margins: 5 + anchors.top: parent.top + anchors.right: parent.right + Text { + horizontalAlignment: Text.AlignHCenter + verticalAlignment: Text.AlignVCenter + color : Colors.white + anchors.fill: parent + font.pixelSize: 10 + text: vBluetooth.pairedBatt + } + } } } }