Index: sources/gui/qml/pages/rxmanager/RxManagerList.qml =================================================================== diff -u -r37d5f1bac027637628217c4b531e5fcdeedc6578 -r4cba74ae9ca492298bb87edf3b4810e29f2e2e3e --- sources/gui/qml/pages/rxmanager/RxManagerList.qml (.../RxManagerList.qml) (revision 37d5f1bac027637628217c4b531e5fcdeedc6578) +++ sources/gui/qml/pages/rxmanager/RxManagerList.qml (.../RxManagerList.qml) (revision 4cba74ae9ca492298bb87edf3b4810e29f2e2e3e) @@ -18,62 +18,23 @@ // Qml imports import "qrc:/globals" import "qrc:/components" +import "qrc:/pages/rxmanager" -Item { id: _root +Item{ + id: _root + property var model: null + anchors { left : parent.left right : parent.right } - - ListView { id: _deviceList - ScrollBar { - anchors.fill: _deviceList - flickable : _deviceList - } - clip : true - spacing : 5 - width : 500 - 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: selectedDevice ? selectedColor : (pair ? pairedColor : normalColor) - text { - text: addr + '\n' + name - anchors.horizontalCenter: undefined - anchors.left: _deviceTouchrect.left - anchors.leftMargin: 5 - } - 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 - } - } - } + height: parent.height - (Variables.mainMenuHeight + Variables.alarmDialogHeaderHeight) + ListView{ + id: _listView + anchors.fill: parent + clip: true + spacing: Variables.defaultMargin + model: _root.model + delegate: RxProfileContainer } }