Theme/Skin: Score screen for 2player done, added bar for navigation (enter button to continue)

Language: Added "SING_LEGEND_CONTINUE", maybe others will follow

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

4 files changed, 472 insertions, 373 deletions

diff --git a/Languages/German.ini b/Languages/German.ini
index f99047fe..601128b1 100644
--- a/Languages/German.ini
+++ b/Languages/German.ini
@@ -73,6 +73,9 @@ SING_OPTIONS_ADVANCED_ONSONGCLICK=nach Songauswahl
 

 SING_LEGEND_SELECT=AUSWÄHLEN

 SING_LEGEND_NAVIGATE=NAVIGIEREN

+

+SING_LEGEND_CONTINUE=weiter

+

 SING_OPTIONS=Optionen

 

 SING_DIFFICULTY=Schwierigkeitsgrad auswählen

diff --git a/Skins/Deluxe/W&C.ini b/Skins/Deluxe/W&C.ini
index c6aad72b..5d39833c 100644
--- a/Skins/Deluxe/W&C.ini
+++ b/Skins/Deluxe/W&C.ini
@@ -24,7 +24,8 @@ Button=Button.jpg
 LoadingBG      = [bg-load]summer.jpg

 MainBG         = [bg-main]summer.jpg

 SongBG         = [bg-main]summer.jpg

-ScoreScreenBG  = [bg-main]summer.jpg

+ScoreScreenBG  = blue.jpg

+#[bg-main]summer.jpg

 Top5BG         = [bg-main]summer.jpg

 OptionsBG      = [bg-main]summer.jpg

 PartyBG        = [bg-main]summer.jpg

@@ -79,6 +80,8 @@ ButtonM    = button_m.jpg
 ButtonJ    = button_j.jpg

 ButtonAlt  = button_alt.jpg

 ButtonAZ   = button_az.jpg

+ButtonEnter= button_enter.jpg

+

 JumpToBG   = [menu]jumpToBg.jpg

 SongMenuBG = [menu]songMenuBg.jpg

 

diff --git a/Skins/Deluxe/button_enter.jpg b/Skins/Deluxe/button_enter.jpg
new file mode 100644
index 00000000..5de8decd
--- /dev/null
+++ b/Skins/Deluxe/button_enter.jpg
diff --git a/Themes/Deluxe.ini b/Themes/Deluxe.ini
index 023bb18f..e3444b4e 100644
--- a/Themes/Deluxe.ini
+++ b/Themes/Deluxe.ini
@@ -81,7 +81,7 @@ Text=
 [MainStatic1]

 X =0

 Y =549

-W =254

+W =252

 H =28

 Tex=Leiste1

 Color =White

@@ -280,7 +280,7 @@ Type=Font Black
 [SongStatic3]

 X =0

 Y =549

-W =254

+W =252

 H =28

 Tex=Leiste1

 Color =White

@@ -621,6 +621,7 @@ TexX1=0
 TexY1=0

 TexX2=1

 TexY2=1

+

 [Sing]

 Texts =1

 

@@ -883,355 +884,57 @@ Color =White
 Tex =ScoreIcon

 Type=Font Black

 

-[ScoreTextName2]

-X =50

-Y =160

-Font =1

-Size =12

-Text =P1

-Color =P1Dark

-Align=0

-

-[ScoreTextName3]

-X =510

-Y =160

-Font =1

-Size =12

-Text =P2

-Color =P2Dark

-Align=0

-

-

-

-[ScoreTextScore2]

-X =100

-Y =110

-Color=GrayDark

-Font =1

-Size =9

-Text =Tone Deaf

-Align=0

-

-[ScoreTextScore3]

-X =560

-Y =110

-Color=GrayDark

-Font =1

-Size =9

-Text =Tone Deaf

-Align=0

-

-

-

-[ScoreTextNotes2]

-X =85

-Y =220

-Color=GrayDark

-Font =0

-Size =9

-Text=SING_NOTES

-Align=0

-

-[ScoreTextNotes3]

-X =545

-Y =220

-Color=GrayDark

-Font =0

-Size =9

-Text =SING_NOTES

-Align=0

-

-

-

-[ScoreTextNotesScore2]

-X =290

-Y =220

-Color=GrayDark

-Font =1

-Size =10

-Align =2

-Text =0000

-

-[ScoreTextNotesScore3]

-X =750

-Y =220

-Color=GrayDark

-Font =1

-Size =10

