Some Themework done. Added Buttonfade to [Options] and [Level]. Navigation-Bar done.

To do: 2 Screens in Party-Mode, Statistic, SingScreen

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

3 files changed, 257 insertions, 85 deletions

diff --git a/Languages/English.ini b/Languages/English.ini
index 9d311b41..74862e3a 100644
--- a/Languages/English.ini
+++ b/Languages/English.ini
@@ -95,29 +95,38 @@ SING_LEGEND_NAVIGATE=navigate
 SING_LEGEND_CONTINUE=continue

 SING_LEGEND_ESC=back

 

-SING_DIFFICULTY=select difficulty

+SING_PLAYER_DESC=enter player name/s

+SING_PLAYER_WHEREAMI=Playernames

+SING_PLAYER_ENTER_NAME=enter name

+

+SING_DIFFICULTY_DESC=select difficulty

+SING_DIFFICULTY_WHEREAMI=Difficulty

+SING_DIFFICULTY_CONTINUE=to song selection

 SING_EASY=Easy

 SING_MEDIUM=Medium

 SING_HARD=Hard

 

-SING_ENTER_PLAYER_NAME=enter player name

-

+SING_SONG_SELECTION_DESC=choose your song

 SING_SONG_SELECTION_WHEREAMI=Song Selection

+SING_SONG_SELECTION_GOTO=go to ..

 SING_SONG_SELECTION=song selection

+SING_SONG_SELECTION_MENU=menu

+SING_SONG_SELECTION_PLAYLIST=playlist

 SING_SONGS_IN_CAT=Songs

-SING_CHOOSE_SONG=choose your song

+

 

 SING_TIME=TIME

 SING_TOTAL=total

-SING_SING_MODE=sing solo

+SING_MODE=sing solo

 SING_NOTES=notes

 SING_GOLDEN_NOTES=golden notes

 SING_PHRASE_BONUS=line bonus

 

-SING_TOP_5_CHARTS=top 5 charts

-

 SING_MENU=Main Menu

 

+SONG_SCORE=song score

+SONG_SCORE_WHEREAMI=Score

+

 SING_SCORE_TONE_DEAF=Tone Deaf

 SING_SCORE_AMATEUR=Amateur

 SING_SCORE_RISING_STAR=Rising Star

@@ -126,6 +135,10 @@ SING_SCORE_HIT_ARTIST=Hit Artist
 SING_SCORE_SUPERSTAR=Superstar

 SING_SCORE_ULTRASTAR=Ultrastar

 

+SING_TOP_5_CHARTS=top 5 Players

+SING_TOP_5_CHARTS_WHEREAMI=top 5

+SING_TOP_5_CHARTS_CONTINUE=to song selection

+

 LINEBONUS_PERFECT=Perfect!

 LINEBONUS_BETTER=Cool!

 LINEBONUS_GOOD=Good!

@@ -163,12 +176,12 @@ SONG_MENU_NO=No
 SONG_MENU_NAME_PLAYLIST_LOAD=Open Playlist

 SONG_MENU_PLAYLIST_LOAD=open

 

-SONG_MENU_NAME_PARTY=Menu

+SONG_MENU_NAME_PARTY=Party Menu

 SONG_MENU_JOKER=Joker

 

 SONG_MENU_NAME_PARTY_JOKER=take joker

 

-SONG_JUMPTO_DESC=Jump to Song

+SONG_JUMPTO_DESC=search song

 SONG_JUMPTO_TYPE_DESC=Search for:

 SONG_JUMPTO_TYPE1=All

 SONG_JUMPTO_TYPE2=Title

diff --git a/Languages/German.ini b/Languages/German.ini
index 1990180a..758e2d86 100644
--- a/Languages/German.ini
+++ b/Languages/German.ini
@@ -88,36 +88,44 @@ SING_OPTIONS_ADVANCED_LOADANIMATION=Lade Animation
 SING_OPTIONS_ADVANCED_ASKBEFOREDEL=Sicherheitsabfragen

 SING_OPTIONS_ADVANCED_LINEBONUS=Phrasen Bonus

 SING_OPTIONS_ADVANCED_COUNT_HOW_OFTEN_SUNG=Wie oft gesungen mitzählen

