Theme/Skin: Beautified options screen, preparation for advanced tab, modified keyboard buttons in bottom bar

Theme/Skin: Skinned song menu
Language: added advanced screen entries to german.ini

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

9 files changed, 470 insertions, 249 deletions

diff --git a/Languages/German.ini b/Languages/German.ini
index 2cf44abd..a44ecc65 100644
--- a/Languages/German.ini
+++ b/Languages/German.ini
@@ -20,6 +20,7 @@ SING_OPTIONS_SOUND=Sound
 SING_OPTIONS_LYRICS=Lyrics

 SING_OPTIONS_THEMES=Themes

 SING_OPTIONS_RECORD=Aufnahme

+SING_OPTIONS_ADVANCED=Erweitert

 SING_OPTIONS_EXIT=zurück

 

 SING_OPTIONS_GAME_DESC=Spiel Optionen

@@ -61,6 +62,14 @@ SING_OPTIONS_RECORD_INPUT=Eingang
 SING_OPTIONS_RECORD_CHANNELL=Linker Kanal

 SING_OPTIONS_RECORD_CHANNELR=Rechter Kanal

 

+SING_OPTIONS_ADVANCED_DESC=Erweiterte Einstellungen

+SING_OPTIONS_ADVANCED_GNOTE_TWINKLE=Goldene Noten glitzern

+SING_OPTIONS_ADVANCED_PERFNOTE_TWINKLE=Perfekte Noten glitzern

+SING_OPTIONS_ADVANCED_ANIMATED_LOADSCREEN=Ladebildschirm animiert

+SING_OPTIONS_ADVANCED_SECURITY_QUESTIONS=Sicherheitsabfragen

+SING_OPTIONS_ADVANCED_COUNT_HOW_OFTEN_SUNG=Wie oft gesungen mitzählen

+SING_OPTIONS_ADVANCED_EVENT_ON_ENTER=Enter bei SongAuswahl

+

 SING_LEGEND_SELECT=AUSWÄHLEN

 SING_LEGEND_NAVIGATE=NAVIGIEREN

 SING_OPTIONS=Optionen

diff --git a/Skins/Deluxe/SongMenuBG.jpg b/Skins/Deluxe/SongMenuBG.jpg
new file mode 100644
index 00000000..77a5d6f6
--- /dev/null
+++ b/Skins/Deluxe/SongMenuBG.jpg
diff --git a/Skins/Deluxe/W&C.ini b/Skins/Deluxe/W&C.ini
index d874d29c..f92f0432 100644
--- a/Skins/Deluxe/W&C.ini
+++ b/Skins/Deluxe/W&C.ini
@@ -30,14 +30,11 @@ Top5BG=W&C.jpg
 OptionsBG=W&C.jpg

 PartyBG=W&C.jpg

 

-MainSolo=Sing.jpg

-MainMulti=Editor.jpg

-MainOptions=Options.jpg

-MainExit=Exit.jpg

-

 SongCD=cd.jpg

 MainIcon=mainicon.jpg

 MainSearch=mainsearch.jpg

+IconOption=[icon]options.jpg

+IconSongMenu=[icon]options.jpg

 

 Leiste1=Leiste1.jpg

 Leiste2=Leiste2.jpg

@@ -71,4 +68,5 @@ ButtonM=button_m.jpg
 ButtonJ=button_j.jpg

 ButtonAlt=button_alt.jpg

 ButtonAZ=button_az.jpg

-JumpToBG=Jump_to_background.jpg
\ No newline at end of file
+JumpToBG=Jump_to_background.jpg

+SongMenuBG=SongMenuBG.jpg
\ No newline at end of file
diff --git a/Skins/Deluxe/[icon]options.jpg b/Skins/Deluxe/[icon]options.jpg
new file mode 100644
index 00000000..278f0adc
--- /dev/null
+++ b/Skins/Deluxe/[icon]options.jpg
diff --git a/Skins/Deluxe/button_alt.jpg b/Skins/Deluxe/button_alt.jpg
index 2e5e885a..d92be06c 100644
--- a/Skins/Deluxe/button_alt.jpg
+++ b/Skins/Deluxe/button_alt.jpg
diff --git a/Skins/Deluxe/button_az.jpg b/Skins/Deluxe/button_az.jpg
index 62b2d21c..c748418a 100644
--- a/Skins/Deluxe/button_az.jpg
+++ b/Skins/Deluxe/button_az.jpg
diff --git a/Skins/Deluxe/button_j.jpg b/Skins/Deluxe/button_j.jpg
index 9d872087..55647a48 100644
--- a/Skins/Deluxe/button_j.jpg
+++ b/Skins/Deluxe/button_j.jpg
diff --git a/Skins/Deluxe/button_m.jpg b/Skins/Deluxe/button_m.jpg
index 5b0f2015..04bc5b0b 100644
--- a/Skins/Deluxe/button_m.jpg
+++ b/Skins/Deluxe/button_m.jpg
diff --git a/Themes/Deluxe.ini b/Themes/Deluxe.ini
index 7107bf8a..69a0e9b4 100644
--- a/Themes/Deluxe.ini
+++ b/Themes/Deluxe.ini
@@ -101,14 +101,15 @@ Reflection=1
 

 [MainStatic3]

 X =600

