Makes use of the new text reflection, some positions are unified, main options screen has longer descriptions for the settings

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

1 files changed, 200 insertions, 196 deletions

diff --git a/Themes/Deluxe.ini b/Themes/Deluxe.ini
index 9bd6b4bb..8bbe7288 100644
--- a/Themes/Deluxe.ini
+++ b/Themes/Deluxe.ini
@@ -52,10 +52,10 @@ Text = SING_LOADING
 

 [LoadingText2]

 X = 790

-Y = 556

+Y = 550

 Color = Black

 Font = 0

-Size = 6

+Size = 10

 Align = 2

 Text = US_VERSION

 

@@ -124,7 +124,7 @@ Tex = ButtonNavi
 Color = White

 Type = Transparent

 Reflection = 1

-ReflectionSpacing = 9

+ReflectionSpacing = 2

 

 [MainText2]

 X = 300

@@ -134,6 +134,8 @@ Font = 0
 Size = 8

 Align = 0

 Text = SING_LEGEND_NAVIGATE

+Reflection = 1

+ReflectionSpacing = 20

 

 [MainStatic5]

 X = 400

@@ -144,7 +146,7 @@ Tex = ButtonEnter
 Color = White

 Type = Transparent

 Reflection = 1

-ReflectionSpacing = 9

+ReflectionSpacing = 2

 

 [MainText3]

 X = 440

@@ -154,6 +156,8 @@ Font = 0
 Size = 8

 Align = 0

 Text = SING_LEGEND_SELECT

+Reflection = 1

+ReflectionSpacing = 20

 

 [MainButtonSolo]

 X = 95

@@ -472,6 +476,16 @@ H = 27
 Color = White

 Tex = SongCD

 Type = Colorized

+#Texts Non Party

+

+[SongTextNonParty1]

+X = 70

+Y = 6

+Color = White

+Font = 0

+Size = 20

+Text = SING_SONG_SELECTION

+Align = 0

 

 # NAVBAR #########################

 # Jump to a letter with [ALT] + [A..Z]

@@ -484,14 +498,14 @@ Tex = ButtonAlt
 Color = White

 Type = Transparent

 Reflection = 1

-ReflectionSpacing = 9

+ReflectionSpacing = 2

 

-[SongTextNonParty3]

-X = 288

+[SongTextNonParty2]

+X = 292

 Y = 548

 Color = Black

-Font = 1

-Size = 5

+Font = 0

+Size = 8

 Align = 0

 Text = +

 

@@ -504,9 +518,9 @@ Tex = ButtonAZ
 Color = White

 Type = Transparent

 Reflection = 1

-ReflectionSpacing = 9

+ReflectionSpacing = 2

 

-[SongTextNonParty4]

+[SongTextNonParty3]

 X = 340

 Y = 548

 Color = Black

@@ -514,6 +528,8 @@ Font = 0
 Size = 8

 Align = 0

 Text = SING_SONG_SELECTION_GOTO

+Reflection = 1

+ReflectionSpacing = 20

 

 # Menu opens with [M]

 [SongStaticNonParty4]

@@ -525,9 +541,9 @@ Tex = ButtonM
 Color = White

 Type = Transparent

 Reflection = 1

-ReflectionSpacing = 9

+ReflectionSpacing = 2

 

-[SongTextNonParty5]

+[SongTextNonParty4]

 X = 465

 Y = 548

 Color = Black

@@ -535,6 +551,8 @@ Font = 0
 Size = 8

 Align = 0

 Text = SING_SONG_SELECTION_MENU

+Reflection = 1

+ReflectionSpacing = 20

 

 # The so famous search, shown with [J]

 [SongStaticNonParty5]

@@ -546,9 +564,9 @@ Tex = ButtonJ
 Color = White

 Type = Transparent

 Reflection = 1

-ReflectionSpacing = 9

+ReflectionSpacing = 2

 

-[SongTextNonParty6]

+[SongTextNonParty5]

 X = 555

 Y = 548

 Color = Black

@@ -556,6 +574,8 @@ Font = 0
 Size = 8

 Align = 0

 Text = SONG_JUMPTO_DESC

