just a first experimental version

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

7 files changed, 901 insertions, 0 deletions

diff --git a/Medley/installer/settings/GameExplorer.nsh b/Medley/installer/settings/GameExplorer.nsh
new file mode 100644
index 00000000..d5056661
--- /dev/null
+++ b/Medley/installer/settings/GameExplorer.nsh
@@ -0,0 +1,198 @@
+# user interface

+ 

+!define GameExplorer_GenerateGUID '!insertmacro GameExplorer_GenerateGUID'

+!define GameExplorer_AddGame      '!insertmacro GameExplorer_AddGame'

+!define GameExplorer_UpdateGame   '!insertmacro GameExplorer_UpdateGame'

+!define GameExplorer_RemoveGame   '!insertmacro GameExplorer_RemoveGame'

+ 

+# internal stuff

+ 

+!define CLSCTX_INPROC_SERVER 1

+!define IID_IGameExplorer  {E7B2FB72-D728-49B3-A5F2-18EBF5F1349E}

+!define CLSID_GameExplorer {9A5EA990-3034-4D6F-9128-01F3C61022BC}

+ 

+!define GIS_CURRENT_USER 2

+!define GIS_ALL_USERS    3

+ 

+!define IGameExplorer_QueryInterface 0

+!define IGameExplorer_AddRef         1

+!define IGameExplorer_Release        2

+!define IGameExplorer_AddGame        3

+!define IGameExplorer_RemoveGame     4

+!define IGameExplorer_UpdateGame     5

+!define IGameExplorer_VerifyAccess   6

+ 

+# includes

+ 

+!include LogicLib.nsh

+ 

+# the actual code

+ 

+!macro GameExplorer_GenerateGUID

+ 

+  System::Call 'ole32::CoCreateGuid(g .s)'

+ 

+!macroend

+ 

+!macro GameExplorer_AddGame CONTEXT GDF INSTDIR EXE GUID

+ 

+  !define __GAME_EXPLORER_UNIQUE "${__LINE__}${__FILE__}"

+ 

+  Push $0

+  Push $1

+ 

+  Push $R0

+  Push $R1

+  Push $R2

+  Push $R3

+ 

+  Push "${EXE}"

+  Push "${GUID}"

+  Push "${INSTDIR}"

+  Push "${GDF}"

+ 

+  Pop $R0 # == ${GDF}

+  Pop $R1 # == ${INSTDIR}

+  Pop $R2 # == ${GUID}

+  Pop $R3 # == ${EXE}

+ 

+  ClearErrors

+ 

+  System::Call "ole32::CoCreateInstance( \

+    g '${CLSID_GameExplorer}', i 0, \

+    i ${CLSCTX_INPROC_SERVER}, \

+    g '${IID_IGameExplorer}', *i .r1) i .r0"

+ 

+  ${If} $0 != 0 # S_OK

+ 

+    SetErrors

+    Goto "done_${__GAME_EXPLORER_UNIQUE}"

+ 

+  ${EndIf}

+ 

+  !if ${CONTEXT} == all

+ 

+    System::Call "$1->${IGameExplorer_AddGame}(w R0, w R1, i ${GIS_ALL_USERS}, g R2) i .r0"

+ 

+  !else if ${CONTEXT} == user

+ 

+    System::Call "$1->${IGameExplorer_AddGame}(w R1, w R0, i ${GIS_CURRENT_USER}, g R2) i .r0"

+ 

+  !else

+ 

+    !error "Invalid CONTEXT passed to GameExplorer_AddGame! Must be `user` or `all`."

+ 

+  !endif

+ 

+  ${If} $0 != 0 # S_OK

+ 

+    SetErrors

+ 

+  ${Else}

+ 

+    # Create play task

+ 

+    !if ${CONTEXT} == all

+ 

+      SetShellVarContext all

+ 

+    !else if if ${CONTEXT} == user

+ 

+      SetShellVarContext user

+ 

+    !endif

+ 

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

+    CreateShortcut $APPDATA\Microsoft\Windows\GameExplorer\$R2\PlayTasks\0\Play.lnk $R3

+ 

+  ${EndIf}

+ 

