Added: Option for background music in sound options (affects UIni too)

Added: New language string SING_OPTIONS_SOUND_BACKGROUNDMUSIC
Added: CC licensed music loop
Improved: Options positions via Deluxe theme (first pass, next will follow)
Improved: Code beautified in UScreenMain

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

1 files changed, 388 insertions, 374 deletions

diff --git a/Themes/Deluxe.ini b/Themes/Deluxe.ini
index 4a10fa04..e1edbd04 100644
--- a/Themes/Deluxe.ini
+++ b/Themes/Deluxe.ini
@@ -2457,7 +2457,7 @@ Tex = IconOption
 Type = Colorized
 
 [OptionsText1]
-X = 93
+X = 95
 Y = 135
 Color = White
 Font = 0
@@ -2466,7 +2466,7 @@ Text = SING_OPTIONS
 Align = 0
 
 [OptionsText2]
-X = 93
+X = 95
 Y = 175
 Color = ColorLightest
 Font = 0
@@ -2475,7 +2475,7 @@ Align = 0
 Text = SING_OPTIONS_DESC
 
 [OptionsTextDescription]
-X = 93
+X = 95
 Y = 195
 Color = White
 Font = 0
@@ -2787,11 +2787,32 @@ Tex = OptionsBG
 [OptionsGameStatic1]
 X = 65
 Y = 22
-W = 27
-H = 27
+W = 25
+H = 23
 Color = White
 Tex = IconOption
-Type = Colorized
+Type = Transparent
+
+[OptionsGameText1]
+X = 95
+Y = 5
+Color = White
+Size = 18
+Text = SING_OPTIONS
+
+[OptionsGameText2]
+X = 95
+Y = 45
+Color = ColorLightest
+Size = 10
+Text = SING_OPTIONS_GAME_DESC
+
+[OptionsGameText3]
+X = 95
+Y = 65
+Color = White
+Size = 10
+Text = SING_OPTIONS_GAME_WHEREAMI
 
 [OptionsGameStatic2]
 X = 0
@@ -2817,66 +2838,44 @@ ReflectionSpacing = 2
 
 [OptionsGameStatic4]
 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
+
+[OptionsGameText4]
+X = 300
+Y = 548
+Z = 0.5
+Color = Black
+Size = 8
+Reflection = 1
+ReflectionSpacing = 20
+Text = SING_LEGEND_NAVIGATE
 
 [OptionsGameStatic5]
-X = 388
-Y = 552
+X = 400
+Y = 545
 W = 32
-H = 23
+H = 30
 Tex = ButtonEsc
 Color = White
 Type = Transparent
-
-[OptionsGameText1]
-X = 70
-Y = 6
-Color = White
-Font = 0
-Size = 20
-Text = SING_OPTIONS
-Align = 0
-
-[OptionsGameText2]
-X = 238
-Y = 552
-Color = Black
-Font = 0
-Size = 7
-Align = 2
-Text = SING_OPTIONS_GAME_WHEREAMI
-
-[OptionsGameText3]
-X = 70
-Y = 53
-Color = White
-Font = 0
-Size = 10
-Align = 0
-Text = SING_OPTIONS_GAME_DESC
-
-[OptionsGameText4]
-X = 294
-Y = 552
-Color = Black
-Font = 0
-Size = 7
-Align = 0
-Text = SING_LEGEND_NAVIGATE
+Reflection = 1
+ReflectionSpacing = 2
 
 [OptionsGameText5]
-X = 418
-Y = 552
+X = 440
+Y = 548
+Z = 0.5
 Color = Black
-Font = 0
-Size = 7
-Align = 0
+Size = 8
+Reflection = 1
+ReflectionSpacing = 20
 Text = SING_LEGEND_ESC
 
 [OptionsGameSelectPlayers]
@@ -3024,13 +3023,34 @@ Texts = 5
 Tex = OptionsBG
 
 [OptionsGraphicsStatic1]
-X = 40
+X = 65
 Y = 22
-W = 27
-H = 27
+W = 25
+H = 23
 Color = White
 Tex = IconOption
-Type = Colorized
+Type = Transparent
+
+[OptionsGraphicsText1]
+X = 95
+Y = 5
+Color = White
+Size = 18
+Text = SING_OPTIONS
+
+[OptionsGraphicsText2]
+X = 95
+Y = 45
+Color = ColorLightest
+Size = 10
+Text = SING_OPTIONS_GRAPHICS_DESC
+
+[OptionsGraphicsText3]
+X = 95
+Y = 65
+Color = White
+Size = 10
+Text = SING_OPTIONS_GRAPHICS_WHEREAMI
 
 [OptionsGraphicsStatic2]
 X = 0
