From 8ee6ad13d62318737acf7d5c2a6ac94feefb6682 Mon Sep 17 00:00:00 2001
From: joostverburg <joostverburg@212acab6-be3b-0410-9dea-997c60f758d6>
Date: Sun, 28 Sep 2003 15:48:50 +0000
Subject: [PATCH] nsisconf header: more info, Modern UI support, updated paths

git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@2980 212acab6-be3b-0410-9dea-997c60f758d6
---
 Contrib/Modern UI/System.nsh |  2 +
 nsisconf.nsh                 | 77 +++++++++++++++++++++++++-----------
 2 files changed, 57 insertions(+), 22 deletions(-)

diff --git a/Contrib/Modern UI/System.nsh b/Contrib/Modern UI/System.nsh
index 22a20153..2844976a 100644
--- a/Contrib/Modern UI/System.nsh	
+++ b/Contrib/Modern UI/System.nsh	
@@ -2048,6 +2048,8 @@ Var MUI_TEMP2
 
 !macro MUI_INSERT
   
+  !insertmacro MUI_NSISCONF
+  
   !ifdef MUI_PRODUCT | MUI_VERSION
     !warning "The MUI_PRODUCT and MUI_VERSION defines have been removed. Use a normal Name command now."
   !endif
diff --git a/nsisconf.nsh b/nsisconf.nsh
index 52dd0499..12eede50 100644
--- a/nsisconf.nsh
+++ b/nsisconf.nsh
@@ -1,27 +1,60 @@
-;Default NSIS Config File
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;------------------------
+;DEFAULT NSIS CONFIG FILE
+;------------------------
 
-;This file is treated as if it is in the directory
-;that you are building from. i.e. the command:
-;
-;   File whatever.dat
-;
-;would need whatever.dat to be in your build directory.
+;This header file will be included when compiling any NSIS installer,
+;you can use it to add script code to every installer you compile.
 
+;This file is treated as if it is in the directory of your script.
+;When using relative paths, the files have to be in your build directory.
 
-;Change the default icon or bitmaps:
-;
-;Icon "${NSISDIR}\Contrib\Icons\setup.ico"
-;CheckBitmap "${NSISDIR}\Contrib\Icons\checks4.bmp"
+;------------------------
+;EXAMPLES
+;------------------------
 
-;Define Symbols:
-;
-;!define poo
+;Compress installer exehead with an executable compressor (such as UPX / Petite).
 
-;Use one of these if you have upx or petite installed.
-;Note that your exe packer should not pack the first icon
-;and paths should ideally be absolute (since you could be 
-;building your installer anywhere).
-;
-;!packhdr tmp.dat '"C:\program files\upx\upx" -9 -q tmp.dat'
-;!packhdr tmp.dat '"C:\program files\petite\petite" -9 -b0 -r** -p0 -y tmp.dat'
+;Paths should be absolute to allow building from any location.
+;Note that your executable compressor should not compress the first icon.
+
+;!packhdr temp.dat '"C:\Program Files\upx\upx" -9 -q temp.dat'
+;!packhdr temp.dat '"C:\Program Files\petite\petite" -9 -b0 -r** -p0 -y temp.dat'
+
+;------------------------
+
+;Set default compressor
+
+;SetCompressor bzip2
+
+;------------------------
+
+;Change the default icons
+
+;Icon "${NSISDIR}\Contrib\Graphics\Icons\arrow-install.ico"
+;UnIcon "${NSISDIR}\Contrib\Graphics\Icons\arrow-uninstall.ico"
+
+;------------------------
+
+;Define symbols
+
+;!define COMPANYNAME "bla"
+
+;------------------------
+;MODERN UI
+;------------------------
+
+;The Modern UI will insert the MUI_NSISCONF macro just before processing the settings.
+;Here you can set default settings for the Modern UI.
+
+;------------------------
+
+!macro MUI_NSISCONF
+
+  ;Example: Change the default Modern UI icons
+  
+  ;!ifndef MUI_ICON & MUI_UNICON
+  ;  !define MUI_ICON "${NSISDIR}\Contrib\Graphics\Icons\arrow-install.ico"
+  ;  !define MUI_UNICON "${NSISDIR}\Contrib\Graphics\Icons\arrow-uninstall.ico"
+  ;!endif
+  
+!macroend
\ No newline at end of file