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 9dfdd3835e..0000000000 Binary files a/src/apps/deskflowc/deskflowc.ico and /dev/null differ 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 257be0a1d1..0000000000 Binary files a/src/apps/deskflowc/tb_wait.ico and /dev/null differ 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 9dfdd3835e..0000000000 Binary files a/src/apps/deskflows/deskflows.ico and /dev/null differ 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 746a87c9ec..0000000000 Binary files a/src/apps/deskflows/tb_error.ico and /dev/null differ diff --git a/src/apps/deskflows/tb_idle.ico b/src/apps/deskflows/tb_idle.ico deleted file mode 100644 index 4e13a264b9..0000000000 Binary files a/src/apps/deskflows/tb_idle.ico and /dev/null differ diff --git a/src/apps/deskflows/tb_run.ico b/src/apps/deskflows/tb_run.ico deleted file mode 100644 index 88e160cbfc..0000000000 Binary files a/src/apps/deskflows/tb_run.ico and /dev/null differ diff --git a/src/apps/deskflows/tb_wait.ico b/src/apps/deskflows/tb_wait.ico deleted file mode 100644 index 257be0a1d1..0000000000 Binary files a/src/apps/deskflows/tb_wait.ico and /dev/null differ 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