@@ -3056,67 +3076,46 @@ ReflectionSpacing = 2
 
 [OptionsGraphicsStatic4]
 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
+
+[OptionsGraphicsText4]
+X = 300
+Y = 548
+Z = 0.5
+Color = Black
+Size = 8
+Text = SING_LEGEND_NAVIGATE
+Reflection = 1
+ReflectionSpacing = 20
 
 [OptionsGraphicsStatic5]
-X = 388
-Y = 552
+X = 400
+Y = 545
 W = 32
-H = 23
+H = 30
+Z = 0.5
 Tex = ButtonEsc
 Color = White
 Type = Transparent
-
-[OptionsGraphicsText1]
-X = 70
-Y = 6
-Color = White
-Font = 0
-Size = 20
-Text = SING_OPTIONS
-Align = 0
-
-[OptionsGraphicsText2]
-X = 238
-Y = 552
-Color = Black
-Font = 0
-Size = 7
-Align = 2
-Text = SING_OPTIONS_GRAPHICS_WHEREAMI
-
-[OptionsGraphicsText3]
-X = 70
-Y = 53
-Color = White
-Font = 0
-Size = 10
-Align = 0
-Text = SING_OPTIONS_GRAPHICS_DESC
-
-[OptionsGraphicsText4]
-X = 294
-Y = 552
-Color = Black
-Font = 0
-Size = 7
-Align = 0
-Text = SING_LEGEND_NAVIGATE
+Reflection = 1
+ReflectionSpacing = 2
 
 [OptionsGraphicsText5]
-X = 418
-Y = 552
+X = 440
+Y = 548
+Z = 0.5
 Color = Black
-Font = 0
-Size = 7
-Align = 0
+Size = 8
 Text = SING_LEGEND_ESC
+Reflection = 1
+ReflectionSpacing = 20
 
 [OptionsGraphicsSelectSlideResolution]
 Text = SING_OPTIONS_GRAPHICS_RESOLUTION
@@ -3263,13 +3262,34 @@ Texts = 5
 Tex = OptionsBG
 
 [OptionsSoundStatic1]
-X = 40
+X = 65
 Y = 22
-W = 27
-H = 27
+W = 25
+H = 23
 Color = White
 Tex = IconOption
-Type = Colorized
+Type = Transparent
+
+[OptionsSoundText1]
+X = 95
+Y = 5
+Color = White
+Size = 18
+Text = SING_OPTIONS
+
+[OptionsSoundText2]
+X = 95
+Y = 45
+Color = ColorLightest
+Size = 10
+Text = SING_OPTIONS_SOUND_DESC
+
+[OptionsSoundText3]
+X = 95
+Y = 65
+Color = White
+Size = 10
+Text = SING_OPTIONS_SOUND_WHEREAMI
 
 [OptionsSoundStatic2]
 X = 0
@@ -3295,67 +3315,45 @@ ReflectionSpacing = 2
 
 [OptionsSoundStatic4]
 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
+
+[OptionsSoundText4]
+X = 300
+Y = 548
+Z = 0.5
+Color = Black
+Size = 8
+Text = SING_LEGEND_NAVIGATE
+Reflection = 1
+ReflectionSpacing = 20
 
 [OptionsSoundStatic5]
-X = 388
-Y = 552
+X = 400
+Y = 545
 W = 32
-H = 23
+H = 30
 Tex = ButtonEsc
 Color = White
 Type = Transparent
-
-[OptionsSoundText1]
-X = 70
-Y = 6
-Color = White
-Font = 0
-Size = 20
-Text = SING_OPTIONS
-Align = 0
-
-[OptionsSoundText2]
-X = 238
-Y = 552
-Color = Black
-Font = 0
-Size = 7
-Align = 2
-Text = SING_OPTIONS_SOUND_WHEREAMI
-
-[OptionsSoundText3]
-X = 70
-Y = 53
-Color = White
-Font = 0
-Size = 10
-Align = 0
-Text = SING_OPTIONS_SOUND_DESC
-
-[OptionsSoundText4]
-X = 294
-Y = 552
-Color = Black
-Font = 0
-Size = 7
-Align = 0
-Text = SING_LEGEND_NAVIGATE
+Reflection = 1
+ReflectionSpacing = 2
 
 [OptionsSoundText5]
-X = 418
-Y = 552
+X = 440
+Y = 548
+Z = 0.5
 Color = Black
