- Redesign of custom settings page

New: Ability to select a different song dir
New: Select ingame sorting
- Updated language file
- Fixed: Added resources folder

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

6 files changed, 406 insertions, 338 deletions

diff --git a/installer/UltraStar Deluxe.nsi b/installer/UltraStar Deluxe.nsi
index 5be85f33..c7fe26ab 100644
--- a/installer/UltraStar Deluxe.nsi
+++ b/installer/UltraStar Deluxe.nsi
@@ -151,9 +151,10 @@ Page custom Settings
 

 Function Settings

 

-!insertmacro MUI_HEADER_TEXT " " "$(page_settings_subtitle)"

+!insertmacro INSTALLOPTIONS_WRITE "Settings-$LANGUAGE" "Field 18" "State" "$INSTDIR\songs"

 

-   !insertmacro INSTALLOPTIONS_DISPLAY "Settings-$LANGUAGE"

+!insertmacro MUI_HEADER_TEXT " " "$(page_settings_subtitle)"   

+!insertmacro INSTALLOPTIONS_DISPLAY "Settings-$LANGUAGE"

 

 ; Get all the variables:

 

@@ -164,13 +165,15 @@ var /GLOBAL fullscreen
 var /GLOBAL language2

 var /GLOBAL resolution

 var /GLOBAL tabs

-var /GLOBAL animations

+var /GLOBAL sorting

+var /GLOBAL songdir

 

-  !insertmacro INSTALLOPTIONS_READ $fullscreen "Settings-$LANGUAGE" "Field 6" "State"

-  !insertmacro INSTALLOPTIONS_READ $language2 "Settings-$LANGUAGE" "Field 7" "State"

-  !insertmacro INSTALLOPTIONS_READ $resolution "Settings-$LANGUAGE" "Field 8" "State"

-  !insertmacro INSTALLOPTIONS_READ $tabs "Settings-$LANGUAGE" "Field 9" "State"

-  !insertmacro INSTALLOPTIONS_READ $animations "Settings-$LANGUAGE" "Field 10" "State"

+  !insertmacro INSTALLOPTIONS_READ $fullscreen "Settings-$LANGUAGE" "Field 5" "State"

+  !insertmacro INSTALLOPTIONS_READ $language2 "Settings-$LANGUAGE" "Field 6" "State"

+  !insertmacro INSTALLOPTIONS_READ $resolution "Settings-$LANGUAGE" "Field 7" "State"

+  !insertmacro INSTALLOPTIONS_READ $tabs "Settings-$LANGUAGE" "Field 8" "State"

+  !insertmacro INSTALLOPTIONS_READ $sorting "Settings-$LANGUAGE" "Field 15" "State"

+  !insertmacro INSTALLOPTIONS_READ $songdir "Settings-$LANGUAGE" "Field 18" "State"

 

 ; Write all variables to config.ini

 

@@ -190,26 +193,14 @@ StrCpy $path_configini "$path_config\config.ini"
 ${WriteToConfig} "[Game]$\r$\n" "$path_configini"

 ${WriteToConfig} "Language=$language2$\r$\n" "$path_configini"

 ${WriteToConfig} "Tabs=$tabs$\r$\n" "$path_configini"

+${WriteToConfig} "Sorting=$sorting$\r$\n" "$path_configini"

 

 ${WriteToConfig} "[Graphics]$\r$\n" "$path_configini"

 ${WriteToConfig} "FullScreen=$fullscreen$\r$\n" "$path_configini"

 ${WriteToConfig} "Resolution=$resolution$\r$\n" "$path_configini"

 

-${WriteToConfig} "[Sound]$\r$\n" "$path_configini"

-${WriteToConfig} "PreviewFading=3 Secs$\r$\n" "$path_configini"

-

-; Animations On / Off Tasks

-

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

-${WriteToConfig} "[Advanced]$\r$\n" "$path_configini"

-${WriteToConfig} "LoadAnimation=Off$\r$\n" "$path_configini"

-${WriteToConfig} "EffectSing=Off$\r$\n" "$path_configini"

-${WriteToConfig} "ScreenFade=Off$\r$\n" "$path_configini"

-${EndIf}

-

-${WriteToConfig} "[Lyrics]$\r$\n" "$path_configini"

