Some Themework in Stats and SingScreen.

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

17 files changed, 127 insertions, 84 deletions

diff --git a/Game/Code/Classes/UGraphic.pas b/Game/Code/Classes/UGraphic.pas
index 7fd159f7..205fa9fd 100644
--- a/Game/Code/Classes/UGraphic.pas
+++ b/Game/Code/Classes/UGraphic.pas
@@ -146,7 +146,7 @@ const
   Skin_OscG = 0;

   Skin_OscB = 0;

 

-  Skin_LyricsT = 500; // 510 / 400

+  Skin_LyricsT = 494; // 500 / 510 / 400

   Skin_SpectrumT = 470;

   Skin_SpectrumBot = 570;

   Skin_SpectrumH = 100;

diff --git a/Game/Code/Screens/UScreenSing.pas b/Game/Code/Screens/UScreenSing.pas
index 6985672f..b49e0add 100644
--- a/Game/Code/Screens/UScreenSing.pas
+++ b/Game/Code/Screens/UScreenSing.pas
@@ -368,7 +368,7 @@ begin
   // sub text

   LyricSub.Clear;

   LyricSub.X := 400;

-  LyricSub.Y := Skin_LyricsT + 42; //40

+  LyricSub.Y := Skin_LyricsT + 35; //42 //40

   LyricSub.Align := 1;

 

   // set custom options

@@ -385,13 +385,13 @@ begin
         {LyricMain.ColSR := Skin_FontHighlightR;

         LyricMain.ColSG := Skin_FontHighlightG;

         LyricMain.ColSB := Skin_FontHighlightB;1aa5dc}

-        LyricMain.ColSR := 26/255;

-        LyricMain.ColSG := 165/255;

-        LyricMain.ColSB := 220/255;

+        LyricMain.ColSR := 96/255; //26

+        LyricMain.ColSG := 192/255; //165

+        LyricMain.ColSB := 96/255;  //220

 

-        LyricSub.ColR := 0.6;

-        LyricSub.ColG := 0.6;

-        LyricSub.ColB := 0.6;

+        LyricSub.ColR := 0.4; //0.6

+        LyricSub.ColG := 0.4; //0.6

+        LyricSub.ColB := 0.4; //0.6

       end;

     1:

       begin

diff --git a/Skins/Deluxe/Blue.ini b/Skins/Deluxe/Blue.ini
index 7e416d4c..e9cdde00 100644
--- a/Skins/Deluxe/Blue.ini
+++ b/Skins/Deluxe/Blue.ini
@@ -50,10 +50,10 @@ LyricBar       = [sing]textBar.jpg
 LyricHelpBar   = [sing]lyricsHelpBar.bmp

 

 #the time progress bar  (not skinned in this theme :P )

-TimeBar        = 

+TimeBar1      = [sing]timeBarBG.jpg

 

 #the bar behind the timestuff

-bar            = [sing]timeBar.jpg

+TimeBar2      = [sing]timeBar.jpg

 

 #linebonus, the thing that pop ups at the score

 LineBonusBack  = [sing]lineBonusPopUp.jpg

@@ -104,8 +104,10 @@ PartyWinDeco2     =x_[party]winDecoration1.jpg
 PartyWinDeco3     =x_[party]winDecoration1.jpg

 

 # # # S T A T S # # #

-StatOverviewBG   = [stat]OverviewBG.jpg

-StatEntryBG = [stat]EntryBG.jpg

+StatMainBG1 = [stat]mainBG1.jpg

+StatMainBG2 = [stat]mainBG2.jpg

+StatMainBG3 = [stat]mainBG3.jpg

+StatDetailBG1 = [stat]detailBG1.jpg

 

 

 # # # N A V I # # #

diff --git a/Skins/Deluxe/Summer.ini b/Skins/Deluxe/Summer.ini
index bc3b711b..22443050 100644
--- a/Skins/Deluxe/Summer.ini
+++ b/Skins/Deluxe/Summer.ini
@@ -50,10 +50,10 @@ LyricBar       = [sing]textBar.jpg
 LyricHelpBar   = [sing]lyricsHelpBar.bmp

 

 #the time progress bar  (not skinned in this theme :P )

-TimeBar        = 

