Index: sources/gui/qml/main.qml =================================================================== diff -u -r174d5078531f9dfbe9cdc45274b852984bb72647 -rfeb3423b373dc2a2c4267ef9fcb4d924d738423d --- sources/gui/qml/main.qml (.../main.qml) (revision 174d5078531f9dfbe9cdc45274b852984bb72647) +++ sources/gui/qml/main.qml (.../main.qml) (revision feb3423b373dc2a2c4267ef9fcb4d924d738423d) @@ -1,6 +1,6 @@ /*! * - * Copyright (c) 2019-2020 Diality Inc. - All Rights Reserved. + * Copyright (c) 2019-2019 Diality Inc. - All Rights Reserved. * \copyright \n * THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, \n * IN PART OR IN WHOLE, \n @@ -36,21 +36,17 @@ property alias powerOffDialog: _powerOffDialog GuiView { id: _GuiView - onDidActionConfirm: { + onDidActionReceive: { + //console.debug(vData) 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 ----- @@ -81,10 +77,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) } }