-${WriteToConfig} "LyricsFont=Plain$\r$\n" "$path_configini"

-${WriteToConfig} "LyricsEffect=Slide$\r$\n" "$path_configini"

+${WriteToConfig} "[Directories]$\r$\n" "$path_configini"

+${WriteToConfig} "SongDir2=$songdir$\r$\n" "$path_configini"

 

 FunctionEnd ; Settings page End

 

@@ -1379,6 +1370,7 @@ done:
   !insertmacro INSTALLOPTIONS_EXTRACT_AS ".\settings\settings-1033.ini" "Settings-1033"

   !insertmacro INSTALLOPTIONS_EXTRACT_AS ".\settings\settings-1038.ini" "Settings-1038"

 

+

 FunctionEnd

 

 Function un.onInit

diff --git a/installer/languages/German.nsh b/installer/languages/German.nsh
index d6a72a9a..fb7ddeb4 100644
--- a/installer/languages/German.nsh
+++ b/installer/languages/German.nsh
@@ -2,13 +2,13 @@
 ; UltraStar Deluxe Installer - Language file: German

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

 

-LangString abort_install ${LANG_GERMAN} "Wollen Sie die Installation wirklich abbrechen?"

-LangString abort_uninstall ${LANG_GERMAN} "Wollen Sie die Deinstallation wirklich abbrechen?"

+LangString abort_install ${LANG_GERMAN} "Willst du die Installation wirklich abbrechen?"

+LangString abort_uninstall ${LANG_GERMAN} "Willst du die Deinstallation wirklich abbrechen?"

 LangString oninit_running ${LANG_GERMAN} "Die Installation wird bereits ausgeführt."

-LangString oninit_installagain ${LANG_GERMAN} "Sind Sie sicher, dass Sie es erneut installieren möchten?"

+LangString oninit_installagain ${LANG_GERMAN} "Bist du sicher, dass du es erneut installieren möchtest?"

 LangString oninit_alreadyinstalled ${LANG_GERMAN} "ist bereits installiert"

 LangString oninit_closeusdx ${LANG_GERMAN} "kann nicht während der Laufzeit deinstalliert werden. Soll es geschlossen werden?"

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

+LangString oninit_updateusdx ${LANG_GERMAN} "Möchtest du das Programm aktualisieren von"

 

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

 LangString button_next ${LANG_GERMAN} "Weiter >"

@@ -25,16 +25,16 @@ LangString update_check_failed ${LANG_GERMAN} "Die Aktualisierungsprüfung ist fe
 ; Welcome Page:

 

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

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

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

 

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

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

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

 

 LangString page_un_welcome_title ${LANG_GERMAN} "Willkommen zur Deinstallation von UltraStar Deluxe"

 

 ; Components Page:

 

-LangString page_components_info ${LANG_GERMAN} "Schieben Sie den Mauszeiger über die Komponente um Details einzusehen"

+LangString page_components_info ${LANG_GERMAN} "Schiebe den Mauszeiger über die Komponente um Details einzusehen"

 

 ; Custom Page

 

@@ -43,7 +43,7 @@ LangString page_settings_subtitle ${LANG_GERMAN} "Lege deine favorisierten Einst
 

 ; Finish Page:

 

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

+LangString page_finish_txt ${LANG_GERMAN} "UltraStar Deluxe wurde erfolgreich auf Ihrem System installiert.$\n$\r$\n$\rBesuche unsere Projektwebseite um die neusten Updates und News zu erhalten."

 LangString page_finish_linktxt ${LANG_GERMAN} "Projektwebseite"

 LangString page_finish_desktop ${LANG_GERMAN} "Verknüpfung auf dem Desktop erstellen?"

 

@@ -69,52 +69,52 @@ LangString name_s2_sub2 ${LANG_GERMAN} "Shearer"
 LangString name_s2_sub3 ${LANG_GERMAN} "Wise Guys"

 

 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 ${LANG_GERMAN} "Hier können Songs zum Herunterladen 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_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_s2_sub3_Section3 ${LANG_GERMAN} "Installiert das Lied 'Mensch, wo bist du? (Karaoke)'."
