From 392718a615f10c62e710eca46a095cb37928fe1b Mon Sep 17 00:00:00 2001 From: canni0 Date: Tue, 30 Sep 2008 10:33:47 +0000 Subject: - New installer source for v.1.1 - Added new demo song git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@1427 b956fd51-792f-4845-bead-9b4dfca2ff2c --- installer/settings/GameExplorer.nsh | 198 ++++++++++++++++++++++++++++ installer/settings/files_main_install.nsh | 4 + installer/settings/files_main_uninstall.nsh | 4 + installer/settings/files_opt_uninstall.nsh | 4 + installer/settings/functions.nsh | 79 +++++++++++ installer/settings/variables.nsh | 46 +++++++ 6 files changed, 335 insertions(+) create mode 100644 installer/settings/GameExplorer.nsh create mode 100644 installer/settings/files_main_install.nsh create mode 100644 installer/settings/files_main_uninstall.nsh create mode 100644 installer/settings/files_opt_uninstall.nsh create mode 100644 installer/settings/functions.nsh create mode 100644 installer/settings/variables.nsh (limited to 'installer/settings') diff --git a/installer/settings/GameExplorer.nsh b/installer/settings/GameExplorer.nsh new file mode 100644 index 00000000..d5056661 --- /dev/null +++ b/installer/settings/GameExplorer.nsh @@ -0,0 +1,198 @@ +# user interface + +!define GameExplorer_GenerateGUID '!insertmacro GameExplorer_GenerateGUID' +!define GameExplorer_AddGame '!insertmacro GameExplorer_AddGame' +!define GameExplorer_UpdateGame '!insertmacro GameExplorer_UpdateGame' +!define GameExplorer_RemoveGame '!insertmacro GameExplorer_RemoveGame' + +# internal stuff + +!define CLSCTX_INPROC_SERVER 1 +!define IID_IGameExplorer {E7B2FB72-D728-49B3-A5F2-18EBF5F1349E} +!define CLSID_GameExplorer {9A5EA990-3034-4D6F-9128-01F3C61022BC} + +!define GIS_CURRENT_USER 2 +!define GIS_ALL_USERS 3 + +!define IGameExplorer_QueryInterface 0 +!define IGameExplorer_AddRef 1 +!define IGameExplorer_Release 2 +!define IGameExplorer_AddGame 3 +!define IGameExplorer_RemoveGame 4 +!define IGameExplorer_UpdateGame 5 +!define IGameExplorer_VerifyAccess 6 + +# includes + +!include LogicLib.nsh + +# the actual code + +!macro GameExplorer_GenerateGUID + + System::Call 'ole32::CoCreateGuid(g .s)' + +!macroend + +!macro GameExplorer_AddGame CONTEXT GDF INSTDIR EXE GUID + + !define __GAME_EXPLORER_UNIQUE "${__LINE__}${__FILE__}" + + Push $0 + Push $1 + + Push $R0 + Push $R1 + Push $R2 + Push $R3 + + Push "${EXE}" + Push "${GUID}" + Push "${INSTDIR}" + Push "${GDF}" + + Pop $R0 # == ${GDF} + Pop $R1 # == ${INSTDIR} + Pop $R2 # == ${GUID} + Pop $R3 # == ${EXE} + + ClearErrors + + System::Call "ole32::CoCreateInstance( \ + g '${CLSID_GameExplorer}', i 0, \ + i ${CLSCTX_INPROC_SERVER}, \ + g '${IID_IGameExplorer}', *i .r1) i .r0" + + ${If} $0 != 0 # S_OK + + SetErrors + Goto "done_${__GAME_EXPLORER_UNIQUE}" + + ${EndIf} + + !if ${CONTEXT} == all + + System::Call "$1->${IGameExplorer_AddGame}(w R0, w R1, i ${GIS_ALL_USERS}, g R2) i .r0" + + !else if ${CONTEXT} == user + + System::Call "$1->${IGameExplorer_AddGame}(w R1, w R0, i ${GIS_CURRENT_USER}, g R2) i .r0" + + !else + + !error "Invalid CONTEXT passed to GameExplorer_AddGame! Must be `user` or `all`." + + !endif + + ${If} $0 != 0 # S_OK + + SetErrors + + ${Else} + + # Create play task + + !if ${CONTEXT} == all + + SetShellVarContext all + + !else if if ${CONTEXT} == user + + SetShellVarContext user + + !endif + + CreateDirectory $APPDATA\Microsoft\Windows\GameExplorer\$R2\PlayTasks\0 + CreateShortcut $APPDATA\Microsoft\Windows\GameExplorer\$R2\PlayTasks\0\Play.lnk $R3 + + ${EndIf} + + System::Call "$1->${IGameExplorer_Release}()" + + "done_${__GAME_EXPLORER_UNIQUE}:" + + Pop $R3 + Pop $R2 + Pop $R1 + Pop $R0 + + Pop $1 + Pop $0 + + !undef __GAME_EXPLORER_UNIQUE + +!macroend + +!macro _GameExplorer_GUID_Function Function GUID + + !define __GAME_EXPLORER_UNIQUE "${__LINE__}${__FILE__}" + + Push $0 + Push $1 + Push $2 + Push $3 + Push $4 + Push $5 + + Push $R0 + + Push "${GUID}" + + Pop $R0 # == ${GUID} + + System::Alloc 16 + Exch $R0 + System::Call "ole32::CLSIDFromString(w s, i R0)" + System::Call "*$R0(i .r2, i .r3, i .r4, i .r5)" + System::Free $R0 + + ClearErrors + + System::Call "ole32::CoCreateInstance( \ + g '${CLSID_GameExplorer}', i 0, \ + i ${CLSCTX_INPROC_SERVER}, \ + g '${IID_IGameExplorer}', *i .r1) i .r0" + + ${If} $0 != 0 # S_OK + + SetErrors + Goto "done_${__GAME_EXPLORER_UNIQUE}" + + ${EndIf} + + System::Call "$1->${Function}(i r2, i r3, i r4, i r5) i .r0" + + ${If} $0 != 0 # S_OK + + SetErrors + + ${EndIf} + + System::Call "$1->${IGameExplorer_Release}()" + + "done_${__GAME_EXPLORER_UNIQUE}:" + + Pop $R0 + + Pop $5 + Pop $4 + Pop $3 + Pop $2 + Pop $1 + Pop $0 + + !undef __GAME_EXPLORER_UNIQUE + +!macroend + +!macro GameExplorer_UpdateGame GUID + + !insertmacro _GameExplorer_GUID_Function ${IGameExplorer_UpdateGame} "${GUID}" + +!macroend + +!macro GameExplorer_RemoveGame GUID + + !insertmacro _GameExplorer_GUID_Function ${IGameExplorer_RemoveGame} "${GUID}" + +!macroend \ No newline at end of file diff --git a/installer/settings/files_main_install.nsh b/installer/settings/files_main_install.nsh new file mode 100644 index 00000000..f6f4a1c8 --- /dev/null +++ b/installer/settings/files_main_install.nsh @@ -0,0 +1,4 @@ +; ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ +; UltraStar Deluxe Installer - Version 1.1: Main components +; ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ + diff --git a/installer/settings/files_main_uninstall.nsh b/installer/settings/files_main_uninstall.nsh new file mode 100644 index 00000000..f6f4a1c8 --- /dev/null +++ b/installer/settings/files_main_uninstall.nsh @@ -0,0 +1,4 @@ +; ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ +; UltraStar Deluxe Installer - Version 1.1: Main components +; ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ + diff --git a/installer/settings/files_opt_uninstall.nsh b/installer/settings/files_opt_uninstall.nsh new file mode 100644 index 00000000..f6f4a1c8 --- /dev/null +++ b/installer/settings/files_opt_uninstall.nsh @@ -0,0 +1,4 @@ +; ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ +; UltraStar Deluxe Installer - Version 1.1: Main components +; ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ + diff --git a/installer/settings/functions.nsh b/installer/settings/functions.nsh new file mode 100644 index 00000000..386def41 --- /dev/null +++ b/installer/settings/functions.nsh @@ -0,0 +1,79 @@ +!define exe2 "USdx" + +; Creates Desktop Shortcut(s) if +; checked on Finish Page + +Function CreateDesktopShortCuts + +SetOutPath "$INSTDIR" + +CreateShortcut "$Desktop\$(sm_shortcut).lnk" "$INSTDIR\${exe2}.exe" + +FunctionEnd + +; Deletes only empty dirs which are +; at the top of the stack. + +Function un.DeleteIfEmpty + FindFirst $R0 $R1 "$0\*.*" + strcmp $R1 "." 0 NoDelete + FindNext $R0 $R1 + strcmp $R1 ".." 0 NoDelete + ClearErrors + FindNext $R0 $R1 + IfErrors 0 NoDelete + FindClose $R0 + Sleep 1000 + RMDir "$0" + NoDelete: + FindClose $R0 +FunctionEnd + +; This is used to write a +; string to config.ini + +Function WriteToConfig + Exch $0 + Exch + Exch $1 + + FileOpen $0 $0 a + FileSeek $0 0 END + FileWrite $0 $1 + FileClose $0 + + Pop $1 + Pop $0 +FunctionEnd + +!macro WriteToConfig String File + Push "${String}" + Push "${File}" + Call WriteToConfig +!macroend +!define WriteToConfig "!insertmacro WriteToConfig" + +; Finds UltraStar Deluxe process +; + +!define nsProcess::FindProcess `!insertmacro nsProcess::FindProcess` + +!macro nsProcess::FindProcess _FILE _ERR + nsProcess::_FindProcess /NOUNLOAD `${_FILE}` + Pop ${_ERR} +!macroend + + +!define nsProcess::KillProcess `!insertmacro nsProcess::KillProcess` + +!macro nsProcess::KillProcess _FILE _ERR + nsProcess::_KillProcess /NOUNLOAD `${_FILE}` + Pop ${_ERR} +!macroend + + +!define nsProcess::Unload `!insertmacro nsProcess::Unload` + +!macro nsProcess::Unload + nsProcess::_Unload +!macroend \ No newline at end of file diff --git a/installer/settings/variables.nsh b/installer/settings/variables.nsh new file mode 100644 index 00000000..f82bf88b --- /dev/null +++ b/installer/settings/variables.nsh @@ -0,0 +1,46 @@ +; ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ +; UltraStar Deluxe Installer - Version 1.1: Variables +; ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ + +; Product Information: + +!define version "1.1 Alpha" + +!define name "UltraStar Deluxe" +!define publisher "USDX Team" +!define homepage "http://www.ultrastardeluxe.org" +!define forum "http://forum.ultrastardeluxe.org" + +!define exe "USdx" + +!define license "license.txt" + +; Icons + +!define img_install "install.ico" +!define img_uninstall "uninstall.ico" + +; Header Images + +!define img_header "header.bmp" ; Header image (150x57) +!define img_side "side.bmp" ; Side image (162x314) + +; Registry for Start menu entries: + +!define PRODUCT_VERSION "${version}" +!define PRODUCT_PUBLISHER "${publisher}" +!define PRODUCT_WEB_SITE "${homepage}" +!define PRODUCT_UNINST_KEY "Software\Microsoft\Windows\CurrentVersion\Uninstall\${name}" +!define PRODUCT_UNINST_ROOT_KEY "HKLM" +!define PRODUCT_STARTMENU_REGVAL "NSIS:StartMenuDir" + +; 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_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" \ No newline at end of file -- cgit v1.2.3 From f8df3baf3415fbea2c56eaebca2def446c15c71b Mon Sep 17 00:00:00 2001 From: canni0 Date: Fri, 3 Oct 2008 16:00:23 +0000 Subject: - Fixed Welcome Page - Added Sections and LangStrings - Exported and merged language files for easier multi language support git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@1431 b956fd51-792f-4845-bead-9b4dfca2ff2c --- installer/settings/settings-1031.ini | 131 +++++++++++++++++++++++++++++++++++ installer/settings/settings-1033.ini | 131 +++++++++++++++++++++++++++++++++++ installer/settings/variables.nsh | 5 +- 3 files changed, 266 insertions(+), 1 deletion(-) create mode 100644 installer/settings/settings-1031.ini create mode 100644 installer/settings/settings-1033.ini (limited to 'installer/settings') diff --git a/installer/settings/settings-1031.ini b/installer/settings/settings-1031.ini new file mode 100644 index 00000000..642f577e --- /dev/null +++ b/installer/settings/settings-1031.ini @@ -0,0 +1,131 @@ +[Settings] +NumFields=16 + +[Field 1] +Type=Label +Text="Vollbild Modus:" +Left=0 +Right=53 +Top=27 +Bottom=35 + +[Field 2] +Type=Label +Text="Sprache:" +Left=0 +Right=53 +Top=51 +Bottom=59 + +[Field 3] +Type=Label +Text="Auflösung:" +Left=0 +Right=53 +Top=73 +Bottom=81 + +[Field 4] +Type=Label +Text="Ordnerstruktur:" +Left=0 +Right=53 +Top=97 +Bottom=105 + +[Field 5] +Type=Label +Text="Animationen/Effekte:" +Left=0 +Right=70 +Top=124 +Bottom=132 + +[Field 6] +Type=Droplist +ListItems=On|Off +Left=71 +Right=161 +Top=25 +Bottom=38 + +[Field 7] +Type=Droplist +ListItems=Catalan|Croatian|Danish|Dutch|English|Euskara|French|German|Italian|Norwegian|Polish|Portuguese|Serbian|Slovak|Spanish|Swedish +Left=71 +Right=161 +Top=48 +Bottom=62 + +[Field 8] +Type=Droplist +ListItems=320x200|640x480|800x600|1024x768|1280x1024|1440x900|1680x1050|1920x1200 +Left=71 +Right=161 +Top=72 +Bottom=86 + +[Field 9] +Type=Droplist +ListItems=On|Off +Left=71 +Right=161 +Top=96 +Bottom=110 + +[Field 10] +Type=Droplist +ListItems=On|Off +Left=71 +Right=161 +Top=121 +Bottom=136 + +[Field 11] +Type=Label +Text="Wähle aus, ob das Spiel im Fenster oder \r\nals Vollbild gestartet werden soll." +Left=170 +Right=315 +Top=24 +Bottom=44 + +[Field 12] +Type=Label +Text="Hier können einige Einstellungen für UltraStar Deluxe vorgenommen werden.\r\nAlle Einstellungen können später im Spielmenü geändert werden." +Left=0 +Right=315 +Top=3 +Bottom=20 + +[Field 13] +Type=Label +Text="Wähle deine favorisierte Sprache, in der UltraStar Deluxe angezeigt werden soll." +Left=170 +Right=315 +Top=46 +Bottom=68 + +[Field 14] +Type=Label +Text="Wähle deine, dem Monitor angepasste, bevorzugte Auflösung." +Left=170 +Right=315 +Top=70 +Bottom=96 + +[Field 15] +Type=Label +Text="Wähle aus, ob UltraStar Deluxe eine Ordnerstruktur zum Anzeigen der Lieder verwenden soll." +Left=170 +Right=315 +Top=92 +Bottom=116 + +[Field 16] +Type=Label +Text="Wähle, ob Spezialeffekte und \r\nAnimationen benutzt werden sollen." +Left=170 +Right=315 +Top=121 +Bottom=137 + diff --git a/installer/settings/settings-1033.ini b/installer/settings/settings-1033.ini new file mode 100644 index 00000000..2a3dfdba --- /dev/null +++ b/installer/settings/settings-1033.ini @@ -0,0 +1,131 @@ +[Settings] +NumFields=16 + +[Field 1] +Type=Label +Text="Fullscreen Mode:" +Left=0 +Right=50 +Top=27 +Bottom=35 + +[Field 2] +Type=Label +Text="Language:" +Left=0 +Right=50 +Top=51 +Bottom=59 + +[Field 3] +Type=Label +Text="Resolution:" +Left=0 +Right=50 +Top=73 +Bottom=81 + +[Field 4] +Type=Label +Text="Tabs:" +Left=0 +Right=50 +Top=100 +Bottom=108 + +[Field 5] +Type=Label +Text="Animations/Effects:" +Left=0 +Right=67 +Top=124 +Bottom=132 + +[Field 6] +Type=Droplist +ListItems=On|Off +Left=70 +Right=160 +Top=24 +Bottom=36 + +[Field 7] +Type=Droplist +ListItems=Catalan|Croatian|Danish|Dutch|English|Euskara|French|German|Italian|Norwegian|Polish|Portuguese|Serbian|Slovak|Spanish|Swedish +Left=70 +Right=160 +Top=48 +Bottom=60 + +[Field 8] +Type=Droplist +ListItems=320x200|640x480|800x600|1024x768|1280x1024|1440x900|1680x1050|1920x1200 +Left=70 +Right=160 +Top=72 +Bottom=86 + +[Field 9] +Type=Droplist +ListItems=On|Off +Left=70 +Right=160 +Top=99 +Bottom=113 + +[Field 10] +Type=Droplist +ListItems=On|Off +Left=70 +Right=160 +Top=123 +Bottom=137 + +[Field 11] +Type=Label +Text="Choose if you want to run UltraStar Deluxe in a window or fullscreen." +Left=170 +Right=305 +Top=25 +Bottom=46 + +[Field 12] +Type=Label +Text="Choose your favorite language, in that UltraStar Deluxe should be displayed." +Left=170 +Right=305 +Top=48 +Bottom=70 + +[Field 13] +Type=Label +Text="Choose your favorite screen resolution for UltraStar Deluxe adjusted to your display device." +Left=170 +Right=305 +Top=72 +Bottom=97 + +[Field 14] +Type=Label +Text="Choose whether you would like to view folders in UltraStar Deluxe or not." +Left=170 +Right=305 +Top=99 +Bottom=122 + +[Field 15] +Type=Label +Text="Here you can define some settings for UltraStar Deluxe. The settings can\r\nalso be changed in the GUI later." +Left=0 +Right=289 +Top=3 +Bottom=20 + +[Field 16] +Type=Label +Text="Choose if special effects or animations should be used by UltraStar Deluxe. Recommended: On" +Left=170 +Right=305 +Top=123 +Bottom=139 + diff --git a/installer/settings/variables.nsh b/installer/settings/variables.nsh index f82bf88b..78f9d185 100644 --- a/installer/settings/variables.nsh +++ b/installer/settings/variables.nsh @@ -43,4 +43,7 @@ !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" \ No newline at end of file +!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 -- cgit v1.2.3 From 6ecfb5323b83021c68c693e5173c32b6ea9cd62a Mon Sep 17 00:00:00 2001 From: canni0 Date: Sat, 4 Oct 2008 16:19:17 +0000 Subject: - fixed: default install dir hover descriptions vista game explorer shortcut - request privileges on vista - added settings page git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@1432 b956fd51-792f-4845-bead-9b4dfca2ff2c --- installer/settings/files_main_uninstall.nsh | 24 ++++++++++++++++++++++++ installer/settings/functions.nsh | 4 +--- installer/settings/variables.nsh | 1 + 3 files changed, 26 insertions(+), 3 deletions(-) (limited to 'installer/settings') diff --git a/installer/settings/files_main_uninstall.nsh b/installer/settings/files_main_uninstall.nsh index f6f4a1c8..882fba9a 100644 --- a/installer/settings/files_main_uninstall.nsh +++ b/installer/settings/files_main_uninstall.nsh @@ -2,3 +2,27 @@ ; UltraStar Deluxe Installer - Version 1.1: Main components ; ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ + +; Delete created Icons in startmenu + + SetShellVarContext all + + Delete "$SMPROGRAMS\$ICONS_GROUP\Uninstall.lnk" + Delete "$SMPROGRAMS\$ICONS_GROUP\Deinstallieren.lnk" + Delete "$SMPROGRAMS\$ICONS_GROUP\Website.lnk" + Delete "$SMPROGRAMS\$ICONS_GROUP\Internetseite.lnk" + Delete "$SMPROGRAMS\$ICONS_GROUP\UltraStar Deluxe spielen.lnk" + Delete "$SMPROGRAMS\$ICONS_GROUP\Play UltraStar Deluxe.lnk" + Delete "$SMPROGRAMS\$ICONS_GROUP\Readme.lnk" + Delete "$SMPROGRAMS\$ICONS_GROUP\Lies mich.lnk" + Delete "$SMPROGRAMS\$ICONS_GROUP\Lizenz.lnk" + Delete "$SMPROGRAMS\$ICONS_GROUP\License.lnk" + +; Delete created Icon on Desktop + +Delete "$Desktop\Play UltraStar Deluxe.lnk" +Delete "$Desktop\UltraStar Deluxe spielen.lnk" + +StrCpy $0 "$SMPROGRAMS\$ICONS_GROUP" +Call un.DeleteIfEmpty + diff --git a/installer/settings/functions.nsh b/installer/settings/functions.nsh index 386def41..8345c4cc 100644 --- a/installer/settings/functions.nsh +++ b/installer/settings/functions.nsh @@ -1,5 +1,3 @@ -!define exe2 "USdx" - ; Creates Desktop Shortcut(s) if ; checked on Finish Page @@ -7,7 +5,7 @@ Function CreateDesktopShortCuts SetOutPath "$INSTDIR" -CreateShortcut "$Desktop\$(sm_shortcut).lnk" "$INSTDIR\${exe2}.exe" +CreateShortcut "$Desktop\$(sm_shortcut).lnk" "$INSTDIR\USdx.exe" FunctionEnd diff --git a/installer/settings/variables.nsh b/installer/settings/variables.nsh index 78f9d185..7b53bdbf 100644 --- a/installer/settings/variables.nsh +++ b/installer/settings/variables.nsh @@ -27,6 +27,7 @@ ; Registry for Start menu entries: +!define PRODUCT_NAME "${name}" !define PRODUCT_VERSION "${version}" !define PRODUCT_PUBLISHER "${publisher}" !define PRODUCT_WEB_SITE "${homepage}" -- cgit v1.2.3 From ad2d64765a945a79255c27f1ac8cb37366e486c1 Mon Sep 17 00:00:00 2001 From: canni0 Date: Wed, 8 Oct 2008 13:08:38 +0000 Subject: - Added Update Installation (version comparison) git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@1436 b956fd51-792f-4845-bead-9b4dfca2ff2c --- installer/settings/files_opt_uninstall.nsh | 4 ---- installer/settings/variables.nsh | 3 ++- 2 files changed, 2 insertions(+), 5 deletions(-) delete mode 100644 installer/settings/files_opt_uninstall.nsh (limited to 'installer/settings') diff --git a/installer/settings/files_opt_uninstall.nsh b/installer/settings/files_opt_uninstall.nsh deleted file mode 100644 index f6f4a1c8..00000000 --- a/installer/settings/files_opt_uninstall.nsh +++ /dev/null @@ -1,4 +0,0 @@ -; ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ -; UltraStar Deluxe Installer - Version 1.1: Main components -; ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ - diff --git a/installer/settings/variables.nsh b/installer/settings/variables.nsh index 7b53bdbf..64df51f1 100644 --- a/installer/settings/variables.nsh +++ b/installer/settings/variables.nsh @@ -4,7 +4,8 @@ ; Product Information: -!define version "1.1 Alpha" +!define version "1.1a" ; Make sure version is also set in onInit + !define name "UltraStar Deluxe" !define publisher "USDX Team" -- cgit v1.2.3 From 7c2116c7cb4c65eaa61c070bcf95036f661ec859 Mon Sep 17 00:00:00 2001 From: canni0 Date: Wed, 8 Oct 2008 14:50:30 +0000 Subject: - Install Routine completed - Support update installation (no covers.ini change) git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@1438 b956fd51-792f-4845-bead-9b4dfca2ff2c --- installer/settings/files_main_install.nsh | 50 +++++++++++++++++++++++++++++++ 1 file changed, 50 insertions(+) (limited to 'installer/settings') diff --git a/installer/settings/files_main_install.nsh b/installer/settings/files_main_install.nsh index f6f4a1c8..1ff099d4 100644 --- a/installer/settings/files_main_install.nsh +++ b/installer/settings/files_main_install.nsh @@ -2,3 +2,53 @@ ; UltraStar Deluxe Installer - Version 1.1: Main components ; ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ +; Create Directories: + +CreateDirectory $INSTDIR\plugins +CreateDirectory $INSTDIR\songs +CreateDirectory $INSTDIR\screenshots +CreateDirectory $INSTDIR\playlists + +SetOutPath "$INSTDIR" + +; themes, languages, sounds, visuals dir + +File /r ..\game\themes +File /r ..\game\languages +File /r ..\game\sounds +File /r ..\installerdependencies\visuals + +; Root dir: + +File ..\game\themes\dll\*.dll + +File ..\ChangeLog.txt +File ..\ChangeLog.german.txt +File ..\README.txt +File ..\installerdependencies\documents\documentation.pdf + +File "..\ScoreConverter.exe" +File "..\${exe}.exe" + +; Covers dir: + +IfFileExists $INSTDIR\covers\covers.ini +2 0 +File ..\game\covers\Covers.ini +File ..\game\covers\NoCover.jpg + +; Plugins dir: + +SetOutPath "$INSTDIR\Plugins\" + File "..\Plugins\Blind.dll" + File "..\Plugins\Duell.dll" + File "..\Plugins\Hold_The_Line.dll" + File "..\Plugins\TeamDuell.dll" + File "..\Plugins\Until5000.dll" + +${If} ${AtLeastWinVista} + + SetOutPath "$WINDIR" + File "..\installerdependencies\plugins\gdf.dll" + +${EndIf} + -- cgit v1.2.3 From 910e332b427f28092a0f34124af753da5845f62f Mon Sep 17 00:00:00 2001 From: canni0 Date: Wed, 8 Oct 2008 16:11:16 +0000 Subject: - Added uninstall routine git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@1439 b956fd51-792f-4845-bead-9b4dfca2ff2c --- installer/settings/files_main_install.nsh | 2 +- installer/settings/files_main_uninstall.nsh | 84 +++++++++++++++++++++++------ installer/settings/variables.nsh | 2 +- 3 files changed, 71 insertions(+), 17 deletions(-) (limited to 'installer/settings') diff --git a/installer/settings/files_main_install.nsh b/installer/settings/files_main_install.nsh index 1ff099d4..5ce3326f 100644 --- a/installer/settings/files_main_install.nsh +++ b/installer/settings/files_main_install.nsh @@ -1,5 +1,5 @@ ; ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ -; UltraStar Deluxe Installer - Version 1.1: Main components +; UltraStar Deluxe Installer: Main components ; ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ; Create Directories: diff --git a/installer/settings/files_main_uninstall.nsh b/installer/settings/files_main_uninstall.nsh index 882fba9a..c8d3a229 100644 --- a/installer/settings/files_main_uninstall.nsh +++ b/installer/settings/files_main_uninstall.nsh @@ -1,5 +1,5 @@ ; ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ -; UltraStar Deluxe Installer - Version 1.1: Main components +; UltraStar Deluxe Uninstaller: Main components ; ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ @@ -7,22 +7,76 @@ SetShellVarContext all - Delete "$SMPROGRAMS\$ICONS_GROUP\Uninstall.lnk" - Delete "$SMPROGRAMS\$ICONS_GROUP\Deinstallieren.lnk" - Delete "$SMPROGRAMS\$ICONS_GROUP\Website.lnk" - Delete "$SMPROGRAMS\$ICONS_GROUP\Internetseite.lnk" - Delete "$SMPROGRAMS\$ICONS_GROUP\UltraStar Deluxe spielen.lnk" - Delete "$SMPROGRAMS\$ICONS_GROUP\Play UltraStar Deluxe.lnk" - Delete "$SMPROGRAMS\$ICONS_GROUP\Readme.lnk" - Delete "$SMPROGRAMS\$ICONS_GROUP\Lies mich.lnk" - Delete "$SMPROGRAMS\$ICONS_GROUP\Lizenz.lnk" - Delete "$SMPROGRAMS\$ICONS_GROUP\License.lnk" + RMDir "$SMPROGRAMS\$ICONS_GROUP\ ; Delete created Icon on Desktop -Delete "$Desktop\Play UltraStar Deluxe.lnk" -Delete "$Desktop\UltraStar Deluxe spielen.lnk" + Delete "$Desktop\Play UltraStar Deluxe.lnk" + Delete "$Desktop\UltraStar Deluxe spielen.lnk" -StrCpy $0 "$SMPROGRAMS\$ICONS_GROUP" -Call un.DeleteIfEmpty +; Remove dirs + RMDir "$INSTDIR\plugins" + RMDir "$INSTDIR\themes" + RMDir "$INSTDIR\languages" + RMDir "$INSTDIR\visuals" + RMDir "$INSTDIR\sounds" + +; Delete remaining files + + Delete "$INSTDIR\ScoreConverter.exe" + Delete "$INSTDIR\${exe}.exe" + Delete "$INSTDIR\Changelog.german.txt" + Delete "$INSTDIR\Changelog.txt" + Delete "$INSTDIR\documentation.pdf" + Delete "$INSTDIR\License.txt" + Delete "$INSTDIR\README.txt" + Delete "$INSTDIR\Error.log" + Delete "$INSTDIR\covers.cache" + + Delete "$INSTDIR\avcodec-51.dll" + Delete "$INSTDIR\avformat-50.dll" + Delete "$INSTDIR\avutil-49.dll" + Delete "$INSTDIR\bass.dll" + Delete "$INSTDIR\glew32.dll" + Delete "$INSTDIR\jpeg.dll" + Delete "$INSTDIR\libfreetype-6.dll" + Delete "$INSTDIR\libpng12-0.dll" + Delete "$INSTDIR\libprojectM.dll" + Delete "$INSTDIR\libtiff-3.dll" + Delete "$INSTDIR\portaudio_x86.dll" + Delete "$INSTDIR\portmixer.dll" + Delete "$INSTDIR\projectM-cwrapper.dll" + Delete "$INSTDIR\SDL.dll" + Delete "$INSTDIR\SDL_image.dll" + Delete "$INSTDIR\SDL_ttf.dll" + Delete "$INSTDIR\sqlite3.dll" + Delete "$INSTDIR\zlib1.dll" + +${If} ${AtLeastWinVista} + Delete "$WINDIR\gdf.dll" +${EndIf} + + + RMDir "$INSTDIR\songs\Dead Smiling Pirates - I 18" + RMDir "$INSTDIR\songs\Joshua Morin - On The Run" + RMDir "$INSTDIR\songs\Pornophonique - Space Invaders" + RMDir "$INSTDIR\songs\Steven Dunston - Northern Star" + + StrCpy $0 "$INSTDIR\songs" + Call un.DeleteIfEmpty + + Delete "$INSTDIR\covers\NoCover.jpg" + + StrCpy $0 "$INSTDIR\screenshots" + Call un.DeleteIfEmpty + + StrCpy $0 "$INSTDIR\playlists" + Call un.DeleteIfEmpty + +; Self delete: + + Delete "$INSTDIR\Uninstall.exe" + + StrCpy $0 "$INSTDIR" + Call un.DeleteIfEmpty \ No newline at end of file diff --git a/installer/settings/variables.nsh b/installer/settings/variables.nsh index 64df51f1..b6ffc022 100644 --- a/installer/settings/variables.nsh +++ b/installer/settings/variables.nsh @@ -1,5 +1,5 @@ ; ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ -; UltraStar Deluxe Installer - Version 1.1: Variables +; UltraStar Deluxe Un/Installer: Variables ; ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ; Product Information: -- cgit v1.2.3 From 6d55066f68067f4952e8fab8470c7368072ff043 Mon Sep 17 00:00:00 2001 From: canni0 Date: Wed, 8 Oct 2008 16:43:52 +0000 Subject: - fixed compilation error (wrong path) git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@1440 b956fd51-792f-4845-bead-9b4dfca2ff2c --- installer/settings/files_main_install.nsh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'installer/settings') diff --git a/installer/settings/files_main_install.nsh b/installer/settings/files_main_install.nsh index 5ce3326f..e9e0e3d2 100644 --- a/installer/settings/files_main_install.nsh +++ b/installer/settings/files_main_install.nsh @@ -20,7 +20,7 @@ File /r ..\installerdependencies\visuals ; Root dir: -File ..\game\themes\dll\*.dll +File ..\nstallerdependencies\dll\*.dll File ..\ChangeLog.txt File ..\ChangeLog.german.txt -- cgit v1.2.3 From 1b801a741edc0a3d3b64b83a75598a5a10da69c6 Mon Sep 17 00:00:00 2001 From: canni0 Date: Wed, 8 Oct 2008 16:45:55 +0000 Subject: - fixed typo caused compilation error git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@1441 b956fd51-792f-4845-bead-9b4dfca2ff2c --- installer/settings/files_main_install.nsh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'installer/settings') diff --git a/installer/settings/files_main_install.nsh b/installer/settings/files_main_install.nsh index e9e0e3d2..c7e48e46 100644 --- a/installer/settings/files_main_install.nsh +++ b/installer/settings/files_main_install.nsh @@ -20,7 +20,7 @@ File /r ..\installerdependencies\visuals ; Root dir: -File ..\nstallerdependencies\dll\*.dll +File ..\installerdependencies\dll\*.dll File ..\ChangeLog.txt File ..\ChangeLog.german.txt -- cgit v1.2.3 From 721776f85625ab218cff2d8156e80522f5381045 Mon Sep 17 00:00:00 2001 From: canni0 Date: Wed, 8 Oct 2008 16:56:12 +0000 Subject: - Few bug fixes git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@1442 b956fd51-792f-4845-bead-9b4dfca2ff2c --- installer/settings/files_main_install.nsh | 5 +++++ installer/settings/files_main_uninstall.nsh | 13 +++++++------ 2 files changed, 12 insertions(+), 6 deletions(-) (limited to 'installer/settings') diff --git a/installer/settings/files_main_install.nsh b/installer/settings/files_main_install.nsh index c7e48e46..00fd3f8e 100644 --- a/installer/settings/files_main_install.nsh +++ b/installer/settings/files_main_install.nsh @@ -22,16 +22,20 @@ File /r ..\installerdependencies\visuals File ..\installerdependencies\dll\*.dll + File ..\ChangeLog.txt File ..\ChangeLog.german.txt File ..\README.txt File ..\installerdependencies\documents\documentation.pdf +File ..\installerdependencies\documents\license.txt File "..\ScoreConverter.exe" File "..\${exe}.exe" ; Covers dir: +SetOutPath "$INSTDIR\covers" + IfFileExists $INSTDIR\covers\covers.ini +2 0 File ..\game\covers\Covers.ini File ..\game\covers\NoCover.jpg @@ -52,3 +56,4 @@ ${If} ${AtLeastWinVista} ${EndIf} +SetOutPath "$INSTDIR" diff --git a/installer/settings/files_main_uninstall.nsh b/installer/settings/files_main_uninstall.nsh index c8d3a229..b3d69da2 100644 --- a/installer/settings/files_main_uninstall.nsh +++ b/installer/settings/files_main_uninstall.nsh @@ -7,7 +7,7 @@ SetShellVarContext all - RMDir "$SMPROGRAMS\$ICONS_GROUP\ + RMDir /r "$SMPROGRAMS\$ICONS_GROUP\" ; Delete created Icon on Desktop @@ -16,11 +16,11 @@ ; Remove dirs - RMDir "$INSTDIR\plugins" - RMDir "$INSTDIR\themes" - RMDir "$INSTDIR\languages" - RMDir "$INSTDIR\visuals" - RMDir "$INSTDIR\sounds" + RMDir /r "$INSTDIR\plugins" + RMDir /r "$INSTDIR\themes" + RMDir /r "$INSTDIR\languages" + RMDir /r "$INSTDIR\visuals" + RMDir /r "$INSTDIR\sounds" ; Delete remaining files @@ -30,6 +30,7 @@ Delete "$INSTDIR\Changelog.txt" Delete "$INSTDIR\documentation.pdf" Delete "$INSTDIR\License.txt" + Delete "$INSTDIR\config.ini" Delete "$INSTDIR\README.txt" Delete "$INSTDIR\Error.log" Delete "$INSTDIR\covers.cache" -- cgit v1.2.3 From f792ac7b80cda072af5ba2472c9f30c3a2feb9c1 Mon Sep 17 00:00:00 2001 From: canni0 Date: Thu, 25 Dec 2008 20:13:20 +0000 Subject: - added jonathan coulton songs - small installer fixes git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@1542 b956fd51-792f-4845-bead-9b4dfca2ff2c --- installer/settings/files_main_install.nsh | 6 +----- installer/settings/variables.nsh | 25 +++++++++++++++++++++++++ 2 files changed, 26 insertions(+), 5 deletions(-) (limited to 'installer/settings') diff --git a/installer/settings/files_main_install.nsh b/installer/settings/files_main_install.nsh index 00fd3f8e..605725aa 100644 --- a/installer/settings/files_main_install.nsh +++ b/installer/settings/files_main_install.nsh @@ -43,11 +43,7 @@ File ..\game\covers\NoCover.jpg ; Plugins dir: SetOutPath "$INSTDIR\Plugins\" - File "..\Plugins\Blind.dll" - File "..\Plugins\Duell.dll" - File "..\Plugins\Hold_The_Line.dll" - File "..\Plugins\TeamDuell.dll" - File "..\Plugins\Until5000.dll" + File "..\Plugins\*.dll" ${If} ${AtLeastWinVista} diff --git a/installer/settings/variables.nsh b/installer/settings/variables.nsh index b6ffc022..bf5668d7 100644 --- a/installer/settings/variables.nsh +++ b/installer/settings/variables.nsh @@ -43,6 +43,31 @@ !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_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" +!define download_sub1_song3 "http://downloads.sourceforge.net/ultrastardx/usdx_song-jonathan_coulton_-_not_about_you.zip" +!define download_sub1_song4 "http://downloads.sourceforge.net/ultrastardx/usdx_song-jonathan_coulton_-_mr_fancy_pants.zip" +!define download_sub1_song5 "http://downloads.sourceforge.net/ultrastardx/usdx_song-jonathan_coulton_-_big_bad_world_one.zip" +!define download_sub1_song6 "http://downloads.sourceforge.net/ultrastardx/usdx_song-jonathan_coulton_-_flickr.zip" +!define download_sub1_song7 "http://downloads.sourceforge.net/ultrastardx/usdx_song-jonathan_coulton_-_my_beige_bear.zip" +!define download_sub1_song8 "http://downloads.sourceforge.net/ultrastardx/usdx_song-jonathan_coulton_-_the_future_soon.zip" +!define download_sub1_song9 "http://downloads.sourceforge.net/ultrastardx/usdx_song-jonathan_coulton_-_ikea.zip" +!define download_sub1_song10 "http://downloads.sourceforge.net/ultrastardx/usdx_song-jonathan_coulton_-_furry_old_lobster.zip" +!define download_sub1_song11 "http://downloads.sourceforge.net/ultrastardx/usdx_song-jonathan_coulton_-_code_monkey.zip" +!define download_sub1_song12 "http://downloads.sourceforge.net/ultrastardx/usdx_song-jonathan_coulton_-_im_your_moon.zip" +!define download_sub1_song13 "http://downloads.sourceforge.net/ultrastardx/usdx_song-jonathan_coulton_-_first_of_may.zip" +!define download_sub1_song14 "http://downloads.sourceforge.net/ultrastardx/usdx_song-jonathan_coulton_-_dance_soterios_johnson_dance.zip" +!define download_sub1_song15 "http://downloads.sourceforge.net/ultrastardx/usdx_song-jonathan_coulton_-_a_talk_with_george.zip" +!define download_sub1_song16 "http://downloads.sourceforge.net/ultrastardx/usdx_song-jonathan_coulton_-_creepy_doll.zip" +!define download_sub1_song17 "http://downloads.sourceforge.net/ultrastardx/usdx_song-jonathan_coulton_-_that_spells_dna.zip" +!define download_sub1_song18 "http://downloads.sourceforge.net/ultrastardx/usdx_song-jonathan_coulton_-_when_you_go.zip" +!define download_sub1_song19 "http://downloads.sourceforge.net/ultrastardx/usdx_song-jonathan_coulton_-_better.zip" +!define download_sub1_song20 "http://downloads.sourceforge.net/ultrastardx/usdx_song-jonathan_coulton_-_shop_vac.zip" +!define download_sub1_song21 "http://downloads.sourceforge.net/ultrastardx/usdx_song-jonathan_coulton_-_i_feel_fantastic.zip" +!define download_sub1_song22 "http://downloads.sourceforge.net/ultrastardx/usdx_song-jonathan_coulton_-_re-_your_brains.zip" +!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_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" -- cgit v1.2.3 From da957735cf8f37e6bda903626e826c4993f37f8a Mon Sep 17 00:00:00 2001 From: canni0 Date: Sat, 10 Jan 2009 21:57:04 +0000 Subject: - Added: Check online for USdx Updates - Changed: Installer Icon git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@1553 b956fd51-792f-4845-bead-9b4dfca2ff2c --- installer/settings/functions.nsh | 100 ++++++++++++++++++++++++++++++++++++++- 1 file changed, 99 insertions(+), 1 deletion(-) (limited to 'installer/settings') diff --git a/installer/settings/functions.nsh b/installer/settings/functions.nsh index 8345c4cc..edaa1e74 100644 --- a/installer/settings/functions.nsh +++ b/installer/settings/functions.nsh @@ -74,4 +74,102 @@ 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 \ No newline at end of file -- cgit v1.2.3 From 8eb1dca0ac1974f13266bf4645c0cb8913d58d9d Mon Sep 17 00:00:00 2001 From: canni0 Date: Sat, 10 Jan 2009 23:29:25 +0000 Subject: - Update: Changed routines for online update check - Fixed: Added missing Language Strings git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@1554 b956fd51-792f-4845-bead-9b4dfca2ff2c --- installer/settings/functions.nsh | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) (limited to 'installer/settings') diff --git a/installer/settings/functions.nsh b/installer/settings/functions.nsh index edaa1e74..bbd4fea2 100644 --- a/installer/settings/functions.nsh +++ b/installer/settings/functions.nsh @@ -172,4 +172,28 @@ Function VersionCompare 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 -- cgit v1.2.3 From 86c75b3e82dff54c8e6a9020a6fd236b6c7339fe Mon Sep 17 00:00:00 2001 From: canni0 Date: Fri, 10 Apr 2009 15:46:34 +0000 Subject: - added songs (wise guys, bodo wartke, shearer) and themes (whitesensation, bluesensation 5.1) git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@1664 b956fd51-792f-4845-bead-9b4dfca2ff2c --- installer/settings/files_main_install.nsh | 3 ++- installer/settings/variables.nsh | 31 +++++++++++++++++++++++-------- 2 files changed, 25 insertions(+), 9 deletions(-) (limited to 'installer/settings') diff --git a/installer/settings/files_main_install.nsh b/installer/settings/files_main_install.nsh index 605725aa..6a270257 100644 --- a/installer/settings/files_main_install.nsh +++ b/installer/settings/files_main_install.nsh @@ -11,11 +11,12 @@ CreateDirectory $INSTDIR\playlists 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: diff --git a/installer/settings/variables.nsh b/installer/settings/variables.nsh index bf5668d7..db98d89f 100644 --- a/installer/settings/variables.nsh +++ b/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 From e05652b4e123eb241cb3c9b85e1b89796996b196 Mon Sep 17 00:00:00 2001 From: canni0 Date: Sun, 12 Apr 2009 18:56:27 +0000 Subject: - added uninstall option (songs, covers, highscores) - added section sizes - changed default options git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@1667 b956fd51-792f-4845-bead-9b4dfca2ff2c --- installer/settings/files_main_uninstall.nsh | 1 + 1 file changed, 1 insertion(+) (limited to 'installer/settings') diff --git a/installer/settings/files_main_uninstall.nsh b/installer/settings/files_main_uninstall.nsh index b3d69da2..277eb409 100644 --- a/installer/settings/files_main_uninstall.nsh +++ b/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" -- cgit v1.2.3 From b32d57bc9515366e9c59b3ec67cc574bc0ab2f30 Mon Sep 17 00:00:00 2001 From: canni0 Date: Sat, 18 Apr 2009 14:57:42 +0000 Subject: - renamed installer options to fit usdx menu - added default options (installer settings menu) git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@1680 b956fd51-792f-4845-bead-9b4dfca2ff2c --- installer/settings/settings-1031.ini | 5 +++++ installer/settings/settings-1033.ini | 5 +++++ 2 files changed, 10 insertions(+) (limited to 'installer/settings') diff --git a/installer/settings/settings-1031.ini b/installer/settings/settings-1031.ini index 642f577e..9e588fcb 100644 --- a/installer/settings/settings-1031.ini +++ b/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/installer/settings/settings-1033.ini b/installer/settings/settings-1033.ini index 2a3dfdba..17a08a8c 100644 --- a/installer/settings/settings-1033.ini +++ b/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 -- cgit v1.2.3 From d6cf58a5e4288d3796cbd0a6a7071a4c036616bb Mon Sep 17 00:00:00 2001 From: canni0 Date: Sat, 18 Apr 2009 15:29:30 +0000 Subject: - fixed assembla ticket #49 - fixed uninstall routine (forgot to delete cached covers) git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@1681 b956fd51-792f-4845-bead-9b4dfca2ff2c --- installer/settings/files_main_install.nsh | 12 ++++++------ installer/settings/files_main_uninstall.nsh | 1 + 2 files changed, 7 insertions(+), 6 deletions(-) (limited to 'installer/settings') diff --git a/installer/settings/files_main_install.nsh b/installer/settings/files_main_install.nsh index 6a270257..c2cdf727 100644 --- a/installer/settings/files_main_install.nsh +++ b/installer/settings/files_main_install.nsh @@ -4,10 +4,11 @@ ; 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" @@ -23,7 +24,6 @@ File /r ..\installerdependencies\visuals File ..\installerdependencies\dll\*.dll - File ..\ChangeLog.txt File ..\ChangeLog.german.txt File ..\README.txt @@ -35,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/installer/settings/files_main_uninstall.nsh b/installer/settings/files_main_uninstall.nsh index 277eb409..af61cb0b 100644 --- a/installer/settings/files_main_uninstall.nsh +++ b/installer/settings/files_main_uninstall.nsh @@ -35,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" -- cgit v1.2.3 From edf4235745e5074a946f8552ec246b3b7c6f3bb6 Mon Sep 17 00:00:00 2001 From: canni0 Date: Mon, 12 Apr 2010 01:03:25 +0000 Subject: updated installer source: - adjusted folders to fit with changes from 1.1 alpha - removed incompatible themes - removed vista game exoplorer features due to incompatibility with windows 7 - added background music derivated from bebeto - added another song - fixed small icons bug - merged dependencies folder into installer git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@2227 b956fd51-792f-4845-bead-9b4dfca2ff2c --- installer/settings/GameExplorer.nsh | 198 ---------------------------- installer/settings/files_main_install.nsh | 57 ++++---- installer/settings/files_main_uninstall.nsh | 75 +++++++---- installer/settings/functions.nsh | 2 +- installer/settings/settings-1031.ini | 2 +- installer/settings/settings-1033.ini | 2 +- installer/settings/variables.nsh | 19 ++- 7 files changed, 97 insertions(+), 258 deletions(-) delete mode 100644 installer/settings/GameExplorer.nsh (limited to 'installer/settings') diff --git a/installer/settings/GameExplorer.nsh b/installer/settings/GameExplorer.nsh deleted file mode 100644 index d5056661..00000000 --- a/installer/settings/GameExplorer.nsh +++ /dev/null @@ -1,198 +0,0 @@ -# user interface - -!define GameExplorer_GenerateGUID '!insertmacro GameExplorer_GenerateGUID' -!define GameExplorer_AddGame '!insertmacro GameExplorer_AddGame' -!define GameExplorer_UpdateGame '!insertmacro GameExplorer_UpdateGame' -!define GameExplorer_RemoveGame '!insertmacro GameExplorer_RemoveGame' - -# internal stuff - -!define CLSCTX_INPROC_SERVER 1 -!define IID_IGameExplorer {E7B2FB72-D728-49B3-A5F2-18EBF5F1349E} -!define CLSID_GameExplorer {9A5EA990-3034-4D6F-9128-01F3C61022BC} - -!define GIS_CURRENT_USER 2 -!define GIS_ALL_USERS 3 - -!define IGameExplorer_QueryInterface 0 -!define IGameExplorer_AddRef 1 -!define IGameExplorer_Release 2 -!define IGameExplorer_AddGame 3 -!define IGameExplorer_RemoveGame 4 -!define IGameExplorer_UpdateGame 5 -!define IGameExplorer_VerifyAccess 6 - -# includes - -!include LogicLib.nsh - -# the actual code - -!macro GameExplorer_GenerateGUID - - System::Call 'ole32::CoCreateGuid(g .s)' - -!macroend - -!macro GameExplorer_AddGame CONTEXT GDF INSTDIR EXE GUID - - !define __GAME_EXPLORER_UNIQUE "${__LINE__}${__FILE__}" - - Push $0 - Push $1 - - Push $R0 - Push $R1 - Push $R2 - Push $R3 - - Push "${EXE}" - Push "${GUID}" - Push "${INSTDIR}" - Push "${GDF}" - - Pop $R0 # == ${GDF} - Pop $R1 # == ${INSTDIR} - Pop $R2 # == ${GUID} - Pop $R3 # == ${EXE} - - ClearErrors - - System::Call "ole32::CoCreateInstance( \ - g '${CLSID_GameExplorer}', i 0, \ - i ${CLSCTX_INPROC_SERVER}, \ - g '${IID_IGameExplorer}', *i .r1) i .r0" - - ${If} $0 != 0 # S_OK - - SetErrors - Goto "done_${__GAME_EXPLORER_UNIQUE}" - - ${EndIf} - - !if ${CONTEXT} == all - - System::Call "$1->${IGameExplorer_AddGame}(w R0, w R1, i ${GIS_ALL_USERS}, g R2) i .r0" - - !else if ${CONTEXT} == user - - System::Call "$1->${IGameExplorer_AddGame}(w R1, w R0, i ${GIS_CURRENT_USER}, g R2) i .r0" - - !else - - !error "Invalid CONTEXT passed to GameExplorer_AddGame! Must be `user` or `all`." - - !endif - - ${If} $0 != 0 # S_OK - - SetErrors - - ${Else} - - # Create play task - - !if ${CONTEXT} == all - - SetShellVarContext all - - !else if if ${CONTEXT} == user - - SetShellVarContext user - - !endif - - CreateDirectory $APPDATA\Microsoft\Windows\GameExplorer\$R2\PlayTasks\0 - CreateShortcut $APPDATA\Microsoft\Windows\GameExplorer\$R2\PlayTasks\0\Play.lnk $R3 - - ${EndIf} - - System::Call "$1->${IGameExplorer_Release}()" - - "done_${__GAME_EXPLORER_UNIQUE}:" - - Pop $R3 - Pop $R2 - Pop $R1 - Pop $R0 - - Pop $1 - Pop $0 - - !undef __GAME_EXPLORER_UNIQUE - -!macroend - -!macro _GameExplorer_GUID_Function Function GUID - - !define __GAME_EXPLORER_UNIQUE "${__LINE__}${__FILE__}" - - Push $0 - Push $1 - Push $2 - Push $3 - Push $4 - Push $5 - - Push $R0 - - Push "${GUID}" - - Pop $R0 # == ${GUID} - - System::Alloc 16 - Exch $R0 - System::Call "ole32::CLSIDFromString(w s, i R0)" - System::Call "*$R0(i .r2, i .r3, i .r4, i .r5)" - System::Free $R0 - - ClearErrors - - System::Call "ole32::CoCreateInstance( \ - g '${CLSID_GameExplorer}', i 0, \ - i ${CLSCTX_INPROC_SERVER}, \ - g '${IID_IGameExplorer}', *i .r1) i .r0" - - ${If} $0 != 0 # S_OK - - SetErrors - Goto "done_${__GAME_EXPLORER_UNIQUE}" - - ${EndIf} - - System::Call "$1->${Function}(i r2, i r3, i r4, i r5) i .r0" - - ${If} $0 != 0 # S_OK - - SetErrors - - ${EndIf} - - System::Call "$1->${IGameExplorer_Release}()" - - "done_${__GAME_EXPLORER_UNIQUE}:" - - Pop $R0 - - Pop $5 - Pop $4 - Pop $3 - Pop $2 - Pop $1 - Pop $0 - - !undef __GAME_EXPLORER_UNIQUE - -!macroend - -!macro GameExplorer_UpdateGame GUID - - !insertmacro _GameExplorer_GUID_Function ${IGameExplorer_UpdateGame} "${GUID}" - -!macroend - -!macro GameExplorer_RemoveGame GUID - - !insertmacro _GameExplorer_GUID_Function ${IGameExplorer_RemoveGame} "${GUID}" - -!macroend \ No newline at end of file diff --git a/installer/settings/files_main_install.nsh b/installer/settings/files_main_install.nsh index c2cdf727..693e0413 100644 --- a/installer/settings/files_main_install.nsh +++ b/installer/settings/files_main_install.nsh @@ -4,53 +4,64 @@ ; Create Directories: -CreateDirectory $INSTDIR\Plugins -CreateDirectory $INSTDIR\Songs -CreateDirectory $INSTDIR\Screenshots -CreateDirectory $INSTDIR\Playlists -CreateDirectory $INSTDIR\Covers +CreateDirectory $INSTDIR\plugins +CreateDirectory $INSTDIR\covers +CreateDirectory $INSTDIR\songs -SetOutPath "$INSTDIR" +${If} ${AtLeastWinVista} + + ; Create folders in appdata for current user + SetShellVarContext current + CreateDirectory $APPDATA\ultrastardx + CreateDirectory $APPDATA\ultrastardx\screenshots + CreateDirectory $APPDATA\ultrastardx\playlists + + SetOutPath "$APPDATA\ultrastardx" + File ..\game\config.ini + + SetOutPath "$INSTDIR" + + CreateShortCut "screenshots.lnk" "$APPDATA\ultrastardx\screenshots" + CreateShortCut "playlists.lnk" "$APPDATA\ultrastardx\playlists" + CreateShortCut "config.ini.lnk" "$APPDATA\ultrastardx\config.ini" + + SetShellVarContext all +${EndIf} ; themes, languages, sounds, fonts, visuals dir +SetOutPath "$INSTDIR" + File /r ..\game\themes File /r ..\game\languages File /r ..\game\sounds File /r ..\game\fonts -File /r ..\installerdependencies\visuals +File /r ..\game\visuals ; Root dir: -File ..\installerdependencies\dll\*.dll +File .\dependencies\dll\*.dll File ..\ChangeLog.txt -File ..\ChangeLog.german.txt +File ..\ChangeLog.GERMAN.txt +File ..\game\LuaCommands.odt File ..\README.txt -File ..\installerdependencies\documents\documentation.pdf -File ..\installerdependencies\documents\license.txt +File .\dependencies\documents\license.txt +File .\dependencies\documents\documentation.pdf -File "..\ScoreConverter.exe" File "..\${exe}.exe" ; Covers dir: -SetOutPath "$INSTDIR\Covers" +SetOutPath "$INSTDIR\covers" IfFileExists $INSTDIR\covers\covers.ini +2 0 -File ..\game\covers\Covers.ini +File ..\game\covers\covers.ini File ..\game\covers\NoCover.jpg ; Plugins dir: -SetOutPath "$INSTDIR\Plugins\" - File "..\Plugins\*.dll" - -${If} ${AtLeastWinVista} - - SetOutPath "$WINDIR" - File "..\installerdependencies\plugins\gdf.dll" - -${EndIf} +SetOutPath "$INSTDIR\plugins\" +File "..\game\plugins\*.*" SetOutPath "$INSTDIR" diff --git a/installer/settings/files_main_uninstall.nsh b/installer/settings/files_main_uninstall.nsh index af61cb0b..e76a3609 100644 --- a/installer/settings/files_main_uninstall.nsh +++ b/installer/settings/files_main_uninstall.nsh @@ -2,11 +2,9 @@ ; UltraStar Deluxe Uninstaller: Main components ; ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ - ; Delete created Icons in startmenu SetShellVarContext all - RMDir /r "$SMPROGRAMS\$ICONS_GROUP\" ; Delete created Icon on Desktop @@ -21,32 +19,47 @@ RMDir /r "$INSTDIR\fonts" RMDir /r "$INSTDIR\languages" RMDir /r "$INSTDIR\visuals" + RMDir /r "$INSTDIR\resources" RMDir /r "$INSTDIR\sounds" -; Delete remaining files +; Remove old files from previous versions + IfFileExists $INSTDIR\ScoreConverter.exe 0 +2 + Delete "$INSTDIR\ScoreConverter.exe" + IfFileExists $INSTDIR\USdx.exe 0 +2 + Delete "$INSTDIR\USdx.exe" + IfFileExists $INSTDIR\covers.cache 0 +2 + Delete "$INSTDIR\covers.cache" +; Delete remaining files Delete "$INSTDIR\ScoreConverter.exe" Delete "$INSTDIR\${exe}.exe" - Delete "$INSTDIR\Changelog.german.txt" - Delete "$INSTDIR\Changelog.txt" + Delete "$INSTDIR\ChangeLog.GERMAN.txt" + Delete "$INSTDIR\ChangeLog.txt" + Delete "$INSTDIR\LuaCommands.odt" Delete "$INSTDIR\documentation.pdf" - Delete "$INSTDIR\License.txt" - Delete "$INSTDIR\config.ini" + Delete "$INSTDIR\license.txt" Delete "$INSTDIR\README.txt" + Delete "$INSTDIR\screenshots.lnk" + Delete "$INSTDIR\playlists.lnk" + Delete "$INSTDIR\config.ini.lnk" + Delete "$INSTDIR\Error.log" - Delete "$INSTDIR\covers.cache" Delete "$INSTDIR\cover.db" - Delete "$INSTDIR\avcodec-51.dll" - Delete "$INSTDIR\avformat-50.dll" - Delete "$INSTDIR\avutil-49.dll" + Delete "$INSTDIR\avcodec-52.dll" + Delete "$INSTDIR\avformat-52.dll" + Delete "$INSTDIR\avdevice-52.dll" + Delete "$INSTDIR\avutil-50.dll" Delete "$INSTDIR\bass.dll" + Delete "$INSTDIR\freetype6.dll" Delete "$INSTDIR\glew32.dll" Delete "$INSTDIR\jpeg.dll" - Delete "$INSTDIR\libfreetype-6.dll" Delete "$INSTDIR\libpng12-0.dll" Delete "$INSTDIR\libprojectM.dll" Delete "$INSTDIR\libtiff-3.dll" + Delete "$INSTDIR\lua5.1.dll" + Delete "$INSTDIR\lua51.dll" + Delete "$INSTDIR\pcre3.dll" Delete "$INSTDIR\portaudio_x86.dll" Delete "$INSTDIR\portmixer.dll" Delete "$INSTDIR\projectM-cwrapper.dll" @@ -54,29 +67,45 @@ Delete "$INSTDIR\SDL_image.dll" Delete "$INSTDIR\SDL_ttf.dll" Delete "$INSTDIR\sqlite3.dll" + Delete "$INSTDIR\swscale-0.dll" Delete "$INSTDIR\zlib1.dll" -${If} ${AtLeastWinVista} - Delete "$WINDIR\gdf.dll" -${EndIf} + StrCpy $0 "$INSTDIR\songs" + Call un.DeleteIfEmpty + StrCpy $0 "$INSTDIR\covers" + Call un.DeleteIfEmpty - RMDir "$INSTDIR\songs\Dead Smiling Pirates - I 18" - RMDir "$INSTDIR\songs\Joshua Morin - On The Run" - RMDir "$INSTDIR\songs\Pornophonique - Space Invaders" - RMDir "$INSTDIR\songs\Steven Dunston - Northern Star" + StrCpy $0 "$INSTDIR\screenshots" + Call un.DeleteIfEmpty - StrCpy $0 "$INSTDIR\songs" + StrCpy $0 "$INSTDIR\playlists" Call un.DeleteIfEmpty - Delete "$INSTDIR\covers\NoCover.jpg" + ; Clean up AppData - StrCpy $0 "$INSTDIR\screenshots" + SetShellVarContext current + + Delete "$APPDATA\ultrastardx\Error.log" + Delete "$APPDATA\ultrastardx\cover.db" + + StrCpy $0 "$APPDATA\ultrastardx\covers" Call un.DeleteIfEmpty - StrCpy $0 "$INSTDIR\playlists" + StrCpy $0 "$APPDATA\ultrastardx\songs" + Call un.DeleteIfEmpty + + StrCpy $0 "$APPDATA\ultrastardx\screenshots" Call un.DeleteIfEmpty + StrCpy $0 "$APPDATA\ultrastardx\playlists" + Call un.DeleteIfEmpty + + StrCpy $0 "$APPDATA\ultrastardx" + Call un.DeleteIfEmpty + + SetShellVarContext all + ; Self delete: Delete "$INSTDIR\Uninstall.exe" diff --git a/installer/settings/functions.nsh b/installer/settings/functions.nsh index bbd4fea2..0b5874c5 100644 --- a/installer/settings/functions.nsh +++ b/installer/settings/functions.nsh @@ -5,7 +5,7 @@ Function CreateDesktopShortCuts SetOutPath "$INSTDIR" -CreateShortcut "$Desktop\$(sm_shortcut).lnk" "$INSTDIR\USdx.exe" +CreateShortcut "$Desktop\$(sm_shortcut).lnk" "$INSTDIR\ultrastardx.exe" FunctionEnd diff --git a/installer/settings/settings-1031.ini b/installer/settings/settings-1031.ini index 9e588fcb..bc5a425d 100644 --- a/installer/settings/settings-1031.ini +++ b/installer/settings/settings-1031.ini @@ -52,7 +52,7 @@ Bottom=38 [Field 7] Type=Droplist -ListItems=Catalan|Croatian|Danish|Dutch|English|Euskara|French|German|Italian|Norwegian|Polish|Portuguese|Serbian|Slovak|Spanish|Swedish +ListItems=Catalan|Croatian|Dutch|English|Euskara|Finnish|French|German|Greek|Italian|Japanese|Luxembourgish|Portuguese|Spanish|Swedish State=German Left=71 Right=161 diff --git a/installer/settings/settings-1033.ini b/installer/settings/settings-1033.ini index 17a08a8c..304eb672 100644 --- a/installer/settings/settings-1033.ini +++ b/installer/settings/settings-1033.ini @@ -52,7 +52,7 @@ Bottom=36 [Field 7] Type=Droplist -ListItems=Catalan|Croatian|Danish|Dutch|English|Euskara|French|German|Italian|Norwegian|Polish|Portuguese|Serbian|Slovak|Spanish|Swedish +ListItems=Catalan|Croatian|Dutch|English|Euskara|Finnish|French|German|Greek|Italian|Japanese|Luxembourgish|Portuguese|Spanish|Swedish State=English Left=70 Right=160 diff --git a/installer/settings/variables.nsh b/installer/settings/variables.nsh index db98d89f..cd69b1ea 100644 --- a/installer/settings/variables.nsh +++ b/installer/settings/variables.nsh @@ -4,17 +4,18 @@ ; Product Information: -!define version "1.1a" ; Make sure version is also set in onInit +!define version "1.1beta" ; Make sure version is also set in onInit !define name "UltraStar Deluxe" !define publisher "USDX Team" !define homepage "http://www.ultrastardeluxe.org" !define forum "http://forum.ultrastardeluxe.org" +!define wiki "http://wiki.ultrastardeluxe.org" -!define exe "USdx" +!define exe "ultrastardx" -!define license "..\installerdependencies\documents\license.txt" +!define license ".\dependencies\documents\license.txt" ; Icons @@ -34,10 +35,10 @@ !define PRODUCT_WEB_SITE "${homepage}" !define PRODUCT_UNINST_KEY "Software\Microsoft\Windows\CurrentVersion\Uninstall\${name}" !define PRODUCT_UNINST_ROOT_KEY "HKLM" -!define PRODUCT_STARTMENU_REGVAL "NSIS:StartMenuDir" ; Download URLs for Songs and Themes: +; SONGS !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" @@ -81,11 +82,7 @@ !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_sub3_song3 "http://downloads.sourceforge.net/ultrastardx/usdx_song-wise_guys_-_mensch_wo_bist_du_kar.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.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 +; THEMES +; (removed theme section - currently no additional skins available for this usdx version) \ No newline at end of file -- cgit v1.2.3 From e90d29d966c36002b3460f3f171b1899e5f1e54b Mon Sep 17 00:00:00 2001 From: canni0 Date: Mon, 12 Apr 2010 02:10:26 +0000 Subject: - added note on 'How to translate the installer' - added Hungarian installer language (thx to Gergely BOR) (settings screen is not yet completely translated!) git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@2228 b956fd51-792f-4845-bead-9b4dfca2ff2c --- installer/settings/settings-1038.ini | 136 +++++++++++++++++++++++++++++++++++ 1 file changed, 136 insertions(+) create mode 100644 installer/settings/settings-1038.ini (limited to 'installer/settings') diff --git a/installer/settings/settings-1038.ini b/installer/settings/settings-1038.ini new file mode 100644 index 00000000..fe97be91 --- /dev/null +++ b/installer/settings/settings-1038.ini @@ -0,0 +1,136 @@ +[Settings] +NumFields=16 + +[Field 1] +Type=Label +Text="Teljes képernyős mód:" +Left=0 +Right=50 +Top=27 +Bottom=35 + +[Field 2] +Type=Label +Text="Nyelv:" +Left=0 +Right=50 +Top=51 +Bottom=59 + +[Field 3] +Type=Label +Text="Felbontás:" +Left=0 +Right=50 +Top=73 +Bottom=81 + +[Field 4] +Type=Label +Text="Tabs:" +Left=0 +Right=50 +Top=100 +Bottom=108 + +[Field 5] +Type=Label +Text="Animációk/Hatások:" +Left=0 +Right=67 +Top=124 +Bottom=132 + +[Field 6] +Type=Droplist +ListItems=On|Off +State=On +Left=70 +Right=160 +Top=24 +Bottom=36 + +[Field 7] +Type=Droplist +ListItems=Catalan|Croatian|Dutch|English|Euskara|Finnish|French|German|Greek|Italian|Japanese|Luxembourgish|Portuguese|Spanish|Swedish +State=English +Left=70 +Right=160 +Top=48 +Bottom=60 + +[Field 8] +Type=Droplist +ListItems=320x200|640x480|800x600|1024x768|1280x1024|1440x900|1680x1050|1920x1200 +State=800x600 +Left=70 +Right=160 +Top=72 +Bottom=86 + +[Field 9] +Type=Droplist +ListItems=On|Off +State=Off +Left=70 +Right=160 +Top=99 +Bottom=113 + +[Field 10] +Type=Droplist +ListItems=On|Off +State=On +Left=70 +Right=160 +Top=123 +Bottom=137 + +[Field 11] +Type=Label +Text="Choose if you want to run UltraStar Deluxe in a window or fullscreen." +Left=170 +Right=305 +Top=25 +Bottom=46 + +[Field 12] +Type=Label +Text="Choose your favorite language, in that UltraStar Deluxe should be displayed." +Left=170 +Right=305 +Top=48 +Bottom=70 + +[Field 13] +Type=Label +Text="Choose your favorite screen resolution for UltraStar Deluxe adjusted to your display device." +Left=170 +Right=305 +Top=72 +Bottom=97 + +[Field 14] +Type=Label +Text="Choose whether you would like to view folders in UltraStar Deluxe or not." +Left=170 +Right=305 +Top=99 +Bottom=122 + +[Field 15] +Type=Label +Text="Here you can define some settings for UltraStar Deluxe. The settings can\r\nalso be changed in the GUI later." +Left=0 +Right=289 +Top=3 +Bottom=20 + +[Field 16] +Type=Label +Text="Choose if special effects or animations should be used by UltraStar Deluxe. Recommended: On" +Left=170 +Right=305 +Top=123 +Bottom=139 + -- cgit v1.2.3 From e84ce1549d84604afe8b81ab82059f67b4e3b3b7 Mon Sep 17 00:00:00 2001 From: canni0 Date: Fri, 23 Apr 2010 18:04:03 +0000 Subject: - Redesign of custom settings page New: Ability to select a different song dir New: Select ingame sorting - Updated language file - Fixed: Added resources folder git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@2280 b956fd51-792f-4845-bead-9b4dfca2ff2c --- installer/settings/files_main_install.nsh | 1 + installer/settings/settings-1031.ini | 197 ++++++++++++++++------------- installer/settings/settings-1033.ini | 201 +++++++++++++++++------------- installer/settings/settings-1038.ini | 201 +++++++++++++++++------------- 4 files changed, 338 insertions(+), 262 deletions(-) (limited to 'installer/settings') diff --git a/installer/settings/files_main_install.nsh b/installer/settings/files_main_install.nsh index 693e0413..bd748a12 100644 --- a/installer/settings/files_main_install.nsh +++ b/installer/settings/files_main_install.nsh @@ -36,6 +36,7 @@ File /r ..\game\themes File /r ..\game\languages File /r ..\game\sounds File /r ..\game\fonts +File /r ..\game\resources File /r ..\game\visuals ; Root dir: diff --git a/installer/settings/settings-1031.ini b/installer/settings/settings-1031.ini index bc5a425d..411e1fc1 100644 --- a/installer/settings/settings-1031.ini +++ b/installer/settings/settings-1031.ini @@ -1,136 +1,161 @@ [Settings] -NumFields=16 +NumFields=19 + +; Background Group of Settings Box +[Field 17] +Type=GroupBox +Left=0 +Top=0 +Right=300 +Bottom=140 +Text=UltraStar Deluxe Konfiguration (Optional) [Field 1] Type=Label Text="Vollbild Modus:" -Left=0 -Right=53 -Top=27 -Bottom=35 +Left=5 +Right=58 +Top=30 +Bottom=38 [Field 2] Type=Label Text="Sprache:" -Left=0 -Right=53 -Top=51 -Bottom=59 +Left=5 +Right=58 +Top=47 +Bottom=55 [Field 3] Type=Label Text="Auflösung:" -Left=0 -Right=53 -Top=73 -Bottom=81 +Left=5 +Right=58 +Top=64 +Bottom=72 [Field 4] Type=Label Text="Ordnerstruktur:" -Left=0 -Right=53 -Top=97 -Bottom=105 +Left=5 +Right=58 +Top=82 +Bottom=90 [Field 5] -Type=Label -Text="Animationen/Effekte:" -Left=0 -Right=70 -Top=124 -Bottom=132 - -[Field 6] -Type=Droplist +Type=DropList ListItems=On|Off State=On -Left=71 -Right=161 -Top=25 -Bottom=38 +Left=62 +Right=152 +Top=28 +Bottom=39 -[Field 7] -Type=Droplist -ListItems=Catalan|Croatian|Dutch|English|Euskara|Finnish|French|German|Greek|Italian|Japanese|Luxembourgish|Portuguese|Spanish|Swedish +[Field 6] +Type=DropList +ListItems=Catalan|Croatian|Dutch|English|Euskara|Finnish|French|German|Greek|Icelandic|Italian|Japanese|Luxembourgish|Portuguese|Spanish|Swedish State=German -Left=71 -Right=161 -Top=48 -Bottom=62 +Left=62 +Right=152 +Top=45 +Bottom=56 -[Field 8] -Type=Droplist +[Field 7] +Type=DropList ListItems=320x200|640x480|800x600|1024x768|1280x1024|1440x900|1680x1050|1920x1200 State=800x600 -Left=71 -Right=161 -Top=72 -Bottom=86 +Left=62 +Right=152 +Top=62 +Bottom=73 -[Field 9] -Type=Droplist +[Field 8] +Type=DropList ListItems=On|Off State=Off -Left=71 -Right=161 -Top=96 -Bottom=110 +Left=62 +Right=152 +Top=81 +Bottom=91 + +[Field 9] +Type=Label +Text=Spiel im Fenster oder Vollbild starten? +Left=157 +Right=300 +Top=30 +Bottom=38 [Field 10] -Type=Droplist -ListItems=On|Off -State=On -Left=71 -Right=161 -Top=121 -Bottom=136 +Type=Label +Text=Alle Einstellungen können nachträglich im Spielmenü geändert werden. +Left=5 +Right=246 +Top=14 +Bottom=23 [Field 11] Type=Label -Text="Wähle aus, ob das Spiel im Fenster oder \r\nals Vollbild gestartet werden soll." -Left=170 -Right=315 -Top=24 -Bottom=44 +Text=Passe die Sprache des Menüs an. +Left=158 +Right=300 +Top=46 +Bottom=55 [Field 12] Type=Label -Text="Hier können einige Einstellungen für UltraStar Deluxe vorgenommen werden.\r\nAlle Einstellungen können später im Spielmenü geändert werden." -Left=0 -Right=315 -Top=3 -Bottom=20 +Text=Wähle die Auflösung/Fenstergröße aus. +Left=157 +Right=300 +Top=64 +Bottom=72 [Field 13] Type=Label -Text="Wähle deine favorisierte Sprache, in der UltraStar Deluxe angezeigt werden soll." -Left=170 -Right=315 -Top=46 -Bottom=68 +Text=Eine virtuelle Ordnerstruktur zum Anzeigen der Lieder verwenden? +Left=158 +Right=300 +Top=78 +Bottom=94 [Field 14] Type=Label -Text="Wähle deine, dem Monitor angepasste, bevorzugte Auflösung." -Left=170 -Right=315 -Top=70 -Bottom=96 +Left=5 +Top=100 +Right=58 +Bottom=109 +Text=Sortierung: [Field 15] -Type=Label -Text="Wähle aus, ob UltraStar Deluxe eine Ordnerstruktur zum Anzeigen der Lieder verwenden soll." -Left=170 -Right=315 -Top=92 -Bottom=116 +Type=DropList +Left=62 +Top=100 +Right=152 +Bottom=111 +State=Artist +ListItems=Edition|Genre|Language|Folder|Title|Artist [Field 16] Type=Label -Text="Wähle, ob Spezialeffekte und \r\nAnimationen benutzt werden sollen." -Left=170 -Right=315 +Left=157 +Top=101 +Right=300 +Bottom=110 +Text=Kriterium zum Sortieren der Lieder wählen. + +[Field 18] +Type=DirRequest +Left=5 Top=121 -Bottom=137 +Right=152 +Bottom=132 +Text=SongDir +State= +[Field 19] +Type=Label +Left=158 +Top=119 +Right=295 +Bottom=134 +Text=Alternativen Ordner mit (weiteren) Songs für UltraStar Deluxe definieren. diff --git a/installer/settings/settings-1033.ini b/installer/settings/settings-1033.ini index 304eb672..9326d276 100644 --- a/installer/settings/settings-1033.ini +++ b/installer/settings/settings-1033.ini @@ -1,136 +1,161 @@ [Settings] -NumFields=16 +NumFields=19 + +; Background Group of Settings Box +[Field 17] +Type=GroupBox +Left=1 +Top=1 +Right=300 +Bottom=140 +Text=UltraStar Deluxe Konfiguration (Optional) [Field 1] Type=Label Text="Fullscreen Mode:" -Left=0 -Right=50 -Top=27 -Bottom=35 +Left=5 +Right=58 +Top=30 +Bottom=38 [Field 2] Type=Label Text="Language:" -Left=0 -Right=50 -Top=51 -Bottom=59 +Left=5 +Right=58 +Top=47 +Bottom=55 [Field 3] Type=Label Text="Resolution:" -Left=0 -Right=50 -Top=73 -Bottom=81 +Left=5 +Right=58 +Top=64 +Bottom=72 [Field 4] Type=Label Text="Tabs:" -Left=0 -Right=50 -Top=100 -Bottom=108 +Left=5 +Right=58 +Top=82 +Bottom=90 [Field 5] -Type=Label -Text="Animations/Effects:" -Left=0 -Right=67 -Top=124 -Bottom=132 - -[Field 6] -Type=Droplist +Type=DropList ListItems=On|Off State=On -Left=70 -Right=160 -Top=24 -Bottom=36 +Left=62 +Right=152 +Top=28 +Bottom=39 -[Field 7] -Type=Droplist -ListItems=Catalan|Croatian|Dutch|English|Euskara|Finnish|French|German|Greek|Italian|Japanese|Luxembourgish|Portuguese|Spanish|Swedish -State=English -Left=70 -Right=160 -Top=48 -Bottom=60 +[Field 6] +Type=DropList +ListItems=Catalan|Croatian|Dutch|English|Euskara|Finnish|French|German|Greek|Icelandic|Italian|Japanese|Luxembourgish|Portuguese|Spanish|Swedish +State=German +Left=62 +Right=152 +Top=45 +Bottom=56 -[Field 8] -Type=Droplist +[Field 7] +Type=DropList ListItems=320x200|640x480|800x600|1024x768|1280x1024|1440x900|1680x1050|1920x1200 State=800x600 -Left=70 -Right=160 -Top=72 -Bottom=86 +Left=62 +Right=152 +Top=62 +Bottom=73 -[Field 9] -Type=Droplist +[Field 8] +Type=DropList ListItems=On|Off State=Off -Left=70 -Right=160 -Top=99 -Bottom=113 +Left=62 +Right=152 +Top=81 +Bottom=91 + +[Field 9] +Type=Label +Text=Start game in window or fullscreen? +Left=157 +Right=300 +Top=30 +Bottom=38 [Field 10] -Type=Droplist -ListItems=On|Off -State=On -Left=70 -Right=160 -Top=123 -Bottom=137 +Type=Label +Text=All settings can also be changed in the GUI later. +Left=5 +Right=246 +Top=14 +Bottom=23 [Field 11] Type=Label -Text="Choose if you want to run UltraStar Deluxe in a window or fullscreen." -Left=170 -Right=305 -Top=25 -Bottom=46 +Text=Adjust the GUI language. +Left=158 +Right=300 +Top=46 +Bottom=55 [Field 12] Type=Label -Text="Choose your favorite language, in that UltraStar Deluxe should be displayed." -Left=170 -Right=305 -Top=48 -Bottom=70 +Text=Choose screen resolution/window size. +Left=157 +Right=300 +Top=64 +Bottom=72 [Field 13] Type=Label -Text="Choose your favorite screen resolution for UltraStar Deluxe adjusted to your display device." -Left=170 -Right=305 -Top=72 -Bottom=97 +Text=Employ a virtual folder structure to show songs? +Left=158 +Right=300 +Top=78 +Bottom=94 [Field 14] Type=Label -Text="Choose whether you would like to view folders in UltraStar Deluxe or not." -Left=170 -Right=305 -Top=99 -Bottom=122 +Left=5 +Top=100 +Right=58 +Bottom=109 +Text=Sorting: [Field 15] -Type=Label -Text="Here you can define some settings for UltraStar Deluxe. The settings can\r\nalso be changed in the GUI later." -Left=0 -Right=289 -Top=3 -Bottom=20 +Type=DropList +Left=62 +Top=100 +Right=152 +Bottom=111 +State=Artist +ListItems=Edition|Genre|Language|Folder|Title|Artist [Field 16] Type=Label -Text="Choose if special effects or animations should be used by UltraStar Deluxe. Recommended: On" -Left=170 -Right=305 -Top=123 -Bottom=139 +Left=157 +Top=101 +Right=300 +Bottom=110 +Text=Select criterion to sort songs. + +[Field 18] +Type=DirRequest +Left=5 +Top=121 +Right=152 +Bottom=132 +Text=SongDir +State= +[Field 19] +Type=Label +Left=158 +Top=119 +Right=295 +Bottom=134 +Text=Choose alternative dir with (additional) songs for UltraStar Deluxe. diff --git a/installer/settings/settings-1038.ini b/installer/settings/settings-1038.ini index fe97be91..c012c674 100644 --- a/installer/settings/settings-1038.ini +++ b/installer/settings/settings-1038.ini @@ -1,136 +1,161 @@ [Settings] -NumFields=16 +NumFields=19 + +; Background Group of Settings Box +[Field 17] +Type=GroupBox +Left=1 +Top=1 +Right=300 +Bottom=140 +Text=UltraStar Deluxe Konfiguration (Optional) [Field 1] Type=Label Text="Teljes képernyős mód:" -Left=0 -Right=50 -Top=27 -Bottom=35 +Left=5 +Right=58 +Top=30 +Bottom=38 [Field 2] Type=Label Text="Nyelv:" -Left=0 -Right=50 -Top=51 -Bottom=59 +Left=5 +Right=58 +Top=47 +Bottom=55 [Field 3] Type=Label Text="Felbontás:" -Left=0 -Right=50 -Top=73 -Bottom=81 +Left=5 +Right=58 +Top=64 +Bottom=72 [Field 4] Type=Label Text="Tabs:" -Left=0 -Right=50 -Top=100 -Bottom=108 +Left=5 +Right=58 +Top=82 +Bottom=90 [Field 5] -Type=Label -Text="Animációk/Hatások:" -Left=0 -Right=67 -Top=124 -Bottom=132 - -[Field 6] -Type=Droplist +Type=DropList ListItems=On|Off State=On -Left=70 -Right=160 -Top=24 -Bottom=36 +Left=62 +Right=152 +Top=28 +Bottom=39 -[Field 7] -Type=Droplist -ListItems=Catalan|Croatian|Dutch|English|Euskara|Finnish|French|German|Greek|Italian|Japanese|Luxembourgish|Portuguese|Spanish|Swedish -State=English -Left=70 -Right=160 -Top=48 -Bottom=60 +[Field 6] +Type=DropList +ListItems=Catalan|Croatian|Dutch|English|Euskara|Finnish|French|German|Greek|Icelandic|Italian|Japanese|Luxembourgish|Portuguese|Spanish|Swedish +State=German +Left=62 +Right=152 +Top=45 +Bottom=56 -[Field 8] -Type=Droplist +[Field 7] +Type=DropList ListItems=320x200|640x480|800x600|1024x768|1280x1024|1440x900|1680x1050|1920x1200 State=800x600 -Left=70 -Right=160 -Top=72 -Bottom=86 +Left=62 +Right=152 +Top=62 +Bottom=73 -[Field 9] -Type=Droplist +[Field 8] +Type=DropList ListItems=On|Off State=Off -Left=70 -Right=160 -Top=99 -Bottom=113 +Left=62 +Right=152 +Top=81 +Bottom=91 + +[Field 9] +Type=Label +Text=Start game in window or fullscreen? +Left=157 +Right=300 +Top=30 +Bottom=38 [Field 10] -Type=Droplist -ListItems=On|Off -State=On -Left=70 -Right=160 -Top=123 -Bottom=137 +Type=Label +Text=All settings can also be changed in the GUI later. +Left=5 +Right=246 +Top=14 +Bottom=23 [Field 11] Type=Label -Text="Choose if you want to run UltraStar Deluxe in a window or fullscreen." -Left=170 -Right=305 -Top=25 -Bottom=46 +Text=Adjust the GUI language. +Left=158 +Right=300 +Top=46 +Bottom=55 [Field 12] Type=Label -Text="Choose your favorite language, in that UltraStar Deluxe should be displayed." -Left=170 -Right=305 -Top=48 -Bottom=70 +Text=Choose screen resolution/window size. +Left=157 +Right=300 +Top=64 +Bottom=72 [Field 13] Type=Label -Text="Choose your favorite screen resolution for UltraStar Deluxe adjusted to your display device." -Left=170 -Right=305 -Top=72 -Bottom=97 +Text=Employ a virtual folder structure to show songs? +Left=158 +Right=300 +Top=78 +Bottom=94 [Field 14] Type=Label -Text="Choose whether you would like to view folders in UltraStar Deluxe or not." -Left=170 -Right=305 -Top=99 -Bottom=122 +Left=5 +Top=100 +Right=58 +Bottom=109 +Text=Sorting: [Field 15] -Type=Label -Text="Here you can define some settings for UltraStar Deluxe. The settings can\r\nalso be changed in the GUI later." -Left=0 -Right=289 -Top=3 -Bottom=20 +Type=DropList +Left=62 +Top=100 +Right=152 +Bottom=111 +State=Artist +ListItems=Edition|Genre|Language|Folder|Title|Artist [Field 16] Type=Label -Text="Choose if special effects or animations should be used by UltraStar Deluxe. Recommended: On" -Left=170 -Right=305 -Top=123 -Bottom=139 +Left=157 +Top=101 +Right=300 +Bottom=110 +Text=Select criterion to sort songs. + +[Field 18] +Type=DirRequest +Left=5 +Top=121 +Right=152 +Bottom=132 +Text=SongDir +State= +[Field 19] +Type=Label +Left=158 +Top=119 +Right=295 +Bottom=134 +Text=Choose alternative dir with (additional) songs for UltraStar Deluxe. -- cgit v1.2.3 From 9003393b3d859040c7bc1b75f2f4025244b921f4 Mon Sep 17 00:00:00 2001 From: canni0 Date: Fri, 23 Apr 2010 19:49:28 +0000 Subject: - Swapped out song downloads in separate file - Added: Song group to store a new song git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@2281 b956fd51-792f-4845-bead-9b4dfca2ff2c --- installer/settings/files_opt_songs.nsh | 931 +++++++++++++++++++++++++++++++++ installer/settings/variables.nsh | 3 +- 2 files changed, 933 insertions(+), 1 deletion(-) create mode 100644 installer/settings/files_opt_songs.nsh (limited to 'installer/settings') diff --git a/installer/settings/files_opt_songs.nsh b/installer/settings/files_opt_songs.nsh new file mode 100644 index 00000000..d8d4ef28 --- /dev/null +++ b/installer/settings/files_opt_songs.nsh @@ -0,0 +1,931 @@ +; ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ +; UltraStar Deluxe Installer: Download optional songs +; ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ + +SectionGroup $(name_section2) Section2 + +;----------------------------------------------------------------------- +; BODO WARTKE +;----------------------------------------------------------------------- +Section /o "Bodo Wartke - Liebeslied (Love Song)" g2Section1 + + AddSize 10343 + SetOverwrite try + SetOutPath "$INSTDIR\songs\" + +; Download song: + NSISdl::download /TIMEOUT=50000 ${download_song1} $LOCALAPPDATA\Temp\Song-BodoWartke-LoveSong.zip + + Pop $R0 + StrCmp $R0 "success" dlok + MessageBox MB_OK|MB_ICONEXCLAMATION "Download Error, click OK to Continue" /SD IDOK + dlok: + ZipDLL::extractall "$LOCALAPPDATA\Temp\Song-BodoWartke-LoveSong.zip" "$INSTDIR\songs\" + + Delete "$LOCALAPPDATA\Temp\Song-BodoWartke-LoveSong.zip" + + SetOutPath "$INSTDIR" + +SectionEnd + +;----------------------------------------------------------------------- +; Dead Smiling Pirates - I 18 +;----------------------------------------------------------------------- + +Section /o "Dead Smiling Pirates - I 18" g2Section2 + AddSize 2816 + SetOverwrite try + SetOutPath "$INSTDIR" + CreateDirectory "$INSTDIR\songs\Dead Smiling Pirates - I 18" + SetOutPath "$INSTDIR\songs\Dead Smiling Pirates - I 18\" + +; Download song: + NSISdl::download /TIMEOUT=50000 ${download_song2} $LOCALAPPDATA\Temp\Song-I-18.zip + + Pop $R0 + StrCmp $R0 "success" dlok + MessageBox MB_OK|MB_ICONEXCLAMATION "Download Error, click OK to Continue" /SD IDOK + dlok: + ZipDLL::extractall "$LOCALAPPDATA\Temp\Song-I-18.zip" "$INSTDIR\songs\Dead Smiling Pirates - I 18\" + + Delete "$LOCALAPPDATA\Temp\Song-I-18.zip" + + SetOutPath "$INSTDIR" + +SectionEnd + +;----------------------------------------------------------------------- +; Jonathan Coulton Songs +;----------------------------------------------------------------------- + +SectionGroup $(name_s2_sub1) s2_sub1 + +Section /o "A Talk With George" s2_sub1_Section15 + + AddSize 4076 + SetOverwrite try + SetOutPath "$INSTDIR\songs\" + +; Download song: + NSISdl::download /TIMEOUT=50000 ${download_sub1_song15} $LOCALAPPDATA\Temp\Song-JC-ATWG.zip + + Pop $R0 + StrCmp $R0 "success" dlok + MessageBox MB_OK|MB_ICONEXCLAMATION "Download Error, click OK to Continue" /SD IDOK + dlok: + ZipDLL::extractall "$LOCALAPPDATA\Temp\Song-JC-ATWG.zip" "$INSTDIR\songs\" + + Delete "$LOCALAPPDATA\Temp\Song-JC-ATWG.zip" + + SetOutPath "$INSTDIR" +SectionEnd +;----------------------------------------------------------------------- +Section /o "Better" s2_sub1_Section19 + + AddSize 4199 + SetOverwrite try + SetOutPath "$INSTDIR\songs\" + +; Download song: + NSISdl::download /TIMEOUT=50000 ${download_sub1_song19} $LOCALAPPDATA\Temp\Song-JC-Better.zip + + Pop $R0 + StrCmp $R0 "success" dlok + MessageBox MB_OK|MB_ICONEXCLAMATION "Download Error, click OK to Continue" /SD IDOK + dlok: + ZipDLL::extractall "$LOCALAPPDATA\Temp\Song-JC-Better.zip" "$INSTDIR\songs\" + + Delete "$LOCALAPPDATA\Temp\Song-JC-Better.zip" + + SetOutPath "$INSTDIR" + +SectionEnd +;----------------------------------------------------------------------- +Section /o "Monkey Shines" s2_sub1_Section1 + + AddSize 1455 + SetOverwrite try + SetOutPath "$INSTDIR\songs\" + +; Download song: + NSISdl::download /TIMEOUT=50000 ${download_sub1_song1} $LOCALAPPDATA\Temp\Song-JC-MS.zip + + Pop $R0 + StrCmp $R0 "success" dlok + MessageBox MB_OK|MB_ICONEXCLAMATION "Download Error, click OK to Continue" /SD IDOK + dlok: + ZipDLL::extractall "$LOCALAPPDATA\Temp\Song-JC-MS.zip" "$INSTDIR\songs\" + + Delete "$LOCALAPPDATA\Temp\Song-JC-MS.zip" + + SetOutPath "$INSTDIR" + +SectionEnd +;----------------------------------------------------------------------- +Section /o "I Crush Everything" s2_sub1_Section2 + + AddSize 7127 + SetOverwrite try + SetOutPath "$INSTDIR\songs\" + +; Download song: + NSISdl::download /TIMEOUT=50000 ${download_sub1_song2} $LOCALAPPDATA\Temp\Song-JC-ICE.zip + + Pop $R0 + StrCmp $R0 "success" dlok + MessageBox MB_OK|MB_ICONEXCLAMATION "Download Error, click OK to Continue" /SD IDOK + dlok: + ZipDLL::extractall "$LOCALAPPDATA\Temp\Song-JC-ICE.zip" "$INSTDIR\songs\" + + Delete "$LOCALAPPDATA\Temp\Song-JC-ICE.zip" + + SetOutPath "$INSTDIR" + +SectionEnd +;----------------------------------------------------------------------- +Section /o "Not About You" s2_sub1_Section3 + + AddSize 3492 + SetOverwrite try + SetOutPath "$INSTDIR\songs\" + +; Download song: + NSISdl::download /TIMEOUT=50000 ${download_sub1_song3} $LOCALAPPDATA\Temp\Song-JC-NAY.zip + + Pop $R0 + StrCmp $R0 "success" dlok + MessageBox MB_OK|MB_ICONEXCLAMATION "Download Error, click OK to Continue" /SD IDOK + dlok: + ZipDLL::extractall "$LOCALAPPDATA\Temp\Song-JC-NAY.zip" "$INSTDIR\songs\" + + Delete "$LOCALAPPDATA\Temp\Song-JC-NAY.zip" + + SetOutPath "$INSTDIR" + +SectionEnd +;----------------------------------------------------------------------- +Section /o "Mr. Fancy Pants" s2_sub1_Section4 + + AddSize 2427 + SetOverwrite try + SetOutPath "$INSTDIR\songs\" + +; Download song: + NSISdl::download /TIMEOUT=50000 ${download_sub1_song4} $LOCALAPPDATA\Temp\Song-JC-MFP.zip + + Pop $R0 + StrCmp $R0 "success" dlok + MessageBox MB_OK|MB_ICONEXCLAMATION "Download Error, click OK to Continue" /SD IDOK + dlok: + ZipDLL::extractall "$LOCALAPPDATA\Temp\Song-JC-MFP.zip" "$INSTDIR\songs\" + + Delete "$LOCALAPPDATA\Temp\Song-JC-MFP.zip" + + SetOutPath "$INSTDIR" + +SectionEnd +;----------------------------------------------------------------------- +Section /o "Big Bad World One" s2_sub1_Section5 + + AddSize 4424 + SetOverwrite try + SetOutPath "$INSTDIR\songs\" + +; Download song: + NSISdl::download /TIMEOUT=50000 ${download_sub1_song5} $LOCALAPPDATA\Temp\Song-JC-BBWO.zip + + Pop $R0 + StrCmp $R0 "success" dlok + MessageBox MB_OK|MB_ICONEXCLAMATION "Download Error, click OK to Continue" /SD IDOK + dlok: + ZipDLL::extractall "$LOCALAPPDATA\Temp\Song-JC-BBWO.zip" "$INSTDIR\songs\" + + Delete "$LOCALAPPDATA\Temp\Song-JC-BBWO.zip" + + SetOutPath "$INSTDIR" + +SectionEnd +;----------------------------------------------------------------------- +Section /o "Flickr" s2_sub1_Section6 + + AddSize 21607 + SetOverwrite try + SetOutPath "$INSTDIR\songs\" + +; Download song: + NSISdl::download /TIMEOUT=50000 ${download_sub1_song6} $LOCALAPPDATA\Temp\Song-JC-Flickr.zip + + Pop $R0 + StrCmp $R0 "success" dlok + MessageBox MB_OK|MB_ICONEXCLAMATION "Download Error, click OK to Continue" /SD IDOK + dlok: + ZipDLL::extractall "$LOCALAPPDATA\Temp\Song-JC-Flickr.zip" "$INSTDIR\songs\" + + Delete "$LOCALAPPDATA\Temp\Song-JC-Flickr.zip" + + SetOutPath "$INSTDIR" + +SectionEnd +;----------------------------------------------------------------------- +Section /o "My Beige Bear" s2_sub1_Section7 + + AddSize 4926 + SetOverwrite try + SetOutPath "$INSTDIR\songs\" + +; Download song: + NSISdl::download /TIMEOUT=50000 ${download_sub1_song7} $LOCALAPPDATA\Temp\Song-JC-MBB.zip + + Pop $R0 + StrCmp $R0 "success" dlok + MessageBox MB_OK|MB_ICONEXCLAMATION "Download Error, click OK to Continue" /SD IDOK + dlok: + ZipDLL::extractall "$LOCALAPPDATA\Temp\Song-JC-MBB.zip" "$INSTDIR\songs\" + + Delete "$LOCALAPPDATA\Temp\Song-JC-MBB.zip" + + SetOutPath "$INSTDIR" + +SectionEnd +;----------------------------------------------------------------------- +Section /o "The Future Soon" s2_sub1_Section8 + + AddSize 5612 + SetOverwrite try + SetOutPath "$INSTDIR\songs\" + +; Download song: + NSISdl::download /TIMEOUT=50000 ${download_sub1_song8} $LOCALAPPDATA\Temp\Song-JC-TFS.zip + + Pop $R0 + StrCmp $R0 "success" dlok + MessageBox MB_OK|MB_ICONEXCLAMATION "Download Error, click OK to Continue" /SD IDOK + dlok: + ZipDLL::extractall "$LOCALAPPDATA\Temp\Song-JC-TFS.zip" "$INSTDIR\songs\" + + Delete "$LOCALAPPDATA\Temp\Song-JC-TFS.zip" + + SetOutPath "$INSTDIR" + +SectionEnd +;----------------------------------------------------------------------- +Section /o "Ikea" s2_sub1_Section9 + + AddSize 4608 + SetOverwrite try + SetOutPath "$INSTDIR\songs\" + +; Download song: + NSISdl::download /TIMEOUT=50000 ${download_sub1_song9} $LOCALAPPDATA\Temp\Song-JC-Ikea.zip + + Pop $R0 + StrCmp $R0 "success" dlok + MessageBox MB_OK|MB_ICONEXCLAMATION "Download Error, click OK to Continue" /SD IDOK + dlok: + ZipDLL::extractall "$LOCALAPPDATA\Temp\Song-JC-Ikea.zip" "$INSTDIR\songs\" + + Delete "$LOCALAPPDATA\Temp\Song-JC-Ikea.zip" + + SetOutPath "$INSTDIR" + +SectionEnd +;----------------------------------------------------------------------- +Section /o "Furry Old Lobster" s2_sub1_Section10 + + AddSize 3288 + SetOverwrite try + SetOutPath "$INSTDIR\songs\" + +; Download song: + NSISdl::download /TIMEOUT=50000 ${download_sub1_song10} $LOCALAPPDATA\Temp\Song-JC-FOL.zip + + Pop $R0 + StrCmp $R0 "success" dlok + MessageBox MB_OK|MB_ICONEXCLAMATION "Download Error, click OK to Continue" /SD IDOK + dlok: + ZipDLL::extractall "$LOCALAPPDATA\Temp\Song-JC-FOL.zip" "$INSTDIR\songs\" + + Delete "$LOCALAPPDATA\Temp\Song-JC-FOL.zip" + + SetOutPath "$INSTDIR" + +SectionEnd +;----------------------------------------------------------------------- +Section /o "Code Monkey" s2_sub1_Section11 + + AddSize 21402 + SetOverwrite try + SetOutPath "$INSTDIR\songs\" + +; Download song: + NSISdl::download /TIMEOUT=50000 ${download_sub1_song11} $LOCALAPPDATA\Temp\Song-JC-CM.zip + + Pop $R0 + StrCmp $R0 "success" dlok + MessageBox MB_OK|MB_ICONEXCLAMATION "Download Error, click OK to Continue" /SD IDOK + dlok: + ZipDLL::extractall "$LOCALAPPDATA\Temp\Song-JC-CM.zip" "$INSTDIR\songs\" + + Delete "$LOCALAPPDATA\Temp\Song-JC-CM.zip" + + SetOutPath "$INSTDIR" + +SectionEnd +;----------------------------------------------------------------------- +Section /o "I´m Your Moon" s2_sub1_Section12 + + AddSize 4916 + SetOverwrite try + SetOutPath "$INSTDIR\songs\" + +; Download song: + NSISdl::download /TIMEOUT=50000 ${download_sub1_song12} $LOCALAPPDATA\Temp\Song-JC-IYM.zip + + Pop $R0 + StrCmp $R0 "success" dlok + MessageBox MB_OK|MB_ICONEXCLAMATION "Download Error, click OK to Continue" /SD IDOK + dlok: + ZipDLL::extractall "$LOCALAPPDATA\Temp\Song-JC-IYM.zip" "$INSTDIR\songs\" + + Delete "$LOCALAPPDATA\Temp\Song-JC-IYM.zip" + + SetOutPath "$INSTDIR" + +SectionEnd +;----------------------------------------------------------------------- +Section /o "First Of May" s2_sub1_Section13 + + AddSize 6257 + SetOverwrite try + SetOutPath "$INSTDIR\songs\" + +; Download song: + NSISdl::download /TIMEOUT=50000 ${download_sub1_song13} $LOCALAPPDATA\Temp\Song-JC-FOM.zip + + Pop $R0 + StrCmp $R0 "success" dlok + MessageBox MB_OK|MB_ICONEXCLAMATION "Download Error, click OK to Continue" /SD IDOK + dlok: + ZipDLL::extractall "$LOCALAPPDATA\Temp\Song-JC-FOM.zip" "$INSTDIR\songs\" + + Delete "$LOCALAPPDATA\Temp\Song-JC-FOM.zip" + + SetOutPath "$INSTDIR" + +SectionEnd +;----------------------------------------------------------------------- +Section /o "Dance, Soterious Johnson, Dance" s2_sub1_Section14 + + AddSize 5929 + SetOverwrite try + SetOutPath "$INSTDIR\songs\" + +; Download song: + NSISdl::download /TIMEOUT=50000 ${download_sub1_song14} $LOCALAPPDATA\Temp\Song-JC-DSJD.zip + + Pop $R0 + StrCmp $R0 "success" dlok + MessageBox MB_OK|MB_ICONEXCLAMATION "Download Error, click OK to Continue" /SD IDOK + dlok: + ZipDLL::extractall "$LOCALAPPDATA\Temp\Song-JC-DSJD.zip" "$INSTDIR\songs\" + + Delete "$LOCALAPPDATA\Temp\Song-JC-DSJD.zip" + + SetOutPath "$INSTDIR" + +SectionEnd +;----------------------------------------------------------------------- +Section /o "Creepy Doll" s2_sub1_Section16 + + AddSize 66560 + SetOverwrite try + SetOutPath "$INSTDIR\songs\" + +; Download song: + NSISdl::download /TIMEOUT=50000 ${download_sub1_song16} $LOCALAPPDATA\Temp\Song-JC-CD.zip + + Pop $R0 + StrCmp $R0 "success" dlok + MessageBox MB_OK|MB_ICONEXCLAMATION "Download Error, click OK to Continue" /SD IDOK + dlok: + ZipDLL::extractall "$LOCALAPPDATA\Temp\Song-JC-CD.zip" "$INSTDIR\songs\" + + Delete "$LOCALAPPDATA\Temp\Song-JC-CD.zip" + + SetOutPath "$INSTDIR" + +SectionEnd +;----------------------------------------------------------------------- +Section /o "That Spells DNA" s2_sub1_Section17 + + AddSize 4158 + SetOverwrite try + SetOutPath "$INSTDIR\songs\" + +; Download song: + NSISdl::download /TIMEOUT=50000 ${download_sub1_song17} $LOCALAPPDATA\Temp\Song-JC-TSDNA.zip + + Pop $R0 + StrCmp $R0 "success" dlok + MessageBox MB_OK|MB_ICONEXCLAMATION "Download Error, click OK to Continue" /SD IDOK + dlok: + ZipDLL::extractall "$LOCALAPPDATA\Temp\Song-JC-TSDNA.zip" "$INSTDIR\songs\" + + Delete "$LOCALAPPDATA\Temp\Song-JC-TSDNA.zip" + + SetOutPath "$INSTDIR" + +SectionEnd +;----------------------------------------------------------------------- +Section /o "When You Go" s2_sub1_Section18 + + AddSize 5755 + SetOverwrite try + SetOutPath "$INSTDIR\songs\" + +; Download song: + NSISdl::download /TIMEOUT=50000 ${download_sub1_song18} $LOCALAPPDATA\Temp\Song-JC-WYG.zip + + Pop $R0 + StrCmp $R0 "success" dlok + MessageBox MB_OK|MB_ICONEXCLAMATION "Download Error, click OK to Continue" /SD IDOK + dlok: + ZipDLL::extractall "$LOCALAPPDATA\Temp\Song-JC-WYG.zip" "$INSTDIR\songs\" + + Delete "$LOCALAPPDATA\Temp\Song-JC-WYG.zip" + + SetOutPath "$INSTDIR" + +SectionEnd +;----------------------------------------------------------------------- +Section /o "Shop Vac" s2_sub1_Section20 + + AddSize 5448 + SetOverwrite try + SetOutPath "$INSTDIR\songs\" + +; Download song: + NSISdl::download /TIMEOUT=50000 ${download_sub1_song20} $LOCALAPPDATA\Temp\Song-JC-SV.zip + + Pop $R0 + StrCmp $R0 "success" dlok + MessageBox MB_OK|MB_ICONEXCLAMATION "Download Error, click OK to Continue" /SD IDOK + dlok: + ZipDLL::extractall "$LOCALAPPDATA\Temp\Song-JC-SV.zip" "$INSTDIR\songs\" + + Delete "$LOCALAPPDATA\Temp\Song-JC-SV.zip" + + SetOutPath "$INSTDIR" + +SectionEnd +;----------------------------------------------------------------------- +Section /o "I Feel Fantastic" s2_sub1_Section21 + + AddSize 3851 + SetOverwrite try + SetOutPath "$INSTDIR\songs\" + +; Download song: + NSISdl::download /TIMEOUT=50000 ${download_sub1_song21} $LOCALAPPDATA\Temp\Song-JC-IFF.zip + + Pop $R0 + StrCmp $R0 "success" dlok + MessageBox MB_OK|MB_ICONEXCLAMATION "Download Error, click OK to Continue" /SD IDOK + dlok: + ZipDLL::extractall "$LOCALAPPDATA\Temp\Song-JC-IFF.zip" "$INSTDIR\songs\" + + Delete "$LOCALAPPDATA\Temp\Song-JC-IFF.zip" + + SetOutPath "$INSTDIR" + +SectionEnd +;----------------------------------------------------------------------- +Section /o "Re: Your Brains" s2_sub1_Section22 + + AddSize 7087 + SetOverwrite try + SetOutPath "$INSTDIR\songs\" + +; Download song: + NSISdl::download /TIMEOUT=50000 ${download_sub1_song22} $LOCALAPPDATA\Temp\Song-JC-ReYB.zip + + Pop $R0 + StrCmp $R0 "success" dlok + MessageBox MB_OK|MB_ICONEXCLAMATION "Download Error, click OK to Continue" /SD IDOK + dlok: + ZipDLL::extractall "$LOCALAPPDATA\Temp\Song-JC-ReYB.zip" "$INSTDIR\songs\" + + Delete "$LOCALAPPDATA\Temp\Song-JC-ReYB.zip" + + SetOutPath "$INSTDIR" + +SectionEnd +;----------------------------------------------------------------------- +Section /o "Skullcrusher Mountain" s2_sub1_Section23 + + AddSize 6298 + SetOverwrite try + SetOutPath "$INSTDIR\songs\" + +; Download song: + NSISdl::download /TIMEOUT=50000 ${download_sub1_song23} $LOCALAPPDATA\Temp\Song-JC-SCM.zip + + Pop $R0 + StrCmp $R0 "success" dlok + MessageBox MB_OK|MB_ICONEXCLAMATION "Download Error, click OK to Continue" /SD IDOK + dlok: + ZipDLL::extractall "$LOCALAPPDATA\Temp\Song-JC-SCM.zip" "$INSTDIR\songs\" + + Delete "$LOCALAPPDATA\Temp\Song-JC-SCM.zip" + + SetOutPath "$INSTDIR" + +SectionEnd +;----------------------------------------------------------------------- +Section /o "Chiron Beta Prime" s2_sub1_Section24 + + AddSize 38298 + SetOverwrite try + SetOutPath "$INSTDIR\songs\" + +; Download song: + NSISdl::download /TIMEOUT=50000 ${download_sub1_song24} $LOCALAPPDATA\Temp\Song-JC-CBP.zip + + Pop $R0 + StrCmp $R0 "success" dlok + MessageBox MB_OK|MB_ICONEXCLAMATION "Download Error, click OK to Continue" /SD IDOK + dlok: + ZipDLL::extractall "$LOCALAPPDATA\Temp\Song-JC-CBP.zip" "$INSTDIR\songs\" + + Delete "$LOCALAPPDATA\Temp\Song-JC-CBP.zip" + + SetOutPath "$INSTDIR" + +SectionEnd + +SectionGroupEnd +;----------------------------------------------------------------------- +; Joshua Morin - On The Run +;----------------------------------------------------------------------- +Section /o "Joshua Morin - On The Run" g2Section3 + AddSize 3881 + SetOverwrite try + SetOutPath "$INSTDIR" + CreateDirectory "$INSTDIR\songs\Joshua Morin - On The Run" + SetOutPath "$INSTDIR\songs\Joshua Morin - On The Run\" + +; Download song: + NSISdl::download /TIMEOUT=50000 ${download_song3} $LOCALAPPDATA\Temp\Song-On-the-run.zip + + Pop $R0 ;Get the return value + StrCmp $R0 "success" dlok + MessageBox MB_OK|MB_ICONEXCLAMATION "Download Error, click OK to Continue" /SD IDOK + dlok: + ZipDLL::extractall "$LOCALAPPDATA\Temp\Song-On-the-run.zip" "$INSTDIR\songs\Joshua Morin - On The Run\" + + Delete "$LOCALAPPDATA\Temp\Song-On-the-run.zip" + + SetOutPath "$INSTDIR" + +SectionEnd +;----------------------------------------------------------------------- +; Pornophonique +;----------------------------------------------------------------------- +SectionGroup $(name_s2_sub4) s2_sub4 + +Section /o "Pornophonique - Space Invaders" g2Section4 + AddSize 3646 + SetOverwrite try + SetOutPath "$INSTDIR" + CreateDirectory "$INSTDIR\songs\Pornophonique - Space Invaders" + SetOutPath "$INSTDIR\songs\Pornophonique - Space Invaders\" + +; Download song: + NSISdl::download /TIMEOUT=50000 ${download_song4} $LOCALAPPDATA\Temp\Song-Space-Invaders.zip + + Pop $R0 ;Get the return value + StrCmp $R0 "success" dlok + MessageBox MB_OK|MB_ICONEXCLAMATION "Download Error, click OK to Continue" /SD IDOK + dlok: + ZipDLL::extractall "$LOCALAPPDATA\Temp\Song-Space-Invaders.zip" "$INSTDIR\songs\Pornophonique - Space Invaders\" + + Delete "$LOCALAPPDATA\Temp\Song-Space-Invaders.zip" + + SetOutPath "$INSTDIR" + +SectionEnd +;----------------------------------------------------------------------- +Section /o "Pornophonique - Space Invaders (Karaoke)" g2Section6 + AddSize 3779 + SetOverwrite try + SetOutPath "$INSTDIR\songs" + +; Download song: + NSISdl::download /TIMEOUT=50000 ${download_song6} $LOCALAPPDATA\Temp\Song-SpaceInvadersKAR.zip + + Pop $R0 ;Get the return value + StrCmp $R0 "success" dlok + MessageBox MB_OK|MB_ICONEXCLAMATION "Download Error, click OK to Continue" /SD IDOK + dlok: + ZipDLL::extractall "$LOCALAPPDATA\Temp\Song-SpaceInvadersKAR.zip" "$INSTDIR\songs\" + + Delete "$LOCALAPPDATA\Temp\Song-SpaceInvadersKAR.zip" + + SetOutPath "$INSTDIR" + +SectionEnd + +SectionGroupEnd +;----------------------------------------------------------------------- +; Shearer +;----------------------------------------------------------------------- +SectionGroup $(name_s2_sub2) s2_sub2 + +Section /o "Shearer - 69" s2_sub2_Section1 + + AddSize 4557 + SetOverwrite try + SetOutPath "$INSTDIR\songs\" + +; Download song: + NSISdl::download /TIMEOUT=50000 ${download_sub2_song1} $LOCALAPPDATA\Temp\Song-Shearer-69.zip + + Pop $R0 + StrCmp $R0 "success" dlok + MessageBox MB_OK|MB_ICONEXCLAMATION "Download Error, click OK to Continue" /SD IDOK + dlok: + ZipDLL::extractall "$LOCALAPPDATA\Temp\Song-Shearer-69.zip" "$INSTDIR\songs\" + + Delete "$LOCALAPPDATA\Temp\Song-Shearer-69.zip" + + SetOutPath "$INSTDIR" + +SectionEnd +;----------------------------------------------------------------------- +Section /o "Shearer - 69 (Karaoke)" s2_sub2_Section2 + + AddSize 4772 + SetOverwrite try + SetOutPath "$INSTDIR\songs\" + +; Download song: + NSISdl::download /TIMEOUT=50000 ${download_sub2_song2} $LOCALAPPDATA\Temp\Song-Shearer-69-Kar.zip + + Pop $R0 + StrCmp $R0 "success" dlok + MessageBox MB_OK|MB_ICONEXCLAMATION "Download Error, click OK to Continue" /SD IDOK + dlok: + ZipDLL::extractall "$LOCALAPPDATA\Temp\Song-Shearer-69-Kar.zip" "$INSTDIR\songs\" + + Delete "$LOCALAPPDATA\Temp\Song-Shearer-69-Kar.zip" + + SetOutPath "$INSTDIR" + +SectionEnd +;----------------------------------------------------------------------- +Section /o "Shearer - Can't stop it" s2_sub2_Section3 + + AddSize 5510 + SetOverwrite try + SetOutPath "$INSTDIR\songs\" + +; Download song: + NSISdl::download /TIMEOUT=50000 ${download_sub2_song3} $LOCALAPPDATA\Temp\Song-Shearer-CSI.zip + + Pop $R0 + StrCmp $R0 "success" dlok + MessageBox MB_OK|MB_ICONEXCLAMATION "Download Error, click OK to Continue" /SD IDOK + dlok: + ZipDLL::extractall "$LOCALAPPDATA\Temp\Song-Shearer-CSI.zip" "$INSTDIR\songs\" + + Delete "$LOCALAPPDATA\Temp\Song-Shearer-CSI.zip" + + SetOutPath "$INSTDIR" + +SectionEnd +;----------------------------------------------------------------------- +Section /o "Shearer - Can't stop it (Karaoke)" s2_sub2_Section4 + + AddSize 4178 + SetOverwrite try + SetOutPath "$INSTDIR\songs\" + +; Download song: + NSISdl::download /TIMEOUT=50000 ${download_sub2_song4} $LOCALAPPDATA\Temp\Song-Shearer-CSI-Kar.zip + + Pop $R0 + StrCmp $R0 "success" dlok + MessageBox MB_OK|MB_ICONEXCLAMATION "Download Error, click OK to Continue" /SD IDOK + dlok: + ZipDLL::extractall "$LOCALAPPDATA\Temp\Song-Shearer-CSI-Kar.zip" "$INSTDIR\songs\" + + Delete "$LOCALAPPDATA\Temp\Song-Shearer-CSI-Kar.zip" + + SetOutPath "$INSTDIR" + +SectionEnd +;----------------------------------------------------------------------- +Section /o "Shearer - In My Hand" s2_sub2_Section5 + + AddSize 5960 + SetOverwrite try + SetOutPath "$INSTDIR\songs\" + +; Download song: + NSISdl::download /TIMEOUT=50000 ${download_sub2_song5} $LOCALAPPDATA\Temp\Song-Shearer-IMH.zip + + Pop $R0 + StrCmp $R0 "success" dlok + MessageBox MB_OK|MB_ICONEXCLAMATION "Download Error, click OK to Continue" /SD IDOK + dlok: + ZipDLL::extractall "$LOCALAPPDATA\Temp\Song-Shearer-IMH.zip" "$INSTDIR\songs\" + + Delete "$LOCALAPPDATA\Temp\Song-Shearer-IMH.zip" + + SetOutPath "$INSTDIR" + +SectionEnd +;----------------------------------------------------------------------- +Section /o "Shearer - Man Song" s2_sub2_Section6 + + AddSize 7270 + SetOverwrite try + SetOutPath "$INSTDIR\songs\" + +; Download song: + NSISdl::download /TIMEOUT=50000 ${download_sub2_song6} $LOCALAPPDATA\Temp\Song-Shearer-MS.zip + + Pop $R0 + StrCmp $R0 "success" dlok + MessageBox MB_OK|MB_ICONEXCLAMATION "Download Error, click OK to Continue" /SD IDOK + dlok: + ZipDLL::extractall "$LOCALAPPDATA\Temp\Song-Shearer-MS.zip" "$INSTDIR\songs\" + + Delete "$LOCALAPPDATA\Temp\Song-Shearer-MS.zip" + + SetOutPath "$INSTDIR" + +SectionEnd +;----------------------------------------------------------------------- +Section /o "Shearer - Man Song (Karaoke)" s2_sub2_Section7 + + AddSize 5807 + SetOverwrite try + SetOutPath "$INSTDIR\songs\" + +; Download song: + NSISdl::download /TIMEOUT=50000 ${download_sub2_song7} $LOCALAPPDATA\Temp\Song-Shearer-MS-Kar.zip + + Pop $R0 + StrCmp $R0 "success" dlok + MessageBox MB_OK|MB_ICONEXCLAMATION "Download Error, click OK to Continue" /SD IDOK + dlok: + ZipDLL::extractall "$LOCALAPPDATA\Temp\Song-Shearer-MS-Kar.zip" "$INSTDIR\songs\" + + Delete "$LOCALAPPDATA\Temp\Song-Shearer-MS-Kar.zip" + + SetOutPath "$INSTDIR" + +SectionEnd +;----------------------------------------------------------------------- +Section /o "Shearer - Stay With Me" s2_sub2_Section8 + + AddSize 6400 + SetOverwrite try + SetOutPath "$INSTDIR\songs\" + +; Download song: + NSISdl::download /TIMEOUT=50000 ${download_sub2_song8} $LOCALAPPDATA\Temp\Song-Shearer-SWM.zip + + Pop $R0 + StrCmp $R0 "success" dlok + MessageBox MB_OK|MB_ICONEXCLAMATION "Download Error, click OK to Continue" /SD IDOK + dlok: + ZipDLL::extractall "$LOCALAPPDATA\Temp\Song-Shearer-SWM.zip" "$INSTDIR\songs\" + + Delete "$LOCALAPPDATA\Temp\Song-Shearer-SWM.zip" + + SetOutPath "$INSTDIR" + +SectionEnd +;----------------------------------------------------------------------- +Section /o "Shearer - Stay With Me (Karaoke)" s2_sub2_Section9 + + AddSize 5417 + SetOverwrite try + SetOutPath "$INSTDIR\songs\" + +; Download song: + NSISdl::download /TIMEOUT=50000 ${download_sub2_song9} $LOCALAPPDATA\Temp\Song-Shearer-SWM-Kar.zip + + Pop $R0 + StrCmp $R0 "success" dlok + MessageBox MB_OK|MB_ICONEXCLAMATION "Download Error, click OK to Continue" /SD IDOK + dlok: + + ZipDLL::extractall "$LOCALAPPDATA\Temp\Song-Shearer-SWM-Kar.zip" "$INSTDIR\songs\" + + Delete "$LOCALAPPDATA\Temp\Song-Shearer-SWM-Kar.zip" + + SetOutPath "$INSTDIR" + +SectionEnd +;----------------------------------------------------------------------- +SectionGroupEnd + +Section /o "Steven Dunston - Northern Star" g2Section5 + AddSize 2427 + SetOverwrite try + SetOutPath "$INSTDIR" + CreateDirectory "$INSTDIR\songs\Steven Dunston - Northern Star" + SetOutPath "$INSTDIR\songs\Steven Dunston - Northern Star\" + +; Download song: + NSISdl::download /TIMEOUT=50000 ${download_song5} $LOCALAPPDATA\Temp\Song-Northern-Star.zip + + Pop $R0 ;Get the return value + StrCmp $R0 "success" dlok + MessageBox MB_OK|MB_ICONEXCLAMATION "Download Error, click OK to Continue" /SD IDOK + dlok: + + ZipDLL::extractall "$LOCALAPPDATA\Temp\Song-Northern-Star.zip" "$INSTDIR\songs\Steven Dunston - Northern Star\" + + Delete "$LOCALAPPDATA\Temp\Song-Northern-Star.zip" + + SetOutPath "$INSTDIR" + +SectionEnd +;----------------------------------------------------------------------- +; Wise Guys +;----------------------------------------------------------------------- +SectionGroup $(name_s2_sub3) s2_sub3 + +Section /o "Wise Guys - Lebendig und kräftig und schärfer" s2_sub3_Section1 + + AddSize 4015 + SetOverwrite try + SetOutPath "$INSTDIR\songs\" + +; Download song: + NSISdl::download /TIMEOUT=50000 ${download_sub3_song1} $LOCALAPPDATA\Temp\Song-WiseGuys-LUKUS.zip + + Pop $R0 + StrCmp $R0 "success" dlok + MessageBox MB_OK|MB_ICONEXCLAMATION "Download Error, click OK to Continue" /SD IDOK + dlok: + + ZipDLL::extractall "$LOCALAPPDATA\Temp\Song-WiseGuys-LUKUS.zip" "$INSTDIR\songs\" + + Delete "$LOCALAPPDATA\Temp\Song-WiseGuys-LUKUS.zip" + + SetOutPath "$INSTDIR" + +SectionEnd +;----------------------------------------------------------------------- +Section /o "Wise Guys - Mensch, wo bist du?" s2_sub3_Section2 + + AddSize 5335 + SetOverwrite try + SetOutPath "$INSTDIR\songs\" + +; Download song: + NSISdl::download /TIMEOUT=50000 ${download_sub3_song2} $LOCALAPPDATA\Temp\Song-WiseGuys-MWBD.zip + + Pop $R0 + StrCmp $R0 "success" dlok + MessageBox MB_OK|MB_ICONEXCLAMATION "Download Error, click OK to Continue" /SD IDOK + dlok: + + ZipDLL::extractall "$LOCALAPPDATA\Temp\Song-WiseGuys-MWBD.zip" "$INSTDIR\songs\" + + Delete "$LOCALAPPDATA\Temp\Song-WiseGuys-MWBD.zip" + + SetOutPath "$INSTDIR" + +SectionEnd +;----------------------------------------------------------------------- +Section /o "Wise Guys - Mensch, wo bist du? (Karaoke)" s2_sub3_Section3 + + AddSize 5335 + SetOverwrite try + SetOutPath "$INSTDIR\songs\" + +; Download song: + NSISdl::download /TIMEOUT=50000 ${download_sub3_song3} $LOCALAPPDATA\Temp\Song-WiseGuys-MWBDKar.zip + + Pop $R0 + StrCmp $R0 "success" dlok + MessageBox MB_OK|MB_ICONEXCLAMATION "Download Error, click OK to Continue" /SD IDOK + dlok: + + ZipDLL::extractall "$LOCALAPPDATA\Temp\Song-WiseGuys-MWBDKar.zip" "$INSTDIR\songs\" + + Delete "$LOCALAPPDATA\Temp\Song-WiseGuys-MWBDKar.zip" + + SetOutPath "$INSTDIR" + +SectionEnd + +SectionGroupEnd + +SectionGroupEnd \ No newline at end of file diff --git a/installer/settings/variables.nsh b/installer/settings/variables.nsh index cd69b1ea..5d79e115 100644 --- a/installer/settings/variables.nsh +++ b/installer/settings/variables.nsh @@ -39,11 +39,12 @@ ; Download URLs for Songs and Themes: ; SONGS +!define download_song1 "http://downloads.sourceforge.net/ultrastardx/usdx_song-bodo_wartke_-_liebeslied.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_song6 "http://downloads.sourceforge.net/ultrastardx/usdx_song-pornophonique_-_space_invaders_kar.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" -- cgit v1.2.3 From cb6ddc9eeb8247c6e47d3e7db283d6e5deaa09aa Mon Sep 17 00:00:00 2001 From: canni0 Date: Fri, 23 Apr 2010 19:57:20 +0000 Subject: - Removed: Not-Referenced functions - Closed: Assembla Ticket #110 in rev 2280 git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@2282 b956fd51-792f-4845-bead-9b4dfca2ff2c --- installer/settings/functions.nsh | 127 +-------------------------------------- 1 file changed, 1 insertion(+), 126 deletions(-) (limited to 'installer/settings') diff --git a/installer/settings/functions.nsh b/installer/settings/functions.nsh index 0b5874c5..e8655bc3 100644 --- a/installer/settings/functions.nsh +++ b/installer/settings/functions.nsh @@ -2,11 +2,8 @@ ; checked on Finish Page Function CreateDesktopShortCuts - SetOutPath "$INSTDIR" - CreateShortcut "$Desktop\$(sm_shortcut).lnk" "$INSTDIR\ultrastardx.exe" - FunctionEnd ; Deletes only empty dirs which are @@ -74,126 +71,4 @@ FunctionEnd !macro nsProcess::Unload nsProcess::_Unload -!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 +!macroend \ No newline at end of file -- cgit v1.2.3 From 6a0f3847d46b6d03b03140864ee7415d5ad7e575 Mon Sep 17 00:00:00 2001 From: canni0 Date: Thu, 29 Apr 2010 17:27:22 +0000 Subject: - applied patch by tobigun - small changes git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@2318 b956fd51-792f-4845-bead-9b4dfca2ff2c --- installer/settings/files_main_install.nsh | 15 ++++++--------- installer/settings/functions.nsh | 24 ------------------------ installer/settings/settings-1031.ini | 2 +- installer/settings/settings-1033.ini | 2 +- installer/settings/settings-1038.ini | 2 +- 5 files changed, 9 insertions(+), 36 deletions(-) (limited to 'installer/settings') diff --git a/installer/settings/files_main_install.nsh b/installer/settings/files_main_install.nsh index bd748a12..df697d5e 100644 --- a/installer/settings/files_main_install.nsh +++ b/installer/settings/files_main_install.nsh @@ -16,9 +16,6 @@ ${If} ${AtLeastWinVista} CreateDirectory $APPDATA\ultrastardx\screenshots CreateDirectory $APPDATA\ultrastardx\playlists - SetOutPath "$APPDATA\ultrastardx" - File ..\game\config.ini - SetOutPath "$INSTDIR" CreateShortCut "screenshots.lnk" "$APPDATA\ultrastardx\screenshots" @@ -32,12 +29,12 @@ ${EndIf} SetOutPath "$INSTDIR" -File /r ..\game\themes -File /r ..\game\languages -File /r ..\game\sounds -File /r ..\game\fonts -File /r ..\game\resources -File /r ..\game\visuals +File /r /x .svn /x .gitignore ..\game\themes +File /r /x .svn /x .gitignore ..\game\languages +File /r /x .svn /x .gitignore ..\game\sounds +File /r /x .svn /x .gitignore ..\game\fonts +File /r /x .svn /x .gitignore ..\game\resources +File /r /x .svn /x .gitignore ..\game\visuals ; Root dir: diff --git a/installer/settings/functions.nsh b/installer/settings/functions.nsh index e8655bc3..d437c9e1 100644 --- a/installer/settings/functions.nsh +++ b/installer/settings/functions.nsh @@ -24,30 +24,6 @@ Function un.DeleteIfEmpty FindClose $R0 FunctionEnd -; This is used to write a -; string to config.ini - -Function WriteToConfig - Exch $0 - Exch - Exch $1 - - FileOpen $0 $0 a - FileSeek $0 0 END - FileWrite $0 $1 - FileClose $0 - - Pop $1 - Pop $0 -FunctionEnd - -!macro WriteToConfig String File - Push "${String}" - Push "${File}" - Call WriteToConfig -!macroend -!define WriteToConfig "!insertmacro WriteToConfig" - ; Finds UltraStar Deluxe process ; diff --git a/installer/settings/settings-1031.ini b/installer/settings/settings-1031.ini index 411e1fc1..7f9573a1 100644 --- a/installer/settings/settings-1031.ini +++ b/installer/settings/settings-1031.ini @@ -158,4 +158,4 @@ Left=158 Top=119 Right=295 Bottom=134 -Text=Alternativen Ordner mit (weiteren) Songs für UltraStar Deluxe definieren. +Text=Hier kann ein weiterer Ordner mit Songs für UltraStar Deluxe angegeben werden. diff --git a/installer/settings/settings-1033.ini b/installer/settings/settings-1033.ini index 9326d276..5e6b6055 100644 --- a/installer/settings/settings-1033.ini +++ b/installer/settings/settings-1033.ini @@ -158,4 +158,4 @@ Left=158 Top=119 Right=295 Bottom=134 -Text=Choose alternative dir with (additional) songs for UltraStar Deluxe. +Text=Choose additional song directory for UltraStar Deluxe. \ No newline at end of file diff --git a/installer/settings/settings-1038.ini b/installer/settings/settings-1038.ini index c012c674..62994a1f 100644 --- a/installer/settings/settings-1038.ini +++ b/installer/settings/settings-1038.ini @@ -158,4 +158,4 @@ Left=158 Top=119 Right=295 Bottom=134 -Text=Choose alternative dir with (additional) songs for UltraStar Deluxe. +Text=Choose additional song directory for UltraStar Deluxe. -- cgit v1.2.3 From 7209bd9d217cf7358f5921842af9bdf5dd2bbed1 Mon Sep 17 00:00:00 2001 From: canni0 Date: Fri, 30 Apr 2010 20:39:56 +0000 Subject: - fixed uninstaller section (all files should be deleted now) git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@2324 b956fd51-792f-4845-bead-9b4dfca2ff2c --- installer/settings/files_main_uninstall.nsh | 1 + 1 file changed, 1 insertion(+) (limited to 'installer/settings') diff --git a/installer/settings/files_main_uninstall.nsh b/installer/settings/files_main_uninstall.nsh index e76a3609..6a081c5b 100644 --- a/installer/settings/files_main_uninstall.nsh +++ b/installer/settings/files_main_uninstall.nsh @@ -48,6 +48,7 @@ Delete "$INSTDIR\avcodec-52.dll" Delete "$INSTDIR\avformat-52.dll" + Delete "$INSTDIR\avfilter-1.dll" Delete "$INSTDIR\avdevice-52.dll" Delete "$INSTDIR\avutil-50.dll" Delete "$INSTDIR\bass.dll" -- cgit v1.2.3 From 818ab818dcc87bacb1acc8448f49c5c5ff99d37f Mon Sep 17 00:00:00 2001 From: canni0 Date: Sat, 1 May 2010 02:25:01 +0000 Subject: - better support for update installation - old files will be removed - uninstaller now deletes all shortcuts - select components in uninstaller: covers, highscores, config, screenshots, playlists, songs git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@2325 b956fd51-792f-4845-bead-9b4dfca2ff2c --- installer/settings/files_main_install.nsh | 27 ++++++++++++++++++++++++++- installer/settings/files_main_uninstall.nsh | 11 +++-------- 2 files changed, 29 insertions(+), 9 deletions(-) (limited to 'installer/settings') diff --git a/installer/settings/files_main_install.nsh b/installer/settings/files_main_install.nsh index df697d5e..a79d4991 100644 --- a/installer/settings/files_main_install.nsh +++ b/installer/settings/files_main_install.nsh @@ -2,6 +2,31 @@ ; UltraStar Deluxe Installer: Main components ; ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ +; Remove old files from previous versions +IfFileExists $INSTDIR\ScoreConverter.exe 0 +2 +Delete "$INSTDIR\ScoreConverter.exe" +IfFileExists $INSTDIR\USdx.exe 0 +2 +Delete "$INSTDIR\USdx.exe" +IfFileExists $INSTDIR\covers.cache 0 +2 +Delete "$INSTDIR\covers.cache" +IfFileExists $INSTDIR\avcodec-51.dll 0 +2 +Delete "$INSTDIR\avcodec-51.dll" +IfFileExists $INSTDIR\avformat-50.dll 0 +2 +Delete "$INSTDIR\avformat-50.dll" +IfFileExists $INSTDIR\avutil-49.dll 0 +2 +Delete "$INSTDIR\avutil-49.dll" +IfFileExists $INSTDIR\bass.dll 0 +2 +Delete "$INSTDIR\bass.dll" +IfFileExists $INSTDIR\SDL.dll 0 +2 +Delete "$INSTDIR\SDL.dll" +IfFileExists $INSTDIR\sqlite3.dll 0 +2 +Delete "$INSTDIR\sqlite3.dll" + +RMDir /r "$INSTDIR\Themes" +RMDir /r "$INSTDIR\Skins" +RMDir /r "$INSTDIR\Plugins" +RMDir /r "$INSTDIR\Languages" + ; Create Directories: CreateDirectory $INSTDIR\plugins @@ -62,4 +87,4 @@ File ..\game\covers\NoCover.jpg SetOutPath "$INSTDIR\plugins\" File "..\game\plugins\*.*" -SetOutPath "$INSTDIR" +SetOutPath "$INSTDIR" \ No newline at end of file diff --git a/installer/settings/files_main_uninstall.nsh b/installer/settings/files_main_uninstall.nsh index 6a081c5b..ed2259bf 100644 --- a/installer/settings/files_main_uninstall.nsh +++ b/installer/settings/files_main_uninstall.nsh @@ -11,6 +11,7 @@ Delete "$Desktop\Play UltraStar Deluxe.lnk" Delete "$Desktop\UltraStar Deluxe spielen.lnk" + Delete "$Desktop\UltraStar Deluxe karaoke.lnk" ; Remove dirs @@ -22,14 +23,6 @@ RMDir /r "$INSTDIR\resources" RMDir /r "$INSTDIR\sounds" -; Remove old files from previous versions - IfFileExists $INSTDIR\ScoreConverter.exe 0 +2 - Delete "$INSTDIR\ScoreConverter.exe" - IfFileExists $INSTDIR\USdx.exe 0 +2 - Delete "$INSTDIR\USdx.exe" - IfFileExists $INSTDIR\covers.cache 0 +2 - Delete "$INSTDIR\covers.cache" - ; Delete remaining files Delete "$INSTDIR\ScoreConverter.exe" Delete "$INSTDIR\${exe}.exe" @@ -44,6 +37,7 @@ Delete "$INSTDIR\config.ini.lnk" Delete "$INSTDIR\Error.log" + Delete "$INSTDIR\Benchmark.log" Delete "$INSTDIR\cover.db" Delete "$INSTDIR\avcodec-52.dll" @@ -88,6 +82,7 @@ SetShellVarContext current Delete "$APPDATA\ultrastardx\Error.log" + Delete "$APPDATA\ultrastardx\Benchmark.log" Delete "$APPDATA\ultrastardx\cover.db" StrCpy $0 "$APPDATA\ultrastardx\covers" -- cgit v1.2.3 From e73913f7f2d00a26741b266ca29d5b45c5896651 Mon Sep 17 00:00:00 2001 From: tobigun Date: Tue, 8 Jun 2010 18:18:29 +0000 Subject: installer adjusted to config.ini detection git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@2455 b956fd51-792f-4845-bead-9b4dfca2ff2c --- installer/settings/files_main_install.nsh | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'installer/settings') diff --git a/installer/settings/files_main_install.nsh b/installer/settings/files_main_install.nsh index a79d4991..10afc6f6 100644 --- a/installer/settings/files_main_install.nsh +++ b/installer/settings/files_main_install.nsh @@ -33,19 +33,19 @@ CreateDirectory $INSTDIR\plugins CreateDirectory $INSTDIR\covers CreateDirectory $INSTDIR\songs -${If} ${AtLeastWinVista} +${If} $UseAppData == true ; Create folders in appdata for current user SetShellVarContext current - CreateDirectory $APPDATA\ultrastardx - CreateDirectory $APPDATA\ultrastardx\screenshots - CreateDirectory $APPDATA\ultrastardx\playlists + CreateDirectory $UserDataPath + CreateDirectory $UserDataPath\screenshots + CreateDirectory $UserDataPath\playlists SetOutPath "$INSTDIR" - CreateShortCut "screenshots.lnk" "$APPDATA\ultrastardx\screenshots" - CreateShortCut "playlists.lnk" "$APPDATA\ultrastardx\playlists" - CreateShortCut "config.ini.lnk" "$APPDATA\ultrastardx\config.ini" + CreateShortCut "screenshots.lnk" "$UserDataPath\screenshots" + CreateShortCut "playlists.lnk" "$UserDataPath\playlists" + CreateShortCut "config.ini.lnk" "$ConfigIniPath" SetShellVarContext all ${EndIf} -- cgit v1.2.3 From f0f0d4b3f9c1e343edf6dfddc04cf25d3b52b496 Mon Sep 17 00:00:00 2001 From: tobigun Date: Tue, 8 Jun 2010 18:27:37 +0000 Subject: string update git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@2456 b956fd51-792f-4845-bead-9b4dfca2ff2c --- installer/settings/variables.nsh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'installer/settings') diff --git a/installer/settings/variables.nsh b/installer/settings/variables.nsh index 5d79e115..43d19a7f 100644 --- a/installer/settings/variables.nsh +++ b/installer/settings/variables.nsh @@ -4,7 +4,7 @@ ; Product Information: -!define version "1.1beta" ; Make sure version is also set in onInit +!define version "1.1RC" ; Make sure version is also set in onInit !define name "UltraStar Deluxe" -- cgit v1.2.3 From 8594853a59c39c339b721fa6ca7c64a59b4541c6 Mon Sep 17 00:00:00 2001 From: canni0 Date: Sun, 13 Jun 2010 13:14:38 +0000 Subject: - updated installer language files git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@2517 b956fd51-792f-4845-bead-9b4dfca2ff2c --- installer/settings/settings-1031.ini | 2 +- installer/settings/settings-1033.ini | 6 +++--- installer/settings/settings-1038.ini | 6 +++--- 3 files changed, 7 insertions(+), 7 deletions(-) (limited to 'installer/settings') diff --git a/installer/settings/settings-1031.ini b/installer/settings/settings-1031.ini index 7f9573a1..b941d03d 100644 --- a/installer/settings/settings-1031.ini +++ b/installer/settings/settings-1031.ini @@ -53,7 +53,7 @@ Bottom=39 [Field 6] Type=DropList -ListItems=Catalan|Croatian|Dutch|English|Euskara|Finnish|French|German|Greek|Icelandic|Italian|Japanese|Luxembourgish|Portuguese|Spanish|Swedish +ListItems=Catalan|Croatian|Czech|Dutch|English|Euskara|Finnish|French|German|Greek|Icelandic|Italian|Japanese|Luxembourgish|Norwegian|Polish|Portuguese|Serbian|Slovak|Slovenian|Spanish|Swedish State=German Left=62 Right=152 diff --git a/installer/settings/settings-1033.ini b/installer/settings/settings-1033.ini index 5e6b6055..545fe5dc 100644 --- a/installer/settings/settings-1033.ini +++ b/installer/settings/settings-1033.ini @@ -8,7 +8,7 @@ Left=1 Top=1 Right=300 Bottom=140 -Text=UltraStar Deluxe Konfiguration (Optional) +Text=UltraStar Deluxe Configuration (optional) [Field 1] Type=Label @@ -53,8 +53,8 @@ Bottom=39 [Field 6] Type=DropList -ListItems=Catalan|Croatian|Dutch|English|Euskara|Finnish|French|German|Greek|Icelandic|Italian|Japanese|Luxembourgish|Portuguese|Spanish|Swedish -State=German +ListItems=Catalan|Croatian|Czech|Dutch|English|Euskara|Finnish|French|German|Greek|Icelandic|Italian|Japanese|Luxembourgish|Norwegian|Polish|Portuguese|Serbian|Slovak|Slovenian|Spanish|Swedish +State=English Left=62 Right=152 Top=45 diff --git a/installer/settings/settings-1038.ini b/installer/settings/settings-1038.ini index 62994a1f..322a77e0 100644 --- a/installer/settings/settings-1038.ini +++ b/installer/settings/settings-1038.ini @@ -8,7 +8,7 @@ Left=1 Top=1 Right=300 Bottom=140 -Text=UltraStar Deluxe Konfiguration (Optional) +Text=UltraStar Deluxe Configuration (optional) [Field 1] Type=Label @@ -53,8 +53,8 @@ Bottom=39 [Field 6] Type=DropList -ListItems=Catalan|Croatian|Dutch|English|Euskara|Finnish|French|German|Greek|Icelandic|Italian|Japanese|Luxembourgish|Portuguese|Spanish|Swedish -State=German +ListItems=Catalan|Croatian|Czech|Dutch|English|Euskara|Finnish|French|German|Greek|Icelandic|Italian|Japanese|Luxembourgish|Norwegian|Polish|Portuguese|Serbian|Slovak|Slovenian|Spanish|Swedish +State=English Left=62 Right=152 Top=45 -- cgit v1.2.3 From 53c9063068d120b14e7e1745ca4659b3d3c74d1c Mon Sep 17 00:00:00 2001 From: davidus01 Date: Sun, 13 Jun 2010 14:46:09 +0000 Subject: polish installer translation git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@2518 b956fd51-792f-4845-bead-9b4dfca2ff2c --- installer/settings/settings-1045.ini | 161 +++++++++++++++++++++++++++++++++++ 1 file changed, 161 insertions(+) create mode 100644 installer/settings/settings-1045.ini (limited to 'installer/settings') diff --git a/installer/settings/settings-1045.ini b/installer/settings/settings-1045.ini new file mode 100644 index 00000000..42cc4710 --- /dev/null +++ b/installer/settings/settings-1045.ini @@ -0,0 +1,161 @@ +[Settings] +NumFields=19 + +; Background Group of Settings Box +[Field 17] +Type=GroupBox +Left=1 +Top=1 +Right=300 +Bottom=140 +Text=Konfiguracja UltraStar Deluxe (opcjonalnie) + +[Field 1] +Type=Label +Text="Tryb Pełnoekranowy:" +Left=5 +Right=58 +Top=30 +Bottom=38 + +[Field 2] +Type=Label +Text="Język:" +Left=5 +Right=58 +Top=47 +Bottom=55 + +[Field 3] +Type=Label +Text="Rozdzielczość:" +Left=5 +Right=58 +Top=64 +Bottom=72 + +[Field 4] +Type=Label +Text="Zakładki:" +Left=5 +Right=58 +Top=82 +Bottom=90 + +[Field 5] +Type=DropList +ListItems=On|Off +State=On +Left=62 +Right=152 +Top=28 +Bottom=39 + +[Field 6] +Type=DropList +ListItems=Catalan|Croatian|Czech|Dutch|English|Euskara|Finnish|French|German|Greek|Icelandic|Italian|Japanese|Luxembourgish|Norwegian|Polish|Portuguese|Serbian|Slovak|Slovenian|Spanish|Swedish +State=English +Left=62 +Right=152 +Top=45 +Bottom=56 + +[Field 7] +Type=DropList +ListItems=320x200|640x480|800x600|1024x768|1280x1024|1440x900|1680x1050|1920x1200 +State=800x600 +Left=62 +Right=152 +Top=62 +Bottom=73 + +[Field 8] +Type=DropList +ListItems=On|Off +State=Off +Left=62 +Right=152 +Top=81 +Bottom=91 + +[Field 9] +Type=Label +Text=Czy uruchamiać grę w oknie czy na pełnym ekranie? +Left=157 +Right=300 +Top=30 +Bottom=38 + +[Field 10] +Type=Label +Text=Wszystkie ustawienia można później zmienić w grze. +Left=5 +Right=246 +Top=14 +Bottom=23 + +[Field 11] +Type=Label +Text=Dostosuj język GUI. +Left=158 +Right=300 +Top=46 +Bottom=55 + +[Field 12] +Type=Label +Text=Wybierz rozdzieczość ekrany/okna. +Left=157 +Right=300 +Top=64 +Bottom=72 + +[Field 13] +Type=Label +Text=Czy chcesz aby piosenki zostały pogrupowane na zakładki ? +Left=158 +Right=300 +Top=78 +Bottom=94 + +[Field 14] +Type=Label +Left=5 +Top=100 +Right=58 +Bottom=109 +Text=Sortowanie: + +[Field 15] +Type=DropList +Left=62 +Top=100 +Right=152 +Bottom=111 +State=Artist +ListItems=Edition|Genre|Language|Folder|Title|Artist + +[Field 16] +Type=Label +Left=157 +Top=101 +Right=300 +Bottom=110 +Text=Wybierz kryteria sortowania piosenek. + +[Field 18] +Type=DirRequest +Left=5 +Top=121 +Right=152 +Bottom=132 +Text=SongDir +State= + +[Field 19] +Type=Label +Left=158 +Top=119 +Right=295 +Bottom=134 +Text=Wybierz katalog w którym znajdują się piosenki? \ No newline at end of file -- cgit v1.2.3 From 8865776c2003e7214e3cc6a9ff6d953b5628743f Mon Sep 17 00:00:00 2001 From: canni0 Date: Sun, 13 Jun 2010 14:48:44 +0000 Subject: - small additions to installer languages git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@2519 b956fd51-792f-4845-bead-9b4dfca2ff2c --- installer/settings/settings-1031.ini | 2 +- installer/settings/settings-1033.ini | 2 +- installer/settings/settings-1038.ini | 4 ++-- installer/settings/settings-1045.ini | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) (limited to 'installer/settings') diff --git a/installer/settings/settings-1031.ini b/installer/settings/settings-1031.ini index b941d03d..9a6b4b71 100644 --- a/installer/settings/settings-1031.ini +++ b/installer/settings/settings-1031.ini @@ -53,7 +53,7 @@ Bottom=39 [Field 6] Type=DropList -ListItems=Catalan|Croatian|Czech|Dutch|English|Euskara|Finnish|French|German|Greek|Icelandic|Italian|Japanese|Luxembourgish|Norwegian|Polish|Portuguese|Serbian|Slovak|Slovenian|Spanish|Swedish +ListItems=Catalan|Croatian|Czech|Danish|Dutch|English|Euskara|Finnish|French|German|Greek|Hungarian|Icelandic|Italian|Japanese|Luxembourgish|Norwegian|Polish|Portuguese|Serbian|Slovak|Slovenian|Spanish|Swedish State=German Left=62 Right=152 diff --git a/installer/settings/settings-1033.ini b/installer/settings/settings-1033.ini index 545fe5dc..7176d229 100644 --- a/installer/settings/settings-1033.ini +++ b/installer/settings/settings-1033.ini @@ -53,7 +53,7 @@ Bottom=39 [Field 6] Type=DropList -ListItems=Catalan|Croatian|Czech|Dutch|English|Euskara|Finnish|French|German|Greek|Icelandic|Italian|Japanese|Luxembourgish|Norwegian|Polish|Portuguese|Serbian|Slovak|Slovenian|Spanish|Swedish +ListItems=Catalan|Croatian|Czech|Danish|Dutch|English|Euskara|Finnish|French|German|Greek|Hungarian|Icelandic|Italian|Japanese|Luxembourgish|Norwegian|Polish|Portuguese|Serbian|Slovak|Slovenian|Spanish|Swedish State=English Left=62 Right=152 diff --git a/installer/settings/settings-1038.ini b/installer/settings/settings-1038.ini index 322a77e0..f2ef973a 100644 --- a/installer/settings/settings-1038.ini +++ b/installer/settings/settings-1038.ini @@ -53,8 +53,8 @@ Bottom=39 [Field 6] Type=DropList -ListItems=Catalan|Croatian|Czech|Dutch|English|Euskara|Finnish|French|German|Greek|Icelandic|Italian|Japanese|Luxembourgish|Norwegian|Polish|Portuguese|Serbian|Slovak|Slovenian|Spanish|Swedish -State=English +ListItems=Catalan|Croatian|Czech|Danish|Dutch|English|Euskara|Finnish|French|German|Greek|Hungarian|Icelandic|Italian|Japanese|Luxembourgish|Norwegian|Polish|Portuguese|Serbian|Slovak|Slovenian|Spanish|Swedish +State=Hungarian Left=62 Right=152 Top=45 diff --git a/installer/settings/settings-1045.ini b/installer/settings/settings-1045.ini index 42cc4710..e59f0227 100644 --- a/installer/settings/settings-1045.ini +++ b/installer/settings/settings-1045.ini @@ -53,8 +53,8 @@ Bottom=39 [Field 6] Type=DropList -ListItems=Catalan|Croatian|Czech|Dutch|English|Euskara|Finnish|French|German|Greek|Icelandic|Italian|Japanese|Luxembourgish|Norwegian|Polish|Portuguese|Serbian|Slovak|Slovenian|Spanish|Swedish -State=English +ListItems=Catalan|Croatian|Czech|Danish|Dutch|English|Euskara|Finnish|French|German|Greek|Hungarian|Icelandic|Italian|Japanese|Luxembourgish|Norwegian|Polish|Portuguese|Serbian|Slovak|Slovenian|Spanish|Swedish +State=Polish Left=62 Right=152 Top=45 -- cgit v1.2.3 From 5e13354bb1fcee732a92c89d6d0ac9888f43daeb Mon Sep 17 00:00:00 2001 From: tobigun Date: Sun, 10 Oct 2010 18:55:31 +0000 Subject: strings adjusted (removed 'RC'-parts) git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@2656 b956fd51-792f-4845-bead-9b4dfca2ff2c --- installer/settings/variables.nsh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'installer/settings') diff --git a/installer/settings/variables.nsh b/installer/settings/variables.nsh index 43d19a7f..331df7e3 100644 --- a/installer/settings/variables.nsh +++ b/installer/settings/variables.nsh @@ -4,7 +4,7 @@ ; Product Information: -!define version "1.1RC" ; Make sure version is also set in onInit +!define version "1.1" ; Make sure version is also set in onInit !define name "UltraStar Deluxe" @@ -86,4 +86,4 @@ !define download_sub3_song3 "http://downloads.sourceforge.net/ultrastardx/usdx_song-wise_guys_-_mensch_wo_bist_du_kar.zip" ; THEMES -; (removed theme section - currently no additional skins available for this usdx version) \ No newline at end of file +; (removed theme section - currently no additional skins available for this usdx version) -- cgit v1.2.3