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/UltraStar Deluxe.nsi | 425 ++++++++++++++++++++++++++++ installer/languages/English.nsh | 38 +++ installer/languages/German.nsh | 38 +++ installer/license.txt | 125 ++++++++ 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 +++ 10 files changed, 961 insertions(+) create mode 100644 installer/UltraStar Deluxe.nsi create mode 100644 installer/languages/English.nsh create mode 100644 installer/languages/German.nsh create mode 100644 installer/license.txt 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') diff --git a/installer/UltraStar Deluxe.nsi b/installer/UltraStar Deluxe.nsi new file mode 100644 index 00000000..59754466 --- /dev/null +++ b/installer/UltraStar Deluxe.nsi @@ -0,0 +1,425 @@ +; ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ +; UltraStar Deluxe Installer - Version 1.1: Main +; ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ + +!include MUI2.nsh +!include "WinVer.nsh" +!include "LogicLib.nsh" + +; ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ +; Variables +; ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ + +; Installer Paths: + +!define path_settings ".\settings" +!define path_languages ".\languages" +!define path_images "..\installerdependencies\images" +!define path_plugins "..\installerdependencies\plugins" +!define path_gdf "..\installerdependencies\gdf" + +!addPluginDir "${path_plugins}\" + +!include "${path_settings}\variables.nsh" +!include "${path_settings}\GameExplorer.nsh" +!include "${path_settings}\functions.nsh" + + + +; ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ +; Export Settings +; ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ + +SetCompress Auto +SetCompressor /SOLID lzma +SetCompressorDictSize 32 +SetDatablockOptimize On + +Name "${name} V.${version}" +Brandingtext "${name} Installation" +OutFile "ultrastardx-${version}-installer-full.exe" + +; ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ +; Interface Settings +; ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ + +; Icons: + +!define MUI_ICON "${path_images}\${img_install}" +!define MUI_UNICON "${path_images}\${img_uninstall}" + +; Header and Side Images: + +!define MUI_HEADERIMAGE +!define MUI_HEADERIMAGE_BITMAP "${path_images}\${img_header}" +!define MUI_HEADERIMAGE_UNBITMAP "${path_images}\${img_header}" + +!define MUI_WELCOMEFINISHPAGE_BITMAP "${path_images}\${img_side}" +!define MUI_UNWELCOMEFINISHPAGE_BITMAP "${path_images}\${img_side}" + +; Settings: + + +; Abort Warnings: + +!define MUI_ABORTWARNING +!define MUI_ABORTWARNING_TEXT "$(abort_install)" +!define MUI_ABORTWARNING_CANCEL_DEFAULT + +!define MUI_UNABORTWARNING +!define MUI_UNABORTWARNING_TEXT "$(abort_uninstall)" +!define MUI_UNABORTWARNING_CANCEL_DEFAULT + +; ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ +; Pages Installation Routine Settings +; ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ + +; License Page: + +!define MUI_LICENSEPAGE_RADIOBUTTONS + +; Components Page: + +!define MUI_COMPONENTSPAGE_SMALLDESC +!define MUI_COMPONENTSPAGE_TEXT_DESCRIPTION_INFO $(page_components_info) + +; Finish Pages: + +!define MUI_FINISHPAGE_TITLE_3LINES + +!define MUI_FINISHPAGE_TEXT_LARGE +!define MUI_FINISHPAGE_TEXT "$(page_finish_txt)" + +!define MUI_FINISHPAGE_RUN "$INSTDIR\${exe}.exe" +!define MUI_FINISHPAGE_RUN_NOTCHECKED + +!define MUI_FINISHPAGE_LINK "$(page_finish_linktxt)" +!define MUI_FINISHPAGE_LINK_LOCATION "${homepage}" + +!define MUI_FINISHPAGE_NOAUTOCLOSE +!define MUI_UNFINISHPAGE_NOAUTOCLOSE + +!define MUI_FINISHPAGE_NOREBOOTSUPPORT + +; ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ +; Pages Installation Routine +; ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ + +!insertmacro MUI_PAGE_WELCOME +!insertmacro MUI_PAGE_LICENSE "${license}" +!insertmacro MUI_PAGE_COMPONENTS +!insertmacro MUI_PAGE_DIRECTORY + +; Start menu page + +var ICONS_GROUP +!define MUI_STARTMENUPAGE_NODISABLE +!define MUI_STARTMENUPAGE_DEFAULTFOLDER "${name}" +!define MUI_STARTMENUPAGE_REGISTRY_ROOT "${PRODUCT_UNINST_ROOT_KEY}" +!define MUI_STARTMENUPAGE_REGISTRY_KEY "${PRODUCT_UNINST_KEY}" +!define MUI_STARTMENUPAGE_REGISTRY_VALUENAME "${PRODUCT_STARTMENU_REGVAL}" +!insertmacro MUI_PAGE_STARTMENU Application $ICONS_GROUP + +!insertmacro MUI_PAGE_INSTFILES +!insertmacro MUI_PAGE_FINISH + +; ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ +; Pages UnInstallation Routine +; ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ + +!insertmacro MUI_UNPAGE_WELCOME +!insertmacro MUI_UNPAGE_CONFIRM +!insertmacro MUI_UNPAGE_INSTFILES +!insertmacro MUI_UNPAGE_FINISH + +; ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ +; Sections Installation Routine +; ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ + +;------------------------------------ +; MAIN COMPONENTS (Section 1) +;------------------------------------ + +Section $(name_section1) Section1 + SectionIn RO + SetOutPath $INSTDIR + SetOverwrite try + +!include "${path_settings}\files_main_install.nsh" + + +; Create Shortcuts: + +SetOutPath "$INSTDIR" + +!insertmacro MUI_STARTMENU_WRITE_BEGIN Application + + SetShellVarContext all + SetOutPath "$INSTDIR" + + CreateDirectory "${name}" + CreateDirectory "$SMPROGRAMS\$ICONS_GROUP" + CreateShortCut "$SMPROGRAMS\$ICONS_GROUP\${name}.lnk" "$INSTDIR\${exe}.exe" +; CreateShortCut "$SMPROGRAMS\$ICONS_GROUP\$(sm_documentation).lnk" "$INSTDIR\documentation.pdf" + CreateShortCut "$SMPROGRAMS\$ICONS_GROUP\$(sm_website).lnk" "http://www.ultrastardeluxe.org/" + CreateShortCut "$SMPROGRAMS\$ICONS_GROUP\$(sm_readme).lnk" "$INSTDIR\ReadMe.txt" + CreateShortCut "$SMPROGRAMS\$ICONS_GROUP\$(sm_license).lnk" "$INSTDIR\License.txt" + CreateShortCut "$SMPROGRAMS\$ICONS_GROUP\$(sm_uninstall).lnk" "$INSTDIR\Uninstall.exe" + !insertmacro MUI_STARTMENU_WRITE_END + +; Vista Game Explorer: + +${If} ${AtLeastWinVista} + +${GameExplorer_GenerateGUID} +Pop $0 + +${GameExplorer_AddGame} all "${path_gdf}" $WINDIR $INSTDIR\${exe}.exe $0 + +CreateDirectory $APPDATA\Microsoft\Windows\GameExplorer\$0\PlayTasks\1 +CreateShortcut "$APPDATA\Microsoft\Windows\GameExplorer\$0\PlayTasks\1\Benchmark.lnk" \ + "$INSTDIR\${exe}.exe" "-Benchmark" + +CreateDirectory $APPDATA\Microsoft\Windows\GameExplorer\$0\PlayTasks\2 +CreateShortcut "$APPDATA\Microsoft\Windows\GameExplorer\$0\PlayTasks\2\Joypad.lnk" \ + "$INSTDIR\${exe}.exe" "-Joypad" + +CreateDirectory $APPDATA\Microsoft\Windows\GameExplorer\$0\PlayTasks\3 +CreateShortcut "$APPDATA\Microsoft\Windows\GameExplorer\$0\PlayTasks\3\Fullscreen.lnk" \ + "$INSTDIR\${exe}.exe" "-FullScreen" + +CreateDirectory $APPDATA\Microsoft\Windows\GameExplorer\$0\PlayTasks\3 +CreateShortcut "$APPDATA\Microsoft\Windows\GameExplorer\$0\PlayTasks\3\Dual Screen.lnk" \ + "$INSTDIR\${exe}.exe" "-Screen 2" + +CreateDirectory $APPDATA\Microsoft\Windows\GameExplorer\$0\SupportTasks\0 +CreateShortcut "$APPDATA\Microsoft\Windows\GameExplorer\$0\SupportTasks\0\Support Forum.lnk" \ + "http://forum.ultrastardeluxe.org" + +${EndIf} + +; Create Uninstaller: + + WriteUninstaller "$INSTDIR\Uninstall.exe" + + WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "DisplayName" "${p_name}" + WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "UninstallString" "$INSTDIR\Uninstall.exe" + WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "DisplayVersion" "${PRODUCT_VERSION}" + WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "URLInfoAbout" "${PRODUCT_WEB_SITE}" + WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "Publisher" "${PRODUCT_PUBLISHER}" + + SetOutPath "$INSTDIR" + +SectionEnd + +;------------------------------------ +; OPTIONAL SONGS (Section 2) +;------------------------------------ + +SectionGroup $(name_section2) Section2 + +; +; Dead Smiling Pirates - I 18 +; + +Section /o "Dead Smiling Pirates - I 18" g2Section1 +; AddSize 1400 + 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=30000 ${download_song1} $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: + nsisunz::Unzip "$TEMP\Song-I-18.zip" "$INSTDIR\Songs\Dead Smiling Pirates - I 18\" + + Delete "$TEMP\Song-I-18.zip" + + SetOutPath "$INSTDIR" + +SectionEnd + +; +; Steven Dunston - Northern Star +; + +Section /o "Joshua Morin - On the run" g2Section2 +; AddSize 2200 + 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=30000 ${download_song3} $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: + nsisunz::Unzip "$TEMP\Song-On-the-run.zip" "$INSTDIR\Songs\Joshua Morin - On the run\" + + Delete "$TEMP\Song-On-the-run.zip" + + SetOutPath "$INSTDIR" + +SectionEnd + +Section /o "Pornophonique - Space Invaders" g2Section3 +; AddSize 2200 + SetOverwrite try + SetOutPath "$INSTDIR" + CreateDirectory "$INSTDIR\Songs\Pornophonique - Space Invaders" + SetOutPath "$INSTDIR\Songs\Pornophonique - Space Invaders\" + +; Download song: + NSISdl::download /TIMEOUT=30000 ${download_song3} $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: + nsisunz::Unzip "$TEMP\Song-Space-Invaders.zip" "$INSTDIR\Songs\Pornophonique - Space Invaders\" + + Delete "$TEMP\Song-Space-Invaders.zip" + + SetOutPath "$INSTDIR" + +SectionEnd + +Section /o "Steven Dunston - Northern Star" g2Section4 +; AddSize 1500 + SetOverwrite try + SetOutPath "$INSTDIR" + CreateDirectory "$INSTDIR\Songs\Steven Dunston - Northern Star" + SetOutPath "$INSTDIR\Songs\Steven Dunston - Northern Star\" + +; Download song: + NSISdl::download /TIMEOUT=30000 ${download_song2} $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: + nsisunz::Unzip "$TEMP\Song-Northern-Star.zip" "$INSTDIR\Songs\Steven Dunston - Northern Star\" + + Delete "$TEMP\Song-Northern-Star.zip" + + SetOutPath "$INSTDIR" + +SectionEnd + +SectionGroupEnd + +;------------------------------------ +; OPTIONAL THEMES (Section 3) +;------------------------------------ + +SectionGroup $(name_section3) Section3 + + Section "Orange" g3Section1 +; AddSize 700 + +; Download theme orange: + NSISdl::download /TIMEOUT=30000 ${download_theme1} $TEMP\Theme-Orange.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: + nsisunz::Unzip "$TEMP\Theme-Orange.zip" "$INSTDIR\" + + Delete "$TEMP\Theme-Orange.zip" + + SetOutPath "$INSTDIR" + +SectionEnd + + Section "Streetlight" g3Section2 +; AddSize 1000 + +; Download theme Streetlight: + NSISdl::download /TIMEOUT=30000 ${download_theme2} $TEMP\Theme-Streetlight.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: + nsisunz::Unzip "$TEMP\Theme-Streetlight.zip" "$INSTDIR\" + + Delete "$TEMP\Theme-Streetlight.zip" + + SetOutPath "$INSTDIR" + +SectionEnd + + Section "Vistar" g3Section3 +; AddSize 1000 + +; Download theme Vistar: + + NSISdl::download /TIMEOUT=30000 ${download_theme3} $TEMP\Theme-Vistar.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: + nsisunz::Unzip "$TEMP\Theme-Vistar.zip" "$INSTDIR\" + + Delete "$TEMP\Theme-Vistar.zip" + + SetOutPath "$INSTDIR" + +SectionEnd + +SectionGroupEnd + +;------------------------------------ +; UNINSTALL (Section 4) +;------------------------------------ + +Section Uninstall + + !insertmacro MUI_STARTMENU_GETFOLDER "Application" $ICONS_GROUP + + !include "${path_settings}\files_opt_uninstall.nsh" + !include "${path_settings}\files_main_uninstall.nsh" + + DeleteRegKey ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" + +; Unregister from Windows Vista Game Explorer + +${If} ${AtLeastWinVista} + +${GameExplorer_RemoveGame} $0 + +${EndIf} + +SectionEnd + +; ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ +; Language Support +; ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ + +!insertmacro MUI_LANGUAGE "English" +!insertmacro MUI_LANGUAGE "German" + +!include "${path_languages}\English.nsh" +!include "${path_languages}\German.nsh" + +Function .onInit + + !insertmacro MUI_LANGDLL_DISPLAY + +FunctionEnd + +Function un.onInit + + !insertmacro MUI_LANGDLL_DISPLAY + +FunctionEnd diff --git a/installer/languages/English.nsh b/installer/languages/English.nsh new file mode 100644 index 00000000..e50410e8 --- /dev/null +++ b/installer/languages/English.nsh @@ -0,0 +1,38 @@ +; ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ +; UltraStar Deluxe Installer - Version 1.1: English +; ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ + +LangString abort_install ${LANG_ENGLISH} "Are you sure to abort Installation?" +LangString abort_uninstall ${LANG_ENGLISH} "Are you sure to abort UnInstallation?" + +; Welcome Page: + +LangString page_welcome_title ${LANG_ENGLISH} "Welcome to the UltraStar Deluxe Setup Wizard" +LangString page_welcome_txt ${LANG_ENGLISH} "This wizard will guide you through the Installation of UltraStar Deluxe. UltraStar Deluxe is a free open source Karaoke game, which can be compared with Singstar.\n\r\n\rThe UltraStar Deluxe Team wishes you fun.\n\rProject website: http://www.ultrastardeluxe.org\n\rSupport Forum: http://forum.ultrastardeluxe.org" + +; Components Page: + +LangString page_components_info ${LANG_ENGLISH} "Hover the component to get details" + +; Finish Page: + +LangString page_finish_txt ${LANG_ENGLISH} "UltraStar Deluxe was installed successfully on you system.\n\r\n\rVisit out project website to get latest news and updates." +LangString page_finish_linktxt ${LANG_ENGLISH} "Project website" + +; Start Menu and Shortcuts + +LangString sm_shortcut ${LANG_ENGLISH} "Play UltraStar Deluxe" +LangString sm_uninstall ${LANG_ENGLISH} "Uninstall" +LangString sm_website ${LANG_ENGLISH} "Website" +LangString sm_license ${LANG_ENGLISH} "License" +LangString sm_readme ${LANG_ENGLISH} "Readme" +LangString sm_documentation ${LANG_ENGLISH} "Documentation" + +LangString sc_play ${LANG_ENGLISH} "Play" +LangString sc_desktop ${LANG_ENGLISH} "Create Desktop Shortcut?" + +; Sections and SectionGroups + +LangString name_section1 ${LANG_ENGLISH} "Main components" +LangString name_section2 ${LANG_ENGLISH} "Optional songs" +LangString name_section3 ${LANG_ENGLISH} "Optional themes" diff --git a/installer/languages/German.nsh b/installer/languages/German.nsh new file mode 100644 index 00000000..20beeef5 --- /dev/null +++ b/installer/languages/German.nsh @@ -0,0 +1,38 @@ +; ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ +; UltraStar Deluxe Installer - Version 1.1: German +; ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ + +LangString abort_install ${LANG_GERMAN} "Wollen Sie die Installation wirklich abbrechen?" +LangString abort_uninstall ${LANG_GERMAN} "Wollen Sie die Deinstallation wirklich abbrechen?" + +; Welcome Page: + +LangString page_welcome_title ${LANG_GERMAN} "Willkommen zur Installationsroutine von UltraStar Deluxe" +LangString page_welcome_txt ${LANG_GERMAN} "Dieser Assistent wird Sie durch die Installation von UltraStar Deluxe begleiten. UltraStar Deluxe ist ein kostenloses quelloffenes Karaokespiel, welches Singstar ähnelt. \n\r\n\rDas UltraStar Deluxe Team wünscht viel Spaß.\n\rProjekthomepage: http://www.ultrastardeluxe.org\n\rSupport Forum: http://forum.ultrastardeluxe.org" + +; Components Page: + +LangString page_components_info ${LANG_GERMAN} "Schieben Sie den Mauszeiger über die Komponente um Details einzusehen" + +; Finish Page: + +LangString page_finish_txt ${LANG_GERMAN} "UltraStar Deluxe wurde erfolgreich auf Ihrem System installiert.\n\r\n\rBesuchen Sie unsere Projektwebseite um die neusten Updates und News zu erhalten." +LangString page_finish_linktxt ${LANG_GERMAN} "Projektwebseite" + +; Start Menu and Shortcuts + +LangString sm_website ${LANG_GERMAN} "Internetseite" +LangString sm_uninstall ${LANG_GERMAN} "Deinstallieren" +LangString sm_shortcut ${LANG_GERMAN} "UltraStar Deluxe spielen" +LangString sm_license ${LANG_GERMAN} "Lizenz" +LangString sm_readme ${LANG_GERMAN} "Lies mich" +LangString sm_documentation ${LANG_GERMAN} "Dokumentation" + +LangString sc_play ${LANG_GERMAN} "Spielen" +LangString sc_desktop ${LANG_GERMAN} "Verknüpfung auf dem Desktop erstellen?" + +; Sections and SectionGroups + +LangString name_section1 ${LANG_GERMAN} "Hauptkomponenten" +LangString name_section2 ${LANG_GERMAN} "Optionale Songs" +LangString name_section3 ${LANG_GERMAN} "Optionale Themen" diff --git a/installer/license.txt b/installer/license.txt new file mode 100644 index 00000000..4964fc70 --- /dev/null +++ b/installer/license.txt @@ -0,0 +1,125 @@ +The GNU General Public License (GPL) +Version 2, June 1991 +Copyright (C) 1989, 1991 Free Software Foundation, Inc. +59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + +Everyone is permitted to copy and distribute verbatim copies +of this license document, but changing it is not allowed. + +Preamble + +The licenses for most software are designed to take away your freedom to share and change it. By contrast, the GNU General Public License is intended to guarantee your freedom to share and change free software--to make sure the software is free for all its users. This General Public License applies to most of the Free Software Foundation's software and to any other program whose authors commit to using it. (Some other Free Software Foundation software is covered by the GNU Library General Public License instead.) You can apply it to your programs, too. + +When we speak of free software, we are referring to freedom, not price. Our General Public Licenses are designed to make sure that you have the freedom to distribute copies of free software (and charge for this service if you wish), that you receive source code or can get it if you want it, that you can change the software or use pieces of it in new free programs; and that you know you can do these things. + +To protect your rights, we need to make restrictions that forbid anyone to deny you these rights or to ask you to surrender the rights. These restrictions translate to certain responsibilities for you if you distribute copies of the software, or if you modify it. + +For example, if you distribute copies of such a program, whether gratis or for a fee, you must give the recipients all the rights that you have. You must make sure that they, too, receive or can get the source code. And you must show them these terms so they know their rights. + +We protect your rights with two steps: (1) copyright the software, and (2) offer you this license which gives you legal permission to copy, distribute and/or modify the software. + +Also, for each author's protection and ours, we want to make certain that everyone understands that there is no warranty for this free software. If the software is modified by someone else and passed on, we want its recipients to know that what they have is not the original, so that any problems introduced by others will not reflect on the original authors' reputations. + +Finally, any free program is threatened constantly by software patents. We wish to avoid the danger that redistributors of a free program will individually obtain patent licenses, in effect making the program proprietary. To prevent this, we have made it clear that any patent must be licensed for everyone's free use or not licensed at all. + +The precise terms and conditions for copying, distribution and modification follow. + +TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + +0. This License applies to any program or other work which contains a notice placed by the copyright holder saying it may be distributed under the terms of this General Public License. The "Program", below, refers to any such program or work, and a "work based on the Program" means either the Program or any derivative work under copyright law: that is to say, a work containing the Program or a portion of it, either verbatim or with modifications and/or translated into another language. (Hereinafter, translation is included without limitation in the term "modification".) Each licensee is addressed as "you". + +Activities other than copying, distribution and modification are not covered by this License; they are outside its scope. The act of running the Program is not restricted, and the output from the Program is covered only if its contents constitute a work based on the Program (independent of having been made by running the Program). Whether that is true depends on what the Program does. + +1. You may copy and distribute verbatim copies of the Program's source code as you receive it, in any medium, provided that you conspicuously and appropriately publish on each copy an appropriate copyright notice and disclaimer of warranty; keep intact all the notices that refer to this License and to the absence of any warranty; and give any other recipients of the Program a copy of this License along with the Program. + +You may charge a fee for the physical act of transferring a copy, and you may at your option offer warranty protection in exchange for a fee. + +2. You may modify your copy or copies of the Program or any portion of it, thus forming a work based on the Program, and copy and distribute such modifications or work under the terms of Section 1 above, provided that you also meet all of these conditions: + +a) You must cause the modified files to carry prominent notices stating that you changed the files and the date of any change. + +b) You must cause any work that you distribute or publish, that in whole or in part contains or is derived from the Program or any part thereof, to be licensed as a whole at no charge to all third parties under the terms of this License. + +c) If the modified program normally reads commands interactively when run, you must cause it, when started running for such interactive use in the most ordinary way, to print or display an announcement including an appropriate copyright notice and a notice that there is no warranty (or else, saying that you provide a warranty) and that users may redistribute the program under these conditions, and telling the user how to view a copy of this License. (Exception: if the Program itself is interactive but does not normally print such an announcement, your work based on the Program is not required to print an announcement.) + +These requirements apply to the modified work as a whole. If identifiable sections of that work are not derived from the Program, and can be reasonably considered independent and separate works in themselves, then this License, and its terms, do not apply to those sections when you distribute them as separate works. But when you distribute the same sections as part of a whole which is a work based on the Program, the distribution of the whole must be on the terms of this License, whose permissions for other licensees extend to the entire whole, and thus to each and every part regardless of who wrote it. + +Thus, it is not the intent of this section to claim rights or contest your rights to work written entirely by you; rather, the intent is to exercise the right to control the distribution of derivative or collective works based on the Program. + +In addition, mere aggregation of another work not based on the Program with the Program (or with a work based on the Program) on a volume of a storage or distribution medium does not bring the other work under the scope of this License. + +3. You may copy and distribute the Program (or a work based on it, under Section 2) in object code or executable form under the terms of Sections 1 and 2 above provided that you also do one of the following: + +a) Accompany it with the complete corresponding machine-readable source code, which must be distributed under the terms of Sections 1 and 2 above on a medium customarily used for software interchange; or, + +b) Accompany it with a written offer, valid for at least three years, to give any third party, for a charge no more than your cost of physically performing source distribution, a complete machine-readable copy of the corresponding source code, to be distributed under the terms of Sections 1 and 2 above on a medium customarily used for software interchange; or, + +c) Accompany it with the information you received as to the offer to distribute corresponding source code. (This alternative is allowed only for noncommercial distribution and only if you received the program in object code or executable form with such an offer, in accord with Subsection b above.) + +The source code for a work means the preferred form of the work for making modifications to it. For an executable work, complete source code means all the source code for all modules it contains, plus any associated interface definition files, plus the scripts used to control compilation and installation of the executable. However, as a special exception, the source code distributed need not include anything that is normally distributed (in either source or binary form) with the major components (compiler, kernel, and so on) of the operating system on which the executable runs, unless that component itself accompanies the executable. + +If distribution of executable or object code is made by offering access to copy from a designated place, then offering equivalent access to copy the source code from the same place counts as distribution of the source code, even though third parties are not compelled to copy the source along with the object code. + +4. You may not copy, modify, sublicense, or distribute the Program except as expressly provided under this License. Any attempt otherwise to copy, modify, sublicense or distribute the Program is void, and will automatically terminate your rights under this License. However, parties who have received copies, or rights, from you under this License will not have their licenses terminated so long as such parties remain in full compliance. + +5. You are not required to accept this License, since you have not signed it. However, nothing else grants you permission to modify or distribute the Program or its derivative works. These actions are prohibited by law if you do not accept this License. Therefore, by modifying or distributing the Program (or any work based on the Program), you indicate your acceptance of this License to do so, and all its terms and conditions for copying, distributing or modifying the Program or works based on it. + +6. Each time you redistribute the Program (or any work based on the Program), the recipient automatically receives a license from the original licensor to copy, distribute or modify the Program subject to these terms and conditions. You may not impose any further restrictions on the recipients' exercise of the rights granted herein. You are not responsible for enforcing compliance by third parties to this License. + +7. If, as a consequence of a court judgment or allegation of patent infringement or for any other reason (not limited to patent issues), conditions are imposed on you (whether by court order, agreement or otherwise) that contradict the conditions of this License, they do not excuse you from the conditions of this License. If you cannot distribute so as to satisfy simultaneously your obligations under this License and any other pertinent obligations, then as a consequence you may not distribute the Program at all. For example, if a patent license would not permit royalty-free redistribution of the Program by all those who receive copies directly or indirectly through you, then the only way you could satisfy both it and this License would be to refrain entirely from distribution of the Program. + +If any portion of this section is held invalid or unenforceable under any particular circumstance, the balance of the section is intended to apply and the section as a whole is intended to apply in other circumstances. + +It is not the purpose of this section to induce you to infringe any patents or other property right claims or to contest validity of any such claims; this section has the sole purpose of protecting the integrity of the free software distribution system, which is implemented by public license practices. Many people have made generous contributions to the wide range of software distributed through that system in reliance on consistent application of that system; it is up to the author/donor to decide if he or she is willing to distribute software through any other system and a licensee cannot impose that choice. + +This section is intended to make thoroughly clear what is believed to be a consequence of the rest of this License. + +8. If the distribution and/or use of the Program is restricted in certain countries either by patents or by copyrighted interfaces, the original copyright holder who places the Program under this License may add an explicit geographical distribution limitation excluding those countries, so that distribution is permitted only in or among countries not thus excluded. In such case, this License incorporates the limitation as if written in the body of this License. + +9. The Free Software Foundation may publish revised and/or new versions of the General Public License from time to time. Such new versions will be similar in spirit to the present version, but may differ in detail to address new problems or concerns. + +Each version is given a distinguishing version number. If the Program specifies a version number of this License which applies to it and "any later version", you have the option of following the terms and conditions either of that version or of any later version published by the Free Software Foundation. If the Program does not specify a version number of this License, you may choose any version ever published by the Free Software Foundation. + +10. If you wish to incorporate parts of the Program into other free programs whose distribution conditions are different, write to the author to ask for permission. For software which is copyrighted by the Free Software Foundation, write to the Free Software Foundation; we sometimes make exceptions for this. Our decision will be guided by the two goals of preserving the free status of all derivatives of our free software and of promoting the sharing and reuse of software generally. + +NO WARRANTY + +11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + +12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. + +END OF TERMS AND CONDITIONS + +How to Apply These Terms to Your New Programs + +If you develop a new program, and you want it to be of the greatest possible use to the public, the best way to achieve this is to make it free software which everyone can redistribute and change under these terms. + +To do so, attach the following notices to the program. It is safest to attach them to the start of each source file to most effectively convey the exclusion of warranty; and each file should have at least the "copyright" line and a pointer to where the full notice is found. + +one line to give the program's name and a brief idea of what it does. +Copyright (C) + +This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. + +This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. + +You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + +Also add information on how to contact you by electronic and paper mail. + +If the program is interactive, make it output a short notice like this when it starts in an interactive mode: + +Gnomovision version 69, Copyright (C) year name of author Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. This is free software, and you are welcome to redistribute it under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate parts of the General Public License. Of course, the commands you use may be called something other than `show w' and `show c'; they could even be mouse-clicks or menu items--whatever suits your program. + +You should also get your employer (if you work as a programmer) or your school, if any, to sign a "copyright disclaimer" for the program, if necessary. Here is a sample; alter the names: + +Yoyodyne, Inc., hereby disclaims all copyright interest +in the program `Gnomovision' (which makes passes at compilers) +written by James Hacker. + +signature of Ty Coon, 1 April 1989 +Ty Coon, President of Vice + +This General Public License does not permit incorporating your program into proprietary programs. If your program is a subroutine library, you may consider it more useful to permit linking proprietary applications with the library. If this is what you want to do, use the GNU Library General Public License instead of this License. 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/UltraStar Deluxe.nsi | 108 +++++++++++++++++++++++++---- installer/languages/English.nsh | 22 +++++- installer/languages/German.nsh | 21 +++++- installer/settings/settings-1031.ini | 131 +++++++++++++++++++++++++++++++++++ installer/settings/settings-1033.ini | 131 +++++++++++++++++++++++++++++++++++ installer/settings/variables.nsh | 5 +- 6 files changed, 400 insertions(+), 18 deletions(-) create mode 100644 installer/settings/settings-1031.ini create mode 100644 installer/settings/settings-1033.ini (limited to 'installer') diff --git a/installer/UltraStar Deluxe.nsi b/installer/UltraStar Deluxe.nsi index 59754466..78e448fc 100644 --- a/installer/UltraStar Deluxe.nsi +++ b/installer/UltraStar Deluxe.nsi @@ -24,8 +24,6 @@ !include "${path_settings}\GameExplorer.nsh" !include "${path_settings}\functions.nsh" - - ; ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ; Export Settings ; ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ @@ -57,9 +55,6 @@ OutFile "ultrastardx-${version}-installer-full.exe" !define MUI_WELCOMEFINISHPAGE_BITMAP "${path_images}\${img_side}" !define MUI_UNWELCOMEFINISHPAGE_BITMAP "${path_images}\${img_side}" -; Settings: - - ; Abort Warnings: !define MUI_ABORTWARNING @@ -74,6 +69,12 @@ OutFile "ultrastardx-${version}-installer-full.exe" ; Pages Installation Routine Settings ; ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ +; Welcome Page: + +!define MUI_WELCOMEPAGE_TITLE_3LINES +!define MUI_WELCOMEPAGE_TITLE "$(page_welcome_title)" +!define MUI_WELCOMEPAGE_TEXT "$(page_welcome_txt)" + ; License Page: !define MUI_LICENSEPAGE_RADIOBUTTONS @@ -202,7 +203,7 @@ ${EndIf} WriteUninstaller "$INSTDIR\Uninstall.exe" - WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "DisplayName" "${p_name}" + WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "DisplayName" "${name}" WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "UninstallString" "$INSTDIR\Uninstall.exe" WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "DisplayVersion" "${PRODUCT_VERSION}" WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "URLInfoAbout" "${PRODUCT_WEB_SITE}" @@ -248,12 +249,12 @@ SectionEnd ; Steven Dunston - Northern Star ; -Section /o "Joshua Morin - On the run" g2Section2 +Section /o "Joshua Morin - On The Run" g2Section2 ; AddSize 2200 SetOverwrite try SetOutPath "$INSTDIR" - CreateDirectory "$INSTDIR\Songs\Joshua Morin - On the run" - SetOutPath "$INSTDIR\Songs\Joshua Morin - On the run\" + CreateDirectory "$INSTDIR\Songs\Joshua Morin - On The Run" + SetOutPath "$INSTDIR\Songs\Joshua Morin - On The Run\" ; Download song: NSISdl::download /TIMEOUT=30000 ${download_song3} $TEMP\Song-On-the-run.zip @@ -262,7 +263,7 @@ Section /o "Joshua Morin - On the run" g2Section2 StrCmp $R0 "success" dlok MessageBox MB_OK|MB_ICONEXCLAMATION "Download Error, click OK to Continue" /SD IDOK dlok: - nsisunz::Unzip "$TEMP\Song-On-the-run.zip" "$INSTDIR\Songs\Joshua Morin - On the run\" + nsisunz::Unzip "$TEMP\Song-On-the-run.zip" "$INSTDIR\Songs\Joshua Morin - On The Run\" Delete "$TEMP\Song-On-the-run.zip" @@ -322,7 +323,7 @@ SectionGroupEnd SectionGroup $(name_section3) Section3 - Section "Orange" g3Section1 + Section /o "Orange" g3Section1 ; AddSize 700 ; Download theme orange: @@ -340,7 +341,7 @@ SectionGroup $(name_section3) Section3 SectionEnd - Section "Streetlight" g3Section2 + Section /o "Streetlight" g3Section2 ; AddSize 1000 ; Download theme Streetlight: @@ -358,7 +359,7 @@ SectionEnd SectionEnd - Section "Vistar" g3Section3 + Section /o "Vistar" g3Section3 ; AddSize 1000 ; Download theme Vistar: @@ -375,6 +376,63 @@ SectionEnd SetOutPath "$INSTDIR" +SectionEnd + + Section /o "BlueSensation" g3Section4 +; AddSize 1000 + +; Download theme BlueSensation: + + NSISdl::download /TIMEOUT=30000 ${download_theme4} $TEMP\Theme-BlueSensation.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: + nsisunz::Unzip "$TEMP\Theme-BlueSensation.zip" "$INSTDIR\" + + Delete "$TEMP\Theme-BlueSensation.zip" + + SetOutPath "$INSTDIR" + +SectionEnd + + Section /o "WiiStar" g3Section5 +; AddSize 1000 + +; Download theme WiiStar: + + NSISdl::download /TIMEOUT=30000 ${download_theme5} $TEMP\Theme-WiiStar.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: + nsisunz::Unzip "$TEMP\Theme-WiiStar.zip" "$INSTDIR\" + + Delete "$TEMP\Theme-WiiStar.zip" + + SetOutPath "$INSTDIR" + +SectionEnd + + Section /o "iStar" g3Section6 +; AddSize 1000 + +; Download theme iStar: + + NSISdl::download /TIMEOUT=30000 ${download_theme6} $TEMP\Theme-iStar.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: + nsisunz::Unzip "$TEMP\Theme-iStar.zip" "$INSTDIR\" + + Delete "$TEMP\Theme-iStar.zip" + + SetOutPath "$INSTDIR" + SectionEnd SectionGroupEnd @@ -402,6 +460,30 @@ ${EndIf} SectionEnd +; ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ +; Section Descriptions +; ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ + + +!insertmacro MUI_FUNCTION_DESCRIPTION_BEGIN + !insertmacro MUI_DESCRIPTION_TEXT ${Section1} $(DESC_Section1) + !insertmacro MUI_DESCRIPTION_TEXT ${Section2} $(DESC_Section2) + !insertmacro MUI_DESCRIPTION_TEXT ${Section3} $(DESC_Section3) + + !insertmacro MUI_DESCRIPTION_TEXT ${g2Section1} $(DESC_g2Section1) + !insertmacro MUI_DESCRIPTION_TEXT ${g2Section2} $(DESC_g2Section2) + !insertmacro MUI_DESCRIPTION_TEXT ${g2Section3} $(DESC_g2Section3) + !insertmacro MUI_DESCRIPTION_TEXT ${g2Section4} $(DESC_g2Section4) + + !insertmacro MUI_DESCRIPTION_TEXT ${g3Section1} $(DESC_g3Section1) + !insertmacro MUI_DESCRIPTION_TEXT ${g3Section2} $(DESC_g3Section2) + !insertmacro MUI_DESCRIPTION_TEXT ${g3Section3} $(DESC_g3Section3) + !insertmacro MUI_DESCRIPTION_TEXT ${g3Section4} $(DESC_g3Section4) + !insertmacro MUI_DESCRIPTION_TEXT ${g3Section5} $(DESC_g3Section5) + !insertmacro MUI_DESCRIPTION_TEXT ${g3Section6} $(DESC_g3Section6) + +!insertmacro MUI_FUNCTION_DESCRIPTION_END + ; ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ; Language Support ; ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ diff --git a/installer/languages/English.nsh b/installer/languages/English.nsh index e50410e8..f0b9d1dd 100644 --- a/installer/languages/English.nsh +++ b/installer/languages/English.nsh @@ -8,7 +8,7 @@ LangString abort_uninstall ${LANG_ENGLISH} "Are you sure to abort UnInstallation ; Welcome Page: LangString page_welcome_title ${LANG_ENGLISH} "Welcome to the UltraStar Deluxe Setup Wizard" -LangString page_welcome_txt ${LANG_ENGLISH} "This wizard will guide you through the Installation of UltraStar Deluxe. UltraStar Deluxe is a free open source Karaoke game, which can be compared with Singstar.\n\r\n\rThe UltraStar Deluxe Team wishes you fun.\n\rProject website: http://www.ultrastardeluxe.org\n\rSupport Forum: http://forum.ultrastardeluxe.org" +LangString page_welcome_txt ${LANG_ENGLISH} "This wizard will guide you through the Installation of UltraStar Deluxe. UltraStar Deluxe is a free open source Karaoke game, which can be compared with Singstar.$\n$\r$\n$\rThe UltraStar Deluxe Team wishes you fun.$\n$\rProject website: http://www.ultrastardeluxe.org$\n$\rSupport Forum: http://forum.ultrastardeluxe.org" ; Components Page: @@ -16,7 +16,7 @@ LangString page_components_info ${LANG_ENGLISH} "Hover the component to get deta ; Finish Page: -LangString page_finish_txt ${LANG_ENGLISH} "UltraStar Deluxe was installed successfully on you system.\n\r\n\rVisit out project website to get latest news and updates." +LangString page_finish_txt ${LANG_ENGLISH} "UltraStar Deluxe was installed successfully on you system.$\n$\r$\n$\rVisit out project website to get latest news and updates." LangString page_finish_linktxt ${LANG_ENGLISH} "Project website" ; Start Menu and Shortcuts @@ -36,3 +36,21 @@ LangString sc_desktop ${LANG_ENGLISH} "Create Desktop Shortcut?" LangString name_section1 ${LANG_ENGLISH} "Main components" LangString name_section2 ${LANG_ENGLISH} "Optional songs" LangString name_section3 ${LANG_ENGLISH} "Optional themes" + +LangString DESC_Section1 ${LANG_ENGLISH} "These are the basic files needed by UltraStar Deluxe" +LangString DESC_Section2 ${LANG_ENGLISH} "You can choose which songs should be installed." +LangString DESC_Section3 ${LANG_ENGLISH} "You can choose which optional themes should be installed." + +LangString DESC_g2Section1 ${LANG_ENGLISH} "This will install the song 'Dead Smiling Pirates - I 18' (CC by-nc-nd 2.5)." +LangString DESC_g2Section2 ${LANG_ENGLISH} "This will install the song 'Joshua Morin - On The Run' (CC by-sa 2.5)." +LangString DESC_g2Section3 ${LANG_ENGLISH} "This will install the song 'Pornophonique - Space Invaders' (CC by-nc-nd 2.0)." +LangString DESC_g2Section4 ${LANG_ENGLISH} "This will install the song 'Steven Dunston - Northern Star' (CC by-nc-sa 2.5)." + +LangString DESC_g3Section1 ${LANG_ENGLISH} "This will install the optional theme 'Orange' by Skar" +LangString DESC_g3Section2 ${LANG_ENGLISH} "This will install the optional theme 'Streetlight' by Skar" +LangString DESC_g3Section3 ${LANG_ENGLISH} "This will install the optional theme 'Vistar' by Skar" +LangString DESC_g3Section4 ${LANG_ENGLISH} "This will install the optional theme 'BlueSensation v5' by Charis" +LangString DESC_g3Section5 ${LANG_ENGLISH} "This will install the optional theme 'WiiStar' by MasterPhW" +LangString DESC_g3Section6 ${LANG_ENGLISH} "This will install the optional theme 'iStar' by MezzoX" + + diff --git a/installer/languages/German.nsh b/installer/languages/German.nsh index 20beeef5..7ed7b422 100644 --- a/installer/languages/German.nsh +++ b/installer/languages/German.nsh @@ -8,7 +8,7 @@ LangString abort_uninstall ${LANG_GERMAN} "Wollen Sie die Deinstallation wirklic ; Welcome Page: LangString page_welcome_title ${LANG_GERMAN} "Willkommen zur Installationsroutine von UltraStar Deluxe" -LangString page_welcome_txt ${LANG_GERMAN} "Dieser Assistent wird Sie durch die Installation von UltraStar Deluxe begleiten. UltraStar Deluxe ist ein kostenloses quelloffenes Karaokespiel, welches Singstar ähnelt. \n\r\n\rDas UltraStar Deluxe Team wünscht viel Spaß.\n\rProjekthomepage: http://www.ultrastardeluxe.org\n\rSupport Forum: http://forum.ultrastardeluxe.org" +LangString page_welcome_txt ${LANG_GERMAN} "Dieser Assistent wird Sie durch die Installation von UltraStar Deluxe begleiten. UltraStar Deluxe ist ein kostenloses quelloffenes Karaokespiel, welches Singstar ähnelt. $\n$\r$\n$\rDas UltraStar Deluxe Team wünscht viel Spaß.$\n$\rProjekthomepage: http://www.ultrastardeluxe.org$\n$\rSupport Forum: http://forum.ultrastardeluxe.org" ; Components Page: @@ -16,7 +16,7 @@ LangString page_components_info ${LANG_GERMAN} "Schieben Sie den Mauszeiger ; Finish Page: -LangString page_finish_txt ${LANG_GERMAN} "UltraStar Deluxe wurde erfolgreich auf Ihrem System installiert.\n\r\n\rBesuchen Sie unsere Projektwebseite um die neusten Updates und News zu erhalten." +LangString page_finish_txt ${LANG_GERMAN} "UltraStar Deluxe wurde erfolgreich auf Ihrem System installiert.$\n$\r$\n$\rBesuchen Sie unsere Projektwebseite um die neusten Updates und News zu erhalten." LangString page_finish_linktxt ${LANG_GERMAN} "Projektwebseite" ; Start Menu and Shortcuts @@ -36,3 +36,20 @@ LangString sc_desktop ${LANG_GERMAN} "Verkn LangString name_section1 ${LANG_GERMAN} "Hauptkomponenten" LangString name_section2 ${LANG_GERMAN} "Optionale Songs" LangString name_section3 ${LANG_GERMAN} "Optionale Themen" + +LangString DESC_Section1 ${LANG_GERMAN} "Dies sind die von UltraStar Deluxe benötigten Grunddateien" +LangString DESC_Section2 ${LANG_GERMAN} "Hier können Songs zum Installieren gewählt werden." +LangString DESC_Section3 ${LANG_GERMAN} "Hier können alternative Motive zum Installieren gewählt werden." + +LangString DESC_g2Section1 ${LANG_GERMAN} "Installiert das Beispiellied 'Dead Smiling Pirates - I 18' (CC by-nc-nd 2.5)." +LangString DESC_g2Section2 ${LANG_GERMAN} "Installiert das Beispiellied 'Joshua Morin - On The Run' (CC by-sa 2.5)." +LangString DESC_g2Section3 ${LANG_GERMAN} "Installiert das Beispiellied 'Pornophonique - Space Invaders' (CC by-nc-nd 2.0)." +LangString DESC_g2Section4 ${LANG_GERMAN} "Installiert das Beispiellied 'Steven Dunston - Northern Star' (CC by-nc-sa 2.5)." + +LangString DESC_g3Section1 ${LANG_GERMAN} "Installiert das Motiv 'Orange' von Skar" +LangString DESC_g3Section2 ${LANG_GERMAN} "Installiert das Motiv 'Streetlight' von Skar" +LangString DESC_g3Section3 ${LANG_GERMAN} "Installiert das Motiv 'Vistar' von Skar" +LangString DESC_g3Section4 ${LANG_GERMAN} "Installiert das Motiv 'BlueSensation v5' von Charis" +LangString DESC_g3Section5 ${LANG_GERMAN} "Installiert das Motiv 'WiiStar' von MasterPhW" +LangString DESC_g3Section6 ${LANG_GERMAN} "Installiert das Motiv 'iStar' von MezzoX" + 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/UltraStar Deluxe.nsi | 143 ++++++++++++++++++++++++++-- installer/languages/English.nsh | 10 ++ installer/languages/German.nsh | 10 ++ installer/settings/files_main_uninstall.nsh | 24 +++++ installer/settings/functions.nsh | 4 +- installer/settings/variables.nsh | 1 + 6 files changed, 181 insertions(+), 11 deletions(-) (limited to 'installer') diff --git a/installer/UltraStar Deluxe.nsi b/installer/UltraStar Deluxe.nsi index 78e448fc..87079682 100644 --- a/installer/UltraStar Deluxe.nsi +++ b/installer/UltraStar Deluxe.nsi @@ -3,8 +3,9 @@ ; ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ !include MUI2.nsh -!include "WinVer.nsh" -!include "LogicLib.nsh" +!include WinVer.nsh +!include LogicLib.nsh +!include InstallOptions.nsh ; ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ; Variables @@ -16,7 +17,7 @@ !define path_languages ".\languages" !define path_images "..\installerdependencies\images" !define path_plugins "..\installerdependencies\plugins" -!define path_gdf "..\installerdependencies\gdf" +!define path_gdf "$WINDIR\gdf.dll" !addPluginDir "${path_plugins}\" @@ -33,10 +34,18 @@ SetCompressor /SOLID lzma SetCompressorDictSize 32 SetDatablockOptimize On +XPStyle on + Name "${name} V.${version}" -Brandingtext "${name} Installation" +Brandingtext "${name} v.${version} Installation" OutFile "ultrastardx-${version}-installer-full.exe" +InstallDir "$PROGRAMFILES\${name}" + +; Windows Vista: + +RequestExecutionLevel user + ; ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ; Interface Settings ; ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ @@ -97,6 +106,10 @@ OutFile "ultrastardx-${version}-installer-full.exe" !define MUI_FINISHPAGE_LINK "$(page_finish_linktxt)" !define MUI_FINISHPAGE_LINK_LOCATION "${homepage}" +!define MUI_FINISHPAGE_SHOWREADME +!define MUI_FINISHPAGE_SHOWREADME_TEXT $(page_finish_desktop) +!define MUI_FINISHPAGE_SHOWREADME_FUNCTION CreateDesktopShortCuts + !define MUI_FINISHPAGE_NOAUTOCLOSE !define MUI_UNFINISHPAGE_NOAUTOCLOSE @@ -122,6 +135,81 @@ var ICONS_GROUP !insertmacro MUI_PAGE_STARTMENU Application $ICONS_GROUP !insertmacro MUI_PAGE_INSTFILES + +; USDX Settings Page + +Page custom Settings + +Function Settings + +!insertmacro MUI_HEADER_TEXT " " "$(page_settings_subtitle)" + + !insertmacro INSTALLOPTIONS_DISPLAY "Settings-$LANGUAGE" + +; Get all the variables: + +var /GLOBAL fullscreen +var /GLOBAL language2 +var /GLOBAL resolution +var /GLOBAL tabs +var /GLOBAL animations + + !insertmacro INSTALLOPTIONS_READ $fullscreen "Settings-$LANGUAGE" "Field 6" "State" + !insertmacro INSTALLOPTIONS_READ $language2 "Settings-$LANGUAGE" "Field 7" "State" + !insertmacro INSTALLOPTIONS_READ $resolution "Settings-$LANGUAGE" "Field 8" "State" + !insertmacro INSTALLOPTIONS_READ $tabs "Settings-$LANGUAGE" "Field 9" "State" + !insertmacro INSTALLOPTIONS_READ $animations "Settings-$LANGUAGE" "Field 10" "State" + +; Write all variables to config.ini + +FileOpen $0 '$INSTDIR\config.ini' w +FileWrite $0 '[Game]$\r$\n' +FileClose $0 + +${If} $language2 != "" + +${WriteToConfig} "Language=$language2$\r$\n" "$INSTDIR\config.ini" + +${EndIf} + +${If} $tabs != "" + +${WriteToConfig} "Tabs=$tabs$\r$\n" "$INSTDIR\config.ini" + +${EndIf} + +${WriteToConfig} "[Graphics]$\r$\n" "$INSTDIR\config.ini" + +${If} $fullscreen != "" + +${WriteToConfig} "FullScreen=$fullscreen$\r$\n" "$INSTDIR\config.ini" + +${EndIf} + +${If} $resolution != "" + +${WriteToConfig} "Resolution=$resolution$\r$\n" "$INSTDIR\config.ini" + +${EndIf} + +${WriteToConfig} "[Advanced]$\r$\n" "$INSTDIR\config.ini" + +; Animations On / Off Tasks + +${If} $animations == "Off" + +${WriteToConfig} "LoadAnimation=Off$\r$\n" "$INSTDIR\config.ini" + +${WriteToConfig} "EffectSing=Off$\r$\n" "$INSTDIR\config.ini" + +${WriteToConfig} "ScreenFade=Off$\r$\n" "$INSTDIR\config.ini" + +${EndIf} + + +FunctionEnd ; Settings page End + + !insertmacro MUI_PAGE_FINISH ; ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ @@ -160,7 +248,7 @@ SetOutPath "$INSTDIR" CreateDirectory "${name}" CreateDirectory "$SMPROGRAMS\$ICONS_GROUP" - CreateShortCut "$SMPROGRAMS\$ICONS_GROUP\${name}.lnk" "$INSTDIR\${exe}.exe" + CreateShortCut "$SMPROGRAMS\$ICONS_GROUP\$(sm_shortcut).lnk" "$INSTDIR\${exe}.exe" ; CreateShortCut "$SMPROGRAMS\$ICONS_GROUP\$(sm_documentation).lnk" "$INSTDIR\documentation.pdf" CreateShortCut "$SMPROGRAMS\$ICONS_GROUP\$(sm_website).lnk" "http://www.ultrastardeluxe.org/" CreateShortCut "$SMPROGRAMS\$ICONS_GROUP\$(sm_readme).lnk" "$INSTDIR\ReadMe.txt" @@ -191,7 +279,7 @@ CreateShortcut "$APPDATA\Microsoft\Windows\GameExplorer\$0\PlayTasks\3\Fullscree CreateDirectory $APPDATA\Microsoft\Windows\GameExplorer\$0\PlayTasks\3 CreateShortcut "$APPDATA\Microsoft\Windows\GameExplorer\$0\PlayTasks\3\Dual Screen.lnk" \ - "$INSTDIR\${exe}.exe" "-Screen 2" + "$INSTDIR\${exe}.exe" "-Screens 2" CreateDirectory $APPDATA\Microsoft\Windows\GameExplorer\$0\SupportTasks\0 CreateShortcut "$APPDATA\Microsoft\Windows\GameExplorer\$0\SupportTasks\0\Support Forum.lnk" \ @@ -466,6 +554,7 @@ SectionEnd !insertmacro MUI_FUNCTION_DESCRIPTION_BEGIN + !insertmacro MUI_DESCRIPTION_TEXT ${Section1} $(DESC_Section1) !insertmacro MUI_DESCRIPTION_TEXT ${Section2} $(DESC_Section2) !insertmacro MUI_DESCRIPTION_TEXT ${Section3} $(DESC_Section3) @@ -491,17 +580,55 @@ SectionEnd !insertmacro MUI_LANGUAGE "English" !insertmacro MUI_LANGUAGE "German" -!include "${path_languages}\English.nsh" -!include "${path_languages}\German.nsh" +!insertmacro MUI_RESERVEFILE_LANGDLL + +!include "${path_languages}\*.nsh" Function .onInit + System::Call 'kernel32::CreateMutexA(i 0, i 0, t "USdx Installer.exe") ?e' + + Pop $R0 + + StrCmp $R0 0 +3 + MessageBox MB_OK|MB_ICONEXCLAMATION $(oninit_running) + Abort + + ReadRegStr $R0 HKLM \ + "Software\Microsoft\Windows\CurrentVersion\Uninstall\${name}" \ + "UninstallString" + StrCmp $R0 "" done + + MessageBox MB_YESNO|MB_ICONEXCLAMATION \ + "${name} $(oninit_alreadyinstalled). $\n$\n $(oninit_installagain)" \ + IDYES done + Abort + + +done: + !insertmacro MUI_LANGDLL_DISPLAY + !insertmacro INSTALLOPTIONS_EXTRACT_AS ".\settings\settings-1031.ini" "Settings-1031" + !insertmacro INSTALLOPTIONS_EXTRACT_AS ".\settings\settings-1033.ini" "Settings-1033" + FunctionEnd Function un.onInit + ${nsProcess::FindProcess} "USdx.exe" $R0 + StrCmp $R0 0 0 +2 + MessageBox MB_YESNO|MB_ICONEXCLAMATION '$(oninit_closeusdx)' IDYES closeit IDNO end + + closeit: + ${nsProcess::KillProcess} "USdx.exe" $R0 + goto continue + + end: + ${nsProcess::Unload} + Abort + + continue: !insertmacro MUI_LANGDLL_DISPLAY FunctionEnd diff --git a/installer/languages/English.nsh b/installer/languages/English.nsh index f0b9d1dd..35362675 100644 --- a/installer/languages/English.nsh +++ b/installer/languages/English.nsh @@ -4,6 +4,10 @@ LangString abort_install ${LANG_ENGLISH} "Are you sure to abort Installation?" LangString abort_uninstall ${LANG_ENGLISH} "Are you sure to abort UnInstallation?" +LangString oninit_running ${LANG_ENGLISH} "The installer is already running." +LangString oninit_installagain ${LANG_ENGLISH} "Are you sure you want to install it again?" +LangString oninit_alreadyinstalled ${LANG_ENGLISH} "is already installed" +LangString oninit_closeusdx ${LANG_ENGLISH} "cannot be uninstalled while its running! Do you want to close it?" ; Welcome Page: @@ -14,10 +18,16 @@ LangString page_welcome_txt ${LANG_ENGLISH} "This wizard will guide you through LangString page_components_info ${LANG_ENGLISH} "Hover the component to get details" +; Custom Page + +LangString page_settings_fullscreen ${LANG_ENGLISH} "Fullscreen Mode" +LangString page_settings_subtitle ${LANG_ENGLISH} "Specify your favorite settings for UltraStar Deluxe." + ; Finish Page: LangString page_finish_txt ${LANG_ENGLISH} "UltraStar Deluxe was installed successfully on you system.$\n$\r$\n$\rVisit out project website to get latest news and updates." LangString page_finish_linktxt ${LANG_ENGLISH} "Project website" +LangString page_finish_desktop ${LANG_ENGLISH} "Create Desktop Shortcut?" ; Start Menu and Shortcuts diff --git a/installer/languages/German.nsh b/installer/languages/German.nsh index 7ed7b422..853b01b3 100644 --- a/installer/languages/German.nsh +++ b/installer/languages/German.nsh @@ -4,6 +4,10 @@ LangString abort_install ${LANG_GERMAN} "Wollen Sie die Installation wirklich abbrechen?" LangString abort_uninstall ${LANG_GERMAN} "Wollen Sie die Deinstallation wirklich abbrechen?" +LangString oninit_running ${LANG_GERMAN} "Die Installation wird bereits ausgeführt." +LangString oninit_installagain ${LANG_GERMAN} "Sind Sie sicher, dass Sie es erneut installieren möchten?" +LangString oninit_alreadyinstalled ${LANG_GERMAN} "ist bereits installiert" +LangString oninit_closeusdx ${LANG_GERMAN} "kann nicht während der Laufzeit deinstalliert werden. Soll es geschlossen werden?" ; Welcome Page: @@ -14,10 +18,16 @@ LangString page_welcome_txt ${LANG_GERMAN} "Dieser Assistent wird Sie durch die LangString page_components_info ${LANG_GERMAN} "Schieben Sie den Mauszeiger über die Komponente um Details einzusehen" +; Custom Page + +LangString page_settings_fullscreen ${LANG_GERMAN} "Vollbild Modus:" +LangString page_settings_subtitle ${LANG_GERMAN} "Lege deine favorisierten Einstellungen für UltraStar Deluxe fest." + ; Finish Page: LangString page_finish_txt ${LANG_GERMAN} "UltraStar Deluxe wurde erfolgreich auf Ihrem System installiert.$\n$\r$\n$\rBesuchen Sie unsere Projektwebseite um die neusten Updates und News zu erhalten." LangString page_finish_linktxt ${LANG_GERMAN} "Projektwebseite" +LangString page_finish_desktop ${LANG_GERMAN} "Verknüpfung auf dem Desktop erstellen?" ; Start Menu and Shortcuts 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/UltraStar Deluxe.nsi | 35 +++++++++++++++++++++--------- installer/languages/English.nsh | 1 + installer/languages/German.nsh | 1 + installer/settings/files_opt_uninstall.nsh | 4 ---- installer/settings/variables.nsh | 3 ++- 5 files changed, 29 insertions(+), 15 deletions(-) delete mode 100644 installer/settings/files_opt_uninstall.nsh (limited to 'installer') diff --git a/installer/UltraStar Deluxe.nsi b/installer/UltraStar Deluxe.nsi index 87079682..882a1c9a 100644 --- a/installer/UltraStar Deluxe.nsi +++ b/installer/UltraStar Deluxe.nsi @@ -36,7 +36,7 @@ SetDatablockOptimize On XPStyle on -Name "${name} V.${version}" +Name "${name} v.${version}" Brandingtext "${name} v.${version} Installation" OutFile "ultrastardx-${version}-installer-full.exe" @@ -533,7 +533,6 @@ Section Uninstall !insertmacro MUI_STARTMENU_GETFOLDER "Application" $ICONS_GROUP - !include "${path_settings}\files_opt_uninstall.nsh" !include "${path_settings}\files_main_uninstall.nsh" DeleteRegKey ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" @@ -546,6 +545,8 @@ ${GameExplorer_RemoveGame} $0 ${EndIf} + + SectionEnd ; ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ @@ -586,6 +587,10 @@ SectionEnd Function .onInit +var /GLOBAL version +StrCpy $version "1.1a" + + System::Call 'kernel32::CreateMutexA(i 0, i 0, t "USdx Installer.exe") ?e' Pop $R0 @@ -594,16 +599,26 @@ Function .onInit MessageBox MB_OK|MB_ICONEXCLAMATION $(oninit_running) Abort - ReadRegStr $R0 HKLM \ - "Software\Microsoft\Windows\CurrentVersion\Uninstall\${name}" \ - "UninstallString" - StrCmp $R0 "" done + ReadRegStr $R0 HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${name}" 'DisplayVersion' - MessageBox MB_YESNO|MB_ICONEXCLAMATION \ - "${name} $(oninit_alreadyinstalled). $\n$\n $(oninit_installagain)" \ - IDYES done - Abort + ${If} $R0 == $version + MessageBox MB_YESNO|MB_ICONEXCLAMATION \ + "${name} v.$R0 $(oninit_alreadyinstalled). $\n$\n $(oninit_installagain)" \ + IDYES done + Abort + ${EndIf} + ReadRegStr $R1 HKLM \ + "Software\Microsoft\Windows\CurrentVersion\Uninstall\${name}" \ + "UninstallString" + StrCmp $R1 "" done + + ${If} $R0 != $version + MessageBox MB_YESNO|MB_ICONEXCLAMATION \ + "${name} v.$R0 $(oninit_alreadyinstalled). $\n$\n $(oninit_updateusdx) v.$R0 -> v.${version}" \ + IDYES done + Abort + ${EndIf} done: diff --git a/installer/languages/English.nsh b/installer/languages/English.nsh index 35362675..2b6f17c3 100644 --- a/installer/languages/English.nsh +++ b/installer/languages/English.nsh @@ -8,6 +8,7 @@ LangString oninit_running ${LANG_ENGLISH} "The installer is already running." LangString oninit_installagain ${LANG_ENGLISH} "Are you sure you want to install it again?" LangString oninit_alreadyinstalled ${LANG_ENGLISH} "is already installed" LangString oninit_closeusdx ${LANG_ENGLISH} "cannot be uninstalled while its running! Do you want to close it?" +LangString oninit_updateusdx ${LANG_ENGLISH} "Do you want to update the installation from:" ; Welcome Page: diff --git a/installer/languages/German.nsh b/installer/languages/German.nsh index 853b01b3..b536eb0e 100644 --- a/installer/languages/German.nsh +++ b/installer/languages/German.nsh @@ -8,6 +8,7 @@ LangString oninit_running ${LANG_GERMAN} "Die Installation wird bereits ausgef LangString oninit_installagain ${LANG_GERMAN} "Sind Sie sicher, dass Sie es erneut installieren möchten?" LangString oninit_alreadyinstalled ${LANG_GERMAN} "ist bereits installiert" LangString oninit_closeusdx ${LANG_GERMAN} "kann nicht während der Laufzeit deinstalliert werden. Soll es geschlossen werden?" +LangString oninit_updateusdx ${LANG_GERMAN} "Möchten Sie das Programm aktualisieren von" ; Welcome Page: 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') 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/UltraStar Deluxe.nsi | 2 +- installer/languages/English.nsh | 2 +- installer/languages/German.nsh | 2 +- installer/settings/files_main_install.nsh | 2 +- installer/settings/files_main_uninstall.nsh | 84 +++++++++++++++++++++++------ installer/settings/variables.nsh | 2 +- 6 files changed, 74 insertions(+), 20 deletions(-) (limited to 'installer') diff --git a/installer/UltraStar Deluxe.nsi b/installer/UltraStar Deluxe.nsi index 882a1c9a..1e71e28c 100644 --- a/installer/UltraStar Deluxe.nsi +++ b/installer/UltraStar Deluxe.nsi @@ -1,5 +1,5 @@ ; ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ -; UltraStar Deluxe Installer - Version 1.1: Main +; UltraStar Deluxe Installer: Main ; ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ !include MUI2.nsh diff --git a/installer/languages/English.nsh b/installer/languages/English.nsh index 2b6f17c3..f74e5c75 100644 --- a/installer/languages/English.nsh +++ b/installer/languages/English.nsh @@ -1,5 +1,5 @@ ; ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ -; UltraStar Deluxe Installer - Version 1.1: English +; UltraStar Deluxe Installer - Language file: English ; ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ LangString abort_install ${LANG_ENGLISH} "Are you sure to abort Installation?" diff --git a/installer/languages/German.nsh b/installer/languages/German.nsh index b536eb0e..1027b8e0 100644 --- a/installer/languages/German.nsh +++ b/installer/languages/German.nsh @@ -1,5 +1,5 @@ ; ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ -; UltraStar Deluxe Installer - Version 1.1: German +; UltraStar Deluxe Installer - Language file: German ; ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ LangString abort_install ${LANG_GERMAN} "Wollen Sie die Installation wirklich abbrechen?" 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') 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') 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/license.txt | 125 ---------------------------- installer/settings/files_main_install.nsh | 5 ++ installer/settings/files_main_uninstall.nsh | 13 +-- 3 files changed, 12 insertions(+), 131 deletions(-) delete mode 100644 installer/license.txt (limited to 'installer') diff --git a/installer/license.txt b/installer/license.txt deleted file mode 100644 index 4964fc70..00000000 --- a/installer/license.txt +++ /dev/null @@ -1,125 +0,0 @@ -The GNU General Public License (GPL) -Version 2, June 1991 -Copyright (C) 1989, 1991 Free Software Foundation, Inc. -59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - -Everyone is permitted to copy and distribute verbatim copies -of this license document, but changing it is not allowed. - -Preamble - -The licenses for most software are designed to take away your freedom to share and change it. By contrast, the GNU General Public License is intended to guarantee your freedom to share and change free software--to make sure the software is free for all its users. This General Public License applies to most of the Free Software Foundation's software and to any other program whose authors commit to using it. (Some other Free Software Foundation software is covered by the GNU Library General Public License instead.) You can apply it to your programs, too. - -When we speak of free software, we are referring to freedom, not price. Our General Public Licenses are designed to make sure that you have the freedom to distribute copies of free software (and charge for this service if you wish), that you receive source code or can get it if you want it, that you can change the software or use pieces of it in new free programs; and that you know you can do these things. - -To protect your rights, we need to make restrictions that forbid anyone to deny you these rights or to ask you to surrender the rights. These restrictions translate to certain responsibilities for you if you distribute copies of the software, or if you modify it. - -For example, if you distribute copies of such a program, whether gratis or for a fee, you must give the recipients all the rights that you have. You must make sure that they, too, receive or can get the source code. And you must show them these terms so they know their rights. - -We protect your rights with two steps: (1) copyright the software, and (2) offer you this license which gives you legal permission to copy, distribute and/or modify the software. - -Also, for each author's protection and ours, we want to make certain that everyone understands that there is no warranty for this free software. If the software is modified by someone else and passed on, we want its recipients to know that what they have is not the original, so that any problems introduced by others will not reflect on the original authors' reputations. - -Finally, any free program is threatened constantly by software patents. We wish to avoid the danger that redistributors of a free program will individually obtain patent licenses, in effect making the program proprietary. To prevent this, we have made it clear that any patent must be licensed for everyone's free use or not licensed at all. - -The precise terms and conditions for copying, distribution and modification follow. - -TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION - -0. This License applies to any program or other work which contains a notice placed by the copyright holder saying it may be distributed under the terms of this General Public License. The "Program", below, refers to any such program or work, and a "work based on the Program" means either the Program or any derivative work under copyright law: that is to say, a work containing the Program or a portion of it, either verbatim or with modifications and/or translated into another language. (Hereinafter, translation is included without limitation in the term "modification".) Each licensee is addressed as "you". - -Activities other than copying, distribution and modification are not covered by this License; they are outside its scope. The act of running the Program is not restricted, and the output from the Program is covered only if its contents constitute a work based on the Program (independent of having been made by running the Program). Whether that is true depends on what the Program does. - -1. You may copy and distribute verbatim copies of the Program's source code as you receive it, in any medium, provided that you conspicuously and appropriately publish on each copy an appropriate copyright notice and disclaimer of warranty; keep intact all the notices that refer to this License and to the absence of any warranty; and give any other recipients of the Program a copy of this License along with the Program. - -You may charge a fee for the physical act of transferring a copy, and you may at your option offer warranty protection in exchange for a fee. - -2. You may modify your copy or copies of the Program or any portion of it, thus forming a work based on the Program, and copy and distribute such modifications or work under the terms of Section 1 above, provided that you also meet all of these conditions: - -a) You must cause the modified files to carry prominent notices stating that you changed the files and the date of any change. - -b) You must cause any work that you distribute or publish, that in whole or in part contains or is derived from the Program or any part thereof, to be licensed as a whole at no charge to all third parties under the terms of this License. - -c) If the modified program normally reads commands interactively when run, you must cause it, when started running for such interactive use in the most ordinary way, to print or display an announcement including an appropriate copyright notice and a notice that there is no warranty (or else, saying that you provide a warranty) and that users may redistribute the program under these conditions, and telling the user how to view a copy of this License. (Exception: if the Program itself is interactive but does not normally print such an announcement, your work based on the Program is not required to print an announcement.) - -These requirements apply to the modified work as a whole. If identifiable sections of that work are not derived from the Program, and can be reasonably considered independent and separate works in themselves, then this License, and its terms, do not apply to those sections when you distribute them as separate works. But when you distribute the same sections as part of a whole which is a work based on the Program, the distribution of the whole must be on the terms of this License, whose permissions for other licensees extend to the entire whole, and thus to each and every part regardless of who wrote it. - -Thus, it is not the intent of this section to claim rights or contest your rights to work written entirely by you; rather, the intent is to exercise the right to control the distribution of derivative or collective works based on the Program. - -In addition, mere aggregation of another work not based on the Program with the Program (or with a work based on the Program) on a volume of a storage or distribution medium does not bring the other work under the scope of this License. - -3. You may copy and distribute the Program (or a work based on it, under Section 2) in object code or executable form under the terms of Sections 1 and 2 above provided that you also do one of the following: - -a) Accompany it with the complete corresponding machine-readable source code, which must be distributed under the terms of Sections 1 and 2 above on a medium customarily used for software interchange; or, - -b) Accompany it with a written offer, valid for at least three years, to give any third party, for a charge no more than your cost of physically performing source distribution, a complete machine-readable copy of the corresponding source code, to be distributed under the terms of Sections 1 and 2 above on a medium customarily used for software interchange; or, - -c) Accompany it with the information you received as to the offer to distribute corresponding source code. (This alternative is allowed only for noncommercial distribution and only if you received the program in object code or executable form with such an offer, in accord with Subsection b above.) - -The source code for a work means the preferred form of the work for making modifications to it. For an executable work, complete source code means all the source code for all modules it contains, plus any associated interface definition files, plus the scripts used to control compilation and installation of the executable. However, as a special exception, the source code distributed need not include anything that is normally distributed (in either source or binary form) with the major components (compiler, kernel, and so on) of the operating system on which the executable runs, unless that component itself accompanies the executable. - -If distribution of executable or object code is made by offering access to copy from a designated place, then offering equivalent access to copy the source code from the same place counts as distribution of the source code, even though third parties are not compelled to copy the source along with the object code. - -4. You may not copy, modify, sublicense, or distribute the Program except as expressly provided under this License. Any attempt otherwise to copy, modify, sublicense or distribute the Program is void, and will automatically terminate your rights under this License. However, parties who have received copies, or rights, from you under this License will not have their licenses terminated so long as such parties remain in full compliance. - -5. You are not required to accept this License, since you have not signed it. However, nothing else grants you permission to modify or distribute the Program or its derivative works. These actions are prohibited by law if you do not accept this License. Therefore, by modifying or distributing the Program (or any work based on the Program), you indicate your acceptance of this License to do so, and all its terms and conditions for copying, distributing or modifying the Program or works based on it. - -6. Each time you redistribute the Program (or any work based on the Program), the recipient automatically receives a license from the original licensor to copy, distribute or modify the Program subject to these terms and conditions. You may not impose any further restrictions on the recipients' exercise of the rights granted herein. You are not responsible for enforcing compliance by third parties to this License. - -7. If, as a consequence of a court judgment or allegation of patent infringement or for any other reason (not limited to patent issues), conditions are imposed on you (whether by court order, agreement or otherwise) that contradict the conditions of this License, they do not excuse you from the conditions of this License. If you cannot distribute so as to satisfy simultaneously your obligations under this License and any other pertinent obligations, then as a consequence you may not distribute the Program at all. For example, if a patent license would not permit royalty-free redistribution of the Program by all those who receive copies directly or indirectly through you, then the only way you could satisfy both it and this License would be to refrain entirely from distribution of the Program. - -If any portion of this section is held invalid or unenforceable under any particular circumstance, the balance of the section is intended to apply and the section as a whole is intended to apply in other circumstances. - -It is not the purpose of this section to induce you to infringe any patents or other property right claims or to contest validity of any such claims; this section has the sole purpose of protecting the integrity of the free software distribution system, which is implemented by public license practices. Many people have made generous contributions to the wide range of software distributed through that system in reliance on consistent application of that system; it is up to the author/donor to decide if he or she is willing to distribute software through any other system and a licensee cannot impose that choice. - -This section is intended to make thoroughly clear what is believed to be a consequence of the rest of this License. - -8. If the distribution and/or use of the Program is restricted in certain countries either by patents or by copyrighted interfaces, the original copyright holder who places the Program under this License may add an explicit geographical distribution limitation excluding those countries, so that distribution is permitted only in or among countries not thus excluded. In such case, this License incorporates the limitation as if written in the body of this License. - -9. The Free Software Foundation may publish revised and/or new versions of the General Public License from time to time. Such new versions will be similar in spirit to the present version, but may differ in detail to address new problems or concerns. - -Each version is given a distinguishing version number. If the Program specifies a version number of this License which applies to it and "any later version", you have the option of following the terms and conditions either of that version or of any later version published by the Free Software Foundation. If the Program does not specify a version number of this License, you may choose any version ever published by the Free Software Foundation. - -10. If you wish to incorporate parts of the Program into other free programs whose distribution conditions are different, write to the author to ask for permission. For software which is copyrighted by the Free Software Foundation, write to the Free Software Foundation; we sometimes make exceptions for this. Our decision will be guided by the two goals of preserving the free status of all derivatives of our free software and of promoting the sharing and reuse of software generally. - -NO WARRANTY - -11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. - -12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. - -END OF TERMS AND CONDITIONS - -How to Apply These Terms to Your New Programs - -If you develop a new program, and you want it to be of the greatest possible use to the public, the best way to achieve this is to make it free software which everyone can redistribute and change under these terms. - -To do so, attach the following notices to the program. It is safest to attach them to the start of each source file to most effectively convey the exclusion of warranty; and each file should have at least the "copyright" line and a pointer to where the full notice is found. - -one line to give the program's name and a brief idea of what it does. -Copyright (C) - -This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. - -This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - -You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - -Also add information on how to contact you by electronic and paper mail. - -If the program is interactive, make it output a short notice like this when it starts in an interactive mode: - -Gnomovision version 69, Copyright (C) year name of author Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. This is free software, and you are welcome to redistribute it under certain conditions; type `show c' for details. - -The hypothetical commands `show w' and `show c' should show the appropriate parts of the General Public License. Of course, the commands you use may be called something other than `show w' and `show c'; they could even be mouse-clicks or menu items--whatever suits your program. - -You should also get your employer (if you work as a programmer) or your school, if any, to sign a "copyright disclaimer" for the program, if necessary. Here is a sample; alter the names: - -Yoyodyne, Inc., hereby disclaims all copyright interest -in the program `Gnomovision' (which makes passes at compilers) -written by James Hacker. - -signature of Ty Coon, 1 April 1989 -Ty Coon, President of Vice - -This General Public License does not permit incorporating your program into proprietary programs. If your program is a subroutine library, you may consider it more useful to permit linking proprietary applications with the library. If this is what you want to do, use the GNU Library General Public License instead of this License. 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/UltraStar Deluxe.nsi | 542 +++++++++++++++++++++++++++++- installer/languages/English.nsh | 27 ++ installer/languages/German.nsh | 27 ++ installer/settings/files_main_install.nsh | 6 +- installer/settings/variables.nsh | 25 ++ 5 files changed, 621 insertions(+), 6 deletions(-) (limited to 'installer') diff --git a/installer/UltraStar Deluxe.nsi b/installer/UltraStar Deluxe.nsi index 1e71e28c..c8df95dd 100644 --- a/installer/UltraStar Deluxe.nsi +++ b/installer/UltraStar Deluxe.nsi @@ -334,7 +334,521 @@ Section /o "Dead Smiling Pirates - I 18" g2Section1 SectionEnd ; -; Steven Dunston - Northern Star +; Jonathan Coulton Songs +; + +SectionGroup $(name_s2_sub1) s2_sub1 + +Section /o "Monkey Shines" s2_sub1_Section1 + +; AddSize 1400 + SetOverwrite try + SetOutPath "$INSTDIR\Songs\" + +; Download song: + NSISdl::download /TIMEOUT=30000 ${download_sub1_song1} $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: + nsisunz::Unzip "$TEMP\Song-JC-MS.zip" "$INSTDIR\Songs\" + + Delete "$TEMP\Song-JC-MS.zip" + + SetOutPath "$INSTDIR" + +SectionEnd + +Section /o "I Crush Everything" s2_sub1_Section2 + +; AddSize 1400 + SetOverwrite try + SetOutPath "$INSTDIR\Songs\" + +; Download song: + NSISdl::download /TIMEOUT=30000 ${download_sub1_song2} $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: + nsisunz::Unzip "$TEMP\Song-JC-ICE.zip" "$INSTDIR\Songs\" + + Delete "$TEMP\Song-JC-ICE.zip" + + SetOutPath "$INSTDIR" + +SectionEnd + +Section /o "Not About You" s2_sub1_Section3 + +; AddSize 1400 + SetOverwrite try + SetOutPath "$INSTDIR\Songs\" + +; Download song: + NSISdl::download /TIMEOUT=30000 ${download_sub1_song3} $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: + nsisunz::Unzip "$TEMP\Song-JC-NAY.zip" "$INSTDIR\Songs\" + + Delete "$TEMP\Song-JC-NAY.zip" + + SetOutPath "$INSTDIR" + + +SectionEnd + +Section /o "Mr. Fancy Pants" s2_sub1_Section4 + +; AddSize 1400 + SetOverwrite try + SetOutPath "$INSTDIR\Songs\" + +; Download song: + NSISdl::download /TIMEOUT=30000 ${download_sub1_song4} $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: + nsisunz::Unzip "$TEMP\Song-JC-MFP.zip" "$INSTDIR\Songs\" + + Delete "$TEMP\Song-JC-MFP.zip" + + SetOutPath "$INSTDIR" + +SectionEnd + +Section /o "Big Bad World One" s2_sub1_Section5 + +; AddSize 1400 + SetOverwrite try + SetOutPath "$INSTDIR\Songs\" + +; Download song: + NSISdl::download /TIMEOUT=30000 ${download_sub1_song5} $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: + nsisunz::Unzip "$TEMP\Song-JC-BBWO.zip" "$INSTDIR\Songs\" + + Delete "$TEMP\Song-JC-BBWO.zip" + + SetOutPath "$INSTDIR" + +SectionEnd + +Section /o "Flickr" s2_sub1_Section6 + +; AddSize 1400 + SetOverwrite try + SetOutPath "$INSTDIR\Songs\" + +; Download song: + NSISdl::download /TIMEOUT=30000 ${download_sub1_song6} $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: + nsisunz::Unzip "$TEMP\Song-JC-Flickr.zip" "$INSTDIR\Songs\" + + Delete "$TEMP\Song-JC-Flickr.zip" + + SetOutPath "$INSTDIR" + +SectionEnd + +Section /o "My Beige Bear" s2_sub1_Section7 + +; AddSize 1400 + SetOverwrite try + SetOutPath "$INSTDIR\Songs\" + +; Download song: + NSISdl::download /TIMEOUT=30000 ${download_sub1_song7} $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: + nsisunz::Unzip "$TEMP\Song-JC-MBB.zip" "$INSTDIR\Songs\" + + Delete "$TEMP\Song-JC-MBB.zip" + + SetOutPath "$INSTDIR" + +SectionEnd + +Section /o "The Future Soon" s2_sub1_Section8 + +; AddSize 1400 + SetOverwrite try + SetOutPath "$INSTDIR\Songs\" + +; Download song: + NSISdl::download /TIMEOUT=30000 ${download_sub1_song8} $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: + nsisunz::Unzip "$TEMP\Song-JC-TFS.zip" "$INSTDIR\Songs\" + + Delete "$TEMP\Song-JC-TFS.zip" + + SetOutPath "$INSTDIR" + +SectionEnd + +Section /o "Ikea" s2_sub1_Section9 + +; AddSize 1400 + SetOverwrite try + SetOutPath "$INSTDIR\Songs\" + +; Download song: + NSISdl::download /TIMEOUT=30000 ${download_sub1_song9} $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: + nsisunz::Unzip "$TEMP\Song-JC-Ikea.zip" "$INSTDIR\Songs\" + + Delete "$TEMP\Song-JC-Ikea.zip" + + SetOutPath "$INSTDIR" + +SectionEnd + +Section /o "Furry Old Lobster" s2_sub1_Section10 + +; AddSize 1400 + SetOverwrite try + SetOutPath "$INSTDIR\Songs\" + +; Download song: + NSISdl::download /TIMEOUT=30000 ${download_sub1_song10} $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: + nsisunz::Unzip "$TEMP\Song-JC-FOL.zip" "$INSTDIR\Songs\" + + Delete "$TEMP\Song-JC-FOL.zip" + + SetOutPath "$INSTDIR" + +SectionEnd + +Section /o "Code Monkey" s2_sub1_Section11 + +; AddSize 1400 + SetOverwrite try + SetOutPath "$INSTDIR\Songs\" + +; Download song: + NSISdl::download /TIMEOUT=30000 ${download_sub1_song11} $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: + nsisunz::Unzip "$TEMP\Song-JC-CM.zip" "$INSTDIR\Songs\" + + Delete "$TEMP\Song-JC-CM.zip" + + SetOutPath "$INSTDIR" + +SectionEnd + +Section /o "I´m Your Moon" s2_sub1_Section12 + +; AddSize 1400 + SetOverwrite try + SetOutPath "$INSTDIR\Songs\" + +; Download song: + NSISdl::download /TIMEOUT=30000 ${download_sub1_song12} $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: + nsisunz::Unzip "$TEMP\Song-JC-IYM.zip" "$INSTDIR\Songs\" + + Delete "$TEMP\Song-JC-IYM.zip" + + SetOutPath "$INSTDIR" + +SectionEnd + +Section /o "First Of May" s2_sub1_Section13 + +; AddSize 1400 + SetOverwrite try + SetOutPath "$INSTDIR\Songs\" + +; Download song: + NSISdl::download /TIMEOUT=30000 ${download_sub1_song13} $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: + nsisunz::Unzip "$TEMP\Song-JC-FOM.zip" "$INSTDIR\Songs\" + + Delete "$TEMP\Song-JC-FOM.zip" + + SetOutPath "$INSTDIR" + +SectionEnd + +Section /o "Dance, Soterious Johnson, Dance" s2_sub1_Section14 + +; AddSize 1400 + SetOverwrite try + SetOutPath "$INSTDIR\Songs\" + +; Download song: + NSISdl::download /TIMEOUT=30000 ${download_sub1_song14} $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: + nsisunz::Unzip "$TEMP\Song-JC-DSJD.zip" "$INSTDIR\Songs\" + + Delete "$TEMP\Song-JC-DSJD.zip" + + SetOutPath "$INSTDIR" + +SectionEnd + +Section /o "A Walk With George" s2_sub1_Section15 + +; AddSize 1400 + SetOverwrite try + SetOutPath "$INSTDIR\Songs\" + +; Download song: + NSISdl::download /TIMEOUT=30000 ${download_sub1_song15} $TEMP\Song-JC-AWWG.zip + + Pop $R0 + StrCmp $R0 "success" dlok + MessageBox MB_OK|MB_ICONEXCLAMATION "Download Error, click OK to Continue" /SD IDOK + dlok: + nsisunz::Unzip "$TEMP\Song-JC-AWWG.zip" "$INSTDIR\Songs\" + + Delete "$TEMP\Song-JC-AWWG.zip" + + SetOutPath "$INSTDIR" + +SectionEnd + +Section /o "Creepy Doll" s2_sub1_Section16 + +; AddSize 1400 + SetOverwrite try + SetOutPath "$INSTDIR\Songs\" + +; Download song: + NSISdl::download /TIMEOUT=30000 ${download_sub1_song16} $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: + nsisunz::Unzip "$TEMP\Song-JC-CD.zip" "$INSTDIR\Songs\" + + Delete "$TEMP\Song-JC-CD.zip" + + SetOutPath "$INSTDIR" + +SectionEnd + +Section /o "That Spells DNA" s2_sub1_Section17 + +; AddSize 1400 + SetOverwrite try + SetOutPath "$INSTDIR\Songs\" + +; Download song: + NSISdl::download /TIMEOUT=30000 ${download_sub1_song17} $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: + nsisunz::Unzip "$TEMP\Song-JC-TSDNA.zip" "$INSTDIR\Songs\" + + Delete "$TEMP\Song-JC-TSDNA.zip" + + SetOutPath "$INSTDIR" + +SectionEnd + +Section /o "When You Go" s2_sub1_Section18 + +; AddSize 1400 + SetOverwrite try + SetOutPath "$INSTDIR\Songs\" + +; Download song: + NSISdl::download /TIMEOUT=30000 ${download_sub1_song18} $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: + nsisunz::Unzip "$TEMP\Song-JC-WYG.zip" "$INSTDIR\Songs\" + + Delete "$TEMP\Song-JC-WYG.zip" + + SetOutPath "$INSTDIR" + +SectionEnd + +Section /o "Better" s2_sub1_Section19 + +; AddSize 1400 + SetOverwrite try + SetOutPath "$INSTDIR\Songs\" + +; Download song: + NSISdl::download /TIMEOUT=30000 ${download_sub1_song19} $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: + nsisunz::Unzip "$TEMP\Song-JC-Better.zip" "$INSTDIR\Songs\" + + Delete "$TEMP\Song-JC-Better.zip" + + SetOutPath "$INSTDIR" + +SectionEnd + +Section /o "Shop Vac" s2_sub1_Section20 + +; AddSize 1400 + SetOverwrite try + SetOutPath "$INSTDIR\Songs\" + +; Download song: + NSISdl::download /TIMEOUT=30000 ${download_sub1_song20} $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: + nsisunz::Unzip "$TEMP\Song-JC-SV.zip" "$INSTDIR\Songs\" + + Delete "$TEMP\Song-JC-SV.zip" + + SetOutPath "$INSTDIR" + +SectionEnd + +Section /o "I Feel Fantastic" s2_sub1_Section21 + +; AddSize 1400 + SetOverwrite try + SetOutPath "$INSTDIR\Songs\" + +; Download song: + NSISdl::download /TIMEOUT=30000 ${download_sub1_song21} $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: + nsisunz::Unzip "$TEMP\Song-JC-IFF.zip" "$INSTDIR\Songs\" + + Delete "$TEMP\Song-JC-IFF.zip" + + SetOutPath "$INSTDIR" + +SectionEnd + +Section /o "Re: Your Brains" s2_sub1_Section22 + +; AddSize 1400 + SetOverwrite try + SetOutPath "$INSTDIR\Songs\" + +; Download song: + NSISdl::download /TIMEOUT=30000 ${download_sub1_song22} $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: + nsisunz::Unzip "$TEMP\Song-JC-ReYB.zip" "$INSTDIR\Songs\" + + Delete "$TEMP\Song-JC-ReYB.zip" + + SetOutPath "$INSTDIR" + +SectionEnd + +Section /o "Skullcrusher Mountain" s2_sub1_Section23 + +; AddSize 1400 + SetOverwrite try + SetOutPath "$INSTDIR\Songs\" + +; Download song: + NSISdl::download /TIMEOUT=30000 ${download_sub1_song23} $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: + nsisunz::Unzip "$TEMP\Song-JC-SCM.zip" "$INSTDIR\Songs\" + + Delete "$TEMP\Song-JC-SCM.zip" + + SetOutPath "$INSTDIR" + +SectionEnd + +Section /o "Chiron Beta Prime" s2_sub1_Section24 + +; AddSize 1400 + SetOverwrite try + SetOutPath "$INSTDIR\Songs\" + +; Download song: + NSISdl::download /TIMEOUT=30000 ${download_sub1_song24} $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: + nsisunz::Unzip "$TEMP\Song-JC-CBP.zip" "$INSTDIR\Songs\" + + Delete "$TEMP\Song-JC-CBP.zip" + + SetOutPath "$INSTDIR" + +SectionEnd + + +SectionGroupEnd + +; +; Joshua Morin - On The Run ; Section /o "Joshua Morin - On The Run" g2Section2 @@ -558,6 +1072,7 @@ SectionEnd !insertmacro MUI_DESCRIPTION_TEXT ${Section1} $(DESC_Section1) !insertmacro MUI_DESCRIPTION_TEXT ${Section2} $(DESC_Section2) + !insertmacro MUI_DESCRIPTION_TEXT ${s2_sub1} $(DESC_Section2_sub1) !insertmacro MUI_DESCRIPTION_TEXT ${Section3} $(DESC_Section3) !insertmacro MUI_DESCRIPTION_TEXT ${g2Section1} $(DESC_g2Section1) @@ -565,6 +1080,31 @@ SectionEnd !insertmacro MUI_DESCRIPTION_TEXT ${g2Section3} $(DESC_g2Section3) !insertmacro MUI_DESCRIPTION_TEXT ${g2Section4} $(DESC_g2Section4) + !insertmacro MUI_DESCRIPTION_TEXT ${s2_sub1_Section1} $(DESC_s2_sub1_Section1) + !insertmacro MUI_DESCRIPTION_TEXT ${s2_sub1_Section2} $(DESC_s2_sub1_Section2) + !insertmacro MUI_DESCRIPTION_TEXT ${s2_sub1_Section3} $(DESC_s2_sub1_Section3) + !insertmacro MUI_DESCRIPTION_TEXT ${s2_sub1_Section4} $(DESC_s2_sub1_Section4) + !insertmacro MUI_DESCRIPTION_TEXT ${s2_sub1_Section5} $(DESC_s2_sub1_Section5) + !insertmacro MUI_DESCRIPTION_TEXT ${s2_sub1_Section6} $(DESC_s2_sub1_Section6) + !insertmacro MUI_DESCRIPTION_TEXT ${s2_sub1_Section7} $(DESC_s2_sub1_Section7) + !insertmacro MUI_DESCRIPTION_TEXT ${s2_sub1_Section8} $(DESC_s2_sub1_Section8) + !insertmacro MUI_DESCRIPTION_TEXT ${s2_sub1_Section9} $(DESC_s2_sub1_Section9) + !insertmacro MUI_DESCRIPTION_TEXT ${s2_sub1_Section10} $(DESC_s2_sub1_Section10) + !insertmacro MUI_DESCRIPTION_TEXT ${s2_sub1_Section11} $(DESC_s2_sub1_Section11) + !insertmacro MUI_DESCRIPTION_TEXT ${s2_sub1_Section12} $(DESC_s2_sub1_Section12) + !insertmacro MUI_DESCRIPTION_TEXT ${s2_sub1_Section13} $(DESC_s2_sub1_Section13) + !insertmacro MUI_DESCRIPTION_TEXT ${s2_sub1_Section14} $(DESC_s2_sub1_Section14) + !insertmacro MUI_DESCRIPTION_TEXT ${s2_sub1_Section15} $(DESC_s2_sub1_Section15) + !insertmacro MUI_DESCRIPTION_TEXT ${s2_sub1_Section16} $(DESC_s2_sub1_Section16) + !insertmacro MUI_DESCRIPTION_TEXT ${s2_sub1_Section17} $(DESC_s2_sub1_Section17) + !insertmacro MUI_DESCRIPTION_TEXT ${s2_sub1_Section18} $(DESC_s2_sub1_Section18) + !insertmacro MUI_DESCRIPTION_TEXT ${s2_sub1_Section19} $(DESC_s2_sub1_Section19) + !insertmacro MUI_DESCRIPTION_TEXT ${s2_sub1_Section20} $(DESC_s2_sub1_Section20) + !insertmacro MUI_DESCRIPTION_TEXT ${s2_sub1_Section21} $(DESC_s2_sub1_Section21) + !insertmacro MUI_DESCRIPTION_TEXT ${s2_sub1_Section22} $(DESC_s2_sub1_Section22) + !insertmacro MUI_DESCRIPTION_TEXT ${s2_sub1_Section23} $(DESC_s2_sub1_Section23) + !insertmacro MUI_DESCRIPTION_TEXT ${s2_sub1_Section24} $(DESC_s2_sub1_Section24) + !insertmacro MUI_DESCRIPTION_TEXT ${g3Section1} $(DESC_g3Section1) !insertmacro MUI_DESCRIPTION_TEXT ${g3Section2} $(DESC_g3Section2) !insertmacro MUI_DESCRIPTION_TEXT ${g3Section3} $(DESC_g3Section3) diff --git a/installer/languages/English.nsh b/installer/languages/English.nsh index f74e5c75..b539a0e2 100644 --- a/installer/languages/English.nsh +++ b/installer/languages/English.nsh @@ -46,10 +46,12 @@ LangString sc_desktop ${LANG_ENGLISH} "Create Desktop Shortcut?" LangString name_section1 ${LANG_ENGLISH} "Main components" LangString name_section2 ${LANG_ENGLISH} "Optional songs" +LangString name_s2_sub1 ${LANG_ENGLISH} "Jonathan Coulton" LangString name_section3 ${LANG_ENGLISH} "Optional themes" LangString DESC_Section1 ${LANG_ENGLISH} "These are the basic files needed by UltraStar Deluxe" LangString DESC_Section2 ${LANG_ENGLISH} "You can choose which songs should be installed." +LangString DESC_Section2_sub1 ${LANG_ENGLISH} "You can choose which Jonathan Coulton Songs (CC by-nc 3.0) should be installed." LangString DESC_Section3 ${LANG_ENGLISH} "You can choose which optional themes should be installed." LangString DESC_g2Section1 ${LANG_ENGLISH} "This will install the song 'Dead Smiling Pirates - I 18' (CC by-nc-nd 2.5)." @@ -57,6 +59,31 @@ LangString DESC_g2Section2 ${LANG_ENGLISH} "This will install the song 'Joshua M LangString DESC_g2Section3 ${LANG_ENGLISH} "This will install the song 'Pornophonique - Space Invaders' (CC by-nc-nd 2.0)." LangString DESC_g2Section4 ${LANG_ENGLISH} "This will install the song 'Steven Dunston - Northern Star' (CC by-nc-sa 2.5)." +LangString DESC_s2_sub1_Section1 ${LANG_ENGLISH} "This will install the song 'Monkey Shines'." +LangString DESC_s2_sub1_Section2 ${LANG_ENGLISH} "This will install the song 'I Crush Everything'." +LangString DESC_s2_sub1_Section3 ${LANG_ENGLISH} "This will install the song 'Not About You'." +LangString DESC_s2_sub1_Section4 ${LANG_ENGLISH} "This will install the song 'Mr. Fancy Pants'." +LangString DESC_s2_sub1_Section5 ${LANG_ENGLISH} "This will install the song 'Big Bad World One'." +LangString DESC_s2_sub1_Section6 ${LANG_ENGLISH} "This will install the song 'Flickr'." +LangString DESC_s2_sub1_Section7 ${LANG_ENGLISH} "This will install the song 'My Beige Bear'." +LangString DESC_s2_sub1_Section8 ${LANG_ENGLISH} "This will install the song 'The Future Soon'." +LangString DESC_s2_sub1_Section9 ${LANG_ENGLISH} "This will install the song 'Ikea'." +LangString DESC_s2_sub1_Section10 ${LANG_ENGLISH} "This will install the song 'Furry Old Lobster'." +LangString DESC_s2_sub1_Section11 ${LANG_ENGLISH} "This will install the song 'Code Monkey'." +LangString DESC_s2_sub1_Section12 ${LANG_ENGLISH} "This will install the song 'I´m Your Moon'." +LangString DESC_s2_sub1_Section13 ${LANG_ENGLISH} "This will install the song 'First Of May'." +LangString DESC_s2_sub1_Section14 ${LANG_ENGLISH} "This will install the song 'Dance, Soterios Johnson, Dance'." +LangString DESC_s2_sub1_Section15 ${LANG_ENGLISH} "This will install the song 'A Talk With George'." +LangString DESC_s2_sub1_Section16 ${LANG_ENGLISH} "This will install the song 'Creepy Doll'." +LangString DESC_s2_sub1_Section17 ${LANG_ENGLISH} "This will install the song 'That Spells DNA'." +LangString DESC_s2_sub1_Section18 ${LANG_ENGLISH} "This will install the song 'When You Go'." +LangString DESC_s2_sub1_Section19 ${LANG_ENGLISH} "This will install the song 'Better'." +LangString DESC_s2_sub1_Section20 ${LANG_ENGLISH} "This will install the song 'Shop Vac'." +LangString DESC_s2_sub1_Section21 ${LANG_ENGLISH} "This will install the song 'I Feel Fantastic'." +LangString DESC_s2_sub1_Section22 ${LANG_ENGLISH} "This will install the song 'Re: Your Brains'." +LangString DESC_s2_sub1_Section23 ${LANG_ENGLISH} "This will install the song 'Skullcrusher Mountain'." +LangString DESC_s2_sub1_Section24 ${LANG_ENGLISH} "This will install the song 'Chiron Beta Prime'." + LangString DESC_g3Section1 ${LANG_ENGLISH} "This will install the optional theme 'Orange' by Skar" LangString DESC_g3Section2 ${LANG_ENGLISH} "This will install the optional theme 'Streetlight' by Skar" LangString DESC_g3Section3 ${LANG_ENGLISH} "This will install the optional theme 'Vistar' by Skar" diff --git a/installer/languages/German.nsh b/installer/languages/German.nsh index 1027b8e0..0939b236 100644 --- a/installer/languages/German.nsh +++ b/installer/languages/German.nsh @@ -46,10 +46,12 @@ LangString sc_desktop ${LANG_GERMAN} "Verkn LangString name_section1 ${LANG_GERMAN} "Hauptkomponenten" LangString name_section2 ${LANG_GERMAN} "Optionale Songs" +LangString name_s2_sub1 ${LANG_GERMAN} "Jonathan Coulton" LangString name_section3 ${LANG_GERMAN} "Optionale Themen" LangString DESC_Section1 ${LANG_GERMAN} "Dies sind die von UltraStar Deluxe benötigten Grunddateien" LangString DESC_Section2 ${LANG_GERMAN} "Hier können Songs zum Installieren gewählt werden." +LangString DESC_Section2_sub1 ${LANG_GERMAN} "Hier können Jonathan Coulton Songs (CC by-nc 3.0) zum Installieren gewählt werden." LangString DESC_Section3 ${LANG_GERMAN} "Hier können alternative Motive zum Installieren gewählt werden." LangString DESC_g2Section1 ${LANG_GERMAN} "Installiert das Beispiellied 'Dead Smiling Pirates - I 18' (CC by-nc-nd 2.5)." @@ -57,6 +59,31 @@ LangString DESC_g2Section2 ${LANG_GERMAN} "Installiert das Beispiellied 'Joshua LangString DESC_g2Section3 ${LANG_GERMAN} "Installiert das Beispiellied 'Pornophonique - Space Invaders' (CC by-nc-nd 2.0)." LangString DESC_g2Section4 ${LANG_GERMAN} "Installiert das Beispiellied 'Steven Dunston - Northern Star' (CC by-nc-sa 2.5)." +LangString DESC_s2_sub1_Section1 ${LANG_GERMAN} "Installiert das Beispiellied 'Monkey Shines'." +LangString DESC_s2_sub1_Section2 ${LANG_GERMAN} "Installiert das Beispiellied 'I Crush Everything'." +LangString DESC_s2_sub1_Section3 ${LANG_GERMAN} "Installiert das Beispiellied 'Not About You'." +LangString DESC_s2_sub1_Section4 ${LANG_GERMAN} "Installiert das Beispiellied 'Mr. Fancy Pants'." +LangString DESC_s2_sub1_Section5 ${LANG_GERMAN} "Installiert das Beispiellied 'Big Bad World One'." +LangString DESC_s2_sub1_Section6 ${LANG_GERMAN} "Installiert das Beispiellied 'Flickr'." +LangString DESC_s2_sub1_Section7 ${LANG_GERMAN} "Installiert das Beispiellied 'My Beige Bear'." +LangString DESC_s2_sub1_Section8 ${LANG_GERMAN} "Installiert das Beispiellied 'The Future Soon'." +LangString DESC_s2_sub1_Section9 ${LANG_GERMAN} "Installiert das Beispiellied 'Ikea'." +LangString DESC_s2_sub1_Section10 ${LANG_GERMAN} "Installiert das Beispiellied 'Furry Old Lobster'." +LangString DESC_s2_sub1_Section11 ${LANG_GERMAN} "Installiert das Beispiellied 'Code Monkey'." +LangString DESC_s2_sub1_Section12 ${LANG_GERMAN} "Installiert das Beispiellied 'I´m Your Moon'." +LangString DESC_s2_sub1_Section13 ${LANG_GERMAN} "Installiert das Beispiellied 'First Of May'." +LangString DESC_s2_sub1_Section14 ${LANG_GERMAN} "Installiert das Beispiellied 'Dance, Soterios Johnson, Dance'." +LangString DESC_s2_sub1_Section15 ${LANG_GERMAN} "Installiert das Beispiellied 'A Talk With George'." +LangString DESC_s2_sub1_Section16 ${LANG_GERMAN} "Installiert das Beispiellied 'Creepy Doll'." +LangString DESC_s2_sub1_Section17 ${LANG_GERMAN} "Installiert das Beispiellied 'That Spells DNA'." +LangString DESC_s2_sub1_Section18 ${LANG_GERMAN} "Installiert das Beispiellied 'When You Go'." +LangString DESC_s2_sub1_Section19 ${LANG_GERMAN} "Installiert das Beispiellied 'Better'." +LangString DESC_s2_sub1_Section20 ${LANG_GERMAN} "Installiert das Beispiellied 'Shop Vac'." +LangString DESC_s2_sub1_Section21 ${LANG_GERMAN} "Installiert das Beispiellied 'I Feel Fantastic'." +LangString DESC_s2_sub1_Section22 ${LANG_GERMAN} "Installiert das Beispiellied 'Re: Your Brains'." +LangString DESC_s2_sub1_Section23 ${LANG_GERMAN} "Installiert das Beispiellied 'Skullcrusher Mountain'." +LangString DESC_s2_sub1_Section24 ${LANG_GERMAN} "Installiert das Beispiellied 'Chiron Beta Prime'." + LangString DESC_g3Section1 ${LANG_GERMAN} "Installiert das Motiv 'Orange' von Skar" LangString DESC_g3Section2 ${LANG_GERMAN} "Installiert das Motiv 'Streetlight' von Skar" LangString DESC_g3Section3 ${LANG_GERMAN} "Installiert das Motiv 'Vistar' von Skar" 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/Update.nsi | 176 +++++++++++++++++++++++++++++++++++++++ installer/languages/English.nsh | 5 ++ installer/languages/German.nsh | 5 ++ installer/settings/functions.nsh | 100 +++++++++++++++++++++- installer/version.txt | 1 + 5 files changed, 286 insertions(+), 1 deletion(-) create mode 100644 installer/Update.nsi create mode 100644 installer/version.txt (limited to 'installer') diff --git a/installer/Update.nsi b/installer/Update.nsi new file mode 100644 index 00000000..6da20f5d --- /dev/null +++ b/installer/Update.nsi @@ -0,0 +1,176 @@ +; ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ +; UltraStar Deluxe Installer: Update +; ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ + +!include MUI2.nsh +!include WinVer.nsh +!include LogicLib.nsh +!include nsDialogs.nsh + +; ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ +; Variables +; ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ + +; Installer Paths: + +!define path_settings ".\settings" +!define path_languages ".\languages" +!define path_images "..\installerdependencies\images" +!define path_plugins "..\installerdependencies\plugins" +!define path_gdf "$WINDIR\gdf.dll" + +!addPluginDir "${path_plugins}\" + +!include "${path_settings}\variables.nsh" +!include "${path_settings}\GameExplorer.nsh" +!include "${path_settings}\functions.nsh" + +; ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ +; Export Settings +; ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ + +SetCompress Auto +SetCompressor /SOLID lzma +SetCompressorDictSize 32 +SetDatablockOptimize On + +Var /GLOBAL CHECKBOX +Var /GLOBAL label_update_information +Var /GLOBAL checkbox_state + +XPStyle on + +Name "${name} v.${version} - Update" +Brandingtext "${name} v.${version} Update" +OutFile "ultrastardx-update.exe" + +InstallDir "$PROGRAMFILES\${name}" + +; Windows Vista: + +RequestExecutionLevel user + +; ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ +; Interface Settings +; ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ + +; Icons: + +!define MUI_ICON "${path_images}\${img_install}" +!define MUI_UNICON "${path_images}\${img_uninstall}" + +; Header and Side Images: + +!define MUI_HEADERIMAGE +!define MUI_HEADERIMAGE_BITMAP "${path_images}\${img_header}" +!define MUI_HEADERIMAGE_UNBITMAP "${path_images}\${img_header}" + +!define MUI_WELCOMEFINISHPAGE_BITMAP "${path_images}\${img_side}" +!define MUI_UNWELCOMEFINISHPAGE_BITMAP "${path_images}\${img_side}" + +; Abort Warnings: + +!define MUI_ABORTWARNING +!define MUI_ABORTWARNING_TEXT "$(abort_install)" +!define MUI_ABORTWARNING_CANCEL_DEFAULT + +!define MUI_UNABORTWARNING +!define MUI_UNABORTWARNING_TEXT "$(abort_uninstall)" +!define MUI_UNABORTWARNING_CANCEL_DEFAULT + +; ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ +; Pages Installation Routine Settings +; ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ + +; Welcome Page: + +!define MUI_WELCOMEPAGE_TITLE_3LINES +!define MUI_WELCOMEPAGE_TITLE "$(page_welcome_title_update)" +!define MUI_WELCOMEPAGE_TEXT "$(page_welcome_txt_update)" + +; ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ +; Pages Installation Routine +; ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ + +!insertmacro MUI_PAGE_WELCOME + +; USDX Update Page + +Page custom Update Download + +Function Update + +nsDialogs::Create /NOUNLOAD 1018 + + Pop $0 + + ${NSD_CreateCheckbox} 0 -150 100% 8u "$(update_connect)" + Pop $CHECKBOX + GetFunctionAddress $0 OnCheckbox + nsDialogs::OnClick /NOUNLOAD $CHECKBOX $0 + + ${NSD_CreateLabel} 0 0 100% 30u "$(update_information)" + Pop $label_update_information + +nsDialogs::Show + + +FunctionEnd ; Update page End + +Function Download + +${NSD_GetState} $CHECKBOX $checkbox_state + +${If} $checkbox_state == "1" + +NSISdl::download_quiet /TIMEOUT=30000 http://ultrastardx.svn.sourceforge.net/viewvc/ultrastardx/trunk/installer/version.txt $TEMP\version.txt + +FileOpen $4 "$TEMP\version.txt" r +FileRead $4 $1 + +ReadRegStr $R0 HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${name}" 'DisplayVersion' + + +${VersionCompare} "$R0" "$1" $R1 + +MessageBox MB_OK "$R1. R0 = $R0 und R1 = $1" + + + +${Else} + + + +${EndIf} + +FunctionEnd + +; ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ +; UPDATE (Section 1) +; ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ + +Section $(name_section1) Section1 + SectionIn RO + SetOutPath $INSTDIR + SetOverwrite try + +SectionEnd + +; ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ +; Language Support +; ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ + +!insertmacro MUI_LANGUAGE "English" +!insertmacro MUI_LANGUAGE "German" + +!insertmacro MUI_RESERVEFILE_LANGDLL + +!include "${path_languages}\*.nsh" + +Function .onInit + + !insertmacro MUI_LANGDLL_DISPLAY + + + +FunctionEnd diff --git a/installer/languages/English.nsh b/installer/languages/English.nsh index b539a0e2..e1ee4656 100644 --- a/installer/languages/English.nsh +++ b/installer/languages/English.nsh @@ -10,6 +10,11 @@ LangString oninit_alreadyinstalled ${LANG_ENGLISH} "is already installed" LangString oninit_closeusdx ${LANG_ENGLISH} "cannot be uninstalled while its running! Do you want to close it?" LangString oninit_updateusdx ${LANG_ENGLISH} "Do you want to update the installation from:" +LangString update_connect ${LANG_ENGLISH} "Establish internet connection and check for new version" +LangString button_next ${LANG_ENGLISH} "Next >" +LangString button_close ${LANG_ENGLISH} "Close" +LangString update_information ${LANG_ENGLISH} "You can check if a new version of 'UltraStar Deluxe' is available. Thereto an internet connection will be established. If a new version is found, it can be installed afterwards." + ; Welcome Page: LangString page_welcome_title ${LANG_ENGLISH} "Welcome to the UltraStar Deluxe Setup Wizard" diff --git a/installer/languages/German.nsh b/installer/languages/German.nsh index 0939b236..7ab009e0 100644 --- a/installer/languages/German.nsh +++ b/installer/languages/German.nsh @@ -10,6 +10,11 @@ LangString oninit_alreadyinstalled ${LANG_GERMAN} "ist bereits installiert" LangString oninit_closeusdx ${LANG_GERMAN} "kann nicht während der Laufzeit deinstalliert werden. Soll es geschlossen werden?" LangString oninit_updateusdx ${LANG_GERMAN} "Möchten Sie das Programm aktualisieren von" +LangString update_connect ${LANG_GERMAN} "Mit dem Internet verbinden und nach aktueller Version suchen" +LangString button_next ${LANG_GERMAN} "Weiter >" +LangString button_close ${LANG_GERMAN} "Beenden" +LangString update_information ${LANG_GERMAN} "Du kannst nach einer aktuelleren Version von 'UltraStar Deluxe' suchen. Dazu wird eine Verbindung mit dem Internet hergestellt. Wurde eine aktuellere Version gefunden, kann diese anschließend installiert werden." + ; Welcome Page: LangString page_welcome_title ${LANG_GERMAN} "Willkommen zur Installationsroutine von UltraStar Deluxe" 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 diff --git a/installer/version.txt b/installer/version.txt new file mode 100644 index 00000000..b123147e --- /dev/null +++ b/installer/version.txt @@ -0,0 +1 @@ +1.1 \ 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/Update.nsi | 53 ++++++++++++++++++++++++++++++++++------ installer/languages/English.nsh | 8 ++++++ installer/languages/German.nsh | 8 ++++++ installer/settings/functions.nsh | 24 ++++++++++++++++++ installer/version.txt | 1 - 5 files changed, 86 insertions(+), 8 deletions(-) delete mode 100644 installer/version.txt (limited to 'installer') diff --git a/installer/Update.nsi b/installer/Update.nsi index 6da20f5d..b8e5a458 100644 --- a/installer/Update.nsi +++ b/installer/Update.nsi @@ -40,8 +40,8 @@ Var /GLOBAL checkbox_state XPStyle on -Name "${name} v.${version} - Update" -Brandingtext "${name} v.${version} Update" +Name "${name} - Update" +Brandingtext "${name} Update" OutFile "ultrastardx-update.exe" InstallDir "$PROGRAMFILES\${name}" @@ -123,26 +123,65 @@ ${NSD_GetState} $CHECKBOX $checkbox_state ${If} $checkbox_state == "1" -NSISdl::download_quiet /TIMEOUT=30000 http://ultrastardx.svn.sourceforge.net/viewvc/ultrastardx/trunk/installer/version.txt $TEMP\version.txt +NSISdl::download /TIMEOUT=50000 http://ultrastardeluxe.xtremeweb-hosting.net/version.txt $TEMP\version.txt -FileOpen $4 "$TEMP\version.txt" r -FileRead $4 $1 +Push 1 +Push "$TEMP\version.txt" + Call ReadFileLine +Pop $1 ReadRegStr $R0 HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${name}" 'DisplayVersion' - ${VersionCompare} "$R0" "$1" $R1 -MessageBox MB_OK "$R1. R0 = $R0 und R1 = $1" +${If} $R1 == "0" + +messageBox MB_OK|MB_ICONINFORMATION "$(update_check_equal)" + +${Else} + ${If} $R1 == "1" + + IfFileExists $TEMP\version.txt FileExists + SetErrors + Goto Failed + + FileExists: + messageBox MB_OK|MB_ICONINFORMATION "$(update_check_newer)" + + ${Else} + ${If} $R1 == "2" + messageBox MB_YESNO|MB_ICONQUESTION \ + "$(update_check_older)" IDNO +6 + Push 2 + Push "$TEMP\version.txt" + Call ReadFileLine + Pop $2 + ExecShell Open $2 + + ${Else} + + Failed: + messageBox MB_YESNO|MB_ICONQUESTION \ + "$(update_check_failed)" IDNO +2 + + ExecShell Open http://www.ultrastardeluxe.org + + ${EndIf} + ${EndIf} +${EndIf} ${Else} +; If checkbox_state = 0 ${EndIf} +Delete "$TEMP\version.txt" + + FunctionEnd ; ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ diff --git a/installer/languages/English.nsh b/installer/languages/English.nsh index e1ee4656..e5d8dccf 100644 --- a/installer/languages/English.nsh +++ b/installer/languages/English.nsh @@ -15,8 +15,16 @@ LangString button_next ${LANG_ENGLISH} "Next >" LangString button_close ${LANG_ENGLISH} "Close" LangString update_information ${LANG_ENGLISH} "You can check if a new version of 'UltraStar Deluxe' is available. Thereto an internet connection will be established. If a new version is found, it can be installed afterwards." +LangString update_check_older ${LANG_ENGLISH} "Your version $R0 is outdated. The new version $1 of UltraStar Deluxe is available. Do you want to update?" +LangString update_check_equal ${LANG_ENGLISH} "Your currently installed version $R0 is up-to-date. No update needed." +LangString update_check_newer ${LANG_ENGLISH} "Your installed version $R0 is newer than the $\n$\rcurrent release version $1 of UltraStar Deluxe. No update needed." +LangString update_check_failed ${LANG_ENGLISH} "The check for a new version failed. Do you want to visit website to check manually ?" + ; Welcome Page: +LangString page_welcome_title_update ${LANG_ENGLISH} "Welcome to the UltraStar Deluxe Update Wizard" +LangString page_welcome_txt_update ${LANG_ENGLISH} "This wizard will guide you through the Update process of UltraStar Deluxe. UltraStar Deluxe is a free open source Karaoke game, which can be compared with Singstar.$\n$\r$\n$\rThe UltraStar Deluxe Team wishes you fun.$\n$\rProject website: http://www.ultrastardeluxe.org$\n$\rSupport Forum: http://forum.ultrastardeluxe.org" + LangString page_welcome_title ${LANG_ENGLISH} "Welcome to the UltraStar Deluxe Setup Wizard" LangString page_welcome_txt ${LANG_ENGLISH} "This wizard will guide you through the Installation of UltraStar Deluxe. UltraStar Deluxe is a free open source Karaoke game, which can be compared with Singstar.$\n$\r$\n$\rThe UltraStar Deluxe Team wishes you fun.$\n$\rProject website: http://www.ultrastardeluxe.org$\n$\rSupport Forum: http://forum.ultrastardeluxe.org" diff --git a/installer/languages/German.nsh b/installer/languages/German.nsh index 7ab009e0..642257ee 100644 --- a/installer/languages/German.nsh +++ b/installer/languages/German.nsh @@ -15,8 +15,16 @@ LangString button_next ${LANG_GERMAN} "Weiter >" LangString button_close ${LANG_GERMAN} "Beenden" LangString update_information ${LANG_GERMAN} "Du kannst nach einer aktuelleren Version von 'UltraStar Deluxe' suchen. Dazu wird eine Verbindung mit dem Internet hergestellt. Wurde eine aktuellere Version gefunden, kann diese anschließend installiert werden." +LangString update_check_older ${LANG_GERMAN} "Deine aktuelle Version $R0 ist veraltet. Die neue Version $1 von UltraStar Deluxe ist verfügbar. Möchtest du sie runterladen?" +LangString update_check_equal ${LANG_GERMAN} "Deine aktuelle Version $R0 ist auf dem neusten Stand.$\n$\rKein Update benötigt." +LangString update_check_newer ${LANG_GERMAN} "Deine aktuelle Version $R0 ist neuer als die zurzeit veröffentlichte$\n$\rVersion $1 von UltraStar Deluxe. Kein Update benötigt." +LangString update_check_failed ${LANG_GERMAN} "Die Aktualisierungsprüfung ist fehlgeschlagen. Willst du manuell nach Updates suchen?" + ; Welcome Page: +LangString page_welcome_title_update ${LANG_GERMAN} "Willkommen beim Aktualisierungsassistenten von UltraStar Deluxe" +LangString page_welcome_txt_update ${LANG_GERMAN} "Dieser Assistent wird Sie durch die Aktualisierung von UltraStar Deluxe begleiten. UltraStar Deluxe ist ein kostenloses quelloffenes Karaokespiel, welches Singstar ähnelt. $\n$\r$\n$\rDas UltraStar Deluxe Team wünscht viel Spaß.$\n$\rProjekthomepage: http://www.ultrastardeluxe.org$\n$\rSupport Forum: http://forum.ultrastardeluxe.org" + LangString page_welcome_title ${LANG_GERMAN} "Willkommen zur Installationsroutine von UltraStar Deluxe" LangString page_welcome_txt ${LANG_GERMAN} "Dieser Assistent wird Sie durch die Installation von UltraStar Deluxe begleiten. UltraStar Deluxe ist ein kostenloses quelloffenes Karaokespiel, welches Singstar ähnelt. $\n$\r$\n$\rDas UltraStar Deluxe Team wünscht viel Spaß.$\n$\rProjekthomepage: http://www.ultrastardeluxe.org$\n$\rSupport Forum: http://forum.ultrastardeluxe.org" 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 diff --git a/installer/version.txt b/installer/version.txt deleted file mode 100644 index b123147e..00000000 --- a/installer/version.txt +++ /dev/null @@ -1 +0,0 @@ -1.1 \ 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/UltraStar Deluxe.nsi | 314 +++++++++++++++++++++++++++++- installer/languages/English.nsh | 37 +++- installer/languages/German.nsh | 84 ++++---- installer/settings/files_main_install.nsh | 3 +- installer/settings/variables.nsh | 31 ++- 5 files changed, 409 insertions(+), 60 deletions(-) (limited to 'installer') diff --git a/installer/UltraStar Deluxe.nsi b/installer/UltraStar Deluxe.nsi index c8df95dd..e512203c 100644 --- a/installer/UltraStar Deluxe.nsi +++ b/installer/UltraStar Deluxe.nsi @@ -307,11 +307,33 @@ SectionEnd SectionGroup $(name_section2) Section2 +Section /o "Bodo Wartke - Liebeslied (Love Song)" g2Section1 + +; AddSize 1400 + SetOverwrite try + SetOutPath "$INSTDIR\Songs\" + +; Download song: + NSISdl::download /TIMEOUT=30000 ${download_song5} $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: + nsisunz::Unzip "$TEMP\Song-BodoWartke-LoveSong.zip" "$INSTDIR\Songs\" + + Delete "$TEMP\Song-BodoWartke-LoveSong.zip" + + SetOutPath "$INSTDIR" + + +SectionEnd + ; ; Dead Smiling Pirates - I 18 ; -Section /o "Dead Smiling Pirates - I 18" g2Section1 +Section /o "Dead Smiling Pirates - I 18" g2Section2 ; AddSize 1400 SetOverwrite try SetOutPath "$INSTDIR" @@ -851,7 +873,7 @@ SectionGroupEnd ; Joshua Morin - On The Run ; -Section /o "Joshua Morin - On The Run" g2Section2 +Section /o "Joshua Morin - On The Run" g2Section3 ; AddSize 2200 SetOverwrite try SetOutPath "$INSTDIR" @@ -859,7 +881,7 @@ Section /o "Joshua Morin - On The Run" g2Section2 SetOutPath "$INSTDIR\Songs\Joshua Morin - On The Run\" ; Download song: - NSISdl::download /TIMEOUT=30000 ${download_song3} $TEMP\Song-On-the-run.zip + NSISdl::download /TIMEOUT=30000 ${download_song2} $TEMP\Song-On-the-run.zip Pop $R0 ;Get the return value StrCmp $R0 "success" dlok @@ -873,7 +895,7 @@ Section /o "Joshua Morin - On The Run" g2Section2 SectionEnd -Section /o "Pornophonique - Space Invaders" g2Section3 +Section /o "Pornophonique - Space Invaders" g2Section4 ; AddSize 2200 SetOverwrite try SetOutPath "$INSTDIR" @@ -895,7 +917,200 @@ Section /o "Pornophonique - Space Invaders" g2Section3 SectionEnd -Section /o "Steven Dunston - Northern Star" g2Section4 +SectionGroup $(name_s2_sub2) s2_sub2 + +Section /o "Shearer - 69" s2_sub2_Section1 + +; AddSize 1400 + SetOverwrite try + SetOutPath "$INSTDIR\Songs\" + +; Download song: + NSISdl::download /TIMEOUT=30000 ${download_sub2_song1} $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: + nsisunz::Unzip "$TEMP\Song-Shearer-69.zip" "$INSTDIR\Songs\" + + Delete "$TEMP\Song-Shearer-69.zip" + + SetOutPath "$INSTDIR" + +SectionEnd + +Section /o "Shearer - 69 (Karaoke)" s2_sub2_Section2 + +; AddSize 1400 + SetOverwrite try + SetOutPath "$INSTDIR\Songs\" + +; Download song: + NSISdl::download /TIMEOUT=30000 ${download_sub2_song2} $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: + nsisunz::Unzip "$TEMP\Song-Shearer-69-Kar.zip" "$INSTDIR\Songs\" + + Delete "$TEMP\Song-Shearer-69-Kar.zip" + + SetOutPath "$INSTDIR" + +SectionEnd + +Section /o "Shearer - Can't stop it" s2_sub2_Section3 + +; AddSize 1400 + SetOverwrite try + SetOutPath "$INSTDIR\Songs\" + +; Download song: + NSISdl::download /TIMEOUT=30000 ${download_sub2_song3} $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: + nsisunz::Unzip "$TEMP\Song-Shearer-CSI.zip" "$INSTDIR\Songs\" + + Delete "$TEMP\Song-Shearer-CSI.zip" + + SetOutPath "$INSTDIR" + +SectionEnd + +Section /o "Shearer - Can't stop it (Karaoke)" s2_sub2_Section4 + +; AddSize 1400 + SetOverwrite try + SetOutPath "$INSTDIR\Songs\" + +; Download song: + NSISdl::download /TIMEOUT=30000 ${download_sub2_song4} $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: + nsisunz::Unzip "$TEMP\Song-Shearer-CSI-Kar.zip" "$INSTDIR\Songs\" + + Delete "$TEMP\Song-Shearer-CSI-Kar.zip" + + SetOutPath "$INSTDIR" + +SectionEnd + +Section /o "Shearer - In My Hand" s2_sub2_Section5 + +; AddSize 1400 + SetOverwrite try + SetOutPath "$INSTDIR\Songs\" + +; Download song: + NSISdl::download /TIMEOUT=30000 ${download_sub2_song5} $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: + nsisunz::Unzip "$TEMP\Song-Shearer-IMH.zip" "$INSTDIR\Songs\" + + Delete "$TEMP\Song-Shearer-IMH.zip" + + SetOutPath "$INSTDIR" + +SectionEnd + +Section /o "Shearer - Man Song" s2_sub2_Section6 + +; AddSize 1400 + SetOverwrite try + SetOutPath "$INSTDIR\Songs\" + +; Download song: + NSISdl::download /TIMEOUT=30000 ${download_sub2_song6} $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: + nsisunz::Unzip "$TEMP\Song-Shearer-MS.zip" "$INSTDIR\Songs\" + + Delete "$TEMP\Song-Shearer-MS.zip" + + SetOutPath "$INSTDIR" + +SectionEnd + +Section /o "Shearer - Man Song (Karaoke)" s2_sub2_Section7 + +; AddSize 1400 + SetOverwrite try + SetOutPath "$INSTDIR\Songs\" + +; Download song: + NSISdl::download /TIMEOUT=30000 ${download_sub2_song7} $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: + nsisunz::Unzip "$TEMP\Song-Shearer-MS-Kar.zip" "$INSTDIR\Songs\" + + Delete "$TEMP\Song-Shearer-MS-Kar.zip" + + SetOutPath "$INSTDIR" + +SectionEnd + +Section /o "Shearer - Stay With Me" s2_sub2_Section8 + +; AddSize 1400 + SetOverwrite try + SetOutPath "$INSTDIR\Songs\" + +; Download song: + NSISdl::download /TIMEOUT=30000 ${download_sub2_song8} $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: + nsisunz::Unzip "$TEMP\Song-Shearer-SWM.zip" "$INSTDIR\Songs\" + + Delete "$TEMP\Song-Shearer-SWM.zip" + + SetOutPath "$INSTDIR" + +SectionEnd + +Section /o "Shearer - Stay With Me (Karaoke)" s2_sub2_Section9 + +; AddSize 1400 + SetOverwrite try + SetOutPath "$INSTDIR\Songs\" + +; Download song: + NSISdl::download /TIMEOUT=30000 ${download_sub2_song9} $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: + nsisunz::Unzip "$TEMP\Song-Shearer-SWM-Kar.zip" "$INSTDIR\Songs\" + + Delete "$TEMP\Song-Shearer-SWM-Kar.zip" + + SetOutPath "$INSTDIR" + +SectionEnd + +SectionGroupEnd + +Section /o "Steven Dunston - Northern Star" g2Section5 ; AddSize 1500 SetOverwrite try SetOutPath "$INSTDIR" @@ -903,7 +1118,7 @@ Section /o "Steven Dunston - Northern Star" g2Section4 SetOutPath "$INSTDIR\Songs\Steven Dunston - Northern Star\" ; Download song: - NSISdl::download /TIMEOUT=30000 ${download_song2} $TEMP\Song-Northern-Star.zip + NSISdl::download /TIMEOUT=30000 ${download_song4} $TEMP\Song-Northern-Star.zip Pop $R0 ;Get the return value StrCmp $R0 "success" dlok @@ -917,6 +1132,52 @@ Section /o "Steven Dunston - Northern Star" g2Section4 SectionEnd +SectionGroup $(name_s2_sub3) s2_sub3 + +Section /o "Wise Guys - Lebendig und kräftig und schärfer" s2_sub3_Section1 + +; AddSize 1400 + SetOverwrite try + SetOutPath "$INSTDIR\Songs\" + +; Download song: + NSISdl::download /TIMEOUT=30000 ${download_sub3_song1} $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: + nsisunz::Unzip "$TEMP\Song-WiseGuys-LUKUS.zip" "$INSTDIR\Songs\" + + Delete "$TEMP\Song-WiseGuys-LUKUS.zip" + + SetOutPath "$INSTDIR" + +SectionEnd + +Section /o "Wise Guys - Mensch, wo bist du?" s2_sub3_Section2 + +; AddSize 1400 + SetOverwrite try + SetOutPath "$INSTDIR\Songs\" + +; Download song: + NSISdl::download /TIMEOUT=30000 ${download_sub3_song2} $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: + nsisunz::Unzip "$TEMP\Song-WiseGuys-MWBD.zip" "$INSTDIR\Songs\" + + Delete "$TEMP\Song-WiseGuys-MWBD.zip" + + SetOutPath "$INSTDIR" + +SectionEnd + +SectionGroupEnd + SectionGroupEnd ;------------------------------------ @@ -999,7 +1260,27 @@ SectionEnd SectionEnd - Section /o "WiiStar" g3Section5 + + Section /o "WhiteSensation" g3Section5 +; AddSize 1000 + +; Download theme WhiteSensation: + + NSISdl::download /TIMEOUT=30000 ${download_theme7} $TEMP\Theme-WhiteSensation.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: + nsisunz::Unzip "$TEMP\Theme-WhiteSensation.zip" "$INSTDIR\" + + Delete "$TEMP\Theme-WhiteSensation.zip" + + SetOutPath "$INSTDIR" + +SectionEnd + + Section /o "WiiStar" g3Section6 ; AddSize 1000 ; Download theme WiiStar: @@ -1018,7 +1299,7 @@ SectionEnd SectionEnd - Section /o "iStar" g3Section6 + Section /o "iStar" g3Section7 ; AddSize 1000 ; Download theme iStar: @@ -1073,12 +1354,15 @@ SectionEnd !insertmacro MUI_DESCRIPTION_TEXT ${Section1} $(DESC_Section1) !insertmacro MUI_DESCRIPTION_TEXT ${Section2} $(DESC_Section2) !insertmacro MUI_DESCRIPTION_TEXT ${s2_sub1} $(DESC_Section2_sub1) + !insertmacro MUI_DESCRIPTION_TEXT ${s2_sub2} $(DESC_Section2_sub2) + !insertmacro MUI_DESCRIPTION_TEXT ${s2_sub3} $(DESC_Section2_sub3) !insertmacro MUI_DESCRIPTION_TEXT ${Section3} $(DESC_Section3) !insertmacro MUI_DESCRIPTION_TEXT ${g2Section1} $(DESC_g2Section1) !insertmacro MUI_DESCRIPTION_TEXT ${g2Section2} $(DESC_g2Section2) !insertmacro MUI_DESCRIPTION_TEXT ${g2Section3} $(DESC_g2Section3) !insertmacro MUI_DESCRIPTION_TEXT ${g2Section4} $(DESC_g2Section4) + !insertmacro MUI_DESCRIPTION_TEXT ${g2Section5} $(DESC_g2Section5) !insertmacro MUI_DESCRIPTION_TEXT ${s2_sub1_Section1} $(DESC_s2_sub1_Section1) !insertmacro MUI_DESCRIPTION_TEXT ${s2_sub1_Section2} $(DESC_s2_sub1_Section2) @@ -1105,12 +1389,26 @@ SectionEnd !insertmacro MUI_DESCRIPTION_TEXT ${s2_sub1_Section23} $(DESC_s2_sub1_Section23) !insertmacro MUI_DESCRIPTION_TEXT ${s2_sub1_Section24} $(DESC_s2_sub1_Section24) + !insertmacro MUI_DESCRIPTION_TEXT ${s2_sub2_Section1} $(DESC_s2_sub2_Section1) + !insertmacro MUI_DESCRIPTION_TEXT ${s2_sub2_Section2} $(DESC_s2_sub2_Section2) + !insertmacro MUI_DESCRIPTION_TEXT ${s2_sub2_Section3} $(DESC_s2_sub2_Section3) + !insertmacro MUI_DESCRIPTION_TEXT ${s2_sub2_Section4} $(DESC_s2_sub2_Section4) + !insertmacro MUI_DESCRIPTION_TEXT ${s2_sub2_Section5} $(DESC_s2_sub2_Section5) + !insertmacro MUI_DESCRIPTION_TEXT ${s2_sub2_Section6} $(DESC_s2_sub2_Section6) + !insertmacro MUI_DESCRIPTION_TEXT ${s2_sub2_Section7} $(DESC_s2_sub2_Section7) + !insertmacro MUI_DESCRIPTION_TEXT ${s2_sub2_Section8} $(DESC_s2_sub2_Section8) + !insertmacro MUI_DESCRIPTION_TEXT ${s2_sub2_Section9} $(DESC_s2_sub2_Section9) + + !insertmacro MUI_DESCRIPTION_TEXT ${s2_sub3_Section1} $(DESC_s2_sub3_Section1) + !insertmacro MUI_DESCRIPTION_TEXT ${s2_sub3_Section2} $(DESC_s2_sub3_Section2) + !insertmacro MUI_DESCRIPTION_TEXT ${g3Section1} $(DESC_g3Section1) !insertmacro MUI_DESCRIPTION_TEXT ${g3Section2} $(DESC_g3Section2) !insertmacro MUI_DESCRIPTION_TEXT ${g3Section3} $(DESC_g3Section3) !insertmacro MUI_DESCRIPTION_TEXT ${g3Section4} $(DESC_g3Section4) !insertmacro MUI_DESCRIPTION_TEXT ${g3Section5} $(DESC_g3Section5) !insertmacro MUI_DESCRIPTION_TEXT ${g3Section6} $(DESC_g3Section6) + !insertmacro MUI_DESCRIPTION_TEXT ${g3Section7} $(DESC_g3Section7) !insertmacro MUI_FUNCTION_DESCRIPTION_END diff --git a/installer/languages/English.nsh b/installer/languages/English.nsh index e5d8dccf..9620723e 100644 --- a/installer/languages/English.nsh +++ b/installer/languages/English.nsh @@ -60,17 +60,22 @@ LangString sc_desktop ${LANG_ENGLISH} "Create Desktop Shortcut?" LangString name_section1 ${LANG_ENGLISH} "Main components" LangString name_section2 ${LANG_ENGLISH} "Optional songs" LangString name_s2_sub1 ${LANG_ENGLISH} "Jonathan Coulton" +LangString name_s2_sub2 ${LANG_ENGLISH} "Shearer" +LangString name_s2_sub3 ${LANG_ENGLISH} "Wise Guys" LangString name_section3 ${LANG_ENGLISH} "Optional themes" LangString DESC_Section1 ${LANG_ENGLISH} "These are the basic files needed by UltraStar Deluxe" LangString DESC_Section2 ${LANG_ENGLISH} "You can choose which songs should be installed." -LangString DESC_Section2_sub1 ${LANG_ENGLISH} "You can choose which Jonathan Coulton Songs (CC by-nc 3.0) should be installed." +LangString DESC_Section2_sub1 ${LANG_ENGLISH} "You can choose which Jonathan Coulton songs (CC by-nc 3.0) should be installed." +LangString DESC_Section2_sub2 ${LANG_ENGLISH} "You can choose which Shearer songs (CC by-nc-sa 2.0 / 3.0) should be installed." +LangString DESC_Section2_sub3 ${LANG_ENGLISH} "You can choose which Wise Guys songs should be installed." LangString DESC_Section3 ${LANG_ENGLISH} "You can choose which optional themes should be installed." -LangString DESC_g2Section1 ${LANG_ENGLISH} "This will install the song 'Dead Smiling Pirates - I 18' (CC by-nc-nd 2.5)." -LangString DESC_g2Section2 ${LANG_ENGLISH} "This will install the song 'Joshua Morin - On The Run' (CC by-sa 2.5)." -LangString DESC_g2Section3 ${LANG_ENGLISH} "This will install the song 'Pornophonique - Space Invaders' (CC by-nc-nd 2.0)." -LangString DESC_g2Section4 ${LANG_ENGLISH} "This will install the song 'Steven Dunston - Northern Star' (CC by-nc-sa 2.5)." +LangString DESC_g2Section2 ${LANG_ENGLISH} "This will install the song 'Dead Smiling Pirates - I 18' (CC by-nc-nd 2.5)." +LangString DESC_g2Section3 ${LANG_ENGLISH} "This will install the song 'Joshua Morin - On The Run' (CC by-sa 2.5)." +LangString DESC_g2Section4 ${LANG_ENGLISH} "This will install the song 'Pornophonique - Space Invaders' (CC by-nc-nd 2.0)." +LangString DESC_g2Section5 ${LANG_ENGLISH} "This will install the song 'Steven Dunston - Northern Star' (CC by-nc-sa 2.5)." +LangString DESC_g2Section1 ${LANG_ENGLISH} "This will install the song 'Bodo Wartke - Liebeslied (Love Song)'." LangString DESC_s2_sub1_Section1 ${LANG_ENGLISH} "This will install the song 'Monkey Shines'." LangString DESC_s2_sub1_Section2 ${LANG_ENGLISH} "This will install the song 'I Crush Everything'." @@ -97,11 +102,23 @@ LangString DESC_s2_sub1_Section22 ${LANG_ENGLISH} "This will install the song 'R LangString DESC_s2_sub1_Section23 ${LANG_ENGLISH} "This will install the song 'Skullcrusher Mountain'." LangString DESC_s2_sub1_Section24 ${LANG_ENGLISH} "This will install the song 'Chiron Beta Prime'." +LangString DESC_s2_sub2_Section1 ${LANG_ENGLISH} "This will install the song '69'." +LangString DESC_s2_sub2_Section2 ${LANG_ENGLISH} "This will install the song '69 (Karaoke)'." +LangString DESC_s2_sub2_Section3 ${LANG_ENGLISH} "This will install the song 'Can't stop it'." +LangString DESC_s2_sub2_Section4 ${LANG_ENGLISH} "This will install the song 'Can't stop it (Karaoke)'." +LangString DESC_s2_sub2_Section5 ${LANG_ENGLISH} "This will install the song 'In My Hand'." +LangString DESC_s2_sub2_Section6 ${LANG_ENGLISH} "This will install the song 'Man Song'." +LangString DESC_s2_sub2_Section7 ${LANG_ENGLISH} "This will install the song 'Man Song (Karaoke)'." +LangString DESC_s2_sub2_Section8 ${LANG_ENGLISH} "This will install the song 'Stay with me'." +LangString DESC_s2_sub2_Section9 ${LANG_ENGLISH} "This will install the song 'Stay with me (Karaoke)'." + +LangString DESC_s2_sub3_Section1 ${LANG_ENGLISH} "This will install the song 'Lebendig und kräftig und schärfer'." +LangString DESC_s2_sub3_Section2 ${LANG_ENGLISH} "This will install the song 'Mensch, wo bist du?'." + LangString DESC_g3Section1 ${LANG_ENGLISH} "This will install the optional theme 'Orange' by Skar" LangString DESC_g3Section2 ${LANG_ENGLISH} "This will install the optional theme 'Streetlight' by Skar" LangString DESC_g3Section3 ${LANG_ENGLISH} "This will install the optional theme 'Vistar' by Skar" -LangString DESC_g3Section4 ${LANG_ENGLISH} "This will install the optional theme 'BlueSensation v5' by Charis" -LangString DESC_g3Section5 ${LANG_ENGLISH} "This will install the optional theme 'WiiStar' by MasterPhW" -LangString DESC_g3Section6 ${LANG_ENGLISH} "This will install the optional theme 'iStar' by MezzoX" - - +LangString DESC_g3Section4 ${LANG_ENGLISH} "This will install the optional theme 'BlueSensation v5.1' by Charis" +LangString DESC_g3Section6 ${LANG_ENGLISH} "This will install the optional theme 'WiiStar' by MasterPhW" +LangString DESC_g3Section7 ${LANG_ENGLISH} "This will install the optional theme 'iStar' by MezzoX" +LangString DESC_g3Section5 ${LANG_ENGLISH} "This will install the optional theme 'WhiteSensation' by Charis" \ No newline at end of file diff --git a/installer/languages/German.nsh b/installer/languages/German.nsh index 642257ee..aeb222a7 100644 --- a/installer/languages/German.nsh +++ b/installer/languages/German.nsh @@ -60,47 +60,65 @@ LangString sc_desktop ${LANG_GERMAN} "Verkn LangString name_section1 ${LANG_GERMAN} "Hauptkomponenten" LangString name_section2 ${LANG_GERMAN} "Optionale Songs" LangString name_s2_sub1 ${LANG_GERMAN} "Jonathan Coulton" +LangString name_s2_sub2 ${LANG_GERMAN} "Shearer" +LangString name_s2_sub3 ${LANG_GERMAN} "Wise Guys" LangString name_section3 ${LANG_GERMAN} "Optionale Themen" LangString DESC_Section1 ${LANG_GERMAN} "Dies sind die von UltraStar Deluxe benötigten Grunddateien" LangString DESC_Section2 ${LANG_GERMAN} "Hier können Songs zum Installieren gewählt werden." LangString DESC_Section2_sub1 ${LANG_GERMAN} "Hier können Jonathan Coulton Songs (CC by-nc 3.0) zum Installieren gewählt werden." +LangString DESC_Section2_sub2 ${LANG_GERMAN} "Hier können Shearer Songs (CC by-nc-sa 2.0 / 3.0) zum Installieren gewählt werden." +LangString DESC_Section2_sub3 ${LANG_GERMAN} "Hier können Wise Guys Songs zum Installieren gewählt werden." LangString DESC_Section3 ${LANG_GERMAN} "Hier können alternative Motive zum Installieren gewählt werden." -LangString DESC_g2Section1 ${LANG_GERMAN} "Installiert das Beispiellied 'Dead Smiling Pirates - I 18' (CC by-nc-nd 2.5)." -LangString DESC_g2Section2 ${LANG_GERMAN} "Installiert das Beispiellied 'Joshua Morin - On The Run' (CC by-sa 2.5)." -LangString DESC_g2Section3 ${LANG_GERMAN} "Installiert das Beispiellied 'Pornophonique - Space Invaders' (CC by-nc-nd 2.0)." -LangString DESC_g2Section4 ${LANG_GERMAN} "Installiert das Beispiellied 'Steven Dunston - Northern Star' (CC by-nc-sa 2.5)." - -LangString DESC_s2_sub1_Section1 ${LANG_GERMAN} "Installiert das Beispiellied 'Monkey Shines'." -LangString DESC_s2_sub1_Section2 ${LANG_GERMAN} "Installiert das Beispiellied 'I Crush Everything'." -LangString DESC_s2_sub1_Section3 ${LANG_GERMAN} "Installiert das Beispiellied 'Not About You'." -LangString DESC_s2_sub1_Section4 ${LANG_GERMAN} "Installiert das Beispiellied 'Mr. Fancy Pants'." -LangString DESC_s2_sub1_Section5 ${LANG_GERMAN} "Installiert das Beispiellied 'Big Bad World One'." -LangString DESC_s2_sub1_Section6 ${LANG_GERMAN} "Installiert das Beispiellied 'Flickr'." -LangString DESC_s2_sub1_Section7 ${LANG_GERMAN} "Installiert das Beispiellied 'My Beige Bear'." -LangString DESC_s2_sub1_Section8 ${LANG_GERMAN} "Installiert das Beispiellied 'The Future Soon'." -LangString DESC_s2_sub1_Section9 ${LANG_GERMAN} "Installiert das Beispiellied 'Ikea'." -LangString DESC_s2_sub1_Section10 ${LANG_GERMAN} "Installiert das Beispiellied 'Furry Old Lobster'." -LangString DESC_s2_sub1_Section11 ${LANG_GERMAN} "Installiert das Beispiellied 'Code Monkey'." -LangString DESC_s2_sub1_Section12 ${LANG_GERMAN} "Installiert das Beispiellied 'I´m Your Moon'." -LangString DESC_s2_sub1_Section13 ${LANG_GERMAN} "Installiert das Beispiellied 'First Of May'." -LangString DESC_s2_sub1_Section14 ${LANG_GERMAN} "Installiert das Beispiellied 'Dance, Soterios Johnson, Dance'." -LangString DESC_s2_sub1_Section15 ${LANG_GERMAN} "Installiert das Beispiellied 'A Talk With George'." -LangString DESC_s2_sub1_Section16 ${LANG_GERMAN} "Installiert das Beispiellied 'Creepy Doll'." -LangString DESC_s2_sub1_Section17 ${LANG_GERMAN} "Installiert das Beispiellied 'That Spells DNA'." -LangString DESC_s2_sub1_Section18 ${LANG_GERMAN} "Installiert das Beispiellied 'When You Go'." -LangString DESC_s2_sub1_Section19 ${LANG_GERMAN} "Installiert das Beispiellied 'Better'." -LangString DESC_s2_sub1_Section20 ${LANG_GERMAN} "Installiert das Beispiellied 'Shop Vac'." -LangString DESC_s2_sub1_Section21 ${LANG_GERMAN} "Installiert das Beispiellied 'I Feel Fantastic'." -LangString DESC_s2_sub1_Section22 ${LANG_GERMAN} "Installiert das Beispiellied 'Re: Your Brains'." -LangString DESC_s2_sub1_Section23 ${LANG_GERMAN} "Installiert das Beispiellied 'Skullcrusher Mountain'." -LangString DESC_s2_sub1_Section24 ${LANG_GERMAN} "Installiert das Beispiellied 'Chiron Beta Prime'." +LangString DESC_g2Section2 ${LANG_GERMAN} "Installiert das Lied 'Dead Smiling Pirates - I 18' (CC by-nc-nd 2.5)." +LangString DESC_g2Section3 ${LANG_GERMAN} "Installiert das Lied 'Joshua Morin - On The Run' (CC by-sa 2.5)." +LangString DESC_g2Section4 ${LANG_GERMAN} "Installiert das Lied 'Pornophonique - Space Invaders' (CC by-nc-nd 2.0)." +LangString DESC_g2Section5 ${LANG_GERMAN} "Installiert das Lied 'Steven Dunston - Northern Star' (CC by-nc-sa 2.5)." +LangString DESC_g2Section1 ${LANG_GERMAN} "Installiert das Lied 'Bodo Wartke - Liebeslied (Love Song)'." + +LangString DESC_s2_sub1_Section1 ${LANG_GERMAN} "Installiert das Lied 'Monkey Shines'." +LangString DESC_s2_sub1_Section2 ${LANG_GERMAN} "Installiert das Lied 'I Crush Everything'." +LangString DESC_s2_sub1_Section3 ${LANG_GERMAN} "Installiert das Lied 'Not About You'." +LangString DESC_s2_sub1_Section4 ${LANG_GERMAN} "Installiert das Lied 'Mr. Fancy Pants'." +LangString DESC_s2_sub1_Section5 ${LANG_GERMAN} "Installiert das Lied 'Big Bad World One'." +LangString DESC_s2_sub1_Section6 ${LANG_GERMAN} "Installiert das Lied 'Flickr'." +LangString DESC_s2_sub1_Section7 ${LANG_GERMAN} "Installiert das Lied 'My Beige Bear'." +LangString DESC_s2_sub1_Section8 ${LANG_GERMAN} "Installiert das Lied 'The Future Soon'." +LangString DESC_s2_sub1_Section9 ${LANG_GERMAN} "Installiert das Lied 'Ikea'." +LangString DESC_s2_sub1_Section10 ${LANG_GERMAN} "Installiert das Lied 'Furry Old Lobster'." +LangString DESC_s2_sub1_Section11 ${LANG_GERMAN} "Installiert das Lied 'Code Monkey'." +LangString DESC_s2_sub1_Section12 ${LANG_GERMAN} "Installiert das Lied 'I´m Your Moon'." +LangString DESC_s2_sub1_Section13 ${LANG_GERMAN} "Installiert das Lied 'First Of May'." +LangString DESC_s2_sub1_Section14 ${LANG_GERMAN} "Installiert das Lied 'Dance, Soterios Johnson, Dance'." +LangString DESC_s2_sub1_Section15 ${LANG_GERMAN} "Installiert das Lied 'A Talk With George'." +LangString DESC_s2_sub1_Section16 ${LANG_GERMAN} "Installiert das Lied 'Creepy Doll'." +LangString DESC_s2_sub1_Section17 ${LANG_GERMAN} "Installiert das Lied 'That Spells DNA'." +LangString DESC_s2_sub1_Section18 ${LANG_GERMAN} "Installiert das Lied 'When You Go'." +LangString DESC_s2_sub1_Section19 ${LANG_GERMAN} "Installiert das Lied 'Better'." +LangString DESC_s2_sub1_Section20 ${LANG_GERMAN} "Installiert das Lied 'Shop Vac'." +LangString DESC_s2_sub1_Section21 ${LANG_GERMAN} "Installiert das Lied 'I Feel Fantastic'." +LangString DESC_s2_sub1_Section22 ${LANG_GERMAN} "Installiert das Lied 'Re: Your Brains'." +LangString DESC_s2_sub1_Section23 ${LANG_GERMAN} "Installiert das Lied 'Skullcrusher Mountain'." +LangString DESC_s2_sub1_Section24 ${LANG_GERMAN} "Installiert das Lied 'Chiron Beta Prime'." + +LangString DESC_s2_sub2_Section1 ${LANG_GERMAN} "Installiert das Lied '69'." +LangString DESC_s2_sub2_Section2 ${LANG_GERMAN} "Installiert das Lied '69 (Karaoke)'." +LangString DESC_s2_sub2_Section3 ${LANG_GERMAN} "Installiert das Lied 'Can't stop it'." +LangString DESC_s2_sub2_Section4 ${LANG_GERMAN} "Installiert das Lied 'Can't stop it (Karaoke)'." +LangString DESC_s2_sub2_Section5 ${LANG_GERMAN} "Installiert das Lied 'In My Hand'." +LangString DESC_s2_sub2_Section6 ${LANG_GERMAN} "Installiert das Lied 'Man Song'." +LangString DESC_s2_sub2_Section7 ${LANG_GERMAN} "Installiert das Lied 'Man Song (Karaoke)'." +LangString DESC_s2_sub2_Section8 ${LANG_GERMAN} "Installiert das Lied 'Stay with me'." +LangString DESC_s2_sub2_Section9 ${LANG_GERMAN} "Installiert das Lied 'Stay with me (Karaoke)'." + +LangString DESC_s2_sub3_Section1 ${LANG_GERMAN} "Installiert das Lied 'Lebendig und kräftig und schärfer'." +LangString DESC_s2_sub3_Section2 ${LANG_GERMAN} "Installiert das Lied 'Mensch, wo bist du?'." LangString DESC_g3Section1 ${LANG_GERMAN} "Installiert das Motiv 'Orange' von Skar" LangString DESC_g3Section2 ${LANG_GERMAN} "Installiert das Motiv 'Streetlight' von Skar" LangString DESC_g3Section3 ${LANG_GERMAN} "Installiert das Motiv 'Vistar' von Skar" -LangString DESC_g3Section4 ${LANG_GERMAN} "Installiert das Motiv 'BlueSensation v5' von Charis" -LangString DESC_g3Section5 ${LANG_GERMAN} "Installiert das Motiv 'WiiStar' von MasterPhW" -LangString DESC_g3Section6 ${LANG_GERMAN} "Installiert das Motiv 'iStar' von MezzoX" - +LangString DESC_g3Section4 ${LANG_GERMAN} "Installiert das Motiv 'BlueSensation v5.1' von Charis" +LangString DESC_g3Section6 ${LANG_GERMAN} "Installiert das Motiv 'WiiStar' von MasterPhW" +LangString DESC_g3Section7 ${LANG_GERMAN} "Installiert das Motiv 'iStar' von MezzoX" +LangString DESC_g3Section5 ${LANG_GERMAN} "Installiert das Motiv 'WhiteSensation' von Charis" \ No newline at end of file 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 fb4faa444f4ebee1ebed08b3493fd0be667d2b51 Mon Sep 17 00:00:00 2001 From: canni0 Date: Fri, 10 Apr 2009 15:58:16 +0000 Subject: - corrected download links git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@1665 b956fd51-792f-4845-bead-9b4dfca2ff2c --- installer/UltraStar Deluxe.nsi | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'installer') diff --git a/installer/UltraStar Deluxe.nsi b/installer/UltraStar Deluxe.nsi index e512203c..2b2dcbdf 100644 --- a/installer/UltraStar Deluxe.nsi +++ b/installer/UltraStar Deluxe.nsi @@ -314,7 +314,7 @@ Section /o "Bodo Wartke - Liebeslied (Love Song)" g2Section1 SetOutPath "$INSTDIR\Songs\" ; Download song: - NSISdl::download /TIMEOUT=30000 ${download_song5} $TEMP\Song-BodoWartke-LoveSong.zip + NSISdl::download /TIMEOUT=30000 ${download_song1} $TEMP\Song-BodoWartke-LoveSong.zip Pop $R0 StrCmp $R0 "success" dlok @@ -341,7 +341,7 @@ Section /o "Dead Smiling Pirates - I 18" g2Section2 SetOutPath "$INSTDIR\Songs\Dead Smiling Pirates - I 18\" ; Download song: - NSISdl::download /TIMEOUT=30000 ${download_song1} $TEMP\Song-I-18.zip + NSISdl::download /TIMEOUT=30000 ${download_song2} $TEMP\Song-I-18.zip Pop $R0 StrCmp $R0 "success" dlok @@ -881,7 +881,7 @@ Section /o "Joshua Morin - On The Run" g2Section3 SetOutPath "$INSTDIR\Songs\Joshua Morin - On The Run\" ; Download song: - NSISdl::download /TIMEOUT=30000 ${download_song2} $TEMP\Song-On-the-run.zip + NSISdl::download /TIMEOUT=30000 ${download_song3} $TEMP\Song-On-the-run.zip Pop $R0 ;Get the return value StrCmp $R0 "success" dlok @@ -903,7 +903,7 @@ Section /o "Pornophonique - Space Invaders" g2Section4 SetOutPath "$INSTDIR\Songs\Pornophonique - Space Invaders\" ; Download song: - NSISdl::download /TIMEOUT=30000 ${download_song3} $TEMP\Song-Space-Invaders.zip + NSISdl::download /TIMEOUT=30000 ${download_song4} $TEMP\Song-Space-Invaders.zip Pop $R0 ;Get the return value StrCmp $R0 "success" dlok @@ -1118,7 +1118,7 @@ Section /o "Steven Dunston - Northern Star" g2Section5 SetOutPath "$INSTDIR\Songs\Steven Dunston - Northern Star\" ; Download song: - NSISdl::download /TIMEOUT=30000 ${download_song4} $TEMP\Song-Northern-Star.zip + NSISdl::download /TIMEOUT=30000 ${download_song5} $TEMP\Song-Northern-Star.zip Pop $R0 ;Get the return value StrCmp $R0 "success" dlok @@ -1134,7 +1134,7 @@ SectionEnd SectionGroup $(name_s2_sub3) s2_sub3 -Section /o "Wise Guys - Lebendig und kräftig und schärfer" s2_sub3_Section1 +Section /o "Wise Guys - Lebendig und kraeftig und schaerfer" s2_sub3_Section1 ; AddSize 1400 SetOverwrite try -- cgit v1.2.3 From 1d9233874262457db5b454e3db9401234bea3cfe Mon Sep 17 00:00:00 2001 From: canni0 Date: Fri, 10 Apr 2009 16:11:57 +0000 Subject: - replaced unzip method (fixes german umlaute problem) git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@1666 b956fd51-792f-4845-bead-9b4dfca2ff2c --- installer/UltraStar Deluxe.nsi | 100 +++++++++++++++++++++-------------------- 1 file changed, 52 insertions(+), 48 deletions(-) (limited to 'installer') diff --git a/installer/UltraStar Deluxe.nsi b/installer/UltraStar Deluxe.nsi index 2b2dcbdf..4ce8c88b 100644 --- a/installer/UltraStar Deluxe.nsi +++ b/installer/UltraStar Deluxe.nsi @@ -320,7 +320,7 @@ Section /o "Bodo Wartke - Liebeslied (Love Song)" g2Section1 StrCmp $R0 "success" dlok MessageBox MB_OK|MB_ICONEXCLAMATION "Download Error, click OK to Continue" /SD IDOK dlok: - nsisunz::Unzip "$TEMP\Song-BodoWartke-LoveSong.zip" "$INSTDIR\Songs\" + ZipDLL::extractall "$TEMP\Song-BodoWartke-LoveSong.zip" "$INSTDIR\Songs\" Delete "$TEMP\Song-BodoWartke-LoveSong.zip" @@ -347,7 +347,7 @@ Section /o "Dead Smiling Pirates - I 18" g2Section2 StrCmp $R0 "success" dlok MessageBox MB_OK|MB_ICONEXCLAMATION "Download Error, click OK to Continue" /SD IDOK dlok: - nsisunz::Unzip "$TEMP\Song-I-18.zip" "$INSTDIR\Songs\Dead Smiling Pirates - I 18\" + ZipDLL::extractall "$TEMP\Song-I-18.zip" "$INSTDIR\Songs\Dead Smiling Pirates - I 18\" Delete "$TEMP\Song-I-18.zip" @@ -374,7 +374,7 @@ Section /o "Monkey Shines" s2_sub1_Section1 StrCmp $R0 "success" dlok MessageBox MB_OK|MB_ICONEXCLAMATION "Download Error, click OK to Continue" /SD IDOK dlok: - nsisunz::Unzip "$TEMP\Song-JC-MS.zip" "$INSTDIR\Songs\" + ZipDLL::extractall "$TEMP\Song-JC-MS.zip" "$INSTDIR\Songs\" Delete "$TEMP\Song-JC-MS.zip" @@ -395,7 +395,7 @@ Section /o "I Crush Everything" s2_sub1_Section2 StrCmp $R0 "success" dlok MessageBox MB_OK|MB_ICONEXCLAMATION "Download Error, click OK to Continue" /SD IDOK dlok: - nsisunz::Unzip "$TEMP\Song-JC-ICE.zip" "$INSTDIR\Songs\" + ZipDLL::extractall "$TEMP\Song-JC-ICE.zip" "$INSTDIR\Songs\" Delete "$TEMP\Song-JC-ICE.zip" @@ -416,7 +416,7 @@ Section /o "Not About You" s2_sub1_Section3 StrCmp $R0 "success" dlok MessageBox MB_OK|MB_ICONEXCLAMATION "Download Error, click OK to Continue" /SD IDOK dlok: - nsisunz::Unzip "$TEMP\Song-JC-NAY.zip" "$INSTDIR\Songs\" + ZipDLL::extractall "$TEMP\Song-JC-NAY.zip" "$INSTDIR\Songs\" Delete "$TEMP\Song-JC-NAY.zip" @@ -438,7 +438,7 @@ Section /o "Mr. Fancy Pants" s2_sub1_Section4 StrCmp $R0 "success" dlok MessageBox MB_OK|MB_ICONEXCLAMATION "Download Error, click OK to Continue" /SD IDOK dlok: - nsisunz::Unzip "$TEMP\Song-JC-MFP.zip" "$INSTDIR\Songs\" + ZipDLL::extractall "$TEMP\Song-JC-MFP.zip" "$INSTDIR\Songs\" Delete "$TEMP\Song-JC-MFP.zip" @@ -459,7 +459,7 @@ Section /o "Big Bad World One" s2_sub1_Section5 StrCmp $R0 "success" dlok MessageBox MB_OK|MB_ICONEXCLAMATION "Download Error, click OK to Continue" /SD IDOK dlok: - nsisunz::Unzip "$TEMP\Song-JC-BBWO.zip" "$INSTDIR\Songs\" + ZipDLL::extractall "$TEMP\Song-JC-BBWO.zip" "$INSTDIR\Songs\" Delete "$TEMP\Song-JC-BBWO.zip" @@ -480,7 +480,7 @@ Section /o "Flickr" s2_sub1_Section6 StrCmp $R0 "success" dlok MessageBox MB_OK|MB_ICONEXCLAMATION "Download Error, click OK to Continue" /SD IDOK dlok: - nsisunz::Unzip "$TEMP\Song-JC-Flickr.zip" "$INSTDIR\Songs\" + ZipDLL::extractall "$TEMP\Song-JC-Flickr.zip" "$INSTDIR\Songs\" Delete "$TEMP\Song-JC-Flickr.zip" @@ -501,7 +501,7 @@ Section /o "My Beige Bear" s2_sub1_Section7 StrCmp $R0 "success" dlok MessageBox MB_OK|MB_ICONEXCLAMATION "Download Error, click OK to Continue" /SD IDOK dlok: - nsisunz::Unzip "$TEMP\Song-JC-MBB.zip" "$INSTDIR\Songs\" + ZipDLL::extractall "$TEMP\Song-JC-MBB.zip" "$INSTDIR\Songs\" Delete "$TEMP\Song-JC-MBB.zip" @@ -522,7 +522,7 @@ Section /o "The Future Soon" s2_sub1_Section8 StrCmp $R0 "success" dlok MessageBox MB_OK|MB_ICONEXCLAMATION "Download Error, click OK to Continue" /SD IDOK dlok: - nsisunz::Unzip "$TEMP\Song-JC-TFS.zip" "$INSTDIR\Songs\" + ZipDLL::extractall "$TEMP\Song-JC-TFS.zip" "$INSTDIR\Songs\" Delete "$TEMP\Song-JC-TFS.zip" @@ -543,7 +543,7 @@ Section /o "Ikea" s2_sub1_Section9 StrCmp $R0 "success" dlok MessageBox MB_OK|MB_ICONEXCLAMATION "Download Error, click OK to Continue" /SD IDOK dlok: - nsisunz::Unzip "$TEMP\Song-JC-Ikea.zip" "$INSTDIR\Songs\" + ZipDLL::extractall "$TEMP\Song-JC-Ikea.zip" "$INSTDIR\Songs\" Delete "$TEMP\Song-JC-Ikea.zip" @@ -564,7 +564,7 @@ Section /o "Furry Old Lobster" s2_sub1_Section10 StrCmp $R0 "success" dlok MessageBox MB_OK|MB_ICONEXCLAMATION "Download Error, click OK to Continue" /SD IDOK dlok: - nsisunz::Unzip "$TEMP\Song-JC-FOL.zip" "$INSTDIR\Songs\" + ZipDLL::extractall "$TEMP\Song-JC-FOL.zip" "$INSTDIR\Songs\" Delete "$TEMP\Song-JC-FOL.zip" @@ -585,7 +585,7 @@ Section /o "Code Monkey" s2_sub1_Section11 StrCmp $R0 "success" dlok MessageBox MB_OK|MB_ICONEXCLAMATION "Download Error, click OK to Continue" /SD IDOK dlok: - nsisunz::Unzip "$TEMP\Song-JC-CM.zip" "$INSTDIR\Songs\" + ZipDLL::extractall "$TEMP\Song-JC-CM.zip" "$INSTDIR\Songs\" Delete "$TEMP\Song-JC-CM.zip" @@ -606,7 +606,7 @@ Section /o "I StrCmp $R0 "success" dlok MessageBox MB_OK|MB_ICONEXCLAMATION "Download Error, click OK to Continue" /SD IDOK dlok: - nsisunz::Unzip "$TEMP\Song-JC-IYM.zip" "$INSTDIR\Songs\" + ZipDLL::extractall "$TEMP\Song-JC-IYM.zip" "$INSTDIR\Songs\" Delete "$TEMP\Song-JC-IYM.zip" @@ -627,7 +627,7 @@ Section /o "First Of May" s2_sub1_Section13 StrCmp $R0 "success" dlok MessageBox MB_OK|MB_ICONEXCLAMATION "Download Error, click OK to Continue" /SD IDOK dlok: - nsisunz::Unzip "$TEMP\Song-JC-FOM.zip" "$INSTDIR\Songs\" + ZipDLL::extractall "$TEMP\Song-JC-FOM.zip" "$INSTDIR\Songs\" Delete "$TEMP\Song-JC-FOM.zip" @@ -648,7 +648,7 @@ Section /o "Dance, Soterious Johnson, Dance" s2_sub1_Section14 StrCmp $R0 "success" dlok MessageBox MB_OK|MB_ICONEXCLAMATION "Download Error, click OK to Continue" /SD IDOK dlok: - nsisunz::Unzip "$TEMP\Song-JC-DSJD.zip" "$INSTDIR\Songs\" + ZipDLL::extractall "$TEMP\Song-JC-DSJD.zip" "$INSTDIR\Songs\" Delete "$TEMP\Song-JC-DSJD.zip" @@ -669,7 +669,7 @@ Section /o "A Walk With George" s2_sub1_Section15 StrCmp $R0 "success" dlok MessageBox MB_OK|MB_ICONEXCLAMATION "Download Error, click OK to Continue" /SD IDOK dlok: - nsisunz::Unzip "$TEMP\Song-JC-AWWG.zip" "$INSTDIR\Songs\" + ZipDLL::extractall "$TEMP\Song-JC-AWWG.zip" "$INSTDIR\Songs\" Delete "$TEMP\Song-JC-AWWG.zip" @@ -690,7 +690,7 @@ Section /o "Creepy Doll" s2_sub1_Section16 StrCmp $R0 "success" dlok MessageBox MB_OK|MB_ICONEXCLAMATION "Download Error, click OK to Continue" /SD IDOK dlok: - nsisunz::Unzip "$TEMP\Song-JC-CD.zip" "$INSTDIR\Songs\" + ZipDLL::extractall "$TEMP\Song-JC-CD.zip" "$INSTDIR\Songs\" Delete "$TEMP\Song-JC-CD.zip" @@ -711,7 +711,7 @@ Section /o "That Spells DNA" s2_sub1_Section17 StrCmp $R0 "success" dlok MessageBox MB_OK|MB_ICONEXCLAMATION "Download Error, click OK to Continue" /SD IDOK dlok: - nsisunz::Unzip "$TEMP\Song-JC-TSDNA.zip" "$INSTDIR\Songs\" + ZipDLL::extractall "$TEMP\Song-JC-TSDNA.zip" "$INSTDIR\Songs\" Delete "$TEMP\Song-JC-TSDNA.zip" @@ -732,7 +732,7 @@ Section /o "When You Go" s2_sub1_Section18 StrCmp $R0 "success" dlok MessageBox MB_OK|MB_ICONEXCLAMATION "Download Error, click OK to Continue" /SD IDOK dlok: - nsisunz::Unzip "$TEMP\Song-JC-WYG.zip" "$INSTDIR\Songs\" + ZipDLL::extractall "$TEMP\Song-JC-WYG.zip" "$INSTDIR\Songs\" Delete "$TEMP\Song-JC-WYG.zip" @@ -753,7 +753,7 @@ Section /o "Better" s2_sub1_Section19 StrCmp $R0 "success" dlok MessageBox MB_OK|MB_ICONEXCLAMATION "Download Error, click OK to Continue" /SD IDOK dlok: - nsisunz::Unzip "$TEMP\Song-JC-Better.zip" "$INSTDIR\Songs\" + ZipDLL::extractall "$TEMP\Song-JC-Better.zip" "$INSTDIR\Songs\" Delete "$TEMP\Song-JC-Better.zip" @@ -774,7 +774,7 @@ Section /o "Shop Vac" s2_sub1_Section20 StrCmp $R0 "success" dlok MessageBox MB_OK|MB_ICONEXCLAMATION "Download Error, click OK to Continue" /SD IDOK dlok: - nsisunz::Unzip "$TEMP\Song-JC-SV.zip" "$INSTDIR\Songs\" + ZipDLL::extractall "$TEMP\Song-JC-SV.zip" "$INSTDIR\Songs\" Delete "$TEMP\Song-JC-SV.zip" @@ -795,7 +795,7 @@ Section /o "I Feel Fantastic" s2_sub1_Section21 StrCmp $R0 "success" dlok MessageBox MB_OK|MB_ICONEXCLAMATION "Download Error, click OK to Continue" /SD IDOK dlok: - nsisunz::Unzip "$TEMP\Song-JC-IFF.zip" "$INSTDIR\Songs\" + ZipDLL::extractall "$TEMP\Song-JC-IFF.zip" "$INSTDIR\Songs\" Delete "$TEMP\Song-JC-IFF.zip" @@ -816,7 +816,7 @@ Section /o "Re: Your Brains" s2_sub1_Section22 StrCmp $R0 "success" dlok MessageBox MB_OK|MB_ICONEXCLAMATION "Download Error, click OK to Continue" /SD IDOK dlok: - nsisunz::Unzip "$TEMP\Song-JC-ReYB.zip" "$INSTDIR\Songs\" + ZipDLL::extractall "$TEMP\Song-JC-ReYB.zip" "$INSTDIR\Songs\" Delete "$TEMP\Song-JC-ReYB.zip" @@ -837,7 +837,7 @@ Section /o "Skullcrusher Mountain" s2_sub1_Section23 StrCmp $R0 "success" dlok MessageBox MB_OK|MB_ICONEXCLAMATION "Download Error, click OK to Continue" /SD IDOK dlok: - nsisunz::Unzip "$TEMP\Song-JC-SCM.zip" "$INSTDIR\Songs\" + ZipDLL::extractall "$TEMP\Song-JC-SCM.zip" "$INSTDIR\Songs\" Delete "$TEMP\Song-JC-SCM.zip" @@ -858,7 +858,7 @@ Section /o "Chiron Beta Prime" s2_sub1_Section24 StrCmp $R0 "success" dlok MessageBox MB_OK|MB_ICONEXCLAMATION "Download Error, click OK to Continue" /SD IDOK dlok: - nsisunz::Unzip "$TEMP\Song-JC-CBP.zip" "$INSTDIR\Songs\" + ZipDLL::extractall "$TEMP\Song-JC-CBP.zip" "$INSTDIR\Songs\" Delete "$TEMP\Song-JC-CBP.zip" @@ -887,7 +887,7 @@ Section /o "Joshua Morin - On The Run" g2Section3 StrCmp $R0 "success" dlok MessageBox MB_OK|MB_ICONEXCLAMATION "Download Error, click OK to Continue" /SD IDOK dlok: - nsisunz::Unzip "$TEMP\Song-On-the-run.zip" "$INSTDIR\Songs\Joshua Morin - On The Run\" + ZipDLL::extractall "$TEMP\Song-On-the-run.zip" "$INSTDIR\Songs\Joshua Morin - On The Run\" Delete "$TEMP\Song-On-the-run.zip" @@ -909,7 +909,7 @@ Section /o "Pornophonique - Space Invaders" g2Section4 StrCmp $R0 "success" dlok MessageBox MB_OK|MB_ICONEXCLAMATION "Download Error, click OK to Continue" /SD IDOK dlok: - nsisunz::Unzip "$TEMP\Song-Space-Invaders.zip" "$INSTDIR\Songs\Pornophonique - Space Invaders\" + ZipDLL::extractall "$TEMP\Song-Space-Invaders.zip" "$INSTDIR\Songs\Pornophonique - Space Invaders\" Delete "$TEMP\Song-Space-Invaders.zip" @@ -932,7 +932,7 @@ Section /o "Shearer - 69" s2_sub2_Section1 StrCmp $R0 "success" dlok MessageBox MB_OK|MB_ICONEXCLAMATION "Download Error, click OK to Continue" /SD IDOK dlok: - nsisunz::Unzip "$TEMP\Song-Shearer-69.zip" "$INSTDIR\Songs\" + ZipDLL::extractall "$TEMP\Song-Shearer-69.zip" "$INSTDIR\Songs\" Delete "$TEMP\Song-Shearer-69.zip" @@ -953,7 +953,7 @@ Section /o "Shearer - 69 (Karaoke)" s2_sub2_Section2 StrCmp $R0 "success" dlok MessageBox MB_OK|MB_ICONEXCLAMATION "Download Error, click OK to Continue" /SD IDOK dlok: - nsisunz::Unzip "$TEMP\Song-Shearer-69-Kar.zip" "$INSTDIR\Songs\" + ZipDLL::extractall "$TEMP\Song-Shearer-69-Kar.zip" "$INSTDIR\Songs\" Delete "$TEMP\Song-Shearer-69-Kar.zip" @@ -974,7 +974,7 @@ Section /o "Shearer - Can't stop it" s2_sub2_Section3 StrCmp $R0 "success" dlok MessageBox MB_OK|MB_ICONEXCLAMATION "Download Error, click OK to Continue" /SD IDOK dlok: - nsisunz::Unzip "$TEMP\Song-Shearer-CSI.zip" "$INSTDIR\Songs\" + ZipDLL::extractall "$TEMP\Song-Shearer-CSI.zip" "$INSTDIR\Songs\" Delete "$TEMP\Song-Shearer-CSI.zip" @@ -995,7 +995,7 @@ Section /o "Shearer - Can't stop it (Karaoke)" s2_sub2_Section4 StrCmp $R0 "success" dlok MessageBox MB_OK|MB_ICONEXCLAMATION "Download Error, click OK to Continue" /SD IDOK dlok: - nsisunz::Unzip "$TEMP\Song-Shearer-CSI-Kar.zip" "$INSTDIR\Songs\" + ZipDLL::extractall "$TEMP\Song-Shearer-CSI-Kar.zip" "$INSTDIR\Songs\" Delete "$TEMP\Song-Shearer-CSI-Kar.zip" @@ -1016,7 +1016,7 @@ Section /o "Shearer - In My Hand" s2_sub2_Section5 StrCmp $R0 "success" dlok MessageBox MB_OK|MB_ICONEXCLAMATION "Download Error, click OK to Continue" /SD IDOK dlok: - nsisunz::Unzip "$TEMP\Song-Shearer-IMH.zip" "$INSTDIR\Songs\" + ZipDLL::extractall "$TEMP\Song-Shearer-IMH.zip" "$INSTDIR\Songs\" Delete "$TEMP\Song-Shearer-IMH.zip" @@ -1037,7 +1037,7 @@ Section /o "Shearer - Man Song" s2_sub2_Section6 StrCmp $R0 "success" dlok MessageBox MB_OK|MB_ICONEXCLAMATION "Download Error, click OK to Continue" /SD IDOK dlok: - nsisunz::Unzip "$TEMP\Song-Shearer-MS.zip" "$INSTDIR\Songs\" + ZipDLL::extractall "$TEMP\Song-Shearer-MS.zip" "$INSTDIR\Songs\" Delete "$TEMP\Song-Shearer-MS.zip" @@ -1058,7 +1058,7 @@ Section /o "Shearer - Man Song (Karaoke)" s2_sub2_Section7 StrCmp $R0 "success" dlok MessageBox MB_OK|MB_ICONEXCLAMATION "Download Error, click OK to Continue" /SD IDOK dlok: - nsisunz::Unzip "$TEMP\Song-Shearer-MS-Kar.zip" "$INSTDIR\Songs\" + ZipDLL::extractall "$TEMP\Song-Shearer-MS-Kar.zip" "$INSTDIR\Songs\" Delete "$TEMP\Song-Shearer-MS-Kar.zip" @@ -1079,7 +1079,7 @@ Section /o "Shearer - Stay With Me" s2_sub2_Section8 StrCmp $R0 "success" dlok MessageBox MB_OK|MB_ICONEXCLAMATION "Download Error, click OK to Continue" /SD IDOK dlok: - nsisunz::Unzip "$TEMP\Song-Shearer-SWM.zip" "$INSTDIR\Songs\" + ZipDLL::extractall "$TEMP\Song-Shearer-SWM.zip" "$INSTDIR\Songs\" Delete "$TEMP\Song-Shearer-SWM.zip" @@ -1100,7 +1100,8 @@ Section /o "Shearer - Stay With Me (Karaoke)" s2_sub2_Section9 StrCmp $R0 "success" dlok MessageBox MB_OK|MB_ICONEXCLAMATION "Download Error, click OK to Continue" /SD IDOK dlok: - nsisunz::Unzip "$TEMP\Song-Shearer-SWM-Kar.zip" "$INSTDIR\Songs\" + + ZipDLL::extractall "$TEMP\Song-Shearer-SWM-Kar.zip" "$INSTDIR\Songs\" Delete "$TEMP\Song-Shearer-SWM-Kar.zip" @@ -1124,7 +1125,8 @@ Section /o "Steven Dunston - Northern Star" g2Section5 StrCmp $R0 "success" dlok MessageBox MB_OK|MB_ICONEXCLAMATION "Download Error, click OK to Continue" /SD IDOK dlok: - nsisunz::Unzip "$TEMP\Song-Northern-Star.zip" "$INSTDIR\Songs\Steven Dunston - Northern Star\" + + ZipDLL::extractall "$TEMP\Song-Northern-Star.zip" "$INSTDIR\Songs\Steven Dunston - Northern Star\" Delete "$TEMP\Song-Northern-Star.zip" @@ -1134,7 +1136,7 @@ SectionEnd SectionGroup $(name_s2_sub3) s2_sub3 -Section /o "Wise Guys - Lebendig und kraeftig und schaerfer" s2_sub3_Section1 +Section /o "Wise Guys - Lebendig und kräftig und schärfer" s2_sub3_Section1 ; AddSize 1400 SetOverwrite try @@ -1147,7 +1149,8 @@ Section /o "Wise Guys - Lebendig und kraeftig und schaerfer" s2_sub3_Section1 StrCmp $R0 "success" dlok MessageBox MB_OK|MB_ICONEXCLAMATION "Download Error, click OK to Continue" /SD IDOK dlok: - nsisunz::Unzip "$TEMP\Song-WiseGuys-LUKUS.zip" "$INSTDIR\Songs\" + + ZipDLL::extractall "$TEMP\Song-WiseGuys-LUKUS.zip" "$INSTDIR\Songs\" Delete "$TEMP\Song-WiseGuys-LUKUS.zip" @@ -1168,7 +1171,8 @@ Section /o "Wise Guys - Mensch, wo bist du?" s2_sub3_Section2 StrCmp $R0 "success" dlok MessageBox MB_OK|MB_ICONEXCLAMATION "Download Error, click OK to Continue" /SD IDOK dlok: - nsisunz::Unzip "$TEMP\Song-WiseGuys-MWBD.zip" "$INSTDIR\Songs\" + + ZipDLL::extractall "$TEMP\Song-WiseGuys-MWBD.zip" "$INSTDIR\Songs\" Delete "$TEMP\Song-WiseGuys-MWBD.zip" @@ -1196,7 +1200,7 @@ SectionGroup $(name_section3) Section3 StrCmp $R0 "success" dlok MessageBox MB_OK|MB_ICONEXCLAMATION "Download Error, click OK to Continue" /SD IDOK dlok: - nsisunz::Unzip "$TEMP\Theme-Orange.zip" "$INSTDIR\" + ZipDLL::extractall "$TEMP\Theme-Orange.zip" "$INSTDIR\" Delete "$TEMP\Theme-Orange.zip" @@ -1214,7 +1218,7 @@ SectionEnd StrCmp $R0 "success" dlok MessageBox MB_OK|MB_ICONEXCLAMATION "Download Error, click OK to Continue" /SD IDOK dlok: - nsisunz::Unzip "$TEMP\Theme-Streetlight.zip" "$INSTDIR\" + ZipDLL::extractall "$TEMP\Theme-Streetlight.zip" "$INSTDIR\" Delete "$TEMP\Theme-Streetlight.zip" @@ -1233,7 +1237,7 @@ SectionEnd StrCmp $R0 "success" dlok MessageBox MB_OK|MB_ICONEXCLAMATION "Download Error, click OK to Continue" /SD IDOK dlok: - nsisunz::Unzip "$TEMP\Theme-Vistar.zip" "$INSTDIR\" + ZipDLL::extractall "$TEMP\Theme-Vistar.zip" "$INSTDIR\" Delete "$TEMP\Theme-Vistar.zip" @@ -1252,7 +1256,7 @@ SectionEnd StrCmp $R0 "success" dlok MessageBox MB_OK|MB_ICONEXCLAMATION "Download Error, click OK to Continue" /SD IDOK dlok: - nsisunz::Unzip "$TEMP\Theme-BlueSensation.zip" "$INSTDIR\" + ZipDLL::extractall "$TEMP\Theme-BlueSensation.zip" "$INSTDIR\" Delete "$TEMP\Theme-BlueSensation.zip" @@ -1272,7 +1276,7 @@ SectionEnd StrCmp $R0 "success" dlok MessageBox MB_OK|MB_ICONEXCLAMATION "Download Error, click OK to Continue" /SD IDOK dlok: - nsisunz::Unzip "$TEMP\Theme-WhiteSensation.zip" "$INSTDIR\" + ZipDLL::extractall "$TEMP\Theme-WhiteSensation.zip" "$INSTDIR\" Delete "$TEMP\Theme-WhiteSensation.zip" @@ -1291,7 +1295,7 @@ SectionEnd StrCmp $R0 "success" dlok MessageBox MB_OK|MB_ICONEXCLAMATION "Download Error, click OK to Continue" /SD IDOK dlok: - nsisunz::Unzip "$TEMP\Theme-WiiStar.zip" "$INSTDIR\" + ZipDLL::extractall "$TEMP\Theme-WiiStar.zip" "$INSTDIR\" Delete "$TEMP\Theme-WiiStar.zip" @@ -1310,7 +1314,7 @@ SectionEnd StrCmp $R0 "success" dlok MessageBox MB_OK|MB_ICONEXCLAMATION "Download Error, click OK to Continue" /SD IDOK dlok: - nsisunz::Unzip "$TEMP\Theme-iStar.zip" "$INSTDIR\" + ZipDLL::extractall "$TEMP\Theme-iStar.zip" "$INSTDIR\" Delete "$TEMP\Theme-iStar.zip" -- 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/UltraStar Deluxe.nsi | 164 +++++++++++++++++++--------- installer/languages/English.nsh | 12 +- installer/languages/German.nsh | 12 +- installer/settings/files_main_uninstall.nsh | 1 + 4 files changed, 129 insertions(+), 60 deletions(-) (limited to 'installer') diff --git a/installer/UltraStar Deluxe.nsi b/installer/UltraStar Deluxe.nsi index 4ce8c88b..2b2991e3 100644 --- a/installer/UltraStar Deluxe.nsi +++ b/installer/UltraStar Deluxe.nsi @@ -6,6 +6,7 @@ !include WinVer.nsh !include LogicLib.nsh !include InstallOptions.nsh +!include nsDialogs.nsh ; ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ; Variables @@ -82,6 +83,7 @@ RequestExecutionLevel user !define MUI_WELCOMEPAGE_TITLE_3LINES !define MUI_WELCOMEPAGE_TITLE "$(page_welcome_title)" + !define MUI_WELCOMEPAGE_TEXT "$(page_welcome_txt)" ; License Page: @@ -148,6 +150,9 @@ Function Settings ; Get all the variables: +Var /GLOBAL CHECKBOX +Var /GLOBAL checkbox_state + var /GLOBAL fullscreen var /GLOBAL language2 var /GLOBAL resolution @@ -192,18 +197,35 @@ ${WriteToConfig} "Resolution=$resolution$\r$\n" "$INSTDIR\config.ini" ${EndIf} -${WriteToConfig} "[Advanced]$\r$\n" "$INSTDIR\config.ini" +${WriteToConfig} "[Sound]$\r$\n" "$INSTDIR\config.ini" +${WriteToConfig} "PreviewFading=3 Secs$\r$\n" "$INSTDIR\config.ini" ; Animations On / Off Tasks ${If} $animations == "Off" +${WriteToConfig} "[Advanced]$\r$\n" "$INSTDIR\config.ini" + ${WriteToConfig} "LoadAnimation=Off$\r$\n" "$INSTDIR\config.ini" ${WriteToConfig} "EffectSing=Off$\r$\n" "$INSTDIR\config.ini" ${WriteToConfig} "ScreenFade=Off$\r$\n" "$INSTDIR\config.ini" +${WriteToConfig} "LineBonus=At Notes$\r$\n" "$INSTDIR\config.ini" + +${EndIf} + +${WriteToConfig} "[Lyrics]$\r$\n" "$INSTDIR\config.ini" +${WriteToConfig} "LyricsFont=Plain$\r$\n" "$INSTDIR\config.ini" +${WriteToConfig} "LyricsEffect=Slide$\r$\n" "$INSTDIR\config.ini" + +${If} $animations != "Off" + +${WriteToConfig} "[Advanced]$\r$\n" "$INSTDIR\config.ini" + +${WriteToConfig} "LineBonus=At Notes$\r$\n" "$INSTDIR\config.ini" + ${EndIf} @@ -216,8 +238,46 @@ FunctionEnd ; Settings page End ; Pages UnInstallation Routine ; ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ +!define MUI_WELCOMEPAGE_TITLE "$(page_un_welcome_title)" !insertmacro MUI_UNPAGE_WELCOME !insertmacro MUI_UNPAGE_CONFIRM + +UninstPage custom un.AskDelete un.DeleteAll + +Function un.AskDelete + +nsDialogs::Create /NOUNLOAD 1018 + + ${NSD_CreateCheckbox} 0 -150 100% 8u "$(delete_all)" + Pop $CHECKBOX + + nsDialogs::OnClick /NOUNLOAD $CHECKBOX $0 + + +nsDialogs::Show + +FunctionEnd + +Function un.DeleteAll + +${NSD_GetState} $CHECKBOX $checkbox_state + +${If} $checkbox_state == "1" + + RMDir /r "$INSTDIR\Songs" + RMDir /r "$INSTDIR\Covers" + Delete "$INSTDIR\Ultrastar.db" + +${Else} + +; If checkbox_state = 0 + + +${EndIf} + + +FunctionEnd + !insertmacro MUI_UNPAGE_INSTFILES !insertmacro MUI_UNPAGE_FINISH @@ -309,7 +369,7 @@ SectionGroup $(name_section2) Section2 Section /o "Bodo Wartke - Liebeslied (Love Song)" g2Section1 -; AddSize 1400 + AddSize 10342 SetOverwrite try SetOutPath "$INSTDIR\Songs\" @@ -334,7 +394,7 @@ SectionEnd ; Section /o "Dead Smiling Pirates - I 18" g2Section2 -; AddSize 1400 + AddSize 2816 SetOverwrite try SetOutPath "$INSTDIR" CreateDirectory "$INSTDIR\Songs\Dead Smiling Pirates - I 18" @@ -363,7 +423,7 @@ SectionGroup $(name_s2_sub1) s2_sub1 Section /o "Monkey Shines" s2_sub1_Section1 -; AddSize 1400 + AddSize 1455 SetOverwrite try SetOutPath "$INSTDIR\Songs\" @@ -384,7 +444,7 @@ SectionEnd Section /o "I Crush Everything" s2_sub1_Section2 -; AddSize 1400 + AddSize 7127 SetOverwrite try SetOutPath "$INSTDIR\Songs\" @@ -405,7 +465,7 @@ SectionEnd Section /o "Not About You" s2_sub1_Section3 -; AddSize 1400 + AddSize 3492 SetOverwrite try SetOutPath "$INSTDIR\Songs\" @@ -427,7 +487,7 @@ SectionEnd Section /o "Mr. Fancy Pants" s2_sub1_Section4 -; AddSize 1400 + AddSize 2427 SetOverwrite try SetOutPath "$INSTDIR\Songs\" @@ -448,7 +508,7 @@ SectionEnd Section /o "Big Bad World One" s2_sub1_Section5 -; AddSize 1400 + AddSize 4424 SetOverwrite try SetOutPath "$INSTDIR\Songs\" @@ -469,7 +529,7 @@ SectionEnd Section /o "Flickr" s2_sub1_Section6 -; AddSize 1400 + AddSize 21607 SetOverwrite try SetOutPath "$INSTDIR\Songs\" @@ -490,7 +550,7 @@ SectionEnd Section /o "My Beige Bear" s2_sub1_Section7 -; AddSize 1400 + AddSize 4926 SetOverwrite try SetOutPath "$INSTDIR\Songs\" @@ -511,7 +571,7 @@ SectionEnd Section /o "The Future Soon" s2_sub1_Section8 -; AddSize 1400 + AddSize 5612 SetOverwrite try SetOutPath "$INSTDIR\Songs\" @@ -532,7 +592,7 @@ SectionEnd Section /o "Ikea" s2_sub1_Section9 -; AddSize 1400 + AddSize 4608 SetOverwrite try SetOutPath "$INSTDIR\Songs\" @@ -553,7 +613,7 @@ SectionEnd Section /o "Furry Old Lobster" s2_sub1_Section10 -; AddSize 1400 + AddSize 3288 SetOverwrite try SetOutPath "$INSTDIR\Songs\" @@ -574,7 +634,7 @@ SectionEnd Section /o "Code Monkey" s2_sub1_Section11 -; AddSize 1400 + AddSize 21402 SetOverwrite try SetOutPath "$INSTDIR\Songs\" @@ -595,7 +655,7 @@ SectionEnd Section /o "I´m Your Moon" s2_sub1_Section12 -; AddSize 1400 + AddSize 4916 SetOverwrite try SetOutPath "$INSTDIR\Songs\" @@ -616,7 +676,7 @@ SectionEnd Section /o "First Of May" s2_sub1_Section13 -; AddSize 1400 + AddSize 6257 SetOverwrite try SetOutPath "$INSTDIR\Songs\" @@ -637,7 +697,7 @@ SectionEnd Section /o "Dance, Soterious Johnson, Dance" s2_sub1_Section14 -; AddSize 1400 + AddSize 5929 SetOverwrite try SetOutPath "$INSTDIR\Songs\" @@ -656,22 +716,22 @@ Section /o "Dance, Soterious Johnson, Dance" s2_sub1_Section14 SectionEnd -Section /o "A Walk With George" s2_sub1_Section15 +Section /o "A Talk With George" s2_sub1_Section15 -; AddSize 1400 + AddSize 4076 SetOverwrite try SetOutPath "$INSTDIR\Songs\" ; Download song: - NSISdl::download /TIMEOUT=30000 ${download_sub1_song15} $TEMP\Song-JC-AWWG.zip + NSISdl::download /TIMEOUT=30000 ${download_sub1_song15} $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 "$TEMP\Song-JC-AWWG.zip" "$INSTDIR\Songs\" + ZipDLL::extractall "$TEMP\Song-JC-ATWG.zip" "$INSTDIR\Songs\" - Delete "$TEMP\Song-JC-AWWG.zip" + Delete "$TEMP\Song-JC-ATWG.zip" SetOutPath "$INSTDIR" @@ -679,7 +739,7 @@ SectionEnd Section /o "Creepy Doll" s2_sub1_Section16 -; AddSize 1400 + AddSize 66560 SetOverwrite try SetOutPath "$INSTDIR\Songs\" @@ -700,7 +760,7 @@ SectionEnd Section /o "That Spells DNA" s2_sub1_Section17 -; AddSize 1400 + AddSize 4158 SetOverwrite try SetOutPath "$INSTDIR\Songs\" @@ -721,7 +781,7 @@ SectionEnd Section /o "When You Go" s2_sub1_Section18 -; AddSize 1400 + AddSize 5755 SetOverwrite try SetOutPath "$INSTDIR\Songs\" @@ -742,7 +802,7 @@ SectionEnd Section /o "Better" s2_sub1_Section19 -; AddSize 1400 + AddSize 4199 SetOverwrite try SetOutPath "$INSTDIR\Songs\" @@ -763,7 +823,7 @@ SectionEnd Section /o "Shop Vac" s2_sub1_Section20 -; AddSize 1400 + AddSize 5448 SetOverwrite try SetOutPath "$INSTDIR\Songs\" @@ -784,7 +844,7 @@ SectionEnd Section /o "I Feel Fantastic" s2_sub1_Section21 -; AddSize 1400 + AddSize 3851 SetOverwrite try SetOutPath "$INSTDIR\Songs\" @@ -805,7 +865,7 @@ SectionEnd Section /o "Re: Your Brains" s2_sub1_Section22 -; AddSize 1400 + AddSize 7087 SetOverwrite try SetOutPath "$INSTDIR\Songs\" @@ -826,7 +886,7 @@ SectionEnd Section /o "Skullcrusher Mountain" s2_sub1_Section23 -; AddSize 1400 + AddSize 6298 SetOverwrite try SetOutPath "$INSTDIR\Songs\" @@ -847,7 +907,7 @@ SectionEnd Section /o "Chiron Beta Prime" s2_sub1_Section24 -; AddSize 1400 + AddSize 38298 SetOverwrite try SetOutPath "$INSTDIR\Songs\" @@ -874,7 +934,7 @@ SectionGroupEnd ; Section /o "Joshua Morin - On The Run" g2Section3 -; AddSize 2200 + AddSize 3881 SetOverwrite try SetOutPath "$INSTDIR" CreateDirectory "$INSTDIR\Songs\Joshua Morin - On The Run" @@ -896,7 +956,7 @@ Section /o "Joshua Morin - On The Run" g2Section3 SectionEnd Section /o "Pornophonique - Space Invaders" g2Section4 -; AddSize 2200 + AddSize 3646 SetOverwrite try SetOutPath "$INSTDIR" CreateDirectory "$INSTDIR\Songs\Pornophonique - Space Invaders" @@ -921,7 +981,7 @@ SectionGroup $(name_s2_sub2) s2_sub2 Section /o "Shearer - 69" s2_sub2_Section1 -; AddSize 1400 + AddSize 4557 SetOverwrite try SetOutPath "$INSTDIR\Songs\" @@ -942,7 +1002,7 @@ SectionEnd Section /o "Shearer - 69 (Karaoke)" s2_sub2_Section2 -; AddSize 1400 + AddSize 4772 SetOverwrite try SetOutPath "$INSTDIR\Songs\" @@ -963,7 +1023,7 @@ SectionEnd Section /o "Shearer - Can't stop it" s2_sub2_Section3 -; AddSize 1400 + AddSize 5510 SetOverwrite try SetOutPath "$INSTDIR\Songs\" @@ -984,7 +1044,7 @@ SectionEnd Section /o "Shearer - Can't stop it (Karaoke)" s2_sub2_Section4 -; AddSize 1400 + AddSize 4178 SetOverwrite try SetOutPath "$INSTDIR\Songs\" @@ -1005,7 +1065,7 @@ SectionEnd Section /o "Shearer - In My Hand" s2_sub2_Section5 -; AddSize 1400 + AddSize 5960 SetOverwrite try SetOutPath "$INSTDIR\Songs\" @@ -1026,7 +1086,7 @@ SectionEnd Section /o "Shearer - Man Song" s2_sub2_Section6 -; AddSize 1400 + AddSize 7270 SetOverwrite try SetOutPath "$INSTDIR\Songs\" @@ -1047,7 +1107,7 @@ SectionEnd Section /o "Shearer - Man Song (Karaoke)" s2_sub2_Section7 -; AddSize 1400 + AddSize 5807 SetOverwrite try SetOutPath "$INSTDIR\Songs\" @@ -1068,7 +1128,7 @@ SectionEnd Section /o "Shearer - Stay With Me" s2_sub2_Section8 -; AddSize 1400 + AddSize 6400 SetOverwrite try SetOutPath "$INSTDIR\Songs\" @@ -1089,7 +1149,7 @@ SectionEnd Section /o "Shearer - Stay With Me (Karaoke)" s2_sub2_Section9 -; AddSize 1400 + AddSize 5417 SetOverwrite try SetOutPath "$INSTDIR\Songs\" @@ -1112,7 +1172,7 @@ SectionEnd SectionGroupEnd Section /o "Steven Dunston - Northern Star" g2Section5 -; AddSize 1500 + AddSize 2427 SetOverwrite try SetOutPath "$INSTDIR" CreateDirectory "$INSTDIR\Songs\Steven Dunston - Northern Star" @@ -1138,7 +1198,7 @@ SectionGroup $(name_s2_sub3) s2_sub3 Section /o "Wise Guys - Lebendig und kräftig und schärfer" s2_sub3_Section1 -; AddSize 1400 + AddSize 4015 SetOverwrite try SetOutPath "$INSTDIR\Songs\" @@ -1160,7 +1220,7 @@ SectionEnd Section /o "Wise Guys - Mensch, wo bist du?" s2_sub3_Section2 -; AddSize 1400 + AddSize 5335 SetOverwrite try SetOutPath "$INSTDIR\Songs\" @@ -1191,7 +1251,7 @@ SectionGroupEnd SectionGroup $(name_section3) Section3 Section /o "Orange" g3Section1 -; AddSize 700 + AddSize 1291 ; Download theme orange: NSISdl::download /TIMEOUT=30000 ${download_theme1} $TEMP\Theme-Orange.zip @@ -1209,7 +1269,7 @@ SectionGroup $(name_section3) Section3 SectionEnd Section /o "Streetlight" g3Section2 -; AddSize 1000 + AddSize 1905 ; Download theme Streetlight: NSISdl::download /TIMEOUT=30000 ${download_theme2} $TEMP\Theme-Streetlight.zip @@ -1227,7 +1287,7 @@ SectionEnd SectionEnd Section /o "Vistar" g3Section3 -; AddSize 1000 + AddSize 1936 ; Download theme Vistar: @@ -1246,7 +1306,7 @@ SectionEnd SectionEnd Section /o "BlueSensation" g3Section4 -; AddSize 1000 + AddSize 2109 ; Download theme BlueSensation: @@ -1266,7 +1326,7 @@ SectionEnd Section /o "WhiteSensation" g3Section5 -; AddSize 1000 + AddSize 1168 ; Download theme WhiteSensation: @@ -1285,7 +1345,7 @@ SectionEnd SectionEnd Section /o "WiiStar" g3Section6 -; AddSize 1000 + AddSize 850 ; Download theme WiiStar: @@ -1304,7 +1364,7 @@ SectionEnd SectionEnd Section /o "iStar" g3Section7 -; AddSize 1000 + AddSize 1588 ; Download theme iStar: diff --git a/installer/languages/English.nsh b/installer/languages/English.nsh index 9620723e..5e1b6331 100644 --- a/installer/languages/English.nsh +++ b/installer/languages/English.nsh @@ -15,6 +15,8 @@ LangString button_next ${LANG_ENGLISH} "Next >" LangString button_close ${LANG_ENGLISH} "Close" LangString update_information ${LANG_ENGLISH} "You can check if a new version of 'UltraStar Deluxe' is available. Thereto an internet connection will be established. If a new version is found, it can be installed afterwards." +LangString delete_all ${LANG_ENGLISH} "Also delete Songs, Highscores and Covers ?" + LangString update_check_older ${LANG_ENGLISH} "Your version $R0 is outdated. The new version $1 of UltraStar Deluxe is available. Do you want to update?" LangString update_check_equal ${LANG_ENGLISH} "Your currently installed version $R0 is up-to-date. No update needed." LangString update_check_newer ${LANG_ENGLISH} "Your installed version $R0 is newer than the $\n$\rcurrent release version $1 of UltraStar Deluxe. No update needed." @@ -28,6 +30,8 @@ LangString page_welcome_txt_update ${LANG_ENGLISH} "This wizard will guide you t LangString page_welcome_title ${LANG_ENGLISH} "Welcome to the UltraStar Deluxe Setup Wizard" LangString page_welcome_txt ${LANG_ENGLISH} "This wizard will guide you through the Installation of UltraStar Deluxe. UltraStar Deluxe is a free open source Karaoke game, which can be compared with Singstar.$\n$\r$\n$\rThe UltraStar Deluxe Team wishes you fun.$\n$\rProject website: http://www.ultrastardeluxe.org$\n$\rSupport Forum: http://forum.ultrastardeluxe.org" +LangString page_un_welcome_title ${LANG_ENGLISH} "Welcome to the UltraStar Deluxe uninstall wizard" + ; Components Page: LangString page_components_info ${LANG_ENGLISH} "Hover the component to get details" @@ -82,17 +86,17 @@ LangString DESC_s2_sub1_Section2 ${LANG_ENGLISH} "This will install the song 'I LangString DESC_s2_sub1_Section3 ${LANG_ENGLISH} "This will install the song 'Not About You'." LangString DESC_s2_sub1_Section4 ${LANG_ENGLISH} "This will install the song 'Mr. Fancy Pants'." LangString DESC_s2_sub1_Section5 ${LANG_ENGLISH} "This will install the song 'Big Bad World One'." -LangString DESC_s2_sub1_Section6 ${LANG_ENGLISH} "This will install the song 'Flickr'." +LangString DESC_s2_sub1_Section6 ${LANG_ENGLISH} "This will install the song 'Flickr [incl. video]'." LangString DESC_s2_sub1_Section7 ${LANG_ENGLISH} "This will install the song 'My Beige Bear'." LangString DESC_s2_sub1_Section8 ${LANG_ENGLISH} "This will install the song 'The Future Soon'." LangString DESC_s2_sub1_Section9 ${LANG_ENGLISH} "This will install the song 'Ikea'." LangString DESC_s2_sub1_Section10 ${LANG_ENGLISH} "This will install the song 'Furry Old Lobster'." -LangString DESC_s2_sub1_Section11 ${LANG_ENGLISH} "This will install the song 'Code Monkey'." +LangString DESC_s2_sub1_Section11 ${LANG_ENGLISH} "This will install the song 'Code Monkey [incl. video]'." LangString DESC_s2_sub1_Section12 ${LANG_ENGLISH} "This will install the song 'I´m Your Moon'." LangString DESC_s2_sub1_Section13 ${LANG_ENGLISH} "This will install the song 'First Of May'." LangString DESC_s2_sub1_Section14 ${LANG_ENGLISH} "This will install the song 'Dance, Soterios Johnson, Dance'." LangString DESC_s2_sub1_Section15 ${LANG_ENGLISH} "This will install the song 'A Talk With George'." -LangString DESC_s2_sub1_Section16 ${LANG_ENGLISH} "This will install the song 'Creepy Doll'." +LangString DESC_s2_sub1_Section16 ${LANG_ENGLISH} "This will install the song 'Creepy Doll [incl. video]'." LangString DESC_s2_sub1_Section17 ${LANG_ENGLISH} "This will install the song 'That Spells DNA'." LangString DESC_s2_sub1_Section18 ${LANG_ENGLISH} "This will install the song 'When You Go'." LangString DESC_s2_sub1_Section19 ${LANG_ENGLISH} "This will install the song 'Better'." @@ -100,7 +104,7 @@ LangString DESC_s2_sub1_Section20 ${LANG_ENGLISH} "This will install the song 'S LangString DESC_s2_sub1_Section21 ${LANG_ENGLISH} "This will install the song 'I Feel Fantastic'." LangString DESC_s2_sub1_Section22 ${LANG_ENGLISH} "This will install the song 'Re: Your Brains'." LangString DESC_s2_sub1_Section23 ${LANG_ENGLISH} "This will install the song 'Skullcrusher Mountain'." -LangString DESC_s2_sub1_Section24 ${LANG_ENGLISH} "This will install the song 'Chiron Beta Prime'." +LangString DESC_s2_sub1_Section24 ${LANG_ENGLISH} "This will install the song 'Chiron Beta Prime [incl. video]'." LangString DESC_s2_sub2_Section1 ${LANG_ENGLISH} "This will install the song '69'." LangString DESC_s2_sub2_Section2 ${LANG_ENGLISH} "This will install the song '69 (Karaoke)'." diff --git a/installer/languages/German.nsh b/installer/languages/German.nsh index aeb222a7..b4f004b3 100644 --- a/installer/languages/German.nsh +++ b/installer/languages/German.nsh @@ -15,6 +15,8 @@ LangString button_next ${LANG_GERMAN} "Weiter >" LangString button_close ${LANG_GERMAN} "Beenden" LangString update_information ${LANG_GERMAN} "Du kannst nach einer aktuelleren Version von 'UltraStar Deluxe' suchen. Dazu wird eine Verbindung mit dem Internet hergestellt. Wurde eine aktuellere Version gefunden, kann diese anschließend installiert werden." +LangString delete_all ${LANG_GERMAN} "Lieder, Highscores und Cover auch löschen?" + LangString update_check_older ${LANG_GERMAN} "Deine aktuelle Version $R0 ist veraltet. Die neue Version $1 von UltraStar Deluxe ist verfügbar. Möchtest du sie runterladen?" LangString update_check_equal ${LANG_GERMAN} "Deine aktuelle Version $R0 ist auf dem neusten Stand.$\n$\rKein Update benötigt." LangString update_check_newer ${LANG_GERMAN} "Deine aktuelle Version $R0 ist neuer als die zurzeit veröffentlichte$\n$\rVersion $1 von UltraStar Deluxe. Kein Update benötigt." @@ -28,6 +30,8 @@ LangString page_welcome_txt_update ${LANG_GERMAN} "Dieser Assistent wird Sie dur LangString page_welcome_title ${LANG_GERMAN} "Willkommen zur Installationsroutine von UltraStar Deluxe" LangString page_welcome_txt ${LANG_GERMAN} "Dieser Assistent wird Sie durch die Installation von UltraStar Deluxe begleiten. UltraStar Deluxe ist ein kostenloses quelloffenes Karaokespiel, welches Singstar ähnelt. $\n$\r$\n$\rDas UltraStar Deluxe Team wünscht viel Spaß.$\n$\rProjekthomepage: http://www.ultrastardeluxe.org$\n$\rSupport Forum: http://forum.ultrastardeluxe.org" +LangString page_un_welcome_title ${LANG_GERMAN} "Willkommen zur Deinstallation von UltraStar Deluxe" + ; Components Page: LangString page_components_info ${LANG_GERMAN} "Schieben Sie den Mauszeiger über die Komponente um Details einzusehen" @@ -82,17 +86,17 @@ LangString DESC_s2_sub1_Section2 ${LANG_GERMAN} "Installiert das Lied 'I Crush E LangString DESC_s2_sub1_Section3 ${LANG_GERMAN} "Installiert das Lied 'Not About You'." LangString DESC_s2_sub1_Section4 ${LANG_GERMAN} "Installiert das Lied 'Mr. Fancy Pants'." LangString DESC_s2_sub1_Section5 ${LANG_GERMAN} "Installiert das Lied 'Big Bad World One'." -LangString DESC_s2_sub1_Section6 ${LANG_GERMAN} "Installiert das Lied 'Flickr'." +LangString DESC_s2_sub1_Section6 ${LANG_GERMAN} "Installiert das Lied 'Flickr [inkl. Video]'." LangString DESC_s2_sub1_Section7 ${LANG_GERMAN} "Installiert das Lied 'My Beige Bear'." LangString DESC_s2_sub1_Section8 ${LANG_GERMAN} "Installiert das Lied 'The Future Soon'." LangString DESC_s2_sub1_Section9 ${LANG_GERMAN} "Installiert das Lied 'Ikea'." LangString DESC_s2_sub1_Section10 ${LANG_GERMAN} "Installiert das Lied 'Furry Old Lobster'." -LangString DESC_s2_sub1_Section11 ${LANG_GERMAN} "Installiert das Lied 'Code Monkey'." +LangString DESC_s2_sub1_Section11 ${LANG_GERMAN} "Installiert das Lied 'Code Monkey [inkl. Video]'." LangString DESC_s2_sub1_Section12 ${LANG_GERMAN} "Installiert das Lied 'I´m Your Moon'." LangString DESC_s2_sub1_Section13 ${LANG_GERMAN} "Installiert das Lied 'First Of May'." LangString DESC_s2_sub1_Section14 ${LANG_GERMAN} "Installiert das Lied 'Dance, Soterios Johnson, Dance'." LangString DESC_s2_sub1_Section15 ${LANG_GERMAN} "Installiert das Lied 'A Talk With George'." -LangString DESC_s2_sub1_Section16 ${LANG_GERMAN} "Installiert das Lied 'Creepy Doll'." +LangString DESC_s2_sub1_Section16 ${LANG_GERMAN} "Installiert das Lied 'Creepy Doll [inkl. Video]'." LangString DESC_s2_sub1_Section17 ${LANG_GERMAN} "Installiert das Lied 'That Spells DNA'." LangString DESC_s2_sub1_Section18 ${LANG_GERMAN} "Installiert das Lied 'When You Go'." LangString DESC_s2_sub1_Section19 ${LANG_GERMAN} "Installiert das Lied 'Better'." @@ -100,7 +104,7 @@ LangString DESC_s2_sub1_Section20 ${LANG_GERMAN} "Installiert das Lied 'Shop Vac LangString DESC_s2_sub1_Section21 ${LANG_GERMAN} "Installiert das Lied 'I Feel Fantastic'." LangString DESC_s2_sub1_Section22 ${LANG_GERMAN} "Installiert das Lied 'Re: Your Brains'." LangString DESC_s2_sub1_Section23 ${LANG_GERMAN} "Installiert das Lied 'Skullcrusher Mountain'." -LangString DESC_s2_sub1_Section24 ${LANG_GERMAN} "Installiert das Lied 'Chiron Beta Prime'." +LangString DESC_s2_sub1_Section24 ${LANG_GERMAN} "Installiert das Lied 'Chiron Beta Prime [inkl. Video]'." LangString DESC_s2_sub2_Section1 ${LANG_GERMAN} "Installiert das Lied '69'." LangString DESC_s2_sub2_Section2 ${LANG_GERMAN} "Installiert das Lied '69 (Karaoke)'." 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/languages/English.nsh | 4 ++-- installer/languages/German.nsh | 4 ++-- installer/settings/settings-1031.ini | 5 +++++ installer/settings/settings-1033.ini | 5 +++++ 4 files changed, 14 insertions(+), 4 deletions(-) (limited to 'installer') diff --git a/installer/languages/English.nsh b/installer/languages/English.nsh index 5e1b6331..63901b87 100644 --- a/installer/languages/English.nsh +++ b/installer/languages/English.nsh @@ -62,11 +62,11 @@ LangString sc_desktop ${LANG_ENGLISH} "Create Desktop Shortcut?" ; Sections and SectionGroups LangString name_section1 ${LANG_ENGLISH} "Main components" -LangString name_section2 ${LANG_ENGLISH} "Optional songs" +LangString name_section2 ${LANG_ENGLISH} "Songs" LangString name_s2_sub1 ${LANG_ENGLISH} "Jonathan Coulton" LangString name_s2_sub2 ${LANG_ENGLISH} "Shearer" LangString name_s2_sub3 ${LANG_ENGLISH} "Wise Guys" -LangString name_section3 ${LANG_ENGLISH} "Optional themes" +LangString name_section3 ${LANG_ENGLISH} "Themes" LangString DESC_Section1 ${LANG_ENGLISH} "These are the basic files needed by UltraStar Deluxe" LangString DESC_Section2 ${LANG_ENGLISH} "You can choose which songs should be installed." diff --git a/installer/languages/German.nsh b/installer/languages/German.nsh index b4f004b3..7f438e9d 100644 --- a/installer/languages/German.nsh +++ b/installer/languages/German.nsh @@ -62,11 +62,11 @@ LangString sc_desktop ${LANG_GERMAN} "Verkn ; Sections and SectionGroups LangString name_section1 ${LANG_GERMAN} "Hauptkomponenten" -LangString name_section2 ${LANG_GERMAN} "Optionale Songs" +LangString name_section2 ${LANG_GERMAN} "Songs" LangString name_s2_sub1 ${LANG_GERMAN} "Jonathan Coulton" LangString name_s2_sub2 ${LANG_GERMAN} "Shearer" LangString name_s2_sub3 ${LANG_GERMAN} "Wise Guys" -LangString name_section3 ${LANG_GERMAN} "Optionale Themen" +LangString name_section3 ${LANG_GERMAN} "Designs" LangString DESC_Section1 ${LANG_GERMAN} "Dies sind die von UltraStar Deluxe benötigten Grunddateien" LangString DESC_Section2 ${LANG_GERMAN} "Hier können Songs zum Installieren gewählt werden." 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') 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 c52a15b5fbd7df575d20e1387a435be4873ec6e1 Mon Sep 17 00:00:00 2001 From: canni0 Date: Fri, 24 Apr 2009 18:47:21 +0000 Subject: - fixed problems with UAC on Windows Vista and upcoming Windows 7 git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@1693 b956fd51-792f-4845-bead-9b4dfca2ff2c --- installer/UltraStar Deluxe.nsi | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'installer') diff --git a/installer/UltraStar Deluxe.nsi b/installer/UltraStar Deluxe.nsi index 2b2991e3..07b064ba 100644 --- a/installer/UltraStar Deluxe.nsi +++ b/installer/UltraStar Deluxe.nsi @@ -43,9 +43,9 @@ OutFile "ultrastardx-${version}-installer-full.exe" InstallDir "$PROGRAMFILES\${name}" -; Windows Vista: +; Windows Vista / Windows 7: -RequestExecutionLevel user +RequestExecutionLevel admin ; ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ; Interface Settings -- cgit v1.2.3 From 81bd09278aeffe40bf73e3ee4c6613cbeada6859 Mon Sep 17 00:00:00 2001 From: canni0 Date: Sat, 25 Apr 2009 16:05:33 +0000 Subject: - updated portugese (thx to zup3r_vock) and croation language - changed installer timeouts git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@1696 b956fd51-792f-4845-bead-9b4dfca2ff2c --- installer/UltraStar Deluxe.nsi | 94 +++++++++++++++++++++--------------------- installer/Update.nsi | 4 +- 2 files changed, 49 insertions(+), 49 deletions(-) (limited to 'installer') diff --git a/installer/UltraStar Deluxe.nsi b/installer/UltraStar Deluxe.nsi index 07b064ba..a6f37e2a 100644 --- a/installer/UltraStar Deluxe.nsi +++ b/installer/UltraStar Deluxe.nsi @@ -374,7 +374,7 @@ Section /o "Bodo Wartke - Liebeslied (Love Song)" g2Section1 SetOutPath "$INSTDIR\Songs\" ; Download song: - NSISdl::download /TIMEOUT=30000 ${download_song1} $TEMP\Song-BodoWartke-LoveSong.zip + NSISdl::download /TIMEOUT=50000 ${download_song1} $TEMP\Song-BodoWartke-LoveSong.zip Pop $R0 StrCmp $R0 "success" dlok @@ -401,7 +401,7 @@ Section /o "Dead Smiling Pirates - I 18" g2Section2 SetOutPath "$INSTDIR\Songs\Dead Smiling Pirates - I 18\" ; Download song: - NSISdl::download /TIMEOUT=30000 ${download_song2} $TEMP\Song-I-18.zip + NSISdl::download /TIMEOUT=50000 ${download_song2} $TEMP\Song-I-18.zip Pop $R0 StrCmp $R0 "success" dlok @@ -428,7 +428,7 @@ Section /o "Monkey Shines" s2_sub1_Section1 SetOutPath "$INSTDIR\Songs\" ; Download song: - NSISdl::download /TIMEOUT=30000 ${download_sub1_song1} $TEMP\Song-JC-MS.zip + NSISdl::download /TIMEOUT=50000 ${download_sub1_song1} $TEMP\Song-JC-MS.zip Pop $R0 StrCmp $R0 "success" dlok @@ -449,7 +449,7 @@ Section /o "I Crush Everything" s2_sub1_Section2 SetOutPath "$INSTDIR\Songs\" ; Download song: - NSISdl::download /TIMEOUT=30000 ${download_sub1_song2} $TEMP\Song-JC-ICE.zip + NSISdl::download /TIMEOUT=50000 ${download_sub1_song2} $TEMP\Song-JC-ICE.zip Pop $R0 StrCmp $R0 "success" dlok @@ -470,7 +470,7 @@ Section /o "Not About You" s2_sub1_Section3 SetOutPath "$INSTDIR\Songs\" ; Download song: - NSISdl::download /TIMEOUT=30000 ${download_sub1_song3} $TEMP\Song-JC-NAY.zip + NSISdl::download /TIMEOUT=50000 ${download_sub1_song3} $TEMP\Song-JC-NAY.zip Pop $R0 StrCmp $R0 "success" dlok @@ -492,7 +492,7 @@ Section /o "Mr. Fancy Pants" s2_sub1_Section4 SetOutPath "$INSTDIR\Songs\" ; Download song: - NSISdl::download /TIMEOUT=30000 ${download_sub1_song4} $TEMP\Song-JC-MFP.zip + NSISdl::download /TIMEOUT=50000 ${download_sub1_song4} $TEMP\Song-JC-MFP.zip Pop $R0 StrCmp $R0 "success" dlok @@ -513,7 +513,7 @@ Section /o "Big Bad World One" s2_sub1_Section5 SetOutPath "$INSTDIR\Songs\" ; Download song: - NSISdl::download /TIMEOUT=30000 ${download_sub1_song5} $TEMP\Song-JC-BBWO.zip + NSISdl::download /TIMEOUT=50000 ${download_sub1_song5} $TEMP\Song-JC-BBWO.zip Pop $R0 StrCmp $R0 "success" dlok @@ -534,7 +534,7 @@ Section /o "Flickr" s2_sub1_Section6 SetOutPath "$INSTDIR\Songs\" ; Download song: - NSISdl::download /TIMEOUT=30000 ${download_sub1_song6} $TEMP\Song-JC-Flickr.zip + NSISdl::download /TIMEOUT=50000 ${download_sub1_song6} $TEMP\Song-JC-Flickr.zip Pop $R0 StrCmp $R0 "success" dlok @@ -555,7 +555,7 @@ Section /o "My Beige Bear" s2_sub1_Section7 SetOutPath "$INSTDIR\Songs\" ; Download song: - NSISdl::download /TIMEOUT=30000 ${download_sub1_song7} $TEMP\Song-JC-MBB.zip + NSISdl::download /TIMEOUT=50000 ${download_sub1_song7} $TEMP\Song-JC-MBB.zip Pop $R0 StrCmp $R0 "success" dlok @@ -576,7 +576,7 @@ Section /o "The Future Soon" s2_sub1_Section8 SetOutPath "$INSTDIR\Songs\" ; Download song: - NSISdl::download /TIMEOUT=30000 ${download_sub1_song8} $TEMP\Song-JC-TFS.zip + NSISdl::download /TIMEOUT=50000 ${download_sub1_song8} $TEMP\Song-JC-TFS.zip Pop $R0 StrCmp $R0 "success" dlok @@ -597,7 +597,7 @@ Section /o "Ikea" s2_sub1_Section9 SetOutPath "$INSTDIR\Songs\" ; Download song: - NSISdl::download /TIMEOUT=30000 ${download_sub1_song9} $TEMP\Song-JC-Ikea.zip + NSISdl::download /TIMEOUT=50000 ${download_sub1_song9} $TEMP\Song-JC-Ikea.zip Pop $R0 StrCmp $R0 "success" dlok @@ -618,7 +618,7 @@ Section /o "Furry Old Lobster" s2_sub1_Section10 SetOutPath "$INSTDIR\Songs\" ; Download song: - NSISdl::download /TIMEOUT=30000 ${download_sub1_song10} $TEMP\Song-JC-FOL.zip + NSISdl::download /TIMEOUT=50000 ${download_sub1_song10} $TEMP\Song-JC-FOL.zip Pop $R0 StrCmp $R0 "success" dlok @@ -639,7 +639,7 @@ Section /o "Code Monkey" s2_sub1_Section11 SetOutPath "$INSTDIR\Songs\" ; Download song: - NSISdl::download /TIMEOUT=30000 ${download_sub1_song11} $TEMP\Song-JC-CM.zip + NSISdl::download /TIMEOUT=50000 ${download_sub1_song11} $TEMP\Song-JC-CM.zip Pop $R0 StrCmp $R0 "success" dlok @@ -660,7 +660,7 @@ Section /o "I SetOutPath "$INSTDIR\Songs\" ; Download song: - NSISdl::download /TIMEOUT=30000 ${download_sub1_song12} $TEMP\Song-JC-IYM.zip + NSISdl::download /TIMEOUT=50000 ${download_sub1_song12} $TEMP\Song-JC-IYM.zip Pop $R0 StrCmp $R0 "success" dlok @@ -681,7 +681,7 @@ Section /o "First Of May" s2_sub1_Section13 SetOutPath "$INSTDIR\Songs\" ; Download song: - NSISdl::download /TIMEOUT=30000 ${download_sub1_song13} $TEMP\Song-JC-FOM.zip + NSISdl::download /TIMEOUT=50000 ${download_sub1_song13} $TEMP\Song-JC-FOM.zip Pop $R0 StrCmp $R0 "success" dlok @@ -702,7 +702,7 @@ Section /o "Dance, Soterious Johnson, Dance" s2_sub1_Section14 SetOutPath "$INSTDIR\Songs\" ; Download song: - NSISdl::download /TIMEOUT=30000 ${download_sub1_song14} $TEMP\Song-JC-DSJD.zip + NSISdl::download /TIMEOUT=50000 ${download_sub1_song14} $TEMP\Song-JC-DSJD.zip Pop $R0 StrCmp $R0 "success" dlok @@ -723,7 +723,7 @@ Section /o "A Talk With George" s2_sub1_Section15 SetOutPath "$INSTDIR\Songs\" ; Download song: - NSISdl::download /TIMEOUT=30000 ${download_sub1_song15} $TEMP\Song-JC-ATWG.zip + NSISdl::download /TIMEOUT=50000 ${download_sub1_song15} $TEMP\Song-JC-ATWG.zip Pop $R0 StrCmp $R0 "success" dlok @@ -744,7 +744,7 @@ Section /o "Creepy Doll" s2_sub1_Section16 SetOutPath "$INSTDIR\Songs\" ; Download song: - NSISdl::download /TIMEOUT=30000 ${download_sub1_song16} $TEMP\Song-JC-CD.zip + NSISdl::download /TIMEOUT=50000 ${download_sub1_song16} $TEMP\Song-JC-CD.zip Pop $R0 StrCmp $R0 "success" dlok @@ -765,7 +765,7 @@ Section /o "That Spells DNA" s2_sub1_Section17 SetOutPath "$INSTDIR\Songs\" ; Download song: - NSISdl::download /TIMEOUT=30000 ${download_sub1_song17} $TEMP\Song-JC-TSDNA.zip + NSISdl::download /TIMEOUT=50000 ${download_sub1_song17} $TEMP\Song-JC-TSDNA.zip Pop $R0 StrCmp $R0 "success" dlok @@ -786,7 +786,7 @@ Section /o "When You Go" s2_sub1_Section18 SetOutPath "$INSTDIR\Songs\" ; Download song: - NSISdl::download /TIMEOUT=30000 ${download_sub1_song18} $TEMP\Song-JC-WYG.zip + NSISdl::download /TIMEOUT=50000 ${download_sub1_song18} $TEMP\Song-JC-WYG.zip Pop $R0 StrCmp $R0 "success" dlok @@ -807,7 +807,7 @@ Section /o "Better" s2_sub1_Section19 SetOutPath "$INSTDIR\Songs\" ; Download song: - NSISdl::download /TIMEOUT=30000 ${download_sub1_song19} $TEMP\Song-JC-Better.zip + NSISdl::download /TIMEOUT=50000 ${download_sub1_song19} $TEMP\Song-JC-Better.zip Pop $R0 StrCmp $R0 "success" dlok @@ -828,7 +828,7 @@ Section /o "Shop Vac" s2_sub1_Section20 SetOutPath "$INSTDIR\Songs\" ; Download song: - NSISdl::download /TIMEOUT=30000 ${download_sub1_song20} $TEMP\Song-JC-SV.zip + NSISdl::download /TIMEOUT=50000 ${download_sub1_song20} $TEMP\Song-JC-SV.zip Pop $R0 StrCmp $R0 "success" dlok @@ -849,7 +849,7 @@ Section /o "I Feel Fantastic" s2_sub1_Section21 SetOutPath "$INSTDIR\Songs\" ; Download song: - NSISdl::download /TIMEOUT=30000 ${download_sub1_song21} $TEMP\Song-JC-IFF.zip + NSISdl::download /TIMEOUT=50000 ${download_sub1_song21} $TEMP\Song-JC-IFF.zip Pop $R0 StrCmp $R0 "success" dlok @@ -870,7 +870,7 @@ Section /o "Re: Your Brains" s2_sub1_Section22 SetOutPath "$INSTDIR\Songs\" ; Download song: - NSISdl::download /TIMEOUT=30000 ${download_sub1_song22} $TEMP\Song-JC-ReYB.zip + NSISdl::download /TIMEOUT=50000 ${download_sub1_song22} $TEMP\Song-JC-ReYB.zip Pop $R0 StrCmp $R0 "success" dlok @@ -891,7 +891,7 @@ Section /o "Skullcrusher Mountain" s2_sub1_Section23 SetOutPath "$INSTDIR\Songs\" ; Download song: - NSISdl::download /TIMEOUT=30000 ${download_sub1_song23} $TEMP\Song-JC-SCM.zip + NSISdl::download /TIMEOUT=50000 ${download_sub1_song23} $TEMP\Song-JC-SCM.zip Pop $R0 StrCmp $R0 "success" dlok @@ -912,7 +912,7 @@ Section /o "Chiron Beta Prime" s2_sub1_Section24 SetOutPath "$INSTDIR\Songs\" ; Download song: - NSISdl::download /TIMEOUT=30000 ${download_sub1_song24} $TEMP\Song-JC-CBP.zip + NSISdl::download /TIMEOUT=50000 ${download_sub1_song24} $TEMP\Song-JC-CBP.zip Pop $R0 StrCmp $R0 "success" dlok @@ -941,7 +941,7 @@ Section /o "Joshua Morin - On The Run" g2Section3 SetOutPath "$INSTDIR\Songs\Joshua Morin - On The Run\" ; Download song: - NSISdl::download /TIMEOUT=30000 ${download_song3} $TEMP\Song-On-the-run.zip + NSISdl::download /TIMEOUT=50000 ${download_song3} $TEMP\Song-On-the-run.zip Pop $R0 ;Get the return value StrCmp $R0 "success" dlok @@ -963,7 +963,7 @@ Section /o "Pornophonique - Space Invaders" g2Section4 SetOutPath "$INSTDIR\Songs\Pornophonique - Space Invaders\" ; Download song: - NSISdl::download /TIMEOUT=30000 ${download_song4} $TEMP\Song-Space-Invaders.zip + NSISdl::download /TIMEOUT=50000 ${download_song4} $TEMP\Song-Space-Invaders.zip Pop $R0 ;Get the return value StrCmp $R0 "success" dlok @@ -986,7 +986,7 @@ Section /o "Shearer - 69" s2_sub2_Section1 SetOutPath "$INSTDIR\Songs\" ; Download song: - NSISdl::download /TIMEOUT=30000 ${download_sub2_song1} $TEMP\Song-Shearer-69.zip + NSISdl::download /TIMEOUT=50000 ${download_sub2_song1} $TEMP\Song-Shearer-69.zip Pop $R0 StrCmp $R0 "success" dlok @@ -1007,7 +1007,7 @@ Section /o "Shearer - 69 (Karaoke)" s2_sub2_Section2 SetOutPath "$INSTDIR\Songs\" ; Download song: - NSISdl::download /TIMEOUT=30000 ${download_sub2_song2} $TEMP\Song-Shearer-69-Kar.zip + NSISdl::download /TIMEOUT=50000 ${download_sub2_song2} $TEMP\Song-Shearer-69-Kar.zip Pop $R0 StrCmp $R0 "success" dlok @@ -1028,7 +1028,7 @@ Section /o "Shearer - Can't stop it" s2_sub2_Section3 SetOutPath "$INSTDIR\Songs\" ; Download song: - NSISdl::download /TIMEOUT=30000 ${download_sub2_song3} $TEMP\Song-Shearer-CSI.zip + NSISdl::download /TIMEOUT=50000 ${download_sub2_song3} $TEMP\Song-Shearer-CSI.zip Pop $R0 StrCmp $R0 "success" dlok @@ -1049,7 +1049,7 @@ Section /o "Shearer - Can't stop it (Karaoke)" s2_sub2_Section4 SetOutPath "$INSTDIR\Songs\" ; Download song: - NSISdl::download /TIMEOUT=30000 ${download_sub2_song4} $TEMP\Song-Shearer-CSI-Kar.zip + NSISdl::download /TIMEOUT=50000 ${download_sub2_song4} $TEMP\Song-Shearer-CSI-Kar.zip Pop $R0 StrCmp $R0 "success" dlok @@ -1070,7 +1070,7 @@ Section /o "Shearer - In My Hand" s2_sub2_Section5 SetOutPath "$INSTDIR\Songs\" ; Download song: - NSISdl::download /TIMEOUT=30000 ${download_sub2_song5} $TEMP\Song-Shearer-IMH.zip + NSISdl::download /TIMEOUT=50000 ${download_sub2_song5} $TEMP\Song-Shearer-IMH.zip Pop $R0 StrCmp $R0 "success" dlok @@ -1091,7 +1091,7 @@ Section /o "Shearer - Man Song" s2_sub2_Section6 SetOutPath "$INSTDIR\Songs\" ; Download song: - NSISdl::download /TIMEOUT=30000 ${download_sub2_song6} $TEMP\Song-Shearer-MS.zip + NSISdl::download /TIMEOUT=50000 ${download_sub2_song6} $TEMP\Song-Shearer-MS.zip Pop $R0 StrCmp $R0 "success" dlok @@ -1112,7 +1112,7 @@ Section /o "Shearer - Man Song (Karaoke)" s2_sub2_Section7 SetOutPath "$INSTDIR\Songs\" ; Download song: - NSISdl::download /TIMEOUT=30000 ${download_sub2_song7} $TEMP\Song-Shearer-MS-Kar.zip + NSISdl::download /TIMEOUT=50000 ${download_sub2_song7} $TEMP\Song-Shearer-MS-Kar.zip Pop $R0 StrCmp $R0 "success" dlok @@ -1133,7 +1133,7 @@ Section /o "Shearer - Stay With Me" s2_sub2_Section8 SetOutPath "$INSTDIR\Songs\" ; Download song: - NSISdl::download /TIMEOUT=30000 ${download_sub2_song8} $TEMP\Song-Shearer-SWM.zip + NSISdl::download /TIMEOUT=50000 ${download_sub2_song8} $TEMP\Song-Shearer-SWM.zip Pop $R0 StrCmp $R0 "success" dlok @@ -1154,7 +1154,7 @@ Section /o "Shearer - Stay With Me (Karaoke)" s2_sub2_Section9 SetOutPath "$INSTDIR\Songs\" ; Download song: - NSISdl::download /TIMEOUT=30000 ${download_sub2_song9} $TEMP\Song-Shearer-SWM-Kar.zip + NSISdl::download /TIMEOUT=50000 ${download_sub2_song9} $TEMP\Song-Shearer-SWM-Kar.zip Pop $R0 StrCmp $R0 "success" dlok @@ -1179,7 +1179,7 @@ Section /o "Steven Dunston - Northern Star" g2Section5 SetOutPath "$INSTDIR\Songs\Steven Dunston - Northern Star\" ; Download song: - NSISdl::download /TIMEOUT=30000 ${download_song5} $TEMP\Song-Northern-Star.zip + NSISdl::download /TIMEOUT=50000 ${download_song5} $TEMP\Song-Northern-Star.zip Pop $R0 ;Get the return value StrCmp $R0 "success" dlok @@ -1203,7 +1203,7 @@ Section /o "Wise Guys - Lebendig und kr SetOutPath "$INSTDIR\Songs\" ; Download song: - NSISdl::download /TIMEOUT=30000 ${download_sub3_song1} $TEMP\Song-WiseGuys-LUKUS.zip + NSISdl::download /TIMEOUT=50000 ${download_sub3_song1} $TEMP\Song-WiseGuys-LUKUS.zip Pop $R0 StrCmp $R0 "success" dlok @@ -1225,7 +1225,7 @@ Section /o "Wise Guys - Mensch, wo bist du?" s2_sub3_Section2 SetOutPath "$INSTDIR\Songs\" ; Download song: - NSISdl::download /TIMEOUT=30000 ${download_sub3_song2} $TEMP\Song-WiseGuys-MWBD.zip + NSISdl::download /TIMEOUT=50000 ${download_sub3_song2} $TEMP\Song-WiseGuys-MWBD.zip Pop $R0 StrCmp $R0 "success" dlok @@ -1254,7 +1254,7 @@ SectionGroup $(name_section3) Section3 AddSize 1291 ; Download theme orange: - NSISdl::download /TIMEOUT=30000 ${download_theme1} $TEMP\Theme-Orange.zip + NSISdl::download /TIMEOUT=50000 ${download_theme1} $TEMP\Theme-Orange.zip Pop $R0 ;Get the return value StrCmp $R0 "success" dlok @@ -1272,7 +1272,7 @@ SectionEnd AddSize 1905 ; Download theme Streetlight: - NSISdl::download /TIMEOUT=30000 ${download_theme2} $TEMP\Theme-Streetlight.zip + NSISdl::download /TIMEOUT=50000 ${download_theme2} $TEMP\Theme-Streetlight.zip Pop $R0 ;Get the return value StrCmp $R0 "success" dlok @@ -1291,7 +1291,7 @@ SectionEnd ; Download theme Vistar: - NSISdl::download /TIMEOUT=30000 ${download_theme3} $TEMP\Theme-Vistar.zip + NSISdl::download /TIMEOUT=50000 ${download_theme3} $TEMP\Theme-Vistar.zip Pop $R0 ;Get the return value StrCmp $R0 "success" dlok @@ -1310,7 +1310,7 @@ SectionEnd ; Download theme BlueSensation: - NSISdl::download /TIMEOUT=30000 ${download_theme4} $TEMP\Theme-BlueSensation.zip + NSISdl::download /TIMEOUT=50000 ${download_theme4} $TEMP\Theme-BlueSensation.zip Pop $R0 ;Get the return value StrCmp $R0 "success" dlok @@ -1330,7 +1330,7 @@ SectionEnd ; Download theme WhiteSensation: - NSISdl::download /TIMEOUT=30000 ${download_theme7} $TEMP\Theme-WhiteSensation.zip + NSISdl::download /TIMEOUT=50000 ${download_theme7} $TEMP\Theme-WhiteSensation.zip Pop $R0 ;Get the return value StrCmp $R0 "success" dlok @@ -1349,7 +1349,7 @@ SectionEnd ; Download theme WiiStar: - NSISdl::download /TIMEOUT=30000 ${download_theme5} $TEMP\Theme-WiiStar.zip + NSISdl::download /TIMEOUT=50000 ${download_theme5} $TEMP\Theme-WiiStar.zip Pop $R0 ;Get the return value StrCmp $R0 "success" dlok @@ -1368,7 +1368,7 @@ SectionEnd ; Download theme iStar: - NSISdl::download /TIMEOUT=30000 ${download_theme6} $TEMP\Theme-iStar.zip + NSISdl::download /TIMEOUT=50000 ${download_theme6} $TEMP\Theme-iStar.zip Pop $R0 ;Get the return value StrCmp $R0 "success" dlok diff --git a/installer/Update.nsi b/installer/Update.nsi index b8e5a458..e916d3e9 100644 --- a/installer/Update.nsi +++ b/installer/Update.nsi @@ -46,9 +46,9 @@ OutFile "ultrastardx-update.exe" InstallDir "$PROGRAMFILES\${name}" -; Windows Vista: +; Windows Vista / Windows 7: -RequestExecutionLevel user +RequestExecutionLevel admin ; ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ; Interface Settings -- 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/UltraStar Deluxe.nsi | 663 ++++++++------------- installer/dependencies/dll/put game dlls here | 0 installer/dependencies/documents/documentation.pdf | Bin 0 -> 575306 bytes installer/dependencies/documents/license.txt | 125 ++++ installer/dependencies/images/header.bmp | Bin 0 -> 25820 bytes installer/dependencies/images/side.bmp | Bin 0 -> 618008 bytes installer/dependencies/loop.wav | Bin 0 -> 1228860 bytes installer/dependencies/plugins/NSISdl.dll | Bin 0 -> 14848 bytes installer/dependencies/plugins/ZipDLL.dll | Bin 0 -> 167424 bytes installer/dependencies/plugins/nsProcess.dll | Bin 0 -> 4096 bytes installer/install.ico | Bin 0 -> 17542 bytes installer/languages/English.nsh | 15 +- installer/languages/German.nsh | 16 +- 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 +- installer/uninstall.ico | Bin 0 -> 22486 bytes 21 files changed, 489 insertions(+), 685 deletions(-) create mode 100644 installer/dependencies/dll/put game dlls here create mode 100644 installer/dependencies/documents/documentation.pdf create mode 100644 installer/dependencies/documents/license.txt create mode 100644 installer/dependencies/images/header.bmp create mode 100644 installer/dependencies/images/side.bmp create mode 100644 installer/dependencies/loop.wav create mode 100644 installer/dependencies/plugins/NSISdl.dll create mode 100644 installer/dependencies/plugins/ZipDLL.dll create mode 100644 installer/dependencies/plugins/nsProcess.dll create mode 100644 installer/install.ico delete mode 100644 installer/settings/GameExplorer.nsh create mode 100644 installer/uninstall.ico (limited to 'installer') diff --git a/installer/UltraStar Deluxe.nsi b/installer/UltraStar Deluxe.nsi index a6f37e2a..28d1400e 100644 --- a/installer/UltraStar Deluxe.nsi +++ b/installer/UltraStar Deluxe.nsi @@ -16,14 +16,13 @@ !define path_settings ".\settings" !define path_languages ".\languages" -!define path_images "..\installerdependencies\images" -!define path_plugins "..\installerdependencies\plugins" -!define path_gdf "$WINDIR\gdf.dll" +!define path_dependencies ".\dependencies" +!define path_images ".\dependencies\images" +!define path_plugins ".\dependencies\plugins" !addPluginDir "${path_plugins}\" !include "${path_settings}\variables.nsh" -!include "${path_settings}\GameExplorer.nsh" !include "${path_settings}\functions.nsh" ; ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ @@ -31,10 +30,12 @@ ; ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ SetCompress Auto -SetCompressor /SOLID lzma +SetCompressor lzma SetCompressorDictSize 32 SetDatablockOptimize On +CRCCheck on + XPStyle on Name "${name} v.${version}" @@ -42,6 +43,7 @@ Brandingtext "${name} v.${version} Installation" OutFile "ultrastardx-${version}-installer-full.exe" InstallDir "$PROGRAMFILES\${name}" +InstallDirRegKey HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\UltraStar Deluxe" "InstallDir" ; Windows Vista / Windows 7: @@ -53,8 +55,8 @@ RequestExecutionLevel admin ; Icons: -!define MUI_ICON "${path_images}\${img_install}" -!define MUI_UNICON "${path_images}\${img_uninstall}" +!define MUI_ICON "${img_install}" +!define MUI_UNICON "${img_uninstall}" ; Header and Side Images: @@ -79,6 +81,8 @@ RequestExecutionLevel admin ; Pages Installation Routine Settings ; ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ +!define MUI_CUSTOMFUNCTION_GUIINIT bgmusic + ; Welcome Page: !define MUI_WELCOMEPAGE_TITLE_3LINES @@ -133,7 +137,7 @@ var ICONS_GROUP !define MUI_STARTMENUPAGE_DEFAULTFOLDER "${name}" !define MUI_STARTMENUPAGE_REGISTRY_ROOT "${PRODUCT_UNINST_ROOT_KEY}" !define MUI_STARTMENUPAGE_REGISTRY_KEY "${PRODUCT_UNINST_KEY}" -!define MUI_STARTMENUPAGE_REGISTRY_VALUENAME "${PRODUCT_STARTMENU_REGVAL}" +!define MUI_STARTMENUPAGE_REGISTRY_VALUENAME "${name}" !insertmacro MUI_PAGE_STARTMENU Application $ICONS_GROUP !insertmacro MUI_PAGE_INSTFILES @@ -167,71 +171,45 @@ var /GLOBAL animations ; Write all variables to config.ini -FileOpen $0 '$INSTDIR\config.ini' w -FileWrite $0 '[Game]$\r$\n' -FileClose $0 - -${If} $language2 != "" - -${WriteToConfig} "Language=$language2$\r$\n" "$INSTDIR\config.ini" - -${EndIf} - -${If} $tabs != "" - -${WriteToConfig} "Tabs=$tabs$\r$\n" "$INSTDIR\config.ini" - -${EndIf} - -${WriteToConfig} "[Graphics]$\r$\n" "$INSTDIR\config.ini" - -${If} $fullscreen != "" - -${WriteToConfig} "FullScreen=$fullscreen$\r$\n" "$INSTDIR\config.ini" +var /GLOBAL path_config +var /GLOBAL path_configini +${If} ${AtLeastWinVista} + SetShellVarContext current + StrCpy $path_config "$APPDATA\ultrastardx" + SetShellVarContext all +${Else} + StrCpy $path_config "$INSTDIR" ${EndIf} -${If} $resolution != "" +StrCpy $path_configini "$path_config\config.ini" -${WriteToConfig} "Resolution=$resolution$\r$\n" "$INSTDIR\config.ini" +${WriteToConfig} "[Game]$\r$\n" "$path_configini" +${WriteToConfig} "Language=$language2$\r$\n" "$path_configini" +${WriteToConfig} "Tabs=$tabs$\r$\n" "$path_configini" -${EndIf} +${WriteToConfig} "[Graphics]$\r$\n" "$path_configini" +${WriteToConfig} "FullScreen=$fullscreen$\r$\n" "$path_configini" +${WriteToConfig} "Resolution=$resolution$\r$\n" "$path_configini" -${WriteToConfig} "[Sound]$\r$\n" "$INSTDIR\config.ini" -${WriteToConfig} "PreviewFading=3 Secs$\r$\n" "$INSTDIR\config.ini" +${WriteToConfig} "[Sound]$\r$\n" "$path_configini" +${WriteToConfig} "PreviewFading=3 Secs$\r$\n" "$path_configini" ; Animations On / Off Tasks ${If} $animations == "Off" - -${WriteToConfig} "[Advanced]$\r$\n" "$INSTDIR\config.ini" - -${WriteToConfig} "LoadAnimation=Off$\r$\n" "$INSTDIR\config.ini" - -${WriteToConfig} "EffectSing=Off$\r$\n" "$INSTDIR\config.ini" - -${WriteToConfig} "ScreenFade=Off$\r$\n" "$INSTDIR\config.ini" - -${WriteToConfig} "LineBonus=At Notes$\r$\n" "$INSTDIR\config.ini" - -${EndIf} - -${WriteToConfig} "[Lyrics]$\r$\n" "$INSTDIR\config.ini" -${WriteToConfig} "LyricsFont=Plain$\r$\n" "$INSTDIR\config.ini" -${WriteToConfig} "LyricsEffect=Slide$\r$\n" "$INSTDIR\config.ini" - -${If} $animations != "Off" - -${WriteToConfig} "[Advanced]$\r$\n" "$INSTDIR\config.ini" - -${WriteToConfig} "LineBonus=At Notes$\r$\n" "$INSTDIR\config.ini" - +${WriteToConfig} "[Advanced]$\r$\n" "$path_configini" +${WriteToConfig} "LoadAnimation=Off$\r$\n" "$path_configini" +${WriteToConfig} "EffectSing=Off$\r$\n" "$path_configini" +${WriteToConfig} "ScreenFade=Off$\r$\n" "$path_configini" ${EndIf} +${WriteToConfig} "[Lyrics]$\r$\n" "$path_configini" +${WriteToConfig} "LyricsFont=Plain$\r$\n" "$path_configini" +${WriteToConfig} "LyricsEffect=Slide$\r$\n" "$path_configini" FunctionEnd ; Settings page End - !insertmacro MUI_PAGE_FINISH ; ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ @@ -264,10 +242,20 @@ ${NSD_GetState} $CHECKBOX $checkbox_state ${If} $checkbox_state == "1" - RMDir /r "$INSTDIR\Songs" - RMDir /r "$INSTDIR\Covers" +; Remove settings, songs, highscores, covers + + RMDir /r "$INSTDIR\songs" + RMDir /r "$INSTDIR\covers" + Delete "$INSTDIR\config.ini" Delete "$INSTDIR\Ultrastar.db" + SetShellVarContext current + RMDir /r "$APPDATA\ultrastardx\songs" + RMDir /r "$APPDATA\ultrastardx\covers" + Delete "$APPDATA\ultrastardx\config.ini" + Delete "$APPDATA\ultrastardx\Ultrastar.db" + SetShellVarContext all + ${Else} ; If checkbox_state = 0 @@ -302,56 +290,27 @@ Section $(name_section1) Section1 SetOutPath "$INSTDIR" !insertmacro MUI_STARTMENU_WRITE_BEGIN Application - SetShellVarContext all SetOutPath "$INSTDIR" CreateDirectory "${name}" CreateDirectory "$SMPROGRAMS\$ICONS_GROUP" CreateShortCut "$SMPROGRAMS\$ICONS_GROUP\$(sm_shortcut).lnk" "$INSTDIR\${exe}.exe" -; CreateShortCut "$SMPROGRAMS\$ICONS_GROUP\$(sm_documentation).lnk" "$INSTDIR\documentation.pdf" CreateShortCut "$SMPROGRAMS\$ICONS_GROUP\$(sm_website).lnk" "http://www.ultrastardeluxe.org/" - CreateShortCut "$SMPROGRAMS\$ICONS_GROUP\$(sm_readme).lnk" "$INSTDIR\ReadMe.txt" - CreateShortCut "$SMPROGRAMS\$ICONS_GROUP\$(sm_license).lnk" "$INSTDIR\License.txt" + CreateShortCut "$SMPROGRAMS\$ICONS_GROUP\$(sm_songs).lnk" "$INSTDIR\songs" CreateShortCut "$SMPROGRAMS\$ICONS_GROUP\$(sm_uninstall).lnk" "$INSTDIR\Uninstall.exe" - !insertmacro MUI_STARTMENU_WRITE_END +!insertmacro MUI_STARTMENU_WRITE_END ; Vista Game Explorer: - -${If} ${AtLeastWinVista} - -${GameExplorer_GenerateGUID} -Pop $0 - -${GameExplorer_AddGame} all "${path_gdf}" $WINDIR $INSTDIR\${exe}.exe $0 - -CreateDirectory $APPDATA\Microsoft\Windows\GameExplorer\$0\PlayTasks\1 -CreateShortcut "$APPDATA\Microsoft\Windows\GameExplorer\$0\PlayTasks\1\Benchmark.lnk" \ - "$INSTDIR\${exe}.exe" "-Benchmark" - -CreateDirectory $APPDATA\Microsoft\Windows\GameExplorer\$0\PlayTasks\2 -CreateShortcut "$APPDATA\Microsoft\Windows\GameExplorer\$0\PlayTasks\2\Joypad.lnk" \ - "$INSTDIR\${exe}.exe" "-Joypad" - -CreateDirectory $APPDATA\Microsoft\Windows\GameExplorer\$0\PlayTasks\3 -CreateShortcut "$APPDATA\Microsoft\Windows\GameExplorer\$0\PlayTasks\3\Fullscreen.lnk" \ - "$INSTDIR\${exe}.exe" "-FullScreen" - -CreateDirectory $APPDATA\Microsoft\Windows\GameExplorer\$0\PlayTasks\3 -CreateShortcut "$APPDATA\Microsoft\Windows\GameExplorer\$0\PlayTasks\3\Dual Screen.lnk" \ - "$INSTDIR\${exe}.exe" "-Screens 2" - -CreateDirectory $APPDATA\Microsoft\Windows\GameExplorer\$0\SupportTasks\0 -CreateShortcut "$APPDATA\Microsoft\Windows\GameExplorer\$0\SupportTasks\0\Support Forum.lnk" \ - "http://forum.ultrastardeluxe.org" - -${EndIf} +; (removed due to incompatibility with Windows 7, needs rewrite) ; Create Uninstaller: WriteUninstaller "$INSTDIR\Uninstall.exe" WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "DisplayName" "${name}" + WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "DisplayIcon" "$INSTDIR\ultrastardx.exe" + WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "InstallDir" "$INSTDIR" WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "UninstallString" "$INSTDIR\Uninstall.exe" WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "DisplayVersion" "${PRODUCT_VERSION}" WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "URLInfoAbout" "${PRODUCT_WEB_SITE}" @@ -371,18 +330,18 @@ Section /o "Bodo Wartke - Liebeslied (Love Song)" g2Section1 AddSize 10342 SetOverwrite try - SetOutPath "$INSTDIR\Songs\" + SetOutPath "$INSTDIR\songs\" ; Download song: - NSISdl::download /TIMEOUT=50000 ${download_song1} $TEMP\Song-BodoWartke-LoveSong.zip + 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 "$TEMP\Song-BodoWartke-LoveSong.zip" "$INSTDIR\Songs\" + ZipDLL::extractall "$LOCALAPPDATA\Temp\Song-BodoWartke-LoveSong.zip" "$INSTDIR\songs\" - Delete "$TEMP\Song-BodoWartke-LoveSong.zip" + Delete "$LOCALAPPDATA\Temp\Song-BodoWartke-LoveSong.zip" SetOutPath "$INSTDIR" @@ -397,19 +356,19 @@ 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\" + CreateDirectory "$INSTDIR\songs\Dead Smiling Pirates - I 18" + SetOutPath "$INSTDIR\songs\Dead Smiling Pirates - I 18\" ; Download song: - NSISdl::download /TIMEOUT=50000 ${download_song2} $TEMP\Song-I-18.zip + 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 "$TEMP\Song-I-18.zip" "$INSTDIR\Songs\Dead Smiling Pirates - I 18\" + ZipDLL::extractall "$LOCALAPPDATA\Temp\Song-I-18.zip" "$INSTDIR\songs\Dead Smiling Pirates - I 18\" - Delete "$TEMP\Song-I-18.zip" + Delete "$LOCALAPPDATA\Temp\Song-I-18.zip" SetOutPath "$INSTDIR" @@ -425,18 +384,18 @@ Section /o "Monkey Shines" s2_sub1_Section1 AddSize 1455 SetOverwrite try - SetOutPath "$INSTDIR\Songs\" + SetOutPath "$INSTDIR\songs\" ; Download song: - NSISdl::download /TIMEOUT=50000 ${download_sub1_song1} $TEMP\Song-JC-MS.zip + 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 "$TEMP\Song-JC-MS.zip" "$INSTDIR\Songs\" + ZipDLL::extractall "$LOCALAPPDATA\Temp\Song-JC-MS.zip" "$INSTDIR\songs\" - Delete "$TEMP\Song-JC-MS.zip" + Delete "$LOCALAPPDATA\Temp\Song-JC-MS.zip" SetOutPath "$INSTDIR" @@ -446,18 +405,18 @@ Section /o "I Crush Everything" s2_sub1_Section2 AddSize 7127 SetOverwrite try - SetOutPath "$INSTDIR\Songs\" + SetOutPath "$INSTDIR\songs\" ; Download song: - NSISdl::download /TIMEOUT=50000 ${download_sub1_song2} $TEMP\Song-JC-ICE.zip + 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 "$TEMP\Song-JC-ICE.zip" "$INSTDIR\Songs\" + ZipDLL::extractall "$LOCALAPPDATA\Temp\Song-JC-ICE.zip" "$INSTDIR\songs\" - Delete "$TEMP\Song-JC-ICE.zip" + Delete "$LOCALAPPDATA\Temp\Song-JC-ICE.zip" SetOutPath "$INSTDIR" @@ -467,18 +426,18 @@ Section /o "Not About You" s2_sub1_Section3 AddSize 3492 SetOverwrite try - SetOutPath "$INSTDIR\Songs\" + SetOutPath "$INSTDIR\songs\" ; Download song: - NSISdl::download /TIMEOUT=50000 ${download_sub1_song3} $TEMP\Song-JC-NAY.zip + 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 "$TEMP\Song-JC-NAY.zip" "$INSTDIR\Songs\" + ZipDLL::extractall "$LOCALAPPDATA\Temp\Song-JC-NAY.zip" "$INSTDIR\songs\" - Delete "$TEMP\Song-JC-NAY.zip" + Delete "$LOCALAPPDATA\Temp\Song-JC-NAY.zip" SetOutPath "$INSTDIR" @@ -489,18 +448,18 @@ Section /o "Mr. Fancy Pants" s2_sub1_Section4 AddSize 2427 SetOverwrite try - SetOutPath "$INSTDIR\Songs\" + SetOutPath "$INSTDIR\songs\" ; Download song: - NSISdl::download /TIMEOUT=50000 ${download_sub1_song4} $TEMP\Song-JC-MFP.zip + 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 "$TEMP\Song-JC-MFP.zip" "$INSTDIR\Songs\" + ZipDLL::extractall "$LOCALAPPDATA\Temp\Song-JC-MFP.zip" "$INSTDIR\songs\" - Delete "$TEMP\Song-JC-MFP.zip" + Delete "$LOCALAPPDATA\Temp\Song-JC-MFP.zip" SetOutPath "$INSTDIR" @@ -510,18 +469,18 @@ Section /o "Big Bad World One" s2_sub1_Section5 AddSize 4424 SetOverwrite try - SetOutPath "$INSTDIR\Songs\" + SetOutPath "$INSTDIR\songs\" ; Download song: - NSISdl::download /TIMEOUT=50000 ${download_sub1_song5} $TEMP\Song-JC-BBWO.zip + 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 "$TEMP\Song-JC-BBWO.zip" "$INSTDIR\Songs\" + ZipDLL::extractall "$LOCALAPPDATA\Temp\Song-JC-BBWO.zip" "$INSTDIR\songs\" - Delete "$TEMP\Song-JC-BBWO.zip" + Delete "$LOCALAPPDATA\Temp\Song-JC-BBWO.zip" SetOutPath "$INSTDIR" @@ -531,18 +490,18 @@ Section /o "Flickr" s2_sub1_Section6 AddSize 21607 SetOverwrite try - SetOutPath "$INSTDIR\Songs\" + SetOutPath "$INSTDIR\songs\" ; Download song: - NSISdl::download /TIMEOUT=50000 ${download_sub1_song6} $TEMP\Song-JC-Flickr.zip + 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 "$TEMP\Song-JC-Flickr.zip" "$INSTDIR\Songs\" + ZipDLL::extractall "$LOCALAPPDATA\Temp\Song-JC-Flickr.zip" "$INSTDIR\songs\" - Delete "$TEMP\Song-JC-Flickr.zip" + Delete "$LOCALAPPDATA\Temp\Song-JC-Flickr.zip" SetOutPath "$INSTDIR" @@ -552,18 +511,18 @@ Section /o "My Beige Bear" s2_sub1_Section7 AddSize 4926 SetOverwrite try - SetOutPath "$INSTDIR\Songs\" + SetOutPath "$INSTDIR\songs\" ; Download song: - NSISdl::download /TIMEOUT=50000 ${download_sub1_song7} $TEMP\Song-JC-MBB.zip + 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 "$TEMP\Song-JC-MBB.zip" "$INSTDIR\Songs\" + ZipDLL::extractall "$LOCALAPPDATA\Temp\Song-JC-MBB.zip" "$INSTDIR\songs\" - Delete "$TEMP\Song-JC-MBB.zip" + Delete "$LOCALAPPDATA\Temp\Song-JC-MBB.zip" SetOutPath "$INSTDIR" @@ -573,18 +532,18 @@ Section /o "The Future Soon" s2_sub1_Section8 AddSize 5612 SetOverwrite try - SetOutPath "$INSTDIR\Songs\" + SetOutPath "$INSTDIR\songs\" ; Download song: - NSISdl::download /TIMEOUT=50000 ${download_sub1_song8} $TEMP\Song-JC-TFS.zip + 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 "$TEMP\Song-JC-TFS.zip" "$INSTDIR\Songs\" + ZipDLL::extractall "$LOCALAPPDATA\Temp\Song-JC-TFS.zip" "$INSTDIR\songs\" - Delete "$TEMP\Song-JC-TFS.zip" + Delete "$LOCALAPPDATA\Temp\Song-JC-TFS.zip" SetOutPath "$INSTDIR" @@ -594,18 +553,18 @@ Section /o "Ikea" s2_sub1_Section9 AddSize 4608 SetOverwrite try - SetOutPath "$INSTDIR\Songs\" + SetOutPath "$INSTDIR\songs\" ; Download song: - NSISdl::download /TIMEOUT=50000 ${download_sub1_song9} $TEMP\Song-JC-Ikea.zip + 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 "$TEMP\Song-JC-Ikea.zip" "$INSTDIR\Songs\" + ZipDLL::extractall "$LOCALAPPDATA\Temp\Song-JC-Ikea.zip" "$INSTDIR\songs\" - Delete "$TEMP\Song-JC-Ikea.zip" + Delete "$LOCALAPPDATA\Temp\Song-JC-Ikea.zip" SetOutPath "$INSTDIR" @@ -615,18 +574,18 @@ Section /o "Furry Old Lobster" s2_sub1_Section10 AddSize 3288 SetOverwrite try - SetOutPath "$INSTDIR\Songs\" + SetOutPath "$INSTDIR\songs\" ; Download song: - NSISdl::download /TIMEOUT=50000 ${download_sub1_song10} $TEMP\Song-JC-FOL.zip + 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 "$TEMP\Song-JC-FOL.zip" "$INSTDIR\Songs\" + ZipDLL::extractall "$LOCALAPPDATA\Temp\Song-JC-FOL.zip" "$INSTDIR\songs\" - Delete "$TEMP\Song-JC-FOL.zip" + Delete "$LOCALAPPDATA\Temp\Song-JC-FOL.zip" SetOutPath "$INSTDIR" @@ -636,18 +595,18 @@ Section /o "Code Monkey" s2_sub1_Section11 AddSize 21402 SetOverwrite try - SetOutPath "$INSTDIR\Songs\" + SetOutPath "$INSTDIR\songs\" ; Download song: - NSISdl::download /TIMEOUT=50000 ${download_sub1_song11} $TEMP\Song-JC-CM.zip + 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 "$TEMP\Song-JC-CM.zip" "$INSTDIR\Songs\" + ZipDLL::extractall "$LOCALAPPDATA\Temp\Song-JC-CM.zip" "$INSTDIR\songs\" - Delete "$TEMP\Song-JC-CM.zip" + Delete "$LOCALAPPDATA\Temp\Song-JC-CM.zip" SetOutPath "$INSTDIR" @@ -657,18 +616,18 @@ Section /o "I AddSize 4916 SetOverwrite try - SetOutPath "$INSTDIR\Songs\" + SetOutPath "$INSTDIR\songs\" ; Download song: - NSISdl::download /TIMEOUT=50000 ${download_sub1_song12} $TEMP\Song-JC-IYM.zip + 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 "$TEMP\Song-JC-IYM.zip" "$INSTDIR\Songs\" + ZipDLL::extractall "$LOCALAPPDATA\Temp\Song-JC-IYM.zip" "$INSTDIR\songs\" - Delete "$TEMP\Song-JC-IYM.zip" + Delete "$LOCALAPPDATA\Temp\Song-JC-IYM.zip" SetOutPath "$INSTDIR" @@ -678,18 +637,18 @@ Section /o "First Of May" s2_sub1_Section13 AddSize 6257 SetOverwrite try - SetOutPath "$INSTDIR\Songs\" + SetOutPath "$INSTDIR\songs\" ; Download song: - NSISdl::download /TIMEOUT=50000 ${download_sub1_song13} $TEMP\Song-JC-FOM.zip + 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 "$TEMP\Song-JC-FOM.zip" "$INSTDIR\Songs\" + ZipDLL::extractall "$LOCALAPPDATA\Temp\Song-JC-FOM.zip" "$INSTDIR\songs\" - Delete "$TEMP\Song-JC-FOM.zip" + Delete "$LOCALAPPDATA\Temp\Song-JC-FOM.zip" SetOutPath "$INSTDIR" @@ -699,18 +658,18 @@ Section /o "Dance, Soterious Johnson, Dance" s2_sub1_Section14 AddSize 5929 SetOverwrite try - SetOutPath "$INSTDIR\Songs\" + SetOutPath "$INSTDIR\songs\" ; Download song: - NSISdl::download /TIMEOUT=50000 ${download_sub1_song14} $TEMP\Song-JC-DSJD.zip + 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 "$TEMP\Song-JC-DSJD.zip" "$INSTDIR\Songs\" + ZipDLL::extractall "$LOCALAPPDATA\Temp\Song-JC-DSJD.zip" "$INSTDIR\songs\" - Delete "$TEMP\Song-JC-DSJD.zip" + Delete "$LOCALAPPDATA\Temp\Song-JC-DSJD.zip" SetOutPath "$INSTDIR" @@ -720,18 +679,18 @@ Section /o "A Talk With George" s2_sub1_Section15 AddSize 4076 SetOverwrite try - SetOutPath "$INSTDIR\Songs\" + SetOutPath "$INSTDIR\songs\" ; Download song: - NSISdl::download /TIMEOUT=50000 ${download_sub1_song15} $TEMP\Song-JC-ATWG.zip + 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 "$TEMP\Song-JC-ATWG.zip" "$INSTDIR\Songs\" + ZipDLL::extractall "$LOCALAPPDATA\Temp\Song-JC-ATWG.zip" "$INSTDIR\songs\" - Delete "$TEMP\Song-JC-ATWG.zip" + Delete "$LOCALAPPDATA\Temp\Song-JC-ATWG.zip" SetOutPath "$INSTDIR" @@ -741,18 +700,18 @@ Section /o "Creepy Doll" s2_sub1_Section16 AddSize 66560 SetOverwrite try - SetOutPath "$INSTDIR\Songs\" + SetOutPath "$INSTDIR\songs\" ; Download song: - NSISdl::download /TIMEOUT=50000 ${download_sub1_song16} $TEMP\Song-JC-CD.zip + 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 "$TEMP\Song-JC-CD.zip" "$INSTDIR\Songs\" + ZipDLL::extractall "$LOCALAPPDATA\Temp\Song-JC-CD.zip" "$INSTDIR\songs\" - Delete "$TEMP\Song-JC-CD.zip" + Delete "$LOCALAPPDATA\Temp\Song-JC-CD.zip" SetOutPath "$INSTDIR" @@ -762,18 +721,18 @@ Section /o "That Spells DNA" s2_sub1_Section17 AddSize 4158 SetOverwrite try - SetOutPath "$INSTDIR\Songs\" + SetOutPath "$INSTDIR\songs\" ; Download song: - NSISdl::download /TIMEOUT=50000 ${download_sub1_song17} $TEMP\Song-JC-TSDNA.zip + 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 "$TEMP\Song-JC-TSDNA.zip" "$INSTDIR\Songs\" + ZipDLL::extractall "$LOCALAPPDATA\Temp\Song-JC-TSDNA.zip" "$INSTDIR\songs\" - Delete "$TEMP\Song-JC-TSDNA.zip" + Delete "$LOCALAPPDATA\Temp\Song-JC-TSDNA.zip" SetOutPath "$INSTDIR" @@ -783,18 +742,18 @@ Section /o "When You Go" s2_sub1_Section18 AddSize 5755 SetOverwrite try - SetOutPath "$INSTDIR\Songs\" + SetOutPath "$INSTDIR\songs\" ; Download song: - NSISdl::download /TIMEOUT=50000 ${download_sub1_song18} $TEMP\Song-JC-WYG.zip + 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 "$TEMP\Song-JC-WYG.zip" "$INSTDIR\Songs\" + ZipDLL::extractall "$LOCALAPPDATA\Temp\Song-JC-WYG.zip" "$INSTDIR\songs\" - Delete "$TEMP\Song-JC-WYG.zip" + Delete "$LOCALAPPDATA\Temp\Song-JC-WYG.zip" SetOutPath "$INSTDIR" @@ -804,18 +763,18 @@ Section /o "Better" s2_sub1_Section19 AddSize 4199 SetOverwrite try - SetOutPath "$INSTDIR\Songs\" + SetOutPath "$INSTDIR\songs\" ; Download song: - NSISdl::download /TIMEOUT=50000 ${download_sub1_song19} $TEMP\Song-JC-Better.zip + 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 "$TEMP\Song-JC-Better.zip" "$INSTDIR\Songs\" + ZipDLL::extractall "$LOCALAPPDATA\Temp\Song-JC-Better.zip" "$INSTDIR\songs\" - Delete "$TEMP\Song-JC-Better.zip" + Delete "$LOCALAPPDATA\Temp\Song-JC-Better.zip" SetOutPath "$INSTDIR" @@ -825,18 +784,18 @@ Section /o "Shop Vac" s2_sub1_Section20 AddSize 5448 SetOverwrite try - SetOutPath "$INSTDIR\Songs\" + SetOutPath "$INSTDIR\songs\" ; Download song: - NSISdl::download /TIMEOUT=50000 ${download_sub1_song20} $TEMP\Song-JC-SV.zip + 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 "$TEMP\Song-JC-SV.zip" "$INSTDIR\Songs\" + ZipDLL::extractall "$LOCALAPPDATA\Temp\Song-JC-SV.zip" "$INSTDIR\songs\" - Delete "$TEMP\Song-JC-SV.zip" + Delete "$LOCALAPPDATA\Temp\Song-JC-SV.zip" SetOutPath "$INSTDIR" @@ -846,18 +805,18 @@ Section /o "I Feel Fantastic" s2_sub1_Section21 AddSize 3851 SetOverwrite try - SetOutPath "$INSTDIR\Songs\" + SetOutPath "$INSTDIR\songs\" ; Download song: - NSISdl::download /TIMEOUT=50000 ${download_sub1_song21} $TEMP\Song-JC-IFF.zip + 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 "$TEMP\Song-JC-IFF.zip" "$INSTDIR\Songs\" + ZipDLL::extractall "$LOCALAPPDATA\Temp\Song-JC-IFF.zip" "$INSTDIR\songs\" - Delete "$TEMP\Song-JC-IFF.zip" + Delete "$LOCALAPPDATA\Temp\Song-JC-IFF.zip" SetOutPath "$INSTDIR" @@ -867,18 +826,18 @@ Section /o "Re: Your Brains" s2_sub1_Section22 AddSize 7087 SetOverwrite try - SetOutPath "$INSTDIR\Songs\" + SetOutPath "$INSTDIR\songs\" ; Download song: - NSISdl::download /TIMEOUT=50000 ${download_sub1_song22} $TEMP\Song-JC-ReYB.zip + 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 "$TEMP\Song-JC-ReYB.zip" "$INSTDIR\Songs\" + ZipDLL::extractall "$LOCALAPPDATA\Temp\Song-JC-ReYB.zip" "$INSTDIR\songs\" - Delete "$TEMP\Song-JC-ReYB.zip" + Delete "$LOCALAPPDATA\Temp\Song-JC-ReYB.zip" SetOutPath "$INSTDIR" @@ -888,18 +847,18 @@ Section /o "Skullcrusher Mountain" s2_sub1_Section23 AddSize 6298 SetOverwrite try - SetOutPath "$INSTDIR\Songs\" + SetOutPath "$INSTDIR\songs\" ; Download song: - NSISdl::download /TIMEOUT=50000 ${download_sub1_song23} $TEMP\Song-JC-SCM.zip + 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 "$TEMP\Song-JC-SCM.zip" "$INSTDIR\Songs\" + ZipDLL::extractall "$LOCALAPPDATA\Temp\Song-JC-SCM.zip" "$INSTDIR\songs\" - Delete "$TEMP\Song-JC-SCM.zip" + Delete "$LOCALAPPDATA\Temp\Song-JC-SCM.zip" SetOutPath "$INSTDIR" @@ -909,18 +868,18 @@ Section /o "Chiron Beta Prime" s2_sub1_Section24 AddSize 38298 SetOverwrite try - SetOutPath "$INSTDIR\Songs\" + SetOutPath "$INSTDIR\songs\" ; Download song: - NSISdl::download /TIMEOUT=50000 ${download_sub1_song24} $TEMP\Song-JC-CBP.zip + 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 "$TEMP\Song-JC-CBP.zip" "$INSTDIR\Songs\" + ZipDLL::extractall "$LOCALAPPDATA\Temp\Song-JC-CBP.zip" "$INSTDIR\songs\" - Delete "$TEMP\Song-JC-CBP.zip" + Delete "$LOCALAPPDATA\Temp\Song-JC-CBP.zip" SetOutPath "$INSTDIR" @@ -937,19 +896,19 @@ 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\" + CreateDirectory "$INSTDIR\songs\Joshua Morin - On The Run" + SetOutPath "$INSTDIR\songs\Joshua Morin - On The Run\" ; Download song: - NSISdl::download /TIMEOUT=50000 ${download_song3} $TEMP\Song-On-the-run.zip + 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 "$TEMP\Song-On-the-run.zip" "$INSTDIR\Songs\Joshua Morin - On The Run\" + ZipDLL::extractall "$LOCALAPPDATA\Temp\Song-On-the-run.zip" "$INSTDIR\songs\Joshua Morin - On The Run\" - Delete "$TEMP\Song-On-the-run.zip" + Delete "$LOCALAPPDATA\Temp\Song-On-the-run.zip" SetOutPath "$INSTDIR" @@ -959,19 +918,19 @@ Section /o "Pornophonique - Space Invaders" g2Section4 AddSize 3646 SetOverwrite try SetOutPath "$INSTDIR" - CreateDirectory "$INSTDIR\Songs\Pornophonique - Space Invaders" - SetOutPath "$INSTDIR\Songs\Pornophonique - Space Invaders\" + CreateDirectory "$INSTDIR\songs\Pornophonique - Space Invaders" + SetOutPath "$INSTDIR\songs\Pornophonique - Space Invaders\" ; Download song: - NSISdl::download /TIMEOUT=50000 ${download_song4} $TEMP\Song-Space-Invaders.zip + 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 "$TEMP\Song-Space-Invaders.zip" "$INSTDIR\Songs\Pornophonique - Space Invaders\" + ZipDLL::extractall "$LOCALAPPDATA\Temp\Song-Space-Invaders.zip" "$INSTDIR\songs\Pornophonique - Space Invaders\" - Delete "$TEMP\Song-Space-Invaders.zip" + Delete "$LOCALAPPDATA\Temp\Song-Space-Invaders.zip" SetOutPath "$INSTDIR" @@ -983,18 +942,18 @@ Section /o "Shearer - 69" s2_sub2_Section1 AddSize 4557 SetOverwrite try - SetOutPath "$INSTDIR\Songs\" + SetOutPath "$INSTDIR\songs\" ; Download song: - NSISdl::download /TIMEOUT=50000 ${download_sub2_song1} $TEMP\Song-Shearer-69.zip + 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 "$TEMP\Song-Shearer-69.zip" "$INSTDIR\Songs\" + ZipDLL::extractall "$LOCALAPPDATA\Temp\Song-Shearer-69.zip" "$INSTDIR\songs\" - Delete "$TEMP\Song-Shearer-69.zip" + Delete "$LOCALAPPDATA\Temp\Song-Shearer-69.zip" SetOutPath "$INSTDIR" @@ -1004,18 +963,18 @@ Section /o "Shearer - 69 (Karaoke)" s2_sub2_Section2 AddSize 4772 SetOverwrite try - SetOutPath "$INSTDIR\Songs\" + SetOutPath "$INSTDIR\songs\" ; Download song: - NSISdl::download /TIMEOUT=50000 ${download_sub2_song2} $TEMP\Song-Shearer-69-Kar.zip + 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 "$TEMP\Song-Shearer-69-Kar.zip" "$INSTDIR\Songs\" + ZipDLL::extractall "$LOCALAPPDATA\Temp\Song-Shearer-69-Kar.zip" "$INSTDIR\songs\" - Delete "$TEMP\Song-Shearer-69-Kar.zip" + Delete "$LOCALAPPDATA\Temp\Song-Shearer-69-Kar.zip" SetOutPath "$INSTDIR" @@ -1025,18 +984,18 @@ Section /o "Shearer - Can't stop it" s2_sub2_Section3 AddSize 5510 SetOverwrite try - SetOutPath "$INSTDIR\Songs\" + SetOutPath "$INSTDIR\songs\" ; Download song: - NSISdl::download /TIMEOUT=50000 ${download_sub2_song3} $TEMP\Song-Shearer-CSI.zip + 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 "$TEMP\Song-Shearer-CSI.zip" "$INSTDIR\Songs\" + ZipDLL::extractall "$LOCALAPPDATA\Temp\Song-Shearer-CSI.zip" "$INSTDIR\songs\" - Delete "$TEMP\Song-Shearer-CSI.zip" + Delete "$LOCALAPPDATA\Temp\Song-Shearer-CSI.zip" SetOutPath "$INSTDIR" @@ -1046,18 +1005,18 @@ Section /o "Shearer - Can't stop it (Karaoke)" s2_sub2_Section4 AddSize 4178 SetOverwrite try - SetOutPath "$INSTDIR\Songs\" + SetOutPath "$INSTDIR\songs\" ; Download song: - NSISdl::download /TIMEOUT=50000 ${download_sub2_song4} $TEMP\Song-Shearer-CSI-Kar.zip + 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 "$TEMP\Song-Shearer-CSI-Kar.zip" "$INSTDIR\Songs\" + ZipDLL::extractall "$LOCALAPPDATA\Temp\Song-Shearer-CSI-Kar.zip" "$INSTDIR\songs\" - Delete "$TEMP\Song-Shearer-CSI-Kar.zip" + Delete "$LOCALAPPDATA\Temp\Song-Shearer-CSI-Kar.zip" SetOutPath "$INSTDIR" @@ -1067,18 +1026,18 @@ Section /o "Shearer - In My Hand" s2_sub2_Section5 AddSize 5960 SetOverwrite try - SetOutPath "$INSTDIR\Songs\" + SetOutPath "$INSTDIR\songs\" ; Download song: - NSISdl::download /TIMEOUT=50000 ${download_sub2_song5} $TEMP\Song-Shearer-IMH.zip + 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 "$TEMP\Song-Shearer-IMH.zip" "$INSTDIR\Songs\" + ZipDLL::extractall "$LOCALAPPDATA\Temp\Song-Shearer-IMH.zip" "$INSTDIR\songs\" - Delete "$TEMP\Song-Shearer-IMH.zip" + Delete "$LOCALAPPDATA\Temp\Song-Shearer-IMH.zip" SetOutPath "$INSTDIR" @@ -1088,18 +1047,18 @@ Section /o "Shearer - Man Song" s2_sub2_Section6 AddSize 7270 SetOverwrite try - SetOutPath "$INSTDIR\Songs\" + SetOutPath "$INSTDIR\songs\" ; Download song: - NSISdl::download /TIMEOUT=50000 ${download_sub2_song6} $TEMP\Song-Shearer-MS.zip + 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 "$TEMP\Song-Shearer-MS.zip" "$INSTDIR\Songs\" + ZipDLL::extractall "$LOCALAPPDATA\Temp\Song-Shearer-MS.zip" "$INSTDIR\songs\" - Delete "$TEMP\Song-Shearer-MS.zip" + Delete "$LOCALAPPDATA\Temp\Song-Shearer-MS.zip" SetOutPath "$INSTDIR" @@ -1109,18 +1068,18 @@ Section /o "Shearer - Man Song (Karaoke)" s2_sub2_Section7 AddSize 5807 SetOverwrite try - SetOutPath "$INSTDIR\Songs\" + SetOutPath "$INSTDIR\songs\" ; Download song: - NSISdl::download /TIMEOUT=50000 ${download_sub2_song7} $TEMP\Song-Shearer-MS-Kar.zip + 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 "$TEMP\Song-Shearer-MS-Kar.zip" "$INSTDIR\Songs\" + ZipDLL::extractall "$LOCALAPPDATA\Temp\Song-Shearer-MS-Kar.zip" "$INSTDIR\songs\" - Delete "$TEMP\Song-Shearer-MS-Kar.zip" + Delete "$LOCALAPPDATA\Temp\Song-Shearer-MS-Kar.zip" SetOutPath "$INSTDIR" @@ -1130,18 +1089,18 @@ Section /o "Shearer - Stay With Me" s2_sub2_Section8 AddSize 6400 SetOverwrite try - SetOutPath "$INSTDIR\Songs\" + SetOutPath "$INSTDIR\songs\" ; Download song: - NSISdl::download /TIMEOUT=50000 ${download_sub2_song8} $TEMP\Song-Shearer-SWM.zip + 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 "$TEMP\Song-Shearer-SWM.zip" "$INSTDIR\Songs\" + ZipDLL::extractall "$LOCALAPPDATA\Temp\Song-Shearer-SWM.zip" "$INSTDIR\songs\" - Delete "$TEMP\Song-Shearer-SWM.zip" + Delete "$LOCALAPPDATA\Temp\Song-Shearer-SWM.zip" SetOutPath "$INSTDIR" @@ -1151,19 +1110,19 @@ Section /o "Shearer - Stay With Me (Karaoke)" s2_sub2_Section9 AddSize 5417 SetOverwrite try - SetOutPath "$INSTDIR\Songs\" + SetOutPath "$INSTDIR\songs\" ; Download song: - NSISdl::download /TIMEOUT=50000 ${download_sub2_song9} $TEMP\Song-Shearer-SWM-Kar.zip + 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 "$TEMP\Song-Shearer-SWM-Kar.zip" "$INSTDIR\Songs\" + ZipDLL::extractall "$LOCALAPPDATA\Temp\Song-Shearer-SWM-Kar.zip" "$INSTDIR\songs\" - Delete "$TEMP\Song-Shearer-SWM-Kar.zip" + Delete "$LOCALAPPDATA\Temp\Song-Shearer-SWM-Kar.zip" SetOutPath "$INSTDIR" @@ -1175,20 +1134,20 @@ 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\" + CreateDirectory "$INSTDIR\songs\Steven Dunston - Northern Star" + SetOutPath "$INSTDIR\songs\Steven Dunston - Northern Star\" ; Download song: - NSISdl::download /TIMEOUT=50000 ${download_song5} $TEMP\Song-Northern-Star.zip + 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 "$TEMP\Song-Northern-Star.zip" "$INSTDIR\Songs\Steven Dunston - Northern Star\" + ZipDLL::extractall "$LOCALAPPDATA\Temp\Song-Northern-Star.zip" "$INSTDIR\songs\Steven Dunston - Northern Star\" - Delete "$TEMP\Song-Northern-Star.zip" + Delete "$LOCALAPPDATA\Temp\Song-Northern-Star.zip" SetOutPath "$INSTDIR" @@ -1200,19 +1159,19 @@ Section /o "Wise Guys - Lebendig und kr AddSize 4015 SetOverwrite try - SetOutPath "$INSTDIR\Songs\" + SetOutPath "$INSTDIR\songs\" ; Download song: - NSISdl::download /TIMEOUT=50000 ${download_sub3_song1} $TEMP\Song-WiseGuys-LUKUS.zip + 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 "$TEMP\Song-WiseGuys-LUKUS.zip" "$INSTDIR\Songs\" + ZipDLL::extractall "$LOCALAPPDATA\Temp\Song-WiseGuys-LUKUS.zip" "$INSTDIR\songs\" - Delete "$TEMP\Song-WiseGuys-LUKUS.zip" + Delete "$LOCALAPPDATA\Temp\Song-WiseGuys-LUKUS.zip" SetOutPath "$INSTDIR" @@ -1222,167 +1181,56 @@ Section /o "Wise Guys - Mensch, wo bist du?" s2_sub3_Section2 AddSize 5335 SetOverwrite try - SetOutPath "$INSTDIR\Songs\" + SetOutPath "$INSTDIR\songs\" ; Download song: - NSISdl::download /TIMEOUT=50000 ${download_sub3_song2} $TEMP\Song-WiseGuys-MWBD.zip + 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 "$TEMP\Song-WiseGuys-MWBD.zip" "$INSTDIR\Songs\" + ZipDLL::extractall "$LOCALAPPDATA\Temp\Song-WiseGuys-MWBD.zip" "$INSTDIR\songs\" - Delete "$TEMP\Song-WiseGuys-MWBD.zip" + Delete "$LOCALAPPDATA\Temp\Song-WiseGuys-MWBD.zip" SetOutPath "$INSTDIR" SectionEnd -SectionGroupEnd - -SectionGroupEnd - -;------------------------------------ -; OPTIONAL THEMES (Section 3) -;------------------------------------ - -SectionGroup $(name_section3) Section3 +Section /o "Wise Guys - Mensch, wo bist du? (Karaoke)" s2_sub3_Section3 - Section /o "Orange" g3Section1 - AddSize 1291 - -; Download theme orange: - NSISdl::download /TIMEOUT=50000 ${download_theme1} $TEMP\Theme-Orange.zip + AddSize 5335 + SetOverwrite try + SetOutPath "$INSTDIR\songs\" - Pop $R0 ;Get the return value +; 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 "$TEMP\Theme-Orange.zip" "$INSTDIR\" - - Delete "$TEMP\Theme-Orange.zip" - - SetOutPath "$INSTDIR" - -SectionEnd - - Section /o "Streetlight" g3Section2 - AddSize 1905 -; Download theme Streetlight: - NSISdl::download /TIMEOUT=50000 ${download_theme2} $TEMP\Theme-Streetlight.zip + ZipDLL::extractall "$LOCALAPPDATA\Temp\Song-WiseGuys-MWBDKar.zip" "$INSTDIR\songs\" - 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 "$TEMP\Theme-Streetlight.zip" "$INSTDIR\" - - Delete "$TEMP\Theme-Streetlight.zip" + Delete "$LOCALAPPDATA\Temp\Song-WiseGuys-MWBDKar.zip" SetOutPath "$INSTDIR" SectionEnd - Section /o "Vistar" g3Section3 - AddSize 1936 - -; Download theme Vistar: - - NSISdl::download /TIMEOUT=50000 ${download_theme3} $TEMP\Theme-Vistar.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 "$TEMP\Theme-Vistar.zip" "$INSTDIR\" - - Delete "$TEMP\Theme-Vistar.zip" - - SetOutPath "$INSTDIR" - -SectionEnd - - Section /o "BlueSensation" g3Section4 - AddSize 2109 - -; Download theme BlueSensation: - - NSISdl::download /TIMEOUT=50000 ${download_theme4} $TEMP\Theme-BlueSensation.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 "$TEMP\Theme-BlueSensation.zip" "$INSTDIR\" - - Delete "$TEMP\Theme-BlueSensation.zip" - - SetOutPath "$INSTDIR" - -SectionEnd - - - Section /o "WhiteSensation" g3Section5 - AddSize 1168 - -; Download theme WhiteSensation: - - NSISdl::download /TIMEOUT=50000 ${download_theme7} $TEMP\Theme-WhiteSensation.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 "$TEMP\Theme-WhiteSensation.zip" "$INSTDIR\" - - Delete "$TEMP\Theme-WhiteSensation.zip" - - SetOutPath "$INSTDIR" - -SectionEnd - - Section /o "WiiStar" g3Section6 - AddSize 850 - -; Download theme WiiStar: - - NSISdl::download /TIMEOUT=50000 ${download_theme5} $TEMP\Theme-WiiStar.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 "$TEMP\Theme-WiiStar.zip" "$INSTDIR\" - - Delete "$TEMP\Theme-WiiStar.zip" - - SetOutPath "$INSTDIR" - -SectionEnd - - Section /o "iStar" g3Section7 - AddSize 1588 - -; Download theme iStar: - - NSISdl::download /TIMEOUT=50000 ${download_theme6} $TEMP\Theme-iStar.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 "$TEMP\Theme-iStar.zip" "$INSTDIR\" +SectionGroupEnd - Delete "$TEMP\Theme-iStar.zip" +SectionGroupEnd - SetOutPath "$INSTDIR" +;------------------------------------ +; OPTIONAL THEMES (Section 3) +;------------------------------------ -SectionEnd - -SectionGroupEnd +; No additional themes available +; for current version of ultrastardx ;------------------------------------ ; UNINSTALL (Section 4) @@ -1397,14 +1245,7 @@ Section Uninstall DeleteRegKey ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" ; Unregister from Windows Vista Game Explorer - -${If} ${AtLeastWinVista} - -${GameExplorer_RemoveGame} $0 - -${EndIf} - - +; (removed due to incompatibility with Windows 7) SectionEnd @@ -1420,7 +1261,7 @@ SectionEnd !insertmacro MUI_DESCRIPTION_TEXT ${s2_sub1} $(DESC_Section2_sub1) !insertmacro MUI_DESCRIPTION_TEXT ${s2_sub2} $(DESC_Section2_sub2) !insertmacro MUI_DESCRIPTION_TEXT ${s2_sub3} $(DESC_Section2_sub3) - !insertmacro MUI_DESCRIPTION_TEXT ${Section3} $(DESC_Section3) +; !insertmacro MUI_DESCRIPTION_TEXT ${Section3} $(DESC_Section3) !insertmacro MUI_DESCRIPTION_TEXT ${g2Section1} $(DESC_g2Section1) !insertmacro MUI_DESCRIPTION_TEXT ${g2Section2} $(DESC_g2Section2) @@ -1465,14 +1306,7 @@ SectionEnd !insertmacro MUI_DESCRIPTION_TEXT ${s2_sub3_Section1} $(DESC_s2_sub3_Section1) !insertmacro MUI_DESCRIPTION_TEXT ${s2_sub3_Section2} $(DESC_s2_sub3_Section2) - - !insertmacro MUI_DESCRIPTION_TEXT ${g3Section1} $(DESC_g3Section1) - !insertmacro MUI_DESCRIPTION_TEXT ${g3Section2} $(DESC_g3Section2) - !insertmacro MUI_DESCRIPTION_TEXT ${g3Section3} $(DESC_g3Section3) - !insertmacro MUI_DESCRIPTION_TEXT ${g3Section4} $(DESC_g3Section4) - !insertmacro MUI_DESCRIPTION_TEXT ${g3Section5} $(DESC_g3Section5) - !insertmacro MUI_DESCRIPTION_TEXT ${g3Section6} $(DESC_g3Section6) - !insertmacro MUI_DESCRIPTION_TEXT ${g3Section7} $(DESC_g3Section7) + !insertmacro MUI_DESCRIPTION_TEXT ${s2_sub3_Section3} $(DESC_s2_sub3_Section3) !insertmacro MUI_FUNCTION_DESCRIPTION_END @@ -1487,10 +1321,21 @@ SectionEnd !include "${path_languages}\*.nsh" +;!addPluginDir "${path_plugins}\" + +Function bgmusic + File /oname=$PLUGINSDIR\loop.wav .\dependencies\loop.wav + BGImage::Sound /NOUNLOAD /LOOP $PLUGINSDIR\loop.wav +FunctionEnd + +Function .onGUIEnd + BGImage::Sound /STOP +FunctionEnd + Function .onInit var /GLOBAL version -StrCpy $version "1.1a" +StrCpy $version "1.1beta" System::Call 'kernel32::CreateMutexA(i 0, i 0, t "USdx Installer.exe") ?e' @@ -1537,10 +1382,18 @@ Function un.onInit StrCmp $R0 0 0 +2 MessageBox MB_YESNO|MB_ICONEXCLAMATION '$(oninit_closeusdx)' IDYES closeit IDNO end - closeit: + closeit: ${nsProcess::KillProcess} "USdx.exe" $R0 goto continue + ${nsProcess::FindProcess} "ultrastardx.exe" $R0 + StrCmp $R0 0 0 +2 + MessageBox MB_YESNO|MB_ICONEXCLAMATION '$(oninit_closeusdx)' IDYES closeusdx IDNO end + + closeusdx: + ${nsProcess::KillProcess} "ultrastardx.exe" $R0 + goto continue + end: ${nsProcess::Unload} Abort diff --git a/installer/dependencies/dll/put game dlls here b/installer/dependencies/dll/put game dlls here new file mode 100644 index 00000000..e69de29b diff --git a/installer/dependencies/documents/documentation.pdf b/installer/dependencies/documents/documentation.pdf new file mode 100644 index 00000000..16267bb9 Binary files /dev/null and b/installer/dependencies/documents/documentation.pdf differ diff --git a/installer/dependencies/documents/license.txt b/installer/dependencies/documents/license.txt new file mode 100644 index 00000000..66f35b98 --- /dev/null +++ b/installer/dependencies/documents/license.txt @@ -0,0 +1,125 @@ +The GNU General Public License (GPL) +Version 2, June 1991 +Copyright (C) 1989, 1991 Free Software Foundation, Inc. +59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + +Everyone is permitted to copy and distribute verbatim copies +of this license document, but changing it is not allowed. + +Preamble + +The licenses for most software are designed to take away your freedom to share and change it. By contrast, the GNU General Public License is intended to guarantee your freedom to share and change free software--to make sure the software is free for all its users. This General Public License applies to most of the Free Software Foundation's software and to any other program whose authors commit to using it. (Some other Free Software Foundation software is covered by the GNU Library General Public License instead.) You can apply it to your programs, too. + +When we speak of free software, we are referring to freedom, not price. Our General Public Licenses are designed to make sure that you have the freedom to distribute copies of free software (and charge for this service if you wish), that you receive source code or can get it if you want it, that you can change the software or use pieces of it in new free programs; and that you know you can do these things. + +To protect your rights, we need to make restrictions that forbid anyone to deny you these rights or to ask you to surrender the rights. These restrictions translate to certain responsibilities for you if you distribute copies of the software, or if you modify it. + +For example, if you distribute copies of such a program, whether gratis or for a fee, you must give the recipients all the rights that you have. You must make sure that they, too, receive or can get the source code. And you must show them these terms so they know their rights. + +We protect your rights with two steps: (1) copyright the software, and (2) offer you this license which gives you legal permission to copy, distribute and/or modify the software. + +Also, for each author's protection and ours, we want to make certain that everyone understands that there is no warranty for this free software. If the software is modified by someone else and passed on, we want its recipients to know that what they have is not the original, so that any problems introduced by others will not reflect on the original authors' reputations. + +Finally, any free program is threatened constantly by software patents. We wish to avoid the danger that redistributors of a free program will individually obtain patent licenses, in effect making the program proprietary. To prevent this, we have made it clear that any patent must be licensed for everyone's free use or not licensed at all. + +The precise terms and conditions for copying, distribution and modification follow. + +TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + +0. This License applies to any program or other work which contains a notice placed by the copyright holder saying it may be distributed under the terms of this General Public License. The "Program", below, refers to any such program or work, and a "work based on the Program" means either the Program or any derivative work under copyright law: that is to say, a work containing the Program or a portion of it, either verbatim or with modifications and/or translated into another language. (Hereinafter, translation is included without limitation in the term "modification".) Each licensee is addressed as "you". + +Activities other than copying, distribution and modification are not covered by this License; they are outside its scope. The act of running the Program is not restricted, and the output from the Program is covered only if its contents constitute a work based on the Program (independent of having been made by running the Program). Whether that is true depends on what the Program does. + +1. You may copy and distribute verbatim copies of the Program's source code as you receive it, in any medium, provided that you conspicuously and appropriately publish on each copy an appropriate copyright notice and disclaimer of warranty; keep intact all the notices that refer to this License and to the absence of any warranty; and give any other recipients of the Program a copy of this License along with the Program. + +You may charge a fee for the physical act of transferring a copy, and you may at your option offer warranty protection in exchange for a fee. + +2. You may modify your copy or copies of the Program or any portion of it, thus forming a work based on the Program, and copy and distribute such modifications or work under the terms of Section 1 above, provided that you also meet all of these conditions: + +a) You must cause the modified files to carry prominent notices stating that you changed the files and the date of any change. + +b) You must cause any work that you distribute or publish, that in whole or in part contains or is derived from the Program or any part thereof, to be licensed as a whole at no charge to all third parties under the terms of this License. + +c) If the modified program normally reads commands interactively when run, you must cause it, when started running for such interactive use in the most ordinary way, to print or display an announcement including an appropriate copyright notice and a notice that there is no warranty (or else, saying that you provide a warranty) and that users may redistribute the program under these conditions, and telling the user how to view a copy of this License. (Exception: if the Program itself is interactive but does not normally print such an announcement, your work based on the Program is not required to print an announcement.) + +These requirements apply to the modified work as a whole. If identifiable sections of that work are not derived from the Program, and can be reasonably considered independent and separate works in themselves, then this License, and its terms, do not apply to those sections when you distribute them as separate works. But when you distribute the same sections as part of a whole which is a work based on the Program, the distribution of the whole must be on the terms of this License, whose permissions for other licensees extend to the entire whole, and thus to each and every part regardless of who wrote it. + +Thus, it is not the intent of this section to claim rights or contest your rights to work written entirely by you; rather, the intent is to exercise the right to control the distribution of derivative or collective works based on the Program. + +In addition, mere aggregation of another work not based on the Program with the Program (or with a work based on the Program) on a volume of a storage or distribution medium does not bring the other work under the scope of this License. + +3. You may copy and distribute the Program (or a work based on it, under Section 2) in object code or executable form under the terms of Sections 1 and 2 above provided that you also do one of the following: + +a) Accompany it with the complete corresponding machine-readable source code, which must be distributed under the terms of Sections 1 and 2 above on a medium customarily used for software interchange; or, + +b) Accompany it with a written offer, valid for at least three years, to give any third party, for a charge no more than your cost of physically performing source distribution, a complete machine-readable copy of the corresponding source code, to be distributed under the terms of Sections 1 and 2 above on a medium customarily used for software interchange; or, + +c) Accompany it with the information you received as to the offer to distribute corresponding source code. (This alternative is allowed only for noncommercial distribution and only if you received the program in object code or executable form with such an offer, in accord with Subsection b above.) + +The source code for a work means the preferred form of the work for making modifications to it. For an executable work, complete source code means all the source code for all modules it contains, plus any associated interface definition files, plus the scripts used to control compilation and installation of the executable. However, as a special exception, the source code distributed need not include anything that is normally distributed (in either source or binary form) with the major components (compiler, kernel, and so on) of the operating system on which the executable runs, unless that component itself accompanies the executable. + +If distribution of executable or object code is made by offering access to copy from a designated place, then offering equivalent access to copy the source code from the same place counts as distribution of the source code, even though third parties are not compelled to copy the source along with the object code. + +4. You may not copy, modify, sublicense, or distribute the Program except as expressly provided under this License. Any attempt otherwise to copy, modify, sublicense or distribute the Program is void, and will automatically terminate your rights under this License. However, parties who have received copies, or rights, from you under this License will not have their licenses terminated so long as such parties remain in full compliance. + +5. You are not required to accept this License, since you have not signed it. However, nothing else grants you permission to modify or distribute the Program or its derivative works. These actions are prohibited by law if you do not accept this License. Therefore, by modifying or distributing the Program (or any work based on the Program), you indicate your acceptance of this License to do so, and all its terms and conditions for copying, distributing or modifying the Program or works based on it. + +6. Each time you redistribute the Program (or any work based on the Program), the recipient automatically receives a license from the original licensor to copy, distribute or modify the Program subject to these terms and conditions. You may not impose any further restrictions on the recipients' exercise of the rights granted herein. You are not responsible for enforcing compliance by third parties to this License. + +7. If, as a consequence of a court judgment or allegation of patent infringement or for any other reason (not limited to patent issues), conditions are imposed on you (whether by court order, agreement or otherwise) that contradict the conditions of this License, they do not excuse you from the conditions of this License. If you cannot distribute so as to satisfy simultaneously your obligations under this License and any other pertinent obligations, then as a consequence you may not distribute the Program at all. For example, if a patent license would not permit royalty-free redistribution of the Program by all those who receive copies directly or indirectly through you, then the only way you could satisfy both it and this License would be to refrain entirely from distribution of the Program. + +If any portion of this section is held invalid or unenforceable under any particular circumstance, the balance of the section is intended to apply and the section as a whole is intended to apply in other circumstances. + +It is not the purpose of this section to induce you to infringe any patents or other property right claims or to contest validity of any such claims; this section has the sole purpose of protecting the integrity of the free software distribution system, which is implemented by public license practices. Many people have made generous contributions to the wide range of software distributed through that system in reliance on consistent application of that system; it is up to the author/donor to decide if he or she is willing to distribute software through any other system and a licensee cannot impose that choice. + +This section is intended to make thoroughly clear what is believed to be a consequence of the rest of this License. + +8. If the distribution and/or use of the Program is restricted in certain countries either by patents or by copyrighted interfaces, the original copyright holder who places the Program under this License may add an explicit geographical distribution limitation excluding those countries, so that distribution is permitted only in or among countries not thus excluded. In such case, this License incorporates the limitation as if written in the body of this License. + +9. The Free Software Foundation may publish revised and/or new versions of the General Public License from time to time. Such new versions will be similar in spirit to the present version, but may differ in detail to address new problems or concerns. + +Each version is given a distinguishing version number. If the Program specifies a version number of this License which applies to it and "any later version", you have the option of following the terms and conditions either of that version or of any later version published by the Free Software Foundation. If the Program does not specify a version number of this License, you may choose any version ever published by the Free Software Foundation. + +10. If you wish to incorporate parts of the Program into other free programs whose distribution conditions are different, write to the author to ask for permission. For software which is copyrighted by the Free Software Foundation, write to the Free Software Foundation; we sometimes make exceptions for this. Our decision will be guided by the two goals of preserving the free status of all derivatives of our free software and of promoting the sharing and reuse of software generally. + +NO WARRANTY + +11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + +12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. + +END OF TERMS AND CONDITIONS + +How to Apply These Terms to Your New Programs + +If you develop a new program, and you want it to be of the greatest possible use to the public, the best way to achieve this is to make it free software which everyone can redistribute and change under these terms. + +To do so, attach the following notices to the program. It is safest to attach them to the start of each source file to most effectively convey the exclusion of warranty; and each file should have at least the "copyright" line and a pointer to where the full notice is found. + +one line to give the program's name and a brief idea of what it does. +Copyright (C) + +This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. + +This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. + +You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + +Also add information on how to contact you by electronic and paper mail. + +If the program is interactive, make it output a short notice like this when it starts in an interactive mode: + +Gnomovision version 69, Copyright (C) year name of author Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. This is free software, and you are welcome to redistribute it under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate parts of the General Public License. Of course, the commands you use may be called something other than `show w' and `show c'; they could even be mouse-clicks or menu items--whatever suits your program. + +You should also get your employer (if you work as a programmer) or your school, if any, to sign a "copyright disclaimer" for the program, if necessary. Here is a sample; alter the names: + +Yoyodyne, Inc., hereby disclaims all copyright interest +in the program `Gnomovision' (which makes passes at compilers) +written by James Hacker. + +signature of Ty Coon, 1 April 1989 +Ty Coon, President of Vice + +This General Public License does not permit incorporating your program into proprietary programs. If your program is a subroutine library, you may consider it more useful to permit linking proprietary applications with the library. If this is what you want to do, use the GNU Library General Public License instead of this License. diff --git a/installer/dependencies/images/header.bmp b/installer/dependencies/images/header.bmp new file mode 100644 index 00000000..058eafd3 Binary files /dev/null and b/installer/dependencies/images/header.bmp differ diff --git a/installer/dependencies/images/side.bmp b/installer/dependencies/images/side.bmp new file mode 100644 index 00000000..3883fa09 Binary files /dev/null and b/installer/dependencies/images/side.bmp differ diff --git a/installer/dependencies/loop.wav b/installer/dependencies/loop.wav new file mode 100644 index 00000000..8a252921 Binary files /dev/null and b/installer/dependencies/loop.wav differ diff --git a/installer/dependencies/plugins/NSISdl.dll b/installer/dependencies/plugins/NSISdl.dll new file mode 100644 index 00000000..a3675054 Binary files /dev/null and b/installer/dependencies/plugins/NSISdl.dll differ diff --git a/installer/dependencies/plugins/ZipDLL.dll b/installer/dependencies/plugins/ZipDLL.dll new file mode 100644 index 00000000..5925d591 Binary files /dev/null and b/installer/dependencies/plugins/ZipDLL.dll differ diff --git a/installer/dependencies/plugins/nsProcess.dll b/installer/dependencies/plugins/nsProcess.dll new file mode 100644 index 00000000..064097a3 Binary files /dev/null and b/installer/dependencies/plugins/nsProcess.dll differ diff --git a/installer/install.ico b/installer/install.ico new file mode 100644 index 00000000..fc1d0797 Binary files /dev/null and b/installer/install.ico differ diff --git a/installer/languages/English.nsh b/installer/languages/English.nsh index 63901b87..5d57a420 100644 --- a/installer/languages/English.nsh +++ b/installer/languages/English.nsh @@ -15,7 +15,7 @@ LangString button_next ${LANG_ENGLISH} "Next >" LangString button_close ${LANG_ENGLISH} "Close" LangString update_information ${LANG_ENGLISH} "You can check if a new version of 'UltraStar Deluxe' is available. Thereto an internet connection will be established. If a new version is found, it can be installed afterwards." -LangString delete_all ${LANG_ENGLISH} "Also delete Songs, Highscores and Covers ?" +LangString delete_all ${LANG_ENGLISH} "Also delete Songs, Settings, Highscores and Covers ?" LangString update_check_older ${LANG_ENGLISH} "Your version $R0 is outdated. The new version $1 of UltraStar Deluxe is available. Do you want to update?" LangString update_check_equal ${LANG_ENGLISH} "Your currently installed version $R0 is up-to-date. No update needed." @@ -54,6 +54,7 @@ LangString sm_uninstall ${LANG_ENGLISH} "Uninstall" LangString sm_website ${LANG_ENGLISH} "Website" LangString sm_license ${LANG_ENGLISH} "License" LangString sm_readme ${LANG_ENGLISH} "Readme" +LangString sm_songs ${LANG_ENGLISH} "Songs" LangString sm_documentation ${LANG_ENGLISH} "Documentation" LangString sc_play ${LANG_ENGLISH} "Play" @@ -66,14 +67,12 @@ LangString name_section2 ${LANG_ENGLISH} "Songs" LangString name_s2_sub1 ${LANG_ENGLISH} "Jonathan Coulton" LangString name_s2_sub2 ${LANG_ENGLISH} "Shearer" LangString name_s2_sub3 ${LANG_ENGLISH} "Wise Guys" -LangString name_section3 ${LANG_ENGLISH} "Themes" LangString DESC_Section1 ${LANG_ENGLISH} "These are the basic files needed by UltraStar Deluxe" LangString DESC_Section2 ${LANG_ENGLISH} "You can choose which songs should be installed." LangString DESC_Section2_sub1 ${LANG_ENGLISH} "You can choose which Jonathan Coulton songs (CC by-nc 3.0) should be installed." LangString DESC_Section2_sub2 ${LANG_ENGLISH} "You can choose which Shearer songs (CC by-nc-sa 2.0 / 3.0) should be installed." LangString DESC_Section2_sub3 ${LANG_ENGLISH} "You can choose which Wise Guys songs should be installed." -LangString DESC_Section3 ${LANG_ENGLISH} "You can choose which optional themes should be installed." LangString DESC_g2Section2 ${LANG_ENGLISH} "This will install the song 'Dead Smiling Pirates - I 18' (CC by-nc-nd 2.5)." LangString DESC_g2Section3 ${LANG_ENGLISH} "This will install the song 'Joshua Morin - On The Run' (CC by-sa 2.5)." @@ -118,11 +117,7 @@ LangString DESC_s2_sub2_Section9 ${LANG_ENGLISH} "This will install the song 'St LangString DESC_s2_sub3_Section1 ${LANG_ENGLISH} "This will install the song 'Lebendig und kräftig und schärfer'." LangString DESC_s2_sub3_Section2 ${LANG_ENGLISH} "This will install the song 'Mensch, wo bist du?'." +LangString DESC_s2_sub3_Section3 ${LANG_ENGLISH} "This will install the song 'Mensch, wo bist du? (Karaoke)'." -LangString DESC_g3Section1 ${LANG_ENGLISH} "This will install the optional theme 'Orange' by Skar" -LangString DESC_g3Section2 ${LANG_ENGLISH} "This will install the optional theme 'Streetlight' by Skar" -LangString DESC_g3Section3 ${LANG_ENGLISH} "This will install the optional theme 'Vistar' by Skar" -LangString DESC_g3Section4 ${LANG_ENGLISH} "This will install the optional theme 'BlueSensation v5.1' by Charis" -LangString DESC_g3Section6 ${LANG_ENGLISH} "This will install the optional theme 'WiiStar' by MasterPhW" -LangString DESC_g3Section7 ${LANG_ENGLISH} "This will install the optional theme 'iStar' by MezzoX" -LangString DESC_g3Section5 ${LANG_ENGLISH} "This will install the optional theme 'WhiteSensation' by Charis" \ No newline at end of file +; Optional Themes +; (not available) \ No newline at end of file diff --git a/installer/languages/German.nsh b/installer/languages/German.nsh index 7f438e9d..d6a72a9a 100644 --- a/installer/languages/German.nsh +++ b/installer/languages/German.nsh @@ -15,7 +15,7 @@ LangString button_next ${LANG_GERMAN} "Weiter >" LangString button_close ${LANG_GERMAN} "Beenden" LangString update_information ${LANG_GERMAN} "Du kannst nach einer aktuelleren Version von 'UltraStar Deluxe' suchen. Dazu wird eine Verbindung mit dem Internet hergestellt. Wurde eine aktuellere Version gefunden, kann diese anschließend installiert werden." -LangString delete_all ${LANG_GERMAN} "Lieder, Highscores und Cover auch löschen?" +LangString delete_all ${LANG_GERMAN} "Lieder, Einstellungen, Highscores und Cover auch löschen?" LangString update_check_older ${LANG_GERMAN} "Deine aktuelle Version $R0 ist veraltet. Die neue Version $1 von UltraStar Deluxe ist verfügbar. Möchtest du sie runterladen?" LangString update_check_equal ${LANG_GERMAN} "Deine aktuelle Version $R0 ist auf dem neusten Stand.$\n$\rKein Update benötigt." @@ -49,11 +49,12 @@ LangString page_finish_desktop ${LANG_GERMAN} "Verkn ; Start Menu and Shortcuts -LangString sm_website ${LANG_GERMAN} "Internetseite" +LangString sm_website ${LANG_GERMAN} "Webseite" LangString sm_uninstall ${LANG_GERMAN} "Deinstallieren" LangString sm_shortcut ${LANG_GERMAN} "UltraStar Deluxe spielen" LangString sm_license ${LANG_GERMAN} "Lizenz" LangString sm_readme ${LANG_GERMAN} "Lies mich" +LangString sm_songs ${LANG_GERMAN} "Songs" LangString sm_documentation ${LANG_GERMAN} "Dokumentation" LangString sc_play ${LANG_GERMAN} "Spielen" @@ -66,14 +67,12 @@ LangString name_section2 ${LANG_GERMAN} "Songs" LangString name_s2_sub1 ${LANG_GERMAN} "Jonathan Coulton" LangString name_s2_sub2 ${LANG_GERMAN} "Shearer" LangString name_s2_sub3 ${LANG_GERMAN} "Wise Guys" -LangString name_section3 ${LANG_GERMAN} "Designs" LangString DESC_Section1 ${LANG_GERMAN} "Dies sind die von UltraStar Deluxe benötigten Grunddateien" LangString DESC_Section2 ${LANG_GERMAN} "Hier können Songs zum Installieren gewählt werden." LangString DESC_Section2_sub1 ${LANG_GERMAN} "Hier können Jonathan Coulton Songs (CC by-nc 3.0) zum Installieren gewählt werden." LangString DESC_Section2_sub2 ${LANG_GERMAN} "Hier können Shearer Songs (CC by-nc-sa 2.0 / 3.0) zum Installieren gewählt werden." LangString DESC_Section2_sub3 ${LANG_GERMAN} "Hier können Wise Guys Songs zum Installieren gewählt werden." -LangString DESC_Section3 ${LANG_GERMAN} "Hier können alternative Motive zum Installieren gewählt werden." LangString DESC_g2Section2 ${LANG_GERMAN} "Installiert das Lied 'Dead Smiling Pirates - I 18' (CC by-nc-nd 2.5)." LangString DESC_g2Section3 ${LANG_GERMAN} "Installiert das Lied 'Joshua Morin - On The Run' (CC by-sa 2.5)." @@ -118,11 +117,4 @@ LangString DESC_s2_sub2_Section9 ${LANG_GERMAN} "Installiert das Lied 'Stay with LangString DESC_s2_sub3_Section1 ${LANG_GERMAN} "Installiert das Lied 'Lebendig und kräftig und schärfer'." LangString DESC_s2_sub3_Section2 ${LANG_GERMAN} "Installiert das Lied 'Mensch, wo bist du?'." - -LangString DESC_g3Section1 ${LANG_GERMAN} "Installiert das Motiv 'Orange' von Skar" -LangString DESC_g3Section2 ${LANG_GERMAN} "Installiert das Motiv 'Streetlight' von Skar" -LangString DESC_g3Section3 ${LANG_GERMAN} "Installiert das Motiv 'Vistar' von Skar" -LangString DESC_g3Section4 ${LANG_GERMAN} "Installiert das Motiv 'BlueSensation v5.1' von Charis" -LangString DESC_g3Section6 ${LANG_GERMAN} "Installiert das Motiv 'WiiStar' von MasterPhW" -LangString DESC_g3Section7 ${LANG_GERMAN} "Installiert das Motiv 'iStar' von MezzoX" -LangString DESC_g3Section5 ${LANG_GERMAN} "Installiert das Motiv 'WhiteSensation' von Charis" \ No newline at end of file +LangString DESC_s2_sub3_Section3 ${LANG_GERMAN} "Installiert das Lied 'Mensch, wo bist du? (Karaoke)'." \ No newline at end of file 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 diff --git a/installer/uninstall.ico b/installer/uninstall.ico new file mode 100644 index 00000000..1c72432a Binary files /dev/null and b/installer/uninstall.ico differ -- 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/UltraStar Deluxe.nsi | 5 ++ installer/languages/English.nsh | 2 - installer/languages/Hungarian.nsh | 122 +++++++++++++++++++++++++++++++ installer/languages/translations.txt | 16 +++++ installer/settings/settings-1038.ini | 136 +++++++++++++++++++++++++++++++++++ 5 files changed, 279 insertions(+), 2 deletions(-) create mode 100644 installer/languages/Hungarian.nsh create mode 100644 installer/languages/translations.txt create mode 100644 installer/settings/settings-1038.ini (limited to 'installer') diff --git a/installer/UltraStar Deluxe.nsi b/installer/UltraStar Deluxe.nsi index 28d1400e..5be85f33 100644 --- a/installer/UltraStar Deluxe.nsi +++ b/installer/UltraStar Deluxe.nsi @@ -20,6 +20,9 @@ !define path_images ".\dependencies\images" !define path_plugins ".\dependencies\plugins" +; MultiLanguage - Show all languages: +!define MUI_LANGDLL_ALLLANGUAGES + !addPluginDir "${path_plugins}\" !include "${path_settings}\variables.nsh" @@ -1316,6 +1319,7 @@ SectionEnd !insertmacro MUI_LANGUAGE "English" !insertmacro MUI_LANGUAGE "German" +!insertmacro MUI_LANGUAGE "Hungarian" !insertmacro MUI_RESERVEFILE_LANGDLL @@ -1373,6 +1377,7 @@ done: !insertmacro INSTALLOPTIONS_EXTRACT_AS ".\settings\settings-1031.ini" "Settings-1031" !insertmacro INSTALLOPTIONS_EXTRACT_AS ".\settings\settings-1033.ini" "Settings-1033" + !insertmacro INSTALLOPTIONS_EXTRACT_AS ".\settings\settings-1038.ini" "Settings-1038" FunctionEnd diff --git a/installer/languages/English.nsh b/installer/languages/English.nsh index 5d57a420..8dd243f4 100644 --- a/installer/languages/English.nsh +++ b/installer/languages/English.nsh @@ -26,10 +26,8 @@ LangString update_check_failed ${LANG_ENGLISH} "The check for a new version fail LangString page_welcome_title_update ${LANG_ENGLISH} "Welcome to the UltraStar Deluxe Update Wizard" LangString page_welcome_txt_update ${LANG_ENGLISH} "This wizard will guide you through the Update process of UltraStar Deluxe. UltraStar Deluxe is a free open source Karaoke game, which can be compared with Singstar.$\n$\r$\n$\rThe UltraStar Deluxe Team wishes you fun.$\n$\rProject website: http://www.ultrastardeluxe.org$\n$\rSupport Forum: http://forum.ultrastardeluxe.org" - LangString page_welcome_title ${LANG_ENGLISH} "Welcome to the UltraStar Deluxe Setup Wizard" LangString page_welcome_txt ${LANG_ENGLISH} "This wizard will guide you through the Installation of UltraStar Deluxe. UltraStar Deluxe is a free open source Karaoke game, which can be compared with Singstar.$\n$\r$\n$\rThe UltraStar Deluxe Team wishes you fun.$\n$\rProject website: http://www.ultrastardeluxe.org$\n$\rSupport Forum: http://forum.ultrastardeluxe.org" - LangString page_un_welcome_title ${LANG_ENGLISH} "Welcome to the UltraStar Deluxe uninstall wizard" ; Components Page: diff --git a/installer/languages/Hungarian.nsh b/installer/languages/Hungarian.nsh new file mode 100644 index 00000000..476554a7 --- /dev/null +++ b/installer/languages/Hungarian.nsh @@ -0,0 +1,122 @@ +; ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ +; UltraStar Deluxe Installer - Language file: Hungarian +; ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ +; Translation by Gergely BOR . + +LangString abort_install ${LANG_HUNGARIAN} "Biztosan megszakítja a telepítést?" +LangString abort_uninstall ${LANG_HUNGARIAN} "Biztosan megszakítja a program eltávolítását?" +LangString oninit_running ${LANG_HUNGARIAN} "A telepítés már folyamatban van." +LangString oninit_installagain ${LANG_HUNGARIAN} "Biztos abban, hogy még egyszer telepíteni szeretné?" +LangString oninit_alreadyinstalled ${LANG_HUNGARIAN} "már telepítve van" +LangString oninit_closeusdx ${LANG_HUNGARIAN} "nem eltávolítható, ha még fut! Kívánja a program bezárását?" +LangString oninit_updateusdx ${LANG_HUNGARIAN} "Kívánja-e a programot frissíteni erről a helyről:" + +LangString update_connect ${LANG_HUNGARIAN} "Új verzió keresése az interneten" +LangString button_next ${LANG_HUNGARIAN} "Tovább >" +LangString button_close ${LANG_HUNGARIAN} "Bezárás" +LangString update_information ${LANG_HUNGARIAN} "Ellenőrizheti, hogy van-e új 'UltraStar Deluxe'-verzió. Ehhez internetkapcsolat szükséges. Ha van új verzió, az ezt követően telepíthető." +LangString delete_all ${LANG_HUNGARIAN} "Töröljük a dalokat, a pontszámokat és a borítókat is?" + +LangString update_check_older ${LANG_HUNGARIAN} "Az Ön gépén telepített verziónál ($R0) van már újabb ($1). Kívánja frissíteni?" +LangString update_check_equal ${LANG_HUNGARIAN} "Az Ön gépén a legfrissebb verzió ($R0) van telepítve. Frissítés nem szükséges." +LangString update_check_newer ${LANG_HUNGARIAN} "Az Ön gépén telepített verzió ($R0) frissebb, mint a jelenlegi kiadás ($1). Frissítés nem szükséges." +LangString update_check_failed ${LANG_HUNGARIAN} "Az ellenőrzés sikertelen. Kívánja betölteni a program weboldalát, hogy ellenőrizhesse hogy van-e frissítés?" + +; Welcome Page: + +LangString page_welcome_title_update ${LANG_HUNGARIAN} "Üdvözli Önt az UltraStar Deluxe frissítési varázslója!" +LangString page_welcome_txt_update ${LANG_HUNGARIAN} "Ez a varázsló végigvezeti Önt az UltraStar Deluxe frissítési folyamatán. Az UltraStar Deluxe egy ingyenes és szabad karaokeprogram, olyan mint a Singstar.$\n$\r$\n$\rAz UltraStar Deluxe csapata jó szórakozást kíván!$\n$\rA projekt weboldala: http://www.ultrastardeluxe.org/$\n$\rTámogatás a fórumunkon: http://forum.ultrastardeluxe.org/" +LangString page_welcome_title ${LANG_HUNGARIAN} "Üdvözli Önt az UltraStar Deluxe telepítési varázslója!" +LangString page_welcome_txt ${LANG_HUNGARIAN} "Ez a varázsló végigvezeti Önt az UltraStar Deluxe telepítési folyamatán. Az UltraStar Deluxe egy ingyenes és szabad karaokeprogram, olyan mint a Singstar.$\n$\r$\n$\rAz UltraStar Deluxe csapata jó szórakozást kíván!$\n$\rA projekt weboldala: http://www.ultrastardeluxe.org/$\n$\rTámogatás a fórumunkon: http://forum.ultrastardeluxe.org/" +LangString page_un_welcome_title ${LANG_HUNGARIAN} "Üdvözli Önt az UltraStar Deluxe eltávolítási varázslója!" + +; Components Page: + +LangString page_components_info ${LANG_HUNGARIAN} "Részletes információért vigye az egeret a komponens fölé" + +; Custom Page + +LangString page_settings_fullscreen ${LANG_HUNGARIAN} "Teljes képernyős üzemmód" +LangString page_settings_subtitle ${LANG_HUNGARIAN} "Adja meg a kedvenc UltraStar Deluxe-beállítását." + +; Finish Page: + +LangString page_finish_txt ${LANG_HUNGARIAN} "Az UltraStar Deluxe telepítése sikeresen befejeződött.$\n$\r$\n$\rHa kíváncsi a legfrissebb hírekre és frissítésekre, kérjük látogassa meg projektünk weboldalát." +LangString page_finish_linktxt ${LANG_HUNGARIAN} "A projekt weboldala" +LangString page_finish_desktop ${LANG_HUNGARIAN} "Tegyünk egy parancsikont az asztalra?" + +; Start Menu and Shortcuts + +LangString sm_shortcut ${LANG_HUNGARIAN} "UltraStar Deluxe karaoke" +LangString sm_uninstall ${LANG_HUNGARIAN} "Eltávolítás" +LangString sm_website ${LANG_HUNGARIAN} "Weboldal" +LangString sm_license ${LANG_HUNGARIAN} "Licensz" +LangString sm_readme ${LANG_HUNGARIAN} "OlvassEl" +LangString sm_songs ${LANG_HUNGARIAN} "Dalok" +LangString sm_documentation ${LANG_HUNGARIAN} "Dokumentáció" + +LangString sc_play ${LANG_HUNGARIAN} "Játék" +LangString sc_desktop ${LANG_HUNGARIAN} "Tegyünk egy parancsikont az asztalra?" + +; Sections and SectionGroups + +LangString name_section1 ${LANG_HUNGARIAN} "Fő komponensek" +LangString name_section2 ${LANG_HUNGARIAN} "Dalok" +LangString name_s2_sub1 ${LANG_HUNGARIAN} "Jonathan Coulton" +LangString name_s2_sub2 ${LANG_HUNGARIAN} "Shearer" +LangString name_s2_sub3 ${LANG_HUNGARIAN} "Wise Guys" + +LangString DESC_Section1 ${LANG_HUNGARIAN} "Azok a fájlok, melyek mindenképpen szükségesek az UltraStar Deluxe futtatásához." +LangString DESC_Section2 ${LANG_HUNGARIAN} "Kiválaszthatja, hogy milyen dalok legyenek telepítve." +LangString DESC_Section2_sub1 ${LANG_HUNGARIAN} "Kiválaszthatja, hogy mely Jonathan Coulton-dalok (CC by-nc 3.0) legyenek telepítve." +LangString DESC_Section2_sub2 ${LANG_HUNGARIAN} "Kiválaszthatja, hogy mely Shearer-dalok (CC by-nc-sa 2.0 / 3.0) legyenek telepítve." +LangString DESC_Section2_sub3 ${LANG_HUNGARIAN} "Kiválaszthatja, hogy mely Wise Guys-dalok legyenek telepítve." +LangString DESC_Section3 ${LANG_HUNGARIAN} "Kiválaszthatja, hogy milyen témák legyenek telepítve. A témák használatával a program grafikai megjelenése változik meg. A témák telepítése nem kötelező." + +LangString DESC_g2Section2 ${LANG_HUNGARIAN} "Telepítésre kerül a 'Dead Smiling Pirates - I 18' (CC by-nc-nd 2.5) címu dal." +LangString DESC_g2Section3 ${LANG_HUNGARIAN} "Telepítésre kerül a 'Joshua Morin - On The Run' (CC by-sa 2.5) címu dal." +LangString DESC_g2Section4 ${LANG_HUNGARIAN} "Telepítésre kerül a 'Pornophonique - Space Invaders' (CC by-nc-nd 2.0) címu dal." +LangString DESC_g2Section5 ${LANG_HUNGARIAN} "Telepítésre kerül a 'Steven Dunston - Northern Star' (CC by-nc-sa 2.5) címu dal." +LangString DESC_g2Section1 ${LANG_HUNGARIAN} "Telepítésre kerül a 'Bodo Wartke - Liebeslied (Love Song)' címu dal." + +LangString DESC_s2_sub1_Section1 ${LANG_HUNGARIAN} "Telepítésre kerül a 'Monkey Shines' címu dal." +LangString DESC_s2_sub1_Section2 ${LANG_HUNGARIAN} "Telepítésre kerül a 'I Crush Everything' címu dal." +LangString DESC_s2_sub1_Section3 ${LANG_HUNGARIAN} "Telepítésre kerül a 'Not About You'." +LangString DESC_s2_sub1_Section4 ${LANG_HUNGARIAN} "Telepítésre kerül a 'Mr. Fancy Pants' címu dal." +LangString DESC_s2_sub1_Section5 ${LANG_HUNGARIAN} "Telepítésre kerül a 'Big Bad World One' címu dal." +LangString DESC_s2_sub1_Section6 ${LANG_HUNGARIAN} "Telepítésre kerül a 'Flickr' címu dal (videóval)." +LangString DESC_s2_sub1_Section7 ${LANG_HUNGARIAN} "Telepítésre kerül a 'My Beige Bear' címu dal." +LangString DESC_s2_sub1_Section8 ${LANG_HUNGARIAN} "Telepítésre kerül a 'The Future Soon' címu dal." +LangString DESC_s2_sub1_Section9 ${LANG_HUNGARIAN} "Telepítésre kerül a 'Ikea' címu dal." +LangString DESC_s2_sub1_Section10 ${LANG_HUNGARIAN} "Telepítésre kerül a 'Furry Old Lobster' címu dal." +LangString DESC_s2_sub1_Section11 ${LANG_HUNGARIAN} "Telepítésre kerül a 'Code Monkey' címu dal (videóval)." +LangString DESC_s2_sub1_Section12 ${LANG_HUNGARIAN} "Telepítésre kerül a 'I'm Your Moon' címu dal." +LangString DESC_s2_sub1_Section13 ${LANG_HUNGARIAN} "Telepítésre kerül a 'First Of May' címu dal." +LangString DESC_s2_sub1_Section14 ${LANG_HUNGARIAN} "Telepítésre kerül a 'Dance, Soterios Johnson, Dance' címu dal." +LangString DESC_s2_sub1_Section15 ${LANG_HUNGARIAN} "Telepítésre kerül a 'A Talk With George' címu dal." +LangString DESC_s2_sub1_Section16 ${LANG_HUNGARIAN} "Telepítésre kerül a 'Creepy Doll' címu dal (videóval)." +LangString DESC_s2_sub1_Section17 ${LANG_HUNGARIAN} "Telepítésre kerül a 'That Spells DNA' címu dal." +LangString DESC_s2_sub1_Section18 ${LANG_HUNGARIAN} "Telepítésre kerül a 'When You Go' címu dal." +LangString DESC_s2_sub1_Section19 ${LANG_HUNGARIAN} "Telepítésre kerül a 'Better' címu dal." +LangString DESC_s2_sub1_Section20 ${LANG_HUNGARIAN} "Telepítésre kerül a 'Shop Vac' címu dal." +LangString DESC_s2_sub1_Section21 ${LANG_HUNGARIAN} "Telepítésre kerül a 'I Feel Fantastic' címu dal." +LangString DESC_s2_sub1_Section22 ${LANG_HUNGARIAN} "Telepítésre kerül a 'Re: Your Brains' címu dal." +LangString DESC_s2_sub1_Section23 ${LANG_HUNGARIAN} "Telepítésre kerül a 'Skullcrusher Mountain' címu dal." +LangString DESC_s2_sub1_Section24 ${LANG_HUNGARIAN} "Telepítésre kerül a 'Chiron Beta Prime' címu dal (videóval)." + +LangString DESC_s2_sub2_Section1 ${LANG_HUNGARIAN} "Telepítésre kerül a '69' címu dal." +LangString DESC_s2_sub2_Section2 ${LANG_HUNGARIAN} "Telepítésre kerül a '69 (Karaoke)' címu dal." +LangString DESC_s2_sub2_Section3 ${LANG_HUNGARIAN} "Telepítésre kerül a 'Can't stop it' címu dal." +LangString DESC_s2_sub2_Section4 ${LANG_HUNGARIAN} "Telepítésre kerül a 'Can't stop it (Karaoke)' címu dal." +LangString DESC_s2_sub2_Section5 ${LANG_HUNGARIAN} "Telepítésre kerül a 'In My Hand' címu dal." +LangString DESC_s2_sub2_Section6 ${LANG_HUNGARIAN} "Telepítésre kerül a 'Man Song' címu dal." +LangString DESC_s2_sub2_Section7 ${LANG_HUNGARIAN} "Telepítésre kerül a 'Man Song (Karaoke)' címu dal." +LangString DESC_s2_sub2_Section8 ${LANG_HUNGARIAN} "Telepítésre kerül a 'Stay with me' címu dal." +LangString DESC_s2_sub2_Section9 ${LANG_HUNGARIAN} "Telepítésre kerül a 'Stay with me (Karaoke)' címu dal." + +LangString DESC_s2_sub3_Section1 ${LANG_HUNGARIAN} "Telepítésre kerül a 'Lebendig und kräftig und schärfer' címu dal." +LangString DESC_s2_sub3_Section2 ${LANG_HUNGARIAN} "Telepítésre kerül a 'Mensch, wo bist du?' címu dal." +LangString DESC_s2_sub3_Section3 ${LANG_HUNGARIAN} "Telepítésre kerül a 'Mensch, wo bist du? (Karaoke)' címu dal." + +; Optional Themes +; (not available) \ No newline at end of file diff --git a/installer/languages/translations.txt b/installer/languages/translations.txt new file mode 100644 index 00000000..9d5946e8 --- /dev/null +++ b/installer/languages/translations.txt @@ -0,0 +1,16 @@ +; ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ +; How to translate the installer into your own language? +; ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ + +If you want to translate the installer, just: + +- Take English.nsh and edit each variabe within the "" + +- Replace LANG_ENGLISH with the name of your language (in english). + +Please also edit the following file +for translating the settings screen: + +..\settings\settings-1033.ini + +Thanks for your help in advance! \ No newline at end of file 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/UltraStar Deluxe.nsi | 38 +++--- installer/languages/German.nsh | 106 ++++++++-------- 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 +++++++++++++++++------------- 6 files changed, 406 insertions(+), 338 deletions(-) (limited to 'installer') diff --git a/installer/UltraStar Deluxe.nsi b/installer/UltraStar Deluxe.nsi index 5be85f33..c7fe26ab 100644 --- a/installer/UltraStar Deluxe.nsi +++ b/installer/UltraStar Deluxe.nsi @@ -151,9 +151,10 @@ Page custom Settings Function Settings -!insertmacro MUI_HEADER_TEXT " " "$(page_settings_subtitle)" +!insertmacro INSTALLOPTIONS_WRITE "Settings-$LANGUAGE" "Field 18" "State" "$INSTDIR\songs" - !insertmacro INSTALLOPTIONS_DISPLAY "Settings-$LANGUAGE" +!insertmacro MUI_HEADER_TEXT " " "$(page_settings_subtitle)" +!insertmacro INSTALLOPTIONS_DISPLAY "Settings-$LANGUAGE" ; Get all the variables: @@ -164,13 +165,15 @@ var /GLOBAL fullscreen var /GLOBAL language2 var /GLOBAL resolution var /GLOBAL tabs -var /GLOBAL animations +var /GLOBAL sorting +var /GLOBAL songdir - !insertmacro INSTALLOPTIONS_READ $fullscreen "Settings-$LANGUAGE" "Field 6" "State" - !insertmacro INSTALLOPTIONS_READ $language2 "Settings-$LANGUAGE" "Field 7" "State" - !insertmacro INSTALLOPTIONS_READ $resolution "Settings-$LANGUAGE" "Field 8" "State" - !insertmacro INSTALLOPTIONS_READ $tabs "Settings-$LANGUAGE" "Field 9" "State" - !insertmacro INSTALLOPTIONS_READ $animations "Settings-$LANGUAGE" "Field 10" "State" + !insertmacro INSTALLOPTIONS_READ $fullscreen "Settings-$LANGUAGE" "Field 5" "State" + !insertmacro INSTALLOPTIONS_READ $language2 "Settings-$LANGUAGE" "Field 6" "State" + !insertmacro INSTALLOPTIONS_READ $resolution "Settings-$LANGUAGE" "Field 7" "State" + !insertmacro INSTALLOPTIONS_READ $tabs "Settings-$LANGUAGE" "Field 8" "State" + !insertmacro INSTALLOPTIONS_READ $sorting "Settings-$LANGUAGE" "Field 15" "State" + !insertmacro INSTALLOPTIONS_READ $songdir "Settings-$LANGUAGE" "Field 18" "State" ; Write all variables to config.ini @@ -190,26 +193,14 @@ StrCpy $path_configini "$path_config\config.ini" ${WriteToConfig} "[Game]$\r$\n" "$path_configini" ${WriteToConfig} "Language=$language2$\r$\n" "$path_configini" ${WriteToConfig} "Tabs=$tabs$\r$\n" "$path_configini" +${WriteToConfig} "Sorting=$sorting$\r$\n" "$path_configini" ${WriteToConfig} "[Graphics]$\r$\n" "$path_configini" ${WriteToConfig} "FullScreen=$fullscreen$\r$\n" "$path_configini" ${WriteToConfig} "Resolution=$resolution$\r$\n" "$path_configini" -${WriteToConfig} "[Sound]$\r$\n" "$path_configini" -${WriteToConfig} "PreviewFading=3 Secs$\r$\n" "$path_configini" - -; Animations On / Off Tasks - -${If} $animations == "Off" -${WriteToConfig} "[Advanced]$\r$\n" "$path_configini" -${WriteToConfig} "LoadAnimation=Off$\r$\n" "$path_configini" -${WriteToConfig} "EffectSing=Off$\r$\n" "$path_configini" -${WriteToConfig} "ScreenFade=Off$\r$\n" "$path_configini" -${EndIf} - -${WriteToConfig} "[Lyrics]$\r$\n" "$path_configini" -${WriteToConfig} "LyricsFont=Plain$\r$\n" "$path_configini" -${WriteToConfig} "LyricsEffect=Slide$\r$\n" "$path_configini" +${WriteToConfig} "[Directories]$\r$\n" "$path_configini" +${WriteToConfig} "SongDir2=$songdir$\r$\n" "$path_configini" FunctionEnd ; Settings page End @@ -1379,6 +1370,7 @@ done: !insertmacro INSTALLOPTIONS_EXTRACT_AS ".\settings\settings-1033.ini" "Settings-1033" !insertmacro INSTALLOPTIONS_EXTRACT_AS ".\settings\settings-1038.ini" "Settings-1038" + FunctionEnd Function un.onInit diff --git a/installer/languages/German.nsh b/installer/languages/German.nsh index d6a72a9a..fb7ddeb4 100644 --- a/installer/languages/German.nsh +++ b/installer/languages/German.nsh @@ -2,13 +2,13 @@ ; UltraStar Deluxe Installer - Language file: German ; ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ -LangString abort_install ${LANG_GERMAN} "Wollen Sie die Installation wirklich abbrechen?" -LangString abort_uninstall ${LANG_GERMAN} "Wollen Sie die Deinstallation wirklich abbrechen?" +LangString abort_install ${LANG_GERMAN} "Willst du die Installation wirklich abbrechen?" +LangString abort_uninstall ${LANG_GERMAN} "Willst du die Deinstallation wirklich abbrechen?" LangString oninit_running ${LANG_GERMAN} "Die Installation wird bereits ausgeführt." -LangString oninit_installagain ${LANG_GERMAN} "Sind Sie sicher, dass Sie es erneut installieren möchten?" +LangString oninit_installagain ${LANG_GERMAN} "Bist du sicher, dass du es erneut installieren möchtest?" LangString oninit_alreadyinstalled ${LANG_GERMAN} "ist bereits installiert" LangString oninit_closeusdx ${LANG_GERMAN} "kann nicht während der Laufzeit deinstalliert werden. Soll es geschlossen werden?" -LangString oninit_updateusdx ${LANG_GERMAN} "Möchten Sie das Programm aktualisieren von" +LangString oninit_updateusdx ${LANG_GERMAN} "Möchtest du das Programm aktualisieren von" LangString update_connect ${LANG_GERMAN} "Mit dem Internet verbinden und nach aktueller Version suchen" LangString button_next ${LANG_GERMAN} "Weiter >" @@ -25,16 +25,16 @@ LangString update_check_failed ${LANG_GERMAN} "Die Aktualisierungspr ; Welcome Page: LangString page_welcome_title_update ${LANG_GERMAN} "Willkommen beim Aktualisierungsassistenten von UltraStar Deluxe" -LangString page_welcome_txt_update ${LANG_GERMAN} "Dieser Assistent wird Sie durch die Aktualisierung von UltraStar Deluxe begleiten. UltraStar Deluxe ist ein kostenloses quelloffenes Karaokespiel, welches Singstar ähnelt. $\n$\r$\n$\rDas UltraStar Deluxe Team wünscht viel Spaß.$\n$\rProjekthomepage: http://www.ultrastardeluxe.org$\n$\rSupport Forum: http://forum.ultrastardeluxe.org" +LangString page_welcome_txt_update ${LANG_GERMAN} "Dieser Assistent wird dich durch die Aktualisierung von UltraStar Deluxe begleiten. UltraStar Deluxe ist ein kostenloses quelloffenes Karaokespiel, welches Singstar ähnelt. $\n$\r$\n$\rDas UltraStar Deluxe Team wünscht viel Spaß.$\n$\rProjekthomepage: http://www.ultrastardeluxe.org$\n$\rSupport Forum: http://forum.ultrastardeluxe.org" LangString page_welcome_title ${LANG_GERMAN} "Willkommen zur Installationsroutine von UltraStar Deluxe" -LangString page_welcome_txt ${LANG_GERMAN} "Dieser Assistent wird Sie durch die Installation von UltraStar Deluxe begleiten. UltraStar Deluxe ist ein kostenloses quelloffenes Karaokespiel, welches Singstar ähnelt. $\n$\r$\n$\rDas UltraStar Deluxe Team wünscht viel Spaß.$\n$\rProjekthomepage: http://www.ultrastardeluxe.org$\n$\rSupport Forum: http://forum.ultrastardeluxe.org" +LangString page_welcome_txt ${LANG_GERMAN} "Dieser Assistent wird dich durch die Installation von UltraStar Deluxe begleiten. UltraStar Deluxe ist ein kostenloses quelloffenes Karaokespiel, welches Singstar ähnelt. $\n$\r$\n$\rDas UltraStar Deluxe Team wünscht viel Spaß.$\n$\rProjekthomepage: http://www.ultrastardeluxe.org$\n$\rSupport Forum: http://forum.ultrastardeluxe.org" LangString page_un_welcome_title ${LANG_GERMAN} "Willkommen zur Deinstallation von UltraStar Deluxe" ; Components Page: -LangString page_components_info ${LANG_GERMAN} "Schieben Sie den Mauszeiger über die Komponente um Details einzusehen" +LangString page_components_info ${LANG_GERMAN} "Schiebe den Mauszeiger über die Komponente um Details einzusehen" ; Custom Page @@ -43,7 +43,7 @@ LangString page_settings_subtitle ${LANG_GERMAN} "Lege deine favorisierten Einst ; Finish Page: -LangString page_finish_txt ${LANG_GERMAN} "UltraStar Deluxe wurde erfolgreich auf Ihrem System installiert.$\n$\r$\n$\rBesuchen Sie unsere Projektwebseite um die neusten Updates und News zu erhalten." +LangString page_finish_txt ${LANG_GERMAN} "UltraStar Deluxe wurde erfolgreich auf Ihrem System installiert.$\n$\r$\n$\rBesuche unsere Projektwebseite um die neusten Updates und News zu erhalten." LangString page_finish_linktxt ${LANG_GERMAN} "Projektwebseite" LangString page_finish_desktop ${LANG_GERMAN} "Verknüpfung auf dem Desktop erstellen?" @@ -69,52 +69,52 @@ LangString name_s2_sub2 ${LANG_GERMAN} "Shearer" LangString name_s2_sub3 ${LANG_GERMAN} "Wise Guys" LangString DESC_Section1 ${LANG_GERMAN} "Dies sind die von UltraStar Deluxe benötigten Grunddateien" -LangString DESC_Section2 ${LANG_GERMAN} "Hier können Songs zum Installieren gewählt werden." +LangString DESC_Section2 ${LANG_GERMAN} "Hier können Songs zum Herunterladen gewählt werden." LangString DESC_Section2_sub1 ${LANG_GERMAN} "Hier können Jonathan Coulton Songs (CC by-nc 3.0) zum Installieren gewählt werden." LangString DESC_Section2_sub2 ${LANG_GERMAN} "Hier können Shearer Songs (CC by-nc-sa 2.0 / 3.0) zum Installieren gewählt werden." LangString DESC_Section2_sub3 ${LANG_GERMAN} "Hier können Wise Guys Songs zum Installieren gewählt werden." -LangString DESC_g2Section2 ${LANG_GERMAN} "Installiert das Lied 'Dead Smiling Pirates - I 18' (CC by-nc-nd 2.5)." -LangString DESC_g2Section3 ${LANG_GERMAN} "Installiert das Lied 'Joshua Morin - On The Run' (CC by-sa 2.5)." -LangString DESC_g2Section4 ${LANG_GERMAN} "Installiert das Lied 'Pornophonique - Space Invaders' (CC by-nc-nd 2.0)." -LangString DESC_g2Section5 ${LANG_GERMAN} "Installiert das Lied 'Steven Dunston - Northern Star' (CC by-nc-sa 2.5)." -LangString DESC_g2Section1 ${LANG_GERMAN} "Installiert das Lied 'Bodo Wartke - Liebeslied (Love Song)'." - -LangString DESC_s2_sub1_Section1 ${LANG_GERMAN} "Installiert das Lied 'Monkey Shines'." -LangString DESC_s2_sub1_Section2 ${LANG_GERMAN} "Installiert das Lied 'I Crush Everything'." -LangString DESC_s2_sub1_Section3 ${LANG_GERMAN} "Installiert das Lied 'Not About You'." -LangString DESC_s2_sub1_Section4 ${LANG_GERMAN} "Installiert das Lied 'Mr. Fancy Pants'." -LangString DESC_s2_sub1_Section5 ${LANG_GERMAN} "Installiert das Lied 'Big Bad World One'." -LangString DESC_s2_sub1_Section6 ${LANG_GERMAN} "Installiert das Lied 'Flickr [inkl. Video]'." -LangString DESC_s2_sub1_Section7 ${LANG_GERMAN} "Installiert das Lied 'My Beige Bear'." -LangString DESC_s2_sub1_Section8 ${LANG_GERMAN} "Installiert das Lied 'The Future Soon'." -LangString DESC_s2_sub1_Section9 ${LANG_GERMAN} "Installiert das Lied 'Ikea'." -LangString DESC_s2_sub1_Section10 ${LANG_GERMAN} "Installiert das Lied 'Furry Old Lobster'." -LangString DESC_s2_sub1_Section11 ${LANG_GERMAN} "Installiert das Lied 'Code Monkey [inkl. Video]'." -LangString DESC_s2_sub1_Section12 ${LANG_GERMAN} "Installiert das Lied 'I´m Your Moon'." -LangString DESC_s2_sub1_Section13 ${LANG_GERMAN} "Installiert das Lied 'First Of May'." -LangString DESC_s2_sub1_Section14 ${LANG_GERMAN} "Installiert das Lied 'Dance, Soterios Johnson, Dance'." -LangString DESC_s2_sub1_Section15 ${LANG_GERMAN} "Installiert das Lied 'A Talk With George'." -LangString DESC_s2_sub1_Section16 ${LANG_GERMAN} "Installiert das Lied 'Creepy Doll [inkl. Video]'." -LangString DESC_s2_sub1_Section17 ${LANG_GERMAN} "Installiert das Lied 'That Spells DNA'." -LangString DESC_s2_sub1_Section18 ${LANG_GERMAN} "Installiert das Lied 'When You Go'." -LangString DESC_s2_sub1_Section19 ${LANG_GERMAN} "Installiert das Lied 'Better'." -LangString DESC_s2_sub1_Section20 ${LANG_GERMAN} "Installiert das Lied 'Shop Vac'." -LangString DESC_s2_sub1_Section21 ${LANG_GERMAN} "Installiert das Lied 'I Feel Fantastic'." -LangString DESC_s2_sub1_Section22 ${LANG_GERMAN} "Installiert das Lied 'Re: Your Brains'." -LangString DESC_s2_sub1_Section23 ${LANG_GERMAN} "Installiert das Lied 'Skullcrusher Mountain'." -LangString DESC_s2_sub1_Section24 ${LANG_GERMAN} "Installiert das Lied 'Chiron Beta Prime [inkl. Video]'." - -LangString DESC_s2_sub2_Section1 ${LANG_GERMAN} "Installiert das Lied '69'." -LangString DESC_s2_sub2_Section2 ${LANG_GERMAN} "Installiert das Lied '69 (Karaoke)'." -LangString DESC_s2_sub2_Section3 ${LANG_GERMAN} "Installiert das Lied 'Can't stop it'." -LangString DESC_s2_sub2_Section4 ${LANG_GERMAN} "Installiert das Lied 'Can't stop it (Karaoke)'." -LangString DESC_s2_sub2_Section5 ${LANG_GERMAN} "Installiert das Lied 'In My Hand'." -LangString DESC_s2_sub2_Section6 ${LANG_GERMAN} "Installiert das Lied 'Man Song'." -LangString DESC_s2_sub2_Section7 ${LANG_GERMAN} "Installiert das Lied 'Man Song (Karaoke)'." -LangString DESC_s2_sub2_Section8 ${LANG_GERMAN} "Installiert das Lied 'Stay with me'." -LangString DESC_s2_sub2_Section9 ${LANG_GERMAN} "Installiert das Lied 'Stay with me (Karaoke)'." - -LangString DESC_s2_sub3_Section1 ${LANG_GERMAN} "Installiert das Lied 'Lebendig und kräftig und schärfer'." -LangString DESC_s2_sub3_Section2 ${LANG_GERMAN} "Installiert das Lied 'Mensch, wo bist du?'." -LangString DESC_s2_sub3_Section3 ${LANG_GERMAN} "Installiert das Lied 'Mensch, wo bist du? (Karaoke)'." \ No newline at end of file +LangString DESC_g2Section2 ${LANG_GERMAN} "Lädt das Lied 'Dead Smiling Pirates - I 18' (CC by-nc-nd 2.5) herunter." +LangString DESC_g2Section3 ${LANG_GERMAN} "Lädt das Lied 'Joshua Morin - On The Run' (CC by-sa 2.5) herunter." +LangString DESC_g2Section4 ${LANG_GERMAN} "Lädt das Lied 'Pornophonique - Space Invaders' (CC by-nc-nd 2.0) herunter." +LangString DESC_g2Section5 ${LANG_GERMAN} "Lädt das Lied 'Steven Dunston - Northern Star' (CC by-nc-sa 2.5) herunter." +LangString DESC_g2Section1 ${LANG_GERMAN} "Lädt das Lied 'Bodo Wartke - Liebeslied (Love Song)' herunter." + +LangString DESC_s2_sub1_Section1 ${LANG_GERMAN} "Lädt das Lied 'Monkey Shines' herunter." +LangString DESC_s2_sub1_Section2 ${LANG_GERMAN} "Lädt das Lied 'I Crush Everything' herunter." +LangString DESC_s2_sub1_Section3 ${LANG_GERMAN} "Lädt das Lied 'Not About You' herunter." +LangString DESC_s2_sub1_Section4 ${LANG_GERMAN} "Lädt das Lied 'Mr. Fancy Pants' herunter." +LangString DESC_s2_sub1_Section5 ${LANG_GERMAN} "Lädt das Lied 'Big Bad World One' herunter." +LangString DESC_s2_sub1_Section6 ${LANG_GERMAN} "Lädt das Lied 'Flickr [inkl. Video]' herunter." +LangString DESC_s2_sub1_Section7 ${LANG_GERMAN} "Lädt das Lied 'My Beige Bear' herunter." +LangString DESC_s2_sub1_Section8 ${LANG_GERMAN} "Lädt das Lied 'The Future Soon' herunter." +LangString DESC_s2_sub1_Section9 ${LANG_GERMAN} "Lädt das Lied 'Ikea' herunter." +LangString DESC_s2_sub1_Section10 ${LANG_GERMAN} "Lädt das Lied 'Furry Old Lobster' herunter." +LangString DESC_s2_sub1_Section11 ${LANG_GERMAN} "Lädt das Lied 'Code Monkey [inkl. Video]' herunter." +LangString DESC_s2_sub1_Section12 ${LANG_GERMAN} "Lädt das Lied 'I´m Your Moon' herunter." +LangString DESC_s2_sub1_Section13 ${LANG_GERMAN} "Lädt das Lied 'First Of May' herunter." +LangString DESC_s2_sub1_Section14 ${LANG_GERMAN} "Lädt das Lied 'Dance, Soterios Johnson, Dance' herunter." +LangString DESC_s2_sub1_Section15 ${LANG_GERMAN} "Lädt das Lied 'A Talk With George' herunter." +LangString DESC_s2_sub1_Section16 ${LANG_GERMAN} "Lädt das Lied 'Creepy Doll [inkl. Video]' herunter." +LangString DESC_s2_sub1_Section17 ${LANG_GERMAN} "Lädt das Lied 'That Spells DNA' herunter." +LangString DESC_s2_sub1_Section18 ${LANG_GERMAN} "Lädt das Lied 'When You Go' herunter." +LangString DESC_s2_sub1_Section19 ${LANG_GERMAN} "Lädt das Lied 'Better' herunter." +LangString DESC_s2_sub1_Section20 ${LANG_GERMAN} "Lädt das Lied 'Shop Vac' herunter." +LangString DESC_s2_sub1_Section21 ${LANG_GERMAN} "Lädt das Lied 'I Feel Fantastic' herunter." +LangString DESC_s2_sub1_Section22 ${LANG_GERMAN} "Lädt das Lied 'Re: Your Brains' herunter." +LangString DESC_s2_sub1_Section23 ${LANG_GERMAN} "Lädt das Lied 'Skullcrusher Mountain' herunter." +LangString DESC_s2_sub1_Section24 ${LANG_GERMAN} "Lädt das Lied 'Chiron Beta Prime [inkl. Video]' herunter." + +LangString DESC_s2_sub2_Section1 ${LANG_GERMAN} "Lädt das Lied '69' herunter." +LangString DESC_s2_sub2_Section2 ${LANG_GERMAN} "Lädt das Lied '69 (Karaoke)' herunter." +LangString DESC_s2_sub2_Section3 ${LANG_GERMAN} "Lädt das Lied 'Can't stop it' herunter." +LangString DESC_s2_sub2_Section4 ${LANG_GERMAN} "Lädt das Lied 'Can't stop it (Karaoke)' herunter." +LangString DESC_s2_sub2_Section5 ${LANG_GERMAN} "Lädt das Lied 'In My Hand' herunter." +LangString DESC_s2_sub2_Section6 ${LANG_GERMAN} "Lädt das Lied 'Man Song' herunter." +LangString DESC_s2_sub2_Section7 ${LANG_GERMAN} "Lädt das Lied 'Man Song (Karaoke)' herunter." +LangString DESC_s2_sub2_Section8 ${LANG_GERMAN} "Lädt das Lied 'Stay with me' herunter." +LangString DESC_s2_sub2_Section9 ${LANG_GERMAN} "Lädt das Lied 'Stay with me (Karaoke)' herunter." + +LangString DESC_s2_sub3_Section1 ${LANG_GERMAN} "Lädt das Lied 'Lebendig und kräftig und schärfer' herunter." +LangString DESC_s2_sub3_Section2 ${LANG_GERMAN} "Lädt das Lied 'Mensch, wo bist du?' herunter." +LangString DESC_s2_sub3_Section3 ${LANG_GERMAN} "Lädt das Lied 'Mensch, wo bist du? (Karaoke)' herunter." \ No newline at end of file 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/UltraStar Deluxe.nsi | 909 +------------------------------- installer/settings/files_opt_songs.nsh | 931 +++++++++++++++++++++++++++++++++ installer/settings/variables.nsh | 3 +- 3 files changed, 937 insertions(+), 906 deletions(-) create mode 100644 installer/settings/files_opt_songs.nsh (limited to 'installer') diff --git a/installer/UltraStar Deluxe.nsi b/installer/UltraStar Deluxe.nsi index c7fe26ab..e21c601f 100644 --- a/installer/UltraStar Deluxe.nsi +++ b/installer/UltraStar Deluxe.nsi @@ -225,7 +225,6 @@ nsDialogs::Create /NOUNLOAD 1018 nsDialogs::OnClick /NOUNLOAD $CHECKBOX $0 - nsDialogs::Show FunctionEnd @@ -278,9 +277,7 @@ Section $(name_section1) Section1 !include "${path_settings}\files_main_install.nsh" - ; Create Shortcuts: - SetOutPath "$INSTDIR" !insertmacro MUI_STARTMENU_WRITE_BEGIN Application @@ -318,906 +315,7 @@ SectionEnd ; OPTIONAL SONGS (Section 2) ;------------------------------------ -SectionGroup $(name_section2) Section2 - -Section /o "Bodo Wartke - Liebeslied (Love Song)" g2Section1 - - AddSize 10342 - 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 "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 "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 "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 "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 "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 - -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 - -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 - -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 + !include "${path_settings}\files_opt_songs.nsh" ;------------------------------------ ; OPTIONAL THEMES (Section 3) @@ -1255,13 +353,15 @@ SectionEnd !insertmacro MUI_DESCRIPTION_TEXT ${s2_sub1} $(DESC_Section2_sub1) !insertmacro MUI_DESCRIPTION_TEXT ${s2_sub2} $(DESC_Section2_sub2) !insertmacro MUI_DESCRIPTION_TEXT ${s2_sub3} $(DESC_Section2_sub3) -; !insertmacro MUI_DESCRIPTION_TEXT ${Section3} $(DESC_Section3) + !insertmacro MUI_DESCRIPTION_TEXT ${s2_sub4} $(DESC_Section2_sub4) +; !insertmacro MUI_DESCRIPTION_TEXT ${Section3} $(DESC_Section3) THEMES !insertmacro MUI_DESCRIPTION_TEXT ${g2Section1} $(DESC_g2Section1) !insertmacro MUI_DESCRIPTION_TEXT ${g2Section2} $(DESC_g2Section2) !insertmacro MUI_DESCRIPTION_TEXT ${g2Section3} $(DESC_g2Section3) !insertmacro MUI_DESCRIPTION_TEXT ${g2Section4} $(DESC_g2Section4) !insertmacro MUI_DESCRIPTION_TEXT ${g2Section5} $(DESC_g2Section5) + !insertmacro MUI_DESCRIPTION_TEXT ${g2Section6} $(DESC_g2Section6) !insertmacro MUI_DESCRIPTION_TEXT ${s2_sub1_Section1} $(DESC_s2_sub1_Section1) !insertmacro MUI_DESCRIPTION_TEXT ${s2_sub1_Section2} $(DESC_s2_sub1_Section2) @@ -1370,7 +470,6 @@ done: !insertmacro INSTALLOPTIONS_EXTRACT_AS ".\settings\settings-1033.ini" "Settings-1033" !insertmacro INSTALLOPTIONS_EXTRACT_AS ".\settings\settings-1038.ini" "Settings-1038" - FunctionEnd Function un.onInit 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') 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 88b765c10347e10d792b727fb4bb613cce719bf1 Mon Sep 17 00:00:00 2001 From: canni0 Date: Thu, 29 Apr 2010 16:32:22 +0000 Subject: - forgot to commit language files in rev 2282 git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@2317 b956fd51-792f-4845-bead-9b4dfca2ff2c --- installer/languages/English.nsh | 95 ++++++++++++++++++++------------------- installer/languages/German.nsh | 11 +++-- installer/languages/Hungarian.nsh | 3 ++ 3 files changed, 59 insertions(+), 50 deletions(-) (limited to 'installer') diff --git a/installer/languages/English.nsh b/installer/languages/English.nsh index 8dd243f4..c6c759b9 100644 --- a/installer/languages/English.nsh +++ b/installer/languages/English.nsh @@ -65,57 +65,60 @@ LangString name_section2 ${LANG_ENGLISH} "Songs" LangString name_s2_sub1 ${LANG_ENGLISH} "Jonathan Coulton" LangString name_s2_sub2 ${LANG_ENGLISH} "Shearer" LangString name_s2_sub3 ${LANG_ENGLISH} "Wise Guys" +LangString name_s2_sub4 ${LANG_ENGLISH} "Pornophonique" LangString DESC_Section1 ${LANG_ENGLISH} "These are the basic files needed by UltraStar Deluxe" -LangString DESC_Section2 ${LANG_ENGLISH} "You can choose which songs should be installed." +LangString DESC_Section2 ${LANG_ENGLISH} "You can choose which songs should be downloaded (Requires Internet Connection!)" LangString DESC_Section2_sub1 ${LANG_ENGLISH} "You can choose which Jonathan Coulton songs (CC by-nc 3.0) should be installed." LangString DESC_Section2_sub2 ${LANG_ENGLISH} "You can choose which Shearer songs (CC by-nc-sa 2.0 / 3.0) should be installed." LangString DESC_Section2_sub3 ${LANG_ENGLISH} "You can choose which Wise Guys songs should be installed." - -LangString DESC_g2Section2 ${LANG_ENGLISH} "This will install the song 'Dead Smiling Pirates - I 18' (CC by-nc-nd 2.5)." -LangString DESC_g2Section3 ${LANG_ENGLISH} "This will install the song 'Joshua Morin - On The Run' (CC by-sa 2.5)." -LangString DESC_g2Section4 ${LANG_ENGLISH} "This will install the song 'Pornophonique - Space Invaders' (CC by-nc-nd 2.0)." -LangString DESC_g2Section5 ${LANG_ENGLISH} "This will install the song 'Steven Dunston - Northern Star' (CC by-nc-sa 2.5)." -LangString DESC_g2Section1 ${LANG_ENGLISH} "This will install the song 'Bodo Wartke - Liebeslied (Love Song)'." - -LangString DESC_s2_sub1_Section1 ${LANG_ENGLISH} "This will install the song 'Monkey Shines'." -LangString DESC_s2_sub1_Section2 ${LANG_ENGLISH} "This will install the song 'I Crush Everything'." -LangString DESC_s2_sub1_Section3 ${LANG_ENGLISH} "This will install the song 'Not About You'." -LangString DESC_s2_sub1_Section4 ${LANG_ENGLISH} "This will install the song 'Mr. Fancy Pants'." -LangString DESC_s2_sub1_Section5 ${LANG_ENGLISH} "This will install the song 'Big Bad World One'." -LangString DESC_s2_sub1_Section6 ${LANG_ENGLISH} "This will install the song 'Flickr [incl. video]'." -LangString DESC_s2_sub1_Section7 ${LANG_ENGLISH} "This will install the song 'My Beige Bear'." -LangString DESC_s2_sub1_Section8 ${LANG_ENGLISH} "This will install the song 'The Future Soon'." -LangString DESC_s2_sub1_Section9 ${LANG_ENGLISH} "This will install the song 'Ikea'." -LangString DESC_s2_sub1_Section10 ${LANG_ENGLISH} "This will install the song 'Furry Old Lobster'." -LangString DESC_s2_sub1_Section11 ${LANG_ENGLISH} "This will install the song 'Code Monkey [incl. video]'." -LangString DESC_s2_sub1_Section12 ${LANG_ENGLISH} "This will install the song 'I´m Your Moon'." -LangString DESC_s2_sub1_Section13 ${LANG_ENGLISH} "This will install the song 'First Of May'." -LangString DESC_s2_sub1_Section14 ${LANG_ENGLISH} "This will install the song 'Dance, Soterios Johnson, Dance'." -LangString DESC_s2_sub1_Section15 ${LANG_ENGLISH} "This will install the song 'A Talk With George'." -LangString DESC_s2_sub1_Section16 ${LANG_ENGLISH} "This will install the song 'Creepy Doll [incl. video]'." -LangString DESC_s2_sub1_Section17 ${LANG_ENGLISH} "This will install the song 'That Spells DNA'." -LangString DESC_s2_sub1_Section18 ${LANG_ENGLISH} "This will install the song 'When You Go'." -LangString DESC_s2_sub1_Section19 ${LANG_ENGLISH} "This will install the song 'Better'." -LangString DESC_s2_sub1_Section20 ${LANG_ENGLISH} "This will install the song 'Shop Vac'." -LangString DESC_s2_sub1_Section21 ${LANG_ENGLISH} "This will install the song 'I Feel Fantastic'." -LangString DESC_s2_sub1_Section22 ${LANG_ENGLISH} "This will install the song 'Re: Your Brains'." -LangString DESC_s2_sub1_Section23 ${LANG_ENGLISH} "This will install the song 'Skullcrusher Mountain'." -LangString DESC_s2_sub1_Section24 ${LANG_ENGLISH} "This will install the song 'Chiron Beta Prime [incl. video]'." - -LangString DESC_s2_sub2_Section1 ${LANG_ENGLISH} "This will install the song '69'." -LangString DESC_s2_sub2_Section2 ${LANG_ENGLISH} "This will install the song '69 (Karaoke)'." -LangString DESC_s2_sub2_Section3 ${LANG_ENGLISH} "This will install the song 'Can't stop it'." -LangString DESC_s2_sub2_Section4 ${LANG_ENGLISH} "This will install the song 'Can't stop it (Karaoke)'." -LangString DESC_s2_sub2_Section5 ${LANG_ENGLISH} "This will install the song 'In My Hand'." -LangString DESC_s2_sub2_Section6 ${LANG_ENGLISH} "This will install the song 'Man Song'." -LangString DESC_s2_sub2_Section7 ${LANG_ENGLISH} "This will install the song 'Man Song (Karaoke)'." -LangString DESC_s2_sub2_Section8 ${LANG_ENGLISH} "This will install the song 'Stay with me'." -LangString DESC_s2_sub2_Section9 ${LANG_ENGLISH} "This will install the song 'Stay with me (Karaoke)'." - -LangString DESC_s2_sub3_Section1 ${LANG_ENGLISH} "This will install the song 'Lebendig und kräftig und schärfer'." -LangString DESC_s2_sub3_Section2 ${LANG_ENGLISH} "This will install the song 'Mensch, wo bist du?'." -LangString DESC_s2_sub3_Section3 ${LANG_ENGLISH} "This will install the song 'Mensch, wo bist du? (Karaoke)'." +LangString DESC_Section2_sub4 ${LANG_ENGLISH} "You can choose which Pornophonique songs should be installed." + +LangString DESC_g2Section2 ${LANG_ENGLISH} "Download the song 'Dead Smiling Pirates - I 18' (CC by-nc-nd 2.5)." +LangString DESC_g2Section3 ${LANG_ENGLISH} "Download the song 'Joshua Morin - On The Run' (CC by-sa 2.5)." +LangString DESC_g2Section4 ${LANG_ENGLISH} "Download the song 'Pornophonique - Space Invaders' (CC by-nc-nd 2.0)." +LangString DESC_g2Section5 ${LANG_ENGLISH} "Download the song 'Steven Dunston - Northern Star' (CC by-nc-sa 2.5)." +LangString DESC_g2Section1 ${LANG_ENGLISH} "Download the song 'Bodo Wartke - Liebeslied (Love Song)'." +LangString DESC_g2Section6 ${LANG_ENGLISH} "Download the song 'Pornophonique - Space Invaders (Karaoke)' (CC by-nc-nd 2.0)." + +LangString DESC_s2_sub1_Section1 ${LANG_ENGLISH} "Download the song 'Monkey Shines'." +LangString DESC_s2_sub1_Section2 ${LANG_ENGLISH} "Download the song 'I Crush Everything'." +LangString DESC_s2_sub1_Section3 ${LANG_ENGLISH} "Download the song 'Not About You'." +LangString DESC_s2_sub1_Section4 ${LANG_ENGLISH} "Download the song 'Mr. Fancy Pants'." +LangString DESC_s2_sub1_Section5 ${LANG_ENGLISH} "Download the song 'Big Bad World One'." +LangString DESC_s2_sub1_Section6 ${LANG_ENGLISH} "Download the song 'Flickr [incl. video]'." +LangString DESC_s2_sub1_Section7 ${LANG_ENGLISH} "Download the song 'My Beige Bear'." +LangString DESC_s2_sub1_Section8 ${LANG_ENGLISH} "Download the song 'The Future Soon'." +LangString DESC_s2_sub1_Section9 ${LANG_ENGLISH} "Download the song 'Ikea'." +LangString DESC_s2_sub1_Section10 ${LANG_ENGLISH} "Download the song 'Furry Old Lobster'." +LangString DESC_s2_sub1_Section11 ${LANG_ENGLISH} "Download the song 'Code Monkey [incl. video]'." +LangString DESC_s2_sub1_Section12 ${LANG_ENGLISH} "Download the song 'I´m Your Moon'." +LangString DESC_s2_sub1_Section13 ${LANG_ENGLISH} "Download the song 'First Of May'." +LangString DESC_s2_sub1_Section14 ${LANG_ENGLISH} "Download the song 'Dance, Soterios Johnson, Dance'." +LangString DESC_s2_sub1_Section15 ${LANG_ENGLISH} "Download the song 'A Talk With George'." +LangString DESC_s2_sub1_Section16 ${LANG_ENGLISH} "Download the song 'Creepy Doll [incl. video]'." +LangString DESC_s2_sub1_Section17 ${LANG_ENGLISH} "Download the song 'That Spells DNA'." +LangString DESC_s2_sub1_Section18 ${LANG_ENGLISH} "Download the song 'When You Go'." +LangString DESC_s2_sub1_Section19 ${LANG_ENGLISH} "Download the song 'Better'." +LangString DESC_s2_sub1_Section20 ${LANG_ENGLISH} "Download the song 'Shop Vac'." +LangString DESC_s2_sub1_Section21 ${LANG_ENGLISH} "Download the song 'I Feel Fantastic'." +LangString DESC_s2_sub1_Section22 ${LANG_ENGLISH} "Download the song 'Re: Your Brains'." +LangString DESC_s2_sub1_Section23 ${LANG_ENGLISH} "Download the song 'Skullcrusher Mountain'." +LangString DESC_s2_sub1_Section24 ${LANG_ENGLISH} "Download the song 'Chiron Beta Prime [incl. video]'." + +LangString DESC_s2_sub2_Section1 ${LANG_ENGLISH} "Download the song '69'." +LangString DESC_s2_sub2_Section2 ${LANG_ENGLISH} "Download the song '69 (Karaoke)'." +LangString DESC_s2_sub2_Section3 ${LANG_ENGLISH} "Download the song 'Can't stop it'." +LangString DESC_s2_sub2_Section4 ${LANG_ENGLISH} "Download the song 'Can't stop it (Karaoke)'." +LangString DESC_s2_sub2_Section5 ${LANG_ENGLISH} "Download the song 'In My Hand'." +LangString DESC_s2_sub2_Section6 ${LANG_ENGLISH} "Download the song 'Man Song'." +LangString DESC_s2_sub2_Section7 ${LANG_ENGLISH} "Download the song 'Man Song (Karaoke)'." +LangString DESC_s2_sub2_Section8 ${LANG_ENGLISH} "Download the song 'Stay with me'." +LangString DESC_s2_sub2_Section9 ${LANG_ENGLISH} "Download the song 'Stay with me (Karaoke)'." + +LangString DESC_s2_sub3_Section1 ${LANG_ENGLISH} "Download the song 'Lebendig und kräftig und schärfer'." +LangString DESC_s2_sub3_Section2 ${LANG_ENGLISH} "Download the song 'Mensch, wo bist du?'." +LangString DESC_s2_sub3_Section3 ${LANG_ENGLISH} "Download the song 'Mensch, wo bist du? (Karaoke)'." ; Optional Themes ; (not available) \ No newline at end of file diff --git a/installer/languages/German.nsh b/installer/languages/German.nsh index fb7ddeb4..6580fa7a 100644 --- a/installer/languages/German.nsh +++ b/installer/languages/German.nsh @@ -67,18 +67,21 @@ LangString name_section2 ${LANG_GERMAN} "Songs" LangString name_s2_sub1 ${LANG_GERMAN} "Jonathan Coulton" LangString name_s2_sub2 ${LANG_GERMAN} "Shearer" LangString name_s2_sub3 ${LANG_GERMAN} "Wise Guys" +LangString name_s2_sub4 ${LANG_GERMAN} "Pornophonique" LangString DESC_Section1 ${LANG_GERMAN} "Dies sind die von UltraStar Deluxe benötigten Grunddateien" -LangString DESC_Section2 ${LANG_GERMAN} "Hier können Songs zum Herunterladen gewählt werden." -LangString DESC_Section2_sub1 ${LANG_GERMAN} "Hier können Jonathan Coulton Songs (CC by-nc 3.0) zum Installieren gewählt werden." -LangString DESC_Section2_sub2 ${LANG_GERMAN} "Hier können Shearer Songs (CC by-nc-sa 2.0 / 3.0) zum Installieren gewählt werden." -LangString DESC_Section2_sub3 ${LANG_GERMAN} "Hier können Wise Guys Songs zum Installieren gewählt werden." +LangString DESC_Section2 ${LANG_GERMAN} "Hier können Songs zum Herunterladen gewählt werden. (Benötigt aktive Internetverbindung!)" +LangString DESC_Section2_sub1 ${LANG_GERMAN} "Hier können Jonathan Coulton Songs (CC by-nc 3.0) zum Herunterladen gewählt werden." +LangString DESC_Section2_sub2 ${LANG_GERMAN} "Hier können Shearer Songs (CC by-nc-sa 2.0 / 3.0) zum Herunterladen gewählt werden." +LangString DESC_Section2_sub3 ${LANG_GERMAN} "Hier können Wise Guys Songs zum Herunterladen gewählt werden." +LangString DESC_Section2_sub4 ${LANG_GERMAN} "Hier können Pornophonique Songs zum Herunterladen gewählt werden." LangString DESC_g2Section2 ${LANG_GERMAN} "Lädt das Lied 'Dead Smiling Pirates - I 18' (CC by-nc-nd 2.5) herunter." LangString DESC_g2Section3 ${LANG_GERMAN} "Lädt das Lied 'Joshua Morin - On The Run' (CC by-sa 2.5) herunter." LangString DESC_g2Section4 ${LANG_GERMAN} "Lädt das Lied 'Pornophonique - Space Invaders' (CC by-nc-nd 2.0) herunter." LangString DESC_g2Section5 ${LANG_GERMAN} "Lädt das Lied 'Steven Dunston - Northern Star' (CC by-nc-sa 2.5) herunter." LangString DESC_g2Section1 ${LANG_GERMAN} "Lädt das Lied 'Bodo Wartke - Liebeslied (Love Song)' herunter." +LangString DESC_g2Section6 ${LANG_GERMAN} "Lädt das Lied 'Pornophonique - Space Invaders (Karaoke)' (CC by-nc-nd 2.0) herunter." LangString DESC_s2_sub1_Section1 ${LANG_GERMAN} "Lädt das Lied 'Monkey Shines' herunter." LangString DESC_s2_sub1_Section2 ${LANG_GERMAN} "Lädt das Lied 'I Crush Everything' herunter." diff --git a/installer/languages/Hungarian.nsh b/installer/languages/Hungarian.nsh index 476554a7..d1cc569d 100644 --- a/installer/languages/Hungarian.nsh +++ b/installer/languages/Hungarian.nsh @@ -65,18 +65,21 @@ LangString name_section2 ${LANG_HUNGARIAN} "Dalok" LangString name_s2_sub1 ${LANG_HUNGARIAN} "Jonathan Coulton" LangString name_s2_sub2 ${LANG_HUNGARIAN} "Shearer" LangString name_s2_sub3 ${LANG_HUNGARIAN} "Wise Guys" +LangString name_s2_sub4 ${LANG_HUNGARIAN} "Pornophonique" LangString DESC_Section1 ${LANG_HUNGARIAN} "Azok a fájlok, melyek mindenképpen szükségesek az UltraStar Deluxe futtatásához." LangString DESC_Section2 ${LANG_HUNGARIAN} "Kiválaszthatja, hogy milyen dalok legyenek telepítve." LangString DESC_Section2_sub1 ${LANG_HUNGARIAN} "Kiválaszthatja, hogy mely Jonathan Coulton-dalok (CC by-nc 3.0) legyenek telepítve." LangString DESC_Section2_sub2 ${LANG_HUNGARIAN} "Kiválaszthatja, hogy mely Shearer-dalok (CC by-nc-sa 2.0 / 3.0) legyenek telepítve." LangString DESC_Section2_sub3 ${LANG_HUNGARIAN} "Kiválaszthatja, hogy mely Wise Guys-dalok legyenek telepítve." +LangString DESC_Section2_sub4 ${LANG_HUNGARIAN} "Kiválaszthatja, hogy mely Pornophonique-dalok legyenek telepítve." LangString DESC_Section3 ${LANG_HUNGARIAN} "Kiválaszthatja, hogy milyen témák legyenek telepítve. A témák használatával a program grafikai megjelenése változik meg. A témák telepítése nem kötelező." LangString DESC_g2Section2 ${LANG_HUNGARIAN} "Telepítésre kerül a 'Dead Smiling Pirates - I 18' (CC by-nc-nd 2.5) címu dal." LangString DESC_g2Section3 ${LANG_HUNGARIAN} "Telepítésre kerül a 'Joshua Morin - On The Run' (CC by-sa 2.5) címu dal." LangString DESC_g2Section4 ${LANG_HUNGARIAN} "Telepítésre kerül a 'Pornophonique - Space Invaders' (CC by-nc-nd 2.0) címu dal." LangString DESC_g2Section5 ${LANG_HUNGARIAN} "Telepítésre kerül a 'Steven Dunston - Northern Star' (CC by-nc-sa 2.5) címu dal." +LangString DESC_g2Section6 ${LANG_HUNGARIAN} "Telepítésre kerül a 'Pornophonique - Space Invaders (Karaoke)' (CC by-nc-nd 2.0) címu dal." LangString DESC_g2Section1 ${LANG_HUNGARIAN} "Telepítésre kerül a 'Bodo Wartke - Liebeslied (Love Song)' címu dal." LangString DESC_s2_sub1_Section1 ${LANG_HUNGARIAN} "Telepítésre kerül a 'Monkey Shines' címu dal." -- 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/UltraStar Deluxe.nsi | 17 ++++++++--------- 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 +- 6 files changed, 17 insertions(+), 45 deletions(-) (limited to 'installer') diff --git a/installer/UltraStar Deluxe.nsi b/installer/UltraStar Deluxe.nsi index e21c601f..66b0bd42 100644 --- a/installer/UltraStar Deluxe.nsi +++ b/installer/UltraStar Deluxe.nsi @@ -190,17 +190,16 @@ ${EndIf} StrCpy $path_configini "$path_config\config.ini" -${WriteToConfig} "[Game]$\r$\n" "$path_configini" -${WriteToConfig} "Language=$language2$\r$\n" "$path_configini" -${WriteToConfig} "Tabs=$tabs$\r$\n" "$path_configini" -${WriteToConfig} "Sorting=$sorting$\r$\n" "$path_configini" +WriteINIStr "$path_configini" "Game" "Language" "$language2" +WriteINIStr "$path_configini" "Game" "Tabs" "$tabs" +WriteINIStr "$path_configini" "Game" "Sorting" "$sorting" -${WriteToConfig} "[Graphics]$\r$\n" "$path_configini" -${WriteToConfig} "FullScreen=$fullscreen$\r$\n" "$path_configini" -${WriteToConfig} "Resolution=$resolution$\r$\n" "$path_configini" +WriteINIStr "$path_configini" "Graphics" "FullScreen" "$fullscreen" +WriteINIStr "$path_configini" "Graphics" "Resolution" "$resolution" -${WriteToConfig} "[Directories]$\r$\n" "$path_configini" -${WriteToConfig} "SongDir2=$songdir$\r$\n" "$path_configini" +${If} $songdir != "$INSTDIR\songs" +WriteINIStr "$path_configini" "Directories" "SongDir1" "$songdir" +${EndIf} FunctionEnd ; Settings page End 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') 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/UltraStar Deluxe.nsi | 114 ++++++++++++++++++++++------ installer/languages/English.nsh | 9 ++- installer/languages/German.nsh | 9 ++- installer/languages/Hungarian.nsh | 10 ++- installer/settings/files_main_install.nsh | 27 ++++++- installer/settings/files_main_uninstall.nsh | 11 +-- 6 files changed, 143 insertions(+), 37 deletions(-) (limited to 'installer') diff --git a/installer/UltraStar Deluxe.nsi b/installer/UltraStar Deluxe.nsi index 66b0bd42..13cf46d0 100644 --- a/installer/UltraStar Deluxe.nsi +++ b/installer/UltraStar Deluxe.nsi @@ -158,8 +158,20 @@ Function Settings ; Get all the variables: -Var /GLOBAL CHECKBOX -Var /GLOBAL checkbox_state +Var /GLOBAL LABEL_COMPONENTS + +Var /GLOBAL CHECKBOX_COVERS +Var /GLOBAL CB_COVERS_State +Var /GLOBAL CHECKBOX_SCORES +Var /GLOBAL CB_SCORES_State +Var /GLOBAL CHECKBOX_CONFIG +Var /GLOBAL CB_CONFIG_State +Var /GLOBAL CHECKBOX_SCREENSHOTS +Var /GLOBAL CB_SCREENSHOTS_State +Var /GLOBAL CHECKBOX_PLAYLISTS +Var /GLOBAL CB_PLAYLISTS_State +Var /GLOBAL CHECKBOX_SONGS +Var /GLOBAL CB_SONGS_State var /GLOBAL fullscreen var /GLOBAL language2 @@ -219,10 +231,33 @@ Function un.AskDelete nsDialogs::Create /NOUNLOAD 1018 - ${NSD_CreateCheckbox} 0 -150 100% 8u "$(delete_all)" - Pop $CHECKBOX + ${NSD_CreateLabel} 0 -195 100% 12u "$(delete_components)" + Pop $LABEL_COMPONENTS + + ${NSD_CreateCheckbox} 0 -175 100% 8u "$(delete_covers)" + Pop $CHECKBOX_COVERS + nsDialogs::OnClick /NOUNLOAD $CHECKBOX_COVERS $1 + + ${NSD_CreateCheckbox} 0 -155 100% 8u "$(delete_config)" + Pop $CHECKBOX_CONFIG + nsDialogs::OnClick /NOUNLOAD $CHECKBOX_CONFIG $2 + + ${NSD_CreateCheckbox} 0 -135 100% 8u "$(delete_highscores)" + Pop $CHECKBOX_SCORES + nsDialogs::OnClick /NOUNLOAD $CHECKBOX_SCORES $3 + + ${NSD_CreateCheckbox} 0 -115 100% 8u "$(delete_screenshots)" + Pop $CHECKBOX_SCREENSHOTS + nsDialogs::OnClick /NOUNLOAD $CHECKBOX_SCREENSHOTS $4 + + ${NSD_CreateCheckbox} 0 -95 100% 8u "$(delete_playlists)" + Pop $CHECKBOX_PLAYLISTS + nsDialogs::OnClick /NOUNLOAD $CHECKBOX_PLAYLISTS $5 + + ${NSD_CreateCheckbox} 0 -65 100% 18u "$(delete_songs)" + Pop $CHECKBOX_SONGS + nsDialogs::OnClick /NOUNLOAD $CHECKBOX_SONGS $6 - nsDialogs::OnClick /NOUNLOAD $CHECKBOX $0 nsDialogs::Show @@ -230,29 +265,53 @@ FunctionEnd Function un.DeleteAll -${NSD_GetState} $CHECKBOX $checkbox_state - -${If} $checkbox_state == "1" - -; Remove settings, songs, highscores, covers +${NSD_GetState} $CHECKBOX_COVERS $CB_COVERS_State +${NSD_GetState} $CHECKBOX_CONFIG $CB_CONFIG_State +${NSD_GetState} $CHECKBOX_SCORES $CB_SCORES_State +${NSD_GetState} $CHECKBOX_SCORES $CB_SCREENSHOTS_State +${NSD_GetState} $CHECKBOX_SCORES $CB_PLAYLISTS_State +${NSD_GetState} $CHECKBOX_SONGS $CB_SONGS_State - RMDir /r "$INSTDIR\songs" +${If} $CB_COVERS_State == "1" ; Remove covers RMDir /r "$INSTDIR\covers" - Delete "$INSTDIR\config.ini" - Delete "$INSTDIR\Ultrastar.db" - SetShellVarContext current - RMDir /r "$APPDATA\ultrastardx\songs" RMDir /r "$APPDATA\ultrastardx\covers" - Delete "$APPDATA\ultrastardx\config.ini" - Delete "$APPDATA\ultrastardx\Ultrastar.db" SetShellVarContext all +${EndIf} -${Else} +${If} $CB_CONFIG_State == "1" ; Remove config + SetShellVarContext current + Delete "$APPDATA\ultrastardx\config.ini" + SetShellVarContext all + Delete "$INSTDIR\config.ini" +${EndIf} -; If checkbox_state = 0 +${If} $CB_SCORES_State == "1" ; Remove highscores + SetShellVarContext current + Delete "$APPDATA\ultrastardx\Ultrastar.db" + SetShellVarContext all + Delete "$INSTDIR\Ultrastar.db" +${EndIf} +${If} $CB_SCREENSHOTS_State == "1" ; Remove screenshots + RMDir /r "$INSTDIR\sreenshots" + SetShellVarContext current + RMDir /r "$APPDATA\ultrastardx\screenshots" + SetShellVarContext all +${EndIf} +${If} $CB_SCREENSHOTS_State == "1" ; Remove playlists + RMDir /r "$INSTDIR\playlists" + SetShellVarContext current + RMDir /r "$APPDATA\ultrastardx\playlists" + SetShellVarContext all +${EndIf} + +${If} $CB_SONGS_State == "1" ; Remove songs + RMDir /r "$INSTDIR\songs" + SetShellVarContext current + RMDir /r "$APPDATA\ultrastardx\songs" + SetShellVarContext all ${EndIf} @@ -432,7 +491,7 @@ var /GLOBAL version StrCpy $version "1.1beta" - System::Call 'kernel32::CreateMutexA(i 0, i 0, t "USdx Installer.exe") ?e' + System::Call 'kernel32::CreateMutexA(i 0, i 0, t "USdx Installer.exe") ?e' Pop $R0 @@ -445,22 +504,27 @@ StrCpy $version "1.1beta" ${If} $R0 == $version MessageBox MB_YESNO|MB_ICONEXCLAMATION \ "${name} v.$R0 $(oninit_alreadyinstalled). $\n$\n $(oninit_installagain)" \ - IDYES done + IDYES continue Abort ${EndIf} - ReadRegStr $R1 HKLM \ - "Software\Microsoft\Windows\CurrentVersion\Uninstall\${name}" \ - "UninstallString" + ReadRegStr $R1 HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${name}" 'UninstallString' StrCmp $R1 "" done + ${If} $R0 != $version MessageBox MB_YESNO|MB_ICONEXCLAMATION \ "${name} v.$R0 $(oninit_alreadyinstalled). $\n$\n $(oninit_updateusdx) v.$R0 -> v.${version}" \ - IDYES done + IDYES continue Abort ${EndIf} + +continue: + ReadRegStr $R2 HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${name}" 'UninstallString' + MessageBox MB_YESNO|MB_ICONEXCLAMATION "$(oninit_uninstall)" IDNO done + ExecWait '"$R2" _?=$INSTDIR' + done: !insertmacro MUI_LANGDLL_DISPLAY diff --git a/installer/languages/English.nsh b/installer/languages/English.nsh index c6c759b9..a3325d5b 100644 --- a/installer/languages/English.nsh +++ b/installer/languages/English.nsh @@ -9,13 +9,20 @@ LangString oninit_installagain ${LANG_ENGLISH} "Are you sure you want to install LangString oninit_alreadyinstalled ${LANG_ENGLISH} "is already installed" LangString oninit_closeusdx ${LANG_ENGLISH} "cannot be uninstalled while its running! Do you want to close it?" LangString oninit_updateusdx ${LANG_ENGLISH} "Do you want to update the installation from:" +LangString oninit_uninstall ${LANG_ENGLISH} "Do you want to uninstall the old version? (recommended)" LangString update_connect ${LANG_ENGLISH} "Establish internet connection and check for new version" LangString button_next ${LANG_ENGLISH} "Next >" LangString button_close ${LANG_ENGLISH} "Close" LangString update_information ${LANG_ENGLISH} "You can check if a new version of 'UltraStar Deluxe' is available. Thereto an internet connection will be established. If a new version is found, it can be installed afterwards." -LangString delete_all ${LANG_ENGLISH} "Also delete Songs, Settings, Highscores and Covers ?" +LangString delete_components ${LANG_ENGLISH} "Also delete the following components:" +LangString delete_covers ${LANG_ENGLISH} "Cover?" +LangString delete_highscores ${LANG_ENGLISH} "Highscores?" +LangString delete_config ${LANG_ENGLISH} "Config?" +LangString delete_screenshots ${LANG_ENGLISH} "Screenshots?" +LangString delete_playlists ${LANG_ENGLISH} "Playlists?" +LangString delete_songs ${LANG_ENGLISH} "Remove songs? WARNING: ALL files within the InstallationDir\songs folder will be removed(!)" LangString update_check_older ${LANG_ENGLISH} "Your version $R0 is outdated. The new version $1 of UltraStar Deluxe is available. Do you want to update?" LangString update_check_equal ${LANG_ENGLISH} "Your currently installed version $R0 is up-to-date. No update needed." diff --git a/installer/languages/German.nsh b/installer/languages/German.nsh index 6580fa7a..56507ec5 100644 --- a/installer/languages/German.nsh +++ b/installer/languages/German.nsh @@ -9,13 +9,20 @@ LangString oninit_installagain ${LANG_GERMAN} "Bist du sicher, dass du es erneut LangString oninit_alreadyinstalled ${LANG_GERMAN} "ist bereits installiert" LangString oninit_closeusdx ${LANG_GERMAN} "kann nicht während der Laufzeit deinstalliert werden. Soll es geschlossen werden?" LangString oninit_updateusdx ${LANG_GERMAN} "Möchtest du das Programm aktualisieren von" +LangString oninit_uninstall ${LANG_GERMAN} "Möchtest du die alte Version entfernen? (empfohlen)" LangString update_connect ${LANG_GERMAN} "Mit dem Internet verbinden und nach aktueller Version suchen" LangString button_next ${LANG_GERMAN} "Weiter >" LangString button_close ${LANG_GERMAN} "Beenden" LangString update_information ${LANG_GERMAN} "Du kannst nach einer aktuelleren Version von 'UltraStar Deluxe' suchen. Dazu wird eine Verbindung mit dem Internet hergestellt. Wurde eine aktuellere Version gefunden, kann diese anschließend installiert werden." -LangString delete_all ${LANG_GERMAN} "Lieder, Einstellungen, Highscores und Cover auch löschen?" +LangString delete_components ${LANG_GERMAN} "Folgende Komponenten ebenfalls entfernen:" +LangString delete_covers ${LANG_GERMAN} "Cover?" +LangString delete_highscores ${LANG_GERMAN} "Statistiken?" +LangString delete_config ${LANG_GERMAN} "Konfiguration?" +LangString delete_screenshots ${LANG_GERMAN} "Screenshots?" +LangString delete_playlists ${LANG_GERMAN} "Playlisten?" +LangString delete_songs ${LANG_GERMAN} "Lieder löschen? WARNUNG: ALLE Dateien im Unterordner 'songs' des Installationsverzeichnisses werden gelöscht(!)" LangString update_check_older ${LANG_GERMAN} "Deine aktuelle Version $R0 ist veraltet. Die neue Version $1 von UltraStar Deluxe ist verfügbar. Möchtest du sie runterladen?" LangString update_check_equal ${LANG_GERMAN} "Deine aktuelle Version $R0 ist auf dem neusten Stand.$\n$\rKein Update benötigt." diff --git a/installer/languages/Hungarian.nsh b/installer/languages/Hungarian.nsh index d1cc569d..198251f6 100644 --- a/installer/languages/Hungarian.nsh +++ b/installer/languages/Hungarian.nsh @@ -10,12 +10,20 @@ LangString oninit_installagain ${LANG_HUNGARIAN} "Biztos abban, hogy m LangString oninit_alreadyinstalled ${LANG_HUNGARIAN} "már telepítve van" LangString oninit_closeusdx ${LANG_HUNGARIAN} "nem eltávolítható, ha még fut! Kívánja a program bezárását?" LangString oninit_updateusdx ${LANG_HUNGARIAN} "Kívánja-e a programot frissíteni erről a helyről:" +LangString oninit_uninstall ${LANG_HUNGARIAN} "Do you want to uninstall the old version? (recommended)" LangString update_connect ${LANG_HUNGARIAN} "Új verzió keresése az interneten" LangString button_next ${LANG_HUNGARIAN} "Tovább >" LangString button_close ${LANG_HUNGARIAN} "Bezárás" LangString update_information ${LANG_HUNGARIAN} "Ellenőrizheti, hogy van-e új 'UltraStar Deluxe'-verzió. Ehhez internetkapcsolat szükséges. Ha van új verzió, az ezt követően telepíthető." -LangString delete_all ${LANG_HUNGARIAN} "Töröljük a dalokat, a pontszámokat és a borítókat is?" + +LangString delete_components ${LANG_HUNGARIAN} "Also delete the following components:" +LangString delete_covers ${LANG_HUNGARIAN} "Töröljük a borítókat?" +LangString delete_highscores ${LANG_HUNGARIAN} "Töröljük a pontszámokat?" +LangString delete_config ${LANG_HUNGARIAN} "Config?" +LangString delete_screenshots ${LANG_HUNGARIAN} "Screenshots?" +LangString delete_playlists ${LANG_HUNGARIAN} "Playlists?" +LangString delete_songs ${LANG_HUNGARIAN} "Töröljük a dalokat is? WARNING: ALL files within the InstallationDir\songs folder will be removed(!)" LangString update_check_older ${LANG_HUNGARIAN} "Az Ön gépén telepített verziónál ($R0) van már újabb ($1). Kívánja frissíteni?" LangString update_check_equal ${LANG_HUNGARIAN} "Az Ön gépén a legfrissebb verzió ($R0) van telepítve. Frissítés nem szükséges." 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 09809c48f227ffa2bb0fc3948b2ef336ab0110f5 Mon Sep 17 00:00:00 2001 From: tobigun Date: Sun, 6 Jun 2010 13:48:33 +0000 Subject: unified indentation git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@2453 b956fd51-792f-4845-bead-9b4dfca2ff2c --- installer/UltraStar Deluxe.nsi | 437 ++++++++++++++++++++--------------------- 1 file changed, 218 insertions(+), 219 deletions(-) (limited to 'installer') diff --git a/installer/UltraStar Deluxe.nsi b/installer/UltraStar Deluxe.nsi index 13cf46d0..497f53ee 100644 --- a/installer/UltraStar Deluxe.nsi +++ b/installer/UltraStar Deluxe.nsi @@ -151,67 +151,67 @@ Page custom Settings Function Settings -!insertmacro INSTALLOPTIONS_WRITE "Settings-$LANGUAGE" "Field 18" "State" "$INSTDIR\songs" - -!insertmacro MUI_HEADER_TEXT " " "$(page_settings_subtitle)" -!insertmacro INSTALLOPTIONS_DISPLAY "Settings-$LANGUAGE" - -; Get all the variables: - -Var /GLOBAL LABEL_COMPONENTS - -Var /GLOBAL CHECKBOX_COVERS -Var /GLOBAL CB_COVERS_State -Var /GLOBAL CHECKBOX_SCORES -Var /GLOBAL CB_SCORES_State -Var /GLOBAL CHECKBOX_CONFIG -Var /GLOBAL CB_CONFIG_State -Var /GLOBAL CHECKBOX_SCREENSHOTS -Var /GLOBAL CB_SCREENSHOTS_State -Var /GLOBAL CHECKBOX_PLAYLISTS -Var /GLOBAL CB_PLAYLISTS_State -Var /GLOBAL CHECKBOX_SONGS -Var /GLOBAL CB_SONGS_State - -var /GLOBAL fullscreen -var /GLOBAL language2 -var /GLOBAL resolution -var /GLOBAL tabs -var /GLOBAL sorting -var /GLOBAL songdir - - !insertmacro INSTALLOPTIONS_READ $fullscreen "Settings-$LANGUAGE" "Field 5" "State" - !insertmacro INSTALLOPTIONS_READ $language2 "Settings-$LANGUAGE" "Field 6" "State" - !insertmacro INSTALLOPTIONS_READ $resolution "Settings-$LANGUAGE" "Field 7" "State" - !insertmacro INSTALLOPTIONS_READ $tabs "Settings-$LANGUAGE" "Field 8" "State" - !insertmacro INSTALLOPTIONS_READ $sorting "Settings-$LANGUAGE" "Field 15" "State" - !insertmacro INSTALLOPTIONS_READ $songdir "Settings-$LANGUAGE" "Field 18" "State" - -; Write all variables to config.ini - -var /GLOBAL path_config -var /GLOBAL path_configini - -${If} ${AtLeastWinVista} - SetShellVarContext current - StrCpy $path_config "$APPDATA\ultrastardx" - SetShellVarContext all -${Else} - StrCpy $path_config "$INSTDIR" -${EndIf} - -StrCpy $path_configini "$path_config\config.ini" - -WriteINIStr "$path_configini" "Game" "Language" "$language2" -WriteINIStr "$path_configini" "Game" "Tabs" "$tabs" -WriteINIStr "$path_configini" "Game" "Sorting" "$sorting" - -WriteINIStr "$path_configini" "Graphics" "FullScreen" "$fullscreen" -WriteINIStr "$path_configini" "Graphics" "Resolution" "$resolution" - -${If} $songdir != "$INSTDIR\songs" -WriteINIStr "$path_configini" "Directories" "SongDir1" "$songdir" -${EndIf} + !insertmacro INSTALLOPTIONS_WRITE "Settings-$LANGUAGE" "Field 18" "State" "$INSTDIR\songs" + + !insertmacro MUI_HEADER_TEXT " " "$(page_settings_subtitle)" + !insertmacro INSTALLOPTIONS_DISPLAY "Settings-$LANGUAGE" + + ; Get all the variables: + + Var /GLOBAL LABEL_COMPONENTS + + Var /GLOBAL CHECKBOX_COVERS + Var /GLOBAL CB_COVERS_State + Var /GLOBAL CHECKBOX_SCORES + Var /GLOBAL CB_SCORES_State + Var /GLOBAL CHECKBOX_CONFIG + Var /GLOBAL CB_CONFIG_State + Var /GLOBAL CHECKBOX_SCREENSHOTS + Var /GLOBAL CB_SCREENSHOTS_State + Var /GLOBAL CHECKBOX_PLAYLISTS + Var /GLOBAL CB_PLAYLISTS_State + Var /GLOBAL CHECKBOX_SONGS + Var /GLOBAL CB_SONGS_State + + Var /GLOBAL fullscreen + Var /GLOBAL language2 + Var /GLOBAL resolution + Var /GLOBAL tabs + Var /GLOBAL sorting + Var /GLOBAL songdir + + !insertmacro INSTALLOPTIONS_READ $fullscreen "Settings-$LANGUAGE" "Field 5" "State" + !insertmacro INSTALLOPTIONS_READ $language2 "Settings-$LANGUAGE" "Field 6" "State" + !insertmacro INSTALLOPTIONS_READ $resolution "Settings-$LANGUAGE" "Field 7" "State" + !insertmacro INSTALLOPTIONS_READ $tabs "Settings-$LANGUAGE" "Field 8" "State" + !insertmacro INSTALLOPTIONS_READ $sorting "Settings-$LANGUAGE" "Field 15" "State" + !insertmacro INSTALLOPTIONS_READ $songdir "Settings-$LANGUAGE" "Field 18" "State" + + ; Write all variables to config.ini + + var /GLOBAL path_config + var /GLOBAL path_configini + + ${If} ${AtLeastWinVista} + SetShellVarContext current + StrCpy $path_config "$APPDATA\ultrastardx" + SetShellVarContext all + ${Else} + StrCpy $path_config "$INSTDIR" + ${EndIf} + + StrCpy $path_configini "$path_config\config.ini" + + WriteINIStr "$path_configini" "Game" "Language" "$language2" + WriteINIStr "$path_configini" "Game" "Tabs" "$tabs" + WriteINIStr "$path_configini" "Game" "Sorting" "$sorting" + + WriteINIStr "$path_configini" "Graphics" "FullScreen" "$fullscreen" + WriteINIStr "$path_configini" "Graphics" "Resolution" "$resolution" + + ${If} $songdir != "$INSTDIR\songs" + WriteINIStr "$path_configini" "Directories" "SongDir1" "$songdir" + ${EndIf} FunctionEnd ; Settings page End @@ -229,7 +229,7 @@ UninstPage custom un.AskDelete un.DeleteAll Function un.AskDelete -nsDialogs::Create /NOUNLOAD 1018 + nsDialogs::Create /NOUNLOAD 1018 ${NSD_CreateLabel} 0 -195 100% 12u "$(delete_components)" Pop $LABEL_COMPONENTS @@ -259,7 +259,7 @@ nsDialogs::Create /NOUNLOAD 1018 nsDialogs::OnClick /NOUNLOAD $CHECKBOX_SONGS $6 -nsDialogs::Show + nsDialogs::Show FunctionEnd @@ -273,45 +273,45 @@ ${NSD_GetState} $CHECKBOX_SCORES $CB_PLAYLISTS_State ${NSD_GetState} $CHECKBOX_SONGS $CB_SONGS_State ${If} $CB_COVERS_State == "1" ; Remove covers - RMDir /r "$INSTDIR\covers" - SetShellVarContext current - RMDir /r "$APPDATA\ultrastardx\covers" - SetShellVarContext all + RMDir /r "$INSTDIR\covers" + SetShellVarContext current + RMDir /r "$APPDATA\ultrastardx\covers" + SetShellVarContext all ${EndIf} ${If} $CB_CONFIG_State == "1" ; Remove config - SetShellVarContext current - Delete "$APPDATA\ultrastardx\config.ini" - SetShellVarContext all - Delete "$INSTDIR\config.ini" + SetShellVarContext current + Delete "$APPDATA\ultrastardx\config.ini" + SetShellVarContext all + Delete "$INSTDIR\config.ini" ${EndIf} ${If} $CB_SCORES_State == "1" ; Remove highscores - SetShellVarContext current - Delete "$APPDATA\ultrastardx\Ultrastar.db" - SetShellVarContext all - Delete "$INSTDIR\Ultrastar.db" + SetShellVarContext current + Delete "$APPDATA\ultrastardx\Ultrastar.db" + SetShellVarContext all + Delete "$INSTDIR\Ultrastar.db" ${EndIf} ${If} $CB_SCREENSHOTS_State == "1" ; Remove screenshots - RMDir /r "$INSTDIR\sreenshots" - SetShellVarContext current - RMDir /r "$APPDATA\ultrastardx\screenshots" - SetShellVarContext all + RMDir /r "$INSTDIR\sreenshots" + SetShellVarContext current + RMDir /r "$APPDATA\ultrastardx\screenshots" + SetShellVarContext all ${EndIf} ${If} $CB_SCREENSHOTS_State == "1" ; Remove playlists - RMDir /r "$INSTDIR\playlists" - SetShellVarContext current - RMDir /r "$APPDATA\ultrastardx\playlists" - SetShellVarContext all + RMDir /r "$INSTDIR\playlists" + SetShellVarContext current + RMDir /r "$APPDATA\ultrastardx\playlists" + SetShellVarContext all ${EndIf} ${If} $CB_SONGS_State == "1" ; Remove songs - RMDir /r "$INSTDIR\songs" - SetShellVarContext current - RMDir /r "$APPDATA\ultrastardx\songs" - SetShellVarContext all + RMDir /r "$INSTDIR\songs" + SetShellVarContext current + RMDir /r "$APPDATA\ultrastardx\songs" + SetShellVarContext all ${EndIf} @@ -333,39 +333,39 @@ Section $(name_section1) Section1 SetOutPath $INSTDIR SetOverwrite try -!include "${path_settings}\files_main_install.nsh" + !include "${path_settings}\files_main_install.nsh" -; Create Shortcuts: -SetOutPath "$INSTDIR" + ; Create Shortcuts: + SetOutPath "$INSTDIR" !insertmacro MUI_STARTMENU_WRITE_BEGIN Application - SetShellVarContext all - SetOutPath "$INSTDIR" - - CreateDirectory "${name}" - CreateDirectory "$SMPROGRAMS\$ICONS_GROUP" - CreateShortCut "$SMPROGRAMS\$ICONS_GROUP\$(sm_shortcut).lnk" "$INSTDIR\${exe}.exe" - CreateShortCut "$SMPROGRAMS\$ICONS_GROUP\$(sm_website).lnk" "http://www.ultrastardeluxe.org/" - CreateShortCut "$SMPROGRAMS\$ICONS_GROUP\$(sm_songs).lnk" "$INSTDIR\songs" - CreateShortCut "$SMPROGRAMS\$ICONS_GROUP\$(sm_uninstall).lnk" "$INSTDIR\Uninstall.exe" + SetShellVarContext all + SetOutPath "$INSTDIR" + + CreateDirectory "${name}" + CreateDirectory "$SMPROGRAMS\$ICONS_GROUP" + CreateShortCut "$SMPROGRAMS\$ICONS_GROUP\$(sm_shortcut).lnk" "$INSTDIR\${exe}.exe" + CreateShortCut "$SMPROGRAMS\$ICONS_GROUP\$(sm_website).lnk" "http://www.ultrastardeluxe.org/" + CreateShortCut "$SMPROGRAMS\$ICONS_GROUP\$(sm_songs).lnk" "$INSTDIR\songs" + CreateShortCut "$SMPROGRAMS\$ICONS_GROUP\$(sm_uninstall).lnk" "$INSTDIR\Uninstall.exe" !insertmacro MUI_STARTMENU_WRITE_END -; Vista Game Explorer: -; (removed due to incompatibility with Windows 7, needs rewrite) + ; Vista Game Explorer: + ; (removed due to incompatibility with Windows 7, needs rewrite) -; Create Uninstaller: + ; Create Uninstaller: - WriteUninstaller "$INSTDIR\Uninstall.exe" + WriteUninstaller "$INSTDIR\Uninstall.exe" - WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "DisplayName" "${name}" - WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "DisplayIcon" "$INSTDIR\ultrastardx.exe" - WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "InstallDir" "$INSTDIR" - WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "UninstallString" "$INSTDIR\Uninstall.exe" - WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "DisplayVersion" "${PRODUCT_VERSION}" - WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "URLInfoAbout" "${PRODUCT_WEB_SITE}" - WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "Publisher" "${PRODUCT_PUBLISHER}" + WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "DisplayName" "${name}" + WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "DisplayIcon" "$INSTDIR\ultrastardx.exe" + WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "InstallDir" "$INSTDIR" + WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "UninstallString" "$INSTDIR\Uninstall.exe" + WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "DisplayVersion" "${PRODUCT_VERSION}" + WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "URLInfoAbout" "${PRODUCT_WEB_SITE}" + WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "Publisher" "${PRODUCT_PUBLISHER}" - SetOutPath "$INSTDIR" + SetOutPath "$INSTDIR" SectionEnd @@ -388,14 +388,14 @@ SectionEnd Section Uninstall - !insertmacro MUI_STARTMENU_GETFOLDER "Application" $ICONS_GROUP + !insertmacro MUI_STARTMENU_GETFOLDER "Application" $ICONS_GROUP - !include "${path_settings}\files_main_uninstall.nsh" + !include "${path_settings}\files_main_uninstall.nsh" - DeleteRegKey ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" + DeleteRegKey ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" -; Unregister from Windows Vista Game Explorer -; (removed due to incompatibility with Windows 7) + ; Unregister from Windows Vista Game Explorer + ; (removed due to incompatibility with Windows 7) SectionEnd @@ -406,59 +406,59 @@ SectionEnd !insertmacro MUI_FUNCTION_DESCRIPTION_BEGIN - !insertmacro MUI_DESCRIPTION_TEXT ${Section1} $(DESC_Section1) - !insertmacro MUI_DESCRIPTION_TEXT ${Section2} $(DESC_Section2) - !insertmacro MUI_DESCRIPTION_TEXT ${s2_sub1} $(DESC_Section2_sub1) - !insertmacro MUI_DESCRIPTION_TEXT ${s2_sub2} $(DESC_Section2_sub2) - !insertmacro MUI_DESCRIPTION_TEXT ${s2_sub3} $(DESC_Section2_sub3) - !insertmacro MUI_DESCRIPTION_TEXT ${s2_sub4} $(DESC_Section2_sub4) -; !insertmacro MUI_DESCRIPTION_TEXT ${Section3} $(DESC_Section3) THEMES - - !insertmacro MUI_DESCRIPTION_TEXT ${g2Section1} $(DESC_g2Section1) - !insertmacro MUI_DESCRIPTION_TEXT ${g2Section2} $(DESC_g2Section2) - !insertmacro MUI_DESCRIPTION_TEXT ${g2Section3} $(DESC_g2Section3) - !insertmacro MUI_DESCRIPTION_TEXT ${g2Section4} $(DESC_g2Section4) - !insertmacro MUI_DESCRIPTION_TEXT ${g2Section5} $(DESC_g2Section5) - !insertmacro MUI_DESCRIPTION_TEXT ${g2Section6} $(DESC_g2Section6) - - !insertmacro MUI_DESCRIPTION_TEXT ${s2_sub1_Section1} $(DESC_s2_sub1_Section1) - !insertmacro MUI_DESCRIPTION_TEXT ${s2_sub1_Section2} $(DESC_s2_sub1_Section2) - !insertmacro MUI_DESCRIPTION_TEXT ${s2_sub1_Section3} $(DESC_s2_sub1_Section3) - !insertmacro MUI_DESCRIPTION_TEXT ${s2_sub1_Section4} $(DESC_s2_sub1_Section4) - !insertmacro MUI_DESCRIPTION_TEXT ${s2_sub1_Section5} $(DESC_s2_sub1_Section5) - !insertmacro MUI_DESCRIPTION_TEXT ${s2_sub1_Section6} $(DESC_s2_sub1_Section6) - !insertmacro MUI_DESCRIPTION_TEXT ${s2_sub1_Section7} $(DESC_s2_sub1_Section7) - !insertmacro MUI_DESCRIPTION_TEXT ${s2_sub1_Section8} $(DESC_s2_sub1_Section8) - !insertmacro MUI_DESCRIPTION_TEXT ${s2_sub1_Section9} $(DESC_s2_sub1_Section9) - !insertmacro MUI_DESCRIPTION_TEXT ${s2_sub1_Section10} $(DESC_s2_sub1_Section10) - !insertmacro MUI_DESCRIPTION_TEXT ${s2_sub1_Section11} $(DESC_s2_sub1_Section11) - !insertmacro MUI_DESCRIPTION_TEXT ${s2_sub1_Section12} $(DESC_s2_sub1_Section12) - !insertmacro MUI_DESCRIPTION_TEXT ${s2_sub1_Section13} $(DESC_s2_sub1_Section13) - !insertmacro MUI_DESCRIPTION_TEXT ${s2_sub1_Section14} $(DESC_s2_sub1_Section14) - !insertmacro MUI_DESCRIPTION_TEXT ${s2_sub1_Section15} $(DESC_s2_sub1_Section15) - !insertmacro MUI_DESCRIPTION_TEXT ${s2_sub1_Section16} $(DESC_s2_sub1_Section16) - !insertmacro MUI_DESCRIPTION_TEXT ${s2_sub1_Section17} $(DESC_s2_sub1_Section17) - !insertmacro MUI_DESCRIPTION_TEXT ${s2_sub1_Section18} $(DESC_s2_sub1_Section18) - !insertmacro MUI_DESCRIPTION_TEXT ${s2_sub1_Section19} $(DESC_s2_sub1_Section19) - !insertmacro MUI_DESCRIPTION_TEXT ${s2_sub1_Section20} $(DESC_s2_sub1_Section20) - !insertmacro MUI_DESCRIPTION_TEXT ${s2_sub1_Section21} $(DESC_s2_sub1_Section21) - !insertmacro MUI_DESCRIPTION_TEXT ${s2_sub1_Section22} $(DESC_s2_sub1_Section22) - !insertmacro MUI_DESCRIPTION_TEXT ${s2_sub1_Section23} $(DESC_s2_sub1_Section23) - !insertmacro MUI_DESCRIPTION_TEXT ${s2_sub1_Section24} $(DESC_s2_sub1_Section24) - - !insertmacro MUI_DESCRIPTION_TEXT ${s2_sub2_Section1} $(DESC_s2_sub2_Section1) - !insertmacro MUI_DESCRIPTION_TEXT ${s2_sub2_Section2} $(DESC_s2_sub2_Section2) - !insertmacro MUI_DESCRIPTION_TEXT ${s2_sub2_Section3} $(DESC_s2_sub2_Section3) - !insertmacro MUI_DESCRIPTION_TEXT ${s2_sub2_Section4} $(DESC_s2_sub2_Section4) - !insertmacro MUI_DESCRIPTION_TEXT ${s2_sub2_Section5} $(DESC_s2_sub2_Section5) - !insertmacro MUI_DESCRIPTION_TEXT ${s2_sub2_Section6} $(DESC_s2_sub2_Section6) - !insertmacro MUI_DESCRIPTION_TEXT ${s2_sub2_Section7} $(DESC_s2_sub2_Section7) - !insertmacro MUI_DESCRIPTION_TEXT ${s2_sub2_Section8} $(DESC_s2_sub2_Section8) - !insertmacro MUI_DESCRIPTION_TEXT ${s2_sub2_Section9} $(DESC_s2_sub2_Section9) - - !insertmacro MUI_DESCRIPTION_TEXT ${s2_sub3_Section1} $(DESC_s2_sub3_Section1) - !insertmacro MUI_DESCRIPTION_TEXT ${s2_sub3_Section2} $(DESC_s2_sub3_Section2) - !insertmacro MUI_DESCRIPTION_TEXT ${s2_sub3_Section3} $(DESC_s2_sub3_Section3) + !insertmacro MUI_DESCRIPTION_TEXT ${Section1} $(DESC_Section1) + !insertmacro MUI_DESCRIPTION_TEXT ${Section2} $(DESC_Section2) + !insertmacro MUI_DESCRIPTION_TEXT ${s2_sub1} $(DESC_Section2_sub1) + !insertmacro MUI_DESCRIPTION_TEXT ${s2_sub2} $(DESC_Section2_sub2) + !insertmacro MUI_DESCRIPTION_TEXT ${s2_sub3} $(DESC_Section2_sub3) + !insertmacro MUI_DESCRIPTION_TEXT ${s2_sub4} $(DESC_Section2_sub4) +; !insertmacro MUI_DESCRIPTION_TEXT ${Section3} $(DESC_Section3) THEMES + + !insertmacro MUI_DESCRIPTION_TEXT ${g2Section1} $(DESC_g2Section1) + !insertmacro MUI_DESCRIPTION_TEXT ${g2Section2} $(DESC_g2Section2) + !insertmacro MUI_DESCRIPTION_TEXT ${g2Section3} $(DESC_g2Section3) + !insertmacro MUI_DESCRIPTION_TEXT ${g2Section4} $(DESC_g2Section4) + !insertmacro MUI_DESCRIPTION_TEXT ${g2Section5} $(DESC_g2Section5) + !insertmacro MUI_DESCRIPTION_TEXT ${g2Section6} $(DESC_g2Section6) + + !insertmacro MUI_DESCRIPTION_TEXT ${s2_sub1_Section1} $(DESC_s2_sub1_Section1) + !insertmacro MUI_DESCRIPTION_TEXT ${s2_sub1_Section2} $(DESC_s2_sub1_Section2) + !insertmacro MUI_DESCRIPTION_TEXT ${s2_sub1_Section3} $(DESC_s2_sub1_Section3) + !insertmacro MUI_DESCRIPTION_TEXT ${s2_sub1_Section4} $(DESC_s2_sub1_Section4) + !insertmacro MUI_DESCRIPTION_TEXT ${s2_sub1_Section5} $(DESC_s2_sub1_Section5) + !insertmacro MUI_DESCRIPTION_TEXT ${s2_sub1_Section6} $(DESC_s2_sub1_Section6) + !insertmacro MUI_DESCRIPTION_TEXT ${s2_sub1_Section7} $(DESC_s2_sub1_Section7) + !insertmacro MUI_DESCRIPTION_TEXT ${s2_sub1_Section8} $(DESC_s2_sub1_Section8) + !insertmacro MUI_DESCRIPTION_TEXT ${s2_sub1_Section9} $(DESC_s2_sub1_Section9) + !insertmacro MUI_DESCRIPTION_TEXT ${s2_sub1_Section10} $(DESC_s2_sub1_Section10) + !insertmacro MUI_DESCRIPTION_TEXT ${s2_sub1_Section11} $(DESC_s2_sub1_Section11) + !insertmacro MUI_DESCRIPTION_TEXT ${s2_sub1_Section12} $(DESC_s2_sub1_Section12) + !insertmacro MUI_DESCRIPTION_TEXT ${s2_sub1_Section13} $(DESC_s2_sub1_Section13) + !insertmacro MUI_DESCRIPTION_TEXT ${s2_sub1_Section14} $(DESC_s2_sub1_Section14) + !insertmacro MUI_DESCRIPTION_TEXT ${s2_sub1_Section15} $(DESC_s2_sub1_Section15) + !insertmacro MUI_DESCRIPTION_TEXT ${s2_sub1_Section16} $(DESC_s2_sub1_Section16) + !insertmacro MUI_DESCRIPTION_TEXT ${s2_sub1_Section17} $(DESC_s2_sub1_Section17) + !insertmacro MUI_DESCRIPTION_TEXT ${s2_sub1_Section18} $(DESC_s2_sub1_Section18) + !insertmacro MUI_DESCRIPTION_TEXT ${s2_sub1_Section19} $(DESC_s2_sub1_Section19) + !insertmacro MUI_DESCRIPTION_TEXT ${s2_sub1_Section20} $(DESC_s2_sub1_Section20) + !insertmacro MUI_DESCRIPTION_TEXT ${s2_sub1_Section21} $(DESC_s2_sub1_Section21) + !insertmacro MUI_DESCRIPTION_TEXT ${s2_sub1_Section22} $(DESC_s2_sub1_Section22) + !insertmacro MUI_DESCRIPTION_TEXT ${s2_sub1_Section23} $(DESC_s2_sub1_Section23) + !insertmacro MUI_DESCRIPTION_TEXT ${s2_sub1_Section24} $(DESC_s2_sub1_Section24) + + !insertmacro MUI_DESCRIPTION_TEXT ${s2_sub2_Section1} $(DESC_s2_sub2_Section1) + !insertmacro MUI_DESCRIPTION_TEXT ${s2_sub2_Section2} $(DESC_s2_sub2_Section2) + !insertmacro MUI_DESCRIPTION_TEXT ${s2_sub2_Section3} $(DESC_s2_sub2_Section3) + !insertmacro MUI_DESCRIPTION_TEXT ${s2_sub2_Section4} $(DESC_s2_sub2_Section4) + !insertmacro MUI_DESCRIPTION_TEXT ${s2_sub2_Section5} $(DESC_s2_sub2_Section5) + !insertmacro MUI_DESCRIPTION_TEXT ${s2_sub2_Section6} $(DESC_s2_sub2_Section6) + !insertmacro MUI_DESCRIPTION_TEXT ${s2_sub2_Section7} $(DESC_s2_sub2_Section7) + !insertmacro MUI_DESCRIPTION_TEXT ${s2_sub2_Section8} $(DESC_s2_sub2_Section8) + !insertmacro MUI_DESCRIPTION_TEXT ${s2_sub2_Section9} $(DESC_s2_sub2_Section9) + + !insertmacro MUI_DESCRIPTION_TEXT ${s2_sub3_Section1} $(DESC_s2_sub3_Section1) + !insertmacro MUI_DESCRIPTION_TEXT ${s2_sub3_Section2} $(DESC_s2_sub3_Section2) + !insertmacro MUI_DESCRIPTION_TEXT ${s2_sub3_Section3} $(DESC_s2_sub3_Section3) !insertmacro MUI_FUNCTION_DESCRIPTION_END @@ -475,89 +475,88 @@ SectionEnd !include "${path_languages}\*.nsh" ;!addPluginDir "${path_plugins}\" - + Function bgmusic - File /oname=$PLUGINSDIR\loop.wav .\dependencies\loop.wav - BGImage::Sound /NOUNLOAD /LOOP $PLUGINSDIR\loop.wav + File /oname=$PLUGINSDIR\loop.wav .\dependencies\loop.wav + BGImage::Sound /NOUNLOAD /LOOP $PLUGINSDIR\loop.wav FunctionEnd Function .onGUIEnd - BGImage::Sound /STOP + BGImage::Sound /STOP FunctionEnd Function .onInit -var /GLOBAL version -StrCpy $version "1.1beta" + var /GLOBAL version + StrCpy $version "1.1beta" - System::Call 'kernel32::CreateMutexA(i 0, i 0, t "USdx Installer.exe") ?e' + System::Call 'kernel32::CreateMutexA(i 0, i 0, t "USdx Installer.exe") ?e' - Pop $R0 + Pop $R0 - StrCmp $R0 0 +3 - MessageBox MB_OK|MB_ICONEXCLAMATION $(oninit_running) - Abort + StrCmp $R0 0 +3 + MessageBox MB_OK|MB_ICONEXCLAMATION $(oninit_running) + Abort - ReadRegStr $R0 HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${name}" 'DisplayVersion' + ReadRegStr $R0 HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${name}" 'DisplayVersion' - ${If} $R0 == $version - MessageBox MB_YESNO|MB_ICONEXCLAMATION \ - "${name} v.$R0 $(oninit_alreadyinstalled). $\n$\n $(oninit_installagain)" \ - IDYES continue - Abort - ${EndIf} + ${If} $R0 == $version + MessageBox MB_YESNO|MB_ICONEXCLAMATION \ + "${name} v.$R0 $(oninit_alreadyinstalled). $\n$\n $(oninit_installagain)" \ + IDYES continue + Abort + ${EndIf} - ReadRegStr $R1 HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${name}" 'UninstallString' - StrCmp $R1 "" done + ReadRegStr $R1 HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${name}" 'UninstallString' + StrCmp $R1 "" done - ${If} $R0 != $version - MessageBox MB_YESNO|MB_ICONEXCLAMATION \ - "${name} v.$R0 $(oninit_alreadyinstalled). $\n$\n $(oninit_updateusdx) v.$R0 -> v.${version}" \ - IDYES continue - Abort - ${EndIf} + ${If} $R0 != $version + MessageBox MB_YESNO|MB_ICONEXCLAMATION \ + "${name} v.$R0 $(oninit_alreadyinstalled). $\n$\n $(oninit_updateusdx) v.$R0 -> v.${version}" \ + IDYES continue + Abort + ${EndIf} continue: - ReadRegStr $R2 HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${name}" 'UninstallString' - MessageBox MB_YESNO|MB_ICONEXCLAMATION "$(oninit_uninstall)" IDNO done - ExecWait '"$R2" _?=$INSTDIR' + ReadRegStr $R2 HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${name}" 'UninstallString' + MessageBox MB_YESNO|MB_ICONEXCLAMATION "$(oninit_uninstall)" IDNO done + ExecWait '"$R2" _?=$INSTDIR' done: + !insertmacro MUI_LANGDLL_DISPLAY - !insertmacro MUI_LANGDLL_DISPLAY - - !insertmacro INSTALLOPTIONS_EXTRACT_AS ".\settings\settings-1031.ini" "Settings-1031" - !insertmacro INSTALLOPTIONS_EXTRACT_AS ".\settings\settings-1033.ini" "Settings-1033" - !insertmacro INSTALLOPTIONS_EXTRACT_AS ".\settings\settings-1038.ini" "Settings-1038" + !insertmacro INSTALLOPTIONS_EXTRACT_AS ".\settings\settings-1031.ini" "Settings-1031" + !insertmacro INSTALLOPTIONS_EXTRACT_AS ".\settings\settings-1033.ini" "Settings-1033" + !insertmacro INSTALLOPTIONS_EXTRACT_AS ".\settings\settings-1038.ini" "Settings-1038" FunctionEnd Function un.onInit - ${nsProcess::FindProcess} "USdx.exe" $R0 - StrCmp $R0 0 0 +2 - MessageBox MB_YESNO|MB_ICONEXCLAMATION '$(oninit_closeusdx)' IDYES closeit IDNO end + ${nsProcess::FindProcess} "USdx.exe" $R0 + StrCmp $R0 0 0 +2 + MessageBox MB_YESNO|MB_ICONEXCLAMATION '$(oninit_closeusdx)' IDYES closeit IDNO end - closeit: - ${nsProcess::KillProcess} "USdx.exe" $R0 - goto continue +closeit: + ${nsProcess::KillProcess} "USdx.exe" $R0 + goto continue - ${nsProcess::FindProcess} "ultrastardx.exe" $R0 - StrCmp $R0 0 0 +2 - MessageBox MB_YESNO|MB_ICONEXCLAMATION '$(oninit_closeusdx)' IDYES closeusdx IDNO end + ${nsProcess::FindProcess} "ultrastardx.exe" $R0 + StrCmp $R0 0 0 +2 + MessageBox MB_YESNO|MB_ICONEXCLAMATION '$(oninit_closeusdx)' IDYES closeusdx IDNO end - closeusdx: +closeusdx: ${nsProcess::KillProcess} "ultrastardx.exe" $R0 - goto continue + goto continue - end: - ${nsProcess::Unload} - Abort +end: + ${nsProcess::Unload} + Abort - continue: - !insertmacro MUI_LANGDLL_DISPLAY +continue: + !insertmacro MUI_LANGDLL_DISPLAY FunctionEnd -- 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/UAC.nsh | 191 ++++++++++++++++++++++++++++++ installer/UltraStar Deluxe.nsi | 102 ++++++++++++---- installer/dependencies/plugins/UAC.dll | Bin 0 -> 17408 bytes installer/settings/files_main_install.nsh | 14 +-- 4 files changed, 274 insertions(+), 33 deletions(-) create mode 100644 installer/UAC.nsh create mode 100644 installer/dependencies/plugins/UAC.dll (limited to 'installer') diff --git a/installer/UAC.nsh b/installer/UAC.nsh new file mode 100644 index 00000000..b21e72ff --- /dev/null +++ b/installer/UAC.nsh @@ -0,0 +1,191 @@ +/* +======================= +UAC helper include file +....................... + +Macros starting with UAC.I should only be called from the installer and vice versa for UAC.U macros. + +*/ +!ifndef UAC_HDR__INC +!define UAC_HDR__INC +!include LogicLib.nsh + +!define UAC.RunElevatedAndProcessMessages 'UAC::RunElevated ' +!define UAC.Unload 'UAC::Unload ' +!define UAC.StackPush 'UAC::StackPush ' + +/*!macro _UAC.BuildOnInitElevationFunc _funcprefix +Function ${_funcprefix}onInit +!ifmacrodef +FunctionEnd +!macroend*/ + +!macro _UAC.GenerateSimpleFunction _funcprefix _funcName _funcCode +Function ${_funcprefix}${_funcName} +${_funcCode} +#messagebox mb_ok "${_funcprefix}${_funcName}" +FunctionEnd +!macroend + +!macro _UAC.TryDef _d _v +!ifndef ${_d} +!define ${_d} "${_v}" +!endif +!macroend + +!macro _UAC.InitStrings _modeprefix +!insertmacro _UAC.TryDef UACSTR.UnDataFile "UAC.dat" +!insertmacro _UAC.TryDef UACSTR.${_modeprefix}ElvWinErr "Unable to elevate , error $0" +!ifNdef __UNINSTALL__ + !insertmacro _UAC.TryDef UACSTR.${_modeprefix}ElvAbortReqAdmin "This installer requires admin access, aborting!" + !insertmacro _UAC.TryDef UACSTR.${_modeprefix}ElvMustTryAgain "This installer requires admin access, try again" + !else + !insertmacro _UAC.TryDef UACSTR.${_modeprefix}ElvAbortReqAdmin "This uninstaller requires admin access, aborting!" + !insertmacro _UAC.TryDef UACSTR.${_modeprefix}ElvMustTryAgain "This uninstaller requires admin access, try again" + !endif +!macroend + +!ifmacroNdef _UAC.GenerateUninstallerTango +!macro _UAC.GenerateUninstallerTango UninstallerFileName +!ifdef __GLOBAL__ + !error "UAC: Needs to be called inside a function" + !endif +!ifNdef __UNINSTALL__ + !error "UAC: _UAC.GenerateUninstallerTango should only be called by uninstaller, see http://forums.winamp.com/showthread.php?threadid=280330" + !endif +!ifNdef UAC_UNINSTALLERTANGOFORALLPLATFORMS + !include WinVer.nsh + !endif +!insertmacro _UAC.InitStrings 'U.' +ReadIniStr $0 "$ExeDir\${UACSTR.UnDataFile}" UAC "Un.Ready" +${IF} $0 != 1 +!ifNdef UAC_UNINSTALLERTANGOFORALLPLATFORMS +${AndIf} ${AtLeastWinVista} +!endif + InitPluginsDir + WriteIniStr "$PluginsDir\${UACSTR.UnDataFile}" UAC "Un.Ready" 1 + CopyFiles /SILENT "$EXEPATH" "$PluginsDir\${UninstallerFileName}" + StrCpy $0 "" + ${IfThen} ${Silent} ${|} StrCpy $0 "/S " ${|} + ExecWait '"$PluginsDir\${UninstallerFileName}" $0/NCRC _?=$INSTDIR' $0 + SetErrorLevel $0 + Quit + ${EndIf} +!macroend +!endif + +!ifmacroNdef _UAC.GenerateOnInitElevationCode +!macro _UAC.GenerateOnInitElevationCode _modeprefix +!ifndef __FUNCTION__ + !error "UAC: Needs to be called inside a function" + !endif +!insertmacro _UAC.InitStrings ${_modeprefix} +!define _UAC.GOIECUniq L${__LINE__} +UAC_Elevate_${_UAC.GOIECUniq}: +UAC::RunElevated +StrCmp 1223 $0 UAC_ElevationAborted_${_UAC.GOIECUniq} ; UAC dialog aborted by user? +StrCmp 0 $0 0 UAC_Err_${_UAC.GOIECUniq} ; Error? +StrCmp 1 $1 0 UAC_Success_${_UAC.GOIECUniq} ;Are we the real deal or just the wrapper? +Quit +UAC_Err_${_UAC.GOIECUniq}: +MessageBox mb_iconstop "${UACSTR.${_modeprefix}ElvWinErr}" +Abort +UAC_ElevationAborted_${_UAC.GOIECUniq}: +MessageBox mb_iconstop "${UACSTR.${_modeprefix}ElvAbortReqAdmin}" +Abort +UAC_Success_${_UAC.GOIECUniq}: +# if $0==0 && $3==1, we are a member of the admin group (Any OS) +# if $0==0 && $1==0, UAC not supported (Probably create a marker file + FileOpen $1 "$INSTDIR\config.use" a + FileClose $1 +end: + FileClose $0 +FunctionEnd + +; Determines the directory used for config.ini and other user +; settings and data. +; Sets $UseAppData, $UserDataPath and $ConfigIniPath +Function DetermineUserDataDir + Delete "$INSTDIR\config.use" + !insertmacro UAC.CallFunctionAsUser CheckInstDirUserPermissions + IfFileExists "$INSTDIR\config.use" 0 notexists + StrCpy $UseAppData false + StrCpy $UserDataPath "$INSTDIR" + Goto end +notexists: + StrCpy $UseAppData true + SetShellVarContext current + StrCpy $UserDataPath "$APPDATA\ultrastardx" + SetShellVarContext all +end: + Delete "$INSTDIR\config.use" + StrCpy $ConfigIniPath "$UserDataPath\config.ini" +FunctionEnd + Function Settings !insertmacro INSTALLOPTIONS_WRITE "Settings-$LANGUAGE" "Field 18" "State" "$INSTDIR\songs" @@ -187,32 +240,17 @@ Function Settings !insertmacro INSTALLOPTIONS_READ $sorting "Settings-$LANGUAGE" "Field 15" "State" !insertmacro INSTALLOPTIONS_READ $songdir "Settings-$LANGUAGE" "Field 18" "State" - ; Write all variables to config.ini - - var /GLOBAL path_config - var /GLOBAL path_configini - - ${If} ${AtLeastWinVista} - SetShellVarContext current - StrCpy $path_config "$APPDATA\ultrastardx" - SetShellVarContext all - ${Else} - StrCpy $path_config "$INSTDIR" - ${EndIf} - - StrCpy $path_configini "$path_config\config.ini" - - WriteINIStr "$path_configini" "Game" "Language" "$language2" - WriteINIStr "$path_configini" "Game" "Tabs" "$tabs" - WriteINIStr "$path_configini" "Game" "Sorting" "$sorting" + WriteINIStr "$ConfigIniPath" "Game" "Language" "$language2" + WriteINIStr "$ConfigIniPath" "Game" "Tabs" "$tabs" + WriteINIStr "$ConfigIniPath" "Game" "Sorting" "$sorting" - WriteINIStr "$path_configini" "Graphics" "FullScreen" "$fullscreen" - WriteINIStr "$path_configini" "Graphics" "Resolution" "$resolution" + WriteINIStr "$ConfigIniPath" "Graphics" "FullScreen" "$fullscreen" + WriteINIStr "$ConfigIniPath" "Graphics" "Resolution" "$resolution" ${If} $songdir != "$INSTDIR\songs" - WriteINIStr "$path_configini" "Directories" "SongDir1" "$songdir" + WriteINIStr "$ConfigIniPath" "Directories" "SongDir1" "$songdir" ${EndIf} - + FunctionEnd ; Settings page End !insertmacro MUI_PAGE_FINISH @@ -333,6 +371,8 @@ Section $(name_section1) Section1 SetOutPath $INSTDIR SetOverwrite try + Call DetermineUserDataDir + !include "${path_settings}\files_main_install.nsh" ; Create Shortcuts: @@ -487,6 +527,8 @@ FunctionEnd Function .onInit + ${UAC.I.Elevate.AdminOnly} + var /GLOBAL version StrCpy $version "1.1beta" @@ -560,3 +602,11 @@ continue: !insertmacro MUI_LANGDLL_DISPLAY FunctionEnd + +Function .onInstFailed + ${UAC.Unload} +FunctionEnd + +Function .onInstSuccess + ${UAC.Unload} +FunctionEnd \ No newline at end of file diff --git a/installer/dependencies/plugins/UAC.dll b/installer/dependencies/plugins/UAC.dll new file mode 100644 index 00000000..edf21305 Binary files /dev/null and b/installer/dependencies/plugins/UAC.dll differ 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/UltraStar Deluxe.nsi | 4 ++-- installer/settings/variables.nsh | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'installer') diff --git a/installer/UltraStar Deluxe.nsi b/installer/UltraStar Deluxe.nsi index 125dfefc..f83cb99c 100644 --- a/installer/UltraStar Deluxe.nsi +++ b/installer/UltraStar Deluxe.nsi @@ -530,7 +530,7 @@ Function .onInit ${UAC.I.Elevate.AdminOnly} var /GLOBAL version - StrCpy $version "1.1beta" + StrCpy $version "1.1RC" System::Call 'kernel32::CreateMutexA(i 0, i 0, t "USdx Installer.exe") ?e' @@ -609,4 +609,4 @@ FunctionEnd Function .onInstSuccess ${UAC.Unload} -FunctionEnd \ No newline at end of file +FunctionEnd 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') 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/languages/Polish.nsh | 131 ++++++++++++++++++++++++++++ installer/settings/settings-1045.ini | 161 +++++++++++++++++++++++++++++++++++ 2 files changed, 292 insertions(+) create mode 100644 installer/languages/Polish.nsh create mode 100644 installer/settings/settings-1045.ini (limited to 'installer') diff --git a/installer/languages/Polish.nsh b/installer/languages/Polish.nsh new file mode 100644 index 00000000..00d04d8e --- /dev/null +++ b/installer/languages/Polish.nsh @@ -0,0 +1,131 @@ +; ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ +; UltraStar Deluxe Installer - Language file: Polish +; ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ + +LangString abort_install ${LANG_POLISH} "Czy jesteś pewien że chcesz zatrzymać instalację ?" +LangString abort_uninstall ${LANG_POLISH} "Czy jesteś pewien że chcesz zatrzymać odinstalowywanie ?" +LangString oninit_running ${LANG_POLISH} "Instajacja jest już uruchomiona." +LangString oninit_installagain ${LANG_POLISH} "Jesteś pewien że chcesz zainstalować jeszcze raz ?" +LangString oninit_alreadyinstalled ${LANG_POLISH} "Jest obecnie zainstalowany" +LangString oninit_closeusdx ${LANG_POLISH} "nie może być odinstalowany dopóki jest uruchomiony! Czy chcesz zamknąć go ?" +LangString oninit_updateusdx ${LANG_POLISH} "Do you want to update the installation from:" +LangString oninit_uninstall ${LANG_POLISH} "Czy chcesz odinstalować starą wersję ? (rekomendowane)" + +LangString update_connect ${LANG_POLISH} "Sprawdź połączenie z insternetm i sprawdź nowe wersje" +LangString button_next ${LANG_POLISH} "Dalej >" +LangString button_close ${LANG_POLISH} "Zamknij" +LangString update_information ${LANG_POLISH} "Możesz sprawdzić czy jest nowsza wersja 'UltraStar Deluxe'. Aby to zrobić połącz się z internetm. Jeśli nowa wersja zostanie znaleziona, będzie można ją zainstalować." + +LangString delete_components ${LANG_POLISH} "Takżę usunąć następujące składniki:" +LangString delete_covers ${LANG_POLISH} "Okładka?" +LangString delete_highscores ${LANG_POLISH} "Wyniki?" +LangString delete_config ${LANG_POLISH} "Koniguracja?" +LangString delete_screenshots ${LANG_POLISH} "Zrzuty ekranów?" +LangString delete_playlists ${LANG_POLISH} "Playlisty?" +LangString delete_songs ${LANG_POLISH} "Usunąć piosenki? UWAGA: Wszystkie pliki w katalogu InstallationDir\songs będą usunięte(!)" + +LangString update_check_older ${LANG_POLISH} "Twoja werjsa $R0 jest przestarzała. Nowa wersja $1 UltraStar'a Deluxe jest już dostępna. Czy chcesz dokonać aktualizacji ?" +LangString update_check_equal ${LANG_POLISH} "Obecnie zainstalowana wersja $R0 jest najbardziej aktualna. Nie ma nowszych wersji." +LangString update_check_newer ${LANG_POLISH} "Twoja obecnie zainstalowana wersja $R0 jest nowsza niż $\n$\robecnie wydana wersja $1 UltraStar'a Deluxe. Nie ma nowszych aktualizacji." +LangString update_check_failed ${LANG_POLISH} "Poszukiwanie nowyszch wersji zakończyło się błędem. Czy chcesz odwiedzić stronę główną i sprawdzić ręcznie ?" + +; Welcome Page: + +LangString page_welcome_title_update ${LANG_POLISH} "Witamy w kreatorze aktualizacji programu UltraStar Deluxe" +LangString page_welcome_txt_update ${LANG_POLISH} "Ten kreator przeprowadzi cię przez proces aktualizacji gry UltraStar Deluxe. UltraStar Deluxe jest bezpłatną i Otwartą grą Karaoke, którą można porównać z SingStar'em.$\n$\r$\n$\rZespół UltraStar Deluxe życzy miłej zabawy.$\n$\rStrona projektu: http://www.ultrastardeluxe.org$\n$\rForum wsparcia: http://forum.ultrastardeluxe.org" +LangString page_welcome_title ${LANG_POLISH} "Witamy w kreatorze instalacji programu UltraStar Deluxe" +LangString page_welcome_txt ${LANG_POLISH} "Ten kreator przeprowadzi cię przez proces instalacji gry UltraStar Deluxe. UltraStar Deluxe jest bezpłatną i Otwartą grą Karaoke, którą można porównać z SingStar'em.$\n$\r$\n$\rZespół UltraStar Deluxe życzy miłej zabawy.$\n$\rStrona projektu: http://www.ultrastardeluxe.org$\n$\rForum wsparcia: http://forum.ultrastardeluxe.org" +LangString page_un_welcome_title ${LANG_POLISH} "Witamy w kreatorze deinstalacji gry UltraStar Deluxe" + +; Components Page: + +LangString page_components_info ${LANG_POLISH} "Najedź myszką na komponent, aby zobaczyć szczegóły" + +; Custom Page + +LangString page_settings_fullscreen ${LANG_POLISH} "Tryb Pełnoekranowy" +LangString page_settings_subtitle ${LANG_POLISH} "Wybierz ustawienia dogodne dla Ciebie." + +; Finish Page: + +LangString page_finish_txt ${LANG_POLISH} "UltraStar Deluxe został poprawnie zainstalowany na twoim komputerze.$\n$\r$\n$\rOdwiedź Naszą stronę aby otrzymać najnowsze wiadomości i aktualizację." +LangString page_finish_linktxt ${LANG_POLISH} "Strona Projektu" +LangString page_finish_desktop ${LANG_POLISH} "Czy stwórzyć skrót na Pulpicie ?" + +; Start Menu and Shortcuts + +LangString sm_shortcut ${LANG_POLISH} "Graj w UltraStar Deluxe" +LangString sm_uninstall ${LANG_POLISH} "Odinstaluj" +LangString sm_website ${LANG_POLISH} "Strona Projektu" +LangString sm_license ${LANG_POLISH} "Licencja" +LangString sm_readme ${LANG_POLISH} "Readme" +LangString sm_songs ${LANG_POLISH} "Piosenki" +LangString sm_documentation ${LANG_POLISH} "Dokumentacja" + +LangString sc_play ${LANG_POLISH} "Graj" +LangString sc_desktop ${LANG_POLISH} "Czy stwórzyć skrót na Pulpicie ?" + +; Sections and SectionGroups + +LangString name_section1 ${LANG_POLISH} "Główne komponenty" +LangString name_section2 ${LANG_POLISH} "Piosenki" +LangString name_s2_sub1 ${LANG_POLISH} "Jonathan Coulton" +LangString name_s2_sub2 ${LANG_POLISH} "Shearer" +LangString name_s2_sub3 ${LANG_POLISH} "Wise Guys" +LangString name_s2_sub4 ${LANG_POLISH} "Pornophonique" + +LangString DESC_Section1 ${LANG_POLISH} "To są podstawowe pliki potrzebe przez UltraStar Deluxe" +LangString DESC_Section2 ${LANG_POLISH} "Możesz wybrać które piosenki chcesz ściągnąć (Wymagane połączenie z internetem!)" +LangString DESC_Section2_sub1 ${LANG_POLISH} "Możesz wybrać które piosenki Jonathan Coulton (CC by-nc 3.0) chcesz zainstalować." +LangString DESC_Section2_sub2 ${LANG_POLISH} "Możesz wybrać które piosenki Shearer (CC by-nc-sa 2.0 / 3.0) chcesz zainstalować." +LangString DESC_Section2_sub3 ${LANG_POLISH} "Możesz wybrać które piosenki Wise Guys chcesz zainstalować." +LangString DESC_Section2_sub4 ${LANG_POLISH} "Możesz wybrać które piosenki Pornophonique chcesz zainstalować." + +LangString DESC_g2Section2 ${LANG_POLISH} "Ściągnij piosenkę 'Dead Smiling Pirates - I 18' (CC by-nc-nd 2.5)." +LangString DESC_g2Section3 ${LANG_POLISH} "Ściągnij piosenkę 'Joshua Morin - On The Run' (CC by-sa 2.5)." +LangString DESC_g2Section4 ${LANG_POLISH} "Ściągnij piosenkę 'Pornophonique - Space Invaders' (CC by-nc-nd 2.0)." +LangString DESC_g2Section5 ${LANG_POLISH} "Ściągnij piosenkę 'Steven Dunston - Northern Star' (CC by-nc-sa 2.5)." +LangString DESC_g2Section1 ${LANG_POLISH} "Ściągnij piosenkę 'Bodo Wartke - Liebeslied (Love Song)'." +LangString DESC_g2Section6 ${LANG_POLISH} "Ściągnij piosenkę 'Pornophonique - Space Invaders (Karaoke)' (CC by-nc-nd 2.0)." + +LangString DESC_s2_sub1_Section1 ${LANG_POLISH} "Ściągnij piosenkę 'Monkey Shines'." +LangString DESC_s2_sub1_Section2 ${LANG_POLISH} "Ściągnij piosenkę 'I Crush Everything'." +LangString DESC_s2_sub1_Section3 ${LANG_POLISH} "Ściągnij piosenkę 'Not About You'." +LangString DESC_s2_sub1_Section4 ${LANG_POLISH} "Ściągnij piosenkę 'Mr. Fancy Pants'." +LangString DESC_s2_sub1_Section5 ${LANG_POLISH} "Ściągnij piosenkę 'Big Bad World One'." +LangString DESC_s2_sub1_Section6 ${LANG_POLISH} "Ściągnij piosenkę 'Flickr [incl. video]'." +LangString DESC_s2_sub1_Section7 ${LANG_POLISH} "Ściągnij piosenkę 'My Beige Bear'." +LangString DESC_s2_sub1_Section8 ${LANG_POLISH} "Ściągnij piosenkę 'The Future Soon'." +LangString DESC_s2_sub1_Section9 ${LANG_POLISH} "Ściągnij piosenkę 'Ikea'." +LangString DESC_s2_sub1_Section10 ${LANG_POLISH} "Ściągnij piosenkę 'Furry Old Lobster'." +LangString DESC_s2_sub1_Section11 ${LANG_POLISH} "Ściągnij piosenkę 'Code Monkey [incl. video]'." +LangString DESC_s2_sub1_Section12 ${LANG_POLISH} "Ściągnij piosenkę 'I´m Your Moon'." +LangString DESC_s2_sub1_Section13 ${LANG_POLISH} "Ściągnij piosenkę 'First Of May'." +LangString DESC_s2_sub1_Section14 ${LANG_POLISH} "Ściągnij piosenkę 'Dance, Soterios Johnson, Dance'." +LangString DESC_s2_sub1_Section15 ${LANG_POLISH} "Ściągnij piosenkę 'A Talk With George'." +LangString DESC_s2_sub1_Section16 ${LANG_POLISH} "Ściągnij piosenkę 'Creepy Doll [incl. video]'." +LangString DESC_s2_sub1_Section17 ${LANG_POLISH} "Ściągnij piosenkę 'That Spells DNA'." +LangString DESC_s2_sub1_Section18 ${LANG_POLISH} "Ściągnij piosenkę 'When You Go'." +LangString DESC_s2_sub1_Section19 ${LANG_POLISH} "Ściągnij piosenkę 'Better'." +LangString DESC_s2_sub1_Section20 ${LANG_POLISH} "Ściągnij piosenkę 'Shop Vac'." +LangString DESC_s2_sub1_Section21 ${LANG_POLISH} "Ściągnij piosenkę 'I Feel Fantastic'." +LangString DESC_s2_sub1_Section22 ${LANG_POLISH} "Ściągnij piosenkę 'Re: Your Brains'." +LangString DESC_s2_sub1_Section23 ${LANG_POLISH} "Ściągnij piosenkę 'Skullcrusher Mountain'." +LangString DESC_s2_sub1_Section24 ${LANG_POLISH} "Ściągnij piosenkę 'Chiron Beta Prime [incl. video]'." + +LangString DESC_s2_sub2_Section1 ${LANG_POLISH} "Ściągnij piosenkę '69'." +LangString DESC_s2_sub2_Section2 ${LANG_POLISH} "Ściągnij piosenkę '69 (Karaoke)'." +LangString DESC_s2_sub2_Section3 ${LANG_POLISH} "Ściągnij piosenkę 'Can't stop it'." +LangString DESC_s2_sub2_Section4 ${LANG_POLISH} "Ściągnij piosenkę 'Can't stop it (Karaoke)'." +LangString DESC_s2_sub2_Section5 ${LANG_POLISH} "Ściągnij piosenkę 'In My Hand'." +LangString DESC_s2_sub2_Section6 ${LANG_POLISH} "Ściągnij piosenkę 'Man Song'." +LangString DESC_s2_sub2_Section7 ${LANG_POLISH} "Ściągnij piosenkę 'Man Song (Karaoke)'." +LangString DESC_s2_sub2_Section8 ${LANG_POLISH} "Ściągnij piosenkę 'Stay with me'." +LangString DESC_s2_sub2_Section9 ${LANG_POLISH} "Ściągnij piosenkę 'Stay with me (Karaoke)'." + +LangString DESC_s2_sub3_Section1 ${LANG_POLISH} "Ściągnij piosenkę 'Lebendig und kräftig und schärfer'." +LangString DESC_s2_sub3_Section2 ${LANG_POLISH} "Ściągnij piosenkę 'Mensch, wo bist du?'." +LangString DESC_s2_sub3_Section3 ${LANG_POLISH} "Ściągnij piosenkę 'Mensch, wo bist du? (Karaoke)'." + +; Optional Themes +; (not available) \ No newline at end of file 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') 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 9a1031db332cdd8d9a89a5372aad07071ecb92cf Mon Sep 17 00:00:00 2001 From: canni0 Date: Sun, 13 Jun 2010 15:00:39 +0000 Subject: - added polish language to installer git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@2520 b956fd51-792f-4845-bead-9b4dfca2ff2c --- installer/UltraStar Deluxe.nsi | 2 ++ 1 file changed, 2 insertions(+) (limited to 'installer') diff --git a/installer/UltraStar Deluxe.nsi b/installer/UltraStar Deluxe.nsi index f83cb99c..6eeeefb1 100644 --- a/installer/UltraStar Deluxe.nsi +++ b/installer/UltraStar Deluxe.nsi @@ -509,6 +509,7 @@ SectionEnd !insertmacro MUI_LANGUAGE "English" !insertmacro MUI_LANGUAGE "German" !insertmacro MUI_LANGUAGE "Hungarian" +!insertmacro MUI_LANGUAGE "Polish" !insertmacro MUI_RESERVEFILE_LANGDLL @@ -573,6 +574,7 @@ done: !insertmacro INSTALLOPTIONS_EXTRACT_AS ".\settings\settings-1031.ini" "Settings-1031" !insertmacro INSTALLOPTIONS_EXTRACT_AS ".\settings\settings-1033.ini" "Settings-1033" !insertmacro INSTALLOPTIONS_EXTRACT_AS ".\settings\settings-1038.ini" "Settings-1038" + !insertmacro INSTALLOPTIONS_EXTRACT_AS ".\settings\settings-1045.ini" "Settings-1045" FunctionEnd -- 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/UltraStar Deluxe.nsi | 2 +- installer/settings/variables.nsh | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'installer') diff --git a/installer/UltraStar Deluxe.nsi b/installer/UltraStar Deluxe.nsi index 6eeeefb1..e98edc54 100644 --- a/installer/UltraStar Deluxe.nsi +++ b/installer/UltraStar Deluxe.nsi @@ -531,7 +531,7 @@ Function .onInit ${UAC.I.Elevate.AdminOnly} var /GLOBAL version - StrCpy $version "1.1RC" + StrCpy $version "1.1" System::Call 'kernel32::CreateMutexA(i 0, i 0, t "USdx Installer.exe") ?e' 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 From e9a665fc7f43f727a1bfbab9b5101ef4e24389be Mon Sep 17 00:00:00 2001 From: canni0 Date: Sun, 10 Oct 2010 21:14:05 +0000 Subject: - Updated documentation (massive thx to pete) git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@2658 b956fd51-792f-4845-bead-9b4dfca2ff2c --- installer/dependencies/documents/documentation.pdf | Bin 575306 -> 581246 bytes 1 file changed, 0 insertions(+), 0 deletions(-) (limited to 'installer') diff --git a/installer/dependencies/documents/documentation.pdf b/installer/dependencies/documents/documentation.pdf index 16267bb9..ae99a860 100644 Binary files a/installer/dependencies/documents/documentation.pdf and b/installer/dependencies/documents/documentation.pdf differ -- cgit v1.2.3