-Font = 0
-Size = 7
-Align = 0
+Size = 8
 Text = SING_LEGEND_ESC
+Reflection = 1
+ReflectionSpacing = 20
 
 [OptionsSoundSelectVoicePassthrough]
 Tex = MainBar
@@ -3377,12 +3375,32 @@ SBGDColor = Gray
 STColor = White
 STDColor = GrayDark
 
+[OptionsSoundSelectBackgroundMusic]
+Tex = MainBar
+TexSBG = SelectBG
+Text = SING_OPTIONS_SOUND_BACKGROUNDMUSIC
+X = 70
+Y = 135
+W = 230
+H = 40
+SkipX = 10
+
+Color = ColorDark
+DColor = Gray
+TColor = White
+TDColor = White
+SBGTex = MainBar
+SBGColor = ColorDark
+SBGDColor = Gray
+STColor = White
+STDColor = GrayDark
+
 [OptionsSoundSelectMicBoost]
 Tex = MainBar
 TexSBG = SelectBG
 Text = SING_OPTIONS_SOUND_MIC_BOOST
 X = 70
-Y = 135
+Y = 185
 W = 230
 H = 40
 SkipX = 10
@@ -3402,7 +3420,7 @@ Tex = MainBar
 TexSBG = SelectBG
 Text = SING_OPTIONS_SOUND_CLICK_ASSIST
 X = 70
-Y = 185
+Y = 235
 W = 230
 H = 40
 SkipX = 10
@@ -3422,7 +3440,7 @@ Tex = MainBar
 TexSBG = SelectBG
 Text = SING_OPTIONS_SOUND_BEAT_CLICK
 X = 70
-Y = 235
+Y = 285
 W = 230
 H = 40
 SkipX = 10
@@ -3442,7 +3460,7 @@ Tex = MainBar
 TexSBG = SelectBG
 Text = SING_OPTIONS_SOUND_THRESHOLD
 X = 70
-Y = 285
+Y = 335
 W = 230
 H = 40
 SkipX = 10
@@ -3462,7 +3480,7 @@ Tex = MainBar
 TexSBG = SelectBG
 Text = SING_OPTIONS_SOUND_PREVIEWVOLUME
 X = 70
-Y = 335
+Y = 385
 W = 230
 H = 40
 SkipX = 10
@@ -3482,7 +3500,7 @@ Tex = MainBar
 TexSBG = SelectBG
 Text = SING_OPTIONS_SOUND_PREVIEWFADING
 X = 70
-Y = 385
+Y = 435
 W = 230
 H = 40
 SkipX = 10
@@ -3499,9 +3517,9 @@ STDColor = GrayDark
 
 [OptionsSoundButtonExit]
 X = 40
-Y = 415
+Y = 465
 W = 230
-H = 70
+H = 50
 Tex = Button
 Color = ColorLight
 DColor = ColorDark
@@ -3516,13 +3534,34 @@ Texts = 1
 Tex = OptionsBG
 
 [OptionsLyricsStatic1]
-X = 40
+X = 65
 Y = 22
-W = 27
-H = 27
+W = 25
+H = 23
 Color = White
 Tex = IconOption
-Type = Colorized
+Type = Transparent
+
+[OptionsLyricsText1]
+X = 95
+Y = 5
+Color = White
+Size = 18
+Text = SING_OPTIONS
+
+[OptionsLyricsText2]
+X = 95
+Y = 45
+Color = ColorLightest
+Size = 10
+Text = SING_OPTIONS_LYRICS_DESC
+
+[OptionsLyricsText3]
+X = 95
+Y = 65
+Color = White
+Size = 10
+Text = SING_OPTIONS_LYRICS_WHEREAMI
 
 [OptionsLyricsStatic2]
 X = 0
@@ -3548,67 +3587,45 @@ ReflectionSpacing = 2
 
 [OptionsLyricsStatic4]
 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
+
+[OptionsLyricsText4]
+X = 300
+Y = 548
+Z = 0.5
+Color = Black
+Size = 8
+Text = SING_LEGEND_NAVIGATE
+Reflection = 1
+ReflectionSpacing = 20
 
 [OptionsLyricsStatic5]
-X = 388
-Y = 552
+X = 400
+Y = 545
 W = 32
-H = 23
+H = 30
 Tex = ButtonEsc
 Color = White
 Type = Transparent
