git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@3476 212acab6-be3b-0410-9dea-997c60f758d6
This commit is contained in:
joostverburg 2004-02-06 23:17:43 +00:00
parent b804b8c403
commit 32589a1d28
13 changed files with 63 additions and 58 deletions

View file

@ -4,10 +4,10 @@
!define VER_MAJOR 2 !define VER_MAJOR 2
!define VER_MINOR 0 !define VER_MINOR 0
!define VER_REVISION 0 !define VER_REVISION 0
!define VER_BUILD 17 !define VER_BUILD 18
!define VER_FILE "20rc4" !define VER_FILE "20"
!define VER_DISPLAY "2.0 release candidate 4" !define VER_DISPLAY "2.0"
;-------------------------------- ;--------------------------------
;Compile CVS Data Setup ;Compile CVS Data Setup
@ -47,12 +47,13 @@ Caption "NSIS ${VER_DISPLAY} Setup"
!define MUI_ABORTWARNING !define MUI_ABORTWARNING
!define MUI_HEADERIMAGE !define MUI_HEADERIMAGE
!define MUI_SPECIALBITMAP "${NSISDIR}\Contrib\Graphics\Wizard\nullsoft.bmp" !define MUI_WELCOMEFINISHPAGE_BITMAP "${NSISDIR}\Contrib\Graphics\Wizard\nsis.bmp"
!define MUI_COMPONENTSPAGE_SMALLDESC !define MUI_COMPONENTSPAGE_SMALLDESC
;Pages ;Pages
!define MUI_WELCOMEPAGE_TEXT "This wizard will guide you through the installation of NSIS (Nullsoft Scriptable Install System), the Windows installer/uninstaller system that doesn't suck and isn't huge.\r\n\r\n\r\n$_CLICK" !define MUI_WELCOMEPAGE_TITLE "Welcome to the NSIS ${VER_DISPLAY} Setup Wizard"
!define MUI_WELCOMEPAGE_TEXT "This wizard will guide you through the installation of NSIS (Nullsoft Scriptable Install System) ${VER_DISPLAY}, the next generation of the Windows installer and uninstaller system that doesn't suck and isn't huge.\r\n\r\nNSIS 2 includes a new Modern User Interface, LZMA compression, support for multiple languages and an easy plug-in system.\r\n\r\n$_CLICK"
!insertmacro MUI_PAGE_WELCOME !insertmacro MUI_PAGE_WELCOME
!insertmacro MUI_PAGE_LICENSE "..\license.txt" !insertmacro MUI_PAGE_LICENSE "..\license.txt"
@ -251,13 +252,17 @@ Section "Modern User Interface" SecInterfacesModernUI
SetOutPath "$INSTDIR\Contrib\Modern UI" SetOutPath "$INSTDIR\Contrib\Modern UI"
File "..\Contrib\Modern UI\System.nsh" File "..\Contrib\Modern UI\System.nsh"
File "..\Contrib\Modern UI\Readme.gif"
File "..\Contrib\Modern UI\Readme.html" File "..\Contrib\Modern UI\Readme.html"
File "..\Contrib\Modern UI\Changelog.txt" File "..\Contrib\Modern UI\Changelog.txt"
File "..\Contrib\Modern UI\Screenshot.png"
File "..\Contrib\Modern UI\Screenshot2.png"
File "..\Contrib\Modern UI\License.txt" File "..\Contrib\Modern UI\License.txt"
File "..\Contrib\Modern UI\ioSpecial.ini" File "..\Contrib\Modern UI\ioSpecial.ini"
SetOutPath "$INSTDIR\Contrib\Modern UI\images"
File "..\Contrib\Modern UI\images\header.gif"
File "..\Contrib\Modern UI\images\screen1.png"
File "..\Contrib\Modern UI\images\screen2.png"
File "..\Contrib\Modern UI\images\open.gif"
File "..\Contrib\Modern UI\images\closed.gif"
SetOutPath $INSTDIR\Contrib\UIs SetOutPath $INSTDIR\Contrib\UIs
File "..\Contrib\UIs\modern.exe" File "..\Contrib\UIs\modern.exe"

