update to trunk rev. 2391

git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/branches/experimental@2401 b956fd51-792f-4845-bead-9b4dfca2ff2c

25 files changed, 2012 insertions, 1869 deletions

diff --git a/cmake/installer/UltraStar Deluxe.nsi b/cmake/installer/UltraStar Deluxe.nsi
index a6f37e2a..13cf46d0 100644
--- a/cmake/installer/UltraStar Deluxe.nsi
+++ b/cmake/installer/UltraStar Deluxe.nsi
@@ -16,14 +16,16 @@
 

 !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"

+

+; MultiLanguage - Show all languages:

+!define MUI_LANGDLL_ALLLANGUAGES

 

 !addPluginDir "${path_plugins}\"

 

 !include "${path_settings}\variables.nsh"

-!include "${path_settings}\GameExplorer.nsh"

 !include "${path_settings}\functions.nsh"

 

 ; ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~

@@ -31,10 +33,12 @@
 ; ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~

 

 SetCompress Auto

-SetCompressor /SOLID lzma

+SetCompressor lzma

 SetCompressorDictSize 32

 SetDatablockOptimize On

 

+CRCCheck on

+

 XPStyle on

 

 Name "${name} v.${version}"

@@ -42,6 +46,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 +58,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 +84,8 @@ RequestExecutionLevel admin
 ; Pages Installation Routine Settings

 ; ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~

 

+!define MUI_CUSTOMFUNCTION_GUIINIT bgmusic

+

 ; Welcome Page:

 

 !define MUI_WELCOMEPAGE_TITLE_3LINES

@@ -133,7 +140,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

@@ -144,94 +151,70 @@ 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:

 

-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

 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

 

-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} "[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"

+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}

 

-${WriteToConfig} "[Lyrics]$\r$\n" "$INSTDIR\config.ini"

-${WriteToConfig} "LyricsFont=Plain$\r$\n" "$INSTDIR\config.ini"

-${WriteToConfig} "LyricsEffect=Slide$\r$\n" "$INSTDIR\config.ini"

+StrCpy $path_configini "$path_config\config.ini"

 

-${If} $animations != "Off"

+WriteINIStr "$path_configini" "Game" "Language" "$language2"

+WriteINIStr "$path_configini" "Game" "Tabs" "$tabs"

+WriteINIStr "$path_configini" "Game" "Sorting" "$sorting"

 

-${WriteToConfig} "[Advanced]$\r$\n" "$INSTDIR\config.ini"

-

-${WriteToConfig} "LineBonus=At Notes$\r$\n" "$INSTDIR\config.ini"

+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

 

-

 !insertmacro MUI_PAGE_FINISH

 

 ; ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~

@@ -248,10 +231,32 @@ 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

 

-	nsDialogs::OnClick /NOUNLOAD $CHECKBOX $0