\ No newline at end of file
+LangString DESC_g2Section2 ${LANG_GERMAN} "Lädt das Lied 'Dead Smiling Pirates - I 18' (CC by-nc-nd 2.5) herunter."

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

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

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

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

+

+LangString DESC_s2_sub1_Section1 ${LANG_GERMAN} "Lädt das Lied 'Monkey Shines' herunter."

+LangString DESC_s2_sub1_Section2 ${LANG_GERMAN} "Lädt das Lied 'I Crush Everything' herunter."

+LangString DESC_s2_sub1_Section3 ${LANG_GERMAN} "Lädt das Lied 'Not About You' herunter."

+LangString DESC_s2_sub1_Section4 ${LANG_GERMAN} "Lädt das Lied 'Mr. Fancy Pants' herunter."

+LangString DESC_s2_sub1_Section5 ${LANG_GERMAN} "Lädt das Lied 'Big Bad World One' herunter."

+LangString DESC_s2_sub1_Section6 ${LANG_GERMAN} "Lädt das Lied 'Flickr [inkl. Video]' herunter."

+LangString DESC_s2_sub1_Section7 ${LANG_GERMAN} "Lädt das Lied 'My Beige Bear' herunter."

+LangString DESC_s2_sub1_Section8 ${LANG_GERMAN} "Lädt das Lied 'The Future Soon' herunter."

+LangString DESC_s2_sub1_Section9 ${LANG_GERMAN} "Lädt das Lied 'Ikea' herunter."

+LangString DESC_s2_sub1_Section10 ${LANG_GERMAN} "Lädt das Lied 'Furry Old Lobster' herunter."

+LangString DESC_s2_sub1_Section11 ${LANG_GERMAN} "Lädt das Lied 'Code Monkey [inkl. Video]' herunter."

+LangString DESC_s2_sub1_Section12 ${LANG_GERMAN} "Lädt das Lied 'I´m Your Moon' herunter."

+LangString DESC_s2_sub1_Section13 ${LANG_GERMAN} "Lädt das Lied 'First Of May' herunter."

+LangString DESC_s2_sub1_Section14 ${LANG_GERMAN} "Lädt das Lied 'Dance, Soterios Johnson, Dance' herunter."

+LangString DESC_s2_sub1_Section15 ${LANG_GERMAN} "Lädt das Lied 'A Talk With George' herunter."

+LangString DESC_s2_sub1_Section16 ${LANG_GERMAN} "Lädt das Lied 'Creepy Doll [inkl. Video]' herunter."

+LangString DESC_s2_sub1_Section17 ${LANG_GERMAN} "Lädt das Lied 'That Spells DNA' herunter."

+LangString DESC_s2_sub1_Section18 ${LANG_GERMAN} "Lädt das Lied 'When You Go' herunter."

+LangString DESC_s2_sub1_Section19 ${LANG_GERMAN} "Lädt das Lied 'Better' herunter."

+LangString DESC_s2_sub1_Section20 ${LANG_GERMAN} "Lädt das Lied 'Shop Vac' herunter."

+LangString DESC_s2_sub1_Section21 ${LANG_GERMAN} "Lädt das Lied 'I Feel Fantastic' herunter."

+LangString DESC_s2_sub1_Section22 ${LANG_GERMAN} "Lädt das Lied 'Re: Your Brains' herunter."

+LangString DESC_s2_sub1_Section23 ${LANG_GERMAN} "Lädt das Lied 'Skullcrusher Mountain' herunter."

+LangString DESC_s2_sub1_Section24 ${LANG_GERMAN} "Lädt das Lied 'Chiron Beta Prime [inkl. Video]' herunter."

+

+LangString DESC_s2_sub2_Section1 ${LANG_GERMAN} "Lädt das Lied '69' herunter."

+LangString DESC_s2_sub2_Section2 ${LANG_GERMAN} "Lädt das Lied '69 (Karaoke)' herunter."

+LangString DESC_s2_sub2_Section3 ${LANG_GERMAN} "Lädt das Lied 'Can't stop it' herunter."

+LangString DESC_s2_sub2_Section4 ${LANG_GERMAN} "Lädt das Lied 'Can't stop it (Karaoke)' herunter."