-Y =549

-W =25

-H =28

+Y =553

+W =21

+H =22

 Tex=ButtonM

 Color =White

 Type=Plain

 Reflection=1

 

+

 [MainText2]

 X =625

 Y =552

@@ -298,16 +299,16 @@ Reflection=1
 

 [SongStatic8]

 X =295

-Y =549

-W =29

-H =28

+Y =553

+W =25

+H =22

 Tex=ButtonAlt

 Color =White

 Type=Plain

 Reflection=1

 

 [SongText5]

-X =324

+X =323

 Y =556

 Color=Black

 Font =1

@@ -317,9 +318,9 @@ Text=+
 

 [SongStatic9]

 X =335

-Y =549

-W =29

-H =28

+Y =553

+W =25

+H =22

 Tex=ButtonAZ

 Color =White

 Type=Plain

@@ -336,9 +337,9 @@ Text=Jump to ..
 

 [SongStatic6]

 X =500

-Y =549

-W =25

-H =28

+Y =553

+W =21

+H =22

 Tex=ButtonM

 Color =White

 Type=Plain

@@ -355,9 +356,9 @@ Text=SONG_MENU_NAME_MAIN
 

 [SongStatic7]

 X =600

-Y =549

-W =25

-H =28

+Y =553

+W =21

+H =22

 Tex=ButtonJ

 Color =White

 Type=Plain

@@ -2139,147 +2140,241 @@ TexX2=1
 TexY2=1

 

 [Options]

-Texts = 3

+#Texts = 4

 Fade = 2

 

 [OptionsBackground]

 Tex=OptionsBG

 

 [OptionsText1]

-X = 50

-Y = 170

-ColR = 0.7

-ColG = 0.7

-ColB = 0.7

-Font = 1

-Size = 25

-Text = SING_OPTIONS

-

-[OptionsText2]

-X = 250

-Y = 550

-ColR = 0.5

-ColG = 0.5

-ColB = 0.5

-Font = 1

-Size = 8

-Text=SING_LEGEND_NAVIGATE

+X =70

+Y =6

+Color=White

+Font =0

+Size =20

+Text=SING_OPTIONS

+Align=0

 

-[OptionsText3]

-X = 500

-Y = 550

-ColR = 0.5

-ColG = 0.5

-ColB = 0.5

-Font = 1

-Size = 8

-Text=SING_LEGEND_SELECT

+[OptionsTextDescription]

+X =70

+Y =53

+Color=White

+Font =0

+Size =10

+Align =0

 

 [OptionsStatic1]

-Tex=MainCursor

-X=40

-Y=250

-W=32

-H=32

-Color=ColorDark

+X =40

+Y =22

+W =27

+H =27

+Color =White

+Tex =IconOption

 Type=Font Black

-TexX1=0

-TexY1=0

-TexX2=1

-TexY2=1

 

-[OptionsTextDescription]

-X = 70

-Y = 248

-ColR = 0.5

-ColG = 0.5

-ColB = 0.5

-Font = 1

-Size = 10

+[OptionsStatic2]

+X =0

+Y =549

+W =252

+H =28

+Tex=Leiste1

+Color =White

+Type=Plain

+Reflection=1

+

+[OptionsStatic3]

+X =254

+Y =549

+W =548

+H =28

+Tex=Leiste2

+Color =White

+Type=Plain

+Reflection=1

+

+[OptionsText2]

+X =120

+Y =552

+Color=Black

+Font =0

+Size =7

+Align=0

+Text=SING_OPTIONS

+

+[OptionsText3]

+X =300

+Y =552

+Color=Black

+Font =0

+Size =7

+Align=0

+Text=SING_OPTIONS_GAME_DESC

 

 [OptionsButtonGame]

