add about, jukebox and credits buttons and rearrange the buttons in the main screen. The functions of the about and jukebox buttons are still off.

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

8 files changed, 97 insertions, 24 deletions

diff --git a/game/themes/Deluxe.ini b/game/themes/Deluxe.ini
index 4ae70e41..f2f0b376 100644
--- a/game/themes/Deluxe.ini
+++ b/game/themes/Deluxe.ini
@@ -11,6 +11,7 @@ DefaultSkin = Blue
 
 [Colors]
 White = 255 255 255
+WhiteGray = 230 230 230
 LightBlue = 119 187 210
 DarkBlue = 28 126 171
 LightRed = 170 146 146
@@ -166,8 +167,9 @@ Text = SING_LEGEND_NAVIGATE
 Reflection = 1
 ReflectionSpacing = 13
 
+; Enter button
 [MainStatic5]
-X = 400
+X = 515
 Y = 545
 W = 32
 H = 30
@@ -178,8 +180,9 @@ Type = Transparent
 Reflection = 1
 ReflectionSpacing = 2
 
+; Enter text
 [MainText3]
-X = 440
+X = 555
 Y = 548
 Z = 0.5
 Color = Black
@@ -190,6 +193,30 @@ Text = SING_LEGEND_SELECT
 Reflection = 1
 ReflectionSpacing = 13
 
+[MainStatic6]
+X = 400
+Y = 545
+W = 32
+H = 30
+Z = 0.952
+Tex = ButtonC
+Color = White
+Type = Transparent
+Reflection = 1
+ReflectionSpacing = 2
+
+[MainText4]
+X = 440
+Y = 548
+Z = 0.952
+Color = Black
+Font = 0
+Size = 24
+Align = 0
+Text = SING_SONG_CREDITS
+Reflection = 1
+ReflectionSpacing = 13
+
 [MainButtonSolo]
 X = 95
 Y = 270
@@ -246,7 +273,7 @@ Align = 1
 Text = SING_MULTI
 Color = White
 
-[MainButtonCollection1]
+[MainButtonJukebox]
 X = 405
 Y = 270
 W = 150
@@ -260,11 +287,39 @@ Reflection = 1
 ReflectionSpacing = 15
 DeSelectReflectionSpacing = 280
 Fade = 1
+FadeText = 1
+SelectH = 150
+FadeTex = ButtonFade
+FadeTexPos = 0
+
+[MainButtonJukeboxText1]
+X = 75
+Y = 10
+Font = 0
+Size = 30
+Align = 1
+Text = SING_JUKEBOX
+Color = White
+
+[MainButtonCollection1]
+X = 560
+Y = 270
+W = 150
+H = 50
+Tex = Button
+Color = ColorLight
+DColor = ColorDark
+Type = Transparent
+Texts = 1
+Reflection = 1
+ReflectionSpacing = 15
+DeSelectReflectionSpacing = 280
+Fade = 1
 FadeText = 0
 SelectH = 150
 FadeTex = ButtonFade
 FadeTexPos = 0
-FirstChild = 3
+FirstChild = 4
 
 [MainButtonCollection1Text1]
 X = 75
@@ -276,7 +331,7 @@ Text = SING_TOOLS
 Color = White
 
 [MainButtonStats]
-X = 410
+X = 565
 Y = 310
 W = 140
 H = 30
@@ -298,7 +353,7 @@ Text = SING_STATS
 Color = White
 
 [MainButtonEditor]
-X = 410
+X = 565
 Y = 345
 W = 140
 H = 30
@@ -320,7 +375,7 @@ Text = SING_EDITOR
 Color = White
 
 [MainButtonOptions]
-X = 410
+X = 565
 Y = 380
 W = 140
 H = 30
@@ -341,30 +396,42 @@ Align = 1
 Text = SING_OPTIONS
 Color = White
 
+[MainButtonAbout]
+X = 465
+Y = 490
+W = 120
+H = 40
+Tex = Button
+Color = ColorLight
+DColor = ColorDark
+Type = Transparent
+Texts = 1
+
+[MainButtonAboutText1]
+X = 60
+Y = 8
+Font = 0
+Size = 24
+Align = 1
+Text = SING_ABOUT
+Color = White
+
 [MainButtonExit]
-X = 560
-Y = 270
-W = 150
-H = 50
+X = 590
+Y = 490
+W = 120
+H = 40
 Tex = Button
 Color = ColorLight
 DColor = ColorDark
 Type = Transparent
 Texts = 1
-Reflection = 1
-ReflectionSpacing = 15
-DeSelectReflectionSpacing = 280
-Fade = 1
-FadeText = 1
-SelectH = 150
-FadeTex = ButtonFade
-FadeTexPos = 0
 
 [MainButtonExitText1]
-X = 75
-Y = 10
+X = 60
+Y = 8
 Font = 0
-Size = 30
+Size = 24
 Align = 1
 Text = SING_EXIT
 Color = White
