Updated installer source:

There will be a lite and a full installer.
Changed install method.

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

10 files changed, 713 insertions, 153 deletions

diff --git a/Installer/Readme.txt b/Installer/Readme.txt
index 5538e0a2..7c988ace 100644
--- a/Installer/Readme.txt
+++ b/Installer/Readme.txt
@@ -1,4 +1,4 @@
-SOURCE (3th of November 2007, 17:30 UTC+1 MESZ)

+SOURCE (23th of November 2007, 23:45 UTC+1 MESZ)

 

 Build using Nullsoft Install System

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

diff --git a/Installer/UltraStarDeluxe.nsi b/Installer/UltraStarDeluxe.nsi
index 31cd8de6..52091548 100644
--- a/Installer/UltraStarDeluxe.nsi
+++ b/Installer/UltraStarDeluxe.nsi
@@ -64,7 +64,7 @@ SetDatablockOptimize On
 

 Name "${p_name} V.${version}"

 Brandingtext "${p_name} Installation"

-OutFile "Install ${p_name} V.${version}.exe"

+OutFile "ultrastardx-${version}-installer-lite.exe"

 !define ins_name "Install ${p_name} V.${version}.exe"

 

 InstallDir "$PROGRAMFILES\${p_name}"

@@ -255,7 +255,7 @@ Section $(sec1) Section1
   CreateDirectory "${p_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_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"

@@ -309,62 +309,62 @@ SectionEnd
 ; Section2: Example Song "Dead Smiling Pirates"

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

 

-LangString DESC_g2Section1 ${LANG_ENGLISH} "${eng_g2Section1_desc}"

-LangString DESC_g2Section1 ${LANG_GERMAN} "${ger_g2Section1_desc}"

+; LangString DESC_g2Section1 ${LANG_ENGLISH} "${eng_g2Section1_desc}"

+; LangString DESC_g2Section1 ${LANG_GERMAN} "${ger_g2Section1_desc}"

 

-LangString DESC_g2Section2 ${LANG_ENGLISH} "${eng_g2Section2_desc}"

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

+; LangString DESC_g2Section2 ${LANG_ENGLISH} "${eng_g2Section2_desc}"

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

 

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

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

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

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

 

-SectionGroup $(sec2) Section2

+; SectionGroup $(sec2) Section2

 

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

-  AddSize 2816

-  SetOverwrite try

-  SetOutPath "$INSTDIR"

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

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

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

+;   AddSize 2816

+;   SetOverwrite try

+;   SetOutPath "$INSTDIR"

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

+;   SetOutPath "$INSTDIR\Songs\Dead Smiling Pirates - I 18 [DEMO]\"

 

 ; Download song:

-NSISdl::download /TIMEOUT=30000 ${demosong} $TEMP\Song-I-18.zip

+; NSISdl::download /TIMEOUT=30000 ${demosong} $TEMP\Song-I-18.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-I-18.zip" "$INSTDIR\Songs\Dead Smiling Pirates - I 18 [DEMO]\"

 

-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-I-18.zip" "$INSTDIR\Songs\Dead Smiling Pirates - I 18 [DEMO]\"

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

 

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

+;   SetOutPath "$INSTDIR"

 

-  SetOutPath "$INSTDIR"

-

-SectionEnd

+; SectionEnd

 

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

-  AddSize 3769

-  SetOverwrite try

-  SetOutPath "$INSTDIR"

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

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

+; Section /o "Steven Dunston - Northern Star" g2Section2

+;   AddSize 3769

+;   SetOverwrite try

+;   SetOutPath "$INSTDIR"

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

+;   SetOutPath "$INSTDIR\Songs\Steven Dunston - Northern Star [DEMO]\"

 

 ; Download song:

-NSISdl::download /TIMEOUT=30000 ${demosong2} $TEMP\Song-Northern-Star.zip

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

+; 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 [DEMO]\"

 

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

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

 

-  SetOutPath "$INSTDIR"

+;   SetOutPath "$INSTDIR"

 

-SectionEnd

+; SectionEnd

 

-SectionGroupEnd

+; SectionGroupEnd

 

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

 ; Section3: Optional Themes

@@ -387,55 +387,67 @@ LangString sec_group ${LANG_GERMAN} "${ger_sec3}"
 

 SectionGroup $(sec_group) Section3

 

- Section /o "Orange" g1Sec1

+ Section "Orange" g1Sec1

 

 ; Download theme orange:

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

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

+; Pop $R0 ;Get the return value

+;   StrCmp $R0 "success" dlok

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

+; dlok:

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

 

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

+; Delete "$TEMP\Theme-Orange.zip"

+

+  SetOutPath "$INSTDIR"

+

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

 

   SetOutPath "$INSTDIR"

 

 SectionEnd

 

- Section /o "Streetlight" g1Sec2

+ Section "Streetlight" g1Sec2

 

 ; Download theme Streetlight:

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

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

+; Pop $R0 ;Get the return value

+;   StrCmp $R0 "success" dlok

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

+; dlok:

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

 

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

+; Delete "$TEMP\Theme-Streetlight.zip"

+

+  SetOutPath "$INSTDIR"

+

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

 

   SetOutPath "$INSTDIR"

 

 SectionEnd

 

- Section /o "Vistar" g1Sec3

+ Section "Vistar" g1Sec3

 

 ; Download theme Vistar:

-NSISdl::download /TIMEOUT=30000 ${dl_vistar} $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\"

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

+

+; Pop $R0 ;Get the return value

+;  StrCmp $R0 "success" dlok

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

+; dlok:

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

 

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

+; Delete "$TEMP\Theme-Vistar.zip"

 

   SetOutPath "$INSTDIR"

 

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

+

+  SetOutPath "$INSTDIR"

 

 SectionEnd

 

