Index: denali.pro.user =================================================================== diff -u -r5abe9a51e8060278ddf81bcea3f3aae7a8de3085 -rf93fd4a2a09a2c6d4db43196b9005f324ae7fa82 --- denali.pro.user (.../denali.pro.user) (revision 5abe9a51e8060278ddf81bcea3f3aae7a8de3085) +++ denali.pro.user (.../denali.pro.user) (revision f93fd4a2a09a2c6d4db43196b9005f324ae7fa82) @@ -1,6 +1,6 @@ - + EnvironmentId Index: sources/gui/qml/pages/MainStack.qml =================================================================== diff -u -re28183bddebf7383c1bd113e7b8ef4ea11f494fb -rf93fd4a2a09a2c6d4db43196b9005f324ae7fa82 --- sources/gui/qml/pages/MainStack.qml (.../MainStack.qml) (revision e28183bddebf7383c1bd113e7b8ef4ea11f494fb) +++ sources/gui/qml/pages/MainStack.qml (.../MainStack.qml) (revision f93fd4a2a09a2c6d4db43196b9005f324ae7fa82) @@ -36,9 +36,9 @@ StackItem { id : _root stackView.initialItem : _mainHome - function doSettingsDisinfect( vFlush, vHeat, vIsChemical ) { + function doSettingsDisinfect() { _mainMenu.currentIndex = 0 - _disinfectStack.doSettingsDisinfect( vFlush, vHeat, vIsChemical ) + _disinfectStack.doSettingsDisinfect() page( _disinfectStack ) } Index: sources/gui/qml/pages/disinfect/DisinfectStack.qml =================================================================== diff -u -re28183bddebf7383c1bd113e7b8ef4ea11f494fb -rf93fd4a2a09a2c6d4db43196b9005f324ae7fa82 --- sources/gui/qml/pages/disinfect/DisinfectStack.qml (.../DisinfectStack.qml) (revision e28183bddebf7383c1bd113e7b8ef4ea11f494fb) +++ sources/gui/qml/pages/disinfect/DisinfectStack.qml (.../DisinfectStack.qml) (revision f93fd4a2a09a2c6d4db43196b9005f324ae7fa82) @@ -41,15 +41,15 @@ readonly property string heatTitle : qsTr("Heat Disinfect") readonly property string chemicalTitle : qsTr("Chemical Disinfect") - function doSettingsDisinfect( vFlush, vHeat, vIsChemical ) { + function doSettingsDisinfect() { // since we do't know the order or timing of the FW message // prefered to set the screens by UI. // If HDOpMode says/has the same state nothing changes, but at least UI is not showing empty screen. _mainMenu.hidden = true stackView.clear() - if ( vFlush ) { page( _disinfectFlush ); return } - if ( vHeat ) { page( _disinfectHeat ); return } - if ( vIsChemical ) { page( _disinfectChemicalInstruction ); return } + if ( vDisinfectAdjustDisinfect.flush ) { page( _disinfectFlush ); return } + if ( vDisinfectAdjustDisinfect.heat ) { page( _disinfectHeat ); return } + if ( vDisinfectAdjustDisinfect.chemical ) { page( _disinfectChemicalInstruction ); return } } DisinfectBase { id : _disinfect Index: sources/gui/qml/pages/settings/SettingsDG.qml =================================================================== diff -u -r5abe9a51e8060278ddf81bcea3f3aae7a8de3085 -rf93fd4a2a09a2c6d4db43196b9005f324ae7fa82 --- sources/gui/qml/pages/settings/SettingsDG.qml (.../SettingsDG.qml) (revision 5abe9a51e8060278ddf81bcea3f3aae7a8de3085) +++ sources/gui/qml/pages/settings/SettingsDG.qml (.../SettingsDG.qml) (revision f93fd4a2a09a2c6d4db43196b9005f324ae7fa82) @@ -140,11 +140,8 @@ if ( ! visible ) return if ( vDisinfectAdjustDisinfect.adjustment_Accepted ) { _root.notificationText = "" - _mainStack.doSettingsDisinfect( // go to disinfect stack - vDisinfectAdjustDisinfect.flush , - vDisinfectAdjustDisinfect.heat , - vDisinfectAdjustDisinfect.chemical ) - pop() // back to settings stack main menu + _mainStack.doSettingsDisinfect() // go to disinfect stack + pop() // back to settings stack main menu } else { _root.notificationText = vDisinfectAdjustDisinfect.text() }