Added Preview Volume and Fading to Sound Options

Changed Themes to Fit these changes
Updated Language Files
Some fixes in SelectSlide

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

2 files changed, 128 insertions, 48 deletions

diff --git a/Themes/Classic.ini b/Themes/Classic.ini
index 13b59e2e..1b5fb857 100644
--- a/Themes/Classic.ini
+++ b/Themes/Classic.ini
@@ -2722,11 +2722,51 @@ SBGDColor = Gray
 STColor = White

 STDColor = GrayDark

 

-[OptionsSoundButtonExit]

+[OptionsSoundSelectSlidePreviewVolume]

+Tex =MainBar

+TexSBG =MainBar

+Text=SING_OPTIONS_SOUND_PREVIEWVOLUME

+X = 40

+Y = 305

+W = 230

+H = 70

+SkipX = 50

+

+Color = ColorDark

+DColor = Gray

+TColor = White

+TDColor = White

+SBGTex =MainBar

+SBGColor = ColorDark

+SBGDColor = Gray

+STColor = White

+STDColor = GrayDark

+

+[OptionsSoundSelectSlidePreviewFading]

+Tex =MainBar

+TexSBG =MainBar

+Text=SING_OPTIONS_SOUND_PREVIEWFADING

 X = 40

 Y = 360

 W = 230

 H = 70

+SkipX = 50

+

+Color = ColorDark

+DColor = Gray

+TColor = White

+TDColor = White

+SBGTex =MainBar

+SBGColor = ColorDark

+SBGDColor = Gray

+STColor = White

+STDColor = GrayDark

+

+[OptionsSoundButtonExit]

+X = 40

+Y = 415

+W = 230

+H = 70

 Tex =MainBar

 Color = ColorDark

 DColor = Gray

diff --git a/Themes/Deluxe.ini b/Themes/Deluxe.ini
index 240d674f..9423f54c 100644
--- a/Themes/Deluxe.ini
+++ b/Themes/Deluxe.ini
@@ -430,16 +430,16 @@ Align =2
 Text=

 

 #Variable statics and texts for song-screen in sing- and partymode

-# There can be an unlimited Number of Statics and Texts, As long 

+# There can be an unlimited Number of Statics and Texts, As long

 # as the numbers are in order.

 # Statics that are shown in PartyMode Only are Named_

-#	SongStaticParty[No]

+#        SongStaticParty[No]

 # Texts that are shown in PartyMode Only are Named_

-#	SongTextParty[No]

+#        SongTextParty[No]

 # Statics that are shown in Normal Mode Only are Named_

-#	SongStaticNonParty[No]

+#        SongStaticNonParty[No]

 # Texts that are shown in Normal Mode Only are Named_

-#	SongTextNonParty[No]

+#        SongTextNonParty[No]

 #Here are the ones for singmode

 

 [SongStaticNonParty1]

@@ -2908,7 +2908,7 @@ Text=SING_LEGEND_ESC
 

 [OptionsGameSelectPlayers]

 Tex = MainBar

-TexSBG = MainBar

+TexSBG =SelectBG

 Text =SING_OPTIONS_GAME_PLAYERS

 X = 40

 Y = 85

@@ -2928,7 +2928,7 @@ STDColor = GrayDark
 

 [OptionsGameSelectDifficulty]

 Tex = MainBar

-TexSBG = MainBar

+TexSBG =SelectBG

 Text =SING_OPTIONS_GAME_DIFFICULTY

 X = 40

 Y = 140

@@ -2949,7 +2949,7 @@ STDColor = GrayDark
 

 [OptionsGameSelectSlideLanguage]

 Tex = MainBar

-TexSBG = MainBar

+TexSBG =SelectBG

 Text =SING_OPTIONS_GAME_LANGUAGE

 X = 40

 Y = 195

@@ -2969,7 +2969,7 @@ STDColor = GrayDark
 

 [OptionsGameSelectTabs]

 Tex =MainBar

-TexSBG =MainBar

+TexSBG =SelectBG

 Text =SING_OPTIONS_GAME_TABS

 X = 40

 Y = 250

@@ -2989,7 +2989,7 @@ STDColor = GrayDark
 

 [OptionsGameSelectSlideSorting]

 Tex =MainBar

-TexSBG =MainBar

