From 1ab628e8ad6c85c8f1b562f10480253ee3e622b7 Mon Sep 17 00:00:00 2001 From: whiteshark0 Date: Fri, 11 Dec 2009 17:34:54 +0000 Subject: merged trunk into lua branch plugin loading is disabled atm because of a bug reading the files (lua may be the reason). Reading the files in usdx and passing the contents to lua may solve this git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/branches/experimental@2019 b956fd51-792f-4845-bead-9b4dfca2ff2c --- Lua/installer/settings/files_main_install.nsh | 15 +-- Lua/installer/settings/files_main_uninstall.nsh | 2 + Lua/installer/settings/functions.nsh | 124 +++++++++++++++++++++++- Lua/installer/settings/settings-1031.ini | 5 + Lua/installer/settings/settings-1033.ini | 5 + Lua/installer/settings/variables.nsh | 31 ++++-- 6 files changed, 166 insertions(+), 16 deletions(-) (limited to 'Lua/installer/settings') diff --git a/Lua/installer/settings/files_main_install.nsh b/Lua/installer/settings/files_main_install.nsh index 605725aa..c2cdf727 100644 --- a/Lua/installer/settings/files_main_install.nsh +++ b/Lua/installer/settings/files_main_install.nsh @@ -4,25 +4,26 @@ ; Create Directories: -CreateDirectory $INSTDIR\plugins -CreateDirectory $INSTDIR\songs -CreateDirectory $INSTDIR\screenshots -CreateDirectory $INSTDIR\playlists +CreateDirectory $INSTDIR\Plugins +CreateDirectory $INSTDIR\Songs +CreateDirectory $INSTDIR\Screenshots +CreateDirectory $INSTDIR\Playlists +CreateDirectory $INSTDIR\Covers SetOutPath "$INSTDIR" -; themes, languages, sounds, visuals dir +; themes, languages, sounds, fonts, visuals dir File /r ..\game\themes File /r ..\game\languages File /r ..\game\sounds +File /r ..\game\fonts File /r ..\installerdependencies\visuals ; Root dir: File ..\installerdependencies\dll\*.dll - File ..\ChangeLog.txt File ..\ChangeLog.german.txt File ..\README.txt @@ -34,7 +35,7 @@ File "..\${exe}.exe" ; Covers dir: -SetOutPath "$INSTDIR\covers" +SetOutPath "$INSTDIR\Covers" IfFileExists $INSTDIR\covers\covers.ini +2 0 File ..\game\covers\Covers.ini diff --git a/Lua/installer/settings/files_main_uninstall.nsh b/Lua/installer/settings/files_main_uninstall.nsh index b3d69da2..af61cb0b 100644 --- a/Lua/installer/settings/files_main_uninstall.nsh +++ b/Lua/installer/settings/files_main_uninstall.nsh @@ -18,6 +18,7 @@ RMDir /r "$INSTDIR\plugins" RMDir /r "$INSTDIR\themes" + RMDir /r "$INSTDIR\fonts" RMDir /r "$INSTDIR\languages" RMDir /r "$INSTDIR\visuals" RMDir /r "$INSTDIR\sounds" @@ -34,6 +35,7 @@ Delete "$INSTDIR\README.txt" Delete "$INSTDIR\Error.log" Delete "$INSTDIR\covers.cache" + Delete "$INSTDIR\cover.db" Delete "$INSTDIR\avcodec-51.dll" Delete "$INSTDIR\avformat-50.dll" diff --git a/Lua/installer/settings/functions.nsh b/Lua/installer/settings/functions.nsh index 8345c4cc..bbd4fea2 100644 --- a/Lua/installer/settings/functions.nsh +++ b/Lua/installer/settings/functions.nsh @@ -74,4 +74,126 @@ FunctionEnd !macro nsProcess::Unload nsProcess::_Unload -!macroend \ No newline at end of file +!macroend + +Function OnCheckbox + GetDlgItem $R0 $HWNDPARENT 1 + Pop $0 # HWND + ${NSD_GetState} $0 $1 + IntCmp $1 1 _Next _Close + _Next: + SendMessage $R0 ${WM_SETTEXT} 0 "STR:$(button_next)" + goto _done + _Close: + SendMessage $R0 ${WM_SETTEXT} 0 "STR:$(button_close)" + _done: +FunctionEnd + +Function VersionCompare + !define VersionCompare `!insertmacro VersionCompareCall` + + !macro VersionCompareCall _VER1 _VER2 _RESULT + Push `${_VER1}` + Push `${_VER2}` + Call VersionCompare + Pop ${_RESULT} + !macroend + + Exch $1 + Exch + Exch $0 + Exch + Push $2 + Push $3 + Push $4 + Push $5 + Push $6 + Push $7 + + begin: + StrCpy $2 -1 + IntOp $2 $2 + 1 + StrCpy $3 $0 1 $2 + StrCmp $3 '' +2 + StrCmp $3 '.' 0 -3 + StrCpy $4 $0 $2 + IntOp $2 $2 + 1 + StrCpy $0 $0 '' $2 + + StrCpy $2 -1 + IntOp $2 $2 + 1 + StrCpy $3 $1 1 $2 + StrCmp $3 '' +2 + StrCmp $3 '.' 0 -3 + StrCpy $5 $1 $2 + IntOp $2 $2 + 1 + StrCpy $1 $1 '' $2 + + StrCmp $4$5 '' equal + + StrCpy $6 -1 + IntOp $6 $6 + 1 + StrCpy $3 $4 1 $6 + StrCmp $3 '0' -2 + StrCmp $3 '' 0 +2 + StrCpy $4 0 + + StrCpy $7 -1 + IntOp $7 $7 + 1 + StrCpy $3 $5 1 $7 + StrCmp $3 '0' -2 + StrCmp $3 '' 0 +2 + StrCpy $5 0 + + StrCmp $4 0 0 +2 + StrCmp $5 0 begin newer2 + StrCmp $5 0 newer1 + IntCmp $6 $7 0 newer1 newer2 + + StrCpy $4 '1$4' + StrCpy $5 '1$5' + IntCmp $4 $5 begin newer2 newer1 + + equal: + StrCpy $0 0 + goto end + newer1: + StrCpy $0 1 + goto end + newer2: + StrCpy $0 2 + + end: + Pop $7 + Pop $6 + Pop $5 + Pop $4 + Pop $3 + Pop $2 + Pop $1 + Exch $0 +FunctionEnd + +Function ReadFileLine +Exch $0 ;file +Exch +Exch $1 ;line number +Push $2 +Push $3 + + FileOpen $2 $0 r + StrCpy $3 0 + +Loop: + IntOp $3 $3 + 1 + ClearErrors + FileRead $2 $0 + IfErrors +2 + StrCmp $3 $1 0 loop + FileClose $2 + +Pop $3 +Pop $2 +Pop $1 +Exch $0 +FunctionEnd \ No newline at end of file diff --git a/Lua/installer/settings/settings-1031.ini b/Lua/installer/settings/settings-1031.ini index 642f577e..9e588fcb 100644 --- a/Lua/installer/settings/settings-1031.ini +++ b/Lua/installer/settings/settings-1031.ini @@ -44,6 +44,7 @@ Bottom=132 [Field 6] Type=Droplist ListItems=On|Off +State=On Left=71 Right=161 Top=25 @@ -52,6 +53,7 @@ Bottom=38 [Field 7] Type=Droplist ListItems=Catalan|Croatian|Danish|Dutch|English|Euskara|French|German|Italian|Norwegian|Polish|Portuguese|Serbian|Slovak|Spanish|Swedish +State=German Left=71 Right=161 Top=48 @@ -60,6 +62,7 @@ Bottom=62 [Field 8] Type=Droplist ListItems=320x200|640x480|800x600|1024x768|1280x1024|1440x900|1680x1050|1920x1200 +State=800x600 Left=71 Right=161 Top=72 @@ -68,6 +71,7 @@ Bottom=86 [Field 9] Type=Droplist ListItems=On|Off +State=Off Left=71 Right=161 Top=96 @@ -76,6 +80,7 @@ Bottom=110 [Field 10] Type=Droplist ListItems=On|Off +State=On Left=71 Right=161 Top=121 diff --git a/Lua/installer/settings/settings-1033.ini b/Lua/installer/settings/settings-1033.ini index 2a3dfdba..17a08a8c 100644 --- a/Lua/installer/settings/settings-1033.ini +++ b/Lua/installer/settings/settings-1033.ini @@ -44,6 +44,7 @@ Bottom=132 [Field 6] Type=Droplist ListItems=On|Off +State=On Left=70 Right=160 Top=24 @@ -52,6 +53,7 @@ Bottom=36 [Field 7] Type=Droplist ListItems=Catalan|Croatian|Danish|Dutch|English|Euskara|French|German|Italian|Norwegian|Polish|Portuguese|Serbian|Slovak|Spanish|Swedish +State=English Left=70 Right=160 Top=48 @@ -60,6 +62,7 @@ Bottom=60 [Field 8] Type=Droplist ListItems=320x200|640x480|800x600|1024x768|1280x1024|1440x900|1680x1050|1920x1200 +State=800x600 Left=70 Right=160 Top=72 @@ -68,6 +71,7 @@ Bottom=86 [Field 9] Type=Droplist ListItems=On|Off +State=Off Left=70 Right=160 Top=99 @@ -76,6 +80,7 @@ Bottom=113 [Field 10] Type=Droplist ListItems=On|Off +State=On Left=70 Right=160 Top=123 diff --git a/Lua/installer/settings/variables.nsh b/Lua/installer/settings/variables.nsh index bf5668d7..db98d89f 100644 --- a/Lua/installer/settings/variables.nsh +++ b/Lua/installer/settings/variables.nsh @@ -14,7 +14,7 @@ !define exe "USdx" -!define license "license.txt" +!define license "..\installerdependencies\documents\license.txt" ; Icons @@ -38,10 +38,11 @@ ; Download URLs for Songs and Themes: -!define download_song1 "http://downloads.sourceforge.net/ultrastardx/usdx_song-dead_smiling_pirates_-_i_18.zip" -!define download_song2 "http://downloads.sourceforge.net/ultrastardx/usdx_song-joshua_morin_-_on_the_run.zip" -!define download_song3 "http://downloads.sourceforge.net/ultrastardx/usdx_song-pornophonique_-_space_-_invaders.zip" -!define download_song4 "http://downloads.sourceforge.net/ultrastardx/usdx_song-steven_dunston_-_northern_star.zip" +!define download_song2 "http://downloads.sourceforge.net/ultrastardx/usdx_song-dead_smiling_pirates_-_i_18.zip" +!define download_song3 "http://downloads.sourceforge.net/ultrastardx/usdx_song-joshua_morin_-_on_the_run.zip" +!define download_song4 "http://downloads.sourceforge.net/ultrastardx/usdx_song-pornophonique_-_space_-_invaders.zip" +!define download_song5 "http://downloads.sourceforge.net/ultrastardx/usdx_song-steven_dunston_-_northern_star.zip" +!define download_song1 "http://downloads.sourceforge.net/ultrastardx/usdx_song-bodo_wartke_-_liebeslied.zip" !define download_sub1_song1 "http://downloads.sourceforge.net/ultrastardx/usdx_song-jonathan_coulton_-_monkey_shines.zip" !define download_sub1_song2 "http://downloads.sourceforge.net/ultrastardx/usdx_song-jonathan_coulton_-_i_crush_everything.zip" @@ -68,9 +69,23 @@ !define download_sub1_song23 "http://downloads.sourceforge.net/ultrastardx/usdx_song-jonathan_coulton_-_skullcrusher_mountain.zip" !define download_sub1_song24 "http://downloads.sourceforge.net/ultrastardx/usdx_song-jonathan_coulton_-_chiron_beta_prime.zip" +!define download_sub2_song1 "http://downloads.sourceforge.net/ultrastardx/usdx_song-shearer_-_69.zip" +!define download_sub2_song2 "http://downloads.sourceforge.net/ultrastardx/usdx_song-shearer_-_69_kar.zip" +!define download_sub2_song3 "http://downloads.sourceforge.net/ultrastardx/usdx_song-shearer_-_cant_stop_it.zip" +!define download_sub2_song4 "http://downloads.sourceforge.net/ultrastardx/usdx_song-shearer_-_cant_stop_it_kar.zip" +!define download_sub2_song5 "http://downloads.sourceforge.net/ultrastardx/usdx_song-shearer_-_in_my_hand.zip" +!define download_sub2_song6 "http://downloads.sourceforge.net/ultrastardx/usdx_song-shearer_-_man_song.zip" +!define download_sub2_song7 "http://downloads.sourceforge.net/ultrastardx/usdx_song-shearer_-_man_song_kar.zip" +!define download_sub2_song8 "http://downloads.sourceforge.net/ultrastardx/usdx_song-shearer_-_stay_with_me.zip" +!define download_sub2_song9 "http://downloads.sourceforge.net/ultrastardx/usdx_song-shearer_-_stay_with_me_kar.zip" + +!define download_sub3_song1 "http://downloads.sourceforge.net/ultrastardx/usdx_song-wise_guys_-_lebendig_und_kraeftig_und_schaerfer.zip" +!define download_sub3_song2 "http://downloads.sourceforge.net/ultrastardx/usdx_song-wise_guys_-_mensch_wo_bist_du.zip" + !define download_theme1 "http://downloads.sourceforge.net/ultrastardx/usdx_skin-orange_by_Skar.zip" !define download_theme2 "http://downloads.sourceforge.net/ultrastardx/usdx_skin-Streetlight_by_Skar.zip" !define download_theme3 "http://downloads.sourceforge.net/ultrastardx/usdx_skin-Vistar_by_Skar.zip" -!define download_theme4 "http://downloads.sourceforge.net/ultrastardx/usdx_skin-bluesensationV5_by_Charis.zip" -!define download_theme5 "http://downloads.sourceforge.net/ultrastardx/usdx_skin-WiiStar_by_MasterPhW.zip" -!define download_theme6 "http://downloads.sourceforge.net/ultrastardx/usdx_skin-istar_by_MezzoX.zip" \ No newline at end of file +!define download_theme4 "http://downloads.sourceforge.net/ultrastardx/usdx_skin-bluesensationV5.1_by_Charis.zip" +!define download_theme6 "http://downloads.sourceforge.net/ultrastardx/usdx_skin-WiiStar_by_MasterPhW.zip" +!define download_theme7 "http://downloads.sourceforge.net/ultrastardx/usdx_skin-istar_by_MezzoX.zip" +!define download_theme5 "http://downloads.sourceforge.net/ultrastardx/usdx_skin-whitesensationV101_by_Charis.zip" \ No newline at end of file -- cgit v1.2.3