merged trunk into lua branch

plugin loading is disabled atm because of a bug reading the files (lua may be the reason). 
Reading the files in usdx and passing the contents to lua may solve this

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

10 files changed, 976 insertions, 180 deletions

diff --git a/Lua/installer/UltraStar Deluxe.nsi b/Lua/installer/UltraStar Deluxe.nsi
index c8df95dd..a6f37e2a 100644
--- a/Lua/installer/UltraStar Deluxe.nsi
+++ b/Lua/installer/UltraStar Deluxe.nsi
@@ -6,6 +6,7 @@
 !include WinVer.nsh

 !include LogicLib.nsh

 !include InstallOptions.nsh

+!include nsDialogs.nsh

 

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

 ; Variables

@@ -42,9 +43,9 @@ OutFile "ultrastardx-${version}-installer-full.exe"
 

 InstallDir "$PROGRAMFILES\${name}"

 

-; Windows Vista:

+; Windows Vista / Windows 7:

 

-RequestExecutionLevel user

+RequestExecutionLevel admin

 

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

 ; Interface Settings

@@ -82,6 +83,7 @@ RequestExecutionLevel user
 

 !define MUI_WELCOMEPAGE_TITLE_3LINES

 !define MUI_WELCOMEPAGE_TITLE "$(page_welcome_title)"

+

 !define MUI_WELCOMEPAGE_TEXT "$(page_welcome_txt)"

 

 ; License Page:

@@ -148,6 +150,9 @@ Function Settings
 

 ; Get all the variables:

 

+Var /GLOBAL CHECKBOX

+Var /GLOBAL checkbox_state

+

 var /GLOBAL fullscreen

 var /GLOBAL language2

 var /GLOBAL resolution

@@ -192,18 +197,35 @@ ${WriteToConfig} "Resolution=$resolution$\r$\n" "$INSTDIR\config.ini"
 

 ${EndIf}

 

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

+${WriteToConfig} "[Sound]$\r$\n" "$INSTDIR\config.ini"

+${WriteToConfig} "PreviewFading=3 Secs$\r$\n" "$INSTDIR\config.ini"

 

 ; Animations On / Off Tasks

 

 ${If} $animations == "Off"

 

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

+

 ${WriteToConfig} "LoadAnimation=Off$\r$\n" "$INSTDIR\config.ini"

 

 ${WriteToConfig} "EffectSing=Off$\r$\n" "$INSTDIR\config.ini"

 

 ${WriteToConfig} "ScreenFade=Off$\r$\n" "$INSTDIR\config.ini"

 

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

+

+${EndIf}

+

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

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

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

+

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

+

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

+

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

+

 ${EndIf}

 

 

@@ -216,8 +238,46 @@ FunctionEnd ; Settings page End
 ; Pages UnInstallation Routine

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

 

+!define MUI_WELCOMEPAGE_TITLE "$(page_un_welcome_title)"

 !insertmacro MUI_UNPAGE_WELCOME

 !insertmacro MUI_UNPAGE_CONFIRM

+

+UninstPage custom un.AskDelete un.DeleteAll

+

+Function un.AskDelete

+

+nsDialogs::Create /NOUNLOAD 1018

+

+	${NSD_CreateCheckbox} 0 -150 100% 8u "$(delete_all)"

+	Pop $CHECKBOX

+

+	nsDialogs::OnClick /NOUNLOAD $CHECKBOX $0

+

+

+nsDialogs::Show

+

+FunctionEnd

+

+Function un.DeleteAll

+

+${NSD_GetState} $CHECKBOX $checkbox_state

+

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

+

+ RMDir /r "$INSTDIR\Songs"

+ RMDir /r "$INSTDIR\Covers"

+ Delete "$INSTDIR\Ultrastar.db"

+

+${Else}

+

+; If checkbox_state = 0

+

+

+${EndIf}

+

+

+FunctionEnd

+

 !insertmacro MUI_UNPAGE_INSTFILES

 !insertmacro MUI_UNPAGE_FINISH

 

@@ -307,25 +367,47 @@ SectionEnd
 

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

-;  AddSize 1400

+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=30000 ${download_song1} $TEMP\Song-I-18.zip

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

-  nsisunz::Unzip "$TEMP\Song-I-18.zip" "$INSTDIR\Songs\Dead Smiling Pirates - I 18\"

+  ZipDLL::extractall "$TEMP\Song-I-18.zip" "$INSTDIR\Songs\Dead Smiling Pirates - I 18\"

 

   Delete "$TEMP\Song-I-18.zip"

 

@@ -341,18 +423,18 @@ SectionGroup $(name_s2_sub1) s2_sub1
 

 Section /o "Monkey Shines" s2_sub1_Section1

 

-;  AddSize 1400

+   AddSize 1455

    SetOverwrite try

    SetOutPath "$INSTDIR\Songs\"

 

 ; Download song:

-  NSISdl::download /TIMEOUT=30000 ${download_sub1_song1} $TEMP\Song-JC-MS.zip

+  NSISdl::download /TIMEOUT=50000 ${download_sub1_song1} $TEMP\Song-JC-MS.zip

  

   Pop $R0

     StrCmp $R0 "success" dlok

       MessageBox MB_OK|MB_ICONEXCLAMATION "Download Error, click OK to Continue" /SD IDOK

   dlok:

-  nsisunz::Unzip "$TEMP\Song-JC-MS.zip" "$INSTDIR\Songs\"

+  ZipDLL::extractall "$TEMP\Song-JC-MS.zip" "$INSTDIR\Songs\"

 

   Delete "$TEMP\Song-JC-MS.zip"

 

@@ -362,18 +444,18 @@ SectionEnd
 

 Section /o "I Crush Everything" s2_sub1_Section2

 

-;  AddSize 1400

+   AddSize 7127

    SetOverwrite try

    SetOutPath "$INSTDIR\Songs\"

 

 ; Download song:

-  NSISdl::download /TIMEOUT=30000 ${download_sub1_song2} $TEMP\Song-JC-ICE.zip

+  NSISdl::download /TIMEOUT=50000 ${download_sub1_song2} $TEMP\Song-JC-ICE.zip

  

   Pop $R0

     StrCmp $R0 "success" dlok

       MessageBox MB_OK|MB_ICONEXCLAMATION "Download Error, click OK to Continue" /SD IDOK

   dlok:

-  nsisunz::Unzip "$TEMP\Song-JC-ICE.zip" "$INSTDIR\Songs\"

+  ZipDLL::extractall "$TEMP\Song-JC-ICE.zip" "$INSTDIR\Songs\"

 

   Delete "$TEMP\Song-JC-ICE.zip"

 

@@ -383,18 +465,18 @@ SectionEnd
 

 Section /o "Not About You" s2_sub1_Section3

 

-;  AddSize 1400

+   AddSize 3492

    SetOverwrite try

    SetOutPath "$INSTDIR\Songs\"

 

 ; Download song:

-  NSISdl::download /TIMEOUT=30000 ${download_sub1_song3} $TEMP\Song-JC-NAY.zip

+  NSISdl::download /TIMEOUT=50000 ${download_sub1_song3} $TEMP\Song-JC-NAY.zip

  

   Pop $R0

     StrCmp $R0 "success" dlok

       MessageBox MB_OK|MB_ICONEXCLAMATION "Download Error, click OK to Continue" /SD IDOK

   dlok:

-  nsisunz::Unzip "$TEMP\Song-JC-NAY.zip" "$INSTDIR\Songs\"

+  ZipDLL::extractall "$TEMP\Song-JC-NAY.zip" "$INSTDIR\Songs\"

 

   Delete "$TEMP\Song-JC-NAY.zip"

 

@@ -405,18 +487,18 @@ SectionEnd
 

 Section /o "Mr. Fancy Pants" s2_sub1_Section4

 

-;  AddSize 1400

+   AddSize 2427

    SetOverwrite try

    SetOutPath "$INSTDIR\Songs\"

 

 ; Download song:

-  NSISdl::download /TIMEOUT=30000 ${download_sub1_song4} $TEMP\Song-JC-MFP.zip

+  NSISdl::download /TIMEOUT=50000 ${download_sub1_song4} $TEMP\Song-JC-MFP.zip

  

   Pop $R0

     StrCmp $R0 "success" dlok

       MessageBox MB_OK|MB_ICONEXCLAMATION "Download Error, click OK to Continue" /SD IDOK

   dlok:

-  nsisunz::Unzip "$TEMP\Song-JC-MFP.zip" "$INSTDIR\Songs\"

+  ZipDLL::extractall "$TEMP\Song-JC-MFP.zip" "$INSTDIR\Songs\"

 

   Delete "$TEMP\Song-JC-MFP.zip"

 

@@ -426,18 +508,18 @@ SectionEnd
 

 Section /o "Big Bad World One" s2_sub1_Section5

 

-;  AddSize 1400

+   AddSize 4424

    SetOverwrite try

    SetOutPath "$INSTDIR\Songs\"

 

 ; Download song:

-  NSISdl::download /TIMEOUT=30000 ${download_sub1_song5} $TEMP\Song-JC-BBWO.zip

+  NSISdl::download /TIMEOUT=50000 ${download_sub1_song5} $TEMP\Song-JC-BBWO.zip

  

   Pop $R0

     StrCmp $R0 "success" dlok

       MessageBox MB_OK|MB_ICONEXCLAMATION "Download Error, click OK to Continue" /SD IDOK

   dlok:

-  nsisunz::Unzip "$TEMP\Song-JC-BBWO.zip" "$INSTDIR\Songs\"

+  ZipDLL::extractall "$TEMP\Song-JC-BBWO.zip" "$INSTDIR\Songs\"

 

   Delete "$TEMP\Song-JC-BBWO.zip"

 

@@ -447,18 +529,18 @@ SectionEnd
 

 Section /o "Flickr" s2_sub1_Section6

 

-;  AddSize 1400

+   AddSize 21607

    SetOverwrite try

    SetOutPath "$INSTDIR\Songs\"

 

 ; Download song:

-  NSISdl::download /TIMEOUT=30000 ${download_sub1_song6} $TEMP\Song-JC-Flickr.zip

+  NSISdl::download /TIMEOUT=50000 ${download_sub1_song6} $TEMP\Song-JC-Flickr.zip

  

   Pop $R0

     StrCmp $R0 "success" dlok

       MessageBox MB_OK|MB_ICONEXCLAMATION "Download Error, click OK to Continue" /SD IDOK

   dlok:

-  nsisunz::Unzip "$TEMP\Song-JC-Flickr.zip" "$INSTDIR\Songs\"

+  ZipDLL::extractall "$TEMP\Song-JC-Flickr.zip" "$INSTDIR\Songs\"

 

   Delete "$TEMP\Song-JC-Flickr.zip"

 

@@ -468,18 +550,18 @@ SectionEnd
 

 Section /o "My Beige Bear" s2_sub1_Section7

 

