Index: sources/gui/qml/pages/MainStack.qml =================================================================== diff -u -r1286d74bd015276aab604808be2766136091c125 -r39a514158384c0ad4bfcfb90bafbaa4ca8dc5a26 --- sources/gui/qml/pages/MainStack.qml (.../MainStack.qml) (revision 1286d74bd015276aab604808be2766136091c125) +++ sources/gui/qml/pages/MainStack.qml (.../MainStack.qml) (revision 39a514158384c0ad4bfcfb90bafbaa4ca8dc5a26) @@ -61,67 +61,13 @@ onVisibleChanged: if (visible) _mainMenu.hidden = true } - ScreenItem { id: _postModeScreen - onVisibleChanged: if (visible) { - _headerBar.activeStack = null - _mainMenu.hidden = true - } - Image { id: _dialityLogo - Behavior on opacity { OpacityAnimator { duration: 1000 } } - opacity : _postModeScreen.visible ? 1 : 0 - anchors.centerIn: parent - anchors.verticalCenterOffset: Variables.notificationHeight * -1 - source : "qrc:/images/iLogoDiality" - } + MainInitialization { id: _postModeScreen } - ProgressBar { - minimum : 0 - maximum : vHDPOSTData.itemCount - value : _GuiView.useLogUnhandledOnly ? maximum : vHDPOSTData.itemIndex - width : _dialityLogo.width + 50 - height : 3 - progress.border.width: 0 - border.width: 0 - minText .visible: false - maxText .visible: false - marker .visible: false - anchors { - top: _dialityLogo.bottom - topMargin : 15 - horizontalCenter: parent.horizontalCenter - } - color : _GuiView.useLogUnhandledOnly ? "red": Colors.highlightProgressBar - } - WaitDone { id: _hdWaitdone - diameter: 100 - anchors { - top: _dialityLogo.bottom - topMargin: 100 - horizontalCenter: parent.horizontalCenter - } - visible : true - // HD will pause for a few seconds before changing to stand-by mode - // So we can show that POST has completed - fail : ! vHDPOSTData.doneResult - done : vHDPOSTData.done - pause : ! _postModeScreen.visible - } + MainHome { id: _mainHome + onCreateTreatment : { vPreTreatmentAdjustmentInitTreatment.doInitiate( )} } - MainHome { id: _mainHome - onCreateTreatment : { vPreTreatmentAdjustmentInitTreatment.doInitiate( )} - onVisibleChanged: { - if (visible) { - _headerBar.activeStack = null - _mainMenu.hidden = false // initially our landing screen is _initialModeScreen which should not have the Main menu. - } - else { - _mainHome.reasonText = "" - } - } - } - Connections { target: vTDOpMode function onIsTreatmentChanged ( vValue ) { if( vValue ) _mainMenu.isTreatment() } function onIsManagerChanged ( vValue ) { if( vValue ) _mainMenu.isManager () }