-SING_OPTIONS_ADVANCED_ONSONGCLICK=nach Songauswahl

+SING_OPTIONS_ADVANCED_ONSONGCLICK=nach Song-Auswahl

 

 SING_LEGEND_SELECT=Auswählen

 SING_LEGEND_NAVIGATE=Navigieren

-SING_LEGEND_CONTINUE=weiter

+SING_LEGEND_CONTINUE=Weiter

 SING_LEGEND_ESC=Zurück

 

-SING_DIFFICULTY=Schwierigkeitsgrad auswählen

+SING_PLAYER_DESC=Spielernamen eingeben.

+SING_PLAYER_WHEREAMI=Spielernamen

+SING_PLAYER_ENTER_NAME=Namen eingeben

+

+SING_DIFFICULTY_DESC=Schwierigkeitsgrad auswählen

+SING_DIFFICULTY_WHEREAMI=Schwierigkeitsgrad

+SING_DIFFICULTY_CONTINUE=zur Song-Auswahl

 SING_EASY=Einfach

 SING_MEDIUM=Mittel

 SING_HARD=Schwierig

 

-SING_ENTER_PLAYER_NAME=Spielernamen eingeben

-

+SING_SONG_SELECTION_DESC=Wähle deinen Song

 SING_SONG_SELECTION_WHEREAMI=Song-Auswahl 

+SING_SONG_SELECTION_GOTO=Gehe zu ..

 SING_SONG_SELECTION=Song-Auswahl

+SING_SONG_SELECTION_MENU=Menü

+SING_SONG_SELECTION_PLAYLIST=Playliste

 SING_SONGS_IN_CAT=Songs

-SING_CHOOSE_SONG=Wähle deinen Song

 

 SING_TIME=ZEIT

 SING_TOTAL=Gesamt

-SING_SING_MODE=Singmodus

+SING_MODE=Singmodus

 SING_NOTES=Noten

 SING_GOLDEN_NOTES=Goldener Ton

 SING_PHRASE_BONUS=Phrasenbonus

 

-SING_TOP_5_CHARTS=Top-5-Charts

-

 SING_MENU=Hauptmenü

 

+SONG_SCORE=Song Punkte

+SONG_SCORE_WHEREAMI=Punkte

+

 SING_SCORE_TONE_DEAF=Anti Talent

 SING_SCORE_AMATEUR=Amateur

 SING_SCORE_RISING_STAR=Möchtegern

@@ -126,6 +134,10 @@ SING_SCORE_HIT_ARTIST=Hit Künstler
 SING_SCORE_SUPERSTAR=Superstar

 SING_SCORE_ULTRASTAR=UltraStar

 

+SING_TOP_5_CHARTS=Top-5-Spieler

+SING_TOP_5_CHARTS_WHEREAMI=Top-5

+SING_TOP_5_CHARTS_CONTINUE=zur Song-Auswahl

+

 LINEBONUS_PERFECT=Perfekt!

 LINEBONUS_BETTER=Cool!

 LINEBONUS_GOOD=Gut!

@@ -163,12 +175,12 @@ SONG_MENU_NO=Nein
 SONG_MENU_NAME_PLAYLIST_LOAD=Playlist öffnen

 SONG_MENU_PLAYLIST_LOAD=Öffnen

 

-SONG_MENU_NAME_PARTY=Menü

+SONG_MENU_NAME_PARTY=Party-Menü

 SONG_MENU_JOKER=Joker

 

 SONG_MENU_NAME_PARTY_JOKER=Joker spielen

 

-SONG_JUMPTO_DESC=Jump to Song

+SONG_JUMPTO_DESC=Song suchen

 SONG_JUMPTO_TYPE_DESC=Suchen in:

 SONG_JUMPTO_TYPE1=Allem

 SONG_JUMPTO_TYPE2=Titel

diff --git a/Themes/Deluxe.ini b/Themes/Deluxe.ini
index 3380ea33..1320f2a2 100644
--- a/Themes/Deluxe.ini
+++ b/Themes/Deluxe.ini
@@ -440,7 +440,7 @@ Color=Black
 Font =0

 Size =7

 Align=0

-Text=Jump to ..

+Text=SING_SONG_SELECTION_GOTO

 

 [SongStatic6]

 X =425

