Index: sources/gui/GuiGlobals.h =================================================================== diff -u -rdf61c476838011a343a6930fd5b30404629379bc -r99e596082b87afd73b06dae039d51e4a67cc5913 --- sources/gui/GuiGlobals.h (.../GuiGlobals.h) (revision df61c476838011a343a6930fd5b30404629379bc) +++ sources/gui/GuiGlobals.h (.../GuiGlobals.h) (revision 99e596082b87afd73b06dae039d51e4a67cc5913) @@ -457,7 +457,7 @@ // Pre-Treatment Self Test Dry Q_ENUM(TD_Pre_Treatment_Dry_Self_Tests_States) // Pre-Treatment Prime - Q_ENUM(TD_Pre_Treatment_Prime_States) + Q_ENUM(TD_Prime_States) // Pre-Treatment Recirculate Q_ENUM(TD_Pre_Treatment_Recirc_States) // Post-Treatment SubMode @@ -537,7 +537,7 @@ // Pre-Treatment Self Test Dry typedef GuiActions::TD_Pre_Treatment_Dry_Self_Tests_States GuiPreTreatmentSelfTestDryStates; // Pre-Treatment Prime - typedef GuiActions::TD_Pre_Treatment_Prime_States GuiPreTreatmentPrimeStates; + typedef GuiActions::TD_Prime_States GuiPreTreatmentPrimeStates; // Pre-Treatment Recirculate typedef GuiActions::TD_Pre_Treatment_Recirc_States GuiPreTreatmentRecirculateStates; Index: sources/gui/qml/components/HeaderBar.qml =================================================================== diff -u -r290835d1a861d8fe7a716d061f0b079d9cfff75a -r99e596082b87afd73b06dae039d51e4a67cc5913 --- sources/gui/qml/components/HeaderBar.qml (.../HeaderBar.qml) (revision 290835d1a861d8fe7a716d061f0b079d9cfff75a) +++ sources/gui/qml/components/HeaderBar.qml (.../HeaderBar.qml) (revision 99e596082b87afd73b06dae039d51e4a67cc5913) @@ -181,6 +181,7 @@ extraSpace : _headerButtonRow.spacing visible : vTDTreatmentStates.txEnd + onPressed : _endTreatmentDialog.open() } IconButton { id : _waterSample Index: sources/gui/qml/components/HeaderBarPopup.qml =================================================================== diff -u -r16a8f25568b4636ebc31e76c86a8031940cc4ad7 -r99e596082b87afd73b06dae039d51e4a67cc5913 --- sources/gui/qml/components/HeaderBarPopup.qml (.../HeaderBarPopup.qml) (revision 16a8f25568b4636ebc31e76c86a8031940cc4ad7) +++ sources/gui/qml/components/HeaderBarPopup.qml (.../HeaderBarPopup.qml) (revision 99e596082b87afd73b06dae039d51e4a67cc5913) @@ -18,6 +18,11 @@ * \param vButton - Headerbar icon button */ function openDialog ( vButton ) { + if ( visible ) { + close() + return + } + button = vButton adjustPosition(button) open() @@ -32,7 +37,7 @@ closePolicy : Dialog.CloseOnPressOutside y : Variables.headerHeight + 5 backgroundColor : Colors.offWhite - showDropShadow : true + // showDropShadow : true onImplicitWidthChanged: Qt.callLater(function() { if (button) { adjustPosition(_root.button) } }) } Index: sources/gui/qml/components/MainMenu.qml =================================================================== diff -u -r56381aae237db191956aff493907cd1f0801216b -r99e596082b87afd73b06dae039d51e4a67cc5913 --- sources/gui/qml/components/MainMenu.qml (.../MainMenu.qml) (revision 56381aae237db191956aff493907cd1f0801216b) +++ sources/gui/qml/components/MainMenu.qml (.../MainMenu.qml) (revision 99e596082b87afd73b06dae039d51e4a67cc5913) @@ -56,7 +56,7 @@ anchors.rightMargin : anchors.leftMargin currentIndex : 0 highlightFollowsCurrentItem : true - highlightMoveDuration : 500 + highlightMoveDuration : 250 highlightMoveVelocity : -1 orientation : ListView.Horizontal interactive : false Index: sources/gui/qml/dialogs/EndTreatmentDialog.qml =================================================================== diff -u -r7b71ec23c53c04a24e3db8ace0ca4825ec57d721 -r99e596082b87afd73b06dae039d51e4a67cc5913 --- sources/gui/qml/dialogs/EndTreatmentDialog.qml (.../EndTreatmentDialog.qml) (revision 7b71ec23c53c04a24e3db8ace0ca4825ec57d721) +++ sources/gui/qml/dialogs/EndTreatmentDialog.qml (.../EndTreatmentDialog.qml) (revision 99e596082b87afd73b06dae039d51e4a67cc5913) @@ -4,15 +4,18 @@ ConfirmDialog { id: _root messageText : qsTr("Dialysis Treatment Complete!") - confirmText : qsTr("End Treatment") - cancelText : qsTr("Stay On Treatment") + confirmText : qsTr("Setup Blood Return") + cancelText : qsTr("Remain on Treatment") width : Variables.completeDialogWidth height : Variables.completeDialogHeight backgroundColor : Colors.darkDialogColor messageTextVerticalOffset : Variables.defaultMargin * -1 - footerBottomMargin : Variables.defaultMargin * 3 + autoClose : false + onAccepted : vTreatmentAdjustmentEnd.doAdjustment () + onRejected : close() + Image { id : _iconImage objectName: "iconImage" @@ -39,9 +42,13 @@ Connections { target : vTreatmentAdjustmentEnd function onAdjustmentTriggered ( vValue ) { - if ( ! vTreatmentAdjustmentEnd.adjustment_Accepted ) { - // TODO Update to show rejection message here vTreatmentAdjustmentEnd.text() + if ( vTreatmentAdjustmentEnd.adjustment_Accepted ) { + close() + notificationText = "" } + else { + notificationText = vTreatmentAdjustmentEnd.text() + } } } } Index: sources/gui/qml/globals/Colors.qml =================================================================== diff -u -r12f90ddffb7782e94d1ce55079f5cd575258b091 -r99e596082b87afd73b06dae039d51e4a67cc5913 --- sources/gui/qml/globals/Colors.qml (.../Colors.qml) (revision 12f90ddffb7782e94d1ce55079f5cd575258b091) +++ sources/gui/qml/globals/Colors.qml (.../Colors.qml) (revision 99e596082b87afd73b06dae039d51e4a67cc5913) @@ -141,7 +141,7 @@ readonly property color textNotificationNoneBg : white readonly property color textNotificationNoneFg : "#1b2b3e" - readonly property color textNotificationLowBg : "#01C8C8" // ? + readonly property color textNotificationLowBg : "#02B0B0" // ? readonly property color textNotificationLowFg : white // ? readonly property color textNotificationMedBg : "#f5a623" // ? @@ -156,7 +156,7 @@ readonly property color alarmTopBarMedBg : "#db8f00" readonly property color alarmTopBarMedFg : white - readonly property color alarmTopBarLowBg : "#01C8C8" + readonly property color alarmTopBarLowBg : "#02B0B0" readonly property color alarmTopBarLowFg : white readonly property color alarmTopBarNoneBg : "#db8f00" Index: sources/gui/qml/pages/MainStack.qml =================================================================== diff -u -r5fdac82425ab432aeda805a3ed7ad8cb2efc2bd1 -r99e596082b87afd73b06dae039d51e4a67cc5913 --- sources/gui/qml/pages/MainStack.qml (.../MainStack.qml) (revision 5fdac82425ab432aeda805a3ed7ad8cb2efc2bd1) +++ sources/gui/qml/pages/MainStack.qml (.../MainStack.qml) (revision 99e596082b87afd73b06dae039d51e4a67cc5913) @@ -114,11 +114,4 @@ _mainHome.reasonText = vPreTreatmentAdjustmentInitTreatment.adjustment_ReasonText } } - - Connections { target: _endTreatmentDialog - // End Treatment -> proceed to rinceback - function onAccepted () { - vTreatmentAdjustmentEnd.doAdjustment () - } - } } Index: sources/view/hd/data/pretreatment/VPreTreatmentStatesData.cpp =================================================================== diff -u -r00a8328d166a8a8a0f47e0d19b38396dbaaf06ae -r99e596082b87afd73b06dae039d51e4a67cc5913 --- sources/view/hd/data/pretreatment/VPreTreatmentStatesData.cpp (.../VPreTreatmentStatesData.cpp) (revision 00a8328d166a8a8a0f47e0d19b38396dbaaf06ae) +++ sources/view/hd/data/pretreatment/VPreTreatmentStatesData.cpp (.../VPreTreatmentStatesData.cpp) (revision 99e596082b87afd73b06dae039d51e4a67cc5913) @@ -71,30 +71,30 @@ // Prime blood and dialysate circuits and run wet self-tests state bool mPrime = vData.mSubMode == GuiPreTreatmentStates ::TD_PRE_TREATMENT_PRIME_STATE ; if ( mPrime ) { - prime_waitUserStart ( vData.mPrimeState == GuiPreTreatmentPrimeStates ::TD_PRIME_WAIT_FOR_USER_START_STATE ); - prime_salineSetup ( vData.mPrimeState == GuiPreTreatmentPrimeStates ::TD_PRIME_SALINE_SETUP_STATE ); - prime_salinePurgeAir ( vData.mPrimeState == GuiPreTreatmentPrimeStates ::TD_PRIME_SALINE_PURGE_AIR_STATE ); - prime_salineCirculateBloodCircuit ( vData.mPrimeState == GuiPreTreatmentPrimeStates ::TD_PRIME_SALINE_CIRC_BLOOD_CIRCUIT_STATE ); - prime_reservoirOneFillComplete ( vData.mPrimeState == GuiPreTreatmentPrimeStates ::TD_PRIME_RESERVOIR_ONE_FILL_COMPLETE_STATE ); - prime_dialysateDialyzer ( vData.mPrimeState == GuiPreTreatmentPrimeStates ::TD_PRIME_DIALYSATE_DIALYZER_STATE ); - prime_salineDialyzerSetup ( vData.mPrimeState == GuiPreTreatmentPrimeStates ::TD_PRIME_SALINE_DIALYZER_SETUP_STATE ); - prime_salineDialyzer ( vData.mPrimeState == GuiPreTreatmentPrimeStates ::TD_PRIME_SALINE_DIALYZER_STATE ); - prime_reservoirTwoFillComplete ( vData.mPrimeState == GuiPreTreatmentPrimeStates ::TD_PRIME_RESERVOIR_TWO_FILL_COMPLETE_STATE ); - prime_dialysateBypass ( vData.mPrimeState == GuiPreTreatmentPrimeStates ::TD_PRIME_DIALYSATE_BYPASS_STATE ); - prime_wetSelfTests ( vData.mPrimeState == GuiPreTreatmentPrimeStates ::TD_PRIME_WET_SELF_TESTS_STATE ); - prime_pause ( vData.mPrimeState == GuiPreTreatmentPrimeStates ::TD_PRIME_PAUSE ); - prime_complete ( vData.mPrimeState == GuiPreTreatmentPrimeStates ::TD_PRIME_COMPLETE ); +// prime_waitUserStart ( vData.mPrimeState == GuiPreTreatmentPrimeStates ::TD_PRIME_WAIT_FOR_USER_START_STATE ); +// prime_salineSetup ( vData.mPrimeState == GuiPreTreatmentPrimeStates ::TD_PRIME_SALINE_SETUP_STATE ); +// prime_salinePurgeAir ( vData.mPrimeState == GuiPreTreatmentPrimeStates ::TD_PRIME_SALINE_PURGE_AIR_STATE ); +// prime_salineCirculateBloodCircuit ( vData.mPrimeState == GuiPreTreatmentPrimeStates ::TD_PRIME_SALINE_CIRC_BLOOD_CIRCUIT_STATE ); +// prime_reservoirOneFillComplete ( vData.mPrimeState == GuiPreTreatmentPrimeStates ::TD_PRIME_RESERVOIR_ONE_FILL_COMPLETE_STATE ); +// prime_dialysateDialyzer ( vData.mPrimeState == GuiPreTreatmentPrimeStates ::TD_PRIME_DIALYSATE_DIALYZER_STATE ); +// prime_salineDialyzerSetup ( vData.mPrimeState == GuiPreTreatmentPrimeStates ::TD_PRIME_SALINE_DIALYZER_SETUP_STATE ); +// prime_salineDialyzer ( vData.mPrimeState == GuiPreTreatmentPrimeStates ::TD_PRIME_SALINE_DIALYZER_STATE ); +// prime_reservoirTwoFillComplete ( vData.mPrimeState == GuiPreTreatmentPrimeStates ::TD_PRIME_RESERVOIR_TWO_FILL_COMPLETE_STATE ); +// prime_dialysateBypass ( vData.mPrimeState == GuiPreTreatmentPrimeStates ::TD_PRIME_DIALYSATE_BYPASS_STATE ); +// prime_wetSelfTests ( vData.mPrimeState == GuiPreTreatmentPrimeStates ::TD_PRIME_WET_SELF_TESTS_STATE ); +// prime_pause ( vData.mPrimeState == GuiPreTreatmentPrimeStates ::TD_PRIME_PAUSE ); +// prime_complete ( vData.mPrimeState == GuiPreTreatmentPrimeStates ::TD_PRIME_COMPLETE ); - prime__BloodCircuit ( _prime_salineSetup || - _prime_salinePurgeAir || - _prime_salineCirculateBloodCircuit); - prime__DialysateCircuit ( _prime_reservoirOneFillComplete || - _prime_dialysateDialyzer || - _prime_salineDialyzerSetup || - _prime_salineDialyzer || - _prime_reservoirTwoFillComplete || - _prime_dialysateBypass ); - prime__WetSelfTests ( _prime_wetSelfTests ); +// prime__BloodCircuit ( _prime_salineSetup || +// _prime_salinePurgeAir || +// _prime_salineCirculateBloodCircuit); +// prime__DialysateCircuit ( _prime_reservoirOneFillComplete || +// _prime_dialysateDialyzer || +// _prime_salineDialyzerSetup || +// _prime_salineDialyzer || +// _prime_reservoirTwoFillComplete || +// _prime_dialysateBypass ); +// prime__WetSelfTests ( _prime_wetSelfTests ); }