Skinned both Statistic Screens.

Position of Text showing cur. Page not perfect yet.
Fixed some Language entrys

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

8 files changed, 298 insertions, 89 deletions

diff --git a/Languages/English.ini b/Languages/English.ini
index e23b29b6..311d17a4 100644
--- a/Languages/English.ini
+++ b/Languages/English.ini
@@ -113,7 +113,7 @@ SING_SONG_SELECTION=song selection
 SING_SONG_SELECTION_MENU=menu

 SING_SONG_SELECTION_PLAYLIST=playlist

 SING_SONGS_IN_CAT=Songs

-

+PLAYLIST_CATTEXT=Playlist: %s

 

 SING_TIME=TIME

 SING_TOTAL=total

@@ -246,19 +246,24 @@ PLUGIN_DUELL_DESC=Sing a duell until 10000 points.
 PLUGIN_BLIND_NAME=Blind Mode

 PLUGIN_BLIND_DESC=Duell without seeing the notes.

 

-STAT_MAIN_DESC=Statistics

+STAT_MAIN=Statistics

+STAT_MAIN_DESC=General

+STAT_MAIN_WHEREAMI=Statistics

 

 STAT_OVERVIEW_INTRO=%0:s Statistics.  \n Last Reset at %2:.2d.%1:.2d.%3:d

 STAT_OVERVIEW_SONG=%0:d Songs(%3:d with Video), whereof %1:d already were played  and %2:d were not played yet.\n The most popular Song is %5:s from %4:s.

-STAT_OVERVIEW_PLAYER=Since the last Reset ther were/was %0:d different Player(s).\n The Best Player is %1:s with an average Score of %2:d Points.\n %3:s did the highest Score with %4:d Points.

+STAT_OVERVIEW_PLAYER=Since the last Reset there were/was %0:d different Player(s).\n The Best Player is %1:s with an average Score of %2:d Points.\n %3:s did the highest Score with %4:d Points.

+

+STAT_DETAIL=Statistics

+STAT_DETAIL_WHEREAMI=Detail Statistics

 

 STAT_NEXT=Next Page

 STAT_PREV=Previous Page

-STAT_REVERSE=Change Order

+STAT_REVERSE=Reverse Order

 STAT_PAGE=Seite %0:d of %1:d Pages\n (%2:d of %3:d Entrys)

 

 STAT_DESC_SCORES=HighScores

-STAT_DESC_SCORES_REVERSED=LowestScores

+STAT_DESC_SCORES_REVERSED=LowScores

 STAT_FORMAT_SCORES=%0:s - %1:d  [%2:s] \n (%3:s - %4:s)

 

 STAT_DESC_SINGERS=Best Singers

diff --git a/Languages/German.ini b/Languages/German.ini
index 324a8c9e..75b4afed 100644
--- a/Languages/German.ini
+++ b/Languages/German.ini
@@ -113,6 +113,7 @@ SING_SONG_SELECTION=Song-Auswahl
 SING_SONG_SELECTION_MENU=Menü

 SING_SONG_SELECTION_PLAYLIST=Playlist

 SING_SONGS_IN_CAT=Songs

+PLAYLIST_CATTEXT=Playlist: %s

 

 SING_TIME=ZEIT

 SING_TOTAL=Gesamt

@@ -245,19 +246,24 @@ PLUGIN_DUELL_DESC=Normales Spiel. Höchste Punkzahl gewinnt.
 PLUGIN_BLIND_NAME=Blind Mode

 PLUGIN_BLIND_DESC=Erreiche Blind die höchste Punktzahl.

 

-STAT_MAIN_DESC=Statistiken

+STAT_MAIN=Statistiken

+STAT_MAIN_DESC=Allgemein

+STAT_MAIN_WHEREAMI=Statistiken

 

 STAT_OVERVIEW_INTRO=%0:s Statistiken. \n Letzter Reset am %1:.2d.%2:.2d.%3:d

 STAT_OVERVIEW_SONG=%0:d Songs(%3:d mit Video), davon wurden %1:d schon einmal gesungen und %2:d noch nicht. \n Der am häufigsten gesungene Song ist %5:s von %4:s.

 STAT_OVERVIEW_PLAYER=Seit dem letzten Reset haben %0:d verschiedene Spieler gesungen. \n Der Beste Spieler ist %1:s mit einer Score von %2:d Punkten. \n Die höchste Punktzahl, %4:d, wurde von %3:s erreicht.

 

