dragonleo/NSIS
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

added MUI_(UN)WELCOMEFINISHPAGE_INI_3LINES, welcome page after installation works, doc fixes

Browse source 
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@3102 212acab6-be3b-0410-9dea-997c60f758d6
This commit is contained in:
joostverburg 2003-11-05 16:02:44 +00:00
parent 5fa5a34e45
commit f9700baff3
2 changed files with 48 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

38
Contrib/Modern UI/Readme.html
View file

@ -194,7 +194,7 @@ will also help you to learn more about the Modern UI.</p>
<p class="text"><span class="bold">MUI_BGCOLOR </span><span class="parameter">(color: RRGGBBR hexadecimal)</span><br /> <p class="text"><span class="bold">MUI_BGCOLOR </span><span class="parameter">(color: RRGGBBR hexadecimal)</span><br />
Background color for the header, Welcome- and Finish page.<br /><i>Default: FFFFFF</i></p> Background color for the header, Welcome- and Finish page.<br /><i>Default: FFFFFF</i></p>
</div> </div>
<p class="sub2header">User Interface Resource Settings</p> <p class="sub2header">Interface Resource Settings</p>
<div class="margin"> <div class="margin">
<p class="text"><span class="bold">MUI_UI </span><span class="parameter">ui_file</span><br /> <p class="text"><span class="bold">MUI_UI </span><span class="parameter">ui_file</span><br />
The interface file with the dialog resources. Change this if you have made your own customized UI.<br /> The interface file with the dialog resources. Change this if you have made your own customized UI.<br />
@ -216,13 +216,9 @@ will also help you to learn more about the Modern UI.</p>
</div> </div>
<p class="sub2header">Welcome/Finish Page Interface Settings</p> <p class="sub2header">Welcome/Finish Page Interface Settings</p>
<div class="margin"> <div class="margin">
<p class="text"><span class="bold">MUI_WELCOMEFINISHPAGE_3LINES </span><span class="parameter">ini_file</span><br /> <p class="text"><span class="bold">MUI_WELCOMEFINISHPAGE_3LINES</span><br />
Create a bigger area for the title on the Welcome- and Finish page, to allow displaying 3 lines of text Create a bigger area for the title on the Welcome- and Finish page, to allow displaying 3 lines of text
(with the default font). This setting has no effect when using a custom INI file.</p> (with the default font).</p>
<p class="text"><span class="bold">MUI_WELCOMEFINISHPAGE_INI </span><span class="parameter">ini_file</span><br />
InstallOptions INI file for the Welcome- and Finish page. You can create your own modified copy of
ioSpecial.ini or ioSpecial3.ini (for 3 lines title).<br />
<i>Default: ${NSISDIR}\Contrib\Modern UI\ioSpecial.ini</i></p>
<p class="text"><span class="bold">MUI_WELCOMEFINISHPAGE_BITMAP </span><span class="parameter">bmp_file</span><br /> <p class="text"><span class="bold">MUI_WELCOMEFINISHPAGE_BITMAP </span><span class="parameter">bmp_file</span><br />
Bitmap for the Welcome- and Finish page (recommended size: 164x314 pixels).<br /> Bitmap for the Welcome- and Finish page (recommended size: 164x314 pixels).<br />
<i>Default: ${NSISDIR}\Contrib\Graphics\Wizard\win.bmp</i></p> <i>Default: ${NSISDIR}\Contrib\Graphics\Wizard\win.bmp</i></p>
@ -234,15 +230,20 @@ will also help you to learn more about the Modern UI.</p>
if the user has a custom DPI setting.</p> if the user has a custom DPI setting.</p>
</div> </div>
</div> </div>
<p class="sub2header">Uninstaller Welcome/Finish Page Interface Settings</p> <p class="sub2header">Welcome/Finish Page InstallOptions INI Settings</p>
<div class="margin"> <div class="margin">
<p class="text"><span class="bold">MUI_UNWELCOMEFINISHPAGE_3LINES </span><span class="parameter">ini_file</span><br /> <p class="text"><span class="bold">MUI_WELCOMEFINISHPAGE_INI </span><span class="parameter">ini_file</span><br />
Create a bigger area for the title on the uninstaller Welcome- and Finish page, to allow displaying 3 lines of text InstallOptions INI file for the Welcome- and Finish page.<br />
(with the default font). This setting has no effect when using a custom INI file.</p>
<p class="text"><span class="bold">MUI_UNWELCOMEFINISHPAGE_INI </span><span class="parameter">ini_file</span><br />
InstallOptions INI file for the uninstaller Welcome- and Finish page. You can create your own modified copy of
ioSpecial.ini or ioSpecial3.ini (for 3 lines title).<br />
<i>Default: ${NSISDIR}\Contrib\Modern UI\ioSpecial.ini</i></p> <i>Default: ${NSISDIR}\Contrib\Modern UI\ioSpecial.ini</i></p>
<p class="text"><span class="bold">MUI_WELCOMEFINISHPAGE_INI_3LINES </span><span class="parameter">ini_file</span><br />
InstallOptions INI file for the Welcome- and Finish page with space for 3 lines of title text (with the default font).<br />
<i>Default: ${NSISDIR}\Contrib\Modern UI\ioSpecial3.ini</i></p>
</div>
<p class="sub2header">Uninstaller Welcome/Finish Page InstallOptions INI Settings</p>
<div class="margin">
<p class="text"><span class="bold">MUI_UNWELCOMEFINISHPAGE_3LINES</span><br />
Create a bigger area for the title on the uninstaller Welcome- and Finish page, to allow displaying 3 lines of text
(with the default font).</p>
<p class="text"><span class="bold">MUI_UNWELCOMEFINISHPAGE_BITMAP </span><span class="parameter">bmp_file</span><br /> <p class="text"><span class="bold">MUI_UNWELCOMEFINISHPAGE_BITMAP </span><span class="parameter">bmp_file</span><br />
Bitmap for the Welcome- and Finish page (recommended size: 164x314 pixels).<br /> Bitmap for the Welcome- and Finish page (recommended size: 164x314 pixels).<br />
<i>Default: ${NSISDIR}\Contrib\Graphics\Wizard\win.bmp</i></p> <i>Default: ${NSISDIR}\Contrib\Graphics\Wizard\win.bmp</i></p>
@ -254,6 +255,15 @@ will also help you to learn more about the Modern UI.</p>
if the user has a custom DPI setting.</p> if the user has a custom DPI setting.</p>
</div> </div>
</div> </div>
<p class="sub2header">Uninstaller Welcome/Finish Page Interface INI File Settings</p>
<div class="margin">
<p class="text"><span class="bold">MUI_UNWELCOMEFINISHPAGE_INI </span><span class="parameter">ini_file</span><br />
InstallOptions INI file for the uninstaller Welcome- and Finish page.<br />
<i>Default: ${NSISDIR}\Contrib\Modern UI\ioSpecial.ini</i></p>
<p class="text"><span class="bold">MUI_WELCOMEFINISHPAGE_INI_3LINES </span><span class="parameter">ini_file</span><br />
InstallOptions INI file for the Welcome- and Finish page with space for 3 lines of title text (with the default font).<br />
<i>Default: ${NSISDIR}\Contrib\Modern UI\ioSpecial3.ini</i></p>
</div>
<p class="sub2header">License Page Interface Settings</p> <p class="sub2header">License Page Interface Settings</p>
<div class="margin"> <div class="margin">
<p class="text"><span class="bold">MUI_LICENSEPAGE_BGCOLOR </span><span class="parameter"> <p class="text"><span class="bold">MUI_LICENSEPAGE_BGCOLOR </span><span class="parameter">

