Index: sources/gui/qml/pages/SettingsBluetooth.qml =================================================================== diff -u -r5696b8db4628ee3143d93952c5dbdf511fa985b1 -r5220c64dd3a0fc9c322a68884e73503bb7893d12 --- sources/gui/qml/pages/SettingsBluetooth.qml (.../SettingsBluetooth.qml) (revision 5696b8db4628ee3143d93952c5dbdf511fa985b1) +++ sources/gui/qml/pages/SettingsBluetooth.qml (.../SettingsBluetooth.qml) (revision 5220c64dd3a0fc9c322a68884e73503bb7893d12) @@ -15,6 +15,7 @@ // Qt import QtQuick 2.12 +import QtQuick.Controls 2.12 // Project import Gui.Actions 0.1; @@ -32,7 +33,10 @@ signal clickedBack() BackButton { id : _backButton - onClicked: _root.clickedBack() + onClicked: { + vBluetooth.doSaveMyDevices() + _root.clickedBack() + } } TitleText { id: _title @@ -62,11 +66,13 @@ color: "transparent" height: Variables.settingsBLEButtonHeight width: Variables.settingsBLEButtonWidth - Text { - id: _status_text + Text { id: _status_text + anchors.leftMargin: 10 text: qsTr("Status: " + vBluetooth.status) color: Colors.textMain font.pixelSize: Fonts.fontPixelDialogText + wrapMode: Text.WordWrap + width: parent.width } } @@ -88,15 +94,27 @@ anchors.horizontalCenter: _pairedDevicesLabel.horizontalCenter anchors.bottom: _root.bottom anchors.bottomMargin: Variables.mainMenuHeight + Variables.notificationHeight - width: Variables.settingsBLEButtonWidth + width: Variables.settingsBLEListViewWidth clip: true spacing: 10 + ScrollBar.vertical: ScrollBar { id: _scrollBarPairedDevices + anchors.right: _pairedDevices.right + anchors.rightMargin: 3 + contentItem: Rectangle { + color: Colors.backgroundRangeRect + implicitWidth: 6 + radius: width / 2 + width: 3 + } + } + delegate: TouchRect { id: _pairedDevicesRect - anchors.horizontalCenter: parent.horizontalCenter - height: 85 - width: parent.width + anchors.right: parent.right + anchors.rightMargin: Variables.settingsBLEItemRightMargin + height: Variables.settingsBLEButtonHeight + width: Variables.settingsBLEButtonWidth color: Colors.backgroundMain border.color: Colors.borderButton radius: 5 @@ -153,15 +171,27 @@ anchors.horizontalCenter: _devicesLabel.horizontalCenter anchors.bottom: _root.bottom anchors.bottomMargin: Variables.mainMenuHeight + Variables.notificationHeight - width: Variables.settingsBLEButtonWidth + width: Variables.settingsBLEListViewWidth clip: true spacing: 10 + ScrollBar.vertical: ScrollBar { id: _scrollBarOtherDevices + anchors.right: _devices.right + anchors.rightMargin: 3 + contentItem: Rectangle { + color: Colors.backgroundRangeRect + implicitWidth: 6 + radius: width / 2 + width: 3 + } + } + delegate: TouchRect { id: _devices_rect - anchors.horizontalCenter: parent.horizontalCenter - height: 85 - width: parent.width + anchors.right: parent.right + anchors.rightMargin: Variables.settingsBLEItemRightMargin + height: Variables.settingsBLEButtonHeight + width: Variables.settingsBLEButtonWidth color: Colors.backgroundMain border.color: Colors.borderButton radius: 5