-;  AddSize 1400

+   AddSize 4926

    SetOverwrite try

    SetOutPath "$INSTDIR\Songs\"

 

 ; Download song:

-  NSISdl::download /TIMEOUT=30000 ${download_sub1_song7} $TEMP\Song-JC-MBB.zip

+  NSISdl::download /TIMEOUT=50000 ${download_sub1_song7} $TEMP\Song-JC-MBB.zip

  

   Pop $R0

     StrCmp $R0 "success" dlok

       MessageBox MB_OK|MB_ICONEXCLAMATION "Download Error, click OK to Continue" /SD IDOK

   dlok:

-  nsisunz::Unzip "$TEMP\Song-JC-MBB.zip" "$INSTDIR\Songs\"

+  ZipDLL::extractall "$TEMP\Song-JC-MBB.zip" "$INSTDIR\Songs\"

 

   Delete "$TEMP\Song-JC-MBB.zip"

 

@@ -489,18 +571,18 @@ SectionEnd
 

 Section /o "The Future Soon" s2_sub1_Section8

 

-;  AddSize 1400

+   AddSize 5612

    SetOverwrite try

    SetOutPath "$INSTDIR\Songs\"

 

 ; Download song:

-  NSISdl::download /TIMEOUT=30000 ${download_sub1_song8} $TEMP\Song-JC-TFS.zip

+  NSISdl::download /TIMEOUT=50000 ${download_sub1_song8} $TEMP\Song-JC-TFS.zip

  

   Pop $R0

     StrCmp $R0 "success" dlok

       MessageBox MB_OK|MB_ICONEXCLAMATION "Download Error, click OK to Continue" /SD IDOK

   dlok:

-  nsisunz::Unzip "$TEMP\Song-JC-TFS.zip" "$INSTDIR\Songs\"

+  ZipDLL::extractall "$TEMP\Song-JC-TFS.zip" "$INSTDIR\Songs\"

 

   Delete "$TEMP\Song-JC-TFS.zip"

 

@@ -510,18 +592,18 @@ SectionEnd
 

 Section /o "Ikea" s2_sub1_Section9

 

-;  AddSize 1400

+   AddSize 4608

    SetOverwrite try

    SetOutPath "$INSTDIR\Songs\"

 

 ; Download song:

-  NSISdl::download /TIMEOUT=30000 ${download_sub1_song9} $TEMP\Song-JC-Ikea.zip

+  NSISdl::download /TIMEOUT=50000 ${download_sub1_song9} $TEMP\Song-JC-Ikea.zip

  

   Pop $R0

     StrCmp $R0 "success" dlok

       MessageBox MB_OK|MB_ICONEXCLAMATION "Download Error, click OK to Continue" /SD IDOK

   dlok:

-  nsisunz::Unzip "$TEMP\Song-JC-Ikea.zip" "$INSTDIR\Songs\"

+  ZipDLL::extractall "$TEMP\Song-JC-Ikea.zip" "$INSTDIR\Songs\"

 

   Delete "$TEMP\Song-JC-Ikea.zip"

 

@@ -531,18 +613,18 @@ SectionEnd
 

 Section /o "Furry Old Lobster" s2_sub1_Section10

 

-;  AddSize 1400

+   AddSize 3288

    SetOverwrite try

    SetOutPath "$INSTDIR\Songs\"

 

 ; Download song:

-  NSISdl::download /TIMEOUT=30000 ${download_sub1_song10} $TEMP\Song-JC-FOL.zip

+  NSISdl::download /TIMEOUT=50000 ${download_sub1_song10} $TEMP\Song-JC-FOL.zip

  

   Pop $R0

     StrCmp $R0 "success" dlok

       MessageBox MB_OK|MB_ICONEXCLAMATION "Download Error, click OK to Continue" /SD IDOK

   dlok:

-  nsisunz::Unzip "$TEMP\Song-JC-FOL.zip" "$INSTDIR\Songs\"

+  ZipDLL::extractall "$TEMP\Song-JC-FOL.zip" "$INSTDIR\Songs\"

 

   Delete "$TEMP\Song-JC-FOL.zip"

 

@@ -552,18 +634,18 @@ SectionEnd
 

 Section /o "Code Monkey" s2_sub1_Section11

 

-;  AddSize 1400

+   AddSize 21402

    SetOverwrite try

    SetOutPath "$INSTDIR\Songs\"

 

 ; Download song:

-  NSISdl::download /TIMEOUT=30000 ${download_sub1_song11} $TEMP\Song-JC-CM.zip

+  NSISdl::download /TIMEOUT=50000 ${download_sub1_song11} $TEMP\Song-JC-CM.zip

  

   Pop $R0

     StrCmp $R0 "success" dlok

       MessageBox MB_OK|MB_ICONEXCLAMATION "Download Error, click OK to Continue" /SD IDOK

   dlok:

-  nsisunz::Unzip "$TEMP\Song-JC-CM.zip" "$INSTDIR\Songs\"

+  ZipDLL::extractall "$TEMP\Song-JC-CM.zip" "$INSTDIR\Songs\"

 

   Delete "$TEMP\Song-JC-CM.zip"

 

@@ -573,18 +655,18 @@ SectionEnd
 

 Section /o "I´m Your Moon" s2_sub1_Section12

 

-;  AddSize 1400

+   AddSize 4916

    SetOverwrite try

    SetOutPath "$INSTDIR\Songs\"

 

 ; Download song:

-  NSISdl::download /TIMEOUT=30000 ${download_sub1_song12} $TEMP\Song-JC-IYM.zip

+  NSISdl::download /TIMEOUT=50000 ${download_sub1_song12} $TEMP\Song-JC-IYM.zip

  

   Pop $R0

     StrCmp $R0 "success" dlok

       MessageBox MB_OK|MB_ICONEXCLAMATION "Download Error, click OK to Continue" /SD IDOK

   dlok:

-  nsisunz::Unzip "$TEMP\Song-JC-IYM.zip" "$INSTDIR\Songs\"

+  ZipDLL::extractall "$TEMP\Song-JC-IYM.zip" "$INSTDIR\Songs\"

 

   Delete "$TEMP\Song-JC-IYM.zip"

 

@@ -594,18 +676,18 @@ SectionEnd
 

 Section /o "First Of May" s2_sub1_Section13

 

-;  AddSize 1400

+   AddSize 6257

    SetOverwrite try

    SetOutPath "$INSTDIR\Songs\"

 

 ; Download song:

-  NSISdl::download /TIMEOUT=30000 ${download_sub1_song13} $TEMP\Song-JC-FOM.zip

+  NSISdl::download /TIMEOUT=50000 ${download_sub1_song13} $TEMP\Song-JC-FOM.zip

  

   Pop $R0

     StrCmp $R0 "success" dlok

       MessageBox MB_OK|MB_ICONEXCLAMATION "Download Error, click OK to Continue" /SD IDOK

   dlok:

-  nsisunz::Unzip "$TEMP\Song-JC-FOM.zip" "$INSTDIR\Songs\"

+  ZipDLL::extractall "$TEMP\Song-JC-FOM.zip" "$INSTDIR\Songs\"

 

   Delete "$TEMP\Song-JC-FOM.zip"

 

@@ -615,18 +697,18 @@ SectionEnd
 

 Section /o "Dance, Soterious Johnson, Dance" s2_sub1_Section14

 

-;  AddSize 1400

+   AddSize 5929

    SetOverwrite try

    SetOutPath "$INSTDIR\Songs\"

 

 ; Download song:

-  NSISdl::download /TIMEOUT=30000 ${download_sub1_song14} $TEMP\Song-JC-DSJD.zip

+  NSISdl::download /TIMEOUT=50000 ${download_sub1_song14} $TEMP\Song-JC-DSJD.zip

  

   Pop $R0

     StrCmp $R0 "success" dlok

       MessageBox MB_OK|MB_ICONEXCLAMATION "Download Error, click OK to Continue" /SD IDOK

   dlok:

-  nsisunz::Unzip "$TEMP\Song-JC-DSJD.zip" "$INSTDIR\Songs\"

+  ZipDLL::extractall "$TEMP\Song-JC-DSJD.zip" "$INSTDIR\Songs\"

 

   Delete "$TEMP\Song-JC-DSJD.zip"

 

@@ -634,22 +716,22 @@ Section /o "Dance, Soterious Johnson, Dance" s2_sub1_Section14
 

 SectionEnd

 

-Section /o "A Walk With George" s2_sub1_Section15

+Section /o "A Talk With George" s2_sub1_Section15

 

-;  AddSize 1400

+   AddSize 4076

    SetOverwrite try

    SetOutPath "$INSTDIR\Songs\"

 

 ; Download song:

-  NSISdl::download /TIMEOUT=30000 ${download_sub1_song15} $TEMP\Song-JC-AWWG.zip

+  NSISdl::download /TIMEOUT=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:

-  nsisunz::Unzip "$TEMP\Song-JC-AWWG.zip" "$INSTDIR\Songs\"

+  ZipDLL::extractall "$TEMP\Song-JC-ATWG.zip" "$INSTDIR\Songs\"

 

-  Delete "$TEMP\Song-JC-AWWG.zip"

+  Delete "$TEMP\Song-JC-ATWG.zip"

 

   SetOutPath "$INSTDIR"

 

@@ -657,18 +739,18 @@ SectionEnd
 

 Section /o "Creepy Doll" s2_sub1_Section16

 

-;  AddSize 1400

+   AddSize 66560

    SetOverwrite try

    SetOutPath "$INSTDIR\Songs\"

 

 ; Download song:

-  NSISdl::download /TIMEOUT=30000 ${download_sub1_song16} $TEMP\Song-JC-CD.zip

+  NSISdl::download /TIMEOUT=50000 ${download_sub1_song16} $TEMP\Song-JC-CD.zip

  

   Pop $R0

     StrCmp $R0 "success" dlok

       MessageBox MB_OK|MB_ICONEXCLAMATION "Download Error, click OK to Continue" /SD IDOK

   dlok:

-  nsisunz::Unzip "$TEMP\Song-JC-CD.zip" "$INSTDIR\Songs\"

+  ZipDLL::extractall "$TEMP\Song-JC-CD.zip" "$INSTDIR\Songs\"

 

   Delete "$TEMP\Song-JC-CD.zip"

 

@@ -678,18 +760,18 @@ SectionEnd
 

 Section /o "That Spells DNA" s2_sub1_Section17

 

-;  AddSize 1400

+   AddSize 4158

    SetOverwrite try

    SetOutPath "$INSTDIR\Songs\"

 

 ; Download song:

-  NSISdl::download /TIMEOUT=30000 ${download_sub1_song17} $TEMP\Song-JC-TSDNA.zip