diff --git a/game/themes/Deluxe/Blue.ini b/game/themes/Deluxe/Blue.ini
index 1712d919..8bbbb201 100644
--- a/game/themes/Deluxe/Blue.ini
+++ b/game/themes/Deluxe/Blue.ini
@@ -175,6 +175,7 @@ StatDetailBG1 = [stat]detailBG1.png
 ButtonP     = [button]p.png
 ButtonM     = [button]m.png
 ButtonJ     = [button]j.png
+ButtonC     = [button]c.png
 ButtonAlt   = [button]alt.png
 ButtonAZ    = [button]az.png
 ButtonEnter = [button]enter.png
@@ -239,4 +240,4 @@ JukeboxRandom = [jukebox]random.png
 JukeboxRepeat = [jukebox]repeat.png
 JukeboxCurrentSongBackground = [jukebox]currentsong.png
 JukeboxSongListUp = [jukebox]songlistup.png
-JukeboxSongListDown = [jukebox]songlistdown.png
+JukeboxSongListDown = [jukebox]songlistdown.png
\ No newline at end of file
diff --git a/game/themes/Deluxe/Fall.ini b/game/themes/Deluxe/Fall.ini
index 1c2fcd09..1f4f04f8 100644
--- a/game/themes/Deluxe/Fall.ini
+++ b/game/themes/Deluxe/Fall.ini
@@ -175,6 +175,7 @@ StatDetailBG1 = [stat]detailBG1.png
 ButtonP     = [button]p.png
 ButtonM     = [button]m.png
 ButtonJ     = [button]j.png
+ButtonC     = [button]c.png
 ButtonAlt   = [button]alt.png
 ButtonAZ    = [button]az.png
 ButtonEnter = [button]enter.png
diff --git a/game/themes/Deluxe/Ocean.ini b/game/themes/Deluxe/Ocean.ini
index 7bb239f1..f5b77206 100644
--- a/game/themes/Deluxe/Ocean.ini
+++ b/game/themes/Deluxe/Ocean.ini
@@ -101,7 +101,7 @@ SongName       = [sing]SongName.png
 
 # # # S C O R E / T O P 5 # # #
 ScoreBox        = [score]box.png
-ScoreGlassBox   = [score]glass_box.png 
+ScoreGlassBox   = [score]glass_box.png
 ScoreLevel      = [score]level.png
 ScoreLevelRound = [score]levelRound.png
 
@@ -175,6 +175,7 @@ StatDetailBG1 = [stat]detailBG1.png
 ButtonP     = [button]p.png
 ButtonM     = [button]m.png
 ButtonJ     = [button]j.png
+ButtonC     = [button]c.png
 ButtonAlt   = [button]alt.png
 ButtonAZ    = [button]az.png
 ButtonEnter = [button]enter.png
diff --git a/game/themes/Deluxe/Ribbon.ini b/game/themes/Deluxe/Ribbon.ini
index c2ee238d..32a20b6f 100644
--- a/game/themes/Deluxe/Ribbon.ini
+++ b/game/themes/Deluxe/Ribbon.ini
@@ -175,6 +175,7 @@ StatDetailBG1 = [stat]detailBG1.png
 ButtonP     = [button]p.png
 ButtonM     = [button]m.png
 ButtonJ     = [button]j.png
+ButtonC     = [button]c.png
 ButtonAlt   = [button]alt.png
 ButtonAZ    = [button]az.png
 ButtonEnter = [button]enter.png
diff --git a/game/themes/Deluxe/Summer.ini b/game/themes/Deluxe/Summer.ini
index 268c74f6..f0829966 100644
--- a/game/themes/Deluxe/Summer.ini
+++ b/game/themes/Deluxe/Summer.ini
@@ -175,6 +175,7 @@ StatDetailBG1 = [stat]detailBG1.png
 ButtonP     = [button]p.png
 ButtonM     = [button]m.png
 ButtonJ     = [button]j.png
+ButtonC     = [button]c.png
 ButtonAlt   = [button]alt.png
 ButtonAZ    = [button]az.png
 ButtonEnter = [button]enter.png
diff --git a/game/themes/Deluxe/Winter.ini b/game/themes/Deluxe/Winter.ini
index 75f698a8..ace3fe16 100644
--- a/game/themes/Deluxe/Winter.ini
+++ b/game/themes/Deluxe/Winter.ini
@@ -175,6 +175,7 @@ StatDetailBG1 = [stat]detailBG1.png
 ButtonP     = [button]p.png
 ButtonM     = [button]m.png
 ButtonJ     = [button]j.png
+ButtonC     = [button]c.png
 ButtonAlt   = [button]alt.png
 ButtonAZ    = [button]az.png
 ButtonEnter = [button]enter.png
diff --git a/game/themes/Deluxe/[button]c.png b/game/themes/Deluxe/[button]c.png
new file mode 100644
index 00000000..fae96083
--- /dev/null
+++ b/game/themes/Deluxe/[button]c.png