aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authork-m_schindler <k-m_schindler@b956fd51-792f-4845-bead-9b4dfca2ff2c>2016-01-05 09:48:08 +0000
committerk-m_schindler <k-m_schindler@b956fd51-792f-4845-bead-9b4dfca2ff2c>2016-01-05 09:48:08 +0000
commitce3f910c28c2f6f91f7138690e5284d000ba05e9 (patch)
tree90a4dd7202961d8ff607c9e2d8954d21804bc585
parente2a9ad22a5dc8a14b7fa536e28628f85481e8caf (diff)
downloadusdx-ce3f910c28c2f6f91f7138690e5284d000ba05e9.tar.gz
usdx-ce3f910c28c2f6f91f7138690e5284d000ba05e9.tar.xz
usdx-ce3f910c28c2f6f91f7138690e5284d000ba05e9.zip
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
Diffstat (limited to '')
-rw-r--r--game/languages/English.ini8
-rw-r--r--game/languages/German.ini8
-rwxr-xr-xgame/themes/Candy/Clouds static.ini1
-rwxr-xr-xgame/themes/Candy/Clouds.ini1
-rw-r--r--game/themes/Candy/[button]c.pngbin0 -> 3964 bytes
-rw-r--r--game/themes/Classic/Star.ini1
-rw-r--r--game/themes/Classic/[button]c.pngbin0 -> 3964 bytes
-rw-r--r--game/themes/Deluxe.ini111
-rw-r--r--game/themes/Deluxe/Blue.ini3
-rw-r--r--game/themes/Deluxe/Fall.ini1
-rw-r--r--game/themes/Deluxe/Ocean.ini3
-rw-r--r--game/themes/Deluxe/Ribbon.ini1
-rw-r--r--game/themes/Deluxe/Summer.ini1
-rw-r--r--game/themes/Deluxe/Winter.ini1
-rw-r--r--game/themes/Deluxe/[button]c.pngbin0 -> 3964 bytes
-rwxr-xr-xgame/themes/Temptation/Temptation (16-9).ini1
-rwxr-xr-xgame/themes/Temptation/Temptation (4-3).ini1
-rw-r--r--game/themes/Temptation/[button]c.pngbin0 -> 3964 bytes
-rw-r--r--game/themes/Verdure.ini149
-rw-r--r--game/themes/Verdure/Drippin.ini1
-rw-r--r--game/themes/Verdure/Drippin_Low.ini1
-rw-r--r--game/themes/Verdure/Drippin_Static.ini1
-rw-r--r--game/themes/Verdure/Springtime.ini1
-rw-r--r--game/themes/Verdure/Springtime_Low.ini1
-rw-r--r--game/themes/Verdure/Springtime_Static.ini1
-rw-r--r--game/themes/Verdure/[button]c.pngbin0 -> 3964 bytes
-rw-r--r--src/base/UThemes.pas54
-rw-r--r--src/screens/UScreenMain.pas4
28 files changed, 260 insertions, 95 deletions
diff --git a/game/languages/English.ini b/game/languages/English.ini
index ebb44b1d..a747fe2d 100644
--- a/game/languages/English.ini
+++ b/game/languages/English.ini
@@ -9,7 +9,7 @@ OPTION_VALUE_ENGLISH=English
OPTION_VALUE_EUSKARA=Euskara
OPTION_VALUE_FINNISH=Finnish
OPTION_VALUE_FRENCH=French
-OPTION_VALUE_GAELIC=Gaelic
+ OPTION_VALUE_GAELIC=Gaelic
OPTION_VALUE_GERMAN=German
OPTION_VALUE_GREEK=Greek
OPTION_VALUE_HUNGARIAN=Hungarian
@@ -458,3 +458,9 @@ JUKEBOX_OPTIONS_RANDOM=CTRL+R: Random Sort
JUKEBOX_OPTIONS_SORT=CTRL+S: Sort by Artist/Title/Edition/Genre/Language
JUKEBOX_OPTIONS_FIND=CTRL+F: On/Off Song Search
+SING_SONG_CREDITS=Credits
+SING_JUKEBOX=Jukebox
+SING_JUKEBOX_DESC=Listen to my collection of songs
+
+SING_ABOUT=About
+SING_ABOUT_DESC=About Ultrastar Deluxe
diff --git a/game/languages/German.ini b/game/languages/German.ini
index b0ffc6ec..36010b4f 100644
--- a/game/languages/German.ini
+++ b/game/languages/German.ini
@@ -444,7 +444,7 @@ ERROR_PLAYER_DEVICE_ASSIGNMENT=Mehrere Mikrofone für Spieler %d gewählt.\nAufn
ERROR_PLAYER_NO_DEVICE_ASSIGNMENT=Kein Mikrofon für Spieler %d gewählt.\nAufnahmeoptionen überprüfen.
;UNUSED: SING_OPTIONS_ADVANCED_COUNT_HOW_OFTEN_SUNG=Wie oft gesungen mitzählen
-MSG_END_JUKEBOX=JokeBox Modus beenden?
+MSG_END_JUKEBOX=JukeBox Modus beenden?
JUKEBOX_RANDOM=Zufall
JUKEBOX_REPEAT=Wiederholen
JUKEBOX_FIND=Suche
@@ -458,3 +458,9 @@ JUKEBOX_OPTIONS_RANDOM=CTRL+R: Zufällige Sortierung
JUKEBOX_OPTIONS_SORT=CTRL+S: Sortieren nach Künstler/Titel/Edition/Genre/Sprache
JUKEBOX_OPTIONS_FIND=CTRL+F: An/Aus Song-Suche
+SING_SONG_CREDITS=Credits
+SING_JUKEBOX=Jukebox
+SING_JUKEBOX_DESC=Höre meine Liedersammlung
+
+SING_ABOUT=Über
+SING_ABOUT_DESC=Über Ultrastar Deluxe
diff --git a/game/themes/Candy/Clouds static.ini b/game/themes/Candy/Clouds static.ini
index 0f57671e..8490a0f5 100755
--- a/game/themes/Candy/Clouds static.ini
+++ b/game/themes/Candy/Clouds static.ini
@@ -112,6 +112,7 @@ StatsBox = StatsBox.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/Candy/Clouds.ini b/game/themes/Candy/Clouds.ini
index c0b18b1e..3de8b367 100755
--- a/game/themes/Candy/Clouds.ini
+++ b/game/themes/Candy/Clouds.ini
@@ -112,6 +112,7 @@ StatsBox = StatsBox.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/Candy/[button]c.png b/game/themes/Candy/[button]c.png
new file mode 100644
index 00000000..fae96083
--- /dev/null
+++ b/game/themes/Candy/[button]c.png
Binary files differ
diff --git a/game/themes/Classic/Star.ini b/game/themes/Classic/Star.ini
index dfa5f096..9cf94d22 100644
--- a/game/themes/Classic/Star.ini
+++ b/game/themes/Classic/Star.ini
@@ -185,6 +185,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/Classic/[button]c.png b/game/themes/Classic/[button]c.png
new file mode 100644
index 00000000..fae96083
--- /dev/null
+++ b/game/themes/Classic/[button]c.png
Binary files differ
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
Binary files differ
diff --git a/game/themes/Temptation/Temptation (16-9).ini b/game/themes/Temptation/Temptation (16-9).ini
index 4cd5dc80..877aa229 100755
--- a/game/themes/Temptation/Temptation (16-9).ini
+++ b/game/themes/Temptation/Temptation (16-9).ini
@@ -204,6 +204,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/Temptation/Temptation (4-3).ini b/game/themes/Temptation/Temptation (4-3).ini
index 5cb26d72..eea20732 100755
--- a/game/themes/Temptation/Temptation (4-3).ini
+++ b/game/themes/Temptation/Temptation (4-3).ini
@@ -204,6 +204,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/Temptation/[button]c.png b/game/themes/Temptation/[button]c.png
new file mode 100644
index 00000000..fae96083
--- /dev/null
+++ b/game/themes/Temptation/[button]c.png
Binary files differ
diff --git a/game/themes/Verdure.ini b/game/themes/Verdure.ini
index 48d66e85..2e45e906 100644
--- a/game/themes/Verdure.ini
+++ b/game/themes/Verdure.ini
@@ -10,6 +10,7 @@ US_Version = USD 110
[Colors]
White = 255 255 255
+WhiteGray = 230 230 230
LightBlue = 119 187 210
DarkBlue = 28 126 171
LightRed = 170 146 146
@@ -52,18 +53,6 @@ Type = Colorized
Reflection = 1
ReflectionSpacing = 2
-[LoadingStatic3]
-X = 150
-Y = 180
-W = 500
-H = 180
-Z = 0.4
-Tex = LoadLogo
-Color = White
-Type = Transparent
-Reflection = 1
-ReflectionSpacing = 2
-
[LoadingStatic2]
X = 250
Y = 545
@@ -76,6 +65,18 @@ Type = Transparent
Reflection = 1
ReflectionSpacing = 2
+[LoadingStatic3]
+X = 150
+Y = 180
+W = 500
+H = 180
+Z = 0.4
+Tex = LoadLogo
+Color = White
+Type = Transparent
+Reflection = 1
+ReflectionSpacing = 2
+
[LoadingText1]
X = 30
Y = 548
@@ -111,15 +112,6 @@ Tex = MainIcon
Color = Black
Type = Transparent
-[MainStatic6]
-X = 95
-Y = 180
-W = 500
-H = 75
-Tex = MainTextBG
-Color = White
-Type = Transparent
-
[MainText1]
X = 140
Y = 176
@@ -187,7 +179,7 @@ Reflection = 1
ReflectionSpacing = 13
[MainStatic5]
-X = 400
+X = 515
Y = 545
W = 32
H = 30
@@ -199,7 +191,7 @@ Reflection = 1
ReflectionSpacing = 2
[MainText3]
-X = 440
+X = 555
Y = 548
Z = 0.5
Color = Black
@@ -210,6 +202,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
@@ -222,12 +238,6 @@ Type = Transparent
Texts = 1
Reflection = 1
ReflectionSpacing = 15
-;DeSelectReflectionSpacing = 280
-;Fade = 1
-;FadeText = 1
-;SelectH = 150
-;FadeTex = ButtonFade
-;FadeTexPos = 0
[MainButtonSoloText1]
X = 75
@@ -250,12 +260,6 @@ Type = Transparent
Texts = 1
Reflection = 1
ReflectionSpacing = 15
-;DeSelectReflectionSpacing = 280
-;Fade = 1
-;FadeText = 1
-;SelectH = 150
-;FadeTex = ButtonFade
-;FadeTexPos = 0
[MainButtonMultiText1]
X = 75
@@ -266,7 +270,7 @@ Align = 1
Text = SING_MULTI
Color = White
-[MainButtonCollection1]
+[MainButtonJukebox]
X = 405
Y = 270
W = 150
@@ -278,13 +282,34 @@ Type = Transparent
Texts = 1
Reflection = 1
ReflectionSpacing = 15
-;DeSelectReflectionSpacing = 280
+
+[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 = ButtonRight
+Color = ColorLight
+DColor = ColorDark
+Type = Transparent
+Texts = 1
+Reflection = 1
+ReflectionSpacing = 15
Fade = 1
FadeText = 0
SelectH = 150
FadeTex = ButtonFade
FadeTexPos = 0
-FirstChild = 3
+FirstChild = 4
[MainButtonCollection1Text1]
X = 75
@@ -296,7 +321,7 @@ Text = SING_TOOLS
Color = White
[MainButtonStats]
-X = 410
+X = 565
Y = 310
W = 140
H = 30
@@ -318,7 +343,7 @@ Text = SING_STATS
Color = White
[MainButtonEditor]
-X = 410
+X = 565
Y = 345
W = 140
H = 30
@@ -340,7 +365,7 @@ Text = SING_EDITOR
Color = White
[MainButtonOptions]
-X = 410
+X = 565
Y = 380
W = 140
H = 30
@@ -361,30 +386,42 @@ Align = 1
Text = SING_OPTIONS
Color = White
+[MainButtonAbout]
+X = 465
+Y = 490
+W = 120
+H = 40
+Tex = ButtonLeft
+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 = ButtonRight
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/Verdure/Drippin.ini b/game/themes/Verdure/Drippin.ini
index fdb843be..3cf08415 100644
--- a/game/themes/Verdure/Drippin.ini
+++ b/game/themes/Verdure/Drippin.ini
@@ -181,6 +181,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/Verdure/Drippin_Low.ini b/game/themes/Verdure/Drippin_Low.ini
index 24b8f003..b6ecbfd3 100644
--- a/game/themes/Verdure/Drippin_Low.ini
+++ b/game/themes/Verdure/Drippin_Low.ini
@@ -181,6 +181,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/Verdure/Drippin_Static.ini b/game/themes/Verdure/Drippin_Static.ini
index dd0d59d9..a5119b8c 100644
--- a/game/themes/Verdure/Drippin_Static.ini
+++ b/game/themes/Verdure/Drippin_Static.ini
@@ -181,6 +181,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/Verdure/Springtime.ini b/game/themes/Verdure/Springtime.ini
index 5edcdf3e..390d874f 100644
--- a/game/themes/Verdure/Springtime.ini
+++ b/game/themes/Verdure/Springtime.ini
@@ -181,6 +181,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/Verdure/Springtime_Low.ini b/game/themes/Verdure/Springtime_Low.ini
index 236e6146..84bc1f02 100644
--- a/game/themes/Verdure/Springtime_Low.ini
+++ b/game/themes/Verdure/Springtime_Low.ini
@@ -181,6 +181,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/Verdure/Springtime_Static.ini b/game/themes/Verdure/Springtime_Static.ini
index 657ce20b..849d2f05 100644
--- a/game/themes/Verdure/Springtime_Static.ini
+++ b/game/themes/Verdure/Springtime_Static.ini
@@ -181,6 +181,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/Verdure/[button]c.png b/game/themes/Verdure/[button]c.png
new file mode 100644
index 00000000..fae96083
--- /dev/null
+++ b/game/themes/Verdure/[button]c.png
Binary files differ
diff --git a/src/base/UThemes.pas b/src/base/UThemes.pas
index b5a0638a..f8de91ab 100644
--- a/src/base/UThemes.pas
+++ b/src/base/UThemes.pas
@@ -251,15 +251,17 @@ type
TThemeMain = class(TThemeBasic)
ButtonSolo: TThemeButton;
ButtonMulti: TThemeButton;
+ ButtonJukebox: TThemeButton;
ButtonStat: TThemeButton;
ButtonEditor: TThemeButton;
ButtonOptions: TThemeButton;
+ ButtonAbout: TThemeButton;
ButtonExit: TThemeButton;
TextDescription: TThemeText;
TextDescriptionLong: TThemeText;
- Description: array[0..5] of UTF8String;
- DescriptionLong: array[0..5] of UTF8String;
+ Description: array[0..7] of UTF8String;
+ DescriptionLong: array[0..7] of UTF8String;
end;
TThemeName = class(TThemeBasic)
@@ -780,6 +782,14 @@ type
SelectRound: array [0..6] of TThemeSelectSlide;
end;
+ //About
+ TThemeAboutMain = class(TThemeBasic)
+ ButtonCredits: TThemeButton;
+ ButtonExit: TThemeButton;
+
+ TextOverview: TThemeText;
+ end;
+
//Stats Screens
TThemeStatMain = class(TThemeBasic)
ButtonScores: TThemeButton;
@@ -868,6 +878,9 @@ type
PartyPlayer: TThemePartyPlayer;
PartyRounds: TThemePartyRounds;
+ // About
+ AboutMain: TThemeAboutMain;
+
//Stats Screens:
StatMain: TThemeStatMain;
StatDetail: TThemeStatDetail;
@@ -1003,6 +1016,9 @@ begin
PartyPlayer := TThemePartyPlayer.Create;
PartyRounds := TThemePartyRounds.Create;
+ // About
+ AboutMain := TThemeAboutMain.Create;
+
//Stats Screens:
StatMain := TThemeStatMain.Create;
StatDetail := TThemeStatDetail.Create;
@@ -1135,9 +1151,11 @@ begin
ThemeLoadText(Main.TextDescriptionLong, 'MainTextDescriptionLong');
ThemeLoadButton(Main.ButtonSolo, 'MainButtonSolo');
ThemeLoadButton(Main.ButtonMulti, 'MainButtonMulti');
+ ThemeLoadButton(Main.ButtonJukebox, 'MainButtonJukebox');
ThemeLoadButton(Main.ButtonStat, 'MainButtonStats');
ThemeLoadButton(Main.ButtonEditor, 'MainButtonEditor');
ThemeLoadButton(Main.ButtonOptions, 'MainButtonOptions');
+ ThemeLoadButton(Main.ButtonAbout, 'MainButtonAbout');
ThemeLoadButton(Main.ButtonExit, 'MainButtonExit');
//Main Desc Text Translation Start
@@ -1146,14 +1164,18 @@ begin
Main.DescriptionLong[0] := Language.Translate('SING_SING_DESC');
Main.Description[1] := Language.Translate('SING_MULTI');
Main.DescriptionLong[1] := Language.Translate('SING_MULTI_DESC');
- Main.Description[2] := Language.Translate('SING_STATS');
- Main.DescriptionLong[2] := Language.Translate('SING_STATS_DESC');
- Main.Description[3] := Language.Translate('SING_EDITOR');
- Main.DescriptionLong[3] := Language.Translate('SING_EDITOR_DESC');
- Main.Description[4] := Language.Translate('SING_GAME_OPTIONS');
- Main.DescriptionLong[4] := Language.Translate('SING_GAME_OPTIONS_DESC');
- Main.Description[5] := Language.Translate('SING_EXIT');
- Main.DescriptionLong[5] := Language.Translate('SING_EXIT_DESC');
+ Main.Description[2] := Language.Translate('SING_JUKEBOX');
+ Main.DescriptionLong[2] := Language.Translate('SING_JUKEBOX_DESC');
+ Main.Description[3] := Language.Translate('SING_STATS');
+ Main.DescriptionLong[3] := Language.Translate('SING_STATS_DESC');
+ Main.Description[4] := Language.Translate('SING_EDITOR');
+ Main.DescriptionLong[4] := Language.Translate('SING_EDITOR_DESC');
+ Main.Description[5] := Language.Translate('SING_GAME_OPTIONS');
+ Main.DescriptionLong[5] := Language.Translate('SING_GAME_OPTIONS_DESC');
+ Main.Description[6] := Language.Translate('SING_ABOUT');
+ Main.DescriptionLong[6] := Language.Translate('SING_ABOUT_DESC');
+ Main.Description[7] := Language.Translate('SING_EXIT');
+ Main.DescriptionLong[7] := Language.Translate('SING_EXIT_DESC');
//Main Desc Text Translation End
@@ -1736,6 +1758,13 @@ begin
{ThemeLoadButton(ButtonNext, 'PartyPlayerButtonNext');
ThemeLoadButton(ButtonPrev, 'PartyPlayerButtonPrev');}
+ // About
+ ThemeLoadBasic(AboutMain, 'AboutMain');
+ ThemeLoadButton(AboutMain.ButtonCredits, 'AboutMainButtonCredits');
+ ThemeLoadButton(AboutMain.ButtonExit, 'AboutMainButtonExit');
+ ThemeLoadText (AboutMain.TextOverview, 'AboutMainTextOverview');
+
+ // Stats
ThemeLoadBasic(StatMain, 'StatMain');
ThemeLoadButton(StatMain.ButtonScores, 'StatMainButtonScores');
@@ -2816,10 +2845,13 @@ begin
freeandnil(Sing);
Sing := TThemeSing.Create;
-
+
freeandnil(Jukebox);
Jukebox := TThemeJukebox.Create;
+ freeandnil(AboutMain);
+ AboutMain := TThemeAboutMain.Create;
+
freeandnil(Score);
Score := TThemeScore.Create;
diff --git a/src/screens/UScreenMain.pas b/src/screens/UScreenMain.pas
index b603fb29..1d6992f9 100644
--- a/src/screens/UScreenMain.pas
+++ b/src/screens/UScreenMain.pas
@@ -286,11 +286,11 @@ begin
AddButton(Theme.Main.ButtonSolo);
AddButton(Theme.Main.ButtonMulti);
-// disable for now AddButton(Theme.Main.ButtonJukebox);
+ AddButton(Theme.Main.ButtonJukebox);
AddButton(Theme.Main.ButtonStat);
AddButton(Theme.Main.ButtonEditor);
AddButton(Theme.Main.ButtonOptions);
-// disable for now AddButton(Theme.Main.ButtonAbout);
+ AddButton(Theme.Main.ButtonAbout);
AddButton(Theme.Main.ButtonExit);
Interaction := 0;