+  NSISdl::download /TIMEOUT=50000 ${download_sub1_song17} $TEMP\Song-JC-TSDNA.zip

  

   Pop $R0

     StrCmp $R0 "success" dlok

       MessageBox MB_OK|MB_ICONEXCLAMATION "Download Error, click OK to Continue" /SD IDOK

   dlok:

-  nsisunz::Unzip "$TEMP\Song-JC-TSDNA.zip" "$INSTDIR\Songs\"

+  ZipDLL::extractall "$TEMP\Song-JC-TSDNA.zip" "$INSTDIR\Songs\"

 

   Delete "$TEMP\Song-JC-TSDNA.zip"

 

@@ -699,18 +781,18 @@ SectionEnd
 

 Section /o "When You Go" s2_sub1_Section18

 

-;  AddSize 1400

+   AddSize 5755

    SetOverwrite try

    SetOutPath "$INSTDIR\Songs\"

 

 ; Download song:

-  NSISdl::download /TIMEOUT=30000 ${download_sub1_song18} $TEMP\Song-JC-WYG.zip

+  NSISdl::download /TIMEOUT=50000 ${download_sub1_song18} $TEMP\Song-JC-WYG.zip

  

   Pop $R0

     StrCmp $R0 "success" dlok

       MessageBox MB_OK|MB_ICONEXCLAMATION "Download Error, click OK to Continue" /SD IDOK

   dlok:

-  nsisunz::Unzip "$TEMP\Song-JC-WYG.zip" "$INSTDIR\Songs\"

+  ZipDLL::extractall "$TEMP\Song-JC-WYG.zip" "$INSTDIR\Songs\"

 

   Delete "$TEMP\Song-JC-WYG.zip"

 

@@ -720,18 +802,18 @@ SectionEnd
 

 Section /o "Better" s2_sub1_Section19

 

-;  AddSize 1400

+   AddSize 4199

    SetOverwrite try

    SetOutPath "$INSTDIR\Songs\"

 

 ; Download song:

-  NSISdl::download /TIMEOUT=30000 ${download_sub1_song19} $TEMP\Song-JC-Better.zip

+  NSISdl::download /TIMEOUT=50000 ${download_sub1_song19} $TEMP\Song-JC-Better.zip

  

   Pop $R0

     StrCmp $R0 "success" dlok

       MessageBox MB_OK|MB_ICONEXCLAMATION "Download Error, click OK to Continue" /SD IDOK

   dlok:

-  nsisunz::Unzip "$TEMP\Song-JC-Better.zip" "$INSTDIR\Songs\"

+  ZipDLL::extractall "$TEMP\Song-JC-Better.zip" "$INSTDIR\Songs\"

 

   Delete "$TEMP\Song-JC-Better.zip"

 

@@ -741,18 +823,18 @@ SectionEnd
 

 Section /o "Shop Vac" s2_sub1_Section20

 

-;  AddSize 1400

+   AddSize 5448

    SetOverwrite try

    SetOutPath "$INSTDIR\Songs\"

 

 ; Download song:

-  NSISdl::download /TIMEOUT=30000 ${download_sub1_song20} $TEMP\Song-JC-SV.zip

+  NSISdl::download /TIMEOUT=50000 ${download_sub1_song20} $TEMP\Song-JC-SV.zip

  

   Pop $R0

     StrCmp $R0 "success" dlok

       MessageBox MB_OK|MB_ICONEXCLAMATION "Download Error, click OK to Continue" /SD IDOK

   dlok:

-  nsisunz::Unzip "$TEMP\Song-JC-SV.zip" "$INSTDIR\Songs\"

+  ZipDLL::extractall "$TEMP\Song-JC-SV.zip" "$INSTDIR\Songs\"

 

   Delete "$TEMP\Song-JC-SV.zip"

 

@@ -762,18 +844,18 @@ SectionEnd
 

 Section /o "I Feel Fantastic" s2_sub1_Section21

 

-;  AddSize 1400

+   AddSize 3851

    SetOverwrite try

    SetOutPath "$INSTDIR\Songs\"

 

 ; Download song:

-  NSISdl::download /TIMEOUT=30000 ${download_sub1_song21} $TEMP\Song-JC-IFF.zip

+  NSISdl::download /TIMEOUT=50000 ${download_sub1_song21} $TEMP\Song-JC-IFF.zip

  

   Pop $R0

     StrCmp $R0 "success" dlok

       MessageBox MB_OK|MB_ICONEXCLAMATION "Download Error, click OK to Continue" /SD IDOK

   dlok:

-  nsisunz::Unzip "$TEMP\Song-JC-IFF.zip" "$INSTDIR\Songs\"

+  ZipDLL::extractall "$TEMP\Song-JC-IFF.zip" "$INSTDIR\Songs\"

 

   Delete "$TEMP\Song-JC-IFF.zip"

 

@@ -783,18 +865,18 @@ SectionEnd
 

 Section /o "Re: Your Brains" s2_sub1_Section22

 

-;  AddSize 1400

+   AddSize 7087

    SetOverwrite try

    SetOutPath "$INSTDIR\Songs\"

 

 ; Download song:

-  NSISdl::download /TIMEOUT=30000 ${download_sub1_song22} $TEMP\Song-JC-ReYB.zip

+  NSISdl::download /TIMEOUT=50000 ${download_sub1_song22} $TEMP\Song-JC-ReYB.zip

  

   Pop $R0

     StrCmp $R0 "success" dlok

       MessageBox MB_OK|MB_ICONEXCLAMATION "Download Error, click OK to Continue" /SD IDOK

   dlok:

-  nsisunz::Unzip "$TEMP\Song-JC-ReYB.zip" "$INSTDIR\Songs\"

+  ZipDLL::extractall "$TEMP\Song-JC-ReYB.zip" "$INSTDIR\Songs\"

 

   Delete "$TEMP\Song-JC-ReYB.zip"

 

@@ -804,18 +886,18 @@ SectionEnd
 

 Section /o "Skullcrusher Mountain" s2_sub1_Section23

 

-;  AddSize 1400

+   AddSize 6298

    SetOverwrite try

    SetOutPath "$INSTDIR\Songs\"

 

 ; Download song:

-  NSISdl::download /TIMEOUT=30000 ${download_sub1_song23} $TEMP\Song-JC-SCM.zip

+  NSISdl::download /TIMEOUT=50000 ${download_sub1_song23} $TEMP\Song-JC-SCM.zip

  

   Pop $R0

     StrCmp $R0 "success" dlok

       MessageBox MB_OK|MB_ICONEXCLAMATION "Download Error, click OK to Continue" /SD IDOK

   dlok:

-  nsisunz::Unzip "$TEMP\Song-JC-SCM.zip" "$INSTDIR\Songs\"

+  ZipDLL::extractall "$TEMP\Song-JC-SCM.zip" "$INSTDIR\Songs\"

 

   Delete "$TEMP\Song-JC-SCM.zip"

 

@@ -825,18 +907,18 @@ SectionEnd
 

 Section /o "Chiron Beta Prime" s2_sub1_Section24

 

-;  AddSize 1400

+   AddSize 38298

    SetOverwrite try

    SetOutPath "$INSTDIR\Songs\"

 

 ; Download song:

-  NSISdl::download /TIMEOUT=30000 ${download_sub1_song24} $TEMP\Song-JC-CBP.zip

+  NSISdl::download /TIMEOUT=50000 ${download_sub1_song24} $TEMP\Song-JC-CBP.zip

  

   Pop $R0

     StrCmp $R0 "success" dlok

       MessageBox MB_OK|MB_ICONEXCLAMATION "Download Error, click OK to Continue" /SD IDOK

   dlok:

-  nsisunz::Unzip "$TEMP\Song-JC-CBP.zip" "$INSTDIR\Songs\"

+  ZipDLL::extractall "$TEMP\Song-JC-CBP.zip" "$INSTDIR\Songs\"

 

   Delete "$TEMP\Song-JC-CBP.zip"

 

@@ -851,21 +933,21 @@ SectionGroupEnd
 ; Joshua Morin - On The Run

 ; 

 

-Section /o "Joshua Morin - On The Run" g2Section2

-;  AddSize 2200

+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=30000 ${download_song3} $TEMP\Song-On-the-run.zip

+  NSISdl::download /TIMEOUT=50000 ${download_song3} $TEMP\Song-On-the-run.zip

 

   Pop $R0 ;Get the return value

     StrCmp $R0 "success" dlok

       MessageBox MB_OK|MB_ICONEXCLAMATION "Download Error, click OK to Continue" /SD IDOK

   dlok:

-  nsisunz::Unzip "$TEMP\Song-On-the-run.zip" "$INSTDIR\Songs\Joshua Morin - On The Run\"

+  ZipDLL::extractall "$TEMP\Song-On-the-run.zip" "$INSTDIR\Songs\Joshua Morin - On The Run\"

 

   Delete "$TEMP\Song-On-the-run.zip"

 

@@ -873,21 +955,21 @@ Section /o "Joshua Morin - On The Run" g2Section2
 

 SectionEnd

 

-Section /o "Pornophonique - Space Invaders" g2Section3

-;  AddSize 2200

+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=30000 ${download_song3} $TEMP\Song-Space-Invaders.zip

+  NSISdl::download /TIMEOUT=50000 ${download_song4} $TEMP\Song-Space-Invaders.zip

 

   Pop $R0 ;Get the return value

     StrCmp $R0 "success" dlok

       MessageBox MB_OK|MB_ICONEXCLAMATION "Download Error, click OK to Continue" /SD IDOK

   dlok:

-  nsisunz::Unzip "$TEMP\Song-Space-Invaders.zip" "$INSTDIR\Songs\Pornophonique - Space Invaders\"

+  ZipDLL::extractall "$TEMP\Song-Space-Invaders.zip" "$INSTDIR\Songs\Pornophonique - Space Invaders\"

 

   Delete "$TEMP\Song-Space-Invaders.zip"

 

@@ -895,21 +977,216 @@ Section /o "Pornophonique - Space Invaders" g2Section3
 

 SectionEnd

 

-Section /o "Steven Dunston - Northern Star" g2Section4

-;  AddSize 1500

+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=30000 ${download_song2} $TEMP\Song-Northern-Star.zip

+  NSISdl::download /TIMEOUT=50000 ${download_song5} $TEMP\Song-Northern-Star.zip

 

   Pop $R0 ;Get the return value

     StrCmp $R0 "success" dlok

       MessageBox MB_OK|MB_ICONEXCLAMATION "Download Error, click OK to Continue" /SD IDOK

   dlok:

-  nsisunz::Unzip "$TEMP\Song-Northern-Star.zip" "$INSTDIR\Songs\Steven Dunston - Northern Star\"

+

+  ZipDLL::extractall "$TEMP\Song-Northern-Star.zip" "$INSTDIR\Songs\Steven Dunston - Northern Star\"

 

   Delete "$TEMP\Song-Northern-Star.zip"

 

@@ -917,6 +1194,54 @@ Section /o "Steven Dunston - Northern Star" g2Section4
 

 SectionEnd

 