@@ -474,8 +486,8 @@ SectionEnd
   !insertmacro MUI_DESCRIPTION_TEXT ${g1Sec2} $(DESC_g1Sec2)

   !insertmacro MUI_DESCRIPTION_TEXT ${g1Sec3} $(DESC_g1Sec3)

 

-  !insertmacro MUI_DESCRIPTION_TEXT ${g2Section1} $(DESC_g2Section1)

-  !insertmacro MUI_DESCRIPTION_TEXT ${g2Section2} $(DESC_g2Section2)

+;  !insertmacro MUI_DESCRIPTION_TEXT ${g2Section1} $(DESC_g2Section1)

+;  !insertmacro MUI_DESCRIPTION_TEXT ${g2Section2} $(DESC_g2Section2)

 

 !insertmacro MUI_FUNCTION_DESCRIPTION_END

 

diff --git a/Installer/UltraStarDeluxeFull.nsi b/Installer/UltraStarDeluxeFull.nsi
new file mode 100644
index 00000000..66c0234b
--- /dev/null
+++ b/Installer/UltraStarDeluxeFull.nsi
@@ -0,0 +1,566 @@
+; --------------------------------------------------------------

+; UltraStar Deluxe - Installation Wizard with NSIS (USDXIWWNSIS)

+; --------------------------------------------------------------

+

+!include "MUI.nsh"        ; Include the macros for the Modern User Interface

+!include "LogicLib.nsh"

+!include ".\settings\GameExplorer.nsh"

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

+

+SetCompress Auto

+SetCompressor /SOLID lzma

+SetCompressorDictSize 32

+SetDatablockOptimize On

+

+; XPStyle on

+

+; ------------------------------------------------------

+; Declaration of Variables (See .\settings\variables.nsh)

+; ------------------------------------------------------

+

+!include ".\settings\variables.nsh"

+

+!addPluginDir "..\InstallerDependencies\plugins\"

+

+; -------------------------------

+; Strings for Installation Wizard

+; -------------------------------

+

+!define MUI_WELCOMEPAGE_TITLE "$(wp_title)"

+

+!define MUI_WELCOMEPAGE_TEXT "$(wp_text)"

+;!define MUI_FINISHPAGE_SHOWREADME_TEXT "$(fp_showreadme)"

+!define MUI_FINISHPAGE_LINK "$(fp_link)"

+!define MUI_UNCONFIRMPAGE_TEXT_TOP "UltraStar Deluxe - $(sm_uninstall)"

+

+!define MUI_LICENSEPAGE_RADIOBUTTONS

+!define MUI_WELCOMEPAGE_TITLE_3LINES

+

+!define MUI_FINISHPAGE_TITLE_3LINES

+

+!define MUI_FINISHPAGE_RUN "$INSTDIR\${exe}.exe"

+!define MUI_FINISHPAGE_RUN_NOTCHECKED

+

+;!define MUI_FINISHPAGE_SHOWREADME "$INSTDIR\ReadMe.txt"

+

+!define MUI_FINISHPAGE_LINK_LOCATION "${homepage}"

+!define MUI_FINISHPAGE_NOREBOOTSUPPORT

+!define MUI_FINISHPAGE_TEXT_LARGE

+!define MUI_FINISHPAGE_TEXT "$(fp_text)"

+

+!define MUI_UNFINISHPAGE_LINK_LOCATION "${forum}"

+

+!define MUI_COMPONENTSPAGE_SMALLDESC

+

+; The other (multi) language Strings are at the bottom of this file

+

+; --------------------------------------------------

+; Begin of the installation wizard

+; --------------------------------------------------

+

+Name "${p_name} V.${version}"

+Brandingtext "${p_name} Installation"

+OutFile "ultrastardx-${version}-installer-full.exe"

+!define ins_name "Install ${p_name} V.${version}.exe"

+

+InstallDir "$PROGRAMFILES\${p_name}"

+

+ShowInstDetails show

+ShowUnInstDetails show

+

+!define PRODUCT_NAME "${p_name}"

+!define PRODUCT_VERSION "${version}"

+!define PRODUCT_PUBLISHER "${publisher}"

+!define PRODUCT_WEB_SITE "${homepage}"

+!define PRODUCT_UNINST_KEY "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_NAME}"

+!define PRODUCT_UNINST_ROOT_KEY "HKLM"

+!define PRODUCT_STARTMENU_REGVAL "NSIS:StartMenuDir"

+

+; Modern User Interface (MUI) Stuff

+

+!define MUI_ICON "${icon_inst}"                ; Icon for Installation

+!define MUI_UNICON "${icon_uninst}"        ; Icon for Uninstallation

+

+!define MUI_HEADERIMAGE

+!define MUI_HEADERIMAGE_BITMAP "${bmp_header}"                  ; Header Bitmap of the installation (Size: 150x57 px)

+!define MUI_HEADERIMAGE_UNBITMAP "${bmp_header}"         ; Header Bitmap of the uninstallation (Size: 150x57 px)

+!define MUI_WELCOMEFINISHPAGE_BITMAP "${bmp_side}"         ; Left Side Bitmap of Welcome & Finish Page while Installation (Size: 164x314 px)

+!define MUI_UNWELCOMEFINISHPAGE_BITMAP "${bmp_side}"         ; Left Side Bitmap of Welcome & Finish Page while Uninstallation (Size: 164x314 px)

+!define MUI_BGCOLOR "FFFFFF"                                 ; RGB Background color (for header, welcome & finish page)

+!define MUI_WELCOMEFINISHPAGE_INI "${mui_ini}"                 ; Installation Options for Welcome & Finish Page (Installation)

+!define MUI_UNWELCOMEFINISHPAGE_INI "${mui_ini}"         ; Installation Options for Welcome & Finish Page (Uninstallation)

