Index: sources/gui/qml/pages/SettingsBluetooth.qml =================================================================== diff -u -rdca8a36ea292270c4de986c0f0872f1ee1e5f85a -r62d4bbefa96100e5a01194c0b704fe32d9db56ec --- sources/gui/qml/pages/SettingsBluetooth.qml (.../SettingsBluetooth.qml) (revision dca8a36ea292270c4de986c0f0872f1ee1e5f85a) +++ sources/gui/qml/pages/SettingsBluetooth.qml (.../SettingsBluetooth.qml) (revision 62d4bbefa96100e5a01194c0b704fe32d9db56ec) @@ -30,12 +30,12 @@ */ ScreenItem { id: _root - signal clickedBack() + signal backClicked() BackButton { id : _backButton onClicked: { vBluetooth.doSaveMyDevices() - _root.clickedBack() + _root.backClicked() } } @@ -55,8 +55,14 @@ height: Variables.settingsBLEButtonHeight width: Variables.settingsBLEButtonWidth text.text: qsTr("Scan for devices") - animated: true - onClicked: vBluetooth.doScanForDevices() + animated: false + onClicked: { + if (!vBluetooth.scanInProgress) { + vBluetooth.doScanForDevices() + } + } + backgroundColor: vBluetooth.scanInProgress ? Colors.backgroundButtonNormal : Colors.backgroundButtonSelect + textColor: vBluetooth.scanInProgress ? "grey" : Colors.textMain } Rectangle { id: _status @@ -68,7 +74,7 @@ width: Variables.settingsBLEButtonWidth Text { id: _status_text anchors.leftMargin: 10 - text: qsTr("Status: " + vBluetooth.status) + text: qsTr(vBluetooth.status) color: Colors.textMain font.pixelSize: Fonts.fontPixelDialogText wrapMode: Text.WordWrap