Commit 9d52fdb5 authored by Gilles Dubois's avatar Gilles Dubois
Browse files

Change agent icon to the new icon and update the nsis setup

parent c38f244f
Agent/res/OCSInventory.ico

15.7 KB | W: | H:

Agent/res/OCSInventory.ico

361 KB | W: | H:

Agent/res/OCSInventory.ico
Agent/res/OCSInventory.ico
Agent/res/OCSInventory.ico
Agent/res/OCSInventory.ico
  • 2-up
  • Swipe
  • Onion skin
NSIS_agent_setup/Banner-ocs.bmp

499 KB | W: | H:

NSIS_agent_setup/Banner-ocs.bmp

519 KB | W: | H:

NSIS_agent_setup/Banner-ocs.bmp
NSIS_agent_setup/Banner-ocs.bmp
NSIS_agent_setup/Banner-ocs.bmp
NSIS_agent_setup/Banner-ocs.bmp
  • 2-up
  • Swipe
  • Onion skin
NSIS_agent_setup/OCS-NG-48.bmp

26.8 KB | W: | H:

NSIS_agent_setup/OCS-NG-48.bmp

33.2 KB | W: | H:

NSIS_agent_setup/OCS-NG-48.bmp
NSIS_agent_setup/OCS-NG-48.bmp
NSIS_agent_setup/OCS-NG-48.bmp
NSIS_agent_setup/OCS-NG-48.bmp
  • 2-up
  • Swipe
  • Onion skin
......@@ -1106,7 +1106,7 @@ not_running:
File /oname=$PLUGINSDIR\proxy.ini "proxy.ini"
File /oname=$PLUGINSDIR\agent.ini "agent.ini"
File /oname=$PLUGINSDIR\local.ini "local.ini"
File /oname=$PLUGINSDIR\splash.bmp "banner-ocs.bmp"
File /oname=$PLUGINSDIR\splash.bmp "Banner-ocs.bmp"
File /oname=$PLUGINSDIR\SetACL.exe "SetACL.exe"
; Don't know
FileOpen $9 "ocsdat" r
......
NSIS_agent_setup/install-ocs.ico

15.7 KB | W: | H:

NSIS_agent_setup/install-ocs.ico

361 KB | W: | H:

NSIS_agent_setup/install-ocs.ico
NSIS_agent_setup/install-ocs.ico
NSIS_agent_setup/install-ocs.ico
NSIS_agent_setup/install-ocs.ico
  • 2-up
  • Swipe
  • Onion skin
NSIS_agent_setup/uninstall-ocs.ico

15.7 KB | W: | H:

NSIS_agent_setup/uninstall-ocs.ico

361 KB | W: | H:

NSIS_agent_setup/uninstall-ocs.ico
NSIS_agent_setup/uninstall-ocs.ico
NSIS_agent_setup/uninstall-ocs.ico
NSIS_agent_setup/uninstall-ocs.ico
  • 2-up
  • Swipe
  • Onion skin