+LangString DESC_s2_sub2_Section5 ${LANG_GERMAN} "Lädt das Lied 'In My Hand' herunter."

+LangString DESC_s2_sub2_Section6 ${LANG_GERMAN} "Lädt das Lied 'Man Song' herunter."

+LangString DESC_s2_sub2_Section7 ${LANG_GERMAN} "Lädt das Lied 'Man Song (Karaoke)' herunter."

+LangString DESC_s2_sub2_Section8 ${LANG_GERMAN} "Lädt das Lied 'Stay with me' herunter."

+LangString DESC_s2_sub2_Section9 ${LANG_GERMAN} "Lädt das Lied 'Stay with me (Karaoke)' herunter."

+

+LangString DESC_s2_sub3_Section1 ${LANG_GERMAN} "Lädt das Lied 'Lebendig und kräftig und schärfer' herunter."

+LangString DESC_s2_sub3_Section2 ${LANG_GERMAN} "Lädt das Lied 'Mensch, wo bist du?' herunter."

+LangString DESC_s2_sub3_Section3 ${LANG_GERMAN} "Lädt das Lied 'Mensch, wo bist du? (Karaoke)' herunter."
\ No newline at end of file
diff --git a/installer/settings/files_main_install.nsh b/installer/settings/files_main_install.nsh
index 693e0413..bd748a12 100644
--- a/installer/settings/files_main_install.nsh
+++ b/installer/settings/files_main_install.nsh
@@ -36,6 +36,7 @@ File /r ..\game\themes
 File /r ..\game\languages

 File /r ..\game\sounds

 File /r ..\game\fonts

+File /r ..\game\resources

 File /r ..\game\visuals

 

 ; Root dir:

diff --git a/installer/settings/settings-1031.ini b/installer/settings/settings-1031.ini
index bc5a425d..411e1fc1 100644
--- a/installer/settings/settings-1031.ini
+++ b/installer/settings/settings-1031.ini
@@ -1,136 +1,161 @@
 [Settings]

-NumFields=16

+NumFields=19

+

+; Background Group of Settings Box

+[Field 17]

+Type=GroupBox

+Left=0

+Top=0

+Right=300

+Bottom=140

+Text=UltraStar Deluxe Konfiguration (Optional) 

 

 [Field 1]

 Type=Label

 Text="Vollbild Modus:"

-Left=0

-Right=53

-Top=27

-Bottom=35

+Left=5

+Right=58

+Top=30

+Bottom=38

 

 [Field 2]

 Type=Label

 Text="Sprache:"

-Left=0

-Right=53

-Top=51

-Bottom=59

+Left=5

+Right=58

+Top=47

+Bottom=55

 

 [Field 3]

 Type=Label

 Text="Auflösung:"

-Left=0

-Right=53

-Top=73

-Bottom=81

+Left=5

+Right=58

+Top=64

+Bottom=72

 

 [Field 4]

 Type=Label

 Text="Ordnerstruktur:"

-Left=0

-Right=53

-Top=97

-Bottom=105

+Left=5

+Right=58

+Top=82

+Bottom=90

 

 [Field 5]

-Type=Label

-Text="Animationen/Effekte:"

-Left=0

-Right=70

-Top=124

-Bottom=132

-

-[Field 6]

-Type=Droplist

+Type=DropList

 ListItems=On|Off

 State=On

-Left=71

-Right=161

-Top=25

-Bottom=38

+Left=62

+Right=152

+Top=28

+Bottom=39

 

-[Field 7]

-Type=Droplist

-ListItems=Catalan|Croatian|Dutch|English|Euskara|Finnish|French|German|Greek|Italian|Japanese|Luxembourgish|Portuguese|Spanish|Swedish

+[Field 6]

+Type=DropList

+ListItems=Catalan|Croatian|Dutch|English|Euskara|Finnish|French|German|Greek|Icelandic|Italian|Japanese|Luxembourgish|Portuguese|Spanish|Swedish

 State=German

-Left=71

-Right=161

-Top=48

-Bottom=62

+Left=62

+Right=152

+Top=45

+Bottom=56

 

-[Field 8]

-Type=Droplist

+[Field 7]

+Type=DropList

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

 State=800x600

-Left=71

-Right=161

-Top=72