+	${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::Show

@@ -260,19 +265,53 @@ FunctionEnd
 

 Function un.DeleteAll

 

-${NSD_GetState} $CHECKBOX $checkbox_state

+${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

+

+${If} $CB_COVERS_State == "1" ; Remove covers

+ RMDir /r "$INSTDIR\covers"

+ SetShellVarContext current	

+ RMDir /r "$APPDATA\ultrastardx\covers"

+ SetShellVarContext all

+${EndIf}

 

-${If} $checkbox_state == "1"

+${If} $CB_CONFIG_State == "1" ; Remove config

+ SetShellVarContext current

+ Delete "$APPDATA\ultrastardx\config.ini" 

+ SetShellVarContext all

+ Delete "$INSTDIR\config.ini"

+${EndIf}

 

- RMDir /r "$INSTDIR\Songs"

- RMDir /r "$INSTDIR\Covers"

+${If} $CB_SCORES_State == "1" ; Remove highscores

+ SetShellVarContext current

+ Delete "$APPDATA\ultrastardx\Ultrastar.db" 

+ SetShellVarContext all

  Delete "$INSTDIR\Ultrastar.db"

+${EndIf}

 

-${Else}

-

-; If checkbox_state = 0

+${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}

 

 

@@ -296,62 +335,31 @@ Section $(name_section1) Section1
 

 !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\$(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}"

@@ -365,1024 +373,14 @@ 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} $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\"

-

-  Delete "$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} $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\"

-

-  Delete "$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} $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\"

-

-  Delete "$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} $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\"

-

-  Delete "$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} $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\"

-

-  Delete "$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} $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\"

-

-  Delete "$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} $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\"

-

-  Delete "$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} $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\"

-

-  Delete "$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} $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\"

-

-  Delete "$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} $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\"

-

-  Delete "$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} $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\"

-

-  Delete "$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} $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\"

-

-  Delete "$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} $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\"

-

-  Delete "$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} $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\"

-

-  Delete "$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} $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\"

-

-  Delete "$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} $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\"

-

-  Delete "$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} $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\"

-

-  Delete "$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} $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\"

-

-  Delete "$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} $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\"

-

-  Delete "$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} $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\"

-

-  Delete "$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} $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\"

-

-  Delete "$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} $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\"

-

-  Delete "$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} $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\"

-

-  Delete "$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} $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\"

-

-  Delete "$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} $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\"

-

-  Delete "$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} $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\"

-

-  Delete "$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} $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\"

-

-  Delete "$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} $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\"

-

-  Delete "$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} $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\"

-

-  Delete "$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} $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\"

-

-  Delete "$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} $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\"

-

-  Delete "$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} $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\"

-

-  Delete "$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} $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\"

-

-  Delete "$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} $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\"

-

-  Delete "$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} $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\"

-

-  Delete "$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} $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\"

-

-  Delete "$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} $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\"

-

-  Delete "$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} $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\"

-

-  Delete "$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} $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\"

-

-  Delete "$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} $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\"

-

-  Delete "$TEMP\Song-WiseGuys-MWBD.zip"

-

-  SetOutPath "$INSTDIR"

-

-SectionEnd

-

-SectionGroupEnd

-

-SectionGroupEnd

+ !include "${path_settings}\files_opt_songs.nsh"

 

 ;------------------------------------

 ; OPTIONAL THEMES (Section 3)

 ;------------------------------------

 

-SectionGroup $(name_section3) Section3

-

- Section /o "Orange" g3Section1

-   AddSize 1291

-

-; Download theme orange:

-  NSISdl::download /TIMEOUT=50000 ${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:

-  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

-

-  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"

-

-  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\"

-

-  Delete "$TEMP\Theme-iStar.zip"

-

-  SetOutPath "$INSTDIR"

-

-SectionEnd

-

-SectionGroupEnd

+; No additional themes available 

+; for current version of ultrastardx

 

 ;------------------------------------

 ; UNINSTALL (Section 4)

@@ -1397,14 +395,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,13 +411,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)

@@ -1465,14 +458,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

 

@@ -1482,18 +468,30 @@ SectionEnd
 

 !insertmacro MUI_LANGUAGE "English"

 !insertmacro MUI_LANGUAGE "German"

+!insertmacro MUI_LANGUAGE "Hungarian"

 

 !insertmacro MUI_RESERVEFILE_LANGDLL

 

 !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'

+  System::Call 'kernel32::CreateMutexA(i 0, i 0, t "USdx Installer.exe") ?e'

 

   Pop $R0

 

@@ -1506,28 +504,34 @@ StrCpy $version "1.1a"
   ${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

 

   !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

 

@@ -1537,10 +541,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/cmake/installer/dependencies/dll/put game dlls here b/cmake/installer/dependencies/dll/put game dlls here
new file mode 100644
index 00000000..e69de29b
--- /dev/null
+++ b/cmake/installer/dependencies/dll/put game dlls here
diff --git a/cmake/installer/dependencies/documents/documentation.pdf b/cmake/installer/dependencies/documents/documentation.pdf
new file mode 100644
index 00000000..16267bb9
--- /dev/null
+++ b/cmake/installer/dependencies/documents/documentation.pdf
diff --git a/cmake/installer/dependencies/documents/license.txt b/cmake/installer/dependencies/documents/license.txt
new file mode 100644
index 00000000..66f35b98
--- /dev/null
+++ b/cmake/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/cmake/installer/dependencies/images/header.bmp b/cmake/installer/dependencies/images/header.bmp
new file mode 100644
index 00000000..058eafd3
--- /dev/null
+++ b/cmake/installer/dependencies/images/header.bmp
diff --git a/cmake/installer/dependencies/images/side.bmp b/cmake/installer/dependencies/images/side.bmp
new file mode 100644
index 00000000..3883fa09
--- /dev/null
+++ b/cmake/installer/dependencies/images/side.bmp
diff --git a/cmake/installer/dependencies/loop.wav b/cmake/installer/dependencies/loop.wav
new file mode 100644
index 00000000..8a252921
--- /dev/null
+++ b/cmake/installer/dependencies/loop.wav
diff --git a/cmake/installer/dependencies/plugins/NSISdl.dll b/cmake/installer/dependencies/plugins/NSISdl.dll
new file mode 100644
index 00000000..a3675054
--- /dev/null
+++ b/cmake/installer/dependencies/plugins/NSISdl.dll
diff --git a/cmake/installer/dependencies/plugins/ZipDLL.dll b/cmake/installer/dependencies/plugins/ZipDLL.dll
new file mode 100644
index 00000000..5925d591
--- /dev/null
+++ b/cmake/installer/dependencies/plugins/ZipDLL.dll
diff --git a/cmake/installer/dependencies/plugins/nsProcess.dll b/cmake/installer/dependencies/plugins/nsProcess.dll
new file mode 100644
index 00000000..064097a3
--- /dev/null
+++ b/cmake/installer/dependencies/plugins/nsProcess.dll
diff --git a/cmake/installer/install.ico b/cmake/installer/install.ico
new file mode 100644
index 00000000..fc1d0797
--- /dev/null
+++ b/cmake/installer/install.ico
diff --git a/cmake/installer/languages/English.nsh b/cmake/installer/languages/English.nsh
index 63901b87..a3325d5b 100644
--- a/cmake/installer/languages/English.nsh
+++ b/cmake/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, 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."

@@ -26,10 +33,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:

@@ -54,6 +59,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,63 +72,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_section3 ${LANG_ENGLISH} "Themes"

+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_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)."

-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_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
+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/cmake/installer/languages/German.nsh b/cmake/installer/languages/German.nsh
index 7f438e9d..56507ec5 100644
--- a/cmake/installer/languages/German.nsh
+++ b/cmake/installer/languages/German.nsh
@@ -2,20 +2,27 @@
 ; 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 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, 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."

@@ -25,16 +32,16 @@ LangString update_check_failed ${LANG_GERMAN} "Die Aktualisierungsprüfung ist fe
 ; 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,17 +50,18 @@ 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?"

 

 ; 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,63 +74,57 @@ 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 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 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)."