+SectionGroup $(name_s2_sub3) s2_sub3

+

+Section /o "Wise Guys - Lebendig und kräftig und schärfer" s2_sub3_Section1

+

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

 

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

@@ -926,16 +1251,16 @@ SectionGroupEnd
 SectionGroup $(name_section3) Section3

 

  Section /o "Orange" g3Section1

-;  AddSize 700

+   AddSize 1291

 

 ; Download theme orange:

-  NSISdl::download /TIMEOUT=30000 ${download_theme1} $TEMP\Theme-Orange.zip

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

-  nsisunz::Unzip "$TEMP\Theme-Orange.zip" "$INSTDIR\"

+  ZipDLL::extractall "$TEMP\Theme-Orange.zip" "$INSTDIR\"

 

   Delete "$TEMP\Theme-Orange.zip"

 

@@ -944,16 +1269,16 @@ SectionGroup $(name_section3) Section3
 SectionEnd

 

  Section /o "Streetlight" g3Section2

-;  AddSize 1000

+  AddSize 1905

 

 ; Download theme Streetlight:

-  NSISdl::download /TIMEOUT=30000 ${download_theme2} $TEMP\Theme-Streetlight.zip

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

-  nsisunz::Unzip "$TEMP\Theme-Streetlight.zip" "$INSTDIR\"

+  ZipDLL::extractall "$TEMP\Theme-Streetlight.zip" "$INSTDIR\"

 

   Delete "$TEMP\Theme-Streetlight.zip"

 

@@ -962,17 +1287,17 @@ SectionEnd
 SectionEnd

 

  Section /o "Vistar" g3Section3

-;   AddSize 1000

+    AddSize 1936

 

 ; Download theme Vistar:

 

-  NSISdl::download /TIMEOUT=30000 ${download_theme3} $TEMP\Theme-Vistar.zip

+  NSISdl::download /TIMEOUT=50000 ${download_theme3} $TEMP\Theme-Vistar.zip

 

   Pop $R0 ;Get the return value

    StrCmp $R0 "success" dlok

      MessageBox MB_OK|MB_ICONEXCLAMATION "Download Error, click OK to Continue" /SD IDOK

   dlok:

-  nsisunz::Unzip "$TEMP\Theme-Vistar.zip" "$INSTDIR\"

+  ZipDLL::extractall "$TEMP\Theme-Vistar.zip" "$INSTDIR\"

 

   Delete "$TEMP\Theme-Vistar.zip"

 

@@ -981,17 +1306,17 @@ SectionEnd
 SectionEnd

 

  Section /o "BlueSensation" g3Section4

-;   AddSize 1000

+    AddSize 2109

 

 ; Download theme BlueSensation:

 

-  NSISdl::download /TIMEOUT=30000 ${download_theme4} $TEMP\Theme-BlueSensation.zip

+  NSISdl::download /TIMEOUT=50000 ${download_theme4} $TEMP\Theme-BlueSensation.zip

 

   Pop $R0 ;Get the return value

    StrCmp $R0 "success" dlok

      MessageBox MB_OK|MB_ICONEXCLAMATION "Download Error, click OK to Continue" /SD IDOK

   dlok:

-  nsisunz::Unzip "$TEMP\Theme-BlueSensation.zip" "$INSTDIR\"

+  ZipDLL::extractall "$TEMP\Theme-BlueSensation.zip" "$INSTDIR\"

 

   Delete "$TEMP\Theme-BlueSensation.zip"

 

@@ -999,18 +1324,38 @@ SectionEnd
 

 SectionEnd

 

- Section /o "WiiStar" g3Section5

-;   AddSize 1000

+

+ 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=30000 ${download_theme5} $TEMP\Theme-WiiStar.zip

+  NSISdl::download /TIMEOUT=50000 ${download_theme5} $TEMP\Theme-WiiStar.zip

 

   Pop $R0 ;Get the return value

    StrCmp $R0 "success" dlok

      MessageBox MB_OK|MB_ICONEXCLAMATION "Download Error, click OK to Continue" /SD IDOK

   dlok:

-  nsisunz::Unzip "$TEMP\Theme-WiiStar.zip" "$INSTDIR\"

+  ZipDLL::extractall "$TEMP\Theme-WiiStar.zip" "$INSTDIR\"

 

   Delete "$TEMP\Theme-WiiStar.zip"

 

@@ -1018,18 +1363,18 @@ SectionEnd
 

 SectionEnd

 

- Section /o "iStar" g3Section6

-;   AddSize 1000

+ Section /o "iStar" g3Section7

+  AddSize 1588

 

 ; Download theme iStar:

 

-  NSISdl::download /TIMEOUT=30000 ${download_theme6} $TEMP\Theme-iStar.zip

+  NSISdl::download /TIMEOUT=50000 ${download_theme6} $TEMP\Theme-iStar.zip

 

   Pop $R0 ;Get the return value

    StrCmp $R0 "success" dlok

      MessageBox MB_OK|MB_ICONEXCLAMATION "Download Error, click OK to Continue" /SD IDOK

   dlok:

-  nsisunz::Unzip "$TEMP\Theme-iStar.zip" "$INSTDIR\"

+  ZipDLL::extractall "$TEMP\Theme-iStar.zip" "$INSTDIR\"

 

   Delete "$TEMP\Theme-iStar.zip"

 

@@ -1073,12 +1418,15 @@ SectionEnd
   !insertmacro MUI_DESCRIPTION_TEXT ${Section1} $(DESC_Section1)

   !insertmacro MUI_DESCRIPTION_TEXT ${Section2} $(DESC_Section2)

   !insertmacro MUI_DESCRIPTION_TEXT ${s2_sub1} $(DESC_Section2_sub1)

+  !insertmacro MUI_DESCRIPTION_TEXT ${s2_sub2} $(DESC_Section2_sub2)

+  !insertmacro MUI_DESCRIPTION_TEXT ${s2_sub3} $(DESC_Section2_sub3)

   !insertmacro MUI_DESCRIPTION_TEXT ${Section3} $(DESC_Section3)

 

   !insertmacro MUI_DESCRIPTION_TEXT ${g2Section1} $(DESC_g2Section1)

   !insertmacro MUI_DESCRIPTION_TEXT ${g2Section2} $(DESC_g2Section2)

   !insertmacro MUI_DESCRIPTION_TEXT ${g2Section3} $(DESC_g2Section3)

   !insertmacro MUI_DESCRIPTION_TEXT ${g2Section4} $(DESC_g2Section4)

+  !insertmacro MUI_DESCRIPTION_TEXT ${g2Section5} $(DESC_g2Section5)

 

   !insertmacro MUI_DESCRIPTION_TEXT ${s2_sub1_Section1} $(DESC_s2_sub1_Section1)

   !insertmacro MUI_DESCRIPTION_TEXT ${s2_sub1_Section2} $(DESC_s2_sub1_Section2)

@@ -1105,12 +1453,26 @@ SectionEnd
   !insertmacro MUI_DESCRIPTION_TEXT ${s2_sub1_Section23} $(DESC_s2_sub1_Section23)

   !insertmacro MUI_DESCRIPTION_TEXT ${s2_sub1_Section24} $(DESC_s2_sub1_Section24)

 

+  !insertmacro MUI_DESCRIPTION_TEXT ${s2_sub2_Section1} $(DESC_s2_sub2_Section1)

+  !insertmacro MUI_DESCRIPTION_TEXT ${s2_sub2_Section2} $(DESC_s2_sub2_Section2)

+  !insertmacro MUI_DESCRIPTION_TEXT ${s2_sub2_Section3} $(DESC_s2_sub2_Section3)

+  !insertmacro MUI_DESCRIPTION_TEXT ${s2_sub2_Section4} $(DESC_s2_sub2_Section4)

+  !insertmacro MUI_DESCRIPTION_TEXT ${s2_sub2_Section5} $(DESC_s2_sub2_Section5)

+  !insertmacro MUI_DESCRIPTION_TEXT ${s2_sub2_Section6} $(DESC_s2_sub2_Section6)

+  !insertmacro MUI_DESCRIPTION_TEXT ${s2_sub2_Section7} $(DESC_s2_sub2_Section7)

+  !insertmacro MUI_DESCRIPTION_TEXT ${s2_sub2_Section8} $(DESC_s2_sub2_Section8)

+  !insertmacro MUI_DESCRIPTION_TEXT ${s2_sub2_Section9} $(DESC_s2_sub2_Section9)

+

+  !insertmacro MUI_DESCRIPTION_TEXT ${s2_sub3_Section1} $(DESC_s2_sub3_Section1)

+  !insertmacro MUI_DESCRIPTION_TEXT ${s2_sub3_Section2} $(DESC_s2_sub3_Section2)

+

   !insertmacro MUI_DESCRIPTION_TEXT ${g3Section1} $(DESC_g3Section1)

   !insertmacro MUI_DESCRIPTION_TEXT ${g3Section2} $(DESC_g3Section2)

   !insertmacro MUI_DESCRIPTION_TEXT ${g3Section3} $(DESC_g3Section3)

   !insertmacro MUI_DESCRIPTION_TEXT ${g3Section4} $(DESC_g3Section4)

   !insertmacro MUI_DESCRIPTION_TEXT ${g3Section5} $(DESC_g3Section5)

   !insertmacro MUI_DESCRIPTION_TEXT ${g3Section6} $(DESC_g3Section6)

+  !insertmacro MUI_DESCRIPTION_TEXT ${g3Section7} $(DESC_g3Section7)

 

 !insertmacro MUI_FUNCTION_DESCRIPTION_END

 

diff --git a/Lua/installer/Update.nsi b/Lua/installer/Update.nsi
new file mode 100644
index 00000000..e916d3e9
--- /dev/null
+++ b/Lua/installer/Update.nsi
@@ -0,0 +1,215 @@
+; ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~

+; UltraStar Deluxe Installer: Update

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

+

+!include MUI2.nsh

+!include WinVer.nsh

+!include LogicLib.nsh

+!include nsDialogs.nsh

+

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

+; Variables

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

+

+; Installer Paths:

+

+!define path_settings ".\settings"

+!define path_languages ".\languages"

+!define path_images "..\installerdependencies\images"

+!define path_plugins "..\installerdependencies\plugins"

+!define path_gdf "$WINDIR\gdf.dll"

+

+!addPluginDir "${path_plugins}\"

+

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

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

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

+

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

+; Export Settings

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

+

+SetCompress Auto

+SetCompressor /SOLID lzma

+SetCompressorDictSize 32

+SetDatablockOptimize On

+

+Var /GLOBAL CHECKBOX

+Var /GLOBAL label_update_information

+Var /GLOBAL checkbox_state

+

+XPStyle on

+

+Name "${name} - Update"

+Brandingtext "${name} Update"

+OutFile "ultrastardx-update.exe"

+

