refactor: single copy of app ico files for window now in src/apps/res
This commit is contained in:
sithlord48
Nick Bolton
parent
225ca23482
commit
9af37463fd
16 changed files with 148 additions and 150 deletions
|
|
@ -1 +1 @@
|
||||||
IDI_ICON1 ICON DISCARDABLE "deskflow.ico"
|
IDI_ICON1 ICON DISCARDABLE "../res/deskflow.ico"
|
||||||
|
|
|
||||||
|
|
@ -20,15 +20,14 @@ set(target deskflow-client)
|
||||||
if(WIN32)
|
if(WIN32)
|
||||||
set(PLATFORM_SOURCES
|
set(PLATFORM_SOURCES
|
||||||
deskflowc.exe.manifest
|
deskflowc.exe.manifest
|
||||||
deskflowc.ico
|
|
||||||
deskflowc.rc
|
deskflowc.rc
|
||||||
MSWindowsClientTaskBarReceiver.cpp
|
MSWindowsClientTaskBarReceiver.cpp
|
||||||
MSWindowsClientTaskBarReceiver.h
|
MSWindowsClientTaskBarReceiver.h
|
||||||
resource.h
|
resource.h
|
||||||
tb_error.ico
|
${PROJECT_SOURCE_DIR}/src/apps/res/deskflow.ico
|
||||||
tb_idle.ico
|
${PROJECT_SOURCE_DIR}/src/apps/res/tb_error.ico
|
||||||
tb_run.ico
|
${PROJECT_SOURCE_DIR}/src/apps/res/tb_idle.ico
|
||||||
tb_wait.ico
|
${PROJECT_SOURCE_DIR}/src/apps/res/tb_run.ico
|
||||||
${PROJECT_BINARY_DIR}/src/version.rc
|
${PROJECT_BINARY_DIR}/src/version.rc
|
||||||
)
|
)
|
||||||
elseif(APPLE)
|
elseif(APPLE)
|
||||||
|
|
|
||||||
Binary file not shown.
|
Before Width: | Height: | Size: 99 KiB |
|
|
@ -57,11 +57,11 @@ END
|
||||||
|
|
||||||
// Icon with lowest ID value placed first to ensure application icon
|
// Icon with lowest ID value placed first to ensure application icon
|
||||||
// remains consistent on all systems.
|
// remains consistent on all systems.
|
||||||
IDI_DESKFLOW ICON DISCARDABLE "deskflowc.ico"
|
IDI_DESKFLOW ICON DISCARDABLE "../res/deskflow.ico"
|
||||||
IDI_TASKBAR_NOT_RUNNING ICON DISCARDABLE "tb_idle.ico"
|
IDI_TASKBAR_NOT_RUNNING ICON DISCARDABLE "../res/tb_idle.ico"
|
||||||
IDI_TASKBAR_NOT_WORKING ICON DISCARDABLE "tb_error.ico"
|
IDI_TASKBAR_NOT_WORKING ICON DISCARDABLE "../res/tb_error.ico"
|
||||||
IDI_TASKBAR_NOT_CONNECTED ICON DISCARDABLE "tb_wait.ico"
|
IDI_TASKBAR_NOT_CONNECTED ICON DISCARDABLE "../res/deskflow.ico"
|
||||||
IDI_TASKBAR_CONNECTED ICON DISCARDABLE "tb_run.ico"
|
IDI_TASKBAR_CONNECTED ICON DISCARDABLE "../res/tb_run.ico"
|
||||||
|
|
||||||
/////////////////////////////////////////////////////////////////////////////
|
/////////////////////////////////////////////////////////////////////////////
|
||||||
//
|
//
|
||||||
|
|
|
||||||
Binary file not shown.
|
Before Width: | Height: | Size: 318 B |
|
|
@ -20,15 +20,14 @@ set(target deskflow-server)
|
||||||
if(WIN32)
|
if(WIN32)
|
||||||
set(PLATFORM_SOURCES
|
set(PLATFORM_SOURCES
|
||||||
deskflows.exe.manifest
|
deskflows.exe.manifest
|
||||||
deskflows.ico
|
|
||||||
deskflows.rc
|
deskflows.rc
|
||||||
MSWindowsServerTaskBarReceiver.cpp
|
MSWindowsServerTaskBarReceiver.cpp
|
||||||
MSWindowsServerTaskBarReceiver.h
|
MSWindowsServerTaskBarReceiver.h
|
||||||
resource.h
|
resource.h
|
||||||
tb_error.ico
|
${PROJECT_SOURCE_DIR}/src/apps/res/deskflow.ico
|
||||||
tb_idle.ico
|
${PROJECT_SOURCE_DIR}/src/apps/res/tb_error.ico
|
||||||
tb_run.ico
|
${PROJECT_SOURCE_DIR}/src/apps/res/tb_idle.ico
|
||||||
tb_wait.ico
|
${PROJECT_SOURCE_DIR}/src/apps/res/tb_run.ico
|
||||||
${PROJECT_BINARY_DIR}/src/version.rc
|
${PROJECT_BINARY_DIR}/src/version.rc
|
||||||
)
|
)
|
||||||
elseif(APPLE)
|
elseif(APPLE)
|
||||||
|
|
|
||||||
Binary file not shown.
|
Before Width: | Height: | Size: 99 KiB |
|
|
@ -1,134 +1,134 @@
|
||||||
// Microsoft Visual C++ generated resource script.
|
// Microsoft Visual C++ generated resource script.
|
||||||
//
|
//
|
||||||
#include "resource.h"
|
#include "resource.h"
|
||||||
|
|
||||||
#define APSTUDIO_READONLY_SYMBOLS
|
#define APSTUDIO_READONLY_SYMBOLS
|
||||||
/////////////////////////////////////////////////////////////////////////////
|
/////////////////////////////////////////////////////////////////////////////
|
||||||
//
|
//
|
||||||
// Generated from the TEXTINCLUDE 2 resource.
|
// Generated from the TEXTINCLUDE 2 resource.
|
||||||
//
|
//
|
||||||
#include <winresrc.h>
|
#include <winresrc.h>
|
||||||
|
|
||||||
/////////////////////////////////////////////////////////////////////////////
|
/////////////////////////////////////////////////////////////////////////////
|
||||||
#undef APSTUDIO_READONLY_SYMBOLS
|
#undef APSTUDIO_READONLY_SYMBOLS
|
||||||
|
|
||||||
/////////////////////////////////////////////////////////////////////////////
|
/////////////////////////////////////////////////////////////////////////////
|
||||||
// English (U.S.) resources
|
// English (U.S.) resources
|
||||||
|
|
||||||
#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
|
#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
|
||||||
#ifdef _WIN32
|
#ifdef _WIN32
|
||||||
LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
|
LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
|
||||||
#pragma code_page(1252)
|
#pragma code_page(1252)
|
||||||
#endif //_WIN32
|
#endif //_WIN32
|
||||||
|
|
||||||
#ifdef APSTUDIO_INVOKED
|
#ifdef APSTUDIO_INVOKED
|
||||||
/////////////////////////////////////////////////////////////////////////////
|
/////////////////////////////////////////////////////////////////////////////
|
||||||
//
|
//
|
||||||
// TEXTINCLUDE
|
// TEXTINCLUDE
|
||||||
//
|
//
|
||||||
|
|
||||||
1 TEXTINCLUDE
|
1 TEXTINCLUDE
|
||||||
BEGIN
|
BEGIN
|
||||||
"resource.h\0"
|
"resource.h\0"
|
||||||
END
|
END
|
||||||
|
|
||||||
2 TEXTINCLUDE
|
2 TEXTINCLUDE
|
||||||
BEGIN
|
BEGIN
|
||||||
"#include <winresrc.h>\r\n"
|
"#include <winresrc.h>\r\n"
|
||||||
"\0"
|
"\0"
|
||||||
END
|
END
|
||||||
|
|
||||||
3 TEXTINCLUDE
|
3 TEXTINCLUDE
|
||||||
BEGIN
|
BEGIN
|
||||||
"\r\n"
|
"\r\n"
|
||||||
"\0"
|
"\0"
|
||||||
END
|
END
|
||||||
|
|
||||||
#endif // APSTUDIO_INVOKED
|
#endif // APSTUDIO_INVOKED
|
||||||
|
|
||||||
|
|
||||||
/////////////////////////////////////////////////////////////////////////////
|
/////////////////////////////////////////////////////////////////////////////
|
||||||
//
|
//
|
||||||
// Icon
|
// Icon
|
||||||
//
|
//
|
||||||
|
|
||||||
// Icon with lowest ID value placed first to ensure application icon
|
// Icon with lowest ID value placed first to ensure application icon
|
||||||
// remains consistent on all systems.
|
// remains consistent on all systems.
|
||||||
IDI_DESKFLOW ICON "deskflows.ico"
|
IDI_DESKFLOW ICON "../res/deskflow.ico"
|
||||||
IDI_TASKBAR_NOT_RUNNING ICON "tb_idle.ico"
|
IDI_TASKBAR_NOT_RUNNING ICON "../res/tb_idle.ico"
|
||||||
IDI_TASKBAR_NOT_WORKING ICON "tb_error.ico"
|
IDI_TASKBAR_NOT_WORKING ICON "../res/tb_error.ico"
|
||||||
IDI_TASKBAR_NOT_CONNECTED ICON "tb_wait.ico"
|
IDI_TASKBAR_NOT_CONNECTED ICON "../res/deskflow.ico"
|
||||||
IDI_TASKBAR_CONNECTED ICON "tb_run.ico"
|
IDI_TASKBAR_CONNECTED ICON "../res/tb_run.ico"
|
||||||
|
|
||||||
/////////////////////////////////////////////////////////////////////////////
|
/////////////////////////////////////////////////////////////////////////////
|
||||||
//
|
//
|
||||||
// Menu
|
// Menu
|
||||||
//
|
//
|
||||||
|
|
||||||
IDR_TASKBAR MENU
|
IDR_TASKBAR MENU
|
||||||
BEGIN
|
BEGIN
|
||||||
POPUP "Deskflow"
|
POPUP "Deskflow"
|
||||||
BEGIN
|
BEGIN
|
||||||
MENUITEM "Show Status", IDC_TASKBAR_STATUS
|
MENUITEM "Show Status", IDC_TASKBAR_STATUS
|
||||||
MENUITEM "Show Log", IDC_TASKBAR_SHOW_LOG
|
MENUITEM "Show Log", IDC_TASKBAR_SHOW_LOG
|
||||||
MENUITEM "Copy Log To Clipboard", IDC_TASKBAR_LOG
|
MENUITEM "Copy Log To Clipboard", IDC_TASKBAR_LOG
|
||||||
POPUP "Set Log Level"
|
POPUP "Set Log Level"
|
||||||
BEGIN
|
BEGIN
|
||||||
MENUITEM "Error", IDC_TASKBAR_LOG_LEVEL_ERROR
|
MENUITEM "Error", IDC_TASKBAR_LOG_LEVEL_ERROR
|
||||||
MENUITEM "Warning", IDC_TASKBAR_LOG_LEVEL_WARNING
|
MENUITEM "Warning", IDC_TASKBAR_LOG_LEVEL_WARNING
|
||||||
MENUITEM "Note", IDC_TASKBAR_LOG_LEVEL_NOTE
|
MENUITEM "Note", IDC_TASKBAR_LOG_LEVEL_NOTE
|
||||||
MENUITEM "Info", IDC_TASKBAR_LOG_LEVEL_INFO
|
MENUITEM "Info", IDC_TASKBAR_LOG_LEVEL_INFO
|
||||||
MENUITEM "Debug", IDC_TASKBAR_LOG_LEVEL_DEBUG
|
MENUITEM "Debug", IDC_TASKBAR_LOG_LEVEL_DEBUG
|
||||||
MENUITEM "Debug1", IDC_TASKBAR_LOG_LEVEL_DEBUG1
|
MENUITEM "Debug1", IDC_TASKBAR_LOG_LEVEL_DEBUG1
|
||||||
MENUITEM "Debug2", IDC_TASKBAR_LOG_LEVEL_DEBUG2
|
MENUITEM "Debug2", IDC_TASKBAR_LOG_LEVEL_DEBUG2
|
||||||
END
|
END
|
||||||
MENUITEM "Reload Configuration", IDC_RELOAD_CONFIG
|
MENUITEM "Reload Configuration", IDC_RELOAD_CONFIG
|
||||||
MENUITEM "Force Reconnect", IDC_FORCE_RECONNECT
|
MENUITEM "Force Reconnect", IDC_FORCE_RECONNECT
|
||||||
MENUITEM "Reset Server", ID_DESKFLOW_RESETSERVER
|
MENUITEM "Reset Server", ID_DESKFLOW_RESETSERVER
|
||||||
MENUITEM SEPARATOR
|
MENUITEM SEPARATOR
|
||||||
MENUITEM "Quit", IDC_TASKBAR_QUIT
|
MENUITEM "Quit", IDC_TASKBAR_QUIT
|
||||||
END
|
END
|
||||||
END
|
END
|
||||||
|
|
||||||
|
|
||||||
/////////////////////////////////////////////////////////////////////////////
|
/////////////////////////////////////////////////////////////////////////////
|
||||||
//
|
//
|
||||||
// Dialog
|
// Dialog
|
||||||
//
|
//
|
||||||
|
|
||||||
IDD_TASKBAR_STATUS DIALOG 0, 0, 145, 60
|
IDD_TASKBAR_STATUS DIALOG 0, 0, 145, 60
|
||||||
STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP
|
STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP
|
||||||
FONT 8, "MS Sans Serif"
|
FONT 8, "MS Sans Serif"
|
||||||
BEGIN
|
BEGIN
|
||||||
EDITTEXT IDC_TASKBAR_STATUS_STATUS,3,3,139,12,ES_AUTOHSCROLL | ES_READONLY | NOT WS_BORDER
|
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
|
LISTBOX IDC_TASKBAR_STATUS_CLIENTS,3,17,139,40,NOT LBS_NOTIFY | LBS_SORT | LBS_NOINTEGRALHEIGHT | LBS_NOSEL | WS_VSCROLL | WS_TABSTOP
|
||||||
END
|
END
|
||||||
|
|
||||||
|
|
||||||
/////////////////////////////////////////////////////////////////////////////
|
/////////////////////////////////////////////////////////////////////////////
|
||||||
//
|
//
|
||||||
// String Table
|
// String Table
|
||||||
//
|
//
|
||||||
|
|
||||||
STRINGTABLE
|
STRINGTABLE
|
||||||
BEGIN
|
BEGIN
|
||||||
IDS_FAILED "Deskflow is about to quit with errors or warnings. Please check the log then click OK."
|
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_INIT_FAILED "Deskflow failed to initialize: %{1}"
|
||||||
IDS_UNCAUGHT_EXCEPTION "Uncaught exception: %{1}"
|
IDS_UNCAUGHT_EXCEPTION "Uncaught exception: %{1}"
|
||||||
END
|
END
|
||||||
|
|
||||||
#endif // English (U.S.) resources
|
#endif // English (U.S.) resources
|
||||||
/////////////////////////////////////////////////////////////////////////////
|
/////////////////////////////////////////////////////////////////////////////
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
#ifndef APSTUDIO_INVOKED
|
#ifndef APSTUDIO_INVOKED
|
||||||
/////////////////////////////////////////////////////////////////////////////
|
/////////////////////////////////////////////////////////////////////////////
|
||||||
//
|
//
|
||||||
// Generated from the TEXTINCLUDE 3 resource.
|
// Generated from the TEXTINCLUDE 3 resource.
|
||||||
//
|
//
|
||||||
|
|
||||||
|
|
||||||
/////////////////////////////////////////////////////////////////////////////
|
/////////////////////////////////////////////////////////////////////////////
|
||||||
#endif // not APSTUDIO_INVOKED
|
#endif // not APSTUDIO_INVOKED
|
||||||
|
|
||||||
|
|
|
||||||
Binary file not shown.
|
Before Width: | Height: | Size: 318 B |
Binary file not shown.
|
Before Width: | Height: | Size: 318 B |
Binary file not shown.
|
Before Width: | Height: | Size: 318 B |
Binary file not shown.
|
Before Width: | Height: | Size: 318 B |
|
Before Width: | Height: | Size: 56 KiB After Width: | Height: | Size: 56 KiB |
|
Before Width: | Height: | Size: 318 B After Width: | Height: | Size: 318 B |
|
Before Width: | Height: | Size: 318 B After Width: | Height: | Size: 318 B |
|
Before Width: | Height: | Size: 318 B After Width: | Height: | Size: 318 B |
Loading…
Reference in a new issue