37
Contrib/Modern UI/System.nsh
View file

@ -80,19 +80,19 @@ Var MUI_TEMP2
!endif !endif
!ifndef MUI_WELCOMEFINISHPAGE_INI !ifndef MUI_WELCOMEFINISHPAGE_INI
!ifndef MUI_WELCOMEFINISHPAGE_3LINES !define MUI_WELCOMEFINISHPAGE_INI "${NSISDIR}\Contrib\Modern UI\ioSpecial.ini"
!define MUI_WELCOMEFINISHPAGE_INI "${NSISDIR}\Contrib\Modern UI\ioSpecial.ini" !endif
!else
!define MUI_WELCOMEFINISHPAGE_INI "${NSISDIR}\Contrib\Modern UI\ioSpecial3.ini" !ifndef MUI_WELCOMEFINISHPAGE_INI_3LINES
!endif !define MUI_WELCOMEFINISHPAGE_INI_3LINES "${NSISDIR}\Contrib\Modern UI\ioSpecial3.ini"
!endif !endif
!ifndef MUI_UNWELCOMEFINISHPAGE_INI !ifndef MUI_UNWELCOMEFINISHPAGE_INI
!ifndef MUI_UNWELCOMEFINISHPAGE_3LINES !define MUI_UNWELCOMEFINISHPAGE_INI "${NSISDIR}\Contrib\Modern UI\ioSpecial.ini"
!define MUI_UNWELCOMEFINISHPAGE_INI "${NSISDIR}\Contrib\Modern UI\ioSpecial.ini" !endif
!else
!define MUI_UNWELCOMEFINISHPAGE_INI "${NSISDIR}\Contrib\Modern UI\ioSpecial3.ini" !ifndef MUI_UNWELCOMEFINISHPAGE_INI_3LINES
!endif !define MUI_UNWELCOMEFINISHPAGE_INI_3LINES "${NSISDIR}\Contrib\Modern UI\ioSpecial3.ini"
!endif !endif
!ifndef MUI_WELCOMEFINISHPAGE_BITMAP !ifndef MUI_WELCOMEFINISHPAGE_BITMAP
@ -359,8 +359,12 @@ Var MUI_TEMP2
!macro MUI_WELCOMEFINISHPAGE_INIT !macro MUI_WELCOMEFINISHPAGE_INIT
!ifdef MUI_WELCOMEPAGE | MUI_FINISHPAGE !ifdef MUI_WELCOMEPAGE | MUI_FINISHPAGE
!insertmacro MUI_INSTALLOPTIONS_EXTRACT_AS "${MUI_WELCOMEFINISHPAGE_INI}" "ioSpecial.ini" !ifndef MUI_WELCOMEFINISHPAGE_3LINES
!insertmacro MUI_INSTALLOPTIONS_EXTRACT_AS "${MUI_WELCOMEFINISHPAGE_INI}" "ioSpecial.ini"
!else
!insertmacro MUI_INSTALLOPTIONS_EXTRACT_AS "${MUI_WELCOMEFINISHPAGE_INI_3LINES}" "ioSpecial.ini"
!endif
File "/oname=$PLUGINSDIR\modern-wizard.bmp" "${MUI_WELCOMEFINISHPAGE_BITMAP}" File "/oname=$PLUGINSDIR\modern-wizard.bmp" "${MUI_WELCOMEFINISHPAGE_BITMAP}"
!insertmacro MUI_INSTALLOPTIONS_WRITE "ioSpecial.ini" "Field 1" "Text" "$PLUGINSDIR\modern-wizard.bmp" !insertmacro MUI_INSTALLOPTIONS_WRITE "ioSpecial.ini" "Field 1" "Text" "$PLUGINSDIR\modern-wizard.bmp"
@ -377,7 +381,11 @@ Var MUI_TEMP2
!ifdef MUI_UNWELCOMEPAGE | UNMUI_FINISHPAGE !ifdef MUI_UNWELCOMEPAGE | UNMUI_FINISHPAGE
!insertmacro MUI_INSTALLOPTIONS_EXTRACT_AS "${MUI_UNWELCOMEFINISHPAGE_INI}" "ioSpecial.ini" !ifndef MUI_UNWELCOMEFINISHPAGE_3LINES
!insertmacro MUI_INSTALLOPTIONS_EXTRACT_AS "${MUI_UNWELCOMEFINISHPAGE_INI}" "ioSpecial.ini"
!else
!insertmacro MUI_INSTALLOPTIONS_EXTRACT_AS "${MUI_UNWELCOMEFINISHPAGE_INI_3LINES}" "ioSpecial.ini"
!endif
File "/oname=$PLUGINSDIR\modern-wizard.bmp" "${MUI_UNWELCOMEFINISHPAGE_BITMAP}" File "/oname=$PLUGINSDIR\modern-wizard.bmp" "${MUI_UNWELCOMEFINISHPAGE_BITMAP}"
!insertmacro MUI_INSTALLOPTIONS_WRITE "ioSpecial.ini" "Field 1" "Text" "$PLUGINSDIR\modern-wizard.bmp" !insertmacro MUI_INSTALLOPTIONS_WRITE "ioSpecial.ini" "Field 1" "Text" "$PLUGINSDIR\modern-wizard.bmp"
@ -1105,6 +1113,9 @@ Var MUI_TEMP2
Function "${PRE}" Function "${PRE}"
!insertmacro MUI_INSTALLOPTIONS_WRITE "ioSpecial.ini" "Settings" "NextButtonText" ""
!insertmacro MUI_INSTALLOPTIONS_WRITE "ioSpecial.ini" "Settings" "CancelEnabled" ""
!ifndef MUI_WELCOMEPAGE_TITLE !ifndef MUI_WELCOMEPAGE_TITLE
!insertmacro MUI_INSTALLOPTIONS_WRITE "ioSpecial.ini" "Field 2" "Text" "$(MUI_${MUI_PAGE_UNINSTALLER}TEXT_WELCOME_INFO_TITLE)" !insertmacro MUI_INSTALLOPTIONS_WRITE "ioSpecial.ini" "Field 2" "Text" "$(MUI_${MUI_PAGE_UNINSTALLER}TEXT_WELCOME_INFO_TITLE)"
!else !else