Index: sources/gui/qml/pages/settings/SettingsStack.qml =================================================================== diff -u -r9b34a391e7401e9a045270744902a20d0e66d650 -r2dd767833cf0cf706c457951c2d78e7e20aff768 --- sources/gui/qml/pages/settings/SettingsStack.qml (.../SettingsStack.qml) (revision 9b34a391e7401e9a045270744902a20d0e66d650) +++ sources/gui/qml/pages/settings/SettingsStack.qml (.../SettingsStack.qml) (revision 2dd767833cf0cf706c457951c2d78e7e20aff768) @@ -166,16 +166,74 @@ SettingsBase { id: _settingsBluetooth itemIndex : SettingsStack.Bluetooth + confirmVisible : false Image { id: _image width : 640 height : 480 source: "qrc:/images/iCuff-Omron-BP7000" anchors { - horizontalCenter: parent.horizontalCenter - top: parent.top - topMargin: _settingsBluetooth.topMarginContent + top : parent.top + topMargin : _settingsBluetooth.topMarginContent + right : parent.right + rightMargin : 50 } } + Column { id : _deviceColumn + property int labelHeight: 25 + + anchors.top : _image.top + anchors.topMargin : 100 + anchors.left : parent.left + anchors.leftMargin : 50 + spacing : 10 + Label { id : _deviceTitle + text : vBluetooth.devicePair ? qsTr("Found Paired Device") : qsTr("Found Device") + } + Row { id : _deviceNameRow + leftPadding : 25 + Label { id : _deviceNameLabel + height : _deviceColumn.labelHeight + text : qsTr("Name") + labelWidth : 125 + verticalAlignment : Text.AlignVCenter + } + Label { id : _deviceName + height : _deviceColumn.labelHeight + text : ": " + vBluetooth.deviceName + font.pixelSize : Fonts.fontPixelNotification + verticalAlignment : Text.AlignVCenter + } + } + Row { + leftPadding : 25 + Label { id : _deviceAddressLabel + height : _deviceColumn.labelHeight + text : qsTr("Address") + labelWidth : 125 + verticalAlignment : Text.AlignVCenter + + } + Label { id : _deviceAddress + height : _deviceColumn.labelHeight + text : ": " + vBluetooth.deviceAddr + font.pixelSize : Fonts.fontPixelNotification + verticalAlignment : Text.AlignVCenter + } + } + } + TouchRect { id : _scanButton + anchors.bottom : parent.bottom + anchors.bottomMargin: Variables.mainMenuHeight * 2 + Variables.minVGap + anchors.left : parent.left + anchors.leftMargin : 100 + text.text : qsTr("SCAN") + width : 300 + isDefault : false + enabled :!vBluetooth.scanInProgress + onClicked : vBluetooth.doScan() + } + + notificationText : vBluetooth.notification } SettingsDG { id: _settingsDGSettings