From 0b3ad0ceb9c9ee330eb9020ddd41303172e5d217 Mon Sep 17 00:00:00 2001 From: rubidium Date: Tue, 29 May 2007 19:01:38 +0000 Subject: (svn r9980) -Merge: Windows Installer changes in 0.5 (r9864). --- os/win32/installer/install.nsi | 35 ++++++++++++++++++++--------------- 1 file changed, 20 insertions(+), 15 deletions(-) (limited to 'os/win32/installer/install.nsi') diff --git a/os/win32/installer/install.nsi b/os/win32/installer/install.nsi index 15bbedafd..b0698d4be 100644 --- a/os/win32/installer/install.nsi +++ b/os/win32/installer/install.nsi @@ -81,6 +81,7 @@ Page custom ShowWarningsPage !define MUI_FINISHPAGE_NOREBOOTSUPPORT !define MUI_FINISHPAGE_SHOWREADME "$INSTDIR\readme.txt" !define MUI_FINISHPAGE_SHOWREADME_NOTCHECKED +!define MUI_WELCOMEFINISHPAGE_CUSTOMFUNCTION_INIT DisableBack !insertmacro MUI_PAGE_FINISH !insertmacro MUI_UNPAGE_CONFIRM @@ -355,26 +356,30 @@ NoCD: hasCD: FunctionEnd -;--------------------------------------------------------------------- -; Custom page function to show notices for running OpenTTD +;---------------------------------------------------------------------------------- +; Disable the "Back" button on finish page if the installer is run on Win9x systems +Function DisableBack + Call GetWindowsVersion + Pop $R0 + StrCmp $R0 "win9x" 0 WinNT + !insertmacro MUI_INSTALLOPTIONS_WRITE "ioSpecial.ini" "Settings" "BackEnabled" "0" +WinNT: + ClearErrors +FunctionEnd + +;---------------------------------------------------------------------------------- +; Custom page function to show notices for running OpenTTD (only for win32 systems) ; We have extracted this custom page as Notice in the .onInit function Function ShowWarningsPage + Call GetWindowsVersion + Pop $R0 + ; Don't show the UNICODE notice if the installer is run on Win9x systems + StrCmp $R0 "win9x" 0 WinNT + Abort +WinNT: !insertmacro MUI_HEADER_TEXT "Installation Complete" "Important notices for OpenTTD usage." !insertmacro MUI_INSTALLOPTIONS_EXTRACT_AS "notice.ini" "Notice" !insertmacro MUI_INSTALLOPTIONS_INITDIALOG "Notice" - - Call GetWindowsVersion - Pop $R0 - - ; Hide the MSLU text if the installer is not run on Win9x systems - StrCmp $R0 "winnt" 0 Win9x - !insertmacro MUI_INSTALLOPTIONS_READ $R1 "Notice" "Field 1" "HWND" ; MSLU groupbox - ShowWindow $R1 0 - !insertmacro MUI_INSTALLOPTIONS_READ $R1 "Notice" "Field 2" "HWND" ; MSLU text - ShowWindow $R1 0 - !insertmacro MUI_INSTALLOPTIONS_READ $R1 "Notice" "Field 3" "HWND" ; MSLU link - ShowWindow $R1 0 -Win9x: ClearErrors !insertmacro MUI_INSTALLOPTIONS_SHOW FunctionEnd -- cgit v1.2.3-70-g09d2