-Bottom=86

+Left=62

+Right=152

+Top=62

+Bottom=73

 

-[Field 9]

-Type=Droplist

+[Field 8]

+Type=DropList

 ListItems=On|Off

 State=Off

-Left=71

-Right=161

-Top=96

-Bottom=110

+Left=62

+Right=152

+Top=81

+Bottom=91

+

+[Field 9]

+Type=Label

+Text=Spiel im Fenster oder Vollbild starten?

+Left=157

+Right=300

+Top=30

+Bottom=38

 

 [Field 10]

-Type=Droplist

-ListItems=On|Off

-State=On

-Left=71

-Right=161

-Top=121

-Bottom=136

+Type=Label

+Text=Alle Einstellungen können nachträglich im Spielmenü geändert werden.

+Left=5

+Right=246

+Top=14

+Bottom=23

 

 [Field 11]

 Type=Label

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

-Left=170

-Right=315

-Top=24

-Bottom=44

+Text=Passe die Sprache des Menüs an.

+Left=158

+Right=300

+Top=46

+Bottom=55

 

 [Field 12]

 Type=Label

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

-Left=0

-Right=315

-Top=3

-Bottom=20

+Text=Wähle die Auflösung/Fenstergröße aus.

+Left=157

+Right=300

+Top=64

+Bottom=72

 

 [Field 13]

 Type=Label

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

-Left=170

-Right=315

-Top=46

-Bottom=68

+Text=Eine virtuelle Ordnerstruktur zum Anzeigen der Lieder verwenden?

+Left=158

+Right=300

+Top=78

+Bottom=94

 

 [Field 14]

 Type=Label

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

-Left=170

-Right=315

-Top=70

-Bottom=96

+Left=5

+Top=100

+Right=58

+Bottom=109

+Text=Sortierung:

 

 [Field 15]

-Type=Label

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

-Left=170

-Right=315

-Top=92

-Bottom=116

+Type=DropList

+Left=62

+Top=100

+Right=152

+Bottom=111

+State=Artist

+ListItems=Edition|Genre|Language|Folder|Title|Artist

 

 [Field 16]

 Type=Label

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

-Left=170

-Right=315

+Left=157

+Top=101

+Right=300

+Bottom=110

+Text=Kriterium zum Sortieren der Lieder wählen.

+

+[Field 18]

+Type=DirRequest

+Left=5

 Top=121

-Bottom=137

+Right=152

+Bottom=132

+Text=SongDir

+State=

 

+[Field 19]

+Type=Label

+Left=158

+Top=119

+Right=295

+Bottom=134

+Text=Alternativen Ordner mit (weiteren) Songs für UltraStar Deluxe definieren.

diff --git a/installer/settings/settings-1033.ini b/installer/settings/settings-1033.ini
index 304eb672..9326d276 100644
--- a/installer/settings/settings-1033.ini
+++ b/installer/settings/settings-1033.ini
@@ -1,136 +1,161 @@
 [Settings]

-NumFields=16

+NumFields=19

+

+; Background Group of Settings Box

+[Field 17]

+Type=GroupBox

+Left=1

+Top=1

+Right=300

+Bottom=140

+Text=UltraStar Deluxe Konfiguration (Optional) 

 

 [Field 1]

 Type=Label

 Text="Fullscreen Mode:"

-Left=0

-Right=50

-Top=27

-Bottom=35

+Left=5

+Right=58

+Top=30

+Bottom=38

 

 [Field 2]

 Type=Label

 Text="Language:"

-Left=0

-Right=50

-Top=51

-Bottom=59

+Left=5

+Right=58

+Top=47

+Bottom=55

 

 [Field 3]

 Type=Label

 Text="Resolution:"

-Left=0

-Right=50

-Top=73

-Bottom=81

+Left=5

+Right=58

+Top=64

+Bottom=72

 

 [Field 4]

 Type=Label

 Text="Tabs:"

-Left=0

-Right=50

-Top=100

-Bottom=108

+Left=5

+Right=58

+Top=82

+Bottom=90

 

 [Field 5]

-Type=Label

-Text="Animations/Effects:"

-Left=0

-Right=67

-Top=124

-Bottom=132

-

-[Field 6]

-Type=Droplist