-
-[OptionsLyricsText1]
-X = 70
-Y = 6
-Color = White
-Font = 0
-Size = 20
-Text = SING_OPTIONS
-Align = 0
-
-[OptionsLyricsText2]
-X = 238
-Y = 552
-Color = Black
-Font = 0
-Size = 7
-Align = 2
-Text = SING_OPTIONS_LYRICS_WHEREAMI
-
-[OptionsLyricsText3]
-X = 70
-Y = 53
-Color = White
-Font = 0
-Size = 10
-Align = 0
-Text = SING_OPTIONS_LYRICS_DESC
-
-[OptionsLyricsText4]
-X = 294
-Y = 552
-Color = Black
-Font = 0
-Size = 7
-Align = 0
-Text = SING_LEGEND_NAVIGATE
+Reflection = 1
+ReflectionSpacing = 2
 
 [OptionsLyricsText5]
-X = 418
-Y = 552
+X = 440
+Y = 548
+Z = 0.5
 Color = Black
-Font = 0
-Size = 7
-Align = 0
+Size = 8
 Text = SING_LEGEND_ESC
+Reflection = 1
+ReflectionSpacing = 20
 
 [OptionsLyricsSelectLyricsFont]
 Tex = MainBar
@@ -3689,13 +3706,34 @@ Texts = 5
 Tex = OptionsBG
 
 [OptionsThemesStatic1]
-X = 40
+X = 65
 Y = 22
-W = 27
-H = 27
+W = 25
+H = 23
 Color = White
 Tex = IconOption
-Type = Colorized
+Type = Transparent
+
+[OptionsThemesText1]
+X = 95
+Y = 5
+Color = White
+Size = 18
+Text = SING_OPTIONS
+
+[OptionsThemesText2]
+X = 95
+Y = 45
+Color = ColorLightest
+Size = 10
+Text = SING_OPTIONS_THEMES_DESC
+
+[OptionsThemesText3]
+X = 95
+Y = 65
+Color = White
+Size = 10
+Text = SING_OPTIONS_THEMES_WHEREAMI
 
 [OptionsThemesStatic2]
 X = 0
@@ -3721,66 +3759,44 @@ ReflectionSpacing = 2
 
 [OptionsThemesStatic4]
 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
+
+[OptionsThemesText4]
+X = 300
+Y = 548
+Z = 0.5
+Color = Black
+Size = 8
+Reflection = 1
+ReflectionSpacing = 20
+Text = SING_LEGEND_NAVIGATE
 
 [OptionsThemesStatic5]
-X = 388
-Y = 552
+X = 400
+Y = 545
 W = 32
-H = 23
+H = 30
 Tex = ButtonEsc
 Color = White
 Type = Transparent
-
-[OptionsThemesText1]
-X = 70
-Y = 6
-Color = White
-Font = 0
-Size = 20
-Text = SING_OPTIONS
-Align = 0
-
-[OptionsThemesText2]
-X = 238
-Y = 552
-Color = Black
-Font = 0
-Size = 7
-Align = 2
-Text = SING_OPTIONS_THEMES_WHEREAMI
-
-[OptionsThemesText3]
-X = 70
-Y = 53
-Color = White
-Font = 0
-Size = 10
-Align = 0
-Text = SING_OPTIONS_THEMES_DESC
-
-[OptionsThemesText4]
-X = 294
-Y = 552
-Color = Black
-Font = 0
-Size = 7
-Align = 0
-Text = SING_LEGEND_NAVIGATE
+Reflection = 1
+ReflectionSpacing = 2
 
 [OptionsThemesText5]
-X = 418
-Y = 552
+X = 440
+Y = 548
+Z = 0.5
 Color = Black
-Font = 0
-Size = 7
-Align = 0
+Size = 8
+Reflection = 1
+ReflectionSpacing = 20
 Text = SING_LEGEND_ESC
 
 [OptionsThemesSelectTheme]
@@ -3862,13 +3878,34 @@ Texts = 5
 Tex = OptionsBG
 
 [OptionsRecordStatic1]
-X = 40
+X = 65
 Y = 22
-W = 27
-H = 27
+W = 25
+H = 23
 Color = White
 Tex = IconOption
-Type = Colorized
+Type = Transparent
+
+[OptionsRecordText1]
+X = 95
+Y = 5
+Color = White
+Size = 18
+Text = SING_OPTIONS
+
+[OptionsRecordText2]
+X = 95
+Y = 45
+Color = ColorLightest
+Size = 10
+Text = SING_OPTIONS_RECORD_DESC
+
+[OptionsRecordText3]
+X = 95
+Y = 65
+Color = White
+Size = 10
+Text = SING_OPTIONS_RECORD_WHEREAMI
 
 [OptionsRecordStatic2]
 X = 0