@@ -458,7 +458,7 @@ Color=Black
 Font =0

 Size =7

 Align=0

-Text=SONG_MENU_NAME_MAIN

+Text=SING_SONG_SELECTION_MENU

 

 [SongStatic7]

 X =515

@@ -494,7 +494,7 @@ Color=Black
 Font =0

 Size =7

 Align=0

-Text=Playlist

+Text=SING_SONG_SELECTION_PLAYLIST

 

 [SongStatic5]

 X =200

@@ -1061,7 +1061,7 @@ Y =6
 Color=White

 Font =0

 Size =20

-Text=song score

+Text=SONG_SCORE

 Align=0

 

 [ScoreTextArtistTitle]

@@ -1111,7 +1111,7 @@ Color=Black
 Font =0

 Size =7

 Align=2

-Text=song score

+Text=SONG_SCORE_WHEREAMI

 

 [ScoreStatic4]

 X =260

@@ -2481,7 +2481,7 @@ Text=SING_LEGEND_ESC
 

 [OptionsButtonGame]

 X =100

-Y =270

+Y =215

 W =150

 H =50

 Tex =Button

@@ -2489,6 +2489,11 @@ Color =DarkBlue
 DColor = LightBlue

 Type=Font Black

 Texts=1

+Fade=1

+FadeText=1

+SelectH=100

+FadeTex=ButtonFade

+FadeTexPos=0

 

 [OptionsButtonGameText1]

 X =75

@@ -2501,7 +2506,7 @@ Color=White
 

 [OptionsButtonGraphics]

 X =255

-Y =270

+Y =215

 W =150

 H =50

 Tex =Button

@@ -2509,6 +2514,11 @@ Color =DarkBlue
 DColor = LightBlue

 Type=Font Black

 Texts=1

+Fade=1

+FadeText=1

+SelectH=100

+FadeTex=ButtonFade

+FadeTexPos=0

 

 [OptionsButtonGraphicsText1]

 X =75

@@ -2521,7 +2531,7 @@ Color=White
 

 [OptionsButtonSound]

 X =410

-Y =270

+Y =215

 W =150

 H =50

 Tex =Button

@@ -2529,6 +2539,11 @@ Color =DarkBlue
 DColor = LightBlue

 Type=Font Black

 Texts=1

+Fade=1

+FadeText=1

+SelectH=100

+FadeTex=ButtonFade

+FadeTexPos=0

 

 [OptionsButtonSoundText1]

 X =75

@@ -2541,7 +2556,7 @@ Color=White
 

 [OptionsButtonLyrics]

 X =565

-Y =270

+Y =215

 W =150

 H =50

 Tex =Button

@@ -2550,6 +2565,11 @@ DColor = LightBlue
 Type=Font Black

 Align=0

 Texts=1

+Fade=1

+FadeText=1

+SelectH=100

+FadeTex=ButtonFade

+FadeTexPos=0

 

 [OptionsButtonLyricsText1]

 X =75

@@ -2562,7 +2582,7 @@ Color=White
 

 [OptionsButtonThemes]

 X =100

-Y =340

+Y =335

 W =150

 H =50

 Tex =Button

@@ -2571,6 +2591,11 @@ DColor = LightBlue
 Type=Font Black

 Align=0

 Texts=1

+Fade=1

+FadeText=1

+SelectH=100

+FadeTex=ButtonFade

+FadeTexPos=0

 

 [OptionsButtonThemesText1]

 X =75

@@ -2583,7 +2608,7 @@ Color=White
 

 [OptionsButtonRecord]

 X =255

-Y =340

+Y =335

 W =150

 H =50

 Tex =Button

@@ -2592,6 +2617,11 @@ DColor = LightBlue
 Type=Font Black

 Align=0

 Texts=1

+Fade=1

+FadeText=1

+SelectH=100

+FadeTex=ButtonFade

+FadeTexPos=0

 

 [OptionsButtonRecordText1]

 X =75

@@ -2605,7 +2635,7 @@ Texts=1
 

 [OptionsButtonAdvanced]

 X =410

-Y =340

+Y =335

 W =150

 H =50

 Tex =Button