-X = 40

-Y = 310

-W = 230

-H = 70

-Tex = MainBar

-Color = ColorDark

-Int = 1

-DColor = White

-DInt = 0.5

-Type = Font Black

+X =100

+Y =270

+W =150

+H =50

+Tex =Button

+Color =DarkBlue

+DColor = LightBlue

+Type=Font Black

+Texts=1

+

+[OptionsButtonGameText1]

+X =75

+Y =10

+Font=0

+Size=10

+Align=1

+Text=SING_OPTIONS_GAME

+Color=White

 

 [OptionsButtonGraphics]

-X = 270

-Y = 310

-W = 230

-H = 70

-Tex = MainBar

-Color = ColorDark

-Int = 1

-DColor = White

-DInt = 0.5

-Type = Font Black

+X =255

+Y =270

+W =150

+H =50

+Tex =Button

+Color =DarkBlue

+DColor = LightBlue

+Type=Font Black

+Texts=1

+

+[OptionsButtonGraphicsText1]

+X =75

+Y =10

+Font=0

+Size=10

+Align=1

+Text=SING_OPTIONS_GRAPHICS

+Color=White

 

 [OptionsButtonSound]

-X = 500

-Y = 310

-W = 230

-H = 70

-Tex = MainBar

-Color = ColorDark

-Int = 1

-DColor = White

-DInt = 0.5

-Type = Font Black

+X =410

+Y =270

+W =150

+H =50

+Tex =Button

+Color =DarkBlue

+DColor = LightBlue

+Type=Font Black

+Texts=1

+

+[OptionsButtonSoundText1]

+X =75

+Y =10

+Font=0

+Size=10

+Align=1

+Text=SING_OPTIONS_SOUND

+Color=White

 

 [OptionsButtonLyrics]

-X = 40

-Y = 380

-W = 230

-H = 70

-Tex = MainBar

-Color = ColorDark

-Int = 1

-DColor = White

-DInt = 0.5

-Type = Font Black

+X =565

+Y =270

+W =150

+H =50

+Tex =Button

+Color =DarkBlue

+DColor = LightBlue

+Type=Font Black

+Align=0

+Texts=1

+

+[OptionsButtonLyricsText1]

+X =75

+Y =10

+Font=0

+Size=10

+Align=1

+Text=SING_OPTIONS_LYRICS

+Color=White

 

 [OptionsButtonThemes]

-X = 270

-Y = 380

-W = 230

-H = 70

-Tex = MainBar

-Color = ColorDark

-Int = 1

-DColor = White

-DInt = 0.5

-Type = Font Black

+X =100

+Y =340

+W =150

+H =50

+Tex =Button

+Color =DarkBlue

+DColor = LightBlue

+Type=Font Black

+Align=0

+Texts=1

+

+[OptionsButtonThemesText1]

+X =75

+Y =10

+Font=0

+Size=10

+Align=1

+Text=SING_OPTIONS_THEMES

+Color=White

 

 [OptionsButtonRecord]

-X = 500

-Y = 380

-W = 230

-H = 70

-Tex = MainBar

-Color = ColorDark

-Int = 1

-DColor = White

-DInt = 0.5

-Type = Font Black

+X =255

+Y =340

+W =150

+H =50

+Tex =Button

+Color =DarkBlue

+DColor = LightBlue

+Type=Font Black

+Align=0

+Texts=1

+

+[OptionsButtonRecordText1]

+X =75

+Y =10

+Font=0

+Size=10

+Align=1

+Text=SING_OPTIONS_RECORD

+Color=White

+Texts=1

+

+[OptionsButtonAdvanced]

+X =410

+Y =340

+W =150

+H =50

+Tex =Button

+Color =DarkBlue

+DColor = LightBlue

+Type=Font Black

+Align=0

+

+[OptionsButtonAdvancedText1]

+X =75

+Y =10

+Font=0

+Size=10

+Align=1

+Text=SING_OPTIONS_ADVANCED

+Color=White

+Texts=1

 

 [OptionsButtonExit]

-X = 500

-Y = 450

-W = 230

-H = 70

-Tex = MainBar

-Color = ColorDark

-Int = 1

-DColor = White

-DInt = 0.5

-Type = Font Black

+X =565

+Y =340

+W =150

+H =50

+Tex =Button

+Color =DarkBlue

+DColor = LightBlue

+Type=Font Black

+Align=0

+Texts=1

+

+[OptionsButtonExitText1]

+X =75

+Y =10

+Font=0

+Size=10