+Type=DropList

 ListItems=On|Off

 State=On

-Left=70

-Right=160

-Top=24

-Bottom=36

+Left=62

+Right=152

+Top=28

+Bottom=39

 

-[Field 7]

-Type=Droplist

-ListItems=Catalan|Croatian|Dutch|English|Euskara|Finnish|French|German|Greek|Italian|Japanese|Luxembourgish|Portuguese|Spanish|Swedish

-State=English

-Left=70

-Right=160

-Top=48

-Bottom=60

+[Field 6]

+Type=DropList

+ListItems=Catalan|Croatian|Dutch|English|Euskara|Finnish|French|German|Greek|Icelandic|Italian|Japanese|Luxembourgish|Portuguese|Spanish|Swedish

+State=German

+Left=62

+Right=152

+Top=45

+Bottom=56

 

-[Field 8]

-Type=Droplist

+[Field 7]

+Type=DropList

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

 State=800x600

-Left=70

-Right=160

-Top=72

-Bottom=86

+Left=62

+Right=152

+Top=62

+Bottom=73

 

-[Field 9]

-Type=Droplist

+[Field 8]

+Type=DropList

 ListItems=On|Off

 State=Off

-Left=70

-Right=160

-Top=99

-Bottom=113

+Left=62

+Right=152

+Top=81

+Bottom=91

+

+[Field 9]

+Type=Label

+Text=Start game in window or fullscreen?

+Left=157

+Right=300

+Top=30

+Bottom=38

 

 [Field 10]

-Type=Droplist

-ListItems=On|Off

-State=On

-Left=70

-Right=160

-Top=123

-Bottom=137

+Type=Label

+Text=All settings can also be changed in the GUI later.

+Left=5

+Right=246

+Top=14

+Bottom=23

 

 [Field 11]

 Type=Label

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

-Left=170

-Right=305

-Top=25

-Bottom=46

+Text=Adjust the GUI language.

+Left=158

+Right=300

+Top=46

+Bottom=55

 

 [Field 12]

 Type=Label

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

-Left=170

-Right=305

-Top=48

-Bottom=70

+Text=Choose screen resolution/window size.

+Left=157

+Right=300

+Top=64

+Bottom=72

 

 [Field 13]

 Type=Label

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

-Left=170

-Right=305

-Top=72

-Bottom=97

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

+Left=158

+Right=300

+Top=78

+Bottom=94

 

 [Field 14]

 Type=Label

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

-Left=170

-Right=305

-Top=99

-Bottom=122

+Left=5

+Top=100

+Right=58

+Bottom=109

+Text=Sorting:

 

 [Field 15]

-Type=Label

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

-Left=0

-Right=289

-Top=3

-Bottom=20

+Type=DropList

+Left=62

+Top=100

+Right=152

+Bottom=111

+State=Artist

+ListItems=Edition|Genre|Language|Folder|Title|Artist

 

 [Field 16]

 Type=Label

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

-Left=170

-Right=305

-Top=123

-Bottom=139

+Left=157

+Top=101

+Right=300

+Bottom=110

+Text=Select criterion to sort songs.

+

+[Field 18]

+Type=DirRequest

+Left=5

+Top=121

+Right=152

+Bottom=132

+Text=SongDir

+State=

 

+[Field 19]

+Type=Label

+Left=158

+Top=119

+Right=295

+Bottom=134

+Text=Choose alternative dir with (additional) songs for UltraStar Deluxe.

diff --git a/installer/settings/settings-1038.ini b/installer/settings/settings-1038.ini
index fe97be91..c012c674 100644
--- a/installer/settings/settings-1038.ini
+++ b/installer/settings/settings-1038.ini
@@ -1,136 +1,161 @@
 [Settings]

-NumFields=16

+NumFields=19

+

+; Background Group of Settings Box

+[Field 17]

+Type=GroupBox

+Left=1

+Top=1

+Right=300

+Bottom=140

+Text=UltraStar Deluxe Konfiguration (Optional) 

 

 [Field 1]

 Type=Label

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

-Left=0

-Right=50

-Top=27

-Bottom=35

+Left=5

+Right=58

+Top=30

+Bottom=38

 

 [Field 2]

 Type=Label

 Text="Nyelv:"