+  System::Call "$1->${IGameExplorer_Release}()"

+ 

+  "done_${__GAME_EXPLORER_UNIQUE}:"

+ 

+    Pop $R3

+    Pop $R2

+    Pop $R1

+    Pop $R0

+ 

+    Pop $1

+    Pop $0

+ 

+  !undef __GAME_EXPLORER_UNIQUE

+ 

+!macroend

+ 

+!macro _GameExplorer_GUID_Function Function GUID

+ 

+  !define __GAME_EXPLORER_UNIQUE "${__LINE__}${__FILE__}"

+ 

+  Push $0

+  Push $1

+  Push $2

+  Push $3

+  Push $4

+  Push $5

+ 

+  Push $R0

+ 

+  Push "${GUID}"

+ 

+  Pop $R0 # == ${GUID}

+ 

+  System::Alloc 16

+  Exch $R0

+  System::Call "ole32::CLSIDFromString(w s, i R0)"

+  System::Call "*$R0(i .r2, i .r3, i .r4, i .r5)"

+  System::Free $R0

+ 

+  ClearErrors

+ 

+  System::Call "ole32::CoCreateInstance( \

+    g '${CLSID_GameExplorer}', i 0, \

+    i ${CLSCTX_INPROC_SERVER}, \

+    g '${IID_IGameExplorer}', *i .r1) i .r0"

+ 

+  ${If} $0 != 0 # S_OK

+ 

+    SetErrors

+    Goto "done_${__GAME_EXPLORER_UNIQUE}"

+ 

+  ${EndIf}

+ 

+  System::Call "$1->${Function}(i r2, i r3, i r4, i r5) i .r0"

+ 

+  ${If} $0 != 0 # S_OK

+ 

+    SetErrors

+ 

+  ${EndIf}

+ 

+  System::Call "$1->${IGameExplorer_Release}()"

+ 

+  "done_${__GAME_EXPLORER_UNIQUE}:"

+ 

+    Pop $R0

+ 

+    Pop $5

+    Pop $4

+    Pop $3

+    Pop $2

+    Pop $1

+    Pop $0

+ 

+  !undef __GAME_EXPLORER_UNIQUE

+ 

+!macroend

+ 

+!macro GameExplorer_UpdateGame GUID

+ 

+  !insertmacro _GameExplorer_GUID_Function ${IGameExplorer_UpdateGame} "${GUID}"

+ 

+!macroend

+ 

+!macro GameExplorer_RemoveGame GUID

+ 

+  !insertmacro _GameExplorer_GUID_Function ${IGameExplorer_RemoveGame} "${GUID}"

+ 

+!macroend
\ No newline at end of file
diff --git a/Medley/installer/settings/files_main_install.nsh b/Medley/installer/settings/files_main_install.nsh
new file mode 100644
index 00000000..c2cdf727
--- /dev/null
+++ b/Medley/installer/settings/files_main_install.nsh
@@ -0,0 +1,56 @@
+; ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~

+; UltraStar Deluxe Installer: Main components

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

+

+; Create Directories:

+

+CreateDirectory $INSTDIR\Plugins

+CreateDirectory $INSTDIR\Songs

+CreateDirectory $INSTDIR\Screenshots

+CreateDirectory $INSTDIR\Playlists

+CreateDirectory $INSTDIR\Covers

+

+SetOutPath "$INSTDIR"

+

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

+File ..\installerdependencies\documents\documentation.pdf

+File ..\installerdependencies\documents\license.txt

+

+File "..\ScoreConverter.exe"

+File "..\${exe}.exe"

+

+; Covers dir:

+

+SetOutPath "$INSTDIR\Covers"

+

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

+File ..\game\covers\Covers.ini

+File ..\game\covers\NoCover.jpg

+

+; Plugins dir:

+

+SetOutPath "$INSTDIR\Plugins\"

+  File "..\Plugins\*.dll"

+

+${If} ${AtLeastWinVista}

+

+  SetOutPath "$WINDIR"

+  File "..\installerdependencies\plugins\gdf.dll"

+

+${EndIf}

+

+SetOutPath "$INSTDIR"