View file

@ -4,18 +4,18 @@
<table border="0"> <table border="0">
<tr> <tr>
<td width="170"> <td width="170">
<p><a href="index.html"><img src="images/arrow.gif" width="30" height="18"><font size="+1" color="#0C6E97"><b>Quick Launch</b></font></a></p> <p><a href="index.html"><img src="images/menu.gif" width="30" height="18"><font size="+1" color="#0C6E97"><b>Quick Launch</b></font></a></p>
<p><a href="intro.html"><img src="images/arrow.gif" width="30" height="18"><font size="+1" color="#0C6E97"><b>Introduction</b></font></a></p> <p><a href="intro.html"><img src="images/menu.gif" width="30" height="18"><font size="+1" color="#0C6E97"><b>Introduction</b></font></a></p>
<p><a href="#"><img src="images/arrowd.gif" width="30" height="18"><font size="+1" color="#808080"><b>Compiler</b></font></a></p> <p><a href="#"><img src="images/menud.gif" width="30" height="18"><font size="+1" color="#808080"><b>Compiler</b></font></a></p>
<p><a href="docs.html"><img src="images/arrow.gif" width="30" height="18"><font size="+1" color="#0C6E97"><b>Documentation</b></font></a></p> <p><a href="docs.html"><img src="images/menu.gif" width="30" height="18"><font size="+1" color="#0C6E97"><b>Documentation</b></font></a></p>
<p><a href="update.html"><img src="images/arrow.gif" width="30" height="18"><font size="+1" color="#0C6E97"><b>Update</b></font></a></p> <p><a href="update.html"><img src="images/menu.gif" width="30" height="18"><font size="+1" color="#0C6E97"><b>Update</b></font></a></p>
<p><a href="websites.html"><img src="images/arrow.gif" width="30" height="18"><font size="+1" color="#0C6E97"><b>Websites</b></font></a></p> <p><a href="websites.html"><img src="images/menu.gif" width="30" height="18"><font size="+1" color="#0C6E97"><b>Websites</b></font></a></p>
</td> </td>
<td width="418" height="100" valign="top"> <td width="418" height="100" valign="top">
<p><font size="+1" color="#0C6E97"><b>Compiler</b></font></p> <p><font size="+1" color="#0C6E97"><b>Compiler</b></font></p>
<p>The makensis compiler can compile NSIS scripts to create installer <p>The makensis compiler can compile NSIS scripts to create installer
executables.<br>MakeNSISW is a graphical interface for this compiler.</p> executables.<br>MakeNSISW is a graphical interface for this compiler.</p>
<p>To compile a script, right click on a script file in explorer and <p>To compile a script, right click on a script file in explorer and
choose 'Compile NSIS Script'. choose 'Compile NSIS Script'.
The compiler will be started in the MakeNSISW interface.</p> The compiler will be started in the MakeNSISW interface.</p>
<p>You can also start MakeNSISW and open the script using the File menu <p>You can also start MakeNSISW and open the script using the File menu
@ -25,6 +25,6 @@
</tr> </tr>
</table> </table>
<p><img src="images/line.gif" width="598" height="3"></p> <p><img src="images/line.gif" width="598" height="3"></p>
<div align="right"><img src="images/version.gif" width="225" height="25"></div> <div align="right"><img src="images/site.gif" width="200" height="25"></div>
</body> </body>
</html> </html>

View file

