refactor: single copy of app ico files for window now in src/apps/res

src/apps/deskflow-gui/deskflow.rc

@@ -1 +1 @@
-IDI_ICON1 ICON DISCARDABLE "deskflow.ico"
+IDI_ICON1 ICON DISCARDABLE "../res/deskflow.ico"

src/apps/deskflowc/CMakeLists.txt

@@ -20,15 +20,14 @@ set(target deskflow-client)
 if(WIN32)
   set(PLATFORM_SOURCES
     deskflowc.exe.manifest
-    deskflowc.ico
     deskflowc.rc
     MSWindowsClientTaskBarReceiver.cpp
     MSWindowsClientTaskBarReceiver.h
     resource.h
-    tb_error.ico
-    tb_idle.ico
-    tb_run.ico
-    tb_wait.ico
+    ${PROJECT_SOURCE_DIR}/src/apps/res/deskflow.ico
+    ${PROJECT_SOURCE_DIR}/src/apps/res/tb_error.ico
+    ${PROJECT_SOURCE_DIR}/src/apps/res/tb_idle.ico
+    ${PROJECT_SOURCE_DIR}/src/apps/res/tb_run.ico
     ${PROJECT_BINARY_DIR}/src/version.rc
   )
 elseif(APPLE)

src/apps/deskflowc/deskflowc.rc

@@ -57,11 +57,11 @@ END
 
 // Icon with lowest ID value placed first to ensure application icon
 // remains consistent on all systems.
-IDI_DESKFLOW             ICON    DISCARDABLE     "deskflowc.ico"
-IDI_TASKBAR_NOT_RUNNING ICON    DISCARDABLE     "tb_idle.ico"
-IDI_TASKBAR_NOT_WORKING ICON    DISCARDABLE     "tb_error.ico"
-IDI_TASKBAR_NOT_CONNECTED ICON    DISCARDABLE     "tb_wait.ico"
-IDI_TASKBAR_CONNECTED   ICON    DISCARDABLE     "tb_run.ico"
+IDI_DESKFLOW             ICON    DISCARDABLE     "../res/deskflow.ico"
+IDI_TASKBAR_NOT_RUNNING ICON    DISCARDABLE     "../res/tb_idle.ico"
+IDI_TASKBAR_NOT_WORKING ICON    DISCARDABLE     "../res/tb_error.ico"
+IDI_TASKBAR_NOT_CONNECTED ICON    DISCARDABLE     "../res/deskflow.ico"
+IDI_TASKBAR_CONNECTED   ICON    DISCARDABLE     "../res/tb_run.ico"
 
 /////////////////////////////////////////////////////////////////////////////
 //

src/apps/deskflows/CMakeLists.txt

@@ -20,15 +20,14 @@ set(target deskflow-server)
 if(WIN32)
   set(PLATFORM_SOURCES
     deskflows.exe.manifest
-    deskflows.ico
     deskflows.rc
     MSWindowsServerTaskBarReceiver.cpp
     MSWindowsServerTaskBarReceiver.h
     resource.h
-    tb_error.ico
-    tb_idle.ico
-    tb_run.ico
-    tb_wait.ico
+    ${PROJECT_SOURCE_DIR}/src/apps/res/deskflow.ico
+    ${PROJECT_SOURCE_DIR}/src/apps/res/tb_error.ico
+    ${PROJECT_SOURCE_DIR}/src/apps/res/tb_idle.ico
+    ${PROJECT_SOURCE_DIR}/src/apps/res/tb_run.ico
     ${PROJECT_BINARY_DIR}/src/version.rc
   )
 elseif(APPLE)

src/apps/deskflows/deskflows.rc

@@ -54,11 +54,11 @@ END
 
 // Icon with lowest ID value placed first to ensure application icon
 // remains consistent on all systems.
-IDI_DESKFLOW             ICON                    "deskflows.ico"
-IDI_TASKBAR_NOT_RUNNING ICON                    "tb_idle.ico"
-IDI_TASKBAR_NOT_WORKING ICON                    "tb_error.ico"
-IDI_TASKBAR_NOT_CONNECTED ICON                    "tb_wait.ico"
-IDI_TASKBAR_CONNECTED   ICON                    "tb_run.ico"
+IDI_DESKFLOW             ICON                    "../res/deskflow.ico"
+IDI_TASKBAR_NOT_RUNNING ICON                    "../res/tb_idle.ico"
+IDI_TASKBAR_NOT_WORKING ICON                    "../res/tb_error.ico"
+IDI_TASKBAR_NOT_CONNECTED ICON                    "../res/deskflow.ico"
+IDI_TASKBAR_CONNECTED   ICON                    "../res/tb_run.ico"
 
 /////////////////////////////////////////////////////////////////////////////
 //