+TimeBar1      = [sing]timeBarBG.jpg

 

 #the bar behind the timestuff

-bar            = [sing]timeBar.jpg

+TimeBar2      = [sing]timeBar.jpg

 

 #linebonus, the thing that pop ups at the score

 LineBonusBack  = [sing]lineBonusPopUp.jpg

@@ -104,8 +104,10 @@ PartyWinDeco2     =x_[party]winDecoration1.jpg
 PartyWinDeco3     =x_[party]winDecoration1.jpg

 

 # # # S T A T S # # #

-StatOverviewBG   = [stat]OverviewBG.jpg

-StatEntryBG = [stat]EntryBG.jpg

+StatMainBG1 = [stat]mainBG1.jpg

+StatMainBG2 = [stat]mainBG2.jpg

+StatMainBG3 = [stat]mainBG3.jpg

+StatDetailBG1 = [stat]detailBG1.jpg

 

 

 # # # N A V I # # #

diff --git a/Skins/Deluxe/Winter.ini b/Skins/Deluxe/Winter.ini
index 7d8e247b..518f234c 100644
--- a/Skins/Deluxe/Winter.ini
+++ b/Skins/Deluxe/Winter.ini
@@ -49,10 +49,10 @@ LyricBar       = [sing]textBar.jpg
 LyricHelpBar   = [sing]lyricsHelpBar.bmp

 

 #the time progress bar  (not skinned in this theme :P )

-TimeBar        = 

+TimeBar1      = [sing]timeBarBG.jpg

 

 #the bar behind the timestuff

-bar            = [sing]timeBar.jpg

+TimeBar2      = [sing]timeBar.jpg

 

 #linebonus, the thing that pop ups at the score

 LineBonusBack  = [sing]lineBonusPopUp.jpg

@@ -103,9 +103,10 @@ PartyWinDeco2     =x_[party]winDecoration1.jpg
 PartyWinDeco3     =x_[party]winDecoration1.jpg

 

 # # # S T A T S # # #

-StatOverviewBG   = [stat]OverviewBG.jpg

-StatEntryBG = [stat]EntryBG.jpg

-

+StatMainBG1 = [stat]mainBG1.jpg

+StatMainBG2 = [stat]mainBG2.jpg

+StatMainBG3 = [stat]mainBG3.jpg

+StatDetailBG1 = [stat]detailBG1.jpg

 

 # # # N A V I # # #

 ButtonP     = [button]p.jpg

diff --git a/Skins/Deluxe/[sing]scoreBg.jpg b/Skins/Deluxe/[sing]scoreBg.jpg
index 0ad261ae..01d3ca75 100644
--- a/Skins/Deluxe/[sing]scoreBg.jpg
+++ b/Skins/Deluxe/[sing]scoreBg.jpg
diff --git a/Skins/Deluxe/[sing]textBar.jpg b/Skins/Deluxe/[sing]textBar.jpg
index 4ad36aa8..e2734bce 100644
--- a/Skins/Deluxe/[sing]textBar.jpg
+++ b/Skins/Deluxe/[sing]textBar.jpg
diff --git a/Skins/Deluxe/[sing]timeBar.jpg b/Skins/Deluxe/[sing]timeBar.jpg
index e33352d5..e1cc3bf4 100644
--- a/Skins/Deluxe/[sing]timeBar.jpg
+++ b/Skins/Deluxe/[sing]timeBar.jpg
diff --git a/Skins/Deluxe/[sing]timeBar1.jpg b/Skins/Deluxe/[sing]timeBar1.jpg
new file mode 100644
index 00000000..924a2e9b
--- /dev/null
+++ b/Skins/Deluxe/[sing]timeBar1.jpg
diff --git a/Skins/Deluxe/[stat]EntryBG.jpg b/Skins/Deluxe/[stat]EntryBG.jpg
deleted file mode 100644
index 603c8d58..00000000
--- a/Skins/Deluxe/[stat]EntryBG.jpg
+++ /dev/null
diff --git a/Skins/Deluxe/[stat]OverviewBG.jpg b/Skins/Deluxe/[stat]OverviewBG.jpg
deleted file mode 100644
index ea1274b4..00000000
--- a/Skins/Deluxe/[stat]OverviewBG.jpg
+++ /dev/null
diff --git a/Skins/Deluxe/[stat]detailBG1.jpg b/Skins/Deluxe/[stat]detailBG1.jpg
new file mode 100644
index 00000000..120dc483
--- /dev/null
+++ b/Skins/Deluxe/[stat]detailBG1.jpg
diff --git a/Skins/Deluxe/[stat]mainBG1.jpg b/Skins/Deluxe/[stat]mainBG1.jpg
new file mode 100644
index 00000000..a937b24a
--- /dev/null
+++ b/Skins/Deluxe/[stat]mainBG1.jpg
diff --git a/Skins/Deluxe/[stat]mainBG2.jpg b/Skins/Deluxe/[stat]mainBG2.jpg
new file mode 100644
index 00000000..201d49b8
--- /dev/null
+++ b/Skins/Deluxe/[stat]mainBG2.jpg
diff --git a/Skins/Deluxe/[stat]mainBG3.jpg b/Skins/Deluxe/[stat]mainBG3.jpg
new file mode 100644
index 00000000..4fb6bc06
--- /dev/null
+++ b/Skins/Deluxe/[stat]mainBG3.jpg
diff --git a/Skins/Deluxe/x_Autum.ini b/Skins/Deluxe/x_Autum.ini
index 325ef268..d5ea5d6e 100644
--- a/Skins/Deluxe/x_Autum.ini
+++ b/Skins/Deluxe/x_Autum.ini
@@ -50,10 +50,10 @@ LyricBar       = [sing]textBar.jpg
 LyricHelpBar   = [sing]lyricsHelpBar.bmp

 

 #the time progress bar  (not skinned in this theme :P )

