Index: sources/gui/qml/pages/MainStack.qml =================================================================== diff -u -r5c21e83a3fdc897cb99ac62e1cec0213f411cd73 -rb50431293b0690d6071f0fd58044880909cef01d --- sources/gui/qml/pages/MainStack.qml (.../MainStack.qml) (revision 5c21e83a3fdc897cb99ac62e1cec0213f411cd73) +++ sources/gui/qml/pages/MainStack.qml (.../MainStack.qml) (revision b50431293b0690d6071f0fd58044880909cef01d) @@ -34,7 +34,7 @@ * is selected from the main menu. */ StackItem { id : _root - stackView.initialItem : _mainHome + stackView.initialItem : _initialModeScreen function doSettingsDisinfect() { _mainMenu.currentIndex = 0 @@ -59,6 +59,7 @@ PostTreatmentStack { id: _postTreatmentStack } ScreenItem { id: _faultModeScreen + // we recently decided to not change the screen on fault and stay on current(whatever are we on currently) screen. PlaceHolderText { screenName: qsTr("FAULT MODE") } onVisibleChanged: if (visible) _mainMenu.hidden = true } @@ -69,8 +70,43 @@ } ScreenItem { id: _initialModeScreen - PlaceHolderText { screenName: qsTr("INITIAL MODE") } onVisibleChanged: if (visible) _mainMenu.hidden = true + Image { id: _dialityLogo + Behavior on opacity { OpacityAnimator { duration: 1000 } } + opacity : _initialModeScreen.visible ? 1 : 0 + anchors.centerIn: parent + source : "qrc:/images/iLogoDiality" + } + + ProgressBar { + minimum : 0 + maximum : vHDPOSTData.itemCount + value : vHDPOSTData.start ? vHDPOSTData.itemIndex + 1 : 0 // the index starts from 0 and 0 which is a valid test index will not show anything. So for progress we start from 1. + width : _dialityLogo.width + 50 + height : 3 + minText .visible: false + maxText .visible: false + marker .visible: false + anchors { + top: _dialityLogo.bottom + topMargin : 15 + horizontalCenter: parent.horizontalCenter + } + } + + 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 + done : vHDPOSTData.done + fail : ! vHDPOSTData.doneResult + } } MainHome { id: _mainHome @@ -127,7 +163,7 @@ onVisibleChanged: { if (visible) { - _mainMenu.hidden = false + _mainMenu.hidden = true // initially our landing screen is _initialModeScreen which should not have the Main menu. } else { stackView.initialItem = null