10 files changed, 38 insertions(+), 30 deletions(-)

M module-apps/Application.cpp
M module-apps/application-settings/windows/ColorTestWindow.cpp
M module-services/service-appmgr/model/ApplicationManager.cpp
M module-services/service-appmgr/service-appmgr/model/ApplicationManager.hpp
M module-services/service-eink/ServiceEink.cpp
M module-services/service-eink/ServiceEink.hpp
M module-services/service-gui/CMakeLists.txt
M module-services/service-gui/ServiceGUI.hpp
R module-services/service-gui/{Common => service-guiName}.hpp
M source/main.cpp

@@ 33,7 33,7 @@
 #include <iterator>    // for distance, next
 #include <type_traits> // for add_const<>...
 #include <WindowsFactory.hpp>
-#include <service-gui/Common.hpp>
+#include <service-guiName.hpp>
 #include <module-utils/Utils.hpp>
 #include <service-db/agents/settings/SystemSettings.hpp>
 #include <module-utils/time/DateAndTimeSettings.hpp>

@@ 4,7 4,7 @@
 #include <memory>
 
 #include <service-appmgr/Controller.hpp>
-#include <service-gui/Common.hpp>
+#include <service-guiName.hpp>
 #include <Style.hpp>
 #include <ChangeColorScheme.hpp>
 

@@ 24,7 24,6 @@
 #include <service-evtmgr/EVMessages.hpp>
 #include <service-gui/ServiceGUI.hpp>
 #include <service-eink/ServiceEink.hpp>
-#include <service-gui/Common.hpp>
 #include <service-desktop/DesktopMessages.hpp>
 #include <service-appmgr/StartupType.hpp>
 #include <module-services/service-audio/service-audio/AudioMessage.hpp>

@@ 27,7 27,7 @@
 
 #include <service-db/DBServiceName.hpp>
 #include <service-db/Settings.hpp>
-#include <service-gui/Common.hpp>
+#include <service-guiName.hpp>
 #include <service-eink/Common.hpp>
 
 #include <notifications/NotificationProvider.hpp>

@@ 5,7 5,6 @@
 #include "messages/EinkModeMessage.hpp"
 #include "messages/PrepareDisplayEarlyRequest.hpp"
 #include <service-gui/messages/EinkInitialized.hpp>
-#include <service-gui/Common.hpp>
 #include <time/ScopedTime.hpp>
 #include <Timers/TimerFactory.hpp>
 

@@ 12,7 12,7 @@
 #include "EinkDisplay.hpp"
 
 #include <service-db/DBServiceName.hpp>
-#include <service-gui/Common.hpp>
+#include <service-guiName.hpp>
 
 #include <chrono>
 #include <cstdint>

@@ 1,28 1,40 @@
-project(service-gui)
-message( "${PROJECT_NAME}  ${CMAKE_CURRENT_LIST_DIR}" )
+add_library(service-gui STATIC)
 
-set(SOURCES
-    "${CMAKE_CURRENT_LIST_DIR}/ServiceGUI.cpp"
-    "${CMAKE_CURRENT_LIST_DIR}/WorkerGUI.cpp"
-    "${CMAKE_CURRENT_LIST_DIR}/ContextPool.cpp"
-    "${CMAKE_CURRENT_LIST_DIR}/RenderCache.cpp"
-    "${CMAKE_CURRENT_LIST_DIR}/DrawCommandsQueue.cpp"
-    "${CMAKE_CURRENT_LIST_DIR}/SynchronizationMechanism.cpp"
-    "${CMAKE_CURRENT_LIST_DIR}/messages/DrawMessage.cpp"
+target_sources(service-gui
+    PRIVATE
+        ContextPool.cpp
+        DrawCommandsQueue.cpp
+        RenderCache.cpp
+        ServiceGUI.cpp
+        SynchronizationMechanism.cpp
+        WorkerGUI.cpp
+        messages/DrawMessage.cpp
+    INTERFACE
+        service-guiName.hpp
+        ContextPool.hpp
+        DrawCommandsQueue.hpp
+        RenderCache.hpp
+        ServiceGUI.hpp
+        SynchronizationMechanism.hpp
+        WorkerGUI.hpp
+        messages/ChangeColorScheme.hpp
+        messages/DrawMessage.hpp
+        messages/EinkInitialized.hpp
+        messages/GUIMessage.hpp
+        messages/RenderingFinished.hpp
 )
 
-add_library(${PROJECT_NAME} STATIC ${SOURCES})
 
-target_link_libraries(${PROJECT_NAME}
+target_link_libraries(service-gui
     service-eink
     module-gui
     module-apps
 )
 
-target_include_directories(${PROJECT_NAME}
+target_include_directories(service-gui
     PUBLIC
-        "${CMAKE_CURRENT_LIST_DIR}"
-        "${CMAKE_CURRENT_LIST_DIR}/messages"
+        ${CMAKE_CURRENT_LIST_DIR}
+        ${CMAKE_CURRENT_LIST_DIR}/messages
 )
 
 if (${ENABLE_TESTS})

@@ 3,7 3,12 @@
 
 #pragma once
 
-#include <Common.hpp>
+#include "ContextPool.hpp"
+#include "DrawCommandsQueue.hpp"
+#include "RenderCache.hpp"
+#include "messages/RenderingFinished.hpp"
+#include "service-guiName.hpp"
+
 #include <Service/Common.hpp>
 #include <Service/Message.hpp>
 #include <Service/Service.hpp>


@@ 11,13 16,6 @@
 
 #include <service-db/DBServiceName.hpp>
 
-#include "messages/RenderingFinished.hpp"
-
-#include "ContextPool.hpp"
-#include "DrawCommandsQueue.hpp"
-#include "Common.hpp"
-#include "RenderCache.hpp"
-
 #include <cstdint>
 #include <memory>
 #include <string>

@@ 32,7 32,7 @@
 #include <service-time/ServiceTime.hpp>
 #include <Service/ServiceCreator.hpp>
 #include <module-services/service-gui/ServiceGUI.hpp>
-#include <module-services/service-gui/Common.hpp>
+#include <service-guiName.hpp>
 #include <module-services/service-eink/ServiceEink.hpp>
 #include <service-fileindexer/Constants.hpp>
 #include <service-fileindexer/ServiceFileIndexer.hpp>