-Align =2

-Text =0000

-

-

-

-[ScoreTextLineBonus2]

-X =85

-Y =260

-Color=GrayDark

-Font =0

-Size =9

-Text =SING_PHRASE_BONUS

-Align=0

-

-[ScoreTextLineBonus3]

-X =545

-Y =260

-Color=GrayDark

-Font =0

-Size =9

-Text =SING_PHRASE_BONUS

-Align=0

-

-

-

-[ScoreTextLineBonusScore2]

-X =290

-Y =260

-Color=GrayDark

-Font =1

-Size =10

-Align =2

-Text =0000

-

-[ScoreTextLineBonusScore3]

-X =750

-Y =260

-Color=GrayDark

-Font =1

-Size =10

-Align =2

-Text =0000

-

+[ScoreStatic2]

+X =0

+Y =549

+W =252

+H =28

+Tex=Leiste1

+Color =White

+Type=Plain

+Reflection=1

+ReflectionSpacing=1

 

-[ScoreTextGoldenNotes2]

-X =85

-Y =300

-Color=GrayDark

-Font =0

-Size =9

-Text =SING_GOLDEN_NOTES

-Align=0

+[ScoreStatic3]

+X =254

+Y =549

+W =548

+H =28

+Tex=Leiste2

+Color =White

+Type=Plain

+Reflection=1

+ReflectionSpacing=1

 

-[ScoreTextGoldenNotes3]

-X =545

-Y =300

-Color=GrayDark

+[ScoreText2]

+X =120

+Y =552

+Color=Black

 Font =0

-Size =9

-Text =SING_GOLDEN_NOTES

+Size =7

 Align=0

+Text=song score

 

+[ScoreStatic4]

+X =260

+Y =553

+W =26

+H =22

+Tex=ButtonEnter

+Color =White

+Type=Plain

 

-[ScoreTextGoldenNotesScore2]

+[ScoreText3]

 X =290

-Y =300

-Color=GrayDark

-Font =1

-Size =10

-Align =2

-Text =0000

-

-[ScoreTextGoldenNotesScore3]

-X =750

-Y =300

-Color=GrayDark

-Font =1

-Size =10

-Align =2

-Text =0000

-

-[ScoreTextTotal2]

-X =50

-Y =370

-Color=GrayDark

+Y =552

+Color=Black

 Font =0

-Size =9

-Text =SING_TOTAL

-Align=0

-

-[ScoreTextTotal3]

-X =510

-Y =370

-Color=GrayDark

-Font =1

-Size =9

-Text =SING_TOTAL

+Size =7

 Align=0

+Text=SING_LEGEND_CONTINUE

 

-[ScoreTextTotalSCore2]

-X =290

-Y =360

-Color=GrayDark

-Font =1

-Size =15

-Align =2

-Text =00000

-

-[ScoreTextTotalScore3]

-X =750

-Y =360

-Color=GrayDark

-Font =1

-Size =15

-Align =2

-Text =00000

-

-[ScorePlayer2Static1]

-Tex =ScoreLine

-X =50

-Y =205

-W =240

-H =6

-Type =Font Black

-Color =GrayDark

-TexX1=0

-TexY1=0

-TexX2=1

-TexY2=1

-

-[ScorePlayer2Static2]

-Tex =ScoreLine

-X =50

-Y =345

-W =240

-H =6

-Type =Font Black

-Color =GrayDark

-TexX1=0

-TexY1=0

-TexX2=1

-TexY2=1

-

-[ScorePlayer2Static3]

-Tex =ScoreLine

-X =50

-Y =410

-W =240

-H =6

-Type =Font Black

-Color =GrayDark

-TexX1=0

-TexY1=0

-TexX2=1

-TexY2=1

-

-[ScoreStaticBoxLightest2]

-Tex =ScoreBox

-X =50

-Y =220

-W =30

-H =30

-Color = DarkPurple

-#P1Lightest

-Type=

-TexX1=0

-TexY1=0

-TexX2=1

-TexY2=1

-

-[ScoreStaticBoxLight2]

-Tex =ScoreBox

-X =50

-Y =260

-W =30

-H =30

-Color =DarkGreen

-#P1Light

-Type=

-TexX1=0

-TexY1=0

-TexX2=1

-TexY2=1

-

-[ScoreStaticBoxDark2]

-Tex =ScoreBox

-X =50

-Y =300

-W =30

-H =30

-Color =P1Dark