@@ -3894,66 +3931,44 @@ ReflectionSpacing = 2
 
 [OptionsRecordStatic4]
 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
+
+[OptionsRecordText4]
+X = 300
+Y = 548
+Z = 0.5
+Color = Black
+Size = 8
+Reflection = 1
+ReflectionSpacing = 20
+Text = SING_LEGEND_NAVIGATE
 
 [OptionsRecordStatic5]
-X = 388
-Y = 552
+X = 400
+Y = 545
 W = 32
-H = 23
+H = 30
 Tex = ButtonEsc
 Color = White
 Type = Transparent
-
-[OptionsRecordText1]
-X = 70
-Y = 6
-Color = White
-Font = 0
-Size = 20
-Text = SING_OPTIONS
-Align = 0
-
-[OptionsRecordText2]
-X = 238
-Y = 552
-Color = Black
-Font = 0
-Size = 7
-Align = 2
-Text = SING_OPTIONS_RECORD_WHEREAMI
-
-[OptionsRecordText3]
-X = 70
-Y = 53
-Color = White
-Font = 0
-Size = 10
-Align = 0
-Text = SING_OPTIONS_RECORD_DESC
-
-[OptionsRecordText4]
-X = 294
-Y = 552
-Color = Black
-Font = 0
-Size = 7
-Align = 0
-Text = SING_LEGEND_NAVIGATE
+Reflection = 1
+ReflectionSpacing = 2
 
 [OptionsRecordText5]
-X = 418
-Y = 552
+X = 440
+Y = 548
+Z = 0.5
 Color = Black
-Font = 0
-Size = 7
-Align = 0
+Size = 8
+Reflection = 1
+ReflectionSpacing = 20
 Text = SING_LEGEND_ESC
 
 [OptionsRecordSelectSlideCard]
@@ -4035,13 +4050,34 @@ Texts = 5
 Tex = OptionsBG
 
 [OptionsAdvancedStatic1]
-X = 40
+X = 65
 Y = 22
-W = 27
-H = 27
+W = 25
+H = 23
 Color = White
 Tex = IconOption
-Type = Colorized
+Type = Transparent
+
+[OptionsAdvancedText1]
+X = 95
+Y = 5
+Color = White
+Size = 18
+Text = SING_OPTIONS
+
+[OptionsAdvancedText3]
+X = 95
+Y = 45
+Color = ColorLightest
+Size = 10
+Text = SING_OPTIONS_ADVANCED_DESC
+
+[OptionsAdvancedText2]
+X = 95
+Y = 65
+Color = White
+Size = 10
+Text = SING_OPTIONS_ADVANCED_WHEREAMI
 
 [OptionsAdvancedStatic2]
 X = 0
@@ -4067,66 +4103,44 @@ ReflectionSpacing = 2
 
 [OptionsAdvancedStatic4]
 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
+
+[OptionsAdvancedText4]
+X = 300
+Y = 548
+Z = 0.5
+Color = Black
+Size = 8
+Reflection = 1
+ReflectionSpacing = 20
+Text = SING_LEGEND_NAVIGATE
 
 [OptionsAdvancedStatic5]
-X = 388
-Y = 552
+X = 400
+Y = 545
 W = 32
-H = 23
+H = 30
 Tex = ButtonEsc
 Color = White
 Type = Transparent
-
-[OptionsAdvancedText1]
-X = 70
-Y = 6
-Color = White
-Font = 0
-Size = 20
-Text = SING_OPTIONS
-Align = 0
-
-[OptionsAdvancedText2]
-X = 238
-Y = 552
-Color = Black
-Font = 0
-Size = 7
-Align = 2
-Text = SING_OPTIONS_ADVANCED_WHEREAMI
-
-[OptionsAdvancedText3]
-X = 70
-Y = 53
-Color = White
-Font = 0
-Size = 10
-Align = 0
-Text = SING_OPTIONS_ADVANCED_DESC
-
-[OptionsAdvancedText4]
-X = 294
-Y = 552
-Color = Black
-Font = 0
-Size = 7
-Align = 0
-Text = SING_LEGEND_NAVIGATE
+Reflection = 1
+ReflectionSpacing = 2
 
 [OptionsAdvancedText5]
-X = 418
-Y = 552
+X = 440
+Y = 548
+Z = 0.5
 Color = Black
-Font = 0
-Size = 7
-Align = 0
+Size = 8
+Reflection = 1
+ReflectionSpacing = 20
 Text = SING_LEGEND_ESC
 
 #########unused at the moment#########