diff --git a/Medley/installer/settings/files_main_uninstall.nsh b/Medley/installer/settings/files_main_uninstall.nsh
new file mode 100644
index 00000000..af61cb0b
--- /dev/null
+++ b/Medley/installer/settings/files_main_uninstall.nsh
@@ -0,0 +1,85 @@
+; ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~

+; UltraStar Deluxe Uninstaller: Main components

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

+

+

+; Delete created Icons in startmenu

+

+ SetShellVarContext all

+

+ RMDir /r "$SMPROGRAMS\$ICONS_GROUP\"

+

+; Delete created Icon on Desktop

+

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

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

+

+; Remove dirs

+

+ RMDir /r "$INSTDIR\plugins"

+ RMDir /r "$INSTDIR\themes"

+ RMDir /r "$INSTDIR\fonts"

+ RMDir /r "$INSTDIR\languages"

+ RMDir /r "$INSTDIR\visuals"

+ RMDir /r "$INSTDIR\sounds"

+

+; Delete remaining files

+

+ Delete "$INSTDIR\ScoreConverter.exe"

+ Delete "$INSTDIR\${exe}.exe"

+ Delete "$INSTDIR\Changelog.german.txt"

+ Delete "$INSTDIR\Changelog.txt"

+ Delete "$INSTDIR\documentation.pdf"

+ Delete "$INSTDIR\License.txt"

+ Delete "$INSTDIR\config.ini"

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

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

+ Delete "$INSTDIR\bass.dll"

+ Delete "$INSTDIR\glew32.dll"

+ Delete "$INSTDIR\jpeg.dll"

+ Delete "$INSTDIR\libfreetype-6.dll"

+ Delete "$INSTDIR\libpng12-0.dll"

+ Delete "$INSTDIR\libprojectM.dll"

+ Delete "$INSTDIR\libtiff-3.dll"

+ Delete "$INSTDIR\portaudio_x86.dll"

+ Delete "$INSTDIR\portmixer.dll"

+ Delete "$INSTDIR\projectM-cwrapper.dll"

+ Delete "$INSTDIR\SDL.dll"

+ Delete "$INSTDIR\SDL_image.dll"

+ Delete "$INSTDIR\SDL_ttf.dll"

+ Delete "$INSTDIR\sqlite3.dll"

+ Delete "$INSTDIR\zlib1.dll"

+

+${If} ${AtLeastWinVista}

+ Delete "$WINDIR\gdf.dll"

+${EndIf}

+

+

+ RMDir "$INSTDIR\songs\Dead Smiling Pirates - I 18"

+ RMDir "$INSTDIR\songs\Joshua Morin - On The Run"

+ RMDir "$INSTDIR\songs\Pornophonique - Space Invaders"

+ RMDir "$INSTDIR\songs\Steven Dunston - Northern Star"

+

+ StrCpy $0 "$INSTDIR\songs"

+ Call un.DeleteIfEmpty

+

+ Delete "$INSTDIR\covers\NoCover.jpg"

+

+ StrCpy $0 "$INSTDIR\screenshots"

+ Call un.DeleteIfEmpty

+

+ StrCpy $0 "$INSTDIR\playlists"

+ Call un.DeleteIfEmpty

+

+; Self delete:

+

+ Delete "$INSTDIR\Uninstall.exe"

+

+ StrCpy $0 "$INSTDIR"

+ Call un.DeleteIfEmpty
\ No newline at end of file
diff --git a/Medley/installer/settings/functions.nsh b/Medley/installer/settings/functions.nsh
new file mode 100644
index 00000000..bbd4fea2
--- /dev/null
+++ b/Medley/installer/settings/functions.nsh
@@ -0,0 +1,199 @@
+; Creates Desktop Shortcut(s) if 

+; checked on Finish Page

+

+Function CreateDesktopShortCuts

+

+SetOutPath "$INSTDIR"

+

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

+

+FunctionEnd

+

+; Deletes only empty dirs which are

+; at the top of the stack.

+

+Function un.DeleteIfEmpty

+  FindFirst $R0 $R1 "$0\*.*"

+  strcmp $R1 "." 0 NoDelete

+   FindNext $R0 $R1

+   strcmp $R1 ".." 0 NoDelete