+InstallDir "$PROGRAMFILES\${name}"

+

+; Windows Vista / Windows 7:

+

+RequestExecutionLevel admin

+

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

+; Interface Settings

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

+

+; Icons:

+

+!define MUI_ICON "${path_images}\${img_install}"

+!define MUI_UNICON "${path_images}\${img_uninstall}"

+

+; Header and Side Images:

+

+!define MUI_HEADERIMAGE

+!define MUI_HEADERIMAGE_BITMAP "${path_images}\${img_header}"

+!define MUI_HEADERIMAGE_UNBITMAP "${path_images}\${img_header}"

+

+!define MUI_WELCOMEFINISHPAGE_BITMAP "${path_images}\${img_side}"

+!define MUI_UNWELCOMEFINISHPAGE_BITMAP "${path_images}\${img_side}"

+

+; Abort Warnings:

+

+!define MUI_ABORTWARNING

+!define MUI_ABORTWARNING_TEXT "$(abort_install)"

+!define MUI_ABORTWARNING_CANCEL_DEFAULT

+

+!define MUI_UNABORTWARNING

+!define MUI_UNABORTWARNING_TEXT "$(abort_uninstall)"

+!define MUI_UNABORTWARNING_CANCEL_DEFAULT

+

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

+; Pages Installation Routine Settings

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

+

+; Welcome Page:

+

+!define MUI_WELCOMEPAGE_TITLE_3LINES

+!define MUI_WELCOMEPAGE_TITLE "$(page_welcome_title_update)"

+!define MUI_WELCOMEPAGE_TEXT "$(page_welcome_txt_update)"

+

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

+; Pages Installation Routine

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

+

+!insertmacro MUI_PAGE_WELCOME

+

+; USDX Update Page

+

+Page custom Update Download

+

+Function Update

+

+nsDialogs::Create /NOUNLOAD 1018

+

+	Pop $0

+	

+	${NSD_CreateCheckbox} 0 -150 100% 8u "$(update_connect)"

+	Pop $CHECKBOX

+	GetFunctionAddress $0 OnCheckbox

+	nsDialogs::OnClick /NOUNLOAD $CHECKBOX $0

+

+	${NSD_CreateLabel} 0 0 100% 30u "$(update_information)"

+	Pop $label_update_information

+

+nsDialogs::Show

+

+

+FunctionEnd ; Update page End

+

+Function Download

+

+${NSD_GetState} $CHECKBOX $checkbox_state

+

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

+

+NSISdl::download /TIMEOUT=50000 http://ultrastardeluxe.xtremeweb-hosting.net/version.txt $TEMP\version.txt

+

+Push 1

+Push "$TEMP\version.txt"

+ Call ReadFileLine

+Pop $1

+

+ReadRegStr $R0  HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${name}" 'DisplayVersion'

+

+${VersionCompare} "$R0" "$1" $R1

+

+${If} $R1 == "0"

+

+messageBox MB_OK|MB_ICONINFORMATION "$(update_check_equal)"

+

+${Else}

+	${If} $R1 == "1"

+

+        IfFileExists $TEMP\version.txt FileExists

+           SetErrors

+           Goto Failed

+

+        FileExists:

+	messageBox MB_OK|MB_ICONINFORMATION "$(update_check_newer)"

+

+	${Else}

+

+		${If} $R1 == "2"

+		messageBox MB_YESNO|MB_ICONQUESTION \

+ 		"$(update_check_older)" IDNO +6

+

+		Push 2

+		Push "$TEMP\version.txt"

+ 		Call ReadFileLine

+		Pop $2

+

+		ExecShell Open $2

+

+		${Else}

+

+		Failed:

+		messageBox MB_YESNO|MB_ICONQUESTION \

+ 		"$(update_check_failed)" IDNO +2

+

+		ExecShell Open http://www.ultrastardeluxe.org

+

+		${EndIf}

+	${EndIf}

+${EndIf}

+${Else}

+

+; If checkbox_state = 0

+

+

+${EndIf}

+

+Delete "$TEMP\version.txt"

+

+

+FunctionEnd

+

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

+; UPDATE (Section 1)

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

+

+Section $(name_section1) Section1

+	SectionIn RO

+	SetOutPath $INSTDIR

+	SetOverwrite try

+

+SectionEnd

+

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

+; Language Support

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

+

+!insertmacro MUI_LANGUAGE "English"

+!insertmacro MUI_LANGUAGE "German"

+

+!insertmacro MUI_RESERVEFILE_LANGDLL

+

+!include "${path_languages}\*.nsh"

+

+Function .onInit

+

+  !insertmacro MUI_LANGDLL_DISPLAY

+

+

+

+FunctionEnd

diff --git a/Lua/installer/languages/English.nsh b/Lua/installer/languages/English.nsh
index b539a0e2..63901b87 100644
--- a/Lua/installer/languages/English.nsh
+++ b/Lua/installer/languages/English.nsh
@@ -10,11 +10,28 @@ LangString oninit_alreadyinstalled ${LANG_ENGLISH} "is already installed"
 LangString oninit_closeusdx ${LANG_ENGLISH} "cannot be uninstalled while its running! Do you want to close it?"

 LangString oninit_updateusdx ${LANG_ENGLISH} "Do you want to update the installation from:"

 

+LangString update_connect ${LANG_ENGLISH} "Establish internet connection and check for new version"

+LangString button_next ${LANG_ENGLISH} "Next >"

+LangString button_close ${LANG_ENGLISH} "Close"

+LangString update_information ${LANG_ENGLISH} "You can check if a new version of 'UltraStar Deluxe' is available. Thereto an internet connection will be established. If a new version is found, it can be installed afterwards."

+

+LangString delete_all ${LANG_ENGLISH} "Also delete Songs, Highscores and Covers ?"

+

+LangString update_check_older ${LANG_ENGLISH} "Your version $R0 is outdated. The new version $1 of UltraStar Deluxe is available. Do you want to update?"

+LangString update_check_equal ${LANG_ENGLISH} "Your currently installed version $R0 is up-to-date. No update needed."

+LangString update_check_newer ${LANG_ENGLISH} "Your installed version $R0 is newer than the $\n$\rcurrent release version $1 of UltraStar Deluxe. No update needed."

+LangString update_check_failed ${LANG_ENGLISH} "The check for a new version failed. Do you want to visit website to check manually ?"

+

 ; Welcome Page:

 

+LangString page_welcome_title_update ${LANG_ENGLISH} "Welcome to the UltraStar Deluxe Update Wizard"

+LangString page_welcome_txt_update ${LANG_ENGLISH} "This wizard will guide you through the Update process of UltraStar Deluxe. UltraStar Deluxe is a free open source Karaoke game, which can be compared with Singstar.$\n$\r$\n$\rThe UltraStar Deluxe Team wishes you fun.$\n$\rProject website: http://www.ultrastardeluxe.org$\n$\rSupport Forum: http://forum.ultrastardeluxe.org"

+

 LangString page_welcome_title ${LANG_ENGLISH} "Welcome to the UltraStar Deluxe Setup Wizard"

 LangString page_welcome_txt ${LANG_ENGLISH} "This wizard will guide you through the Installation of UltraStar Deluxe. UltraStar Deluxe is a free open source Karaoke game, which can be compared with Singstar.$\n$\r$\n$\rThe UltraStar Deluxe Team wishes you fun.$\n$\rProject website: http://www.ultrastardeluxe.org$\n$\rSupport Forum: http://forum.ultrastardeluxe.org"

 

+LangString page_un_welcome_title ${LANG_ENGLISH} "Welcome to the UltraStar Deluxe uninstall wizard"

+

 ; Components Page:

 

 LangString page_components_info ${LANG_ENGLISH} "Hover the component to get details"

@@ -45,36 +62,41 @@ LangString sc_desktop ${LANG_ENGLISH} "Create Desktop Shortcut?"
 ; Sections and SectionGroups

 

 LangString name_section1 ${LANG_ENGLISH} "Main components"

-LangString name_section2 ${LANG_ENGLISH} "Optional songs"

+LangString name_section2 ${LANG_ENGLISH} "Songs"

 LangString name_s2_sub1 ${LANG_ENGLISH} "Jonathan Coulton"

-LangString name_section3 ${LANG_ENGLISH} "Optional themes"

+LangString name_s2_sub2 ${LANG_ENGLISH} "Shearer"

+LangString name_s2_sub3 ${LANG_ENGLISH} "Wise Guys"

+LangString name_section3 ${LANG_ENGLISH} "Themes"

 

 LangString DESC_Section1 ${LANG_ENGLISH} "These are the basic files needed by UltraStar Deluxe"

 LangString DESC_Section2 ${LANG_ENGLISH} "You can choose which songs should be installed."

-LangString DESC_Section2_sub1 ${LANG_ENGLISH} "You can choose which Jonathan Coulton Songs (CC by-nc 3.0) should be installed."

+LangString DESC_Section2_sub1 ${LANG_ENGLISH} "You can choose which Jonathan Coulton songs (CC by-nc 3.0) should be installed."

+LangString DESC_Section2_sub2 ${LANG_ENGLISH} "You can choose which Shearer songs (CC by-nc-sa 2.0 / 3.0) should be installed."

+LangString DESC_Section2_sub3 ${LANG_ENGLISH} "You can choose which Wise Guys songs should be installed."

 LangString DESC_Section3 ${LANG_ENGLISH} "You can choose which optional themes should be installed."

 

-LangString DESC_g2Section1 ${LANG_ENGLISH} "This will install the song 'Dead Smiling Pirates - I 18' (CC by-nc-nd 2.5)."

-LangString DESC_g2Section2 ${LANG_ENGLISH} "This will install the song 'Joshua Morin - On The Run' (CC by-sa 2.5)."

-LangString DESC_g2Section3 ${LANG_ENGLISH} "This will install the song 'Pornophonique - Space Invaders' (CC by-nc-nd 2.0)."

-LangString DESC_g2Section4 ${LANG_ENGLISH} "This will install the song 'Steven Dunston - Northern Star' (CC by-nc-sa 2.5)."

+LangString DESC_g2Section2 ${LANG_ENGLISH} "This will install the song 'Dead Smiling Pirates - I 18' (CC by-nc-nd 2.5)."

+LangString DESC_g2Section3 ${LANG_ENGLISH} "This will install the song 'Joshua Morin - On The Run' (CC by-sa 2.5)."

+LangString DESC_g2Section4 ${LANG_ENGLISH} "This will install the song 'Pornophonique - Space Invaders' (CC by-nc-nd 2.0)."

+LangString DESC_g2Section5 ${LANG_ENGLISH} "This will install the song 'Steven Dunston - Northern Star' (CC by-nc-sa 2.5)."