+!define MUI_LICENSEPAGE_BGCOLOR "${license_bgcolor}"         ; Background Color of Licence agreement

+!define MUI_COMPONENTSPAGE_CHECKBITMAP "${bmp_check}"          ; Bitmap of Checks at Components Selection Page

+!define MUI_DIRECTORYPAGE_BGCOLOR "${directory_bgcolor}" ; RGB Background Color for Directory textbox

+!define MUI_STARTMENUPAGE_BGCOLOR "${smp_bgcolor}"         ; RGB Background of Startmenu List and Textbox

+;!define MUI_INSTFILESPAGE_COLORS "${dets_bgcolor}"         ; Background Color of Details Screen while files are being extracted

+

+

+!define MUI_LANGDLL_WINDOWTITLE "USdx In-/Uninstaller: Choose language"

+!define MUI_LANGDLL_ALWAYSSHOW

+

+!define MUI_FINISHPAGE_NOAUTOCLOSE                         ; Allows user to check the log file of installation (Comment out if unwanted)

+!define MUI_UNFINISHPAGE_NOAUTOCLOSE                         ; Allows user to check the log file of uninstallation (Comment out if unwanted)

+

+!define MUI_ABORTWARNING

+!define MUI_ABORTWARNING_TEXT $(str_abort)                 ; Abort Warning message

+!define MUI_ABORTWARNING_CANCEL_DEFAULT                         ; Default: Cancel abort (Comment out if unwanted)

+

+!define MUI_FINISHPAGE_SHOWREADME

+!define MUI_FINISHPAGE_SHOWREADME_TEXT $(sc_desktop)

+!define MUI_FINISHPAGE_SHOWREADME_FUNCTION CreateDesktopShortCuts

+

+; --------------------------------------------------

+; Begin of the installation routine

+; --------------------------------------------------

+

+; Pages for MUI Installation

+

+!insertmacro MUI_PAGE_WELCOME

+!insertmacro MUI_PAGE_LICENSE "${file_license}"

+!insertmacro MUI_PAGE_COMPONENTS

+!insertmacro MUI_PAGE_DIRECTORY

+

+

+; Start menu page

+

+var ICONS_GROUP

+!define MUI_STARTMENUPAGE_NODISABLE

+!define MUI_STARTMENUPAGE_DEFAULTFOLDER "UltraStar Deluxe"

+!define MUI_STARTMENUPAGE_REGISTRY_ROOT "${PRODUCT_UNINST_ROOT_KEY}"

+!define MUI_STARTMENUPAGE_REGISTRY_KEY "${PRODUCT_UNINST_KEY}"

+!define MUI_STARTMENUPAGE_REGISTRY_VALUENAME "${PRODUCT_STARTMENU_REGVAL}"

+!insertmacro MUI_PAGE_STARTMENU Application $ICONS_GROUP

+

+!insertmacro MUI_PAGE_INSTFILES

+Page custom Settings

+

+; USDX Settings Page

+

+Function Settings

+

+!insertmacro MUI_HEADER_TEXT "$(Settings_TITLE)" "$(Settings_SUBTITLE)"

+

+   !insertmacro MUI_INSTALLOPTIONS_DISPLAY "Settings-$LANGUAGE"

+

+; Get all the variables:

+

+var /GLOBAL fullscreen

+var /GLOBAL language2

+var /GLOBAL resolution

+var /GLOBAL tabs

+var /GLOBAL animations

+  !insertmacro MUI_INSTALLOPTIONS_READ $fullscreen "Settings-$LANGUAGE" "Field 6" "State"

+  !insertmacro MUI_INSTALLOPTIONS_READ $language2 "Settings-$LANGUAGE" "Field 7" "State"

+  !insertmacro MUI_INSTALLOPTIONS_READ $resolution "Settings-$LANGUAGE" "Field 8" "State"

+  !insertmacro MUI_INSTALLOPTIONS_READ $tabs "Settings-$LANGUAGE" "Field 9" "State"

+  !insertmacro MUI_INSTALLOPTIONS_READ $animations "Settings-$LANGUAGE" "Field 10" "State"

+

+; Write all variables to config.ini

+

+FileOpen $0 '$INSTDIR\config.ini' w

+FileWrite $0 '[Game]$\r$\n'

+FileClose $0

+

+${If} $language2 != ""

+

+${WriteToConfig} "Language=$language2$\r$\n" "$INSTDIR\config.ini"

+

+${EndIf}

+

+${If} $tabs != ""

+

+${WriteToConfig} "Tabs=$tabs$\r$\n" "$INSTDIR\config.ini"

+

+${EndIf}

+

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

+

+${If} $fullscreen != ""

+

+${WriteToConfig} "FullScreen=$fullscreen$\r$\n" "$INSTDIR\config.ini"

+

+${EndIf}

+

+${If} $resolution != ""

+

+${WriteToConfig} "Resolution=$resolution$\r$\n" "$INSTDIR\config.ini"

+

+${EndIf}

+

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

+

+; Animations On / Off Tasks

+

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

+

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

+

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

+

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

+

+${EndIf}

+

+

+FunctionEnd ;Custom page end

+

+!insertmacro MUI_PAGE_FINISH

+

+; Pages for MUI Uninstallation

+

+!insertmacro MUI_UNPAGE_WELCOME

+!insertmacro MUI_UNPAGE_CONFIRM

+!insertmacro MUI_UNPAGE_INSTFILES

+

+; Language files

+

+!insertmacro MUI_LANGUAGE "English"

+!insertmacro MUI_LANGUAGE "German"

+

+; Finish Page

+

+!insertmacro MUI_UNPAGE_FINISH

+

+; ---------------------------------------------------------

+; Section1: Main components of UltraStar Deluxe