+Align=1

+Text=SING_OPTIONS_EXIT

+Color=White

 

 [OptionsGame]

 Texts = 1

@@ -2289,14 +2384,22 @@ Fade = 2
 Tex=OptionsBG

 

 [OptionsGameText1]

-X = 50

-Y = 10

-ColR = 0.7

-ColG = 0.7

-ColB = 0.7

-Font = 1

-Size = 25

-Text=SING_OPTIONS_GAME_DESC

+X =70

+Y =6

+Color=White

+Font =0

+Size =20

+Text=SING_OPTIONS_GAME

+Align=0

+

+[OptionsGameStatic1]

+X =40

+Y =22

+W =27

+H =27

+Color =White

+Tex =IconOption

+Type=Font Black

 

 [OptionsGameSelectPlayers]

 Tex = MainBar

@@ -2436,14 +2539,22 @@ Texts = 1
 Tex=OptionsBG

 

 [OptionsGraphicsText1]

-X = 50

-Y = 10

-ColR = 0.7

-ColG = 0.7

-ColB = 0.7

-Font = 1

-Size = 25

+X =70

+Y =6

+Color=White

+Font =0

+Size =20

 Text=SING_OPTIONS_GRAPHICS_DESC

+Align=0

+

+[OptionsGraphicsStatic1]

+X =40

+Y =22

+W =27

+H =27

+Color =White

+Tex =IconOption

+Type=Font Black

 

 [OptionsGraphicsSelectSlideResolution]

 Tex =MainBar

@@ -2582,14 +2693,22 @@ Texts = 1
 Tex=OptionsBG

 

 [OptionsSoundText1]

-X = 50

-Y = 10

-ColR = 0.7

-ColG = 0.7

-ColB = 0.7

-Font = 1

-Size = 25

-Text =SING_OPTIONS_SOUND_DESC

+X =70

+Y =6

+Color=White

+Font =0

+Size =20

+Text=SING_OPTIONS_SOUND_DESC

+Align=0

+

+[OptionsSoundStatic1]

+X =40

+Y =22

+W =27

+H =27

+Color =White

+Tex =IconOption

+Type=Font Black

 

 [OptionsSoundSelectMicBoost]

 Tex =MainBar

@@ -2708,14 +2827,22 @@ Texts = 1
 Tex=OptionsBG

 

 [OptionsLyricsText1]

-X = 50

-Y = 10

-ColR = 0.7

-ColG = 0.7

-ColB = 0.7

-Font = 1

-Size = 25

-Text =SING_OPTIONS_LYRICS_DESC

+X =70

+Y =6

+Color=White

+Font =0

+Size =20

+Text=SING_OPTIONS_LYRICS_DESC

+Align=0

+

+[OptionsLyricsStatic1]

+X =40

+Y =22

+W =27

+H =27

+Color =White

+Tex =IconOption

+Type=Font Black

 

 [OptionsLyricsSelectLyricsFont]

 Tex =MainBar

@@ -2794,14 +2921,22 @@ Texts = 1
 Tex=OptionsBG

 

 [OptionsThemesText1]

-X = 50

-Y = 10

-ColR = 0.7

-ColG = 0.7

-ColB = 0.7

-Font = 1

-Size = 25

-Text =SING_OPTIONS_THEMES_DESC

+X =70

+Y =6

+Color=White

+Font =0

+Size =20

+Text=SING_OPTIONS_THEMES_DESC

+Align=0

+

+[OptionsThemesStatic1]

+X =40

+Y =22

+W =27

+H =27

+Color =White

+Tex =IconOption

+Type=Font Black

 

 [OptionsThemesSelectTheme]

 Tex =MainBar

@@ -2880,14 +3015,22 @@ Texts = 1
 Tex=OptionsBG

 

 [OptionsRecordText1]

-X = 50

-Y = 10

-ColR = 0.7

-ColG = 0.7

-ColB = 0.7

-Font = 1

-Size = 25

+X =70

+Y =6

+Color=White

+Font =0

+Size =20

 Text=SING_OPTIONS_RECORD_DESC

+Align=0

+

+[OptionsRecordStatic1]

+X =40

+Y =22

+W =27

+H =27

+Color =White

+Tex =IconOption

+Type=Font Black

 

 [OptionsRecordSelectSlideCard]

 Tex = MainBar

@@ -2983,6 +3126,30 @@ Color = ColorDark
 DColor = Gray

 Type = Font Black

 

+[OptionsAdvanced]

+Texts = 1

+