-Type=

-TexX1=0

-TexY1=0

-TexX2=1

-TexY2=1

-

-[ScorePlayer3Static1]

-Tex =ScoreLine

-X =510

-Y =205

-W =240

-H =6

-Type =Font Black

-Color =GrayDark

-TexX1=0

-TexY1=0

-TexX2=1

-TexY2=1

 

-[ScorePlayer3Static2]

-Tex =ScoreLine

-X =510

-Y =345

-W =240

-H =6

-Type =Font Black

-Color =GrayDark

-TexX1=0

-TexY1=0

-TexX2=1

-TexY2=1

-

-[ScorePlayer3Static3]

-Tex =ScoreLine

-X =510

-Y =410

-W =240

-H =6

-Type =Font Black

-Color =GrayDark

-TexX1=0

-TexY1=0

-TexX2=1

-TexY2=1

-

-[ScoreStaticBoxLightest3]

-Tex =ScoreBox

-X =510

-Y =220

-W =30

-H =30

-Color =P2Lightest

-Type=

-TexX1=0

-TexY1=0

-TexX2=1

-TexY2=1

-

-[ScoreStaticBoxLight3]

-Tex =ScoreBox

-X =510

-Y =260

-W =30

-H =30

-Color =P2Light

-Type=

-TexX1=0

-TexY1=0

-TexX2=1

-TexY2=1

-

-[ScoreStaticBoxDark3]

-Tex =ScoreBox

-X =510

-Y =300

-W =30

-H =30

-Color =P2Dark

-Type=

-TexX1=0

-TexY1=0

-TexX2=1

-TexY2=1

+#end of main stuff

 

 # # # # # # # # # # # # # # # # # # One Player Score # # # # # # # # # # # #

 [ScoreTextName1]

@@ -1468,7 +1171,7 @@ Type =Font Black
 TexX1=0

 TexY1=0

 TexX2=1

-TexY2=0.5

+TexY2=1

 

 [ScorePlayer1Static7]

 Tex =ScoreEndCap

@@ -1479,9 +1182,9 @@ H =30
 Color =P1Dark

 Type =Font Black

 TexX1=0

-TexY1=0.1

+TexY1=0

 TexX2=1

-TexY2=0.9

+TexY2=1

 Reflection=1

 ReflectionSpacing=1

 

@@ -1499,65 +1202,425 @@ TexX2=1
 TexY2=0.9

 Z=1

 

-# # # # # # # # # # # # # # # # # # Two Player Score? # # # # # # # # # # # #

 

+# # # # # # # # # # # # # # # # # # Two Player Score # # # # # # # # # # # #

+# P L A Y E R   O N E

+[ScoreTextName2]

+X =20

+Y =260

+Font =0

+Size =14

+Text =P1

+Color =White

+Align=0

+

+[ScoreTextScore2]

+X =20

+Y =430

+Color=White

+Font =1

+Size =9

+Text =Tone Deaf

+Align=0

+

+[ScoreTextNotes2]

+X =20

+Y =340

+Color=White

+Font =0

+Size =9

+Text=SING_NOTES

+Align=0

+

+[ScoreTextNotesScore2]

+X =300

+Y =340

+Color=White

+Font =0

+Size =10

+Align =2

+Text =0000

+

+[ScoreTextLineBonus2]

+X =20

+Y =370

+Color=White

+Font =0

+Size =9

+Text =SING_PHRASE_BONUS

+Align=0

+

+[ScoreTextLineBonusScore2]

+X =300

+Y =370

+Color=White

+Font =0

+Size =10

+Align =2

+Text =0000

+

+[ScoreTextGoldenNotes2]

+X =20

+Y =400

+Color=White

+Font =0

+Size =9

+Text =SING_GOLDEN_NOTES

+Align=0

+

+[ScoreTextGoldenNotesScore2]

+X =300

+Y =400

+Color=White

+Font =0

+Size =10

+Align =2

+Text =0000

+

+[ScoreTextTotal2]

+X =50

+Y =460

+Color=White

+Font =0

+Size =14

+Text =SING_TOTAL

+Align=0

+

+[ScoreTextTotalSCore2]

+X =300

+Y =460

+Color=White

+Font =0

+Size =14

+Align =2

+Text =00000

+

+# Lines

+[ScorePlayer2Static1]

+Tex =ScoreLine

+X =20

+Y =338

+W =280

+H =2

+Type =Font Black

+Color =White