-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_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_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."

+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/cmake/installer/languages/Hungarian.nsh b/cmake/installer/languages/Hungarian.nsh
new file mode 100644
index 00000000..198251f6
--- /dev/null
+++ b/cmake/installer/languages/Hungarian.nsh
@@ -0,0 +1,133 @@
+; ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~

+; UltraStar Deluxe Installer - Language file: Hungarian

+; ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~

+; Translation by Gergely BOR <borg42+ultrastardx at gmail.com>.

+

+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 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_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."

+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 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."

+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/cmake/installer/languages/translations.txt b/cmake/installer/languages/translations.txt
new file mode 100644
index 00000000..9d5946e8
--- /dev/null
+++ b/cmake/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/cmake/installer/settings/GameExplorer.nsh b/cmake/installer/settings/GameExplorer.nsh
deleted file mode 100644
index d5056661..00000000
--- a/cmake/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/cmake/installer/settings/files_main_install.nsh b/cmake/installer/settings/files_main_install.nsh
index c2cdf727..a79d4991 100644
--- a/cmake/installer/settings/files_main_install.nsh
+++ b/cmake/installer/settings/files_main_install.nsh
@@ -2,55 +2,89 @@
 ; 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

-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 "$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

 

-File /r ..\game\themes

-File /r ..\game\languages

-File /r ..\game\sounds

-File /r ..\game\fonts

-File /r ..\installerdependencies\visuals

+SetOutPath "$INSTDIR"

+

+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:

 

-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"

+SetOutPath "$INSTDIR"
\ No newline at end of file
diff --git a/cmake/installer/settings/files_main_uninstall.nsh b/cmake/installer/settings/files_main_uninstall.nsh
index af61cb0b..ed2259bf 100644
--- a/cmake/installer/settings/files_main_uninstall.nsh
+++ b/cmake/installer/settings/files_main_uninstall.nsh
@@ -2,17 +2,16 @@
 ; UltraStar Deluxe Uninstaller: Main components

 ; ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~

 

-

 ; Delete created Icons in startmenu

 

  SetShellVarContext all

-

  RMDir /r "$SMPROGRAMS\$ICONS_GROUP\"

 

 ; Delete created Icon on Desktop

 

  Delete "$Desktop\Play UltraStar Deluxe.lnk"

  Delete "$Desktop\UltraStar Deluxe spielen.lnk"

