Index: main.cpp
===================================================================
diff -u -r44a85c96ab55e424866ec4cca0270aa218355f82 -rd2035a8728794afeefaa244bf8d1597926d945f5
--- main.cpp	(.../main.cpp)	(revision 44a85c96ab55e424866ec4cca0270aa218355f82)
+++ main.cpp	(.../main.cpp)	(revision d2035a8728794afeefaa244bf8d1597926d945f5)
@@ -39,7 +39,7 @@
 #include "applicationcontroller.h"
 #include "guicontroller.h"
 #include "logger.h"
-#include "usbwatcher.h"
+#include "DriveWatcher.h"
 #include "threads.h"
 
 // kernel
@@ -69,7 +69,7 @@
 const char *gFakeData_default           = "00"  ;
 bool        gSendEmptyKeepAwake         = false ;
 bool        gFakeSeqAtBegin             = false ;
-bool        gDisableHunhandledReport    = false ;
+bool        gDisableUnhandledReport     = false ;
 bool        gDisableTimeout             = false ;
 
 bool        gConsoleoutFrameInterface   = false ;
@@ -143,9 +143,9 @@
     parser.addOption(optionFakeSeqAtBegin);
 
     // --- -u : disable-unhandled-report
-    QCommandLineOption optionDisableHunhandledReport(QStringList() << "u" << "disable-unhandled-report",
+    QCommandLineOption optionDisableUnhandledReport(QStringList() << "u" << "disable-unhandled-report",
             QCoreApplication::translate("main", "Disable unhandled messages report as an error in the log"));
-    parser.addOption(optionDisableHunhandledReport);
+    parser.addOption(optionDisableUnhandledReport);
 
     // --- -u : disable-unhandled-report
     QCommandLineOption optionDisableTimeout(QStringList() << "q" << "disable-timeout",
@@ -158,7 +158,7 @@
 
     gConsoleoutCanInterface     = parser.isSet(optionConsoleoutCanInterface     );
     gConsoleoutFrameInterface   = parser.isSet(optionConsoleoutFrameInterface   );
-    gDisableHunhandledReport    = parser.isSet(optionDisableHunhandledReport    );
+    gDisableUnhandledReport     = parser.isSet(optionDisableUnhandledReport     );
     gDisableTimeout             = parser.isSet(optionDisableTimeout             );
 
     if (parser.isSet(optionSendEmptyKeepAwake)) gSendEmptyKeepAwake = true;
@@ -258,17 +258,21 @@
     //! - Initializing Logger
     _Logger.init(Threads::_Logger_Thread);
 
-    LOG_EVENT(QObject::tr("Application Started"));
+    LOG_EVENT("UI," + QObject::tr("Application %1 Started,%2")
+                          .arg(app.applicationName   ())
+                          .arg(app.applicationVersion())
+              );
 
     if (gFakeInterval) {
-        qDebug() << "  ~~ !!!!! APPLICATION RUNNING IN THE TEST MODE !!!!! ~~ " ;
+        QString msg = "  ~~ !!!!! APPLICATION RUNNING IN THE TEST MODE !!!!! ~~ ";
+        qDebug() <<  msg;
         LOG_EVENT(" \n ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ "
-                  " \n ~~ !!!!! APPLICATION RUNNING IN THE TEST MODE !!!!! ~~ "
+                  " \n " +                       msg                          +
                   " \n ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ");
     }
 
     //! - Initializing USB Watcher
-    _USBWatcher.init(Threads::_USBWatcher_Thread);
+    _DriveWatcher.init(Threads::_DriveWatcher_Thread);
 
     //! - Initializing CanBus Interface
     if (_CanInterface.init(Threads::_CanFrame_Thread)) {