+TexSBG =SelectBG

 Text =SING_OPTIONS_GAME_SORTING

 X = 40

 Y = 305

@@ -3009,7 +3009,7 @@ STDColor = GrayDark
 

 [OptionsGameSelectDebug]

 Tex =MainBar

-TexSBG =MainBar

+TexSBG =SelectBG

 Text =SING_OPTIONS_GAME_DEBUG

 X = 40

 Y = 360

@@ -3140,7 +3140,7 @@ Text=SING_LEGEND_ESC
 

 [OptionsGraphicsSelectSlideResolution]

 Tex =MainBar

-TexSBG =MainBar

+TexSBG =SelectBG

 Text=SING_OPTIONS_GRAPHICS_RESOLUTION

 X = 40

 Y = 85

@@ -3160,7 +3160,7 @@ STDColor = GrayDark
 

 [OptionsGraphicsSelectFullscreen]

 Tex =MainBar

-TexSBG =MainBar

+TexSBG =SelectBG

 Text =SING_OPTIONS_GRAPHICS_FULLSCREEN

 X = 40

 Y = 140

@@ -3180,7 +3180,7 @@ STDColor = GrayDark
 

 [OptionsGraphicsSelectDepth]

 Tex =MainBar

-TexSBG =MainBar

+TexSBG =SelectBG

 Text =SING_OPTIONS_GRAPHICS_DEPTH

 X = 40

 Y = 195

@@ -3200,7 +3200,7 @@ STDColor = GrayDark
 

 [OptionsGraphicsSelectOscilloscope]

 Tex =MainBar

-TexSBG =MainBar

+TexSBG =SelectBG

 Text =SING_OPTIONS_GRAPHICS_OSCILLOSCOPE

 X = 40

 Y = 250

@@ -3220,7 +3220,7 @@ STDColor = GrayDark
 

 [OptionsGraphicsSelectMovieSize]

 Tex =MainBar

-TexSBG =MainBar

+TexSBG =SelectBG

 Text =SING_OPTIONS_GRAPHICS_MOVIE_SIZE

 X = 40

 Y = 305

@@ -3351,7 +3351,7 @@ Text=SING_LEGEND_ESC
 

 [OptionsSoundSelectMicBoost]

 Tex =MainBar

-TexSBG =MainBar

+TexSBG =SelectBG

 Text =SING_OPTIONS_SOUND_MIC_BOOST

 X = 40

 Y = 85

@@ -3371,7 +3371,7 @@ STDColor = GrayDark
 

 [OptionsSoundSelectClickAssist]

 Tex =MainBar

-TexSBG =MainBar

+TexSBG =SelectBG

 Text =SING_OPTIONS_SOUND_CLICK_ASSIST

 X = 40

 Y = 140

@@ -3391,7 +3391,7 @@ STDColor = GrayDark
 

 [OptionsSoundSelectBeatClick]

 Tex =MainBar

-TexSBG =MainBar

+TexSBG =SelectBG

 Text =SING_OPTIONS_SOUND_BEAT_CLICK

 X = 40

 Y = 195

@@ -3411,7 +3411,7 @@ STDColor = GrayDark
 

 [OptionsSoundSelectThreshold]

 Tex =MainBar

-TexSBG =MainBar

+TexSBG =SelectBG

 Text =SING_OPTIONS_SOUND_THRESHOLD

 X = 40

 Y = 250

@@ -3431,7 +3431,7 @@ STDColor = GrayDark
 

 [OptionsSoundSelectTwoPlayerMode]

 Tex =MainBar

-TexSBG =MainBar

+TexSBG =SelectBG

 Text =SING_OPTIONS_SOUND_TWO_PLAYERS_MODE

 X = 40

 Y = 305

@@ -3449,11 +3449,51 @@ SBGDColor = Gray
 STColor = White

 STDColor = GrayDark

 

-[OptionsSoundButtonExit]

+[OptionsSoundSelectSlidePreviewVolume]

+Tex =MainBar

+TexSBG =SelectBG

+Text=SING_OPTIONS_SOUND_PREVIEWVOLUME

+X = 40

+Y = 305

+W = 230

+H = 70

+SkipX = 50

+

+Color = ColorDark

+DColor = Gray

+TColor = White

+TDColor = White

+SBGTex =MainBar

+SBGColor = ColorDark