+ Delete "$Desktop\UltraStar Deluxe karaoke.lnk"

 

 ; Remove dirs

 

@@ -21,32 +20,41 @@
  RMDir /r "$INSTDIR\fonts"

  RMDir /r "$INSTDIR\languages"

  RMDir /r "$INSTDIR\visuals"

+ RMDir /r "$INSTDIR\resources"

  RMDir /r "$INSTDIR\sounds"

 

 ; 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\Benchmark.log"

  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\avfilter-1.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 +62,46 @@
  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\Benchmark.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/cmake/installer/settings/files_opt_songs.nsh b/cmake/installer/settings/files_opt_songs.nsh
new file mode 100644
index 00000000..d8d4ef28
--- /dev/null
+++ b/cmake/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/cmake/installer/settings/functions.nsh b/cmake/installer/settings/functions.nsh
index bbd4fea2..d437c9e1 100644
--- a/cmake/installer/settings/functions.nsh
+++ b/cmake/installer/settings/functions.nsh
@@ -2,11 +2,8 @@
 ; checked on Finish Page

 

 Function CreateDesktopShortCuts

-

 SetOutPath "$INSTDIR"

-

-CreateShortcut "$Desktop\$(sm_shortcut).lnk" "$INSTDIR\USdx.exe"

-

+CreateShortcut "$Desktop\$(sm_shortcut).lnk" "$INSTDIR\ultrastardx.exe"

 FunctionEnd

 

 ; Deletes only empty dirs which are

@@ -27,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

 ;

 

@@ -74,126 +47,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
diff --git a/cmake/installer/settings/settings-1031.ini b/cmake/installer/settings/settings-1031.ini
index 9e588fcb..7f9573a1 100644
--- a/cmake/installer/settings/settings-1031.ini
+++ b/cmake/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|Danish|Dutch|English|Euskara|French|German|Italian|Norwegian|Polish|Portuguese|Serbian|Slovak|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=Hier kann ein weiterer Ordner mit Songs für UltraStar Deluxe angegeben werden.

diff --git a/cmake/installer/settings/settings-1033.ini b/cmake/installer/settings/settings-1033.ini
index 17a08a8c..5e6b6055 100644
--- a/cmake/installer/settings/settings-1033.ini
+++ b/cmake/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|Danish|Dutch|English|Euskara|French|German|Italian|Norwegian|Polish|Portuguese|Serbian|Slovak|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 additional song directory for UltraStar Deluxe.
\ No newline at end of file
diff --git a/cmake/installer/settings/settings-1038.ini b/cmake/installer/settings/settings-1038.ini
new file mode 100644
index 00000000..62994a1f
--- /dev/null
+++ b/cmake/installer/settings/settings-1038.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=UltraStar Deluxe Konfiguration (Optional) 

+

+[Field 1]

+Type=Label

+Text="Teljes képernyõs mód:"

+Left=5

+Right=58

+Top=30

+Bottom=38

+

+[Field 2]

+Type=Label

+Text="Nyelv:"

+Left=5

+Right=58

+Top=47

+Bottom=55

+

+[Field 3]

+Type=Label

+Text="Felbontás:"

+Left=5

+Right=58

+Top=64

+Bottom=72

+

+[Field 4]

+Type=Label

+Text="Tabs:"

+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|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 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=Start game in window or fullscreen?

+Left=157

+Right=300

+Top=30

+Bottom=38

+

+[Field 10]

+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=Adjust the GUI language.

+Left=158

+Right=300

+Top=46

+Bottom=55

+

+[Field 12]

+Type=Label

+Text=Choose screen resolution/window size.

+Left=157

+Right=300

+Top=64

+Bottom=72

+

+[Field 13]

+Type=Label

+Text=Employ a virtual folder structure to show songs?

+Left=158

+Right=300

+Top=78

+Bottom=94

+

+[Field 14]

+Type=Label

+Left=5

+Top=100

+Right=58

+Bottom=109

+Text=Sorting:

+

+[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=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 additional song directory for UltraStar Deluxe.

diff --git a/cmake/installer/settings/variables.nsh b/cmake/installer/settings/variables.nsh
index db98d89f..5d79e115 100644
--- a/cmake/installer/settings/variables.nsh
+++ b/cmake/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,15 +35,16 @@
 !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_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"

@@ -81,11 +83,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/cmake/installer/uninstall.ico b/cmake/installer/uninstall.ico
new file mode 100644
index 00000000..1c72432a
--- /dev/null
+++ b/cmake/installer/uninstall.ico