new Graphics folder with a good structure, updated icons

git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@2954 212acab6-be3b-0410-9dea-997c60f758d6

Contrib/Makensisw/resource.rc

@@ -54,7 +54,7 @@ END
 
 // Icon with lowest ID value placed first to ensure application icon
 // remains consistent on all systems.
-IDI_ICON                ICON    DISCARDABLE     "..\\..\\contrib\\icons\\adni18-installer-B.ico"
+IDI_ICON                ICON    DISCARDABLE     "..\\..\\contrib\\graphics\\icons\\modern-install-blue-full.ico"
 IDI_SHELL               ICON    DISCARDABLE     "shell.ico"
 
 /////////////////////////////////////////////////////////////////////////////

Contrib/Modern UI/Readme.html

@@ -341,16 +341,16 @@ will also help you to learn more about the Modern UI.</p>
   The interface files with a customized dialog resource IDD_SELCOM for a small or no description area.<br />
   <i>Defaults: {NSISDIR}\Contrib\UIs\modern-smalldesc.exe, {NSISDIR}\Contrib\UIs\modern-nodesc.exe</i></p>
   <p class="text"><span class="bold">MUI_ICON </span><span class="parameter">icon_file</span><br />
-  The icon of the installer.<br /><i>Default: ${NSISDIR}\Contrib\Icons\modern-install.ico</i></p>
+  The icon of the installer.<br /><i>Default: ${NSISDIR}\Contrib\Graphics\Icons\modern-install.ico</i></p>
   <p class="text"><span class="bold">MUI_UNICON </span><span class="parameter">icon_file</span><br />
-  The icon of the uninstaller.<br /><i>Default: ${NSISDIR}\Contrib\Icons\modern-uninstall.ico</i></p>
+  The icon of the uninstaller.<br /><i>Default: ${NSISDIR}\Contrib\Graphics\Icons\modern-uninstall.ico</i></p>
   <p class="text"><span class="bold">MUI_LICENSEBKCOLOR </span><span class="parameter">
   (/windows | /grey | (color: RRGGBB hexadecimal))</span><br />
   The background color for the license textbox. Use /windows for the default text background (usually white).
   Use the /grey for the standard window background (usually grey).<br /><i>Default: /windows</i></p>
   <p class="text"><span class="bold">MUI_CHECKBITMAP </span><span class="parameter">bitmap_file</span><br />
   The bitmap with images for the checks of the component select treeview.<br />
-  <i>Default: ${NSISDIR}\Contrib\Icons\modern.bmp</i></p>
+  <i>Default: ${NSISDIR}\Contrib\Graphics\Checks\modern.bmp</i></p>
   <p class="text"><span class="bold">MUI_INSTALLCOLORS </span><span class="parameter">(/windows |
   (foreground color: RRGGBB hexadecimal) (background color: RRGGBB hexadecimal))</span><br />
   The colors of the details screen. Use /windows for the default colors.</p>
@@ -358,7 +358,7 @@ will also help you to learn more about the Modern UI.</p>
   The style of the progress bar. Colored makes it use the MUI_INSTALLCOLORS.<br /><i>Default: smooth</i></p>
   <p class="text"><span class="bold">MUI_HEADERBITMAP </span><span class="parameter">bmp_file</span><br />
   Bitmap to display in the white header (recommended size: 150x57 pixels). The NSIS Setup uses the bitmap
-  ${NSISDIR}\Contrib\Icons\modern-header.bmp, but can also make one with your own logo.</p>
+  ${NSISDIR}\Contrib\Graphics\Header\nsis.bmp, but can also make one with your own logo.</p>
   <div class="margin">
   <p class="text"><span class="bold">MUI_HEADERBITMAP_RIGHT</span><br />
   Display the header image on the right side instead of the left side.</p>