-TimeBar        = 

+TimeBar1      = [sing]timeBarBG.jpg

 

 #the bar behind the timestuff

-bar            = [sing]timeBar.jpg

+TimeBar2      = [sing]timeBar.jpg

 

 #linebonus, the thing that pop ups at the score

 LineBonusBack  = [sing]lineBonusPopUp.jpg

@@ -104,8 +104,10 @@ PartyWinDeco2     =x_[party]winDecoration1.jpg
 PartyWinDeco3     =x_[party]winDecoration1.jpg

                    

 # # # S T A T S # # #

-StatOverviewBG   = [stat]OverviewBG.jpg

-StatEntryBG = [stat]EntryBG.jpg

+StatMainBG1 = [stat]mainBG1.jpg

+StatMainBG2 = [stat]mainBG2.jpg

+StatMainBG3 = [stat]mainBG3.jpg

+StatDetailBG1 = [stat]detailBG1.jpg

 

 

 # # # N A V I # # #

diff --git a/Themes/Deluxe.ini b/Themes/Deluxe.ini
index 6561661b..cbc6b6dc 100644
--- a/Themes/Deluxe.ini
+++ b/Themes/Deluxe.ini
@@ -750,15 +750,15 @@ Tex =LyricBar
 X =10

 Y =490

 W =780

-H =105

+H =85

 Color =GrayLightest

 Type=Font Black

 

 [SingStatic2]

 ;TimeBar

-Tex =bar

+Tex =TimeBar1

 X =10

-Y =580

+Y =577

 W =780

 H =16

 Color =Black

@@ -766,16 +766,16 @@ Type=Font Black
 

 [SingTimeProgress]

 X =20

-Y =584

+Y =581

 W =700

 H =7

 Color=White

 

 [SingStatic3]

 ;the thing behind the time progress

-Tex =bar

+Tex =TimeBar2

 X =20

-Y =584

+Y =581

 W =700

 H =7

 Color=GrayLightest

@@ -784,7 +784,7 @@ Type=Font Black
 [SingTimeText]

 Text =SING_TIME

 X =750

-Y =579

+Y =576

 Font =1

 Size =6

 Color =White

@@ -813,16 +813,16 @@ Align=0
 [SingP1Static2]

 Tex =ScoreBG

 X =680

-Y =276

+Y =282

 W =100

-H =40

+H =34

 Color =P1Dark

 Type=Transparent

 

 [SingP1TextScore]

 Text =00000

 X =690

-Y =281

+Y =284

 Font =0

 Size =10

 Color =White

@@ -857,16 +857,16 @@ Align=0
 [SingP1TwoPStatic2]

 Tex =ScoreBG

 X =680