+; ---------------------------------------------------------

+

+LangString DESC_Section1 ${LANG_ENGLISH} "${eng_sec1_desc}"        ; Adds the description to section1

+LangString DESC_Section1 ${LANG_GERMAN} "${ger_sec1_desc}"

+

+LangString sec1 ${LANG_ENGLISH} "${eng_sec1}"                        ; Name of section1

+LangString sec1 ${LANG_GERMAN} "${ger_sec1}"

+

+Section $(sec1) Section1

+  SectionIn RO                        ; readonly

+  SetOutPath $INSTDIR

+  SetOverwrite try

+

+!include ".\settings\files_in.nsh"

+

+; Create shortcuts

+

+  SetOutPath "$INSTDIR"

+

+  !insertmacro MUI_STARTMENU_WRITE_BEGIN Application

+

+  SetShellVarContext all

+  SetOutPath "$INSTDIR"

+

+  CreateDirectory "${p_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_uninstall).lnk" "$INSTDIR\Uninstall.exe"

+  !insertmacro MUI_STARTMENU_WRITE_END

+

+; WINDOWS VISTA GAME EXPLORER

+

+${If} ${AtLeastWinVista}

+

+${GameExplorer_GenerateGUID}

+Pop $0

+

+${GameExplorer_AddGame} all "${gdf_path}" $WINDIR $INSTDIR\${exe}.exe $0

+

+CreateDirectory $APPDATA\Microsoft\Windows\GameExplorer\$0\PlayTasks\1

+CreateShortcut "$APPDATA\Microsoft\Windows\GameExplorer\$0\PlayTasks\1\Benchmark.lnk" \

+  "$INSTDIR\${exe}.exe" "-Benchmark"

+

+CreateDirectory $APPDATA\Microsoft\Windows\GameExplorer\$0\PlayTasks\2

+CreateShortcut "$APPDATA\Microsoft\Windows\GameExplorer\$0\PlayTasks\2\Joypad.lnk" \

+  "$INSTDIR\${exe}.exe" "-Joypad"

+

+CreateDirectory $APPDATA\Microsoft\Windows\GameExplorer\$0\PlayTasks\3

+CreateShortcut "$APPDATA\Microsoft\Windows\GameExplorer\$0\PlayTasks\3\Fullscreen.lnk" \

+  "$INSTDIR\${exe}.exe" "-FullScreen"

+

+CreateDirectory $APPDATA\Microsoft\Windows\GameExplorer\$0\PlayTasks\3

+CreateShortcut "$APPDATA\Microsoft\Windows\GameExplorer\$0\PlayTasks\3\Dual Screen.lnk" \

+  "$INSTDIR\${exe}.exe" "-Screen 2"

+

+CreateDirectory $APPDATA\Microsoft\Windows\GameExplorer\$0\SupportTasks\0

+CreateShortcut "$APPDATA\Microsoft\Windows\GameExplorer\$0\SupportTasks\0\Support Forum.lnk" \

+  "http://forum.ultrastardeluxe.org"

+

+${EndIf}

+

+; Create Uninstaller:

+

+  WriteUninstaller "$INSTDIR\Uninstall.exe"

+

+  WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "DisplayName" "${p_name}"

+  WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "UninstallString" "$INSTDIR\Uninstall.exe"

+  WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "DisplayVersion" "${PRODUCT_VERSION}"

+  WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "URLInfoAbout" "${PRODUCT_WEB_SITE}"

+  WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "Publisher" "${PRODUCT_PUBLISHER}"

+

+SectionEnd

+

+; ---------------------------------------------------------

+; Section2: Example Song "Dead Smiling Pirates"

+; ---------------------------------------------------------

+

+ LangString DESC_g2Section1 ${LANG_ENGLISH} "${eng_g2Section1_desc}"

+ LangString DESC_g2Section1 ${LANG_GERMAN} "${ger_g2Section1_desc}"

+

+ LangString DESC_g2Section2 ${LANG_ENGLISH} "${eng_g2Section2_desc}"

+ LangString DESC_g2Section2 ${LANG_GERMAN} "${ger_g2Section2_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

+   SetOverwrite try

+   SetOutPath "$INSTDIR"

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

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

+

+; Download song:

+; NSISdl::download /TIMEOUT=30000 ${demosong} $TEMP\Song-I-18.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-I-18.zip" "$INSTDIR\Songs\Dead Smiling Pirates - I 18 [DEMO]\"

+

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

+

+

+  SetOutPath "$INSTDIR"

+

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

+

+  SetOutPath "$INSTDIR"

+

+ SectionEnd

+

+Section /o "Steven Dunston - Northern Star" g2Section2

+   AddSize 3769

+   SetOverwrite try

+   SetOutPath "$INSTDIR"

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

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

+

+; Download song:

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

+

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

+

+  SetOutPath "$INSTDIR"

+

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

+

+  SetOutPath "$INSTDIR"

+

+ SectionEnd

+

+ SectionGroupEnd

+

+; ---------------------------------------------------------

+; Section3: Optional Themes

+; ---------------------------------------------------------

+

+LangString DESC_Section3 ${LANG_ENGLISH} "${eng_sec3_desc}"

+LangString DESC_Section3 ${LANG_GERMAN} "${ger_sec3_desc}"

+

+LangString DESC_g1Sec1 ${LANG_ENGLISH} "${eng_g1Sec1_desc}"

+LangString DESC_g1Sec1 ${LANG_GERMAN} "${ger_g1Sec1_desc}"

+

+LangString DESC_g1Sec2 ${LANG_ENGLISH} "${eng_g1Sec2_desc}"

+LangString DESC_g1Sec2 ${LANG_GERMAN} "${ger_g1Sec2_desc}"

+