+    ClearErrors

+    FindNext $R0 $R1

+    IfErrors 0 NoDelete

+     FindClose $R0

+     Sleep 1000

+     RMDir "$0"

+  NoDelete:

+   FindClose $R0

+FunctionEnd

+

+; This is used to write a

+; string to config.ini

+

+Function WriteToConfig

+ Exch $0

+ Exch

+ Exch $1

+ 

+  FileOpen $0 $0 a

+   FileSeek $0 0 END

+   FileWrite $0 $1

+  FileClose $0

+ 

+ Pop $1

+ Pop $0

+FunctionEnd

+ 

+!macro WriteToConfig String File

+ Push "${String}"

+ Push "${File}"

+  Call WriteToConfig

+!macroend

+!define WriteToConfig "!insertmacro WriteToConfig"

+

+; Finds UltraStar Deluxe process

+;

+

+!define nsProcess::FindProcess `!insertmacro nsProcess::FindProcess`

+

+!macro nsProcess::FindProcess _FILE _ERR

+	nsProcess::_FindProcess /NOUNLOAD `${_FILE}`

+	Pop ${_ERR}

+!macroend

+

+

+!define nsProcess::KillProcess `!insertmacro nsProcess::KillProcess`

+

+!macro nsProcess::KillProcess _FILE _ERR

+	nsProcess::_KillProcess /NOUNLOAD `${_FILE}`

+	Pop ${_ERR}

+!macroend

+

+

+!define nsProcess::Unload `!insertmacro nsProcess::Unload`

+

+!macro nsProcess::Unload

+	nsProcess::_Unload

+!macroend

+

+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/Medley/installer/settings/settings-1031.ini b/Medley/installer/settings/settings-1031.ini
new file mode 100644
index 00000000..9e588fcb
--- /dev/null
+++ b/Medley/installer/settings/settings-1031.ini
@@ -0,0 +1,136 @@
+[Settings]

+NumFields=16

+

+[Field 1]

+Type=Label

+Text="Vollbild Modus:"

+Left=0

+Right=53

+Top=27

+Bottom=35

+

+[Field 2]

+Type=Label

+Text="Sprache:"

+Left=0

+Right=53

+Top=51

+Bottom=59

+

+[Field 3]

+Type=Label

+Text="Auflösung:"

+Left=0

+Right=53

+Top=73

+Bottom=81

+

+[Field 4]

+Type=Label

+Text="Ordnerstruktur:"

+Left=0

+Right=53

+Top=97

+Bottom=105

+

+[Field 5]

+Type=Label

+Text="Animationen/Effekte:"

+Left=0

+Right=70

+Top=124

+Bottom=132

+

+[Field 6]

+Type=Droplist

+ListItems=On|Off

+State=On

+Left=71

+Right=161

+Top=25

+Bottom=38

+

+[Field 7]

+Type=Droplist

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

+State=German

+Left=71

+Right=161

+Top=48

+Bottom=62

+

+[Field 8]

+Type=Droplist

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

+State=800x600

+Left=71

+Right=161

+Top=72

+Bottom=86

+

+[Field 9]

+Type=Droplist

+ListItems=On|Off

+State=Off

+Left=71

+Right=161

+Top=96

+Bottom=110

+

+[Field 10]

+Type=Droplist

+ListItems=On|Off

+State=On

+Left=71

+Right=161

+Top=121

+Bottom=136

+

+[Field 11]

+Type=Label

+Text="Wähle aus, ob das Spiel im Fenster oder \r\nals Vollbild gestartet werden soll."

+Left=170

+Right=315

+Top=24

+Bottom=44

+

+[Field 12]

+Type=Label

+Text="Hier können einige Einstellungen für UltraStar Deluxe vorgenommen werden.\r\nAlle Einstellungen können später im Spielmenü geändert werden."

+Left=0

+Right=315

+Top=3

+Bottom=20

+

+[Field 13]

+Type=Label

+Text="Wähle deine favorisierte Sprache, in der UltraStar Deluxe angezeigt werden soll."

+Left=170

+Right=315

+Top=46

+Bottom=68

+

+[Field 14]

+Type=Label