+SBGDColor = Gray

+STColor = White

+STDColor = GrayDark

+

+[OptionsSoundSelectSlidePreviewFADING]

+Tex =MainBar

+TexSBG =SelectBG

+Text=SING_OPTIONS_SOUND_PREVIEWFADING

 X = 40

 Y = 360

 W = 230

 H = 70

+SkipX = 50

+

+Color = ColorDark

+DColor = Gray

+TColor = White

+TDColor = White

+SBGTex =MainBar

+SBGColor = ColorDark

+SBGDColor = Gray

+STColor = White

+STDColor = GrayDark

+

+[OptionsSoundButtonExit]

+X = 40

+Y = 415

+W = 230

+H = 70

 Tex =MainBar

 Color = ColorDark

 DColor = Gray

@@ -3562,7 +3602,7 @@ Text=SING_LEGEND_ESC
 

 [OptionsLyricsSelectLyricsFont]

 Tex =MainBar

-TexSBG =MainBar

+TexSBG =SelectBG

 Text =SING_OPTIONS_LYRICS_FONT

 X = 40

 Y = 85

@@ -3582,7 +3622,7 @@ STDColor = GrayDark
 

 [OptionsLyricsSelectLyricsEffect]

 Tex =MainBar

-TexSBG =MainBar

+TexSBG =SelectBG

 Text =SING_OPTIONS_LYRICS_EFFECT

 X = 40

 Y = 140

@@ -3602,7 +3642,7 @@ STDColor = GrayDark
 

 [OptionsLyricsSelectSolmization]

 Tex =MainBar

-TexSBG =MainBar

+TexSBG =SelectBG

 Text =SING_OPTIONS_LYRICS_SOLMIZATION

 X = 40

 Y = 195

@@ -3733,7 +3773,7 @@ Text=SING_LEGEND_ESC
 

 [OptionsThemesSelectTheme]

 Tex =MainBar

-TexSBG =MainBar

+TexSBG =SelectBG

 Text =SING_OPTIONS_THEMES_THEME

 X = 40

 Y = 85

@@ -3753,7 +3793,7 @@ STDColor = GrayDark
 

 [OptionsThemesSelectSkin]

 Tex =MainBar

-TexSBG =MainBar

+TexSBG =SelectBG

 Text =SING_OPTIONS_THEMES_SKIN

 X = 40

 Y = 140

@@ -3773,7 +3813,7 @@ STDColor = GrayDark
 

 [OptionsThemesSelectColor]

 Tex =MainBar

-TexSBG =MainBar

+TexSBG =SelectBG

 Text =SING_OPTIONS_THEMES_COLOR

 X = 40

 Y = 195

@@ -3904,7 +3944,7 @@ Text=SING_LEGEND_ESC
 

 [OptionsRecordSelectSlideCard]

 Tex = MainBar

-TexSBG = MainBar

+TexSBG =SelectBG

 Text =SING_OPTIONS_RECORD_CARD

 X = 40

 Y = 85

@@ -3925,7 +3965,7 @@ STDColor = GrayDark
 

 [OptionsRecordSelectSlideInput]

 Tex = MainBar

-TexSBG = MainBar

+TexSBG =SelectBG

 Text =SING_OPTIONS_RECORD_INPUT

 X = 40

 Y = 140

@@ -3946,7 +3986,7 @@ STDColor = GrayDark
 

 [OptionsRecordSelectSlideChannelL]

 Tex = MainBar

-TexSBG = MainBar

+TexSBG =SelectBG

 Text =SING_OPTIONS_RECORD_CHANNELL

 X = 40

 Y = 195

@@ -3967,7 +4007,7 @@ STDColor = GrayDark
 

 [OptionsRecordSelectSlideChannelR]

 Tex = MainBar

-TexSBG = MainBar

+TexSBG =SelectBG

 Text =SING_OPTIONS_RECORD_CHANNELR

 X = 40

 Y = 250

@@ -4099,7 +4139,7 @@ Text=SING_LEGEND_ESC
 

 [OptionsAdvancedSelectLoadAnimation]

 Tex =MainBar

-TexSBG =MainBar

+TexSBG =SelectBG

 Text=SING_OPTIONS_ADVANCED_LOADANIMATION

 X = 40

 Y = 85