@ -4,12 +4,12 @@
<table border="0"> <table border="0">
<tr> <tr>
<td width="170"> <td width="170">
<p><a href="index.html"><img src="images/arrow.gif" width="30" height="18"><font size="+1" color="#0C6E97"><b>Quick Launch</b></font></a></p> <p><a href="index.html"><img src="images/menu.gif" width="30" height="18"><font size="+1" color="#0C6E97"><b>Quick Launch</b></font></a></p>
<p><a href="intro.html"><img src="images/arrow.gif" width="30" height="18"><font size="+1" color="#0C6E97"><b>Introduction</b></font></a></p> <p><a href="intro.html"><img src="images/menu.gif" width="30" height="18"><font size="+1" color="#0C6E97"><b>Introduction</b></font></a></p>
<p><a href="compiler.html"><img src="images/arrow.gif" width="30" height="18"><font size="+1" color="#0C6E97"><b>Compiler</b></font></a></p> <p><a href="compiler.html"><img src="images/menu.gif" width="30" height="18"><font size="+1" color="#0C6E97"><b>Compiler</b></font></a></p>
<p><a href="#"><img src="images/arrowd.gif" width="30" height="18"><font size="+1" color="#808080"><b>Documentation</b></font></a></p> <p><a href="#"><img src="images/menud.gif" width="30" height="18"><font size="+1" color="#808080"><b>Documentation</b></font></a></p>
<p><a href="update.html"><img src="images/arrow.gif" width="30" height="18"><font size="+1" color="#0C6E97"><b>Update</b></font></a></p> <p><a href="update.html"><img src="images/menu.gif" width="30" height="18"><font size="+1" color="#0C6E97"><b>Update</b></font></a></p>
<p><a href="websites.html"><img src="images/arrow.gif" width="30" height="18"><font size="+1" color="#0C6E97"><b>Websites</b></font></a></p> <p><a href="websites.html"><img src="images/menu.gif" width="30" height="18"><font size="+1" color="#0C6E97"><b>Websites</b></font></a></p>
</td> </td>
<td width="418" valign="top"> <td width="418" valign="top">
<p><font size="+1" color="#0C6E97"><b>Documentation</b></font></p> <p><font size="+1" color="#0C6E97"><b>Documentation</b></font></p>
@ -30,6 +30,6 @@
</tr> </tr>
</table> </table>
<p><img src="images/line.gif" width="598" height="3"></p> <p><img src="images/line.gif" width="598" height="3"></p>
<div align="right"><img src="images/version.gif" width="225" height="25"></div> <div align="right"><img src="images/site.gif" width="200" height="25"></div>
</body> </body>
</html> </html>

Binary file not shown.

Before

Width:  |  Height:  |  Size: 6.4 KiB

After

Width:  |  Height:  |  Size: 6.5 KiB

Before After
Before After

View file

Before

Width:  |  Height:  |  Size: 189 B

After

Width:  |  Height:  |  Size: 189 B

Before After
Before After

View file

Before

Width:  |  Height:  |  Size: 189 B

After

Width:  |  Height:  |  Size: 189 B

Before After
Before After

BIN
Menu/images/site.gif Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 822 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 904 B

View file