......@@ -16,13 +16,11 @@
#undef APSTUDIO_READONLY_SYMBOLS
/////////////////////////////////////////////////////////////////////////////
// English (Neutral) resources
// English resources
#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
#ifdef _WIN32
LANGUAGE LANG_ENGLISH, SUBLANG_NEUTRAL
#pragma code_page(1252)
#endif //_WIN32
/////////////////////////////////////////////////////////////////////////////
//
......@@ -71,7 +69,7 @@ END
//
#ifdef APSTUDIO_INVOKED
GUIDELINES DESIGNINFO
GUIDELINES DESIGNINFO
BEGIN
IDD_OCSSYSTRAY_DIALOG, DIALOG
BEGIN
......@@ -95,7 +93,7 @@ END
// Menu
//
IDR_MAINFRAME MENU
IDR_MAINFRAME MENU
BEGIN
POPUP "OCS Inventory NG"
BEGIN
......@@ -114,12 +112,12 @@ END
// String Table
//
STRINGTABLE
STRINGTABLE
BEGIN
AFX_IDS_APP_TITLE "OCS Inventory NG Agent for Windows"
END
STRINGTABLE
STRINGTABLE
BEGIN
IDS_FAILED_CONNECT_SERVICE "Failed connecting to %s...\n%s"
IDS_FAILED_SEND_MESSAGE "Failed sending control message to %s...\n%s"
......@@ -133,18 +131,16 @@ BEGIN
"Cannot display inventory informations !\n\nReason: %s"
END
#endif // English (Neutral) resources
#endif // English resources
/////////////////////////////////////////////////////////////////////////////
/////////////////////////////////////////////////////////////////////////////
// Spanish (Neutral) resources
// Spanish resources
#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ESN)
#ifdef _WIN32
LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL
#pragma code_page(1252)
#endif //_WIN32
/////////////////////////////////////////////////////////////////////////////
//
......@@ -193,7 +189,7 @@ END
//
#ifdef APSTUDIO_INVOKED
GUIDELINES DESIGNINFO
GUIDELINES DESIGNINFO
BEGIN
IDD_OCSSYSTRAY_DIALOG, DIALOG
BEGIN
......@@ -217,7 +213,7 @@ END
// Menu
//
IDR_MAINFRAME MENU
IDR_MAINFRAME MENU
BEGIN
POPUP "OCS Inventory NG"
BEGIN
......@@ -236,12 +232,12 @@ END
// String Table
//
STRINGTABLE
STRINGTABLE
BEGIN
AFX_IDS_APP_TITLE "OCS Inventory NG Agent for Windows"
END
STRINGTABLE
STRINGTABLE
BEGIN
IDS_FAILED_CONNECT_SERVICE "Error de conexin en %s...\n%s"
IDS_FAILED_SEND_MESSAGE "Error de envio a %s...\n%s"
......@@ -255,18 +251,16 @@ BEGIN
"No se puede mostrar la informacin del inventario ! Razn: %s"
END
#endif // Spanish (Neutral) resources
#endif // Spanish resources
/////////////////////////////////////////////////////////////////////////////
/////////////////////////////////////////////////////////////////////////////
// French (Neutral) resources
// French resources
#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_FRA)
#ifdef _WIN32
LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL
#pragma code_page(1252)
#endif //_WIN32
/////////////////////////////////////////////////////////////////////////////
//
......@@ -315,7 +309,7 @@ END
//
#ifdef APSTUDIO_INVOKED
GUIDELINES DESIGNINFO
GUIDELINES DESIGNINFO
BEGIN
IDD_OCSSYSTRAY_DIALOG, DIALOG
BEGIN
......@@ -339,7 +333,7 @@ END
// Menu
//
IDR_MAINFRAME MENU
IDR_MAINFRAME MENU
BEGIN
POPUP "OCS Inventory NG"
BEGIN
......@@ -358,12 +352,12 @@ END
// String Table
//
STRINGTABLE
STRINGTABLE
BEGIN
AFX_IDS_APP_TITLE "OCS Inventory NG Agent for Windows"
END
STRINGTABLE
STRINGTABLE
BEGIN
IDS_FAILED_CONNECT_SERVICE "Echec de connexion %s...\n%s"
IDS_FAILED_SEND_MESSAGE "Echec d'envoi d'un message de contrle %s...\n%s"
......@@ -377,7 +371,7 @@ BEGIN
"Impossible d'afficher les informations d'inventaire !\n\nRaison: %s"
END
#endif // French (Neutral) resources
#endif // French resources
/////////////////////////////////////////////////////////////////////////////
......@@ -385,10 +379,8 @@ END
// Neutral (Default) resources
#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_NEUD)
#ifdef _WIN32
LANGUAGE LANG_NEUTRAL, SUBLANG_DEFAULT
#pragma code_page(1252)
#endif //_WIN32
/////////////////////////////////////////////////////////////////////////////
//
......@@ -447,10 +439,8 @@ IDR_MAINFRAME ICON "..\\Agent\\res\\OCSInventory.ic
// German (Germany) resources
#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_DEU)
#ifdef _WIN32
LANGUAGE LANG_GERMAN, SUBLANG_GERMAN
#pragma code_page(1252)
#endif //_WIN32
/////////////////////////////////////////////////////////////////////////////
//
......@@ -499,7 +489,7 @@ END
//
#ifdef APSTUDIO_INVOKED
GUIDELINES DESIGNINFO
GUIDELINES DESIGNINFO
BEGIN
IDD_OCSSYSTRAY_DIALOG, DIALOG
BEGIN
......@@ -523,7 +513,7 @@ END
// Menu
//
IDR_MAINFRAME MENU
IDR_MAINFRAME MENU
BEGIN
POPUP "OCS Inventory NG"
BEGIN
......@@ -542,12 +532,12 @@ END
// String Table
//
STRINGTABLE
STRINGTABLE
BEGIN
AFX_IDS_APP_TITLE "OCS Inventory NG Agent fr Windows"
END
STRINGTABLE
STRINGTABLE
BEGIN
IDS_FAILED_CONNECT_SERVICE
"Konnte keine Verbindung herstellen zu %s...\n%s"
......@@ -570,10 +560,17 @@ END
// French (France) resources
#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_FRA)
#ifdef _WIN32
LANGUAGE LANG_FRENCH, SUBLANG_FRENCH
#pragma code_page(1252)
#endif //_WIN32
/////////////////////////////////////////////////////////////////////////////
//
// Icon
//
// Icon with lowest ID value placed first to ensure application icon
// remains consistent on all systems.
IDI_ICON1 ICON "..\\agent\\res\\icon1.ico"
#ifdef APSTUDIO_INVOKED
/////////////////////////////////////////////////////////////////////////////
......
......@@ -12,6 +12,7 @@
#define IDS_SERVICE_STOPPING 134
#define IDS_SERVICE_STOPPED 135
#define IDS_START_INVENTORY_SUCCESSFULL 136
#define IDI_ICON1 136
#define IDS_SHOW_INVENTORY_FAILED 137
#define IDC_VERSION_SERVICE 1000
#define IDC_VERSION_AGENT 1001
......@@ -34,7 +35,7 @@
//
#ifdef APSTUDIO_INVOKED
#ifndef APSTUDIO_READONLY_SYMBOLS
#define _APS_NEXT_RESOURCE_VALUE 136
#define _APS_NEXT_RESOURCE_VALUE 137
#define _APS_NEXT_COMMAND_VALUE 32775
#define _APS_NEXT_CONTROL_VALUE 1010
#define _APS_NEXT_SYMED_VALUE 103
......
......@@ -16,10 +16,8 @@
// Neutral (Default) resources
#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_NEUD)
#ifdef _WIN32
LANGUAGE LANG_NEUTRAL, SUBLANG_DEFAULT
#pragma code_page(1252)
#endif //_WIN32
/////////////////////////////////////////////////////////////////////////////
//
......@@ -91,6 +89,26 @@ END
/////////////////////////////////////////////////////////////////////////////
/////////////////////////////////////////////////////////////////////////////
// French (France) resources
#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_FRA)
LANGUAGE LANG_FRENCH, SUBLANG_FRENCH
#pragma code_page(1252)
/////////////////////////////////////////////////////////////////////////////
//
// Icon
//
// Icon with lowest ID value placed first to ensure application icon
// remains consistent on all systems.
IDI_ICON1 ICON "C:\\Users\\user-win-dev\\Documents\\GitHub\\WindowsAgent\\NSIS_agent_setup\\OCSInventory.ico"
IDI_ICON2 ICON "C:\\Users\\user-win-dev\\Documents\\GitHub\\WindowsAgent\\Agent\\res\\OCSInventory.ico"
#endif // French (France) resources
/////////////////////////////////////////////////////////////////////////////
#ifndef APSTUDIO_INVOKED
/////////////////////////////////////////////////////////////////////////////
......
......@@ -152,9 +152,6 @@
<Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(RootDir)%(Directory)\%(Filename).h;%(Outputs)</Outputs>
</CustomBuild>
</ItemGroup>
<ItemGroup>
<Image Include="..\Agent\res\OCSInventory.ico" />
</ItemGroup>
<ItemGroup>
<ResourceCompile Include="Service.rc" />
</ItemGroup>
......@@ -179,6 +176,9 @@
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
</ProjectReference>
</ItemGroup>
<ItemGroup>
<Image Include="..\Agent\res\OCSInventory.ico" />
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
......
......@@ -2,13 +2,15 @@
// Microsoft Visual C++ generated include file.
// Used by Service.rc
//
#define IDI_ICON1 104
#define IDI_ICON2 105
#define ID_SYSTRAY_MENU_NAME 40001
// Next default values for new objects
//
#ifdef APSTUDIO_INVOKED
#ifndef APSTUDIO_READONLY_SYMBOLS
#define _APS_NEXT_RESOURCE_VALUE 104
#define _APS_NEXT_RESOURCE_VALUE 106
#define _APS_NEXT_COMMAND_VALUE 40004
#define _APS_NEXT_CONTROL_VALUE 1000
#define _APS_NEXT_SYMED_VALUE 103
......
......@@ -19,10 +19,8 @@
// Neutral (Default) resources
#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_NEUD)
#ifdef _WIN32
LANGUAGE LANG_NEUTRAL, SUBLANG_DEFAULT
#pragma code_page(1252)
#endif //_WIN32
/////////////////////////////////////////////////////////////////////////////
//
......@@ -94,7 +92,7 @@ END
//
#ifdef APSTUDIO_INVOKED
GUIDELINES DESIGNINFO
GUIDELINES DESIGNINFO
BEGIN
IDD_TESTSYSINFO_DIALOG, DIALOG
BEGIN
......@@ -123,10 +121,18 @@ IDR_MAINFRAME ICON "..\\Agent\\res\\OCSInventory.ic
// French (France) resources
#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_FRA)
#ifdef _WIN32
LANGUAGE LANG_FRENCH, SUBLANG_FRENCH
#pragma code_page(1252)
#endif //_WIN32
/////////////////////////////////////////////////////////////////////////////
//
// Icon
//
// Icon with lowest ID value placed first to ensure application icon
// remains consistent on all systems.
IDI_ICON1 ICON "C:\\Users\\user-win-dev\\Documents\\GitHub\\WindowsAgent\\NSIS_agent_setup\\install-ocs.ico"
IDI_ICON2 ICON "C:\\Users\\user-win-dev\\Documents\\GitHub\\WindowsAgent\\Agent\\res\\OCSInventory.ico"
#ifdef APSTUDIO_INVOKED
/////////////////////////////////////////////////////////////////////////////
......
......@@ -4,6 +4,8 @@
//
#define IDD_TESTSYSINFO_DIALOG 102
#define IDR_MAINFRAME 128
#define IDI_ICON1 129
#define IDI_ICON2 130
#define IDC_LIST1 1000
#define IDC_SMBIOS 1001
#define IDC_WMI 1002
......@@ -16,7 +18,7 @@
//
#ifdef APSTUDIO_INVOKED
#ifndef APSTUDIO_READONLY_SYMBOLS
#define _APS_NEXT_RESOURCE_VALUE 129
#define _APS_NEXT_RESOURCE_VALUE 131
#define _APS_NEXT_COMMAND_VALUE 32771
#define _APS_NEXT_CONTROL_VALUE 1007
#define _APS_NEXT_SYMED_VALUE 101
......
logon/install-ocs.ico

15.7 KB | W: | H:

logon/install-ocs.ico

361 KB | W: | H:

logon/install-ocs.ico
logon/install-ocs.ico
logon/install-ocs.ico
logon/install-ocs.ico
  • 2-up
  • Swipe
  • Onion skin
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment