Index: sources/gui/qml/pages/MainStack.qml =================================================================== diff -u -r11a7a3223f8405b6cfba01f8f684fadb2090e0cc -rb238ed3e1aa94f5c03d4e1a6ed6c9fdfdd2a3cb5 --- sources/gui/qml/pages/MainStack.qml (.../MainStack.qml) (revision 11a7a3223f8405b6cfba01f8f684fadb2090e0cc) +++ sources/gui/qml/pages/MainStack.qml (.../MainStack.qml) (revision b238ed3e1aa94f5c03d4e1a6ed6c9fdfdd2a3cb5) @@ -40,12 +40,6 @@ stackView.initialItem : _root.initialItem - function doSettingsDisinfect() { - _mainMenu.currentIndex = 0 - page( _disinfectStack ) - _disinfectStack.doSettingsDisinfect() - } - // Standby / Disinfection DisinfectStack { id: _disinfectStack } // Pre Treatment @@ -124,6 +118,9 @@ if (visible) { _mainMenu.hidden = false // initially our landing screen is _initialModeScreen which should not have the Main menu. } + else { + _mainHome.reasonText = "" + } } } @@ -149,9 +146,9 @@ onIsManagerChanged : { if( visManager ) _mainMenu.isManager () } onIsSettingsChanged : { if( visSettings ) _mainMenu.isSettings () } - onFaultChanged : { page( _faultModeScreen , vfault )} + onFaultChanged : { page( _faultModeScreen , vfault && ! vSettings.noCANBus )} onServiceChanged : { page( _serviceModeScreen , vservice )} - onInitChanged : { page( _postModeScreen , vinit ) + onInitChanged : { page( _postModeScreen , vinit && ! vSettings.noCANBus ) if ( vinit ) vHDPOSTData.reset() // better to reset on vinit = true because the rest makes the screen animation to run } @@ -168,20 +165,6 @@ onInvalidModeChanged : { page( null , vinvalidMode )} } - // As long as UI is in In-Tx BP/HR is updated and the dialog will pop up on interval. - Connections { target: vHDOperationMode - onInTreatmentChanged : { - vTreatmentVitals.enableDialog = vinTreatment - if ( vinTreatment ) { - vTreatmentVitals.doTimerStart() - } - else { - vTreatmentVitals.doTimerStop() - vTreatmentVitals.doReset() - } - } - } - // the page function is more flixible regarding our current design // and it's easier(or may not need) to modify later if required. // and is more optimized and will never leave screen empty