@@ -372,7 +372,7 @@ will also help you to learn more about the Modern UI.</p>
   <i>Default: ${NSISDIR}\Contrib\Modern UI\ioSpecial.ini</i></p>
   <p class="text"><span class="bold">MUI_SPECIALBITMAP </span><span class="parameter">bmp_file</span><br />
   Bitmap for the Welcome and Finish page (recommended size: 164x314 pixels).<br />
-  <i>Default: ${NSISDIR}\Contrib\Icons\modern-wizard.bmp</i></p>
+  <i>Default: ${NSISDIR}\Contrib\Graphics\Wizard\win.bmp</i></p>
   <div class="margin">
   <p class="text"><span class="bold">MUI_SPECIALBITMAP_NOSTRETCH</span><br />
   Do not stretch the bitmap for the Welcome and Finish page to fit the size of the field.
@@ -601,7 +601,7 @@ the data block, because this will make your installer start faster.</p>
 or above your own init- or page functions, you have to reserve files:</p>
 <pre class="margin">
 ReserveFile "ioFile.ini" ;Your own InstallOptions INI files
-ReserveFile "${NSISDIR}\Contrib\Icons\modern-header.bmp" ;Your header bitmap
+ReserveFile "${NSISDIR}\Contrib\Graphics\Header\nsis.bmp" ;Your header bitmap
 
 !insertmacro MUI_RESERVEFILE_WELCOMEFINISHPAGE ;Welcome- or Finish page
 !insertmacro MUI_RESERVEFILE_INSTALLOPTIONS ;InstallOptions

Contrib/Modern UI/System.nsh

@@ -52,15 +52,15 @@ Var MUI_TEMP2
   !endif
 
   !ifndef MUI_ICON
-    !define MUI_ICON "${NSISDIR}\Contrib\Icons\modern-install.ico"
+    !define MUI_ICON "${NSISDIR}\Contrib\Graphics\Icons\modern-install.ico"
   !endif
 
   !ifndef MUI_UNICON
-    !define MUI_UNICON "${NSISDIR}\Contrib\Icons\modern-uninstall.ico"
+    !define MUI_UNICON "${NSISDIR}\Contrib\Graphics\Icons\modern-uninstall.ico"
   !endif
 
   !ifndef MUI_CHECKBITMAP
-    !define MUI_CHECKBITMAP "${NSISDIR}\Contrib\Icons\modern.bmp"
+    !define MUI_CHECKBITMAP "${NSISDIR}\Contrib\Graphics\Checks\modern.bmp"
   !endif
   
   !ifndef MUI_LICENSEBKCOLOR
@@ -84,7 +84,7 @@ Var MUI_TEMP2
   !endif
   
   !ifndef MUI_SPECIALBITMAP
-    !define MUI_SPECIALBITMAP "${NSISDIR}\Contrib\Icons\modern-wizard.bmp"
+    !define MUI_SPECIALBITMAP "${NSISDIR}\Contrib\Graphics\Wizard\win.bmp"
   !endif
 
   XPStyle On

Contrib/NSIS Update/NSISUpdate.nsi

@@ -53,7 +53,7 @@ InstallColors /windows
 ChangeUI IDD_INST "Resources\GUI\NSISUpdate.exe"
 ChangeUI IDD_INSTFILES "Resources\GUI\NSISUpdate.exe"
 
-Icon "${NSISDIR}\Contrib\Icons\yi-simple2_install.ico"
+Icon "${NSISDIR}\Contrib\Graphics\Icons\arrow-install.ico"
 
 XPStyle on
 

Examples/gfx.nsi

@@ -57,7 +57,7 @@ Page instfiles instImage
 Section ""
 	; You can also use the BI_NEXT macro here...
 	MessageBox MB_YESNO "We can change the branding image from within a section too!$\nDo you want me to change it?" IDNO done