+LangString DESC_g2Section1 ${LANG_ENGLISH} "This will install the song 'Bodo Wartke - Liebeslied (Love Song)'."

 

 LangString DESC_s2_sub1_Section1 ${LANG_ENGLISH} "This will install the song 'Monkey Shines'."

 LangString DESC_s2_sub1_Section2 ${LANG_ENGLISH} "This will install the song 'I Crush Everything'."

 LangString DESC_s2_sub1_Section3 ${LANG_ENGLISH} "This will install the song 'Not About You'."

 LangString DESC_s2_sub1_Section4 ${LANG_ENGLISH} "This will install the song 'Mr. Fancy Pants'."

 LangString DESC_s2_sub1_Section5 ${LANG_ENGLISH} "This will install the song 'Big Bad World One'."

-LangString DESC_s2_sub1_Section6 ${LANG_ENGLISH} "This will install the song 'Flickr'."

+LangString DESC_s2_sub1_Section6 ${LANG_ENGLISH} "This will install the song 'Flickr [incl. video]'."

 LangString DESC_s2_sub1_Section7 ${LANG_ENGLISH} "This will install the song 'My Beige Bear'."

 LangString DESC_s2_sub1_Section8 ${LANG_ENGLISH} "This will install the song 'The Future Soon'."

 LangString DESC_s2_sub1_Section9 ${LANG_ENGLISH} "This will install the song 'Ikea'."

 LangString DESC_s2_sub1_Section10 ${LANG_ENGLISH} "This will install the song 'Furry Old Lobster'."

-LangString DESC_s2_sub1_Section11 ${LANG_ENGLISH} "This will install the song 'Code Monkey'."

+LangString DESC_s2_sub1_Section11 ${LANG_ENGLISH} "This will install the song 'Code Monkey [incl. video]'."

 LangString DESC_s2_sub1_Section12 ${LANG_ENGLISH} "This will install the song 'I´m Your Moon'."

 LangString DESC_s2_sub1_Section13 ${LANG_ENGLISH} "This will install the song 'First Of May'."

 LangString DESC_s2_sub1_Section14 ${LANG_ENGLISH} "This will install the song 'Dance, Soterios Johnson, Dance'."

 LangString DESC_s2_sub1_Section15 ${LANG_ENGLISH} "This will install the song 'A Talk With George'."

-LangString DESC_s2_sub1_Section16 ${LANG_ENGLISH} "This will install the song 'Creepy Doll'."

+LangString DESC_s2_sub1_Section16 ${LANG_ENGLISH} "This will install the song 'Creepy Doll [incl. video]'."

 LangString DESC_s2_sub1_Section17 ${LANG_ENGLISH} "This will install the song 'That Spells DNA'."

 LangString DESC_s2_sub1_Section18 ${LANG_ENGLISH} "This will install the song 'When You Go'."

 LangString DESC_s2_sub1_Section19 ${LANG_ENGLISH} "This will install the song 'Better'."

@@ -82,13 +104,25 @@ LangString DESC_s2_sub1_Section20 ${LANG_ENGLISH} "This will install the song 'S
 LangString DESC_s2_sub1_Section21 ${LANG_ENGLISH} "This will install the song 'I Feel Fantastic'."

 LangString DESC_s2_sub1_Section22 ${LANG_ENGLISH} "This will install the song 'Re: Your Brains'."

 LangString DESC_s2_sub1_Section23 ${LANG_ENGLISH} "This will install the song 'Skullcrusher Mountain'."

-LangString DESC_s2_sub1_Section24 ${LANG_ENGLISH} "This will install the song 'Chiron Beta Prime'."

+LangString DESC_s2_sub1_Section24 ${LANG_ENGLISH} "This will install the song 'Chiron Beta Prime [incl. video]'."

+

+LangString DESC_s2_sub2_Section1 ${LANG_ENGLISH} "This will install the song '69'."

+LangString DESC_s2_sub2_Section2 ${LANG_ENGLISH} "This will install the song '69 (Karaoke)'."

+LangString DESC_s2_sub2_Section3 ${LANG_ENGLISH} "This will install the song 'Can't stop it'."

+LangString DESC_s2_sub2_Section4 ${LANG_ENGLISH} "This will install the song 'Can't stop it (Karaoke)'."

+LangString DESC_s2_sub2_Section5 ${LANG_ENGLISH} "This will install the song 'In My Hand'."

+LangString DESC_s2_sub2_Section6 ${LANG_ENGLISH} "This will install the song 'Man Song'."

+LangString DESC_s2_sub2_Section7 ${LANG_ENGLISH} "This will install the song 'Man Song (Karaoke)'."

+LangString DESC_s2_sub2_Section8 ${LANG_ENGLISH} "This will install the song 'Stay with me'."

+LangString DESC_s2_sub2_Section9 ${LANG_ENGLISH} "This will install the song 'Stay with me (Karaoke)'."

+

+LangString DESC_s2_sub3_Section1 ${LANG_ENGLISH} "This will install the song 'Lebendig und kräftig und schärfer'."

+LangString DESC_s2_sub3_Section2 ${LANG_ENGLISH} "This will install the song 'Mensch, wo bist du?'."

 

 LangString DESC_g3Section1 ${LANG_ENGLISH} "This will install the optional theme 'Orange' by Skar"

 LangString DESC_g3Section2 ${LANG_ENGLISH} "This will install the optional theme 'Streetlight' by Skar"

 LangString DESC_g3Section3 ${LANG_ENGLISH} "This will install the optional theme 'Vistar' by Skar"

-LangString DESC_g3Section4 ${LANG_ENGLISH} "This will install the optional theme 'BlueSensation v5' by Charis"

-LangString DESC_g3Section5 ${LANG_ENGLISH} "This will install the optional theme 'WiiStar' by MasterPhW"

-LangString DESC_g3Section6 ${LANG_ENGLISH} "This will install the optional theme 'iStar' by MezzoX"

-

-

+LangString DESC_g3Section4 ${LANG_ENGLISH} "This will install the optional theme 'BlueSensation v5.1' by Charis"

+LangString DESC_g3Section6 ${LANG_ENGLISH} "This will install the optional theme 'WiiStar' by MasterPhW"

+LangString DESC_g3Section7 ${LANG_ENGLISH} "This will install the optional theme 'iStar' by MezzoX"

+LangString DESC_g3Section5 ${LANG_ENGLISH} "This will install the optional theme 'WhiteSensation' by Charis"
\ No newline at end of file
diff --git a/Lua/installer/languages/German.nsh b/Lua/installer/languages/German.nsh
index 0939b236..7f438e9d 100644
--- a/Lua/installer/languages/German.nsh
+++ b/Lua/installer/languages/German.nsh
@@ -10,11 +10,28 @@ LangString oninit_alreadyinstalled ${LANG_GERMAN} "ist bereits installiert"
 LangString oninit_closeusdx ${LANG_GERMAN} "kann nicht während der Laufzeit deinstalliert werden. Soll es geschlossen werden?"

 LangString oninit_updateusdx ${LANG_GERMAN} "Möchten Sie das Programm aktualisieren von"

 

+LangString update_connect ${LANG_GERMAN} "Mit dem Internet verbinden und nach aktueller Version suchen"

+LangString button_next ${LANG_GERMAN} "Weiter >"

+LangString button_close ${LANG_GERMAN} "Beenden"

+LangString update_information ${LANG_GERMAN} "Du kannst nach einer aktuelleren Version von 'UltraStar Deluxe' suchen. Dazu wird eine Verbindung mit dem Internet hergestellt. Wurde eine aktuellere Version gefunden, kann diese anschließend installiert werden."

+

+LangString delete_all ${LANG_GERMAN} "Lieder, Highscores und Cover auch löschen?"

+

+LangString update_check_older ${LANG_GERMAN} "Deine aktuelle Version $R0 ist veraltet. Die neue Version $1 von UltraStar Deluxe ist verfügbar. Möchtest du sie runterladen?"

+LangString update_check_equal ${LANG_GERMAN} "Deine aktuelle Version $R0 ist auf dem neusten Stand.$\n$\rKein Update benötigt."

+LangString update_check_newer ${LANG_GERMAN} "Deine aktuelle Version $R0 ist neuer als die zurzeit veröffentlichte$\n$\rVersion $1 von UltraStar Deluxe. Kein Update benötigt."

+LangString update_check_failed ${LANG_GERMAN} "Die Aktualisierungsprüfung ist fehlgeschlagen. Willst du manuell nach Updates suchen?"

+

 ; Welcome Page:

 

+LangString page_welcome_title_update ${LANG_GERMAN} "Willkommen beim Aktualisierungsassistenten von UltraStar Deluxe" 

+LangString page_welcome_txt_update ${LANG_GERMAN} "Dieser Assistent wird Sie durch die Aktualisierung von UltraStar Deluxe begleiten. UltraStar Deluxe ist ein kostenloses quelloffenes Karaokespiel, welches Singstar ähnelt. $\n$\r$\n$\rDas UltraStar Deluxe Team wünscht viel Spaß.$\n$\rProjekthomepage: http://www.ultrastardeluxe.org$\n$\rSupport Forum: http://forum.ultrastardeluxe.org"

+

 LangString page_welcome_title ${LANG_GERMAN} "Willkommen zur Installationsroutine von UltraStar Deluxe"

 LangString page_welcome_txt ${LANG_GERMAN} "Dieser Assistent wird Sie durch die Installation von UltraStar Deluxe begleiten. UltraStar Deluxe ist ein kostenloses quelloffenes Karaokespiel, welches Singstar ähnelt. $\n$\r$\n$\rDas UltraStar Deluxe Team wünscht viel Spaß.$\n$\rProjekthomepage: http://www.ultrastardeluxe.org$\n$\rSupport Forum: http://forum.ultrastardeluxe.org"

 

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

@@ -45,49 +62,67 @@ LangString sc_desktop ${LANG_GERMAN} "Verknüpfung auf dem Desktop erstellen?"
 ; Sections and SectionGroups

 

 LangString name_section1 ${LANG_GERMAN} "Hauptkomponenten"

-LangString name_section2 ${LANG_GERMAN} "Optionale Songs"

+LangString name_section2 ${LANG_GERMAN} "Songs"

 LangString name_s2_sub1 ${LANG_GERMAN} "Jonathan Coulton"

-LangString name_section3 ${LANG_GERMAN} "Optionale Themen"

+LangString name_s2_sub2 ${LANG_GERMAN} "Shearer"

+LangString name_s2_sub3 ${LANG_GERMAN} "Wise Guys"

+LangString name_section3 ${LANG_GERMAN} "Designs"

 

 LangString DESC_Section1 ${LANG_GERMAN} "Dies sind die von UltraStar Deluxe benötigten Grunddateien"

 LangString DESC_Section2 ${LANG_GERMAN} "Hier können Songs zum Installieren gewählt werden."

 LangString DESC_Section2_sub1 ${LANG_GERMAN} "Hier können Jonathan Coulton Songs (CC by-nc 3.0) zum Installieren gewählt werden."