@ -5,12 +5,12 @@
<tr> <tr>
<td width="170"> <td width="170">
<p><img src="images/clear.gif" width="170" height="3"> <p><img src="images/clear.gif" width="170" height="3">
<a href="#"><img src="images/arrowd.gif" width="30" height="18"><font size="+1" color="#808080"><b>Quick Launch</b></font></a></p> <a href="#"><img src="images/menud.gif" width="30" height="18"><font size="+1" color="#808080"><b>Quick Launch</b></font></a></p>
<p><a href="intro.html"><img src="images/arrow.gif" width="30" height="18"><font size="+1" color="#0C6E97"><b>Introduction</b></font></a></p> <p><a href="intro.html"><img src="images/menu.gif" width="30" height="18"><font size="+1" color="#0C6E97"><b>Introduction</b></font></a></p>
<p><a href="compiler.html"><img src="images/arrow.gif" width="30" height="18"><font size="+1" color="#0C6E97"><b>Compiler</b></font></a></p> <p><a href="compiler.html"><img src="images/menu.gif" width="30" height="18"><font size="+1" color="#0C6E97"><b>Compiler</b></font></a></p>
<p><a href="docs.html"><img src="images/arrow.gif" width="30" height="18"><font size="+1" color="#0C6E97"><b>Documentation</b></font></a></p> <p><a href="docs.html"><img src="images/menu.gif" width="30" height="18"><font size="+1" color="#0C6E97"><b>Documentation</b></font></a></p>
<p><a href="update.html"><img src="images/arrow.gif" width="30" height="18"><font size="+1" color="#0C6E97"><b>Update</b></font></a></p> <p><a href="update.html"><img src="images/menu.gif" width="30" height="18"><font size="+1" color="#0C6E97"><b>Update</b></font></a></p>
<p><a href="websites.html"><img src="images/arrow.gif" width="30" height="18"><font size="+1" color="#0C6E97"><b>Websites</b></font></a></p> <p><a href="websites.html"><img src="images/menu.gif" width="30" height="18"><font size="+1" color="#0C6E97"><b>Websites</b></font></a></p>
</td> </td>
<td width="418" valign="top"> <td width="418" valign="top">
<table> <table>
@ -46,6 +46,6 @@
</table> </table>
<p><img src="images/clear.gif" width="598" height="3"> <p><img src="images/clear.gif" width="598" height="3">
<img src="images/line.gif" width="598" height="3"></p> <img src="images/line.gif" width="598" height="3"></p>
<div align="right"><img src="images/version.gif" width="225" height="25"></div> <div align="right"><img src="images/site.gif" width="200" height="25"></div>
</body> </body>
</html> </html>

View file

@ -4,12 +4,12 @@
<table border="0"> <table border="0">
<tr> <tr>
<td width="170"> <td width="170">
<p><a href="index.html"><img src="images/arrow.gif" width="30" height="18"><font size="+1" color="#0C6E97"><b>Quick Launch</b></font></a></p> <p><a href="index.html"><img src="images/menu.gif" width="30" height="18"><font size="+1" color="#0C6E97"><b>Quick Launch</b></font></a></p>
<p><a href="#"><img src="images/arrowd.gif" width="30" height="18"><font size="+1" color="#808080"><b>Introduction</b></font></a></p> <p><a href="#"><img src="images/menud.gif" width="30" height="18"><font size="+1" color="#808080"><b>Introduction</b></font></a></p>
<p><a href="compiler.html"><img src="images/arrow.gif" width="30" height="18"><font size="+1" color="#0C6E97"><b>Compiler</b></font></a></p> <p><a href="compiler.html"><img src="images/menu.gif" width="30" height="18"><font size="+1" color="#0C6E97"><b>Compiler</b></font></a></p>
<p><a href="docs.html"><img src="images/arrow.gif" width="30" height="18"><font size="+1" color="#0C6E97"><b>Documentation</b></font></a></p> <p><a href="docs.html"><img src="images/menu.gif" width="30" height="18"><font size="+1" color="#0C6E97"><b>Documentation</b></font></a></p>
<p><a href="update.html"><img src="images/arrow.gif" width="30" height="18"><font size="+1" color="#0C6E97"><b>Update</b></font></a></p> <p><a href="update.html"><img src="images/menu.gif" width="30" height="18"><font size="+1" color="#0C6E97"><b>Update</b></font></a></p>
<p><a href="websites.html"><img src="images/arrow.gif" width="30" height="18"><font size="+1" color="#0C6E97"><b>Websites</b></font></a></p> <p><a href="websites.html"><img src="images/menu.gif" width="30" height="18"><font size="+1" color="#0C6E97"><b>Websites</b></font></a></p>
</td> </td>
<td width="418" valign="top"> <td width="418" valign="top">
<p><font size="+1" color="#0C6E97"><b>Introduction</b></font></p> <p><font size="+1" color="#0C6E97"><b>Introduction</b></font></p>
@ -27,6 +27,6 @@
</tr> </tr>
</table> </table>
<p><img src="images/line.gif" width="598" height="3"></p> <p><img src="images/line.gif" width="598" height="3"></p>
<div align="right"><img src="images/version.gif" width="225" height="25"></div> <div align="right"><img src="images/site.gif" width="200" height="25"></div>
</body> </body>
</html> </html>

View file