@@ -2614,6 +2644,11 @@ DColor = LightBlue
 Type=Font Black

 Align=0

 Texts=1

+Fade=1

+FadeText=1

+SelectH=100

+FadeTex=ButtonFade

+FadeTexPos=0

 

 [OptionsButtonAdvancedText1]

 X =75

@@ -2627,7 +2662,7 @@ Texts=1
 

 [OptionsButtonExit]

 X =565

-Y =340

+Y =335

 W =150

 H =50

 Tex =Button

@@ -2636,6 +2671,11 @@ DColor = LightBlue
 Type=Font Black

 Align=0

 Texts=1

+Fade=1

+FadeText=1

+SelectH=100

+FadeTex=ButtonFade

+FadeTexPos=0

 

 [OptionsButtonExitText1]

 X =75

@@ -4168,7 +4208,7 @@ Color=Black
 Font =0

 Size =7

 Align=2

-Text=SING_TOP_5_CHARTS

+Text=SING_TOP_5_CHARTS_WHEREAMI

 

 [Top5Static4]

 X =260

@@ -4186,7 +4226,7 @@ Color=Black
 Font =0

 Size =7

 Align=0

-Text=SING_LEGEND_CONTINUE

+Text=SING_TOP_5_CHARTS_CONTINUE

 

 [Top5TextName1]

 X =150

@@ -4369,29 +4409,11 @@ Color=P1Dark
 Type=Font Black

 

 [Level]

-Texts=4

+Texts=5

 

 [LevelBackground]

 Tex=MainBG

 

-[LevelText1]

-X =70

-Y =6

-Color=White

-Font =0

-Size =20

-Text=SING_SING_MODE

-Color=White

-

-[LevelText2]

-X =70

-Y =53

-Color=White

-Font =0

-Size =10

-Align =0

-Text=SING_DIFFICULTY

-

 [LevelStatic1]

 X =0

 Y =549

@@ -4423,6 +4445,46 @@ Color =White
 Tex =MainIcon

 Type=Font Black

 

+[LevelStatic4]

+X =260

+Y =553

+W =30

+H =22

+Tex=ButtonNavi

+Color =White

+Type=Plain

+Style=5

+

+[LevelStatic5]

+X =388

+Y =553

+W =26

+H =22

+Tex=ButtonEnter

+Color =White

+Type=Plain

+Style=5

+

+[LevelText1]

+X =70

+Y =6

+ColR = 0.7

+ColG = 0.7

+ColB = 0.7

+Font = 0

+Size = 20

+Color =White

+Text=SING_MODE

+

+[LevelText2]

+X =70

+Y =53

+Color=White

+Font =0

+Size =10

+Align =0

+Text=SING_DIFFICULTY_DESC

+

 [LevelText3]

 X =238

 Y =552

@@ -4430,16 +4492,25 @@ Color=Black
 Font =0

 Size =7

 Align=2

-Text=SING_SING_MODE

+Text=SING_DIFFICULTY_WHEREAMI

 

 [LevelText4]

-X =300

+X =294

+Y =552

+Color=Black

+Font =0

+Size =7

+Align=0

+Text=SING_LEGEND_NAVIGATE

+

+[LevelText5]

+X =418

 Y =552

 Color=Black

 Font =0

 Size =7

 Align=0

-Text=SING_DIFFICULTY

+Text=SING_DIFFICULTY_CONTINUE

 

 [LevelButtonEasy]

 X =180

@@ -4451,7 +4522,11 @@ Color =DarkBlue
 DColor = LightBlue

 Type=Font Black

 Texts=1

-Reflection=1

+Fade=1

+FadeText=1

+SelectH=100

+FadeTex=ButtonFade

+FadeTexPos=0

 

 [LevelButtonMedium]

 X =335

@@ -4463,7 +4538,11 @@ Color =DarkBlue
 DColor = LightBlue

 Type=Font Black

 Texts=1

-Reflection=1

+Fade=1

+FadeText=1

+SelectH=100

+FadeTex=ButtonFade

+FadeTexPos=0

 

 [LevelButtonHard]

 X =490

@@ -4475,7 +4554,11 @@ Color =DarkBlue
 DColor = LightBlue

 Type=Font Black

 Texts=1

-Reflection=1