+LangString DESC_g1Sec3 ${LANG_ENGLISH} "${eng_g1Sec3_desc}"

+LangString DESC_g1Sec3 ${LANG_GERMAN} "${ger_g1Sec3_desc}"

+

+LangString sec_group ${LANG_ENGLISH} "${eng_sec3}"

+LangString sec_group ${LANG_GERMAN} "${ger_sec3}"

+

+SectionGroup $(sec_group) Section3

+

+ Section "Orange" g1Sec1

+

+; Download theme orange:

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

+

+; Pop $R0 ;Get the return value

+;   StrCmp $R0 "success" dlok

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

+; dlok:

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

+

+; Delete "$TEMP\Theme-Orange.zip"

+

+  SetOutPath "$INSTDIR"

+

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

+

+  SetOutPath "$INSTDIR"

+

+SectionEnd

+

+ Section "Streetlight" g1Sec2

+

+; Download theme Streetlight:

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

+

+; Pop $R0 ;Get the return value

+;   StrCmp $R0 "success" dlok

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

+; dlok:

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

+

+; Delete "$TEMP\Theme-Streetlight.zip"

+

+  SetOutPath "$INSTDIR"

+

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

+

+  SetOutPath "$INSTDIR"

+

+SectionEnd

+

+ Section "Vistar" g1Sec3

+

+; Download theme Vistar:

+

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

+

+; Pop $R0 ;Get the return value

+;  StrCmp $R0 "success" dlok

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

+; dlok:

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

+

+; Delete "$TEMP\Theme-Vistar.zip"

+

+  SetOutPath "$INSTDIR"

+

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

+

+  SetOutPath "$INSTDIR"

+

+SectionEnd

+

+

+SectionGroupEnd

+

+; ---------------------------------------------------------

+; Section4: Uninstallation Wizard

+; ---------------------------------------------------------

+

+Section Uninstall

+ !insertmacro MUI_STARTMENU_GETFOLDER "Application" $ICONS_GROUP

+

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

+ !include ".\settings\files_un.nsh"

+

+ DeleteRegKey ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}"

+

+; Unregister from Windows Vista Game Explorer

+

+${If} ${AtLeastWinVista}

+

+${GameExplorer_RemoveGame} $0

+

+${EndIf}

+

+SectionEnd

+

+!insertmacro MUI_FUNCTION_DESCRIPTION_BEGIN

+  !insertmacro MUI_DESCRIPTION_TEXT ${Section1} $(DESC_Section1)

+

+;  !insertmacro MUI_DESCRIPTION_TEXT ${Section2} $(DESC_Section2)

+;  !insertmacro MUI_DESCRIPTION_TEXT ${Section3} $(DESC_Section3)

+

+  !insertmacro MUI_DESCRIPTION_TEXT ${g1Sec1} $(DESC_g1Sec1)

+  !insertmacro MUI_DESCRIPTION_TEXT ${g1Sec2} $(DESC_g1Sec2)

+  !insertmacro MUI_DESCRIPTION_TEXT ${g1Sec3} $(DESC_g1Sec3)

+

+  !insertmacro MUI_DESCRIPTION_TEXT ${g2Section1} $(DESC_g2Section1)

+  !insertmacro MUI_DESCRIPTION_TEXT ${g2Section2} $(DESC_g2Section2)

+

+!insertmacro MUI_FUNCTION_DESCRIPTION_END

+

+; -----------------------------------------------------------------------

+; Language Strings for Installation / Uninstallation Wizard

+; can be found at .\settings\langstrings.nsh

+; -----------------------------------------------------------------------

+

+!include .\settings\langstrings.nsh

+

+; ------------------------------------------------------------------

+; Functions for the beginning of the installation and uninstallation

+; ------------------------------------------------------------------

+

+; Function for Installation

+

+Function .onInit

+

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

+

+  Pop $R0

+

+  StrCmp $R0 0 +3

+    MessageBox MB_OK "The installer is already running."

+    Abort

+

+  !insertmacro MUI_LANGDLL_DISPLAY

+

+  ReadRegStr $R0 HKLM \

+  "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_NAME}" \

+  "UninstallString"

+  StrCmp $R0 "" done

+

+  MessageBox MB_YESNO|MB_ICONEXCLAMATION \

+  "${PRODUCT_NAME} is already installed. $\n$\nAre you sure you want to \

+  install it again?" \

+  IDYES done

+  Abort

+

+

+done:

+

+     !insertmacro MUI_INSTALLOPTIONS_EXTRACT_AS ".\settings\settings-1031.ini" "Settings-1031"

+     !insertmacro MUI_INSTALLOPTIONS_EXTRACT_AS ".\settings\settings-1033.ini" "Settings-1033"

+

+FunctionEnd

+

+; Function for Uninstallation

+

+Function un.onInit

+

+        ${nsProcess::FindProcess} "USdx.exe" $R0

+        StrCmp $R0 0 0 +2

+        MessageBox MB_YESNO|MB_ICONEXCLAMATION 'UltraStar Deluxe cannot be uninstalled while its running! Do you want to close it?' IDYES closeit IDNO end

+

+        closeit:

+        ${nsProcess::KillProcess} "USdx.exe" $R0

+        goto continue

+

+        end:

+        ${nsProcess::Unload}

+        Abort

+

+        continue:

+           !insertmacro MUI_LANGDLL_DISPLAY

+

+FunctionEnd
\ No newline at end of file
diff --git a/Installer/settings/files_in.nsh b/Installer/settings/files_in.nsh
index e391d240..d94291df 100644
--- a/Installer/settings/files_in.nsh
+++ b/Installer/settings/files_in.nsh
@@ -1,7 +1,7 @@
 ; This list contains the files that will be installed

 

 ; Create required directories:

-

