Index: sources/gui/qml/pages/pretreatment/connection/PreTreatmentConnectionStack.qml =================================================================== diff -u -rbb93d05bea8defa9ff689ceda63d03e5233da855 -r05502bb4afa7492fcaf9ad5a9b1d5cc23c61715e --- sources/gui/qml/pages/pretreatment/connection/PreTreatmentConnectionStack.qml (.../PreTreatmentConnectionStack.qml) (revision bb93d05bea8defa9ff689ceda63d03e5233da855) +++ sources/gui/qml/pages/pretreatment/connection/PreTreatmentConnectionStack.qml (.../PreTreatmentConnectionStack.qml) (revision 05502bb4afa7492fcaf9ad5a9b1d5cc23c61715e) @@ -23,6 +23,7 @@ import "qrc:/compounds" import "qrc:/pages/pretreatment" import "qrc:/pages/pretreatment/connection" +import "qrc:/pages/settings" // for SettingsBluetoothCuff /*! * \brief the pre-treatment consumbles stack screen @@ -42,16 +43,26 @@ } header.stepIndex : 5 - header.confirmText.text : _bphrEntry.isValid ? qsTr("CONFIRM") : qsTr("SKIP") + header.confirmText.text : qsTr("CONFIRM") header.backVisible : false header.confirmVisible : true + header.confirmEnabled : _bphrEntry.isValid title.text : qsTr("BP/HR") BPHREntry { id: _bphrEntry topMarginContent : 250 contentRectHeight : _root.height } + TouchRect { id: _enterBluetoothScreen + visible : vBluetooth.pairedAddr == "" // empty pairedAddr indicate not paired + text.text : qsTr("CONNECTION") + onClicked : page(_settingsBluetoothPage) + 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 @@ -80,6 +91,12 @@ } } + SettingsBluetoothCuff { id: _settingsBluetoothPage + property var itemsText : [qsTr("Bluetooth Cuff")] + itemIndex : 0 // set to zero for itemsText access of array + onBackClicked : page(_settingsBluetoothPage) + } + PreTreatmentUltrafiltration { id: _preTreatmentUltrafiltration header.stepIndex : 6 header.confirmVisible : true