+

+[ScorePlayer2Static2]

+Tex =ScoreLine

+X =20

+Y =368

+W =280

+H =2

+Type =Font Black

+Color =White

+

+[ScorePlayer2Static3]

+Tex =ScoreLine

+X =20

+Y =398

+W =280

+H =2

+Type =Font Black

+Color =White

+

+[ScorePlayer2Static4]

+Tex =ScoreLine

+X =20

+Y =428

+W =280

+H =2

+Type =Font Black

+Color =White

+

+[ScorePlayer2Static5]

+Tex =ScoreLine

+X =20

+Y =458

+W =280

+H =4

+Type =Font Black

+Color =White

+

+[ScorePlayer2Static6]

+Tex =PlayerNumberBox

+X =20

+Y =467

+W =25

+H =25

+Type =Font Black

+Color =P1Dark

+Z=0.9

+Reflection=1

+ReflectionSpacing=4

+

+[ScorePlayer2Text1]

+X =24

+Y =472

+W =30

+H =30

+Z=1

+Color=White

+Font =1

+Size =5

+Align=0

+Text=P1

+

+#ScoreBar

 [ScoreStaticBackLevel2]

 Tex =ScoreLevel

-X =290

-Y =140

+X =293

+Y =160

 W =120

 H =300

 Color =P1Lightest

 Type =Font Black

 TexX1=0

-TexY1=0.1

+TexY1=0

 TexX2=1

-TexY2=0.9

+TexY2=1

 

 [ScoreStaticBackLevelRound2]

 Tex =ScoreLevelRound

-X =290

-Y =110

+X =293

+Y =130

 W =120

 H =30

 Color =P1Lightest

 Type =Font Black

-TexX1=0

+TexX1=1

 TexY1=0

-TexX2=1

+TexX2=0

 TexY2=0.5

 

 [ScoreStaticLevel2]

 Tex =ScoreLevel

-X =290

+X =293

 Y =410

 W =120

 H =30

-Color =P1Light

+Color =P1Dark

 Type =Font Black

 TexX1=0

-TexY1=0.1

+TexY1=0

 TexX2=1

-TexY2=0.9

+TexY2=1

 

 [ScoreStaticLevelRound2]

 Tex =ScoreLevelRound

-X =290

+X =293

 Y =380

 W =120

 H =30

-Color =P1Light

+Color =P1Dark

 Type =Font Black

-TexX1=0

+TexX1=1

 TexY1=0

-TexX2=1

+TexX2=0

 TexY2=0.5

 

-# # # # # # # # # # # # # # # # # # Three Player Score? # # # # # # # # # # # #

+[ScorePlayer2Static7]

+Tex =ScoreEndCap

+X =308

+Y =460

+W =90

+H =30

+Color =P1Dark

+Type =Font Black

+TexX1=1

+TexY1=0

+TexX2=0

+TexY2=1

+Reflection=1

+ReflectionSpacing=4

+

+[ScorePlayer2Static8]

+Tex =ScoreLine

+X =307

+Y =460

+W =92

+H =2

+Color =White

+Type =Font Black

+TexX1=0

+TexY1=0.1

+TexX2=1

+TexY2=0.9

+Z=1

+

+# P L A Y E R   T W O

+[ScoreTextName3]

+X =780

+Y =260

+Font =0

+Size =14

+Text =P2

+Color =White

+Align=2

+

+[ScoreTextScore3]

+X =780

+Y =430

+Color=White

+Font =1

+Size =9

+Text =Tone Deaf

+Align=2

+

+[ScoreTextNotes3]

+X =780

+Y =340

+Color=White

+Font =0

+Size =9

+Text =SING_NOTES

+Align=2

+

+[ScoreTextNotesScore3]

+X =500

+Y =340

+Color=White

+Font =0

+Size =10

+Align =0

+Text =0000

+

+[ScoreTextLineBonus3]

+X =780

+Y =370

+Color=White

+Font =0

+Size =9

+Text =SING_PHRASE_BONUS

+Align=2

+

+[ScoreTextLineBonusScore3]

+X =500

+Y =370

+Color=White

+Font =0

+Size =10

+Align =0

+Text =0000

+

+[ScoreTextGoldenNotes3]

+X =780

+Y =400

+Color=White

+Font =0

+Size =9

+Text =SING_GOLDEN_NOTES

+Align=2

+

+[ScoreTextGoldenNotesScore3]

+X =500