@@ -4119,7 +4159,7 @@ STDColor = GrayDark
 

 [OptionsAdvancedSelectScreenFade]

 Tex =MainBar

-TexSBG =MainBar

+TexSBG =SelectBG

 Text =SING_OPTIONS_ADVANCED_SCREENFADE

 X = 40

 Y = 140

@@ -4139,7 +4179,7 @@ STDColor = GrayDark
 

 [OptionsAdvancedSelectEffectSing]

 Tex =MainBar

-TexSBG =MainBar

+TexSBG =SelectBG

 Text =SING_OPTIONS_ADVANCED_EFFECTSING

 X = 40

 Y = 195

@@ -4159,7 +4199,7 @@ STDColor = GrayDark
 

 [OptionsAdvancedSelectLineBonus]

 Tex =MainBar

-TexSBG =MainBar

+TexSBG =SelectBG

 Text =SING_OPTIONS_GRAPHICS_LINEBONUS

 X = 40

 Y = 250

@@ -4179,7 +4219,7 @@ STDColor = GrayDark
 

 [OptionsAdvancedSelectSlideOnSongClick]

 Tex =MainBar

-TexSBG =MainBar

+TexSBG =SelectBG

 Text=SING_OPTIONS_ADVANCED_ONSONGCLICK

 X = 40

 Y = 305

@@ -4199,7 +4239,7 @@ STDColor = GrayDark
 

 [OptionsAdvancedSelectAskbeforeDel]

 Tex =MainBar

-TexSBG =MainBar

+TexSBG =SelectBG

 Text =SING_OPTIONS_ADVANCED_ASKBEFOREDEL

 X = 40

 Y = 360

@@ -4219,7 +4259,7 @@ STDColor = GrayDark
 

 [OptionsAdvancedSelectPartyPopup]

 Tex =MainBar

-TexSBG =MainBar

+TexSBG =SelectBG

 Text =SING_OPTIONS_ADVANCED_PARTYPOPUP

 X = 40

 Y = 415

@@ -6344,7 +6384,7 @@ Text=SING_LEGEND_CONTINUE
 

 [PartyOptionsSelectLevel]

 Tex = MainBar

-TexSBG = MainBar

+TexSBG =SelectBG

 Text =PARTY_DIFFICULTY

 X = 40

 Y = 85

@@ -6365,7 +6405,7 @@ STDColor = GrayDark
 

 [PartyOptionsSelectPlayList]

 Tex = MainBar

-TexSBG = MainBar

+TexSBG =SelectBG

 Text =PARTY_PLAYLIST

 X = 40

 Y = 140

@@ -6386,7 +6426,7 @@ STDColor = GrayDark
 

 [PartyOptionsSelectPlayList2]

 Tex = MainBar

-TexSBG = MainBar

+TexSBG =SelectBG

 Text =PARTY_PLAYLIST

 X = 40

 Y = 195

@@ -6407,7 +6447,7 @@ STDColor = GrayDark
 

 [PartyOptionsSelectRounds]

 Tex = MainBar

-TexSBG = MainBar

+TexSBG =SelectBG

 Text =PARTY_ROUNDS

 X = 40

 Y = 250

@@ -6428,7 +6468,7 @@ STDColor = GrayDark
 

 [PartyOptionsSelectTeams]

 Tex = MainBar

-TexSBG = MainBar

+TexSBG =SelectBG

 Text =PARTY_TEAMS

 X = 40

 Y = 305

@@ -6449,7 +6489,7 @@ STDColor = GrayDark
 

 [PartyOptionsSelectPlayers1]

 Tex = MainBar

-TexSBG = MainBar

+TexSBG =SelectBG

 Text =PARTY_TEAMS_PLAYER1

 X = 40

 Y = 360

@@ -6470,7 +6510,7 @@ STDColor = GrayDark
 

 [PartyOptionsSelectPlayers2]

 Tex = MainBar

-TexSBG = MainBar

+TexSBG =SelectBG

 Text =PARTY_TEAMS_PLAYER2

 X = 40

 Y = 415

@@ -6491,7 +6531,7 @@ STDColor = GrayDark
 

 [PartyOptionsSelectPlayers3]

 Tex = MainBar

-TexSBG = MainBar

+TexSBG =SelectBG

 Text =PARTY_TEAMS_PLAYER3

 X = 40

 Y = 470