-Y =96

+Y =102

 W =100

-H =40

+H =34

 Color =P1Dark

 Type=Transparent

 

 [SingP1TwoPTextScore]

 Text =00000

 X =690

-Y =101

+Y =104

 Font =0

 Size =10

 Color =White

@@ -900,16 +900,16 @@ Align=0
 [SingP2RStatic2]

 Tex =ScoreBG

 X =680

-Y =276

+Y =282

 W =100

-H =40

+H =34

 Color =P2Dark

 Type=Transparent

 

 [SingP2RTextScore]

 Text =00000

 X =690

-Y =281

+Y =284

 Font =0

 Size =10

 Color =White

@@ -926,7 +926,7 @@ H =8
 [SingP1ThreePStatic]

 Tex =P

 X =16

-Y =55

+Y =59

 W =50

 H =54

 Color =P1Dark

@@ -935,7 +935,7 @@ Type=Transparent
 [SingP1ThreePText]

 Text =P1

 X =27

-Y =62

+Y =66

 Font =1

 Size =8

 Color =White

@@ -944,16 +944,16 @@ Align=0
 [SingP1ThreePStatic2]

 Tex =ScoreBG

 X =75

-Y =55

+Y =61

 W =100

-H =40

+H =34

 Color =P1Dark

 Type=Transparent

 

 [SingP1ThreePTextScore]

 Text =00000

 X =85

-Y =60

+Y =63

 Font =0

 Size =10

 Color =White

@@ -969,7 +969,7 @@ H =8
 [SingP2MStatic]

 Tex =P

 X =311

-Y =55

+Y =59

 W =50

 H =54

 Color =P2Dark

@@ -978,7 +978,7 @@ Type=Transparent
 [SingP2MText]

 Text =P2

 X =321

-Y =62

+Y =66

 Font =1

 Size =8

 Color =White

@@ -987,16 +987,16 @@ Align=0
 [SingP2MStatic2]

 Tex =ScoreBG

 X =370

-Y =55

+Y =61

 W =100

-H =40

+H =34

 Color =P2Dark

 Type=Transparent

 

 [SingP2MTextScore]

 Text =00000

 X =380

-Y =60

+Y =63

 Font =0

 Size =10

 Color =White

@@ -1012,7 +1012,7 @@ H =8
 [SingP3RStatic]

 Tex =P

 X =611

-Y =55

+Y =59

 W =50

 H =54

 Color =P3Dark

@@ -1021,7 +1021,7 @@ Type=Transparent
 [SingP3RText]

 Text =P3

 X =621

-Y =62

+Y =66

 Font =1

 Size =8

 Color =White

@@ -1030,16 +1030,16 @@ Align=0
 [SingP3RStatic2]

 Tex =ScoreBG

 X =670

-Y =55

+Y =61

 W =100

-H =40

+H =34

 Color =P3Dark

 Type=Transparent

 

 [SingP3RTextScore]

 Text =00000

 X =680

-Y =60

+Y =63

 Font =0

 Size =10

 Color =White

@@ -6861,7 +6861,7 @@ Tex=MainBG
 

 [StatMainButtonScores]

 X =589

-Y =80

+Y =100

 W =190

 H =50

 Tex =Button

@@ -6882,7 +6882,7 @@ Color=White
 

 [StatMainButtonSingers]

 X =589

-Y =140

+Y =160

 W =190

 H =50

 Tex =Button

@@ -6903,7 +6903,7 @@ Color=White
 

 [StatMainButtonSongs]

 X =589

-Y =200

+Y =220

 W =190

 H =50

 Tex =Button

@@ -6924,7 +6924,7 @@ Color=White
 

 [StatMainButtonBands]

 X =589

-Y =260

+Y =280

 W =190

 H =50

 Tex =Button

@@ -6945,7 +6945,7 @@ Color=White
 

 [StatMainButtonExit]

 X =589

-Y =320

+Y =340

 W =190

 H =50

 Tex =Button

@@ -6966,7 +6966,7 @@ Color=White
 

 [StatMainTextOverview]

 X =45

-Y =85

+Y =125

 W =510

 Color=White

 Font =0

@@ -7026,13 +7026,31 @@ Type=Plain
 

 [StatMainStatic6]

 X =40