@ -4,12 +4,12 @@
<table border="0"> <table border="0">
<tr> <tr>
<td width="170"> <td width="170">
<p><a href="index.html"><img src="images/arrow.gif" width="30" height="18"><font size="+1" color="#0C6E97"><b>Quick Launch</b></font></a></p> <p><a href="index.html"><img src="images/menu.gif" width="30" height="18"><font size="+1" color="#0C6E97"><b>Quick Launch</b></font></a></p>
<p><a href="intro.html"><img src="images/arrow.gif" width="30" height="18"><font size="+1" color="#0C6E97"><b>Introduction</b></font></a></p> <p><a href="intro.html"><img src="images/menu.gif" width="30" height="18"><font size="+1" color="#0C6E97"><b>Introduction</b></font></a></p>
<p><a href="compiler.html"><img src="images/arrow.gif" width="30" height="18"><font size="+1" color="#0C6E97"><b>Compiler</b></font></a></p> <p><a href="compiler.html"><img src="images/menu.gif" width="30" height="18"><font size="+1" color="#0C6E97"><b>Compiler</b></font></a></p>
<p><a href="docs.html"><img src="images/arrow.gif" width="30" height="18"><font size="+1" color="#0C6E97"><b>Documentation</b></font></a></p> <p><a href="docs.html"><img src="images/menu.gif" width="30" height="18"><font size="+1" color="#0C6E97"><b>Documentation</b></font></a></p>
<p><a href="update.html"><img src="images/arrow.gif" width="30" height="18"><font size="+1" color="#0C6E97"><b>Update</b></font></a></p> <p><a href="update.html"><img src="images/menu.gif" width="30" height="18"><font size="+1" color="#0C6E97"><b>Update</b></font></a></p>
<p><a href="websites.html"><img src="images/arrow.gif" width="30" height="18"><font size="+1" color="#0C6E97"><b>Websites</b></font></a></p> <p><a href="websites.html"><img src="images/menu.gif" width="30" height="18"><font size="+1" color="#0C6E97"><b>Websites</b></font></a></p>
</td> </td>
<td width="418" valign="top"> <td width="418" valign="top">
<p><font size="+1" color="#0C6E97"><b>Feature not installed</b></font></p> <p><font size="+1" color="#0C6E97"><b>Feature not installed</b></font></p>
@ -21,6 +21,6 @@
</tr> </tr>
</table> </table>
<p><img src="images/line.gif" width="598" height="3"></p> <p><img src="images/line.gif" width="598" height="3"></p>
<div align="right"><img src="images/version.gif" width="225" height="25"></div> <div align="right"><img src="images/site.gif" width="200" height="25"></div>
</body> </body>
</html> </html>

View file