+LangString DESC_Section2_sub2 ${LANG_GERMAN} "Hier können Shearer Songs (CC by-nc-sa 2.0 / 3.0) zum Installieren gewählt werden."

+LangString DESC_Section2_sub3 ${LANG_GERMAN} "Hier können Wise Guys Songs zum Installieren gewählt werden."

 LangString DESC_Section3 ${LANG_GERMAN} "Hier können alternative Motive zum Installieren gewählt werden."

 

-LangString DESC_g2Section1 ${LANG_GERMAN} "Installiert das Beispiellied 'Dead Smiling Pirates - I 18' (CC by-nc-nd 2.5)."

-LangString DESC_g2Section2 ${LANG_GERMAN} "Installiert das Beispiellied 'Joshua Morin - On The Run' (CC by-sa 2.5)."

-LangString DESC_g2Section3 ${LANG_GERMAN} "Installiert das Beispiellied 'Pornophonique - Space Invaders' (CC by-nc-nd 2.0)."

-LangString DESC_g2Section4 ${LANG_GERMAN} "Installiert das Beispiellied 'Steven Dunston - Northern Star' (CC by-nc-sa 2.5)."

-

-LangString DESC_s2_sub1_Section1 ${LANG_GERMAN} "Installiert das Beispiellied 'Monkey Shines'."

-LangString DESC_s2_sub1_Section2 ${LANG_GERMAN} "Installiert das Beispiellied 'I Crush Everything'."

-LangString DESC_s2_sub1_Section3 ${LANG_GERMAN} "Installiert das Beispiellied 'Not About You'."

-LangString DESC_s2_sub1_Section4 ${LANG_GERMAN} "Installiert das Beispiellied 'Mr. Fancy Pants'."

-LangString DESC_s2_sub1_Section5 ${LANG_GERMAN} "Installiert das Beispiellied 'Big Bad World One'."

-LangString DESC_s2_sub1_Section6 ${LANG_GERMAN} "Installiert das Beispiellied 'Flickr'."

-LangString DESC_s2_sub1_Section7 ${LANG_GERMAN} "Installiert das Beispiellied 'My Beige Bear'."

-LangString DESC_s2_sub1_Section8 ${LANG_GERMAN} "Installiert das Beispiellied 'The Future Soon'."

-LangString DESC_s2_sub1_Section9 ${LANG_GERMAN} "Installiert das Beispiellied 'Ikea'."

-LangString DESC_s2_sub1_Section10 ${LANG_GERMAN} "Installiert das Beispiellied 'Furry Old Lobster'."

-LangString DESC_s2_sub1_Section11 ${LANG_GERMAN} "Installiert das Beispiellied 'Code Monkey'."

-LangString DESC_s2_sub1_Section12 ${LANG_GERMAN} "Installiert das Beispiellied 'I´m Your Moon'."

-LangString DESC_s2_sub1_Section13 ${LANG_GERMAN} "Installiert das Beispiellied 'First Of May'."

-LangString DESC_s2_sub1_Section14 ${LANG_GERMAN} "Installiert das Beispiellied 'Dance, Soterios Johnson, Dance'."

-LangString DESC_s2_sub1_Section15 ${LANG_GERMAN} "Installiert das Beispiellied 'A Talk With George'."

-LangString DESC_s2_sub1_Section16 ${LANG_GERMAN} "Installiert das Beispiellied 'Creepy Doll'."

-LangString DESC_s2_sub1_Section17 ${LANG_GERMAN} "Installiert das Beispiellied 'That Spells DNA'."

-LangString DESC_s2_sub1_Section18 ${LANG_GERMAN} "Installiert das Beispiellied 'When You Go'."

-LangString DESC_s2_sub1_Section19 ${LANG_GERMAN} "Installiert das Beispiellied 'Better'."

-LangString DESC_s2_sub1_Section20 ${LANG_GERMAN} "Installiert das Beispiellied 'Shop Vac'."

-LangString DESC_s2_sub1_Section21 ${LANG_GERMAN} "Installiert das Beispiellied 'I Feel Fantastic'."

-LangString DESC_s2_sub1_Section22 ${LANG_GERMAN} "Installiert das Beispiellied 'Re: Your Brains'."

-LangString DESC_s2_sub1_Section23 ${LANG_GERMAN} "Installiert das Beispiellied 'Skullcrusher Mountain'."

-LangString DESC_s2_sub1_Section24 ${LANG_GERMAN} "Installiert das Beispiellied 'Chiron Beta Prime'."

+LangString DESC_g2Section2 ${LANG_GERMAN} "Installiert das Lied 'Dead Smiling Pirates - I 18' (CC by-nc-nd 2.5)."

+LangString DESC_g2Section3 ${LANG_GERMAN} "Installiert das Lied 'Joshua Morin - On The Run' (CC by-sa 2.5)."

+LangString DESC_g2Section4 ${LANG_GERMAN} "Installiert das Lied 'Pornophonique - Space Invaders' (CC by-nc-nd 2.0)."

+LangString DESC_g2Section5 ${LANG_GERMAN} "Installiert das Lied 'Steven Dunston - Northern Star' (CC by-nc-sa 2.5)."

+LangString DESC_g2Section1 ${LANG_GERMAN} "Installiert das Lied 'Bodo Wartke - Liebeslied (Love Song)'."

+

+LangString DESC_s2_sub1_Section1 ${LANG_GERMAN} "Installiert das Lied 'Monkey Shines'."

+LangString DESC_s2_sub1_Section2 ${LANG_GERMAN} "Installiert das Lied 'I Crush Everything'."

+LangString DESC_s2_sub1_Section3 ${LANG_GERMAN} "Installiert das Lied 'Not About You'."

+LangString DESC_s2_sub1_Section4 ${LANG_GERMAN} "Installiert das Lied 'Mr. Fancy Pants'."

+LangString DESC_s2_sub1_Section5 ${LANG_GERMAN} "Installiert das Lied 'Big Bad World One'."

+LangString DESC_s2_sub1_Section6 ${LANG_GERMAN} "Installiert das Lied 'Flickr [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' von Charis"

-LangString DESC_g3Section5 ${LANG_GERMAN} "Installiert das Motiv 'WiiStar' von MasterPhW"

-LangString DESC_g3Section6 ${LANG_GERMAN} "Installiert das Motiv 'iStar' von MezzoX"

-

+LangString DESC_g3Section4 ${LANG_GERMAN} "Installiert das Motiv 'BlueSensation v5.1' von Charis"

+LangString DESC_g3Section6 ${LANG_GERMAN} "Installiert das Motiv 'WiiStar' von MasterPhW"

+LangString DESC_g3Section7 ${LANG_GERMAN} "Installiert das Motiv 'iStar' von MezzoX"

+LangString DESC_g3Section5 ${LANG_GERMAN} "Installiert das Motiv 'WhiteSensation' von Charis"
\ No newline at end of file
diff --git a/Lua/installer/settings/files_main_install.nsh b/Lua/installer/settings/files_main_install.nsh
index 605725aa..c2cdf727 100644
--- a/Lua/installer/settings/files_main_install.nsh
+++ b/Lua/installer/settings/files_main_install.nsh
@@ -4,25 +4,26 @@
 

 ; Create Directories:

 

-CreateDirectory $INSTDIR\plugins

-CreateDirectory $INSTDIR\songs

-CreateDirectory $INSTDIR\screenshots

-CreateDirectory $INSTDIR\playlists

+CreateDirectory $INSTDIR\Plugins

+CreateDirectory $INSTDIR\Songs

+CreateDirectory $INSTDIR\Screenshots

+CreateDirectory $INSTDIR\Playlists

+CreateDirectory $INSTDIR\Covers

 

 SetOutPath "$INSTDIR"

 

-; themes, languages, sounds, visuals dir

+; themes, languages, sounds, fonts, visuals dir

 

 File /r ..\game\themes

 File /r ..\game\languages

 File /r ..\game\sounds

+File /r ..\game\fonts

 File /r ..\installerdependencies\visuals

 

 ; Root dir:

 

 File ..\installerdependencies\dll\*.dll

 

-

 File ..\ChangeLog.txt

 File ..\ChangeLog.german.txt

 File ..\README.txt

@@ -34,7 +35,7 @@ File "..\${exe}.exe"
 

 ; Covers dir:

 

-SetOutPath "$INSTDIR\covers"

+SetOutPath "$INSTDIR\Covers"

 

 IfFileExists $INSTDIR\covers\covers.ini +2 0

 File ..\game\covers\Covers.ini

diff --git a/Lua/installer/settings/files_main_uninstall.nsh b/Lua/installer/settings/files_main_uninstall.nsh
index b3d69da2..af61cb0b 100644
--- a/Lua/installer/settings/files_main_uninstall.nsh
+++ b/Lua/installer/settings/files_main_uninstall.nsh
@@ -18,6 +18,7 @@
 

  RMDir /r "$INSTDIR\plugins"

  RMDir /r "$INSTDIR\themes"

+ RMDir /r "$INSTDIR\fonts"

  RMDir /r "$INSTDIR\languages"

  RMDir /r "$INSTDIR\visuals"

  RMDir /r "$INSTDIR\sounds"

@@ -34,6 +35,7 @@
  Delete "$INSTDIR\README.txt"

  Delete "$INSTDIR\Error.log"

  Delete "$INSTDIR\covers.cache"

+ Delete "$INSTDIR\cover.db"

 

  Delete "$INSTDIR\avcodec-51.dll"

  Delete "$INSTDIR\avformat-50.dll"

diff --git a/Lua/installer/settings/functions.nsh b/Lua/installer/settings/functions.nsh
index 8345c4cc..bbd4fea2 100644
--- a/Lua/installer/settings/functions.nsh
+++ b/Lua/installer/settings/functions.nsh
@@ -74,4 +74,126 @@ FunctionEnd
 

 !macro nsProcess::Unload

 	nsProcess::_Unload

-!macroend
\ No newline at end of file
+!macroend

+

+Function OnCheckbox

+	GetDlgItem $R0 $HWNDPARENT 1

+	Pop $0 # HWND

+	${NSD_GetState} $0 $1

+	IntCmp $1 1 _Next _Close

+		_Next:

+		SendMessage $R0 ${WM_SETTEXT} 0 "STR:$(button_next)"

+		goto _done

+		_Close:

+		SendMessage $R0 ${WM_SETTEXT} 0 "STR:$(button_close)"

+	_done:

+FunctionEnd

+

+Function VersionCompare

+	!define VersionCompare `!insertmacro VersionCompareCall`

+ 

+	!macro VersionCompareCall _VER1 _VER2 _RESULT

+		Push `${_VER1}`

+		Push `${_VER2}`

+		Call VersionCompare

+		Pop ${_RESULT}

+	!macroend

+ 

+	Exch $1

+	Exch

+	Exch $0

+	Exch

+	Push $2

+	Push $3

+	Push $4

