Index: sources/gui/guiview.h =================================================================== diff -u -r9a3ee027dbc33f39ee7df2a9dc5a7897c6b1854d -rb9c5b0b3afc3b34d4980ecc4f023f498f80dafbc --- sources/gui/guiview.h (.../guiview.h) (revision 9a3ee027dbc33f39ee7df2a9dc5a7897c6b1854d) +++ sources/gui/guiview.h (.../guiview.h) (revision b9c5b0b3afc3b34d4980ecc4f023f498f80dafbc) @@ -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 @@ -17,7 +17,7 @@ #include // Project -#include "guiactions.h" +#include "guiglobals.h" // define // ... @@ -33,22 +33,34 @@ explicit GuiView(QQuickItem *parent = nullptr); private: - void connection(); + void initConnections(); private slots: - void onActionConfirm (GuiActionType vAction, GuiActionInfo vInfo); // UI <= HD/DG - void onActionCommand (GuiActionType vAction ); // UI <= HD/DG + void onActionReceive (GuiActionType vAction, const QVariantList &vData); // UI <= HD/DG + void doUSBDriveMount (); + void doUSBDriveRemove(); + + void doExport (); + public slots: // is public since will be used in the UI and is in the same thread. - void doActionRequest (GuiActionType vAction ); // UI => HD/DG - void doActionPerform (GuiActionType vAction, GuiActionInfo vInfo); // UI => HD/DG + void doActionTransmit(GuiActionType vAction, const QVariantList &vData); // UI => HD/DG + void doActionTransmit(GuiActionType vAction, const QVariant &vData); // UI => HD/DG + void doUSBDriveUmount(); + void doExportLog (); + QString alarmPriorityName (GuiAlarmPriority vEnum); + QString alarmIDName (GuiAlarmID vEnum); + signals: - void didActionConfirm(GuiActionType vAction, GuiActionInfo vInfo); // UI <= HD/DG - void didActionCommand(GuiActionType vAction ); // UI <= HD/DG + void didActionReceive (GuiActionType vAction, const QVariantList &vData); // UI <= HD/DG + void didActionTransmit(GuiActionType vAction, const QVariantList &vData); // UI => HD/DG - void didActionRequest(GuiActionType vAction ); // UI => HD/DG - void didActionPerform(GuiActionType vAction, GuiActionInfo vInfo); // UI => HD/DG + void didUSBDriveMount (); + void didUSBDriveUmount(); + void didUSBDriveRemove(); + void didExportLog(); + void didExport (); }; }