+Y =400

+Color=White

+Font =0

+Size =10

+Align =0

+Text =0000

+

+[ScoreTextTotal3]

+X =750

+Y =460

+Color=White

+Font =0

+Size =14

+Text =SING_TOTAL

+Align=2

+Reflection=1

+ReflectionSpacing=4

+

+[ScoreTextTotalScore3]

+X =500

+Y =460

+Color=White

+Font =0

+Size =14

+Align =0

+Text =00000

+Reflection=1

+ReflectionSpacing=4

+

+#Lines

+[ScorePlayer3Static1]

+Tex =ScoreLine

+X =500

+Y =338

+W =280

+H =2

+Type =Font Black

+Color =White

+

+[ScorePlayer3Static2]

+Tex =ScoreLine

+X =500

+Y =368

+W =280

+H =2

+Type =Font Black

+Color =White

+

+[ScorePlayer3Static3]

+Tex =ScoreLine

+X =500

+Y =398

+W =280

+H =2

+Type =Font Black

+Color =White

+

+[ScorePlayer3Static4]

+Tex =ScoreLine

+X =500

+Y =428

+W =280

+H =2

+Type =Font Black

+Color =White

+

+[ScorePlayer3Static5]

+Tex =ScoreLine

+X =500

+Y =458

+W =280

+H =4

+Type =Font Black

+Color =White

+

+[ScorePlayer3Static6]

+Tex =PlayerNumberBox

+X =755

+Y =467

+W =25

+H =25

+Type =Font Black

+Color =P2Dark

+Z=0.9

+TexX1=1

+TexY1=0

+TexX2=0

+TexY2=1

+Reflection=1

+ReflectionSpacing=4

+

+[ScorePlayer3Text1]

+X =759

+Y =472

+W =30

+H =30

+Z=1

+Color=White

+Font =1

+Size =5

+Align=0

+Text=P2

+

+#ScoreBars

 [ScoreStaticBackLevel3]

 Tex =ScoreLevel

-X =390

-Y =140

+X =387

+Y =160

 W =120

 H =300

 Color =P2Lightest

@@ -1569,8 +1632,8 @@ TexY2=0.9
 

 [ScoreStaticBackLevelRound3]

 Tex =ScoreLevelRound

-X =390

-Y =110

+X =387

+Y =130

 W =120

 H =30

 Color =P2Lightest

@@ -1582,11 +1645,11 @@ TexY2=0.5
 

 [ScoreStaticLevel3]

 Tex =ScoreLevel

-X =390

+X =387

 Y =410

 W =120

 H =30

-Color =P2Light

+Color =P2Dark

 Type =Font Black

 TexX1=0

 TexY1=0.1

@@ -1595,17 +1658,47 @@ TexY2=0.9
 

 [ScoreStaticLevelRound3]

 Tex =ScoreLevelRound

-X =390

+X =387

 Y =380

 W =120

 H =30

-Color =P2Light

+Color =P2Dark

 Type =Font Black

 TexX1=0

 TexY1=0

 TexX2=1

 TexY2=0.5

 

+[ScorePlayer3Static7]

+Tex =ScoreEndCap

+X =402

+Y =460

+W =90

+H =30

+Color =P2Dark

+Type =Font Black

+TexX1=0

+TexY1=0

+TexX2=1

+TexY2=1

+Reflection=1

+ReflectionSpacing=4

+

+[ScorePlayer3Static8]

+Tex =ScoreLine

+X =401

+Y =460

+W =92

+H =2

+Color =White

+Type =Font Black

+TexX1=0

+TexY1=0.1

+TexX2=1

+TexY2=0.9

+Z=1

+

+# # # # # # # # # # # # # # # # # # Three Player Score? # # # # # # # # # # # #

 [ScorePlayer4Static1]

 X=20

 Y=205

@@ -2254,7 +2347,7 @@ Type=Font Black
 [OptionsStatic2]

 X =0

 Y =549

-W =254

+W =252

 H =28

 Tex=Leiste1

 Color =White

@@ -3640,7 +3733,7 @@ Text=SING_DIFFICULTY
 [LevelStatic1]

 X =0

 Y =549

-W =254

+W =252

 H =28

 Tex=Leiste1

 Color =White

@@ -3758,7 +3851,7 @@ Tex=MainBG
 [NameStatic1]

 X =0

 Y =549

-W =254

+W =252

 H =28

 Tex=Leiste1

 Color =White