+	Push $5

+	Push $6

+	Push $7

+ 

+	begin:

+	StrCpy $2 -1

+	IntOp $2 $2 + 1

+	StrCpy $3 $0 1 $2

+	StrCmp $3 '' +2

+	StrCmp $3 '.' 0 -3

+	StrCpy $4 $0 $2

+	IntOp $2 $2 + 1

+	StrCpy $0 $0 '' $2

+ 

+	StrCpy $2 -1

+	IntOp $2 $2 + 1

+	StrCpy $3 $1 1 $2

+	StrCmp $3 '' +2

+	StrCmp $3 '.' 0 -3

+	StrCpy $5 $1 $2

+	IntOp $2 $2 + 1

+	StrCpy $1 $1 '' $2

+ 

+	StrCmp $4$5 '' equal

+ 

+	StrCpy $6 -1

+	IntOp $6 $6 + 1

+	StrCpy $3 $4 1 $6

+	StrCmp $3 '0' -2

+	StrCmp $3 '' 0 +2

+	StrCpy $4 0

+ 

+	StrCpy $7 -1

+	IntOp $7 $7 + 1

+	StrCpy $3 $5 1 $7

+	StrCmp $3 '0' -2

+	StrCmp $3 '' 0 +2

+	StrCpy $5 0

+ 

+	StrCmp $4 0 0 +2

+	StrCmp $5 0 begin newer2

+	StrCmp $5 0 newer1

+	IntCmp $6 $7 0 newer1 newer2

+ 

+	StrCpy $4 '1$4'

+	StrCpy $5 '1$5'

+	IntCmp $4 $5 begin newer2 newer1

+ 

+	equal:

+	StrCpy $0 0

+	goto end

+	newer1:

+	StrCpy $0 1

+	goto end

+	newer2:

+	StrCpy $0 2

+ 

+	end:

+	Pop $7

+	Pop $6

+	Pop $5

+	Pop $4

+	Pop $3

+	Pop $2

+	Pop $1

+	Exch $0

+FunctionEnd

+

+Function ReadFileLine

+Exch $0 ;file

+Exch

+Exch $1 ;line number

+Push $2

+Push $3

+ 

+  FileOpen $2 $0 r

+ StrCpy $3 0

+ 

+Loop:

+ IntOp $3 $3 + 1

+  ClearErrors

+  FileRead $2 $0

+  IfErrors +2

+ StrCmp $3 $1 0 loop

+  FileClose $2

+ 

+Pop $3

+Pop $2

+Pop $1

+Exch $0

+FunctionEnd
\ No newline at end of file
diff --git a/Lua/installer/settings/settings-1031.ini b/Lua/installer/settings/settings-1031.ini
index 642f577e..9e588fcb 100644
--- a/Lua/installer/settings/settings-1031.ini
+++ b/Lua/installer/settings/settings-1031.ini
@@ -44,6 +44,7 @@ Bottom=132
 [Field 6]

 Type=Droplist

 ListItems=On|Off

+State=On

 Left=71

 Right=161

 Top=25

@@ -52,6 +53,7 @@ Bottom=38
 [Field 7]

 Type=Droplist

 ListItems=Catalan|Croatian|Danish|Dutch|English|Euskara|French|German|Italian|Norwegian|Polish|Portuguese|Serbian|Slovak|Spanish|Swedish

+State=German

 Left=71

 Right=161

 Top=48

@@ -60,6 +62,7 @@ Bottom=62
 [Field 8]

 Type=Droplist

 ListItems=320x200|640x480|800x600|1024x768|1280x1024|1440x900|1680x1050|1920x1200

+State=800x600

 Left=71

 Right=161

 Top=72

@@ -68,6 +71,7 @@ Bottom=86
 [Field 9]

 Type=Droplist

 ListItems=On|Off

+State=Off

 Left=71

 Right=161

 Top=96

@@ -76,6 +80,7 @@ Bottom=110
 [Field 10]

 Type=Droplist

 ListItems=On|Off

+State=On

 Left=71

 Right=161

 Top=121

diff --git a/Lua/installer/settings/settings-1033.ini b/Lua/installer/settings/settings-1033.ini
index 2a3dfdba..17a08a8c 100644
--- a/Lua/installer/settings/settings-1033.ini
+++ b/Lua/installer/settings/settings-1033.ini
@@ -44,6 +44,7 @@ Bottom=132
 [Field 6]

 Type=Droplist

 ListItems=On|Off

+State=On

 Left=70

 Right=160

 Top=24

@@ -52,6 +53,7 @@ Bottom=36
 [Field 7]

 Type=Droplist

 ListItems=Catalan|Croatian|Danish|Dutch|English|Euskara|French|German|Italian|Norwegian|Polish|Portuguese|Serbian|Slovak|Spanish|Swedish

+State=English

 Left=70

 Right=160

 Top=48

@@ -60,6 +62,7 @@ Bottom=60
 [Field 8]

 Type=Droplist

 ListItems=320x200|640x480|800x600|1024x768|1280x1024|1440x900|1680x1050|1920x1200

+State=800x600

 Left=70

 Right=160

 Top=72

@@ -68,6 +71,7 @@ Bottom=86
 [Field 9]

 Type=Droplist

 ListItems=On|Off

+State=Off

 Left=70

 Right=160

 Top=99

@@ -76,6 +80,7 @@ Bottom=113
 [Field 10]

 Type=Droplist

 ListItems=On|Off

+State=On

 Left=70

 Right=160

 Top=123

diff --git a/Lua/installer/settings/variables.nsh b/Lua/installer/settings/variables.nsh
index bf5668d7..db98d89f 100644
--- a/Lua/installer/settings/variables.nsh
+++ b/Lua/installer/settings/variables.nsh
@@ -14,7 +14,7 @@
 

 !define exe "USdx"

 

-!define license "license.txt"

+!define license "..\installerdependencies\documents\license.txt"

 

 ; Icons

 

@@ -38,10 +38,11 @@
 

 ; Download URLs for Songs and Themes:

 

-!define download_song1 "http://downloads.sourceforge.net/ultrastardx/usdx_song-dead_smiling_pirates_-_i_18.zip"

-!define download_song2 "http://downloads.sourceforge.net/ultrastardx/usdx_song-joshua_morin_-_on_the_run.zip"

-!define download_song3 "http://downloads.sourceforge.net/ultrastardx/usdx_song-pornophonique_-_space_-_invaders.zip"

-!define download_song4 "http://downloads.sourceforge.net/ultrastardx/usdx_song-steven_dunston_-_northern_star.zip"

+!define download_song2 "http://downloads.sourceforge.net/ultrastardx/usdx_song-dead_smiling_pirates_-_i_18.zip"

+!define download_song3 "http://downloads.sourceforge.net/ultrastardx/usdx_song-joshua_morin_-_on_the_run.zip"

+!define download_song4 "http://downloads.sourceforge.net/ultrastardx/usdx_song-pornophonique_-_space_-_invaders.zip"

+!define download_song5 "http://downloads.sourceforge.net/ultrastardx/usdx_song-steven_dunston_-_northern_star.zip"

+!define download_song1 "http://downloads.sourceforge.net/ultrastardx/usdx_song-bodo_wartke_-_liebeslied.zip"

 

 !define download_sub1_song1 "http://downloads.sourceforge.net/ultrastardx/usdx_song-jonathan_coulton_-_monkey_shines.zip"

 !define download_sub1_song2 "http://downloads.sourceforge.net/ultrastardx/usdx_song-jonathan_coulton_-_i_crush_everything.zip"

@@ -68,9 +69,23 @@
 !define download_sub1_song23 "http://downloads.sourceforge.net/ultrastardx/usdx_song-jonathan_coulton_-_skullcrusher_mountain.zip"

 !define download_sub1_song24 "http://downloads.sourceforge.net/ultrastardx/usdx_song-jonathan_coulton_-_chiron_beta_prime.zip"

 

+!define download_sub2_song1 "http://downloads.sourceforge.net/ultrastardx/usdx_song-shearer_-_69.zip"

+!define download_sub2_song2 "http://downloads.sourceforge.net/ultrastardx/usdx_song-shearer_-_69_kar.zip"

+!define download_sub2_song3 "http://downloads.sourceforge.net/ultrastardx/usdx_song-shearer_-_cant_stop_it.zip"

+!define download_sub2_song4 "http://downloads.sourceforge.net/ultrastardx/usdx_song-shearer_-_cant_stop_it_kar.zip"

+!define download_sub2_song5 "http://downloads.sourceforge.net/ultrastardx/usdx_song-shearer_-_in_my_hand.zip"

+!define download_sub2_song6 "http://downloads.sourceforge.net/ultrastardx/usdx_song-shearer_-_man_song.zip"

+!define download_sub2_song7 "http://downloads.sourceforge.net/ultrastardx/usdx_song-shearer_-_man_song_kar.zip"

+!define download_sub2_song8 "http://downloads.sourceforge.net/ultrastardx/usdx_song-shearer_-_stay_with_me.zip"

+!define download_sub2_song9 "http://downloads.sourceforge.net/ultrastardx/usdx_song-shearer_-_stay_with_me_kar.zip"

+

+!define download_sub3_song1 "http://downloads.sourceforge.net/ultrastardx/usdx_song-wise_guys_-_lebendig_und_kraeftig_und_schaerfer.zip"

+!define download_sub3_song2 "http://downloads.sourceforge.net/ultrastardx/usdx_song-wise_guys_-_mensch_wo_bist_du.zip"

+

 !define download_theme1 "http://downloads.sourceforge.net/ultrastardx/usdx_skin-orange_by_Skar.zip"

 !define download_theme2 "http://downloads.sourceforge.net/ultrastardx/usdx_skin-Streetlight_by_Skar.zip"

 !define download_theme3 "http://downloads.sourceforge.net/ultrastardx/usdx_skin-Vistar_by_Skar.zip"

-!define download_theme4 "http://downloads.sourceforge.net/ultrastardx/usdx_skin-bluesensationV5_by_Charis.zip"

-!define download_theme5 "http://downloads.sourceforge.net/ultrastardx/usdx_skin-WiiStar_by_MasterPhW.zip"

-!define download_theme6 "http://downloads.sourceforge.net/ultrastardx/usdx_skin-istar_by_MezzoX.zip"
\ No newline at end of file
+!define download_theme4 "http://downloads.sourceforge.net/ultrastardx/usdx_skin-bluesensationV5.1_by_Charis.zip"

+!define download_theme6 "http://downloads.sourceforge.net/ultrastardx/usdx_skin-WiiStar_by_MasterPhW.zip"

+!define download_theme7 "http://downloads.sourceforge.net/ultrastardx/usdx_skin-istar_by_MezzoX.zip"

+!define download_theme5 "http://downloads.sourceforge.net/ultrastardx/usdx_skin-whitesensationV101_by_Charis.zip"   
\ No newline at end of file