+Reflection = 1

+ReflectionSpacing = 20

 

 # [P]laylist ;)

 [SongStaticNonParty6]

@@ -567,9 +587,9 @@ Tex = ButtonP
 Color = White

 Type = Transparent

 Reflection = 1

-ReflectionSpacing = 9

+ReflectionSpacing = 2

 

-[SongTextNonParty7]

+[SongTextNonParty6]

 X = 720

 Y = 548

 Color = Black

@@ -577,26 +597,8 @@ Font = 0
 Size = 8

 Align = 0

 Text = SING_SONG_SELECTION_PLAYLIST

-

-#Texts Non Party

-[SongTextNonParty1]

-X = 70

-Y = 6

-Color = White

-Font = 0

-Size = 20

-Text = SING_SONG_SELECTION

-Align = 0

-

-[SongTextNonParty2]

-X = 238

-Y = 548

-Color = Black

-Font = 0

-Size = 7

-Align = 2

-Text = SING_SONG_SELECTION_WHEREAMI

-

+Reflection = 1

+ReflectionSpacing = 20

 

 #and these are the ones for partymode

 [SongStaticParty1]

@@ -1265,32 +1267,27 @@ Type = Transparent
 Reflection = 1

 ReflectionSpacing = 2

 

-[ScoreText2]

-X = 238

-Y = 552

-Color = Black

-Font = 0

-Size = 7

-Align = 2

-Text = SONG_SCORE_WHEREAMI

-

 [ScoreStatic4]

 X = 260

-Y = 552

-W = 24

-H = 23

+Y = 545

+W = 32

+H = 30

 Tex = ButtonEnter

 Color = White

 Type = Transparent

+Reflection = 1

+ReflectionSpacing = 2

 

-[ScoreText3]

-X = 290

-Y = 552

+[ScoreText2]

+X = 300

+Y = 548

 Color = Black

 Font = 0

-Size = 7

+Size = 8

 Align = 0

 Text = SING_LEGEND_CONTINUE

+Reflection = 1

+ReflectionSpacing = 20

 #end of main stuff

 

 # # # # # # # # # # # # # # # # # # One Player Score # # # # # # # # # # # #

@@ -2463,14 +2460,14 @@ Size = 10
 Align = 0

 Text = SING_OPTIONS_DESC

 

-;[OptionsText6]

-;X = 238

-;Y = 552

-;Color = Black

-;Font = 0

-;Size = 7

-;Align = 2

-;Text = SING_OPTIONS_WHEREAMI

+[OptionsTextDescription]

+X = 93

+Y = 195

+Color = White

+Font = 0

+Size = 10

+Align = 0

+Text = 

 

 [OptionsStatic2]

 X = 0

@@ -2503,7 +2500,7 @@ Tex = ButtonNavi
 Color = White

 Type = Transparent

 Reflection = 1

-ReflectionSpacing = 9

+ReflectionSpacing = 2

 

 [OptionsText3]

 X = 300

@@ -2513,6 +2510,8 @@ Font = 0
 Size = 8

 Align = 0

 Text = SING_LEGEND_NAVIGATE

+Reflection=1

+ReflectionSpacing=20

 

 [OptionsStatic5]

 X = 400

@@ -2523,7 +2522,7 @@ Tex = ButtonEnter
 Color = White

 Type = Transparent

 Reflection = 1

-ReflectionSpacing = 9

+ReflectionSpacing = 2

 

 [OptionsText4]

 X = 440

@@ -2533,6 +2532,8 @@ Font = 0
 Size = 8

 Align = 0

 Text = SING_LEGEND_SELECT

+Reflection=1

+ReflectionSpacing=20

 

 [OptionsStatic6]

 X = 550

@@ -2543,7 +2544,7 @@ Tex = ButtonEsc
 Color = White

 Type = Transparent

 Reflection = 1

-ReflectionSpacing = 9

+ReflectionSpacing = 2

 

 [OptionsText5]

 X = 590