-Y =80

+Y =100

 W =520

-H =350

-Tex=StatOverviewBG

+H =20

+Tex=StatMainBG1

+Color =ColorLight

+Type=Font Black

+

+[StatMainStatic7]

+X =40

+Y =120

+W =520

+H =300

+Tex=StatMainBG2

 Color =ColorDark

 Type=Font Black

 

+[StatMainStatic8]

+X =40

+Y =420

+W =520

+H =20

+Tex=StatMainBG3

+Color =ColorLight

+Type=Font Black

+

 [StatMainText1]

 X =70

 Y =6

@@ -7087,7 +7105,7 @@ Tex=MainBG
 

 [StatDetailButtonNext]

 X =589

-Y =80

+Y =100

 W =190

 H =50

 Tex =Button

@@ -7108,7 +7126,7 @@ Color=White
 

 [StatDetailButtonPrev]

 X =589

-Y =140

+Y =160

 W =190

 H =50

 Tex =Button

@@ -7129,7 +7147,7 @@ Color=White
 

 [StatDetailButtonReverse]

 X =589

-Y =200

+Y =220

 W =190

 H =50

 Tex =Button

@@ -7150,7 +7168,7 @@ Color=White
 

 [StatDetailButtonExit]

 X =589

-Y =260

+Y =280

 W =190

 H =50

 Tex =Button

@@ -7179,8 +7197,8 @@ Align =0
 Text=

 

 [StatDetailTextPage]

-X = 557

-Y = 80

+X = 546

+Y = 98

 Color= Black

 Font = 0

 Size = 6

@@ -7189,7 +7207,7 @@ Text=
 

 [StatDetailTextList1]

 X = 45

-Y = 85

+Y = 122

 Color=White

 Font = 0

 Size = 8

@@ -7197,7 +7215,7 @@ Text=Stat1
 

 [StatDetailTextList2]

 X = 45

-Y = 125

+Y = 160

 Color=White

 Font = 0

 Size = 8

@@ -7205,7 +7223,7 @@ Text=Stat2
 

 [StatDetailTextList3]

 X = 45

-Y = 165

+Y = 198

 Color=White

 Font = 0

 Size = 8

@@ -7213,7 +7231,7 @@ Text=
 

 [StatDetailTextList4]

 X = 45

-Y = 205

+Y = 236

 Color=White

 Font = 0

 Size = 8

@@ -7221,7 +7239,7 @@ Text=
 

 [StatDetailTextList5]

 X = 45

-Y = 245

+Y = 274

 Color=White

 Font = 0

 Size = 8

@@ -7229,7 +7247,7 @@ Text=
 

 [StatDetailTextList6]

 X = 45

-Y = 285

+Y = 312

 Color=White

 Font = 0

 Size = 8

@@ -7237,7 +7255,7 @@ Text=
 

 [StatDetailTextList7]

 X = 45

-Y = 325

+Y = 350

 Color=White

 Font = 0

 Size = 8

@@ -7245,7 +7263,7 @@ Text=
 

 [StatDetailTextList8]

 X = 45

-Y = 365

+Y = 388

 Color=White

 Font = 0

 Size = 8

@@ -7253,7 +7271,7 @@ Text=
 

 [StatDetailTextList9]

 X = 45

-Y = 405

+Y = 426

 Color=White

 Font = 0

 Size = 8

@@ -7261,7 +7279,7 @@ Text=
 

 [StatDetailTextList10]

 X = 45

-Y = 445

+Y = 464

 Color=White

 Font = 0

 Size = 8

@@ -7319,13 +7337,31 @@ Type=Plain
 

 [StatDetailStatic6]

 X =40

-Y =80

+Y =100

+W =520

+H =24

+Tex=StatDetailBG1

+Color =ColorLight

+Type=Font Black

+

+[StatDetailStatic7]

+X =40

+Y =124

 W =520

-H =405

-Tex=StatOverviewBG

+H =376

+Tex=StatMainBG2

 Color =ColorDark

 Type=Font Black

 

+[StatDetailStatic8]

+X =40

+Y =500

+W =520

+H =20

+Tex=StatMainBG3

+Color =ColorLight

+Type=Font Black

+

 

 [StatDetailText1]

 X =70