+Text="Wähle deine, dem Monitor angepasste, bevorzugte Auflösung."

+Left=170

+Right=315

+Top=70

+Bottom=96

+

+[Field 15]

+Type=Label

+Text="Wähle aus, ob UltraStar Deluxe eine Ordnerstruktur zum Anzeigen der Lieder verwenden soll."

+Left=170

+Right=315

+Top=92

+Bottom=116

+

+[Field 16]

+Type=Label

+Text="Wähle, ob Spezialeffekte und \r\nAnimationen benutzt werden sollen."

+Left=170

+Right=315

+Top=121

+Bottom=137

+

diff --git a/Medley/installer/settings/settings-1033.ini b/Medley/installer/settings/settings-1033.ini
new file mode 100644
index 00000000..17a08a8c
--- /dev/null
+++ b/Medley/installer/settings/settings-1033.ini
@@ -0,0 +1,136 @@
+[Settings]

+NumFields=16

+

+[Field 1]

+Type=Label

+Text="Fullscreen Mode:"

+Left=0

+Right=50

+Top=27

+Bottom=35

+

+[Field 2]

+Type=Label

+Text="Language:"

+Left=0

+Right=50

+Top=51

+Bottom=59

+

+[Field 3]

+Type=Label

+Text="Resolution:"

+Left=0

+Right=50

+Top=73

+Bottom=81

+

+[Field 4]

+Type=Label

+Text="Tabs:"

+Left=0

+Right=50

+Top=100

+Bottom=108

+

+[Field 5]

+Type=Label

+Text="Animations/Effects:"

+Left=0

+Right=67

+Top=124

+Bottom=132

+

+[Field 6]

+Type=Droplist

+ListItems=On|Off

+State=On

+Left=70

+Right=160

+Top=24

+Bottom=36

+

+[Field 7]

+Type=Droplist

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

+State=English

+Left=70

+Right=160

+Top=48

+Bottom=60

+

+[Field 8]

+Type=Droplist

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

+State=800x600

+Left=70

+Right=160

+Top=72

+Bottom=86

+

+[Field 9]

+Type=Droplist

+ListItems=On|Off

+State=Off

+Left=70

+Right=160

+Top=99

+Bottom=113

+

+[Field 10]

+Type=Droplist

+ListItems=On|Off

+State=On

+Left=70

+Right=160

+Top=123

+Bottom=137

+

+[Field 11]

+Type=Label

+Text="Choose if you want to run UltraStar Deluxe in a window or fullscreen."

+Left=170

+Right=305

+Top=25

+Bottom=46

+

+[Field 12]

+Type=Label

+Text="Choose your favorite language, in that UltraStar Deluxe should be displayed."

+Left=170

+Right=305

+Top=48

+Bottom=70

+

+[Field 13]

+Type=Label

+Text="Choose your favorite screen resolution for UltraStar Deluxe adjusted to your display device."

+Left=170

+Right=305

+Top=72

+Bottom=97

+

+[Field 14]

+Type=Label

+Text="Choose whether you would like to view folders in UltraStar Deluxe or not."

+Left=170

+Right=305

+Top=99

+Bottom=122

+

+[Field 15]

+Type=Label

+Text="Here you can define some settings for UltraStar Deluxe. The settings can\r\nalso be changed in the GUI later."

+Left=0

+Right=289

+Top=3

+Bottom=20

+

+[Field 16]

+Type=Label

+Text="Choose if special effects or animations should be used by UltraStar Deluxe. Recommended: On"

+Left=170

+Right=305

+Top=123

+Bottom=139

+

diff --git a/Medley/installer/settings/variables.nsh b/Medley/installer/settings/variables.nsh
new file mode 100644
index 00000000..db98d89f
--- /dev/null
+++ b/Medley/installer/settings/variables.nsh
@@ -0,0 +1,91 @@
+; ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~

+; UltraStar Deluxe Un/Installer: Variables

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

+

+; Product Information:

+

+!define version "1.1a" ; Make sure version is also set in onInit

+

+

+!define name "UltraStar Deluxe"

+!define publisher "USDX Team"

+!define homepage "http://www.ultrastardeluxe.org"

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

