Index: sources/device/DeviceController.h =================================================================== diff -u -r0e122c98700951af539d9f47c5578e26d640fcc7 -rc73feffa73c7fe073a7a7581144f5806dfc91beb --- sources/device/DeviceController.h (.../DeviceController.h) (revision 0e122c98700951af539d9f47c5578e26d640fcc7) +++ sources/device/DeviceController.h (.../DeviceController.h) (revision c73feffa73c7fe073a7a7581144f5806dfc91beb) @@ -110,6 +110,10 @@ QFileSystemWatcher _fileSystemWatcher; + QString _macEthernet = ""; + QString _macWireless = ""; + QString _macBluetooth = ""; + //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 @@ -124,6 +128,11 @@ private slots: void onScreenshot(const QImage &vImage, const QString &vFileName); + void onUSBDriveUmount(); + void onWatchFileChanged(const QString &vFile); + + void onPOSTInformationReady(const QString &vMacEthernet, const QString &vMacWireless, const QString &vMacBluetooth); + protected: void timerEvent(QTimerEvent *) override; @@ -206,7 +215,16 @@ void didWatchFileChange(const QString &vFile); -private slots: + /*! + * \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); + +private: // ----- USB void usbCheck(); @@ -215,16 +233,9 @@ void usbRemove(); void usbError (const QString &vDevice); - void onUSBDriveUmount(); - - void onWatchFileChanged(const QString &vFile); - - // ----- SDCard void sdcardSpaceCheck(); + void usbSpaceCheck(); - // ----- USBDrive - void usbSpaceCheck(); - SAFE_CALL_EX(doAddWatch, const QString &) }; }