+  

   CreateDirectory "$INSTDIR\Covers"

   CreateDirectory "$INSTDIR\Languages"

   CreateDirectory "$INSTDIR\Plugins"

@@ -17,10 +17,10 @@
   SetOutPath "$INSTDIR"

   File "..\InstallerDependencies\dll\bass.dll"

   File "..\InstallerDependencies\dll\SDL.dll"

-  File "..\InstallerDependencies\dll\avutil-49.dll"

+  File "..\InstallerDependencies\dll\sqlite3.dll"

   File "..\InstallerDependencies\dll\avcodec-51.dll"

   File "..\InstallerDependencies\dll\avformat-50.dll"

-  File "..\InstallerDependencies\dll\sqlite3.dll"

+  File "..\InstallerDependencies\dll\avutil-49.dll"

 

   File "..\InstallerDependencies\documents\Changelog.german.txt"

   File "..\InstallerDependencies\documents\Changelog.txt"

@@ -62,8 +62,8 @@ ${EndIf}
   File "..\Plugins\Blind.dll"

   File "..\Plugins\Duell.dll"

   File "..\Plugins\Hold_The_Line.dll"

-  File "..\Plugins\Until5000.dll"

   File "..\Plugins\TeamDuell.dll"

+  File "..\Plugins\Until5000.dll"

 

   SetOutPath "$INSTDIR\Skins\Classic\"

   File "..\Skins\Classic\[button]13.jpg"

@@ -258,7 +258,7 @@ ${EndIf}
   File "..\Sounds\select music change music 50.mp3"

   File "..\Sounds\select music change music.mp3"

   File "..\Sounds\wome-credits-tune.mp3"

-

+  

   SetOutPath "$INSTDIR\Themes\"

   File "..\Themes\Classic.ini"

   File "..\Themes\Deluxe.ini"

diff --git a/Installer/settings/langstrings.nsh b/Installer/settings/langstrings.nsh
index dec444d8..fa3acf19 100644
--- a/Installer/settings/langstrings.nsh
+++ b/Installer/settings/langstrings.nsh
@@ -9,8 +9,8 @@ LangString str_abort ${LANG_GERMAN} "Wollen Sie die Installation wirklich abbrec
 LangString uninst_begin ${LANG_ENGLISH} "This will uninstall UltraStar Deluxe completely (with Songs!). Continue ?"

 LangString uninst_begin ${LANG_GERMAN} "Dies wird UltraStar Deluxe vollständig deinstallieren (inkl. Songs!). Fortfahren?"

 

-LangString MUI_UNTEXT_FINISH_INFO_TEXT ${LANG_ENGLISH} "We hope you enjoyed UltraStar Deluxe. Please leave us a comment why you uninstalled UltraStar Deluxe in our forum:\n\n${forum}\n\nWe would also be pleased to recieve your feedback on UltraStar Deluxe there."

-LangString MUI_UNTEXT_FINISH_INFO_TEXT ${LANG_GERMAN} "Wir hoffen du hast UltraStar Deluxe genossen. Bitte hinterlasse uns einen Kommentar im Forum, warum du UltraStar Deluxe deinstalliert hast:\n\n${forum}\n\nWir würden uns dort ebenso über eine Rückmeldung für UltraStar Deluxe freuen."

+LangString MUI_UNTEXT_FINISH_INFO_TEXT ${LANG_ENGLISH} "We hope you enjoyed UltraStar Deluxe. Please leave us a comment why you uninstalled UltraStar Deluxe in our forum: ${forum}. We would also be pleased to recieve your feedback on UltraStar Deluxe there."

+LangString MUI_UNTEXT_FINISH_INFO_TEXT ${LANG_GERMAN} "Wir hoffen du hast UltraStar Deluxe genossen. Bitte hinterlasse uns einen Kommentar im Forum, warum du UltraStar Deluxe deinstalliert hast: ${forum}. Wir würden uns dort ebenso über eine Rückmeldung für UltraStar Deluxe freuen."

 

 LangString MUI_UNTEXT_FINISH_INFO_TITLE ${LANG_ENGLISH} "The uninstallation finished successfully!"

 LangString MUI_UNTEXT_FINISH_INFO_TITLE ${LANG_GERMAN} "Die Deinstallation wurde erfolgreich abgeschlossen."

@@ -30,22 +30,19 @@ LangString sm_shortcut ${LANG_ENGLISH} "Play UltraStar Deluxe"
 LangString sc_desktop ${LANG_GERMAN} "Verknüpfung auf dem Desktop erstellen?" ; Finish Page: Readme = Create Desktop Shortcut

 LangString sc_desktop ${LANG_ENGLISH} "Create Desktop Shortcut?"

 

-LangString sc_play ${LANG_GERMAN} "Spielen"                            ; Shortcut name play or spielen (used for MCE)

+LangString sc_play ${LANG_GERMAN} "Spielen"  			  ; Shortcut name play or spielen (used for MCE)

 LangString sc_play ${LANG_ENGLISH} "Play"

 

-LangString sm_uninstall ${LANG_GERMAN} "Deinstallieren"                  ; Name for uninstall icon in startmenu

+LangString sm_uninstall ${LANG_GERMAN} "Deinstallieren"		  ; Name for uninstall icon in startmenu

 LangString sm_uninstall ${LANG_ENGLISH} "Uninstall"

 

-LangString sm_website ${LANG_GERMAN} "Webseite"                  ; Name for website icon in startmenu

+LangString sm_website ${LANG_GERMAN} "Internetseite"		  ; Name for website icon in startmenu

 LangString sm_website ${LANG_ENGLISH} "Website"

 

-LangString sm_documentation ${LANG_GERMAN} "Dokumentation"                  ; Name for documentation icon in startmenu

-LangString sm_documentation ${LANG_ENGLISH} "Documentation"