+Fade=1

+FadeText=1

+SelectH=100

+FadeTex=ButtonFade

+FadeTexPos=0

 

 [LevelButtonEasyText1]

 X =75

@@ -4532,41 +4615,100 @@ Type=Plain
 Reflection=1

 ReflectionSpacing=1

 

+[NameStatic3]

+X =40

+Y =22

+W =27

+H =27

+Color =White

+Tex =MainIcon

+Type=Font Black

+

+[NameText1]

+X =70

+Y =6

+ColR = 0.7

+ColG = 0.7

+ColB = 0.7

+Font = 0

+Size = 20

+Color =White

+Text=SING_MODE

+

 [NameText2]

+X =70

+Y =53

+Color=White

+Font =0

+Size =10

+Align =0

+Text=SING_PLAYER_DESC

+

+[NameText3]

 X =238

 Y =552

 Color=Black

 Font =0

 Size =7

 Align=2

-Text=SING_OPTIONS_GAME_PLAYERS

+Text=SING_PLAYER_WHEREAMI

 

-[NameText3]

-X =300

+[NameStatic4]

+X =260

+Y =553

+W =30

+H =22

+Tex=ButtonNavi

+Color =White

+Type=Plain

+Style=5

+

+[NameText4]

+X =294

 Y =552

 Color=Black

 Font =0

 Size =7

 Align=0

-Text=SING_ENTER_PLAYER_NAME

+Text=SING_LEGEND_NAVIGATE

 

-[NameStatic3]

-X =40

-Y =22

-W =27

-H =27

+[NameStatic5]

+X =388

+Y =553

+W =26

+H =22

+Tex=ButtonAZ

 Color =White

-Tex =MainIcon

-Type=Font Black

+Type=Plain

+Style=5

 

-[NameText1]

-X =70

-Y =6

-Color=White

+[NameText5]

+X =418

+Y =552

+Color=Black

 Font =0

-Size =20

-Text=SING_ENTER_PLAYER_NAME

-Color=White

+Size =7

+Align=0

+Text=SING_PLAYER_ENTER_NAME

+

+[NameStatic6]

+X =556

+Y =553

+W =26

+H =22

+Tex=ButtonEnter

+Color =White

+Type=Plain

+Style=5

+

+[NameText6]

+X =586

+Y =552

+Color=Black

+Font =0

+Size =7

+Align=0

+Text=SING_LEGEND_CONTINUE

 

 [NameButtonPlayer1]

 X =180

@@ -4579,6 +4721,7 @@ DColor = P1Light
 Type=Font Black

 Texts=1

 Reflection=1

+ReflectionSpacing=2

 

 [NameButtonPlayer1Text1]

 X =75

@@ -4600,7 +4743,7 @@ DColor = P2Light
 Type=Font Black

 Texts=1

 Reflection=1

-

+ReflectionSpacing=2

 

 [NameButtonPlayer2Text1]

 X =75

@@ -4622,6 +4765,7 @@ DColor = P3Light
 Type=Font Black

 Texts=1

 Reflection=1

+ReflectionSpacing=2

 

 [NameButtonPlayer3Text1]

 X =75

@@ -4638,11 +4782,12 @@ Y =400
 W =150

 H =50

 Tex =Button

-Color =DarkPurple

-DColor = LightPurple

+Color =P4Dark

+DColor = P4Light

 Type=Font Black

 Texts=1

 Reflection=1

+ReflectionSpacing=2

 

 [NameButtonPlayer4Text1]

 X =75

@@ -4659,11 +4804,12 @@ Y =400
 W =150

 H =50

 Tex =Button

-Color =DarkOrange

-DColor = LightOrange

+Color =P5Dark

+DColor = P5Light

 Type=Font Black

 Texts=1

 Reflection=1

+ReflectionSpacing=2

 

 [NameButtonPlayer5Text1]

 X =75

@@ -4680,11 +4826,12 @@ Y =400
 W =150

 H =50

 Tex =Button

-Color =DarkYellow

-DColor = LightYellow

+Color =P6Dark

+DColor = P6Light

 Type=Font Black

 Texts=1

 Reflection=1

+ReflectionSpacing=2

 

 [NameButtonPlayer6Text1]

 X =75