Index: sources/ApplicationController.cpp =================================================================== diff -u -r6816b783f50e08267aa016d64350bc020080d901 -r61f16c988a159401c92730b4cbfca5085c77222f --- sources/ApplicationController.cpp (.../ApplicationController.cpp) (revision 6816b783f50e08267aa016d64350bc020080d901) +++ sources/ApplicationController.cpp (.../ApplicationController.cpp) (revision 61f16c988a159401c92730b4cbfca5085c77222f) @@ -21,7 +21,7 @@ #include "MainTimer.h" #include "MessageDispatcher.h" #include "Logger.h" -#include "DriveWatcher.h" +#include "DeviceController.h" #include "FileHandler.h" #include "GuiController.h" #include "Settings.h" @@ -108,16 +108,16 @@ // USB drive connect(&_GuiController , SIGNAL(didUSBDriveUmount()), this , SLOT( onUSBDriveUmount())); - connect(&_DriveWatcher , SIGNAL(didUSBDriveMount ()), - this , SLOT( onUSBDriveMount ())); - connect(&_DriveWatcher , SIGNAL(didUSBDriveRemove()), - this , SLOT( onUSBDriveRemove())); + connect(&_DeviceController , SIGNAL(didUSBDriveMount ()), + this , SLOT( onUSBDriveMount ())); + connect(&_DeviceController , SIGNAL(didUSBDriveRemove()), + this , SLOT( onUSBDriveRemove())); // SD Card - connect(&_DriveWatcher , SIGNAL(didSDCardStateChange(bool, bool)), - this , SLOT( onSDCardStateChange(bool, bool))); - connect(&_DriveWatcher , SIGNAL(didSDCardSpaceTooLow(quint8)), - this , SLOT( onSDCardSpaceTooLow(quint8))); + connect(&_DeviceController , SIGNAL(didSDCardStateChange(bool, bool)), + this , SLOT( onSDCardStateChange(bool, bool))); + connect(&_DeviceController , SIGNAL(didSDCardSpaceTooLow(quint8)), + this , SLOT( onSDCardSpaceTooLow(quint8))); connect(&_GuiController , SIGNAL(didExportLog()), this , SLOT( onExportLog())); @@ -132,6 +132,14 @@ connect(&_settingsWatcher, SIGNAL(finished ()), this , SLOT(onSettingsUpdate())); + + // Gui -> App + connect(&_GuiController , SIGNAL(didAttributeRequest(const DeviceBrightnessRequestData &)), + this , SLOT( onAttributeRequest(const DeviceBrightnessRequestData &))); + // App <- Dev + connect(&_DeviceController , SIGNAL(didAttributeResponse(const DeviceBrightnessResponseData &)), + this , SLOT( onAttributeResponse(const DeviceBrightnessResponseData &))); + // ---- Signal/Slots ADJUST_TRANSMT_MODEL_BRIDGE_CONNECTIONS(_GuiController ) ACTION_RECEIVE_MODEL_BRIDGE_CONNECTIONS(_MessageDispatcher) @@ -217,7 +225,7 @@ /*! * \brief ApplicationController::onUSBDriveMount - * \details This is the slot which connects to the _DriveWatcher didUSBDriveMount signal + * \details This is the slot which connects to the _DeviceController didUSBDriveMount signal * and notifies the other classes (GuiController) by emitting its signal didUSBDriveMount */ void ApplicationController::onUSBDriveMount () @@ -231,7 +239,7 @@ /*! * \brief ApplicationController::onUSBDriveRemove * \details This is the slot which connects to the _GuiController didUSBDriveUmount signal - * and notifies the other classes (DriveWatcher) by emitting its signal didUSBDriveUmount + * and notifies the other classes (DeviceController) by emitting its signal didUSBDriveUmount */ void ApplicationController::onUSBDriveUmount() { @@ -243,7 +251,7 @@ /*! * \brief ApplicationController::onUSBDriveRemove - * \details This is the slot which connects to the _DriveWatcher didUSBDriveRemove signal + * \details This is the slot which connects to the _DeviceController didUSBDriveRemove signal * and notifies the other classes (GuiController) by emitting its signal didUSBDriveRemove */ void ApplicationController::onUSBDriveRemove() @@ -256,7 +264,7 @@ /*! * \brief ApplicationController::onSDCardStateChange - * \details This is the slot which connects to the _DriveWatcher didSDCardStateChange signal + * \details This is the slot which connects to the _DeviceController didSDCardStateChange signal * and notifies the other classes (GuiController) by emitting its signal didSDCardStateChange * \param vIsReady - SDCard is Ready * \param vIsReadOnly - SDCard is ReadOnly @@ -272,7 +280,7 @@ /*! * \brief ApplicationController::onSDCardSpaceTooLow - * \details The handler slot for the didSDCardSpaceTooLow signal comes form DriveWatcher + * \details The handler slot for the didSDCardSpaceTooLow signal comes form DeviceController * \param vAvailablePercent - the minimum limit of available storage space */ void ApplicationController::onSDCardSpaceTooLow(quint8 vAvailablePercent)