Index: sources/gui/qml/main.qml =================================================================== diff -u -refac452e8558f6f95b37243f82e980187965e821 -r9a3ee027dbc33f39ee7df2a9dc5a7897c6b1854d --- sources/gui/qml/main.qml (.../main.qml) (revision efac452e8558f6f95b37243f82e980187965e821) +++ sources/gui/qml/main.qml (.../main.qml) (revision 9a3ee027dbc33f39ee7df2a9dc5a7897c6b1854d) @@ -26,9 +26,6 @@ import "qrc:/components" import "qrc:/dialogs" -// TODO : -// 3 - Version - /* * \brief Initialization and start point of the QML */ @@ -38,20 +35,26 @@ property alias powerOffDialog: _powerOffDialog - GuiView { id: _guiView - onActionEvaluated: { - if (vAction === GuiActions.ActBack) { - if (vAccepted) { - _stackView.pop() - } + GuiView { id: _GuiView + onDidActionConfirm: { + switch(vAction) { + case GuiActions.PowerOff: + if (vInfo === GuiActions.Accepted) + _powerOffDialog.open() + break; } - if (vAction === GuiActions.ActConfirm) { - // NoOp + } + onDidActionCommand: { + switch(vAction) { + case GuiActions.PowerOff: + _powerOffDialog.open() + break; } } } - // ----- Follow the Z order ----- + + // ----- Follow the below Z order ----- // 1 - Screens // 1 - 1 SettingsStack { id: _settingsStack } @@ -74,10 +77,17 @@ } // 4 - Modals - PowerOff { id: _powerOffDialog } + PowerOff { id: _powerOffDialog + onAccepted: { + _GuiView.doActionPerform(GuiActions.PowerOff, GuiActions.Accepted) + } + onRejected: { + _GuiView.doActionPerform(GuiActions.PowerOff, GuiActions.Rejected) + } + } // 9 - Others - Text { //NOTE: Test Code : Must be removed when implemented + Text { // TODO : Test Code color: Colors.textMain x: 1172 y: 767