@ -4,12 +4,12 @@
<table border="0"> <table border="0">
<tr> <tr>
<td width="170"> <td width="170">
<p><a href="index.html"><img src="images/arrow.gif" width="30" height="18"><font size="+1" color="#0C6E97"><b>Quick Launch</b></font></a></p> <p><a href="index.html"><img src="images/menu.gif" width="30" height="18"><font size="+1" color="#0C6E97"><b>Quick Launch</b></font></a></p>
<p><a href="intro.html"><img src="images/arrow.gif" width="30" height="18"><font size="+1" color="#0C6E97"><b>Introduction</b></font></a></p> <p><a href="intro.html"><img src="images/menu.gif" width="30" height="18"><font size="+1" color="#0C6E97"><b>Introduction</b></font></a></p>
<p><a href="compiler.html"><img src="images/arrow.gif" width="30" height="18"><font size="+1" color="#0C6E97"><b>Compiler</b></font></a></p> <p><a href="compiler.html"><img src="images/menu.gif" width="30" height="18"><font size="+1" color="#0C6E97"><b>Compiler</b></font></a></p>
<p><a href="docs.html"><img src="images/arrow.gif" width="30" height="18"><font size="+1" color="#0C6E97"><b>Documentation</b></font></a></p> <p><a href="docs.html"><img src="images/menu.gif" width="30" height="18"><font size="+1" color="#0C6E97"><b>Documentation</b></font></a></p>
<p><a href="#"><img src="images/arrowd.gif" width="30" height="18"><font size="+1" color="#808080"><b>Update</b></font></a></p> <p><a href="#"><img src="images/menud.gif" width="30" height="18"><font size="+1" color="#808080"><b>Update</b></font></a></p>
<p><a href="websites.html"><img src="images/arrow.gif" width="30" height="18"><font size="+1" color="#0C6E97"><b>Websites</b></font></a></p> <p><a href="websites.html"><img src="images/menu.gif" width="30" height="18"><font size="+1" color="#0C6E97"><b>Websites</b></font></a></p>
</td> </td>
<td width="418" valign="top"> <td width="418" valign="top">
<p><font size="+1" color="#0C6E97"><b>Update</b></font></p> <p><font size="+1" color="#0C6E97"><b>Update</b></font></p>
@ -27,6 +27,6 @@
</tr> </tr>
</table> </table>
<p><img src="images/line.gif" width="598" height="3"></p> <p><img src="images/line.gif" width="598" height="3"></p>
<div align="right"><img src="images/version.gif" width="225" height="25"></div> <div align="right"><img src="images/site.gif" width="200" height="25"></div>
</body> </body>
</html> </html>

View file

@ -4,12 +4,12 @@
<table border="0"> <table border="0">
<tr> <tr>
<td width="170"> <td width="170">
<p><a href="index.html"><img src="images/arrow.gif" width="30" height="18"><font size="+1" color="#0C6E97"><b>Quick Launch</b></font></a></p> <p><a href="index.html"><img src="images/menu.gif" width="30" height="18"><font size="+1" color="#0C6E97"><b>Quick Launch</b></font></a></p>
<p><a href="intro.html"><img src="images/arrow.gif" width="30" height="18"><font size="+1" color="#0C6E97"><b>Introduction</b></font></a></p> <p><a href="intro.html"><img src="images/menu.gif" width="30" height="18"><font size="+1" color="#0C6E97"><b>Introduction</b></font></a></p>
<p><a href="compiler.html"><img src="images/arrow.gif" width="30" height="18"><font size="+1" color="#0C6E97"><b>Compiler</b></font></a></p> <p><a href="compiler.html"><img src="images/menu.gif" width="30" height="18"><font size="+1" color="#0C6E97"><b>Compiler</b></font></a></p>
<p><a href="docs.html"><img src="images/arrow.gif" width="30" height="18"><font size="+1" color="#0C6E97"><b>Documentation</b></font></a></p> <p><a href="docs.html"><img src="images/menu.gif" width="30" height="18"><font size="+1" color="#0C6E97"><b>Documentation</b></font></a></p>
<p><a href="update.html"><img src="images/arrow.gif" width="30" height="18"><font size="+1" color="#0C6E97"><b>Update</b></font></a></p> <p><a href="update.html"><img src="images/menu.gif" width="30" height="18"><font size="+1" color="#0C6E97"><b>Update</b></font></a></p>
<p><a href="#"><img src="images/arrowd.gif" width="30" height="18"><font size="+1" color="#808080"><b>Websites</b></font></a></p> <p><a href="#"><img src="images/menud.gif" width="30" height="18"><font size="+1" color="#808080"><b>Websites</b></font></a></p>
</td> </td>
<td width="418" valign="top"> <td width="418" valign="top">
<p><font size="+1" color="#0C6E97"><b>Websites</b></font></p> <p><font size="+1" color="#0C6E97"><b>Websites</b></font></p>
@ -28,6 +28,6 @@
</tr> </tr>
</table> </table>
<p><img src="images/line.gif" width="598" height="3"></p> <p><img src="images/line.gif" width="598" height="3"></p>
<div align="right"><img src="images/version.gif" width="225" height="25"></div> <div align="right"><img src="images/site.gif" width="200" height="25"></div>
</body> </body>
</html> </html>