defines for custom extension UI's

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

Contrib/Modern UI/Readme.html

@@ -242,6 +242,13 @@ follow these steps:</p>
   <p class="text">The following settings are available: <i>(default values)</i></p>
   <p class="text"><span class="bold">MUI_UI</span> <i>(${NSISDIR}\Contrib\UIs\modern.exe)</i><br />
   The interface file with the dialog resources. Change this if you have made your own customized UI.</p>
+  <p class="text"><span class="bold">MUI_UI_HEADERBITMAP, MUI_UI_HEADERBITMAP_RIGHT</span>
+  <i>(${NSISDIR}\Contrib\UIs\modern-headerbmp(r).exe)</i><br />
+  The interface files with the dialog resource IDD_INST that contains a bitmap control and space for
+  the header bitmap.</p>
+  <p class="text"><span class="bold">MUI_UI_SMALLDESCRIPTION, MUI_UI_NODESCRIPTION</span>
+  <i>(${NSISDIR}\Contrib\UIs\modern-(small/no)desc.exe)</i><br />
+  The interface files with a customized dialog resource IDD_SELCOM for a small or no description area.</p>
   <p class="text"><span class="bold">MUI_ICON</span> <i>(${NSISDIR}\Contrib\Icons\modern-install.ico)</i><br />
   The icon of the installer.</p>
   <p class="text"><span class="bold">MUI_UNICON</span> <i>(${NSISDIR}\Contrib\Icons\modern-uninstall.ico)</i><br />
@@ -461,10 +468,10 @@ ReserveFile "ioFile.ini" ;Your own InstallOptions INI files
   Welcome/Finish page: <a href="../../Examples/Modern UI/WelcomeFinish.nsi">WelcomeFinish.nsi</a><br />
   </p>
 <p class="header">Customize the dialogs</p>
-  <p class="text">To change elements on the dialogs, modify modern.exe
+  <p class="text">To change elements on the dialogs, modify the
-  in the Contrib\UIs directory using a resource editor such as
+  resource files Contrib\UIs directory using a resource editor such as
   <a href="http://www.users.on.net/johnson/resourcehacker/">Resource Hacker</a>
-  and use the MUI_UI define to use your customized UI.</p>
+  and use the interface setting to define to filename use your customized UI.</p>
   <p class="text">The 'Please wait while Setup is loading...' text
   on the splash screen which  is being displayed when the installer
   is starting (Verifying installer, Unpacking data) cannot be changed

Contrib/Modern UI/System.nsh

@@ -34,6 +34,22 @@
   !ifndef MUI_UI
     !define MUI_UI "${NSISDIR}\Contrib\UIs\modern.exe"
   !endif
+  
+  !ifndef MUI_UI_HEADERBITMAP
+    !define MUI_UI_HEADERBITMAP "${NSISDIR}\Contrib\UIs\modern_headerbmp.exe"
+  !endif
+
+  !ifndef MUI_UI_HEADERBITMAP_RIGHT
+    !define MUI_UI_HEADERBITMAP_RIGHT "${NSISDIR}\Contrib\UIs\modern_headerbmpr.exe"
+  !endif
+  
+  !ifndef MUI_UI_SMALLDESCRIPTION
+    !define MUI_UI_SMALLDESCRIPTION "${NSISDIR}\Contrib\UIs\modern_smalldesc.exe"
+  !endif
+
+  !ifndef MUI_UI_NODESCRIPTION
+    !define MUI_UI_NODESCRIPTION "${NSISDIR}\Contrib\UIs\modern_nodesc.exe"
+  !endif
 
   !ifndef MUI_ICON
     !define MUI_ICON "${NSISDIR}\Contrib\Icons\modern-install.ico"
@@ -111,27 +127,27 @@
     ChangeUI all "${MUI_UI}"
     !ifdef MUI_HEADERBITMAP
       !ifndef MUI_HEADERBITMAP_RIGHT
-        ChangeUI IDD_INST "${NSISDIR}\Contrib\UIs\modern_headerbmp.exe"
+        ChangeUI IDD_INST "${MUI_UI_HEADERBITMAP}"
       !else
-        ChangeUI IDD_INST "${NSISDIR}\Contrib\UIs\modern_headerbmpr.exe"
+        ChangeUI IDD_INST "${MUI_UI_HEADERBITMAP_RIGHT}"
       !endif
     !endif
     !ifdef MUI_COMPONENTSPAGE_SMALLDESC
-      ChangeUI IDD_SELCOM "${NSISDIR}\Contrib\UIs\modern_smalldesc.exe"
+      ChangeUI IDD_SELCOM "${MUI_UI_SMALLDESCRIPTION}"
     !else ifdef MUI_COMPONENTSPAGE_NODESC
-      ChangeUI IDD_SELCOM "${NSISDIR}\Contrib\UIs\modern_nodesc.exe"
+      ChangeUI IDD_SELCOM "${MUI_UI_NODESCRIPTION}"
     !endif
   !else
     ChangeUI /RTL all "${MUI_UI}"
     !ifndef MUI_HEADERBITMAP_RIGHT
-      ChangeUI /RTL IDD_INST "${NSISDIR}\Contrib\UIs\modern_headerbmp.exe"
+      ChangeUI /RTL IDD_INST "${MUI_UI_HEADERBITMAP}"
     !else
-      ChangeUI /RTL IDD_INST "${NSISDIR}\Contrib\UIs\modern_headerbmpr.exe"
+      ChangeUI /RTL IDD_INST "${MUI_UI_HEADERBITMAP_RIGHT}"
     !endif
     !ifdef MUI_COMPONENTSPAGE_SMALLDESC
-      ChangeUI /RTL IDD_SELCOM "${NSISDIR}\Contrib\UIs\modern_smalldesc.exe"
+      ChangeUI /RTL IDD_SELCOM "${MUI_UI_SMALLDESCRIPTION}"
     !else ifdef MUI_COMPONENTSPAGE_NODESC
-      ChangeUI /RTL IDD_SELCOM "${NSISDIR}\Contrib\UIs\modern_nodesc.exe"
+      ChangeUI /RTL IDD_SELCOM "${MUI_UI_NODESCRIPTION}"
     !endif
   !endif