Index: sources/gui/qml/main.qml =================================================================== diff -u -r9a3ee027dbc33f39ee7df2a9dc5a7897c6b1854d -rc933552983a659ca4cc351ff4d43d07319adab1e --- sources/gui/qml/main.qml (.../main.qml) (revision 9a3ee027dbc33f39ee7df2a9dc5a7897c6b1854d) +++ sources/gui/qml/main.qml (.../main.qml) (revision c933552983a659ca4cc351ff4d43d07319adab1e) @@ -36,24 +36,18 @@ property alias powerOffDialog: _powerOffDialog GuiView { id: _GuiView - onDidActionConfirm: { + onDidActionReceive: { switch(vAction) { case GuiActions.PowerOff: - if (vInfo === GuiActions.Accepted) + if (vData[GuiActions.PowerOff_ShowHide] === GuiActions.Command) _powerOffDialog.open() + if (vData[GuiActions.PowerOff_ShowHide] === GuiActions.Timeout) + _powerOffDialog.close() break; } } - onDidActionCommand: { - switch(vAction) { - case GuiActions.PowerOff: - _powerOffDialog.open() - break; - } - } } - // ----- Follow the below Z order ----- // 1 - Screens // 1 - 1 @@ -69,6 +63,9 @@ // 3 - Footer MainMenu { id: _mainMenu titles: [ qsTr("Treatment") , qsTr("Manager") , qsTr("Settings") ] + Component.onCompleted: { + _treatmentStack.visible = true + } onItemPressed: { _treatmentStack .visible = vIndex == 0; _mansagerStack .visible = vIndex == 1; @@ -79,10 +76,10 @@ // 4 - Modals PowerOff { id: _powerOffDialog onAccepted: { - _GuiView.doActionPerform(GuiActions.PowerOff, GuiActions.Accepted) + _GuiView.doActionTransmit(GuiActions.PowerOff, GuiActions.Accepted) } onRejected: { - _GuiView.doActionPerform(GuiActions.PowerOff, GuiActions.Rejected) + _GuiView.doActionTransmit(GuiActions.PowerOff, GuiActions.Rejected) } }