- Updated installer source to fit changes made for version 1.0.1a

- Added new demo song "Joshua Morin - On the run"
- Fixed: required disc size will now be calculated correctly
- Fixed: icon appears now in the software uninstall menu of windows

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

11 files changed, 79 insertions, 18 deletions

diff --git a/Installer/Readme.txt b/Installer/Readme.txt
index 7c988ace..a10b8ac2 100644
--- a/Installer/Readme.txt
+++ b/Installer/Readme.txt
@@ -1,4 +1,4 @@
-SOURCE (23th of November 2007, 23:45 UTC+1 MESZ)

+SOURCE (23th of December 2007, 13:00 UTC+1 MESZ)

 

 Build using Nullsoft Install System

 (http://nsis.sourceforge.net/)

diff --git a/Installer/UltraStarDeluxe.nsi b/Installer/UltraStarDeluxe.nsi
index 52091548..cb1b7745 100644
--- a/Installer/UltraStarDeluxe.nsi
+++ b/Installer/UltraStarDeluxe.nsi
@@ -8,8 +8,8 @@
 !include ".\settings\functions.nsh"

 !include "WinVer.nsh"

 

-!define icon_inst ".\icons\ustar.ico"                ; Icon for Installation

-!define icon_uninst ".\icons\uninstall.ico"        ; Icon for Uninstallation

+!define icon_inst "ustar.ico"                ; Icon for Installation

+!define icon_uninst "uninstall.ico"        ; Icon for Uninstallation

 

 SetCompress Auto

 SetCompressor /SOLID lzma

diff --git a/Installer/UltraStarDeluxeFull.nsi b/Installer/UltraStarDeluxeFull.nsi
index 66c0234b..95bb628a 100644
--- a/Installer/UltraStarDeluxeFull.nsi
+++ b/Installer/UltraStarDeluxeFull.nsi
@@ -8,8 +8,8 @@
 !include ".\settings\functions.nsh"

 !include "WinVer.nsh"

 

-!define icon_inst ".\icons\ustar.ico"                ; Icon for Installation

-!define icon_uninst ".\icons\uninstall.ico"        ; Icon for Uninstallation

+!define icon_inst "ustar.ico"                ; Icon for Installation

+!define icon_uninst "uninstall.ico"        ; Icon for Uninstallation

 

 SetCompress Auto

 SetCompressor /SOLID lzma

@@ -315,13 +315,16 @@ SectionEnd
  LangString DESC_g2Section2 ${LANG_ENGLISH} "${eng_g2Section2_desc}"

  LangString DESC_g2Section2 ${LANG_GERMAN} "${ger_g2Section2_desc}"

 

+ LangString DESC_g2Section3 ${LANG_ENGLISH} "${eng_g2Section3_desc}"

+ LangString DESC_g2Section3 ${LANG_GERMAN} "${ger_g2Section3_desc}"

+

  LangString sec2 ${LANG_ENGLISH} "${eng_sec2}"

  LangString sec2 ${LANG_GERMAN} "${ger_sec2}"

 

 SectionGroup $(sec2) Section2

 

 Section /o "Dead Smiling Pirates - I 18" g2Section1

-   AddSize 2816

+;  AddSize 1400

    SetOverwrite try

    SetOutPath "$INSTDIR"

    CreateDirectory "$INSTDIR\Songs\Dead Smiling Pirates - I 18 [DEMO]"

@@ -348,7 +351,7 @@ Section /o "Dead Smiling Pirates - I 18" g2Section1
  SectionEnd

 

 Section /o "Steven Dunston - Northern Star" g2Section2

-   AddSize 3769

+;  AddSize 1500

    SetOverwrite try

    SetOutPath "$INSTDIR"

    CreateDirectory "$INSTDIR\Songs\Steven Dunston - Northern Star [DEMO]"

@@ -373,6 +376,32 @@ Section /o "Steven Dunston - Northern Star" g2Section2
 

  SectionEnd

 

+Section /o "Joshua Morin - On the run" g2Section3

+;  AddSize 2200

+   SetOverwrite try

+   SetOutPath "$INSTDIR"

+   CreateDirectory "$INSTDIR\Songs\Joshua Morin - On the run [DEMO]"

+   SetOutPath "$INSTDIR\Songs\Joshua Morin - On the run [DEMO]\"

+

+; Download song:

+; NSISdl::download /TIMEOUT=30000 ${demosong3} $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 [DEMO]\"

+

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

+

+  SetOutPath "$INSTDIR"

+

+!include ".\settings\optional\in_song3.nsh"

+

+  SetOutPath "$INSTDIR"

+

+ SectionEnd

+

  SectionGroupEnd

 

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

@@ -397,6 +426,7 @@ LangString sec_group ${LANG_GERMAN} "${ger_sec3}"
 SectionGroup $(sec_group) Section3

 

  Section "Orange" g1Sec1

+;  AddSize 700

 

 ; Download theme orange:

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

@@ -418,6 +448,7 @@ SectionGroup $(sec_group) Section3
 SectionEnd

 

  Section "Streetlight" g1Sec2

+;  AddSize 1000

 

 ; Download theme Streetlight:

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

@@ -439,6 +470,7 @@ SectionEnd
 SectionEnd

 

  Section "Vistar" g1Sec3

+;   AddSize 1000

 

 ; Download theme Vistar:

 

@@ -497,6 +529,7 @@ SectionEnd
 

   !insertmacro MUI_DESCRIPTION_TEXT ${g2Section1} $(DESC_g2Section1)

   !insertmacro MUI_DESCRIPTION_TEXT ${g2Section2} $(DESC_g2Section2)

+  !insertmacro MUI_DESCRIPTION_TEXT ${g2Section3} $(DESC_g2Section3)

 

 !insertmacro MUI_FUNCTION_DESCRIPTION_END

 

diff --git a/Installer/gdf/UltraStar Deluxe.gdf.xml b/Installer/gdf/UltraStar Deluxe.gdf.xml
index a231a4d5..90da47aa 100644
--- a/Installer/gdf/UltraStar Deluxe.gdf.xml
+++ b/Installer/gdf/UltraStar Deluxe.gdf.xml
diff --git a/Installer/settings/files_un.nsh b/Installer/settings/files_un.nsh
index 2bdc0819..a45a3da1 100644
--- a/Installer/settings/files_un.nsh
+++ b/Installer/settings/files_un.nsh
@@ -12,7 +12,12 @@
  Delete "$INSTDIR\License.txt"

  Delete "$INSTDIR\ReadMe.txt"

  Delete "$INSTDIR\SDL.dll"

- Delete "$INSTDIR\smpeg.dll"

+

+ Delete "$INSTDIR\sqlite3.dll"

+ Delete "$INSTDIR\avcodec-51.dll"

+ Delete "$INSTDIR\avformat-50.dll"

+ Delete "$INSTDIR\avutil-49.dll"

+

  Delete "$INSTDIR\sqlite3.dll"

  Delete "$INSTDIR\config.ini"

  Delete "$INSTDIR\Error.log"

@@ -48,6 +53,7 @@ ${EndIf}
  Delete "$INSTDIR\Plugins\Blind.dll"

  Delete "$INSTDIR\Plugins\Duell.dll"

  Delete "$INSTDIR\Plugins\Hold_The_Line.dll"

+ Delete "$INSTDIR\Plugins\TeamDuell.dll"

  Delete "$INSTDIR\Plugins\Until5000.dll"

 

 ; Delete provided Classic Skin

@@ -257,10 +263,16 @@ ${EndIf}
 

  Delete "$INSTDIR\Songs\Steven Dunston - Northern Star [DEMO]\Steven Dunston - Northern Star [BG].jpg"

  Delete "$INSTDIR\Songs\Steven Dunston - Northern Star [DEMO]\Steven Dunston - Northern Star [CO].jpg"

- Delete "$INSTDIR\Songs\Steven Dunston - Northern Star [DEMO]\Steven Dunston - Northern Star.mp3"

- Delete "$INSTDIR\Songs\Steven Dunston - Northern Star [DEMO]\Steven Dunston - Northern Star v1.4.txt"

+ Delete "$INSTDIR\Songs\Steven Dunston - Northern Star [DEMO]\Steven Dunston - Northern Star.ogg"

+ Delete "$INSTDIR\Songs\Steven Dunston - Northern Star [DEMO]\Steven Dunston - Northern Star.txt"

  Delete "$INSTDIR\Songs\Steven Dunston - Northern Star [DEMO]\License.txt"

 

+ Delete "$INSTDIR\Songs\Joshua Morin - On the run [DEMO]\License.txt"

+ Delete "$INSTDIR\Songs\Joshua Morin - On the run [DEMO]\Joshua Morin - On the run.txt"

+ Delete "$INSTDIR\Songs\Joshua Morin - On the run [DEMO]\Joshua Morin - On the run [BG].jpg"

+ Delete "$INSTDIR\Songs\Joshua Morin - On the run [DEMO]\Joshua Morin - On the run [CO].jpg"

+ Delete "$INSTDIR\Songs\Joshua Morin - On the run [DEMO]\Joshua Morin - On the run.ogg"

+

 ; Delete only empty directories:

 

 StrCpy $0 "$INSTDIR\Covers"

@@ -287,6 +299,9 @@ Call un.DeleteIfEmpty
 StrCpy $0 "$INSTDIR\Songs\Steven Dunston - Northern Star [DEMO]"

 Call un.DeleteIfEmpty

 

+StrCpy $0 "$INSTDIR\Songs\Joshua Morin - On the run [DEMO]"

+Call un.DeleteIfEmpty

+

 StrCpy $0 "$INSTDIR\Songs"

 Call un.DeleteIfEmpty

 

@@ -306,7 +321,6 @@ StrCpy $0 "$INSTDIR"
 Call un.DeleteIfEmpty

 

 

-

 ; Delete created Icons in startmenu

 

  SetShellVarContext all

diff --git a/Installer/settings/langstrings.nsh b/Installer/settings/langstrings.nsh
index fa3acf19..baed5f94 100644
--- a/Installer/settings/langstrings.nsh
+++ b/Installer/settings/langstrings.nsh
@@ -53,8 +53,8 @@ LangString Settings_SUBTITLE ${LANG_GERMAN} "Lege deine favorisierten Einstellun
 LangString wp_title ${LANG_GERMAN} "Willkommen zur Installationsroutine von UltraStar Deluxe"	; Title String in Welcome Page

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

 

-LangString wp_text ${LANG_GERMAN} "Dieser Assistent wird Sie durch die Installation von UltraStar Deluxe begleiten. UltraStar Deluxe ist ein kostenloses quelloffenes Karaokespiel, welches Singstar ähnelt. Diese Installationsroutine enthält den Bonus Song 'Dead Smiling Pirates - I 18' aus der CreativeCommons Datenbank, der optional heruntergeladen werden kann (benötigt aktive Internetverbindung).\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 wp_text ${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. These Installation Wizard includes the bonus track 'Dead Smiling Pirates - I 18' from the CreativeCommons database and which can be downloaded seperatly (requires active internet connection).\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 wp_text ${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 wp_text ${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 fp_showreadme ${LANG_GERMAN} "Dokumentation ansehen (PDF)"	; "Show Readme" String in Finish Page

 LangString fp_showreadme ${LANG_ENGLISH} "See documentation (PDF)"

diff --git a/Installer/settings/optional/in_song2.nsh b/Installer/settings/optional/in_song2.nsh
index a9929b17..29478c56 100644
--- a/Installer/settings/optional/in_song2.nsh
+++ b/Installer/settings/optional/in_song2.nsh
@@ -2,10 +2,10 @@
   SetOutPath "$INSTDIR\Songs\Steven Dunston - Northern Star [DEMO]\"

 

   File "..\Songs\Steven Dunston - Northern Star [DEMO]\License.txt"

-  File "..\Songs\Steven Dunston - Northern Star [DEMO]\Steven Dunston - Northern Star v1.4.txt"

+  File "..\Songs\Steven Dunston - Northern Star [DEMO]\Steven Dunston - Northern Star.txt"

   File "..\Songs\Steven Dunston - Northern Star [DEMO]\Steven Dunston - Northern Star [BG].jpg"

   File "..\Songs\Steven Dunston - Northern Star [DEMO]\Steven Dunston - Northern Star [CO].jpg"

-  File "..\Songs\Steven Dunston - Northern Star [DEMO]\Steven Dunston - Northern Star.mp3"

+  File "..\Songs\Steven Dunston - Northern Star [DEMO]\Steven Dunston - Northern Star.ogg"

 

 

   SetOutPath "$INSTDIR"
\ No newline at end of file
diff --git a/Installer/settings/optional/in_song3.nsh b/Installer/settings/optional/in_song3.nsh
new file mode 100644
index 00000000..844accdd
--- /dev/null
+++ b/Installer/settings/optional/in_song3.nsh
@@ -0,0 +1,11 @@
+

+  SetOutPath "$INSTDIR\Songs\Joshua Morin - On the run [DEMO]\"

+

+  File "..\Songs\Joshua Morin - On the run [DEMO]\License.txt"

+  File "..\Songs\Joshua Morin - On the run [DEMO]\Joshua Morin - On the run.txt"

+  File "..\Songs\Joshua Morin - On the run [DEMO]\Joshua Morin - On the run [BG].jpg"

+  File "..\Songs\Joshua Morin - On the run [DEMO]\Joshua Morin - On the run [CO].jpg"

+  File "..\Songs\Joshua Morin - On the run [DEMO]\Joshua Morin - On the run.ogg"

+

+

+  SetOutPath "$INSTDIR"
\ No newline at end of file
diff --git a/Installer/settings/variables.nsh b/Installer/settings/variables.nsh
index 3a022ecd..7f41776e 100644
--- a/Installer/settings/variables.nsh
+++ b/Installer/settings/variables.nsh
@@ -1,7 +1,7 @@
 ; These are the common used variables

 ; for the USdx Installation Wizard

 

-!define version "1.01"						; Current version of UltraStar Deluxe

+!define version "1.0.1a"						; Current version of UltraStar Deluxe

 !define p_name "UltraStar Deluxe" 				; Just the name of the program

 !define publisher "USDX Team"					; Publisher

 !define homepage "http://www.ultrastardeluxe.org/"		; Project Homepage

@@ -28,10 +28,13 @@
 !define ger_sec3_desc "Hier können optionale Motive zum Installieren gewählt werden."   ; German Description of "Optional Themes"-Section

 

 !define eng_g2Section1_desc "Install the demo song 'Dead Smiling Pirates - I 18'."	; English Description of the Example Song "I 18"

-!define ger_g2Section1_desc "Installiert das freie Beispiellied 'Dead Smiling Pirates - I 18'"   	; German Description of the Example Song "I 18"

+!define ger_g2Section1_desc "Installiert das freie Beispiellied 'Dead Smiling Pirates - I 18'."   	; German Description of the Example Song "I 18"

 

 !define eng_g2Section2_desc "Install the demo song 'Steven Dunston - Northern Star'."		; English Description of the Example Song "Northern Star"

-!define ger_g2Section2_desc "Installiert das freie Beispiellied 'Steven Dunston - Northern Star'"	; German Description of the Example Song "Northern Star"

+!define ger_g2Section2_desc "Installiert das freie Beispiellied 'Steven Dunston - Northern Star'."	; German Description of the Example Song "Northern Star"

+

+!define eng_g2Section3_desc "Install the demo song 'Joshua Morin - On the run'." ; English Description of the Example Song "On the run"

+!define ger_g2Section3_desc "Installiert das freie Beispiellied 'Joshua Morin - On the run'."; German Description of the Example Song "On the run"

 

 !define eng_sec1 "Base components" 							; English Name of the component section1

 !define ger_sec1 "Basiskomponenten" 							; German Name of the component section1

diff --git a/Installer/icons/uninstall.ico b/Installer/uninstall.ico
index 1c72432a..1c72432a 100644
--- a/Installer/icons/uninstall.ico
+++ b/Installer/uninstall.ico
diff --git a/Installer/icons/ustar.ico b/Installer/ustar.ico
index f3214d1a..f3214d1a 100644
--- a/Installer/icons/ustar.ico
+++ b/Installer/ustar.ico