+STAT_DETAIL=Statistiken

+STAT_DETAIL_WHEREAMI=Detailierte Statistiken

+

 STAT_NEXT=Nächste Seite

 STAT_PREV=Vorherige Seite

-STAT_REVERSE=Reihenfolge umkehren

+STAT_REVERSE=Umkehren

 STAT_PAGE=Seite %0:d von %1:d \n (%2:d von %3:d Einträgen)

 

 STAT_DESC_SCORES=HighScores

-STAT_DESC_SCORES_REVERSED=LowestScores

+STAT_DESC_SCORES_REVERSED=LowScores

 STAT_FORMAT_SCORES=%0:s - %1:d  [%2:s] \n (%3:s - %4:s)

 

 STAT_DESC_SINGERS=Beste Sänger

diff --git a/Languages/readme.txt b/Languages/readme.txt
index 247539bc..29148a94 100644
--- a/Languages/readme.txt
+++ b/Languages/readme.txt
@@ -44,6 +44,9 @@ LINEBONUS_WORST=Ghastly!
 IMPLODE_GLUE1=, 

 IMPLODE_GLUE2= and 

 

+#Song Screen Legend

+PLAYLIST_CATTEXT=Playlist: %s

+

 #Text for the Legend Bar at the bottom

 SING_LEGEND_CONTINUE=Continue

 

@@ -121,20 +124,25 @@ PLUGIN_BLIND_DESC=Duell without seeing the Notes
 

 #Statistics Screen

 #For more Info about the Format Strings look at the SorceCode (UScreenStatMain)

-STAT_MAIN_DESC=Statistics

+STAT_MAIN=Statistics

+STAT_MAIN_DESC=General

+STAT_MAIN_WHEREAMI=Statistics

 

 STAT_OVERVIEW_INTRO=%0:s Statistics.  \n Last Reset at %2:.2d.%1:.2d.%3:d

 STAT_OVERVIEW_SONG=%0:d Songs(%3:d with Video), whereof %1:d already were played  and %2:d were not played yet.\n The most popular Song is %5:s from %4:s.

-STAT_OVERVIEW_PLAYER=Since the last Reset ther were/was %0:d different Player(s).\n The Best Player is %1:s with an average Score of %2:d Points.\n %3:s did the highest Score with %4:d Points.

+STAT_OVERVIEW_PLAYER=Since the last Reset there were/was %0:d different Player(s).\n The Best Player is %1:s with an average Score of %2:d Points.\n %3:s did the highest Score with %4:d Points.

 

 #Stat Detail Screen

+STAT_DETAIL=Statistics

+STAT_DETAIL_WHEREAMI=Detail Statistics

+

 STAT_NEXT=Next Page

 STAT_PREV=Previous Page

-STAT_REVERSE=Change Order

+STAT_REVERSE=Reverse Order

 STAT_PAGE=Seite %0:d of %1:d Pages\n (%2:d of %3:d Entrys)

 

 STAT_DESC_SCORES=HighScores

-STAT_DESC_SCORES_REVERSED=LowestScores

+STAT_DESC_SCORES_REVERSED=LowScores

 STAT_FORMAT_SCORES=%0:s - %1:d  [%2:s] \n (%3:s - %4:s)

 

 STAT_DESC_SINGERS=Best Singers

diff --git a/Skins/Deluxe/Blue.ini b/Skins/Deluxe/Blue.ini
index 83784051..dcbd064b 100644
--- a/Skins/Deluxe/Blue.ini
+++ b/Skins/Deluxe/Blue.ini
@@ -33,6 +33,7 @@ IconOption     = [icon]options.jpg
 IconSongMenu   = [icon]songmenu.jpg

 ScoreIcon      = [icon]score.jpg

 PartyIcon      = [icon]party.jpg

+StatIcon       = [icon]stats.jpg

 

 

 # # # S O N G S E L E C E T # # #

@@ -96,6 +97,10 @@ PartyScoreDeco    =x_[party]scoreDecoration.jpg
 PartyScoreBG1     =[party]scoreBG1.jpg

 PartyScoreBG2     =[party]scoreBG2.jpg

 

+# # # S T A T S # # #

