- 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

4 files changed, 338 insertions, 262 deletions

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.