-

-LangString sm_license ${LANG_GERMAN} "Lizenz"                          ; Name for license.txt icon in startmenu

+LangString sm_license ${LANG_GERMAN} "Lizenz"			  ; Name for license.txt icon in startmenu

 LangString sm_license ${LANG_ENGLISH} "License"

 

-LangString sm_readme ${LANG_GERMAN} "Lies mich"                          ; Name for readme.txt icon in startmenu

+LangString sm_readme ${LANG_GERMAN} "Lies mich"			  ; Name for readme.txt icon in startmenu

 LangString sm_readme ${LANG_ENGLISH} "Readme"

 

 LangString Settings_TITLE ${LANG_ENGLISH} " "

@@ -53,20 +50,20 @@ LangString Settings_TITLE ${LANG_GERMAN} " "
 LangString Settings_SUBTITLE ${LANG_ENGLISH} "Specify your favorite settings for UltraStar Deluxe"

 LangString Settings_SUBTITLE ${LANG_GERMAN} "Lege deine favorisierten Einstellungen für UltraStar Deluxe fest."

 

-LangString wp_title ${LANG_GERMAN} "Willkommen zur Installationsroutine von UltraStar Deluxe"        ; Title String in Welcome Page

+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 fp_showreadme ${LANG_GERMAN} "Dokumentation ansehen (PDF)"        ; "Show Readme" String in Finish Page

+LangString fp_showreadme ${LANG_GERMAN} "Dokumentation ansehen (PDF)"	; "Show Readme" String in Finish Page

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

 

-LangString fp_text ${LANG_GERMAN}  "UltraStar wurde erfolgreich auf Ihrem System installiert.\n\rBesuchen Sie unsere Projektwebseite um die neusten Updates und News zu erhalten."

-LangString fp_text ${LANG_ENGLISH}  "UltraStar was installed successfully on you system.\n\rVisit out project website to get latest news and updates."