+StatOverviewBG   = [stat]OverviewBG.jpg

+StatEntryBG = [stat]EntryBG.jpg

+

 

 # # # N A V I # # #

 ButtonP     = [button]p.jpg

diff --git a/Skins/Deluxe/W&C-Summer.ini b/Skins/Deluxe/Summer.ini
index af9f6147..f0aca08e 100644
--- a/Skins/Deluxe/W&C-Summer.ini
+++ b/Skins/Deluxe/Summer.ini
@@ -5,7 +5,7 @@
 

 [Skin]

 Theme=Deluxe

-Name=W&C-Summer

+Name=Summer

 Color=Blue

 

 [Textures]

@@ -33,6 +33,7 @@ IconOption     = [icon]options.jpg
 IconSongMenu   = [icon]songmenu.jpg

 ScoreIcon      = [icon]score.jpg

 PartyIcon      = [icon]party.jpg

+StatIcon       = [icon]stats.jpg

 

 

 # # # S O N G S E L E C E T # # #

@@ -96,6 +97,10 @@ PartyScoreDeco    =x_[party]scoreDecoration.jpg
 PartyScoreBG1     =[party]scoreBG1.jpg

 PartyScoreBG2     =[party]scoreBG2.jpg

 

+# # # S T A T S # # #

+StatOverviewBG   = [stat]OverviewBG.jpg

+StatEntryBG = [stat]EntryBG.jpg

+

 

 # # # N A V I # # #

 ButtonP     = [button]p.jpg

diff --git a/Skins/Deluxe/W&C-Winter.ini b/Skins/Deluxe/Winter.ini
index e91b87f7..209ea64f 100644
--- a/Skins/Deluxe/W&C-Winter.ini
+++ b/Skins/Deluxe/Winter.ini
@@ -5,7 +5,7 @@
 

 [Skin]

 Theme=Deluxe

-Name=W&C-Winter

+Name=Winter

 Color=Blue

 

 [Textures]

@@ -33,7 +33,7 @@ IconOption     = [icon]options.jpg
 IconSongMenu   = [icon]songmenu.jpg

 ScoreIcon      = [icon]score.jpg

 PartyIcon      = [icon]party.jpg

-

+StatIcon       = [icon]stats.jpg

 

 # # # S O N G S E L E C E T # # #

 SongSelection1 = [main]songSelection1.jpg

@@ -96,6 +96,10 @@ PartyScoreDeco    =x_[party]scoreDecoration.jpg
 PartyScoreBG1     =[party]scoreBG1.jpg

 PartyScoreBG2     =[party]scoreBG2.jpg

 

+# # # S T A T S # # #

+StatOverviewBG   = [stat]OverviewBG.jpg

+StatEntryBG = [stat]EntryBG.jpg

+

 

 # # # N A V I # # #

 ButtonP     = [button]p.jpg

diff --git a/Skins/Deluxe/x_W&C-Autum.ini b/Skins/Deluxe/x_Autum.ini
index 3666fadf..306023b7 100644
--- a/Skins/Deluxe/x_W&C-Autum.ini
+++ b/Skins/Deluxe/x_Autum.ini
@@ -5,7 +5,7 @@
 

 [Skin]

 Theme=Deluxe

-Name=W&C-Autum

+Name=Autum

 Color=Orange

 

 [Textures]

@@ -33,6 +33,7 @@ IconOption     = [icon]options.jpg
 IconSongMenu   = [icon]songmenu.jpg

 ScoreIcon      = [icon]score.jpg

 PartyIcon      = [icon]party.jpg

+StatIcon       = [icon]stats.jpg

 

 

 # # # S O N G S E L E C E T # # #

@@ -96,6 +97,11 @@ PartyScoreDeco    =x_[party]scoreDecoration.jpg
 PartyScoreBG1     =[party]scoreBG1.jpg

 PartyScoreBG2     =[party]scoreBG2.jpg

 

+# # # S T A T S # # #

+StatOverviewBG   = [stat]OverviewBG.jpg

+StatEntryBG = [stat]EntryBG.jpg

+

+

 # # # N A V I # # #

 ButtonP     = [button]p.jpg

 ButtonM     = [button]m.jpg

