Index: denali.pro =================================================================== diff -u -rebc82b5efe26c1081606fab06a1c99bb4f9c0098 -r9b34a391e7401e9a045270744902a20d0e66d650 --- denali.pro (.../denali.pro) (revision ebc82b5efe26c1081606fab06a1c99bb4f9c0098) +++ denali.pro (.../denali.pro) (revision 9b34a391e7401e9a045270744902a20d0e66d650) @@ -1,4 +1,4 @@ -QT += widgets qml quick serialbus concurrent charts +QT += qml quick serialbus concurrent charts bluetooth CONFIG += c++17 warn_on # CONFIG += disable-desktop QMAKE_CXXFLAGS += -Wall -Werror -Wimplicit-fallthrough # -save-temps # see .ii Index: denali.pro.user =================================================================== diff -u -r20453ac382a122d1dde3c399ed9fcaf8a39b4ad6 -r9b34a391e7401e9a045270744902a20d0e66d650 --- denali.pro.user (.../denali.pro.user) (revision 20453ac382a122d1dde3c399ed9fcaf8a39b4ad6) +++ denali.pro.user (.../denali.pro.user) (revision 9b34a391e7401e9a045270744902a20d0e66d650) @@ -1,6 +1,6 @@ - + EnvironmentId Index: denali.qrc =================================================================== diff -u -rb50431293b0690d6071f0fd58044880909cef01d -r9b34a391e7401e9a045270744902a20d0e66d650 --- denali.qrc (.../denali.qrc) (revision b50431293b0690d6071f0fd58044880909cef01d) +++ denali.qrc (.../denali.qrc) (revision 9b34a391e7401e9a045270744902a20d0e66d650) @@ -61,6 +61,7 @@ resources/images/BusyFail.png resources/images/eject.png resources/images/eye.png + resources/images/Omron-bp7000.png sources/gui/qml/components/MainMenu.qml Index: resources/images/Omron-bp7000.png =================================================================== diff -u Binary files differ Index: sources/gui/qml/pages/endtreatment/EndTreatmentRecirculateStack.qml =================================================================== diff -u -r8a5dbf556a66524fbe4b60ac1573182a0bd27617 -r9b34a391e7401e9a045270744902a20d0e66d650 --- sources/gui/qml/pages/endtreatment/EndTreatmentRecirculateStack.qml (.../EndTreatmentRecirculateStack.qml) (revision 8a5dbf556a66524fbe4b60ac1573182a0bd27617) +++ sources/gui/qml/pages/endtreatment/EndTreatmentRecirculateStack.qml (.../EndTreatmentRecirculateStack.qml) (revision 9b34a391e7401e9a045270744902a20d0e66d650) @@ -32,7 +32,7 @@ property int stackStepIndex : 0 signal reconnectClicked () - signal reconnectConfirmClicked () + signal recirculateConfirmClicked() signal recirculateBackClicked () signal treatmentEndClicked () @@ -85,7 +85,7 @@ } onReconnectClicked : vTreatmentAdjustmentRecirculate.doReconnect () //84.0 - onReconnectConfirmClicked : vTreatmentAdjustmentRecirculate.doConfirm () //84.1 + onRecirculateConfirmClicked : vTreatmentAdjustmentRecirculate.doConfirm () //84.1 onRecirculateBackClicked : vTreatmentAdjustmentRecirculate.doResume () //84.2 onTreatmentEndClicked : vTreatmentAdjustmentRecirculate.doTreatmentEnd() //84.3 Index: sources/gui/qml/pages/settings/SettingsStack.qml =================================================================== diff -u -r13d6a4fae2f910ab6e289ac9280258a94f734405 -r9b34a391e7401e9a045270744902a20d0e66d650 --- sources/gui/qml/pages/settings/SettingsStack.qml (.../SettingsStack.qml) (revision 13d6a4fae2f910ab6e289ac9280258a94f734405) +++ sources/gui/qml/pages/settings/SettingsStack.qml (.../SettingsStack.qml) (revision 9b34a391e7401e9a045270744902a20d0e66d650) @@ -55,7 +55,7 @@ qsTr("Information" ), // Information qsTr("Volume And Brightness" ), // VolumeBrightness qsTr("Wi-Fi" ), // WiFi - qsTr("Bluetooth" ), // Bluetooth + qsTr("Bluetooth Cuff" ), // Bluetooth qsTr("Dialysate Generator Settings" ), // DGSettings qsTr("Services" ), // Services qsTr("Set Date And Time" ), // SetDateTime @@ -68,7 +68,7 @@ true , // Information true , // VolumeBrightness true , // WiFi - false , // Bluetooth + true , // Bluetooth true , // DGSettings true , // Services true , // SetDateTime @@ -166,6 +166,16 @@ SettingsBase { id: _settingsBluetooth itemIndex : SettingsStack.Bluetooth + Image { id: _image + width : 640 + height : 480 + source: "qrc:/images/iCuff-Omron-BP7000" + anchors { + horizontalCenter: parent.horizontalCenter + top: parent.top + topMargin: _settingsBluetooth.topMarginContent + } + } } SettingsDG { id: _settingsDGSettings