-		!insertmacro BIMAGE "${NSISDIR}\Contrib\Icons\checksX2.bmp" ""
+		!insertmacro BIMAGE "${NSISDIR}\Contrib\Graphics\Wizard\nsis.bmp" ""
 	done:
 	WriteUninstaller uninst.exe
 SectionEnd
@@ -65,24 +65,24 @@ SectionEnd
 ;--------------------------------
 
 Function licenseImage
-	!insertmacro BIMAGE "${NSISDIR}\Contrib\Icons\checks1.bmp" /RESIZETOFIT
+	!insertmacro BIMAGE "${NSISDIR}\Contrib\Graphics\Header\nsis.bmp" /RESIZETOFIT
 	MessageBox MB_YESNO 'Would you like to skip the license page?' IDNO no
 		Abort
 	no:
 FunctionEnd
 
 Function customPage
-	!insertmacro BIMAGE "${NSISDIR}\Contrib\Icons\modern.bmp" /RESIZETOFIT
+	!insertmacro BIMAGE "${NSISDIR}\Contrib\Graphics\Checks\modern.bmp" /RESIZETOFIT
 	MessageBox MB_OK 'This is a nice custom "page" with yet another image :P'
 	#insert install options/start menu/<insert plugin name here> here
 FunctionEnd
 
 Function dirImage
-	!insertmacro BIMAGE "${NSISDIR}\Contrib\Icons\checks2.bmp" /RESIZETOFIT
+	!insertmacro BIMAGE "${NSISDIR}\Contrib\Graphics\Header\win.bmp" /RESIZETOFIT
 FunctionEnd
 
 Function instImage
-	!insertmacro BIMAGE "${NSISDIR}\Contrib\Icons\checks-sdbarker.bmp" /RESIZETOFIT
+	!insertmacro BIMAGE "${NSISDIR}\Contrib\Graphics\Wizard\llama.bmp" /RESIZETOFIT
 FunctionEnd
 
 ;--------------------------------
@@ -94,17 +94,17 @@ UninstPage custom un.customPage
 UninstPage instfiles un.instImage
 
 Function un.uninstImage
-	!insertmacro BIMAGE "${NSISDIR}\Contrib\Icons\checksX.bmp" /RESIZETOFIT
+	!insertmacro BIMAGE "${NSISDIR}\Contrib\Graphics\Checks\modern.bmp" /RESIZETOFIT
 FunctionEnd
 
 Function un.customPage
-	!insertmacro BIMAGE "${NSISDIR}\Contrib\Icons\modern.bmp" /RESIZETOFIT
+	!insertmacro BIMAGE "${NSISDIR}\Contrib\Graphics\Header\win.bmp" /RESIZETOFIT
 	MessageBox MB_OK 'This is a nice uninstaller custom "page" with yet another image :P'
 	#insert install options/start menu/<insert plugin name here> here
 FunctionEnd
 
 Function un.instImage
-	!insertmacro BIMAGE "${NSISDIR}\Contrib\Icons\jarsonic-checks.bmp" /RESIZETOFIT
+	!insertmacro BIMAGE "${NSISDIR}\Contrib\Graphics\Wizard\llama.bmp" /RESIZETOFIT
 FunctionEnd
 
 ;--------------------------------

Examples/makensis.nsi

@@ -57,8 +57,8 @@ Caption "NSIS ${VER_DISPLAY} Setup"
 ;Settings
 !define MUI_ABORTWARNING
 
-!define MUI_HEADERBITMAP "${NSISDIR}\Contrib\Icons\modern-header.bmp"
+!define MUI_HEADERBITMAP "${NSISDIR}\Contrib\Graphics\Header\nsis.bmp"
-!define MUI_SPECIALBITMAP "${NSISDIR}\Contrib\Icons\modern-wizard nsis llama.bmp"
+!define MUI_SPECIALBITMAP "${NSISDIR}\Contrib\Graphics\Wizard\nullsoft.bmp"
 
 !define MUI_COMPONENTSPAGE_SMALLDESC