diff --git a/Themes/Deluxe.ini b/Themes/Deluxe.ini
index dbdec115..ebc87403 100644
--- a/Themes/Deluxe.ini
+++ b/Themes/Deluxe.ini
@@ -6649,6 +6649,7 @@ Align=0
 Z=1

 

 [SongMenuSelectSlide3]

+Tex = Rectangle

 TexSBG = Rectangle

 Text =

 X = 460

@@ -6660,13 +6661,13 @@ SkipX = 0
 

 SBGW = 270

 

-Color = ColorDark

-DColor = Gray

+Color = LightBlue

+DColor = DarkBlue

 TColor = White

 TDColor = White

-SBGTex = MainBar

-SBGColor = ColorDark

-SBGDColor = Gray

+SBGTex = Rectangle

+SBGColor = LightBlue

+SBGDColor = DarkBlue

 STColor = White

 STDColor = GrayDark

 

@@ -6890,24 +6891,119 @@ Text=SING_OPTIONS_EXIT
 Color=White

 

 [StatMainTextOverview]

-X =30

-Y =80

-W =550

-Color=Grey

+X =45

+Y =85

+W =510

+Color=White

 Font =0

-Size =12

+Size =9

 Align=0

 Text=

 

+[StatMainStatic1]

+X =40

+Y =22

+W =27

+H =27

+Color =White

+Tex =StatIcon

+Type=Font Black

+

+[StatMainStatic2]

+X =0

+Y =549

+W =252

+H =28

+Tex=Leiste1

+Color =White

+Type=Plain

+Reflection=1

+ReflectionSpacing=1

+

+[StatMainStatic3]

+X =254

+Y =549

+W =548

+H =28

+Tex=Leiste2

+Color =White

+Type=Plain

+Reflection=1

+ReflectionSpacing=1

+

+[StatMainStatic4]

+X =260

+Y =553

+W =30

+H =22

+Tex=ButtonNavi

+Color =White

+Type=Plain

+Style=5

+

+[StatMainStatic5]

+X =388

+Y =553

+W =22

+H =22

+Tex=ButtonEsc

+Color =White

+Type=Plain

+

+[StatMainStatic6]

+X =40

+Y =80

+W =520

+H =350

+Tex=StatOverviewBG

+Color =ColorDark

+Type=Font Black

+

 [StatMainText1]

 X =70

 Y =6

 Color=White

 Font =0

 Size =20

+Text=STAT_MAIN

 Align=0

+

+[StatMainText2]

+X =238

+Y =552

+Color=Black

+Font =0

+Size =7

+Align=2

+Text=STAT_MAIN_WHEREAMI

+

+[StatMainText3]

+X =70

+Y =53

+Color=White

+Font =0

+Size =10

+Align =0

 Text=STAT_MAIN_DESC

 

+[StatMainText4]

+X =294

+Y =552

+Color=Black

+Font =0

+Size =7

+Align=0

+Text=SING_LEGEND_NAVIGATE

+

+[StatMainText5]

+X =418

+Y =552

+Color=Black

+Font =0

+Size =7

+Align=0

+Text=SING_LEGEND_ESC

+

 [StatDetail]

 Texts=0

 Statics=0

@@ -6917,7 +7013,7 @@ Tex=MainBG
 

 [StatDetailButtonNext]

 X =589

-Y =70

+Y =80

 W =190

 H =50

 Tex =Button

@@ -6938,7 +7034,7 @@ Color=White
 

 [StatDetailButtonPrev]

 X =589

-Y =130

+Y =140

 W =190

 H =50

 Tex =Button

@@ -6959,7 +7055,7 @@ Color=White
 

 [StatDetailButtonReverse]

 X =589

-Y =190

+Y =200

 W =190

 H =50

 Tex =Button

@@ -6980,7 +7076,7 @@ Color=White
 

 [StatDetailButtonExit]

 X =589

-Y =250

+Y =260

 W =190

 H =50

 Tex =Button

@@ -7001,124 +7097,198 @@ Color=White
 

 [StatDetailTextDescription]

 X =70

-Y =6

+Y =53

 Color=White

 Font =0

-Size =20

-Align=0

+Size =10

+Align =0

 Text=

 

 [StatDetailTextPage]

-X = 795

-Y = 560

-ColR = 0.3

-ColG = 0.3

-ColB = 0.3

+X = 557

+Y = 80

+Color= Black

 Font = 0

-Size = 8

