(svn r17186) -Change: remove UNICODE notice in windows installer
This commit is contained in:
		@@ -71,10 +71,6 @@ Page custom SelectCDEnter SelectCDExit ": TTD folder"
 | 
			
		||||
 | 
			
		||||
!insertmacro MUI_PAGE_INSTFILES
 | 
			
		||||
 | 
			
		||||
;-----------------------------------------------------
 | 
			
		||||
; New custom page to show UNICODE and MSLU information
 | 
			
		||||
Page custom ShowWarningsPage
 | 
			
		||||
 | 
			
		||||
!define MUI_FINISHPAGE_TITLE_3LINES
 | 
			
		||||
!define MUI_FINISHPAGE_RUN_TEXT "Run ${APPNAMEANDVERSION} now!"
 | 
			
		||||
!define MUI_FINISHPAGE_RUN "$INSTDIR\openttd.exe"
 | 
			
		||||
@@ -134,8 +130,6 @@ Section "!OpenTTD" Section1
 | 
			
		||||
	; Delete old files from the main dir. they are now placed in data/ and lang/
 | 
			
		||||
	Delete "$INSTDIR\*.lng"
 | 
			
		||||
	Delete "$INSTDIR\*.grf"
 | 
			
		||||
	Delete "$INSTDIR\*.obg"
 | 
			
		||||
	Delete "$INSTDIR\*.obs"
 | 
			
		||||
	Delete "$INSTDIR\sample.cat"
 | 
			
		||||
	Delete "$INSTDIR\ttd.exe"
 | 
			
		||||
 | 
			
		||||
@@ -376,23 +370,6 @@ 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"
 | 
			
		||||
	ClearErrors
 | 
			
		||||
	!insertmacro MUI_INSTALLOPTIONS_SHOW
 | 
			
		||||
FunctionEnd
 | 
			
		||||
 | 
			
		||||
;-------------------------------------------------------------------------------
 | 
			
		||||
; Determine windows version, returns "win9x" if Win9x/Me or "winnt" on the stack
 | 
			
		||||
Function GetWindowsVersion
 | 
			
		||||
 
 | 
			
		||||
@@ -1,30 +0,0 @@
 | 
			
		||||
; Ini file generated by the HM NIS Edit IO designer.
 | 
			
		||||
[Settings]
 | 
			
		||||
NumFields=3
 | 
			
		||||
CancelEnabled=0
 | 
			
		||||
 | 
			
		||||
[Field 1]
 | 
			
		||||
Type=Groupbox
 | 
			
		||||
Text=UNICODE support
 | 
			
		||||
Left=8
 | 
			
		||||
Right=292
 | 
			
		||||
Top=0
 | 
			
		||||
Bottom=75
 | 
			
		||||
 | 
			
		||||
[Field 2]
 | 
			
		||||
Type=Label
 | 
			
		||||
Text=This version of OpenTTD has support for UNICODE, allowing users to use non-ASCII character sets such as Russian or Japanese.\r\nSelecting such a language will result in an unusable and garbled interface. You will need to specify a font that has support for these characters in openttd.cfg, or alternatively use an appropiate grf file.\r\n\r\nFor more information please refer to the readme or the wiki.
 | 
			
		||||
Left=13
 | 
			
		||||
Right=284
 | 
			
		||||
Top=9
 | 
			
		||||
Bottom=65
 | 
			
		||||
 | 
			
		||||
[Field 3]
 | 
			
		||||
Type=Link
 | 
			
		||||
Text=OpenTTD wiki
 | 
			
		||||
Left=238
 | 
			
		||||
Right=284
 | 
			
		||||
Top=64
 | 
			
		||||
Bottom=72
 | 
			
		||||
State=http://wiki.openttd.org/index.php/Unicode
 | 
			
		||||
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user