+LangString fp_text ${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 fp_text ${LANG_ENGLISH}  "UltraStar Deluxe was installed successfully on you system.\n\r\n\rVisit out project website to get latest news and updates."

 

-LangString fp_link ${LANG_GERMAN} "Projektwebseite"        ; Link to developers website - String in Finish Page

+LangString fp_link ${LANG_GERMAN} "Projektwebseite"	; Link to developers website - String in Finish Page

 LangString fp_link ${LANG_ENGLISH} "Project website"

 

-LangString uncp_text ${LANG_GERMAN} "Willkommen beim Deinstallations-Assistent für UltraStar Deluxe"

+LangString uncp_text ${LANG_GERMAN} "Willkommen beim Deinstallations-Assistent für UltraStar Deluxe" 

 LangString uncp_text ${LANG_ENGLISH} "Welcome to the UltraStar Deluxe Uninstall Wizard"
\ No newline at end of file
diff --git a/Installer/settings/optional/in_song1.nsh b/Installer/settings/optional/in_song1.nsh
new file mode 100644
index 00000000..50c1e20a
--- /dev/null
+++ b/Installer/settings/optional/in_song1.nsh
@@ -0,0 +1,10 @@
+

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

+

+  File "..\Songs\Dead Smiling Pirates - I 18 [DEMO]\Dead Smiling Pirates - I 18 [BG].jpg"

+  File "..\Songs\Dead Smiling Pirates - I 18 [DEMO]\Dead Smiling Pirates - I 18 [CO].jpg"

+  File "..\Songs\Dead Smiling Pirates - I 18 [DEMO]\Dead Smiling Pirates - I 18.ogg"

+  File "..\Songs\Dead Smiling Pirates - I 18 [DEMO]\Dead Smiling Pirates - I 18.txt"

+  File "..\Songs\Dead Smiling Pirates - I 18 [DEMO]\License.txt"

+

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

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

+

+

+  SetOutPath "$INSTDIR"
\ No newline at end of file
diff --git a/Installer/settings/variables.nsh b/Installer/settings/variables.nsh
index 1bb3a7b6..3a022ecd 100644
--- a/Installer/settings/variables.nsh
+++ b/Installer/settings/variables.nsh
@@ -27,11 +27,11 @@
 !define eng_sec3_desc "You can choose which optional themes should also be installed."  ; English Description of "Optional Themes"-Section

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

 

-!define eng_g2Section1_desc "Downloads the demo song 'Dead Smiling Pirates - I 18'. Requires: Active Internet connection!"	; English Description of the Example Song "I 18"

-!define ger_g2Section1_desc "Lädt das freie Beispiellied 'Dead Smiling Pirates - I 18' herunter. Benötigt: Aktive Internetverbindung!"   	; German Description of the Example Song "I 18"

+!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 eng_g2Section2_desc "Downloads the demo song 'Steven Dunston - Northern Star'. Requires: Active Internet connection!"		; English Description of the Example Song "Northern Star"

-!define ger_g2Section2_desc "Lädt das freie Beispiellied 'Steven Dunston - Northern Star' herunter. Benötigt: Aktive Internetverbindung!"	; German Description of the Example Song "Northern Star"

+!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 eng_sec1 "Base components" 							; English Name of the component section1

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

@@ -44,14 +44,14 @@
 

 ; Group Section Descriptions:

 

-!define eng_g1Sec1_desc "This will download the optional theme 'Orange' by Skar."

-!define ger_g1Sec1_desc "Dies lädt das optionale Motiv 'Orange' von Skar herunter."

+!define eng_g1Sec1_desc "This will install the optional theme 'Orange' by Skar."

+!define ger_g1Sec1_desc "Dies installiert das optionale Motiv 'Orange' von Skar."

 

-!define eng_g1Sec2_desc "This will download the optional theme 'Streetlight' by Skar."

-!define ger_g1Sec2_desc "Dies lädt das optionale Motiv 'Streetlight' von Skar herunter."

+!define eng_g1Sec2_desc "This will install the optional theme 'Streetlight' by Skar."

+!define ger_g1Sec2_desc "Dies installiert das optionale Motiv 'Streetlight' von Skar."

 

-!define eng_g1Sec3_desc "This will download the optional theme 'Vistar' by Skar."

-!define ger_g1Sec3_desc "Dies lädt das optionale Motiv 'Vistar' von Skar herunter."

+!define eng_g1Sec3_desc "This will install the optional theme 'Vistar' by Skar."

+!define ger_g1Sec3_desc "Dies installiert das optionale Motiv 'Vistar' von Skar."

 

 ; Skin:

 

diff --git a/InstallerDependencies/documents/Changelog.german.txt b/InstallerDependencies/documents/Changelog.german.txt
index 20baa668..db8d1b35 100644
--- a/InstallerDependencies/documents/Changelog.german.txt
+++ b/InstallerDependencies/documents/Changelog.german.txt
@@ -1,31 +1,13 @@
-UltraStar Deluxe 1.01

+UltraStar Deluxe 1.01 (by Ultrastar Deluxe Team)

 -----------------------------

-Upd: Neue SDL-Lib

-Upd: Neue Bass.dll

-Upd: Video support neu geschrieben (FFMpeg anstatt SMPeg)

-     ->Fast alle Videoformate werden nun unterstützt. Bessere Synchronisation der meisten Videos.

-Upd: Theme, Skin und Farbe können ohne Neustart geändert werden

-Upd: Einige Geschwindigkeitsverbesserungen

-Upd: Backspace ist nun identisch mit ESC bei den meisten Screens

-Upd: Editor: Singlenote-playback (SHIFT + Leertaste / STRG + SHIFT + Leertaste)

-Upd: Editor: Mehr Buchstaben funktionieren nun im Texteditmodus z.B. '~'

-Upd: Deluxe-Theme verschönert. 

-       - Neue Texturen für die Leiste

-       - Neue Hintergründe für die Deluxe Skins

-       - Farbe ist nun im Deluxe-Theme änderbar \o/

-Upd: Executable Name zu USdx.exe geändert

-Upd: Neue Sounds für die Menüs

-Upd: 3 neue Skins von Skar/Alajasam hinzugefügt

-Upd: TeamDuell (ähnlich Gib das Mikro weiter) Modiplugin hinzugefügt

-

-Add: Installer verfügbar

-

-Fix: 4/6 Spieler: Richtige Punktzahlen werden auf dem Scorescreen angezeigt

-Fix: Doppeltes hinzufügen der Scores bei Screens=2

-Fix: Überlappen einiger Artistennamen mit den Songname sollte nun in den meisten Fällen gefixed sein.

-Fix: License- und Readme.txt Dateien tauchen nicht mehr in der error.log auf

-Fix: Einige Sounds, (hauptsächlich der Editor 'klick'-Sound) waren zu leise

-Fix: USdx sollte nun mit Girder funktionieren

+Upd: Neue Sprachen hinzugefügt

+Upd: SDL Libary aktualisiert

+Upd: UsDx Installer als Download

+

+Fix: Girder support

+Fix: Lizenz des Demosongs stand als Fehler in der Error.log

+     (Errors für Dateien mit den Namen Readme.txt oder License.txt werden ignoriert)

+Fix: Auflösungs Fix um Ultrastar in Wine laufen zu lassen. (z.B. auf Linux)

 

 UltraStar Deluxe 1.00 (by Ultrastar Deluxe Team)

 -----------------------------

diff --git a/InstallerDependencies/documents/Changelog.txt b/InstallerDependencies/documents/Changelog.txt
index d3605d84..5fc14b84 100644
--- a/InstallerDependencies/documents/Changelog.txt
+++ b/InstallerDependencies/documents/Changelog.txt
@@ -1,31 +1,13 @@
-UltraStar Deluxe 1.01

+UltraStar Deluxe 1.01 (by Ultrastar Deluxe Team)

 -----------------------------

-Upd: SDL-Lib update

-Upd: Bass update

-Upd: New video support (FFMpeg instead of SMPeg) 

-     ->nearly all video formats are supported. Better synchronisation of most vids.

-Upd: On demand theme, skin and color changing

-Upd: Some speed improvements

-Upd: Backspace works now like ESC on most screens

-Upd: Editor: Singlenote-playback (SHIFT + Space / CTRL + SHIFT + Space)

-Upd: Editor: More characters work in text-edit-mode e.g. '~'

-Upd: Beautified Deluxe theme. 

-       - New textures for the bar

-       - New backgrounds for the Deluxe skins

-       - Color is changeable in Deluxe theme now \o/

-Upd: Executable name changed to USdx.exe

-Upd: New menusounds

-Upd: Added 3 new skins by Skar/Alajasam

-Upd: Added TeamDuell modi-plugin

-

-Add: Installer available

-

-Fix: 4/6 Players: Scores are shown correctly on the scorescreen

-Fix: Double adding of Highscores if screens=2

-Fix: Overlapping of some artists names with songs should be fixed in most cases

-Fix: License and Readme files caused error messages in error.log

-Fix: Some sounds, (mainly the editors 'click' sound) were to quiet

-Fix: Should now work with Girder

+Upd: New language files added

+Upd: Upgraded SDL Libary

+Upd: Offer Installer Download

+

+Fix: Girder support

+Fix: License file was mentioned in the error.log 

+     (There are no error reports for files named Readme.txt or License.txt)

+Fix: Resolution fix to support running in wine (e.g. on linux)

 

 UltraStar Deluxe 1.00 (by Ultrastar Deluxe Team)

 -----------------------------