+Size = 6

 Align=2

 Text=

 

 [StatDetailTextList1]

-X = 30

-Y = 70

-ColR = 0.3

-ColG = 0.3

-ColB = 0.3

+X = 45

+Y = 85

+Color=White

 Font = 0

 Size = 8

 Text=Stat1

 

 [StatDetailTextList2]

-X = 30

-Y = 117

-ColR = 0.3

-ColG = 0.3

-ColB = 0.3

+X = 45

+Y = 125

+Color=White

 Font = 0

 Size = 8

 Text=Stat2

 

 [StatDetailTextList3]

-X = 30

-Y = 164

-ColR = 0.3

-ColG = 0.3

-ColB = 0.3

+X = 45

+Y = 165

+Color=White

 Font = 0

 Size = 8

 Text=

 

 [StatDetailTextList4]

-X = 30

-Y = 211

-ColR = 0.3

-ColG = 0.3

-ColB = 0.3

+X = 45

+Y = 205

+Color=White

 Font = 0

 Size = 8

 Text=

 

 [StatDetailTextList5]

-X = 30

-Y = 258

-ColR = 0.3

-ColG = 0.3

-ColB = 0.3

+X = 45

+Y = 245

+Color=White

 Font = 0

 Size = 8

 Text=

 

 [StatDetailTextList6]

-X = 30

-Y = 305

-ColR = 0.3

-ColG = 0.3

-ColB = 0.3

+X = 45

+Y = 285

+Color=White

 Font = 0

 Size = 8

 Text=

 

 [StatDetailTextList7]

-X = 30

-Y = 352

-ColR = 0.3

-ColG = 0.3

-ColB = 0.3

+X = 45

+Y = 325

+Color=White

 Font = 0

 Size = 8

 Text=

 

 [StatDetailTextList8]

-X = 30

-Y = 399

-ColR = 0.3

-ColG = 0.3

-ColB = 0.3

+X = 45

+Y = 365

+Color=White

 Font = 0

 Size = 8

 Text=

 

 [StatDetailTextList9]

-X = 30

-Y = 446

-ColR = 0.3

-ColG = 0.3

-ColB = 0.3

+X = 45

+Y = 405

+Color=White

 Font = 0

 Size = 8

 Text=

 

 [StatDetailTextList10]

-X = 30

-Y = 493

-ColR = 0.3

-ColG = 0.3

-ColB = 0.3

+X = 45

+Y = 445

+Color=White

 Font = 0

 Size = 8

 Text=

 

+[StatDetailStatic1]

+X =40

+Y =22

+W =27

+H =27

+Color =White

+Tex =StatIcon

+Type=Font Black

+

+[StatDetailStatic2]

+X =0

+Y =549

+W =252

+H =28

+Tex=Leiste1

+Color =White

+Type=Plain

+Reflection=1

+ReflectionSpacing=1

+

+[StatDetailStatic3]

+X =254

+Y =549

+W =548

+H =28

+Tex=Leiste2

+Color =White

+Type=Plain

+Reflection=1

+ReflectionSpacing=1

+

+[StatDetailStatic4]

+X =260

+Y =553

+W =30

+H =22

+Tex=ButtonNavi

+Color =White

+Type=Plain

+Style=5

+

+[StatDetailStatic5]

+X =388

+Y =553

+W =22

+H =22

+Tex=ButtonEsc

+Color =White

+Type=Plain

+

+[StatDetailStatic6]

+X =40

+Y =80

+W =520

+H =405

+Tex=StatOverviewBG

+Color =ColorDark

+Type=Font Black

+

+

+[StatDetailText1]

+X =70

+Y =6

+Color=White

+Font =0

+Size =20

+Text=STAT_DETAIL

+Align=0

+

+[StatDetailText2]

+X =238

+Y =552

+Color=Black

+Font =0

+Size =7

+Align=2

+Text=STAT_DETAIL_WHEREAMI

+

+[StatDetailText3]

+X =294

+Y =552

+Color=Black

+Font =0

+Size =7

+Align=0

+Text=SING_LEGEND_NAVIGATE

+

+[StatDetailText4]

+X =418

+Y =552

+Color=Black

+Font =0

+Size =7

+Align=0

+Text=SING_LEGEND_ESC

+

 [CheckPopup]

 Texts=1

 Statics=1