From 9af37463fd8530fdb8d9ce22140b3c567c5532ef Mon Sep 17 00:00:00 2001 From: sithlord48 Date: Thu, 19 Dec 2024 09:48:25 -0500 Subject: [PATCH] refactor: single copy of app ico files for window now in src/apps/res --- src/apps/deskflow-gui/deskflow.rc | 2 +- src/apps/deskflowc/CMakeLists.txt | 9 +- src/apps/deskflowc/deskflowc.ico | Bin 101014 -> 0 bytes src/apps/deskflowc/deskflowc.rc | 10 +- src/apps/deskflowc/tb_wait.ico | Bin 318 -> 0 bytes src/apps/deskflows/CMakeLists.txt | 9 +- src/apps/deskflows/deskflows.ico | Bin 101014 -> 0 bytes src/apps/deskflows/deskflows.rc | 268 ++++++++++---------- src/apps/deskflows/tb_error.ico | Bin 318 -> 0 bytes src/apps/deskflows/tb_idle.ico | Bin 318 -> 0 bytes src/apps/deskflows/tb_run.ico | Bin 318 -> 0 bytes src/apps/deskflows/tb_wait.ico | Bin 318 -> 0 bytes src/apps/{deskflow-gui => res}/deskflow.ico | Bin src/apps/{deskflowc => res}/tb_error.ico | Bin src/apps/{deskflowc => res}/tb_idle.ico | Bin src/apps/{deskflowc => res}/tb_run.ico | Bin 16 files changed, 148 insertions(+), 150 deletions(-) delete mode 100644 src/apps/deskflowc/deskflowc.ico delete mode 100644 src/apps/deskflowc/tb_wait.ico delete mode 100644 src/apps/deskflows/deskflows.ico delete mode 100644 src/apps/deskflows/tb_error.ico delete mode 100644 src/apps/deskflows/tb_idle.ico delete mode 100644 src/apps/deskflows/tb_run.ico delete mode 100644 src/apps/deskflows/tb_wait.ico rename src/apps/{deskflow-gui => res}/deskflow.ico (100%) rename src/apps/{deskflowc => res}/tb_error.ico (100%) rename src/apps/{deskflowc => res}/tb_idle.ico (100%) rename src/apps/{deskflowc => res}/tb_run.ico (100%) diff --git a/src/apps/deskflow-gui/deskflow.rc b/src/apps/deskflow-gui/deskflow.rc index d22c936e19..60028ceb5e 100644 --- a/src/apps/deskflow-gui/deskflow.rc +++ b/src/apps/deskflow-gui/deskflow.rc @@ -1 +1 @@ -IDI_ICON1 ICON DISCARDABLE "deskflow.ico" +IDI_ICON1 ICON DISCARDABLE "../res/deskflow.ico" diff --git a/src/apps/deskflowc/CMakeLists.txt b/src/apps/deskflowc/CMakeLists.txt index b2a2e5252f..980608d56e 100644 --- a/src/apps/deskflowc/CMakeLists.txt +++ b/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) diff --git a/src/apps/deskflowc/deskflowc.ico b/src/apps/deskflowc/deskflowc.ico deleted file mode 100644 index 9dfdd3835e963125eae556435116d6c7577ef430..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 101014 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 bK^p|rsL&TegMu0r3ZQ-H7&#v*gUbF7M}Ogd diff --git a/src/apps/deskflowc/deskflowc.rc b/src/apps/deskflowc/deskflowc.rc index 109c0336a9..e05b047dd0 100644 --- a/src/apps/deskflowc/deskflowc.rc +++ b/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" ///////////////////////////////////////////////////////////////////////////// // diff --git a/src/apps/deskflowc/tb_wait.ico b/src/apps/deskflowc/tb_wait.ico deleted file mode 100644 index 257be0a1d1bc613eec8cc1838a1dfd25d4644844..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 318 zcmZvXF%H5o3`Ji7QN#e9SYe77nRA*>nK?mJi9LtNNy<&SB_ktS@h=k+vHidOZA%U` zW?k2zcWvM#wvckMXxJFSxZpn+z?@1UcuF zl1i)Vw8|M$8oa;3u2z*2ycgFRqu9Ap#396Zhplt1gb?~ejL|uFp_CFr025R~TS5=- dGfb`By0-J}?~kW-COE!+Lz;S;(X4i~`vJXUO(y^V diff --git a/src/apps/deskflows/CMakeLists.txt b/src/apps/deskflows/CMakeLists.txt index 8d0efd16e5..c5850f337b 100644 --- a/src/apps/deskflows/CMakeLists.txt +++ b/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) diff --git a/src/apps/deskflows/deskflows.ico b/src/apps/deskflows/deskflows.ico deleted file mode 100644 index 9dfdd3835e963125eae556435116d6c7577ef430..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 101014 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 bK^p|rsL&TegMu0r3ZQ-H7&#v*gUbF7M}Ogd diff --git a/src/apps/deskflows/deskflows.rc b/src/apps/deskflows/deskflows.rc index 386de13288..b74306e648 100644 --- a/src/apps/deskflows/deskflows.rc +++ b/src/apps/deskflows/deskflows.rc @@ -1,134 +1,134 @@ -// Microsoft Visual C++ generated resource script. -// -#include "resource.h" - -#define APSTUDIO_READONLY_SYMBOLS -///////////////////////////////////////////////////////////////////////////// -// -// Generated from the TEXTINCLUDE 2 resource. -// -#include - -///////////////////////////////////////////////////////////////////////////// -#undef APSTUDIO_READONLY_SYMBOLS - -///////////////////////////////////////////////////////////////////////////// -// English (U.S.) resources - -#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU) -#ifdef _WIN32 -LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US -#pragma code_page(1252) -#endif //_WIN32 - -#ifdef APSTUDIO_INVOKED -///////////////////////////////////////////////////////////////////////////// -// -// TEXTINCLUDE -// - -1 TEXTINCLUDE -BEGIN - "resource.h\0" -END - -2 TEXTINCLUDE -BEGIN - "#include \r\n" - "\0" -END - -3 TEXTINCLUDE -BEGIN - "\r\n" - "\0" -END - -#endif // APSTUDIO_INVOKED - - -///////////////////////////////////////////////////////////////////////////// -// -// Icon -// - -// 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" - -///////////////////////////////////////////////////////////////////////////// -// -// Menu -// - -IDR_TASKBAR MENU -BEGIN - POPUP "Deskflow" - BEGIN - MENUITEM "Show Status", IDC_TASKBAR_STATUS - MENUITEM "Show Log", IDC_TASKBAR_SHOW_LOG - MENUITEM "Copy Log To Clipboard", IDC_TASKBAR_LOG - POPUP "Set Log Level" - BEGIN - MENUITEM "Error", IDC_TASKBAR_LOG_LEVEL_ERROR - MENUITEM "Warning", IDC_TASKBAR_LOG_LEVEL_WARNING - MENUITEM "Note", IDC_TASKBAR_LOG_LEVEL_NOTE - MENUITEM "Info", IDC_TASKBAR_LOG_LEVEL_INFO - MENUITEM "Debug", IDC_TASKBAR_LOG_LEVEL_DEBUG - MENUITEM "Debug1", IDC_TASKBAR_LOG_LEVEL_DEBUG1 - MENUITEM "Debug2", IDC_TASKBAR_LOG_LEVEL_DEBUG2 - END - MENUITEM "Reload Configuration", IDC_RELOAD_CONFIG - MENUITEM "Force Reconnect", IDC_FORCE_RECONNECT - MENUITEM "Reset Server", ID_DESKFLOW_RESETSERVER - MENUITEM SEPARATOR - MENUITEM "Quit", IDC_TASKBAR_QUIT - END -END - - -///////////////////////////////////////////////////////////////////////////// -// -// Dialog -// - -IDD_TASKBAR_STATUS DIALOG 0, 0, 145, 60 -STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP -FONT 8, "MS Sans Serif" -BEGIN - EDITTEXT IDC_TASKBAR_STATUS_STATUS,3,3,139,12,ES_AUTOHSCROLL | ES_READONLY | NOT WS_BORDER - LISTBOX IDC_TASKBAR_STATUS_CLIENTS,3,17,139,40,NOT LBS_NOTIFY | LBS_SORT | LBS_NOINTEGRALHEIGHT | LBS_NOSEL | WS_VSCROLL | WS_TABSTOP -END - - -///////////////////////////////////////////////////////////////////////////// -// -// String Table -// - -STRINGTABLE -BEGIN - IDS_FAILED "Deskflow is about to quit with errors or warnings. Please check the log then click OK." - IDS_INIT_FAILED "Deskflow failed to initialize: %{1}" - IDS_UNCAUGHT_EXCEPTION "Uncaught exception: %{1}" -END - -#endif // English (U.S.) resources -///////////////////////////////////////////////////////////////////////////// - - - -#ifndef APSTUDIO_INVOKED -///////////////////////////////////////////////////////////////////////////// -// -// Generated from the TEXTINCLUDE 3 resource. -// - - -///////////////////////////////////////////////////////////////////////////// -#endif // not APSTUDIO_INVOKED - +// Microsoft Visual C++ generated resource script. +// +#include "resource.h" + +#define APSTUDIO_READONLY_SYMBOLS +///////////////////////////////////////////////////////////////////////////// +// +// Generated from the TEXTINCLUDE 2 resource. +// +#include + +///////////////////////////////////////////////////////////////////////////// +#undef APSTUDIO_READONLY_SYMBOLS + +///////////////////////////////////////////////////////////////////////////// +// English (U.S.) resources + +#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU) +#ifdef _WIN32 +LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US +#pragma code_page(1252) +#endif //_WIN32 + +#ifdef APSTUDIO_INVOKED +///////////////////////////////////////////////////////////////////////////// +// +// TEXTINCLUDE +// + +1 TEXTINCLUDE +BEGIN + "resource.h\0" +END + +2 TEXTINCLUDE +BEGIN + "#include \r\n" + "\0" +END + +3 TEXTINCLUDE +BEGIN + "\r\n" + "\0" +END + +#endif // APSTUDIO_INVOKED + + +///////////////////////////////////////////////////////////////////////////// +// +// Icon +// + +// Icon with lowest ID value placed first to ensure application icon +// remains consistent on all systems. +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" + +///////////////////////////////////////////////////////////////////////////// +// +// Menu +// + +IDR_TASKBAR MENU +BEGIN + POPUP "Deskflow" + BEGIN + MENUITEM "Show Status", IDC_TASKBAR_STATUS + MENUITEM "Show Log", IDC_TASKBAR_SHOW_LOG + MENUITEM "Copy Log To Clipboard", IDC_TASKBAR_LOG + POPUP "Set Log Level" + BEGIN + MENUITEM "Error", IDC_TASKBAR_LOG_LEVEL_ERROR + MENUITEM "Warning", IDC_TASKBAR_LOG_LEVEL_WARNING + MENUITEM "Note", IDC_TASKBAR_LOG_LEVEL_NOTE + MENUITEM "Info", IDC_TASKBAR_LOG_LEVEL_INFO + MENUITEM "Debug", IDC_TASKBAR_LOG_LEVEL_DEBUG + MENUITEM "Debug1", IDC_TASKBAR_LOG_LEVEL_DEBUG1 + MENUITEM "Debug2", IDC_TASKBAR_LOG_LEVEL_DEBUG2 + END + MENUITEM "Reload Configuration", IDC_RELOAD_CONFIG + MENUITEM "Force Reconnect", IDC_FORCE_RECONNECT + MENUITEM "Reset Server", ID_DESKFLOW_RESETSERVER + MENUITEM SEPARATOR + MENUITEM "Quit", IDC_TASKBAR_QUIT + END +END + + +///////////////////////////////////////////////////////////////////////////// +// +// Dialog +// + +IDD_TASKBAR_STATUS DIALOG 0, 0, 145, 60 +STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP +FONT 8, "MS Sans Serif" +BEGIN + EDITTEXT IDC_TASKBAR_STATUS_STATUS,3,3,139,12,ES_AUTOHSCROLL | ES_READONLY | NOT WS_BORDER + LISTBOX IDC_TASKBAR_STATUS_CLIENTS,3,17,139,40,NOT LBS_NOTIFY | LBS_SORT | LBS_NOINTEGRALHEIGHT | LBS_NOSEL | WS_VSCROLL | WS_TABSTOP +END + + +///////////////////////////////////////////////////////////////////////////// +// +// String Table +// + +STRINGTABLE +BEGIN + IDS_FAILED "Deskflow is about to quit with errors or warnings. Please check the log then click OK." + IDS_INIT_FAILED "Deskflow failed to initialize: %{1}" + IDS_UNCAUGHT_EXCEPTION "Uncaught exception: %{1}" +END + +#endif // English (U.S.) resources +///////////////////////////////////////////////////////////////////////////// + + + +#ifndef APSTUDIO_INVOKED +///////////////////////////////////////////////////////////////////////////// +// +// Generated from the TEXTINCLUDE 3 resource. +// + + +///////////////////////////////////////////////////////////////////////////// +#endif // not APSTUDIO_INVOKED + diff --git a/src/apps/deskflows/tb_error.ico b/src/apps/deskflows/tb_error.ico deleted file mode 100644 index 746a87c9ec8ae70f24b4125afe9ca68defb2f6d1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 318 zcmZusyA6Xd5PgscB3VLIX+veDOwBY@u9?8{1k4aIf%|Jb3Y{4t9eD?$OZQF)q4|7v^Hl|=e!@IsjRK@B2u}b(FJQe=z?=V5liH zWoPHjzBjX*nT1SN6a`+-89X}5txV(@w?b&ncnuP0lhP#!b);z;MJKxRrt5r?%Pbk_ z?N%_Tg0`uZoK7he#O%9wJeiXYR@<+l75<*=!?qP*0HwJ2|O6{7v9^DvFs zu!_Y~)D!l8cMcLvA>Yqua2!LMtJfQ~uh~C-l}Rwt@WUxQyu;vMf6!iXu5qpJ`0fd8 C{!x(t diff --git a/src/apps/deskflows/tb_run.ico b/src/apps/deskflows/tb_run.ico deleted file mode 100644 index 88e160cbfcd029978599f49605ba1a3c7695027e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 318 zcmZvXJ#K_B5QRT>QHT}^QKbzPO1ZU9vz2R3fRNJr5IzCD8;(L}A7MN84cny1jNhAi z^COL+lJ|X&*-r&u76q#eLPafx?d1Px0X>%G9mGo6woTC*$N4x8%LKWVjJU*LBRA(t z*&)UlLNF;^_DhTq!s6VW^|KVov_j`difNtFX&-H(O$k3SDILcq=N9iD-8@T;1372! my*B6BBsAGS;Q0-Eqg$^!Uw{7 diff --git a/src/apps/deskflows/tb_wait.ico b/src/apps/deskflows/tb_wait.ico deleted file mode 100644 index 257be0a1d1bc613eec8cc1838a1dfd25d4644844..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 318 zcmZvXF%H5o3`Ji7QN#e9SYe77nRA*>nK?mJi9LtNNy<&SB_ktS@h=k+vHidOZA%U` zW?k2zcWvM#wvckMXxJFSxZpn+z?@1UcuF zl1i)Vw8|M$8oa;3u2z*2ycgFRqu9Ap#396Zhplt1gb?~ejL|uFp_CFr025R~TS5=- dGfb`By0-J}?~kW-COE!+Lz;S;(X4i~`vJXUO(y^V diff --git a/src/apps/deskflow-gui/deskflow.ico b/src/apps/res/deskflow.ico similarity index 100% rename from src/apps/deskflow-gui/deskflow.ico rename to src/apps/res/deskflow.ico diff --git a/src/apps/deskflowc/tb_error.ico b/src/apps/res/tb_error.ico similarity index 100% rename from src/apps/deskflowc/tb_error.ico rename to src/apps/res/tb_error.ico diff --git a/src/apps/deskflowc/tb_idle.ico b/src/apps/res/tb_idle.ico similarity index 100% rename from src/apps/deskflowc/tb_idle.ico rename to src/apps/res/tb_idle.ico diff --git a/src/apps/deskflowc/tb_run.ico b/src/apps/res/tb_run.ico similarity index 100% rename from src/apps/deskflowc/tb_run.ico rename to src/apps/res/tb_run.ico