-Left=0

-Right=50

-Top=51

-Bottom=59

+Left=5

+Right=58

+Top=47

+Bottom=55

 

 [Field 3]

 Type=Label

 Text="Felbontás:"

-Left=0

-Right=50

-Top=73

-Bottom=81

+Left=5

+Right=58

+Top=64

+Bottom=72

 

 [Field 4]

 Type=Label

 Text="Tabs:"

-Left=0

-Right=50

-Top=100

-Bottom=108

+Left=5

+Right=58

+Top=82

+Bottom=90

 

 [Field 5]

-Type=Label

-Text="Animációk/Hatások:"

-Left=0

-Right=67

-Top=124

-Bottom=132

-

-[Field 6]

-Type=Droplist

+Type=DropList

 ListItems=On|Off

 State=On

-Left=70

-Right=160

-Top=24

-Bottom=36

+Left=62

+Right=152

+Top=28

+Bottom=39

 

-[Field 7]

-Type=Droplist

-ListItems=Catalan|Croatian|Dutch|English|Euskara|Finnish|French|German|Greek|Italian|Japanese|Luxembourgish|Portuguese|Spanish|Swedish

-State=English

-Left=70

-Right=160

-Top=48

-Bottom=60

+[Field 6]

+Type=DropList

+ListItems=Catalan|Croatian|Dutch|English|Euskara|Finnish|French|German|Greek|Icelandic|Italian|Japanese|Luxembourgish|Portuguese|Spanish|Swedish

+State=German

+Left=62

+Right=152

+Top=45

+Bottom=56

 

-[Field 8]

-Type=Droplist

+[Field 7]

+Type=DropList

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

 State=800x600

-Left=70

-Right=160

-Top=72

-Bottom=86

+Left=62

+Right=152

+Top=62

+Bottom=73

 

-[Field 9]

-Type=Droplist

+[Field 8]

+Type=DropList

 ListItems=On|Off

 State=Off

-Left=70

-Right=160

-Top=99

-Bottom=113

+Left=62

+Right=152

+Top=81

+Bottom=91

+

+[Field 9]

+Type=Label

+Text=Start game in window or fullscreen?

+Left=157

+Right=300

+Top=30

+Bottom=38

 

 [Field 10]

-Type=Droplist

-ListItems=On|Off

-State=On

-Left=70

-Right=160

-Top=123

-Bottom=137

+Type=Label

+Text=All settings can also be changed in the GUI later.

+Left=5

+Right=246

+Top=14

+Bottom=23

 

 [Field 11]

 Type=Label

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

-Left=170

-Right=305

-Top=25

-Bottom=46

+Text=Adjust the GUI language.

+Left=158

+Right=300

+Top=46

+Bottom=55

 

 [Field 12]

 Type=Label

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

-Left=170

-Right=305

-Top=48

-Bottom=70

+Text=Choose screen resolution/window size.

+Left=157

+Right=300

+Top=64

+Bottom=72

 

 [Field 13]

 Type=Label

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

-Left=170

-Right=305

-Top=72

-Bottom=97

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

+Left=158

+Right=300

+Top=78

+Bottom=94

 

 [Field 14]

 Type=Label

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

-Left=170

-Right=305

-Top=99

-Bottom=122

+Left=5

+Top=100

+Right=58

+Bottom=109

+Text=Sorting:

 

 [Field 15]

-Type=Label

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

-Left=0

-Right=289

-Top=3

-Bottom=20

+Type=DropList

+Left=62

+Top=100

+Right=152

+Bottom=111

+State=Artist

+ListItems=Edition|Genre|Language|Folder|Title|Artist

 

 [Field 16]

 Type=Label

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

-Left=170

-Right=305

-Top=123

-Bottom=139

+Left=157

+Top=101

+Right=300

+Bottom=110

+Text=Select criterion to sort songs.

+

+[Field 18]

+Type=DirRequest

+Left=5

+Top=121

+Right=152

+Bottom=132

+Text=SongDir

+State=

 

+[Field 19]

+Type=Label

+Left=158

+Top=119

+Right=295

+Bottom=134

+Text=Choose alternative dir with (additional) songs for UltraStar Deluxe.