Index: sources/device/DeviceController.h =================================================================== diff -u -r389f028cb9d4d320eae393de7c4408a58a619356 -r1da89b0452b8ef9448847618e75c118f3f58bd0c --- sources/device/DeviceController.h (.../DeviceController.h) (revision 389f028cb9d4d320eae393de7c4408a58a619356) +++ sources/device/DeviceController.h (.../DeviceController.h) (revision 1da89b0452b8ef9448847618e75c118f3f58bd0c) @@ -113,7 +113,11 @@ QString _macEthernet = ""; QString _macWireless = ""; QString _macBluetooth = ""; + QString _netCloudSync = ""; + bool _hasThread = false; + bool _hasSalt = false; + //TODO: all of these should use the TimesProcess (instead of QProcess) // to be able to kill the process automatically after the set time out. DEVICE_DEV_DEFINITION_LIST @@ -131,10 +135,22 @@ void onUSBDriveUmount(); void onWatchFileChanged(const QString &vFile); - void onPOSTInformationReady(const QString &vMacEthernet, const QString &vMacWireless, const QString &vMacBluetooth); void onEventThreadChange (); + /*! + * \brief didPOSTData + * \details These signals will be emitted when UI is done with the POST and will let DeviceView update its property(ies). + * \param vMacEthernet - Ethernet Mac Adress + * \param vMacWireless - Wireless Mac Adress + * \param vMacBluetooth - Bluetooth Mac Adress + * \param vNetCloudSync - CloudSync IP Adress + */ + void onPOSTEthernetData (const QString &vMacAddress); + void onPOSTWirelessData (const QString &vMacAddress); + void onPOSTBluetoothData (const QString &vMacAddress); + void onPOSTCloudSyncData (const QString &vNetAddress); + protected: void timerEvent(QTimerEvent *) override; @@ -154,6 +170,8 @@ bool addWatch(const QString &vFilePath); + void checkConfugurationMountReady(); + signals: /*! * \brief didScreenshot @@ -218,20 +236,23 @@ void didWatchFileChange(const QString &vFile); /*! - * \brief didPOSTReady - * \details This signal will be emitted when UI is done with the POST and will let DeviceView update its property(ies). - * \param vMacEthernet - Ethernet Mac Adress - * \param vMacWireless - Wireless Mac Adress - * \param vMacBluetooth - Bluetooth Mac Adress - */ - void didPOSTInformationReady(const QString &vMacEthernet, const QString &vMacWireless, const QString &vMacBluetooth); - - /*! * \brief didEventThreadChange * \details this signal will be emitted when the curr */ void didEventThreadChange (QPrivateSignal); + void didPOSTEthernetData (const QString &vMacAddress); + void didPOSTWirelessData (const QString &vMacAddress); + void didPOSTBluetoothData (const QString &vMacAddress); + void didPOSTCloudSyncData (const QString &vNetAddress); + + /*! + * \brief didCryptSetupMount + * \details will be emitted when decrypting the configuration partition is. + * to notify the ApplicationController to call initSettings + */ + void didCryptSetupMount ( bool vPass ); + private: // ----- USB void usbCheck();