@@ -2553,10 +2554,12 @@ Font = 0
 Size = 8

 Align = 0

 Text = SING_LEGEND_ESC

+Reflection=1

+ReflectionSpacing=20

 

 [OptionsButtonGame]

 X = 95

-Y = 215

+Y = 235

 W = 150

 H = 50

 Tex = Button

@@ -2581,7 +2584,7 @@ Color = White
 

 [OptionsButtonGraphics]

 X = 250

-Y = 215

+Y = 235

 W = 150

 H = 50

 Tex = Button

@@ -2606,7 +2609,7 @@ Color = White
 

 [OptionsButtonSound]

 X = 405

-Y = 215

+Y = 235

 W = 150

 H = 50

 Tex = Button

@@ -2631,7 +2634,7 @@ Color = White
 

 [OptionsButtonLyrics]

 X = 560

-Y = 215

+Y = 235

 W = 150

 H = 50

 Tex = Button

@@ -4536,6 +4539,33 @@ Texts = 5
 Tex = MainBG

 

 [LevelStatic1]

+X = 65

+Y = 205

+W = 25

+H = 23

+Tex = MainIcon

+Color = White

+Type = Transparent

+

+[LevelText1]

+X = 95

+Y = 190

+Color = White

+Font = 0

+Size = 18

+Align = 0

+Text = SING_MODE

+

+[LevelText2]

+X = 95

+Y = 230

+Color = ColorLightest

+Font = 0

+Size = 10

+Align = 0

+Text = SING_DIFFICULTY_DESC

+

+[LevelStatic2]

 X = 0

 Y = 545

 W = 250

@@ -4546,7 +4576,7 @@ Type = Colorized
 Reflection = 1

 ReflectionSpacing = 2

 

-[LevelStatic2]

+[LevelStatic3]

 X = 250

 Y = 545

 W = 550

@@ -4557,81 +4587,49 @@ Type = Transparent
 Reflection = 1

 ReflectionSpacing = 2

 

-[LevelStatic3]

-X = 40

-Y = 22

-W = 27

-H = 27

-Color = White

-Tex = MainIcon

-Type = Colorized

-

 [LevelStatic4]

 X = 260

-Y = 552

-W = 24

-H = 23

+Y = 545

+W = 32

+H = 30

 Tex = ButtonNavi

 Color = White

 Type = Transparent

-Style = 5

+Reflection = 1

+ReflectionSpacing = 2

 

 [LevelStatic5]

-X = 388

-Y = 552

-W = 24

-H = 23

+X = 400

+Y = 545

+W = 32

+H = 30

 Tex = ButtonEnter

 Color = White

 Type = Transparent

-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

+Reflection = 1

+ReflectionSpacing = 2

 

 [LevelText3]

-X = 238

-Y = 552

-Color = Black

-Font = 0

-Size = 7

-Align = 2

-Text = SING_DIFFICULTY_WHEREAMI

-

-[LevelText4]

-X = 294

-Y = 552

+X = 300

+Y = 548

 Color = Black

 Font = 0

-Size = 7

+Size = 8

 Align = 0

 Text = SING_LEGEND_NAVIGATE

+Reflection = 1

+ReflectionSpacing = 20

 

-[LevelText5]

-X = 418

-Y = 552

+[LevelText4]

+X = 440

+Y = 548

 Color = Black

 Font = 0

-Size = 7

+Size = 8

 Align = 0

 Text = SING_DIFFICULTY_CONTINUE

+Reflection = 1

+ReflectionSpacing = 20

 

 [LevelButtonEasy]

 X = 180

@@ -4639,13 +4637,16 @@ Y = 270
 W = 150

 H = 50

 Tex = Button

-Color = DarkBlue

-DColor = LightBlue

+Color = ColorLight

+DColor = ColorDark

 Type = Colorized

 Texts = 1

+Reflection = 1

+ReflectionSpacing = 15

+DeSelectReflectionSpacing = 280

 Fade = 1

 FadeText = 1

-SelectH = 100

+SelectH = 150

 FadeTex = ButtonFade

 FadeTexPos = 0

 

