Index: sources/ApplicationController.cpp =================================================================== diff -u -r7ebc073150532073ae7f1a0e768272bcff5d6fb3 -r465a935949a85d3d1bebd11979737ff38ef96122 --- sources/ApplicationController.cpp (.../ApplicationController.cpp) (revision 7ebc073150532073ae7f1a0e768272bcff5d6fb3) +++ sources/ApplicationController.cpp (.../ApplicationController.cpp) (revision 465a935949a85d3d1bebd11979737ff38ef96122) @@ -114,16 +114,20 @@ this , SLOT( onFailedTransmit(Sequence))); // USB drive - connect(&_GuiController , SIGNAL(didUSBDriveUmount()), - this , SLOT( onUSBDriveUmount())); + connect(&_GuiController , SIGNAL(didUSBDriveUmount()), + this , SLOT( onUSBDriveUmount())); connect(&_DeviceController , SIGNAL(didUSBDriveMount ()), this , SLOT( onUSBDriveMount ())); connect(&_DeviceController , SIGNAL(didUSBDriveRemove()), this , SLOT( onUSBDriveRemove())); + connect(&_DeviceController , SIGNAL(didUSBSpaceChange(bool, qint64, qint64, quint8)), + this , SLOT( onUSBSpaceChange(bool, qint64, qint64, quint8))); // SD Card connect(&_DeviceController , SIGNAL(didSDCardStateChange(bool, bool)), this , SLOT( onSDCardStateChange(bool, bool))); + connect(&_DeviceController , SIGNAL(didSDCardSpaceChange(bool, qint64, qint64, quint8)), + this , SLOT( onSDCardSpaceChange(bool, qint64, qint64, quint8))); connect(&_DeviceController , SIGNAL(didSDCardSpaceTooLow(quint8)), this , SLOT( onSDCardSpaceTooLow(quint8))); @@ -134,8 +138,8 @@ connect(&_GuiController , SIGNAL(didExportTreatment ()), this , SLOT( onExportTreatment ())); - connect(&_Logger , SIGNAL(didExportLogs()), - this , SLOT( onExport ())); + connect(&_Logger , SIGNAL(didExportLogs ()), + this , SLOT( onExport ())); // Settings - move to application thread connect(this, SIGNAL(didSettingsInit()), @@ -263,12 +267,15 @@ */ void ApplicationController::onUSBDriveRemove() { - // disabled coco begin validated: This needs user interaction to plug-in USB device - // has been tested manually emit didUSBDriveRemove(); } -// disabled coco end +void ApplicationController::onUSBSpaceChange(bool vReady, qint64 vTotal, qint64 vAvailable, quint8 vPercent) +{ + //DEBUG:0: qDebug() << "ApplicationController::onUSBSpaceChange" << vReady << vTotal << vAvailable << vPercent; + emit didUSBSpaceChange(vReady, vTotal, vAvailable, vPercent); +} + /*! * \brief ApplicationController::onSDCardStateChange * \details This is the slot which connects to the _DeviceController didSDCardStateChange signal @@ -278,13 +285,15 @@ */ void ApplicationController::onSDCardStateChange(bool vIsReady, bool vIsReadOnly) { - // disabled coco begin validated: This needs user interaction to plug-in SD Card - // has been tested manually - /// DEBUG: qDebug() << " ***** ApplicationController " << Storage::SDCard_Base_Path_Name << vIsReady; + //DEBUG:0: qDebug() << " ***** ApplicationController " << Storage::SDCard_Base_Path_Name << vIsReady; emit didSDCardStateChange(vIsReady, vIsReadOnly); } -// disabled coco end +void ApplicationController::onSDCardSpaceChange(bool vReady, qint64 vTotal, qint64 vAvailable, quint8 vPercent) +{ + emit didSDCardSpaceChange(vReady, vTotal, vAvailable, vPercent); +} + /*! * \brief ApplicationController::onSDCardSpaceTooLow * \details The handler slot for the didSDCardSpaceTooLow signal comes form DeviceController