From 3c05425123ff680987e0d23acc50befbb8a4126b Mon Sep 17 00:00:00 2001
From: joostverburg
Date: Sun, 9 Mar 2003 18:55:57 +0000
Subject: [PATCH] Modern UI 1.63
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@2253 212acab6-be3b-0410-9dea-997c60f758d6
---
Contrib/Icons/modern-header.bmp | Bin 0 -> 25820 bytes
Contrib/Modern UI/Changelog.txt | 6 +-
Contrib/Modern UI/Readme.html | 52 +++++++++------
Contrib/Modern UI/System.nsh | 81 +++++++++++++++++++----
Contrib/UIs/modern2.exe | Bin 6144 -> 0 bytes
Contrib/UIs/modern3.exe | Bin 6144 -> 0 bytes
Contrib/UIs/modern_headerbmp.exe | Bin 0 -> 4608 bytes
Contrib/UIs/modern_headerbmpr.exe | Bin 0 -> 4608 bytes
Contrib/UIs/modern_nodesc.exe | Bin 0 -> 4096 bytes
Contrib/UIs/modern_smalldesc.exe | Bin 0 -> 4096 bytes
Contrib/UIs/modern_topbmp.exe | Bin 0 -> 4608 bytes
Examples/Modern UI/Basic.nsi | 5 +-
Examples/Modern UI/HeaderBitmap.nsi | 90 ++++++++++++++++++++++++++
Examples/Modern UI/InstallOptions.nsi | 5 +-
Examples/Modern UI/MultiLanguage.nsi | 15 +++--
Examples/Modern UI/StartMenu.nsi | 5 +-
Examples/Modern UI/WelcomeFinish.nsi | 5 +-
Examples/makensis.nsi | 6 +-
18 files changed, 209 insertions(+), 61 deletions(-)
create mode 100644 Contrib/Icons/modern-header.bmp
delete mode 100644 Contrib/UIs/modern2.exe
delete mode 100644 Contrib/UIs/modern3.exe
create mode 100644 Contrib/UIs/modern_headerbmp.exe
create mode 100644 Contrib/UIs/modern_headerbmpr.exe
create mode 100644 Contrib/UIs/modern_nodesc.exe
create mode 100644 Contrib/UIs/modern_smalldesc.exe
create mode 100644 Contrib/UIs/modern_topbmp.exe
create mode 100644 Examples/Modern UI/HeaderBitmap.nsi
diff --git a/Contrib/Icons/modern-header.bmp b/Contrib/Icons/modern-header.bmp
new file mode 100644
index 0000000000000000000000000000000000000000..e5e563e3fdfefa8cd1570166e5c93b3392d8edcc
GIT binary patch
literal 25820
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
Show the license page.
MUI_COMPONENTSPAGE
Show the component selection page.
+
+
MUI_COMPONENTSPAGE_SMALLDESC
+ A small description area on the bottom of the page. Use this layout
+ if you have a lot of sections and don't need large descriptions.
+
MUI_COMPONENTSPAGE_NODESC
+ No description area.
+
MUI_DIRECTORYPAGE
Show the directory selection page.
MUI_STARTMENUPAGE
@@ -230,11 +237,11 @@ follow these steps:
You can also change the settings of the interface by using defines:
- !define MUI_UI "${NSISDIR}\Contrib\UIs\modern2.exe"
+ !define MUI_ICON "myicon.ico"
If you don't define a setting, the default will be used.
The following settings are available: (default values)
MUI_UI (${NSISDIR}\Contrib\UIs\modern.exe)
- The interface file with the dialog resources.
+ The interface file with the dialog resources. Change this if you have made your own customized UI.
MUI_ICON (${NSISDIR}\Contrib\Icons\modern-install.ico)
The icon of the installer.
MUI_UNICON (${NSISDIR}\Contrib\Icons\modern-uninstall.ico)
@@ -252,7 +259,16 @@ follow these steps:
MUI_INSTALLCOLORS (/windows)
The colors of the details screen, hexadecimal RRGGBB. ("foreground" "background")
MUI_PROGRESSBAR (smooth)
- The style of the progress bar ("colored" to use the MUI_INSTALLCOLORS or "" for a old-school windows look).
+ The style of the progress bar ("colored" to use the MUI_INSTALLCOLORS or "" for an old-school
+ windows look).
+ MUI_HEADERBITMAP (not defined)
+ Bitmap to display in the white header. With the default DPI, a bitmap with a size 150x57 won't have to be resized.
+ An example of a header bitmap is ${NSISDIR}\Contrib\Icons\modern-header.bmp, but can also make one with your own
+ logo.
+
+
MUI_HEADERBITMAP_RIGHT (not defined)
+ Put the header bitmap on the right side of the header instead of the left side.
+
MUI_SPECIALINI (${NSISDIR}\Contrib\Modern UI\ioSpecial.ini)
Install Options INI File for the Welcome and Finish page.
MUI_SPECIALBITMAP (${NSISDIR}\Contrib\Icons\modern-wizard.bmp)
@@ -266,13 +282,11 @@ follow these steps:
Modern UI, such as the .onGUIInit function and the Page function, create your
own function and let the Modern UI functions call them..
More info...
-
- !insertmacro MUI_SYSTEM
-
+
If you want to use custom pages (define MUI_CUSTOMPAGECOMMANDS
or MUI_UNCUSTOMPAGECOMMANDS), insert them before inserting the language files.
More info...
-
+
Insert the Modern UI language files for the languages you are using:
!insertmacro MUI_LANGUAGE "English"
The Modern UI language files load the NLF language files,
@@ -291,7 +305,7 @@ follow these steps:
language (in the language itself) to the stack:
!insertmacro MUI_LANGDLL_PUSH "English" ;Parameter = Language file name in English
-
+
If you are not using a Finish page without defining
MUI_FINISHPAGE_NOAUTOCLOSEWINDOW and have not set AutoCloseWindow
to true, you should insert the MUI_SECTIONS_FINISHHEADER
@@ -446,23 +460,17 @@ ReserveFile "ioFile.ini" ;Your own InstallOptions INI files
Start Menu Folder selection: StartMenu.nsi
Welcome/Finish page: WelcomeFinish.nsi
-
-
- There are three different versions of the Modern UI.
- Modern.exe contains the dialogs of the standard interface.
- If you have an installer with a lot of subsections or long section
- names, use modern2.exe, which has a different component selection page.
- Use modern3.exe if you are not using descriptions.
-
- To change elements on the dialogs, modify modern?.exe
+
+ To change elements on the dialogs, modify modern.exe
in the Contrib\UIs directory using a resource editor such as
- Resource Hacker.
+ Resource Hacker
+ and use the MUI_UI define to use your customized UI.
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
by the script, because the installer is not started yet when this
dialog is being displayed. If you want to change this text, modify
- dialog 111 of modern?.exe.
+ dialog 111 of modern.exe.
The 'Verifying installer' and 'Unpacking data' texts are defined in
the language header file of the NSIS exehead (Source\exehead\lang.h).
To change them, you need to edit this file and recompile NSIS.
@@ -544,8 +552,12 @@ FunctionEnd
-- 1.62b - March 6, 2003
+
- 1.63 - March 9, 2003
+ - Support for a bitmap in the wizard header
+ - New defines to change the description area
+ - MUI_SYSTEM inserted automatically
+ - Easier to customize resouce files
- New system for custom functions
- New InstallOptions macro's that do not remove the return value from
the stack
diff --git a/Contrib/Modern UI/System.nsh b/Contrib/Modern UI/System.nsh
index 8ead1c75..dc3c0d72 100644
--- a/Contrib/Modern UI/System.nsh
+++ b/Contrib/Modern UI/System.nsh
@@ -1,4 +1,4 @@
-;NSIS Modern User Interface version 1.62
+;NSIS Modern User Interface version 1.63
;Macro System
;Written by Joost Verburg
@@ -108,10 +108,33 @@
XPStyle On
!ifndef MUI_RTL_UI
- ChangeUI all "${MUI_UI}"
+ ChangeUI all "${MUI_UI}"
+ !ifdef MUI_HEADERBITMAP
+ !ifndef MUI_HEADERBITMAP_RIGHT
+ ChangeUI IDD_INST "${NSISDIR}\Contrib\UIs\modern_headerbmp.exe"
+ !else
+ ChangeUI IDD_INST "${NSISDIR}\Contrib\UIs\modern_headerbmpr.exe"
+ !endif
+ !endif
+ !ifdef MUI_COMPONENTSPAGE_SMALLDESC
+ ChangeUI IDD_SELCOM "${NSISDIR}\Contrib\UIs\modern_smalldesc.exe"
+ !else ifdef MUI_COMPONENTSPAGE_NODESC
+ ChangeUI IDD_SELCOM "${NSISDIR}\Contrib\UIs\modern_nodesc.exe"
+ !endif
!else
ChangeUI /RTL all "${MUI_UI}"
+ !ifndef MUI_HEADERBITMAP_RIGHT
+ ChangeUI /RTL IDD_INST "${NSISDIR}\Contrib\UIs\modern_headerbmp.exe"
+ !else
+ ChangeUI /RTL IDD_INST "${NSISDIR}\Contrib\UIs\modern_headerbmpr.exe"
+ !endif
+ !ifdef MUI_COMPONENTSPAGE_SMALLDESC
+ ChangeUI /RTL IDD_SELCOM "${NSISDIR}\Contrib\UIs\modern_smalldesc.exe"
+ !else ifdef MUI_COMPONENTSPAGE_NODESC
+ ChangeUI /RTL IDD_SELCOM "${NSISDIR}\Contrib\UIs\modern_nodesc.exe"
+ !endif
!endif
+
Icon "${MUI_ICON}"
!ifdef MUI_UNINSTALLER
@@ -308,13 +331,11 @@
!ifdef MUI_WELCOMEPAGE
!insertmacro MUI_WELCOMEFINISHPAGE_INIT
+ !else ifdef MUI_FINISHPAGE
+ !insertmacro MUI_WELCOMEFINISHPAGE_INIT
!endif
- !ifndef MUI_WELCOMEPAGE
- !ifdef MUI_FINISHPAGE
- !insertmacro MUI_WELCOMEFINISHPAGE_INIT
- !endif
- !endif
+ !insertmacro MUI_HEADERBITMAP_INIT
!insertmacro MUI_GUIINIT_BASIC
@@ -322,6 +343,8 @@
!macro MUI_UNGUIINIT
+ !insertmacro MUI_HEADERBITMAP_INIT
+
!insertmacro MUI_GUIINIT_BASIC
!macroend
@@ -374,6 +397,16 @@
!macroend
+!macro MUI_HEADERBITMAP_INIT
+
+ !ifdef MUI_HEADERBITMAP
+ InitPluginsDir
+ File "/oname=$PLUGINSDIR\modern-header.bmp" "${MUI_HEADERBITMAP}"
+ SetBrandingImage /IMGID=1046 /RESIZETOFIT "$PLUGINSDIR\modern-header.bmp"
+ !endif
+
+!macroend
+
!macro MUI_LANGUAGE LANGUAGE
!ifndef MUI_MANUALVERBOSE
@@ -1751,13 +1784,28 @@
!verbose 3
!endif
- !define MUI_NOVERBOSE
-
- !insertmacro MUI_INTERFACE
- !insertmacro MUI_BASIC
- !insertmacro MUI_UNBASIC
+ !ifndef MUI_SYSTEM_INSERTED
- !undef MUI_NOVERBOSE
+ !define MUI_SYSTEM_INSERTED
+
+ ;1.62 compatibility
+ !ifdef MUI_STARTMENU_VARIABLE || MUI_STARTMENU_DEFAULTFOLDER || MUI_STARTMENU_REGISTRY_ROOT
+ !error "The Start Menu Folder page defines have been renamed from MUI_STARTMENU_??? to MUI_STARTMENUPAGE_???. Please change this in your script."
+ !endif
+
+ !define MUI_NOVERBOSE
+
+ !insertmacro MUI_INTERFACE
+ !insertmacro MUI_BASIC
+ !insertmacro MUI_UNBASIC
+
+ !undef MUI_NOVERBOSE
+
+ !else
+
+ !warning "The MUI_SYSTEM macro is now being inserted automatically. You can remove '!insertmacro MUI_SYSTEM' from your script."
+
+ !endif
!ifndef MUI_MANUALVERBOSE
!verbose 4
@@ -1814,6 +1862,13 @@
;LANGUAGE FILES
!macro MUI_LANGUAGEFILE_BEGIN LANGUAGE
+
+ !ifndef MUI_SYSTEM_INSERT
+
+ !define MUI_SYSTEM_INSERT
+ !insertmacro MUI_SYSTEM
+
+ !endif
!ifndef "MUI_LANGUAGEFILE_${LANGUAGE}_USED"
diff --git a/Contrib/UIs/modern2.exe b/Contrib/UIs/modern2.exe
deleted file mode 100644
index 0f6d41794fbcd78670fc7e08e197c997b97973c3..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 6144
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
diff --git a/Contrib/UIs/modern_headerbmp.exe b/Contrib/UIs/modern_headerbmp.exe
new file mode 100644
index 0000000000000000000000000000000000000000..3a37af3812c047a0342893bb1e7e9904169ebc63
GIT binary patch
literal 4608
zcmeHKU1$_n6h5=b+BLr$$+ptpNexsXS*%GwhzVn|iyPeNHoMuC{%FUYF*DnBrp(S(
z1q-3ZQrHNkw3NO`C7=(5J{2NG=%$5K3xY_|Je5-V(11`MM4^4S{qCLFWRb*|QnZj0
z&OP@#-#O==duOsUGyeL=)IdayP{xQZ!*Wr?_~>B?blXecw$V46uXkORlGnR3hFOx|
zb?hleJuc@}%d%bhs4hEYOExVzb}%g;w>3T5+S=6Zmp-dp{e7Y9;(Sd91K-X6An>L6
z8?ZNb{5`)2`&r=g`6}$DSH2W>!ps{yXT1(naiXNuNatTD4Ao+OrFN-V+T?Av$@Bi$
z0UL(O94p>D;DvAxKNle>j6MJjK@!hfu|DK3NJb{o_(UN(t}e{j)#
zD#ao@QR@QdvId3GGnVN;OTcX4G#?{92pC+P<4Nr^Kcl^K@w+MGFZ|kxmXe@RrW=M6
z!Y2b1B3bl&kCpFc*#J*wk?q_asv!kvc?R{;mA68<%1{j0NFp%JZdV3)Sz`~7(TIP$
zG`p2zw~c<_LW2)_IFNkM%|XBeg`kM34Dl6^RtSo2eG)lF2Tmc)A_?$?AeKAwMql;t
zHC&Etjzx&CTtqz<31eCr=)~B^a_m;l*d10VS1@yP;%LxQWDiIrZG|~<__5!H8x1_B
z6TstdnlJt0%U%P~E~00lEl@7Au;-ztp;w?cp}#@zK?yk)?3>Ue^lR>eT$P0p!!Ued
z;H5g>7Uapm)jD54d?Db=b-rQVQym6ck^iFauPA=fbW@I<*GnaGqQ#|@ZU^i!4ntdXJr!qXB
z1k#3m!gJv_Zk12jC8AdY>Aa)sR>mGJn!1I@xXXL+!YA~+OC21?ic@2*ew=8MMjc&s
z^_Zy^?WvTCmoBXF1;zA|>)5CKWf}q~?!HzwUB5G0q`0MdNpzmP$%uW@FEE*oPtA251wd^EGN|CNigG5Oz|z%g`cK&PMu=sQp@_!JPrAfu|4
z*KvOzz)dU<6YY^l)I0(Yq{q_od%9CHZHosBJXz8mdCYQk=a`z;Eh4bP5cs}nxDQ%;sb$An3{WdjG>pHweTj(bE
Ywl#QMS5aTX9-m%==WB1slY0XH04S8)-2eap
literal 0
HcmV?d00001
diff --git a/Contrib/UIs/modern_headerbmpr.exe b/Contrib/UIs/modern_headerbmpr.exe
new file mode 100644
index 0000000000000000000000000000000000000000..d18586078e91d3224d94625ea373d502bab099cf
GIT binary patch
literal 4608
zcmeHKU1$_n6h5=b+BJW>k!&mdozy@T%wkOfLQEKwUEJVCx7p3E^hZ1HjG5W4Gi7$R
zDp&|LmclBO(o*^&m4JOH^r;XjLN_g>S`b8v=BboYXahoh5QX;P_PcjxlSL9=O3^}2
zIQQJ|eCM2d?w!fb%=oJxQWFt1Lm4Bw1j|Jcb&)(?MTvyw-h5N?q&D8fIC3
z+p(t{^_W~xEz5T0Bf9KVEZMZ=_<@Xk%+~Z+dwWZdU;2!4<+u6ni*t1y417EHy})10
zU5CA~?eDn-*iQnV&edQyy!5%S6K28SIcs&8P7tM}W;*{|ai|{i3x%atX@j@f7SH=b
zCu{^NbF6stfEU6&{9J^jG5P>B1W7z^+4_*XAX%A6;}eDGpqIeWzZV&`A5tae>L*MKi>25CNPJ{L~q6%O?6eA5s!mI#DriQL_zm4FO1G|{|+dRZ{uJ^6rx(pDLVzY
z#9rYL^*Uf1L=mUa;8>qN@)NihoY|p}RC#K;T}+HFKo$+j3eA3iX*J#x>fI#~-CumB
zcK`a8Aa{Njp~>p))3+nlL|d*m0yaGJC$^FdpDA%Lmxv_YXOl^HbKkujtAto|7wY9$
zv>#?^3?Y5Bqo?1ENa2rb=i~TbZy+TM=-2h`WMLD{JSIr7rj`Ok>t}Z*akV
zBF&;ZQ0oHcat1}vGnVN;L%?j{6d$A85iqzg%ag)0KcT&Ii92cIFZ|kxmQtWmrU!--
z!Y2b1qdD|^msRfM*Z@yv(XHGasv`wxX$JK&)i*-<>QEfmNFgx8ZdC_(Sz|Yl(Tsn)
z47-_Tw~T(^Vv`THb0GPkhl79zia`-m9pWn>tr!&D`Xq9UPMku9MU&u*K`eLpwZ7V+
ztGFDwJc|-vxrBNw8o{(W(1o#&<=M@=u`8lbzG&uW#nGUr=x&fm+6;5}&?CPM*Bf|5
zCxFM_G++Ap7rh2z-9%4A+n`*|!k&kof?kH+fc^@-3nk=Ou&+Z?(66`;azz$K48!n6
zfEOEln~*01*BX5N@P&XcHTZ^kPYoDoS^kT@zof(o(@i^eK`)odk@o8DxUE%6dQ!Et
zlD>y%IFPbcEoB~YROck{zQn}-M5=FROe>X$1_K%0(#DajPVwmXf!(}mY4-6fp33li
z6v!C%anFU{xD`Hamx*2uWD1V1TUmRwWa<_k<1X*P3!l&nE_HGoFHMcP`Z1zO8g+El
z)#IjGvZvB2Ub?WxXB5}Vu4A9{muU*1xcf@Qbp6g~ffAPHCDD2ECL{IILC;8Q>dgN&+H
zLC5{QA2+c)Otf1bQ40v%pBc-@@90k1v@ISi@MKwcsSe<}GLG-iPeCI5idDO%nm9T0#IKh@ipmzE1@5!
zy-$IC($7BceQJzThGeKgI+gGzQye3|S5~AceUYxxPU;ZfsfTB5JldJH2?R9y4Pv9R+5Zwj<
literal 0
HcmV?d00001
diff --git a/Contrib/UIs/modern_nodesc.exe b/Contrib/UIs/modern_nodesc.exe
new file mode 100644
index 0000000000000000000000000000000000000000..d8a5458e521c20d2621d887111085db5d2f53484
GIT binary patch
literal 4096
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
Y$0|IoYl_dOfIU9B3eViSJiaIJ5A_k;!vFvP
literal 0
HcmV?d00001
diff --git a/Examples/Modern UI/Basic.nsi b/Examples/Modern UI/Basic.nsi
index 6e228abb..fd13ec10 100644
--- a/Examples/Modern UI/Basic.nsi
+++ b/Examples/Modern UI/Basic.nsi
@@ -1,4 +1,4 @@
-;NSIS Modern User Interface version 1.62
+;NSIS Modern User Interface version 1.63
;Basic Example Script
;Written by Joost Verburg
@@ -28,9 +28,6 @@
!define MUI_UNINSTALLER
!define MUI_UNCONFIRMPAGE
- ;Modern UI System
- !insertmacro MUI_SYSTEM
-
;--------------------------------
;Languages
diff --git a/Examples/Modern UI/HeaderBitmap.nsi b/Examples/Modern UI/HeaderBitmap.nsi
new file mode 100644
index 00000000..a67dfe55
--- /dev/null
+++ b/Examples/Modern UI/HeaderBitmap.nsi
@@ -0,0 +1,90 @@
+;NSIS Modern User Interface version 1.63
+;Header Bitmap Example Script
+;Written by Joost Verburg
+
+!define MUI_PRODUCT "Test Software" ;Define your own software name here
+!define MUI_VERSION "1.0" ;Define your own software version here
+
+!include "MUI.nsh"
+
+;--------------------------------
+;Configuration
+
+ ;General
+ OutFile "HeaderBitmap.exe"
+
+ ;Folder selection page
+ InstallDir "$PROGRAMFILES\${MUI_PRODUCT}"
+
+;--------------------------------
+;Modern UI Configuration
+
+ !define MUI_LICENSEPAGE
+ !define MUI_COMPONENTSPAGE
+ !define MUI_DIRECTORYPAGE
+
+ !define MUI_ABORTWARNING
+
+ !define MUI_UNINSTALLER
+ !define MUI_UNCONFIRMPAGE
+
+ !define MUI_HEADERBITMAP "${NSISDIR}\Contrib\Icons\modern-header.bmp"
+
+;--------------------------------
+;Languages
+
+ !insertmacro MUI_LANGUAGE "English"
+
+;--------------------------------
+;Language Strings
+
+ ;Description
+ LangString DESC_SecCopyUI ${LANG_ENGLISH} "Copy the modern.exe file to the application folder."
+
+;--------------------------------
+;Data
+
+ LicenseData "${NSISDIR}\Contrib\Modern UI\License.txt"
+
+;--------------------------------
+;Installer Sections
+
+Section "modern.exe" SecCopyUI
+
+ ;ADD YOUR OWN STUFF HERE!
+
+ SetOutPath "$INSTDIR"
+ File "${NSISDIR}\Contrib\UIs\modern.exe"
+
+ ;Create uninstaller
+ WriteUninstaller "$INSTDIR\Uninstall.exe"
+
+SectionEnd
+
+;Display the Finish header
+;Insert this macro after the sections if you are not using a finish page
+!insertmacro MUI_SECTIONS_FINISHHEADER
+
+;--------------------------------
+;Descriptions
+
+!insertmacro MUI_FUNCTIONS_DESCRIPTION_BEGIN
+ !insertmacro MUI_DESCRIPTION_TEXT ${SecCopyUI} $(DESC_SecCopyUI)
+!insertmacro MUI_FUNCTIONS_DESCRIPTION_END
+
+;--------------------------------
+;Uninstaller Section
+
+Section "Uninstall"
+
+ ;ADD YOUR OWN STUFF HERE!
+
+ Delete "$INSTDIR\modern.exe"
+ Delete "$INSTDIR\Uninstall.exe"
+
+ RMDir "$INSTDIR"
+
+ ;Display the Finish header
+ !insertmacro MUI_UNFINISHHEADER
+
+SectionEnd
\ No newline at end of file
diff --git a/Examples/Modern UI/InstallOptions.nsi b/Examples/Modern UI/InstallOptions.nsi
index d4b3f6a5..f15f02e6 100644
--- a/Examples/Modern UI/InstallOptions.nsi
+++ b/Examples/Modern UI/InstallOptions.nsi
@@ -1,4 +1,4 @@
-;NSIS Modern User Interface version 1.62
+;NSIS Modern User Interface version 1.63
;InstallOptions Example Script
;Written by Joost Verburg
@@ -31,9 +31,6 @@
!define MUI_UNINSTALLER
!define MUI_UNCONFIRMPAGE
-
- ;Modern UI System
- !insertmacro MUI_SYSTEM
;--------------------------------
;Pages
diff --git a/Examples/Modern UI/MultiLanguage.nsi b/Examples/Modern UI/MultiLanguage.nsi
index 4db0fa3f..e1d3a8a4 100644
--- a/Examples/Modern UI/MultiLanguage.nsi
+++ b/Examples/Modern UI/MultiLanguage.nsi
@@ -1,4 +1,4 @@
-;NSIS Modern User Interface version 1.62
+;NSIS Modern User Interface version 1.63
;MultiLanguage Example Script
;Written by Joost Verburg
@@ -27,9 +27,6 @@
!define MUI_UNINSTALLER
!define MUI_UNCONFIRMPAGE
-
- ;Modern UI System
- !insertmacro MUI_SYSTEM
;--------------------------------
;Languages
@@ -40,7 +37,8 @@
!insertmacro MUI_LANGUAGE "Spanish"
!insertmacro MUI_LANGUAGE "SimpChinese"
!insertmacro MUI_LANGUAGE "TradChinese"
- !insertmacro MUI_LANGUAGE "Japanese"
+ !insertmacro MUI_LANGUAGE "Japanese"
+ !insertmacro MUI_LANGUAGE "Korean"
!insertmacro MUI_LANGUAGE "Italian"
!insertmacro MUI_LANGUAGE "Dutch"
!insertmacro MUI_LANGUAGE "Danish"
@@ -69,6 +67,7 @@
LangString DESC_SecCopyUI ${LANG_SIMPCHINESE} "modern.exe: Simplified Chinese description"
LangString DESC_SecCopyUI ${LANG_TRADCHINESE} "modern.exe: Traditional Chinese description"
LangString DESC_SecCopyUI ${LANG_JAPANESE} "modern.exe: Japanese description"
+ LangString DESC_SecCopyUI ${LANG_JAPANESE} "modern.exe: Korean description"
LangString DESC_SecCopyUI ${LANG_ITALIAN} "modern.exe: Italian description"
LangString DESC_SecCopyUI ${LANG_DUTCH} "modern.exe: Dutch description"
LangString DESC_SecCopyUI ${LANG_DANISH} "modern.exe: Danish description"
@@ -96,6 +95,7 @@
LicenseData /LANG=${LANG_SIMPCHINESE} "${NSISDIR}\Contrib\Modern UI\License.txt"
LicenseData /LANG=${LANG_TRADCHINESE} "${NSISDIR}\Contrib\Modern UI\License.txt"
LicenseData /LANG=${LANG_JAPANESE} "${NSISDIR}\Contrib\Modern UI\License.txt"
+ LicenseData /LANG=${LANG_KOREAN} "${NSISDIR}\Contrib\Modern UI\License.txt"
LicenseData /LANG=${LANG_ITALIAN} "${NSISDIR}\Contrib\Modern UI\License.txt"
LicenseData /LANG=${LANG_DUTCH} "${NSISDIR}\Contrib\Modern UI\License.txt"
LicenseData /LANG=${LANG_DANISH} "${NSISDIR}\Contrib\Modern UI\License.txt"
@@ -159,7 +159,8 @@ Function .onInit
!insertmacro MUI_LANGDLL_PUSH "Spanish"
!insertmacro MUI_LANGDLL_PUSH "SimpChinese"
!insertmacro MUI_LANGDLL_PUSH "TradChinese"
- !insertmacro MUI_LANGDLL_PUSH "Japanese"
+ !insertmacro MUI_LANGDLL_PUSH "Japanese"
+ !insertmacro MUI_LANGDLL_PUSH "Korean"
!insertmacro MUI_LANGDLL_PUSH "Italian"
!insertmacro MUI_LANGDLL_PUSH "Dutch"
!insertmacro MUI_LANGDLL_PUSH "Danish"
@@ -177,7 +178,7 @@ Function .onInit
!insertmacro MUI_LANGDLL_PUSH "Macedonian"
!insertmacro MUI_LANGDLL_PUSH "Turkish"
- Push 23F ;22 = number of languages, F = change font
+ Push 24F ;24 = number of languages, F = change font
LangDLL::LangDialog "Installer Language" "Please select a language."
diff --git a/Examples/Modern UI/StartMenu.nsi b/Examples/Modern UI/StartMenu.nsi
index ae141894..c63f09e7 100644
--- a/Examples/Modern UI/StartMenu.nsi
+++ b/Examples/Modern UI/StartMenu.nsi
@@ -1,4 +1,4 @@
-;NSIS Modern User Interface version 1.62
+;NSIS Modern User Interface version 1.63
;Start Menu Folder Selection Example Script
;Written by Joost Verburg
@@ -43,9 +43,6 @@
!define MUI_UNINSTALLER
!define MUI_UNCONFIRMPAGE
- ;Modern UI System
- !insertmacro MUI_SYSTEM
-
;--------------------------------
;Languages
diff --git a/Examples/Modern UI/WelcomeFinish.nsi b/Examples/Modern UI/WelcomeFinish.nsi
index 38bcc648..569a3fff 100644
--- a/Examples/Modern UI/WelcomeFinish.nsi
+++ b/Examples/Modern UI/WelcomeFinish.nsi
@@ -1,4 +1,4 @@
-;NSIS Modern User Interface version 1.62
+;NSIS Modern User Interface version 1.63
;Welcome/Finish Page Example Script
;Written by Joost Verburg
@@ -31,9 +31,6 @@
!define MUI_UNINSTALLER
!define MUI_UNCONFIRMPAGE
- ;Modern UI System
- !insertmacro MUI_SYSTEM
-
;--------------------------------
;Languages
diff --git a/Examples/makensis.nsi b/Examples/makensis.nsi
index 2dd6f835..27151c8e 100644
--- a/Examples/makensis.nsi
+++ b/Examples/makensis.nsi
@@ -43,6 +43,7 @@ InstallDirRegKey HKLM SOFTWARE\NSIS ""
!define MUI_WELCOMEPAGE
!define MUI_LICENSEPAGE
!define MUI_COMPONENTSPAGE
+ !define MUI_COMPONENTSPAGE_SMALLDESC
!define MUI_DIRECTORYPAGE
!define MUI_FINISHPAGE
!define MUI_FINISHPAGE_SHOWREADME "$INSTDIR\Docs\index.html"
@@ -53,11 +54,8 @@ InstallDirRegKey HKLM SOFTWARE\NSIS ""
!define MUI_UNINSTALLER
!define MUI_UNCONFIRMPAGE
+ !define MUI_HEADERBITMAP "${NSISDIR}\Contrib\Icons\modern-header.bmp"
!define MUI_SPECIALBITMAP "${NSISDIR}\Contrib\Icons\modern-wizard nsis llama.bmp"
- !define MUI_UI "${NSISDIR}\Contrib\UIs\modern2.exe"
-
- ;Modern UI System
- !insertmacro MUI_SYSTEM
;--------------------------------
;Languages