+[OptionsAdvancedBackground]

+Tex=OptionsBG

+

+[OptionsAdvancedText1]

+X =70

+Y =6

+Color=White

+Font =0

+Size =20

+Text=SING_OPTIONS_ADVANCED_DESC

+Align=0

+

+[OptionsAdvancedStatic1]

+X =40

+Y =22

+W =27

+H =27

+Color =White

+Tex =IconOption

+Type=Font Black

+

 [Top5]

 Texts=1

 

@@ -4625,64 +4792,104 @@ Texts=0
 Statics=1

 

 [SongMenuButton1]

-X = 450

-Y = 280

-Z = 1

-W = 160

-H = 50

-Tex = MainBar

-Color = ColorDark

-Int = 1

-DColor = White

-DInt = 0.5

-Type = Font Black

+X = 460

+Y = 170

+W = 180

+H = 30

+Tex =Button

+Color =LightBlue

+DColor = DarkBlue

+Type=Font Black

+Texts=1

+Z = 0.99

+Texts=1

+

+[SongMenuButton1Text1]

+X =30

+Y =0

+Color=White

+Font =0

+Size =10

+Text=SONG_MENU_PLAY

+Align=0

+Z=1

 

 [SongMenuButton2]

-X = 450

-Y = 330

-Z = 1

-W = 160

-H = 50

-Tex = MainBar

-Color = ColorDark

-Int = 1

-DColor = White

-DInt = 0.5

-Type = Font Black

+X = 460

+Y = 210

+W = 180

+H = 30

+Tex =Button

+Color =LightBlue

+DColor = DarkBlue

+Type=Font Black

+Texts=1

+Z = 0.99

+Texts=1

+

+[SongMenuButton2Text1]

+X =30

+Y =0

+Color=White

+Font =0

+Size =10

+Text=SONG_MENU_EDIT

+Align=0

+Z=1

 

 [SongMenuButton3]

-X = 450

-Y = 380

-Z = 1

-W = 160

-H = 50

-Tex = MainBar

-Color = ColorDark

-Int = 1

-DColor = White

-DInt = 0.5

-Type = Font Black

+X = 460

+Y = 250

+W = 180

+H = 30

+Tex =Button

+Color =LightBlue

+DColor = DarkBlue

+Type=Font Black

+Texts=1

+Z = 0.99

+Texts=1

+

+[SongMenuButton3Text1]

+X =30

+Y =0

+Color=White

+Font =0

+Size =10

+Text=SONG_MENU_MODI

+Align=0

+Z=1

 

 [SongMenuButton4]

-X = 450

-Y = 430

-Z = 1

-W = 160

-H = 50

-Tex = MainBar

-Color = ColorDark

-Int = 1

-DColor = White

-DInt = 0.5

-Type = Font Black

+X = 460

+Y = 290

+W = 180

+H = 30

+Tex =Button

+Color =LightBlue

+DColor = DarkBlue

+Type=Font Black

+Texts=1

+Z = 0.99

+Texts=1

+

+[SongMenuButton4Text1]

+X =30

+Y =0

+Color=White

+Font =0

+Size =10

+Text=SONG_MENU_CANCEL

+Align=0

+Z=1

 

 [SongMenuSelectSlide3]

-Tex = MainBar

-TexSBG = MainBar

+Tex = button

+TexSBG = button

 Text =

-X = 450

-Y = 380

-Z = 1

+X = 460

+Y = 250

+Z = 0.99

 W = 0

 H = 50

 SkipX = 0

@@ -4699,28 +4906,35 @@ STColor = White
 STDColor = GrayDark

 

 [SongMenuTextMenu]

-X =450

-Y =240

+X =489

+Y =125

 Color=White

-Font =1

-Size =15

-Text=Menu

+Font =0

+Size =14

+Text=MENU

 Align=0

+Z=1

+

+[SongMenuStatic2]

+X =463

+Y =135

+W =21

+H =21

+Color =White

+Tex =IconSongMenu

+Type=Font Black

+Z=1

 

 [SongMenuStatic1]

-Tex =ScoreBG

+Tex =SongMenuBG

 X =450

-Y =235

+Y =120

 W =200

-H =250

-Z =1

-Int=0.6

-Color =LightBlue

-Type=Transparent

-TexX1=0.02

-TexY1=0.05

-TexX2=0.98

-TexY2=0.98

+H =210

+Z =0.95

+Int=1

+Color =DarkBlue

+Type=Font Black

 

 [SongJumpto]

 Texts=0