Index: sources/gui/qml/pages/endtreatment/EndTreatmentRecirculateStack.qml =================================================================== diff -u -rbb2557d984b23c29426f452968ea797e6559ac3b -r37883a3031992b4cedd90746f7070542519447cc --- sources/gui/qml/pages/endtreatment/EndTreatmentRecirculateStack.qml (.../EndTreatmentRecirculateStack.qml) (revision bb2557d984b23c29426f452968ea797e6559ac3b) +++ sources/gui/qml/pages/endtreatment/EndTreatmentRecirculateStack.qml (.../EndTreatmentRecirculateStack.qml) (revision 37883a3031992b4cedd90746f7070542519447cc) @@ -65,7 +65,7 @@ } component ButtonStartRecirculate : TouchRect { - text.text : qsTr("Start Recirculation") + text.text : qsTr("Start Temporary Break") isDefault : true height : Variables.defaultButtonHeight onClicked : confirmDisconnectClicked() @@ -79,7 +79,7 @@ // Disconnect EndTreatmentBase { id: _recirculateDisconnect - headerTitle : qsTr("Recirculate Set Up") + headerTitle : qsTr("Temporary Break Set Up") instructionBased : true footer.children : [ ButtonEndTreatment {}, Index: sources/gui/qml/pages/endtreatment/recirculate/EndTreatmentRecirculateProgress.qml =================================================================== diff -u -r45cc119e54711893ccc2b9d600412b8f51b7764f -r37883a3031992b4cedd90746f7070542519447cc --- sources/gui/qml/pages/endtreatment/recirculate/EndTreatmentRecirculateProgress.qml (.../EndTreatmentRecirculateProgress.qml) (revision 45cc119e54711893ccc2b9d600412b8f51b7764f) +++ sources/gui/qml/pages/endtreatment/recirculate/EndTreatmentRecirculateProgress.qml (.../EndTreatmentRecirculateProgress.qml) (revision 37883a3031992b4cedd90746f7070542519447cc) @@ -10,7 +10,7 @@ import "qrc:/pages/endtreatment" EndTreatmentBase { id: _root - headerTitle : qsTr("Recirculate In Progress") + headerTitle : qsTr("Temporary Break In Progress") footer.anchors.bottomMargin: Variables.notificationHeight + Variables.defaultMargin readonly property int timeoutCountdown : vTreatmentRecirculate .timeoutCountDown @@ -32,7 +32,7 @@ LabelUnitText { id: _timeElapsed objectName : "_timeElapsed" width : _infoRow.cellWidth - label : qsTr("Recirculation Time Elapsed:") + label : qsTr("Temporary Break Time Elapsed:") labelWeight : Font.Medium TimeText { id: _timeText objectName: "timeText" Index: sources/gui/qml/pages/treatment/TreatmentStack.qml =================================================================== diff -u -r4c32cadadd4c8abdee1eab4ef6425f356f863547 -r37883a3031992b4cedd90746f7070542519447cc --- sources/gui/qml/pages/treatment/TreatmentStack.qml (.../TreatmentStack.qml) (revision 4c32cadadd4c8abdee1eab4ef6425f356f863547) +++ sources/gui/qml/pages/treatment/TreatmentStack.qml (.../TreatmentStack.qml) (revision 37883a3031992b4cedd90746f7070542519447cc) @@ -309,7 +309,10 @@ Connections { target: vTDTreatmentStates // in-Treatmet function onTxBloodPrimeChanged ( vValue ) { page( _treatmentBloodPrime , vValue )} - function onTxDialysisChanged ( vValue ) { page( _treatmentHome , vValue )} + function onTxDialysisChanged ( vValue ) { page( _treatmentHome , _headerBar.headerMenuIndex === HeaderBar.Treatment && vValue ) + + print(" _headerBar.headerMenuIndex " + _headerBar.headerMenuIndex) + } function onTxEndChanged ( vValue ) { if ( vValue ) { _endTreatmentDialog.open() }} function onTxRinsebackChanged ( vValue ) { page( _endTreatmentRinsebackStack , vValue )} function onTxRecirculateChanged ( vValue ) { page( _endTreatmentRecirculateStack , vValue )} Index: sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentVitalsInterval.qml =================================================================== diff -u -r59a1b4dceeb629ed08a434775d819ce108fe894b -r37883a3031992b4cedd90746f7070542519447cc --- sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentVitalsInterval.qml (.../TreatmentAdjustmentVitalsInterval.qml) (revision 59a1b4dceeb629ed08a434775d819ce108fe894b) +++ sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentVitalsInterval.qml (.../TreatmentAdjustmentVitalsInterval.qml) (revision 37883a3031992b4cedd90746f7070542519447cc) @@ -79,7 +79,7 @@ LabelUnitValueAdjuster { id: _systolicHighAlarmLimit width : _root.containerWidth - text : qsTr("Systolic BP Low Alarm Limit") + text : qsTr("Systolic BP High Alarm Limit") unitText : Variables.unitTextBloodPressure valid : ! vTreatmentAdjustmentVitalsAlarmLimits.systolicBpHighAlarmLimitRejectionReson minimum : vTreatmentRanges.systolicBloodPressureHighAlarmLimitMin