@@ -4655,13 +4656,16 @@ Y = 270
 W = 150

 H = 50

 Tex = Button

-Color = DarkBlue

-DColor = LightBlue

+Color = ColorLight

+DColor = ColorDark

 Type = Colorized

 Texts = 1

+Reflection = 1

+ReflectionSpacing = 15

+DeSelectReflectionSpacing = 280

 Fade = 1

 FadeText = 1

-SelectH = 100

+SelectH = 150

 FadeTex = ButtonFade

 FadeTexPos = 0

 

@@ -4671,13 +4675,16 @@ Y = 270
 W = 150

 H = 50

 Tex = Button

-Color = DarkBlue

-DColor = LightBlue

+Color = ColorLight

+DColor = ColorDark

 Type = Colorized

 Texts = 1

+Reflection = 1

+ReflectionSpacing = 15

+DeSelectReflectionSpacing = 280

 Fade = 1

 FadeText = 1

-SelectH = 100

+SelectH = 150

 FadeTex = ButtonFade

 FadeTexPos = 0

 

@@ -4715,6 +4722,32 @@ Texts = 2
 Tex = MainBG

 

 [NameStatic1]

+X = 65

+Y = 205

+W = 25

+H = 23

+Tex = MainIcon

+Color = White

+Type = Transparent

+

+[NameText1]

+X = 95

+Y = 190

+Color = White

+Font = 0

+Size = 18

+Text = SING_MODE

+

+[NameText2]

+X = 95

+Y = 230

+Color = ColorLightest

+Font = 0

+Size = 10

+Align = 0

+Text = SING_PLAYER_DESC

+

+[NameStatic2]

 X = 0

 Y = 545

 W = 250

@@ -4725,7 +4758,7 @@ Type = Colorized
 Reflection = 1

 ReflectionSpacing = 2

 

-[NameStatic2]

+[NameStatic3]

 X = 250

 Y = 545

 W = 550

@@ -4736,100 +4769,71 @@ Type = Transparent
 Reflection = 1

 ReflectionSpacing = 2

 

-[NameStatic3]

-X = 40

-Y = 22

-W = 27

-H = 27

-Color = White

-Tex = MainIcon

-Type = Colorized

-

-[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_PLAYER_WHEREAMI

-

 [NameStatic4]

 X = 260

-Y = 552

-W = 24

-H = 23

+Y = 545

+W = 32

+H = 30

 Tex = ButtonNavi

 Color = White

 Type = Transparent

-Style = 5

+Reflection = 1

+ReflectionSpacing = 2

 

-[NameText4]

-X = 294

-Y = 552

+[NameText3]

+X = 300

+Y = 548

 Color = Black

 Font = 0

-Size = 7

+Size = 8

 Align = 0

 Text = SING_LEGEND_NAVIGATE

+Reflection = 1

+ReflectionSpacing = 20

 

 [NameStatic5]

-X = 388

-Y = 552

+X = 400

+Y = 545

 W = 32

-H = 23

+H = 30

 Tex = ButtonAZ

 Color = White

 Type = Transparent

-Style = 5

+Reflection = 1

+ReflectionSpacing = 2

 

-[NameText5]

-X = 418

-Y = 552

+[NameText4]

+X = 440

+Y = 548

 Color = Black

 Font = 0

-Size = 7

+Size = 8

 Align = 0

 Text = SING_PLAYER_ENTER_NAME

+Reflection = 1

+ReflectionSpacing = 20

 

 [NameStatic6]

-X = 556

-Y = 552

-W = 24

-H = 23

+X = 590

+Y = 545

+W = 32

+H = 30

 Tex = ButtonEnter

 Color = White

 Type = Transparent

-Style = 5

+Reflection = 1

+ReflectionSpacing = 2

 

-[NameText6]

-X = 586

-Y = 552

+[NameText5]

+X = 630

+Y = 548

 Color = Black

 Font = 0

-Size = 7

+Size = 8

 Align = 0

 Text = SING_LEGEND_CONTINUE

+Reflection = 1

+ReflectionSpacing = 20

 

 [NameButtonPlayer1]

 X = 180