+

+!define exe "USdx"

+

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

+

+; Icons

+

+!define img_install "install.ico"

+!define img_uninstall "uninstall.ico"

+

+; Header Images

+

+!define img_header "header.bmp" ; Header image (150x57)

+!define img_side "side.bmp" ; Side image (162x314)

+

+; Registry for Start menu entries:

+

+!define PRODUCT_NAME "${name}"

+!define PRODUCT_VERSION "${version}"

+!define PRODUCT_PUBLISHER "${publisher}"

+!define PRODUCT_WEB_SITE "${homepage}"

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

+!define PRODUCT_UNINST_ROOT_KEY "HKLM"

+!define PRODUCT_STARTMENU_REGVAL "NSIS:StartMenuDir"

+

+; Download URLs for Songs and Themes:

+

+!define download_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"

+!define download_sub1_song3 "http://downloads.sourceforge.net/ultrastardx/usdx_song-jonathan_coulton_-_not_about_you.zip"

+!define download_sub1_song4 "http://downloads.sourceforge.net/ultrastardx/usdx_song-jonathan_coulton_-_mr_fancy_pants.zip"

+!define download_sub1_song5 "http://downloads.sourceforge.net/ultrastardx/usdx_song-jonathan_coulton_-_big_bad_world_one.zip"

+!define download_sub1_song6 "http://downloads.sourceforge.net/ultrastardx/usdx_song-jonathan_coulton_-_flickr.zip"

+!define download_sub1_song7 "http://downloads.sourceforge.net/ultrastardx/usdx_song-jonathan_coulton_-_my_beige_bear.zip"

+!define download_sub1_song8 "http://downloads.sourceforge.net/ultrastardx/usdx_song-jonathan_coulton_-_the_future_soon.zip"

+!define download_sub1_song9 "http://downloads.sourceforge.net/ultrastardx/usdx_song-jonathan_coulton_-_ikea.zip"

+!define download_sub1_song10 "http://downloads.sourceforge.net/ultrastardx/usdx_song-jonathan_coulton_-_furry_old_lobster.zip"

+!define download_sub1_song11 "http://downloads.sourceforge.net/ultrastardx/usdx_song-jonathan_coulton_-_code_monkey.zip"

+!define download_sub1_song12 "http://downloads.sourceforge.net/ultrastardx/usdx_song-jonathan_coulton_-_im_your_moon.zip"

+!define download_sub1_song13 "http://downloads.sourceforge.net/ultrastardx/usdx_song-jonathan_coulton_-_first_of_may.zip"

+!define download_sub1_song14 "http://downloads.sourceforge.net/ultrastardx/usdx_song-jonathan_coulton_-_dance_soterios_johnson_dance.zip"

+!define download_sub1_song15 "http://downloads.sourceforge.net/ultrastardx/usdx_song-jonathan_coulton_-_a_talk_with_george.zip"

+!define download_sub1_song16 "http://downloads.sourceforge.net/ultrastardx/usdx_song-jonathan_coulton_-_creepy_doll.zip"

+!define download_sub1_song17 "http://downloads.sourceforge.net/ultrastardx/usdx_song-jonathan_coulton_-_that_spells_dna.zip"

+!define download_sub1_song18 "http://downloads.sourceforge.net/ultrastardx/usdx_song-jonathan_coulton_-_when_you_go.zip"

+!define download_sub1_song19 "http://downloads.sourceforge.net/ultrastardx/usdx_song-jonathan_coulton_-_better.zip"

+!define download_sub1_song20 "http://downloads.sourceforge.net/ultrastardx/usdx_song-jonathan_coulton_-_shop_vac.zip"

+!define download_sub1_song21 "http://downloads.sourceforge.net/ultrastardx/usdx_song-jonathan_coulton_-_i_feel_fantastic.zip"

+!define download_sub1_song22 "http://downloads.sourceforge.net/ultrastardx/usdx_song-jonathan_coulton_-_re-_your_brains.zip"

+!define download_sub1_song23 "http://downloads.sourceforge.net/ultrastardx/usdx_song-jonathan_coulton_-_skullcrusher_mountain.zip"

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

+

+!define download_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.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