Index: sources/gui/qml/pages/pretreatment/connection/PreTreatmentConnectionStack.qml =================================================================== diff -u -re384cd37cb5f778a75e86c28e5901086a5aa2aa3 -r9e2abbe568ea8bcf1a9ee955c56a0bfd840c2840 --- sources/gui/qml/pages/pretreatment/connection/PreTreatmentConnectionStack.qml (.../PreTreatmentConnectionStack.qml) (revision e384cd37cb5f778a75e86c28e5901086a5aa2aa3) +++ sources/gui/qml/pages/pretreatment/connection/PreTreatmentConnectionStack.qml (.../PreTreatmentConnectionStack.qml) (revision 9e2abbe568ea8bcf1a9ee955c56a0bfd840c2840) @@ -52,17 +52,16 @@ contentRectHeight : _root.height } TouchRect { id: _enterBluetoothScreen - visible : true - text.text : qsTr("Bluetooth Settings") + visible : vBluetooth.pairedAddr == "" // empty pairedAddr indicate not paired + text.text : qsTr("CONNECTION") onClicked : _settingsBluetoothPage.visible = true - isDefault : true width : _bphrEntry.width/2 anchors.top : _bphrEntry.bottom anchors.topMargin : Variables.notificationHeight + Variables.minVGap anchors.horizontalCenter: _bphrEntry.horizontalCenter } Label { - text : qsTr("Press START on Blood Pressure Measurement Cuff to display reading or enter vitals manually") + text : (vBluetooth.pairedAddr == "") ? qsTr("Press CONNECTION to pair a Bluetooth Pressure Measurement Cuff.") : qsTr("Press START on Blood Pressure Measurement Cuff to display reading or enter vitals manually") width : parent.width anchors { bottom: parent.bottom Index: sources/view/settings/VBluetooth.cpp =================================================================== diff -u -r7bb28b34d5337c6fe8669ee797e0312639c0e02f -r9e2abbe568ea8bcf1a9ee955c56a0bfd840c2840 --- sources/view/settings/VBluetooth.cpp (.../VBluetooth.cpp) (revision 7bb28b34d5337c6fe8669ee797e0312639c0e02f) +++ sources/view/settings/VBluetooth.cpp (.../VBluetooth.cpp) (revision 9e2abbe568ea8bcf1a9ee955c56a0bfd840c2840) @@ -105,7 +105,6 @@ */ void View::VBluetooth::onStateChange(const BluetoothData &vData) { - pairedAddr(""); Model::MBluetooth::InterfaceStates state = vData.state; if ( state == MBluetooth::eIS_Local_Error_POST ) { isInvalid( true ); @@ -129,6 +128,7 @@ break; case MBluetooth::eIS_Scan_Start : + pairedAddr(""); scanEnabled(false); // disable the scan button while the device is scanning reset(); break; @@ -189,6 +189,8 @@ error (vData.error ); notify( state ); + + //DEBUG: qDebug()<< "bt state : " << state << " currently paired to addr: "<< _pairedAddr; } /*!