Index: sources/applicationcontroller.cpp
===================================================================
diff -u -rc71deaab48699cffdf9db816dfac2778d79c2238 -rd1907168ef46faa6de1ada400cad789f8379041f
--- sources/applicationcontroller.cpp	(.../applicationcontroller.cpp)	(revision c71deaab48699cffdf9db816dfac2778d79c2238)
+++ sources/applicationcontroller.cpp	(.../applicationcontroller.cpp)	(revision d1907168ef46faa6de1ada400cad789f8379041f)
@@ -1,16 +1,16 @@
 /*!
- * 
+ *
  * Copyright (c) 2019-2020 Diality Inc. - All Rights Reserved.
  * \copyright
  * THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, IN PART OR IN
  * WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER.
- * 
+ *
  * \file applicationcontroller.cpp
  * \author (last) Peter Lucia
  * \date (last) 25-Jun-2020
  * \author (original) Behrouz NematiPour
  * \date (original) 24-Sep-2019
- * 
+ *
  */
 #include "applicationcontroller.h"
 
@@ -22,7 +22,7 @@
 #include "maintimer.h"
 #include "messagedispatcher.h"
 #include "logger.h"
-#include "usbwatcher.h"
+#include "DriveWatcher.h"
 #include "filehandler.h"
 #include "guicontroller.h"
 
@@ -52,7 +52,7 @@
     // coco begin validated: The class ApplicationPost has not been implemented Yet.
     if (!_applicationPost->init()) return false;
     // coco end
-    LOG_EVENT(QObject::tr("%1 Initialized").arg(metaObject()->className()));
+    LOG_EVENT("UI," + tr("%1 Initialized").arg(metaObject()->className()));
 
     return true;
 }
@@ -104,19 +104,19 @@
             this               ,   SLOT( onActionReceive(GuiActionType, const QVariantList &)));
 
     connect(&_MessageDispatcher, SIGNAL(didFailedTransmit(Sequence)),
-            this               , SLOT(onFailedTransmit(Sequence)));
+            this               ,   SLOT( onFailedTransmit(Sequence)));
 
     connect(&_GuiController , SIGNAL(didUSBDriveUmount()),
             this            ,   SLOT( onUSBDriveUmount()));
-    connect(&_USBWatcher    , SIGNAL(didUSBDriveMount ()),
+    connect(&_DriveWatcher  , SIGNAL(didUSBDriveMount ()),
             this            ,   SLOT( onUSBDriveMount ()));
-    connect(&_USBWatcher    , SIGNAL(didUSBDriveRemove()),
+    connect(&_DriveWatcher  , SIGNAL(didUSBDriveRemove()),
             this            ,   SLOT( onUSBDriveRemove()));
 
     connect(&_GuiController , SIGNAL(didExportLog()),
             this            ,   SLOT( onExportLog()));
 
-    connect(&_Logger        , SIGNAL(didExport()),
+    connect(&_Logger        , SIGNAL(didExportLogs()),
             this            ,   SLOT( onExport()));
 
     // ---- Signal/Slots
@@ -204,7 +204,7 @@
 
 /*!
  * \brief   ApplicationController::onUSBDriveMount
- * \details This is the slot which connects to the _USBWatcher didUSBDriveMount signal
+ * \details This is the slot which connects to the _DriveWatcher didUSBDriveMount signal
  *          and notifies the other classes (GuiController) by emitting its signal didUSBDriveMount
  */
 void ApplicationController::onUSBDriveMount ()
@@ -218,7 +218,7 @@
 /*!
  * \brief   ApplicationController::onUSBDriveRemove
  * \details This is the slot which connects to the _GuiController didUSBDriveUmount signal
- *          and notifies the other classes (USBWatcher) by emitting its signal didUSBDriveUmount
+ *          and notifies the other classes (DriveWatcher) by emitting its signal didUSBDriveUmount
  */
 void ApplicationController::onUSBDriveUmount()
 {
@@ -230,7 +230,7 @@
 
 /*!
  * \brief   ApplicationController::onUSBDriveRemove
- * \details This is the slot which connects to the _USBWatcher didUSBDriveRemove signal
+ * \details This is the slot which connects to the _DriveWatcher didUSBDriveRemove signal
  *          and notifies the other classes (GuiController) by emitting its signal didUSBDriveRemove
  */
 void ApplicationController::onUSBDriveRemove()
@@ -289,7 +289,7 @@
     else {
         mData += static_cast<quint8>(GuiActionData::NoData);
     }
-    onActionTransmit(GuiActionType::KeepAlive, mData);
+    onActionTransmit(GuiActionType::ID_KeepAlive, mData);
 #endif
 }