From ca12fbb41e2886ee23e95617f434742bb8be2dd1 Mon Sep 17 00:00:00 2001 From: whiteshark0 Date: Tue, 13 Apr 2010 17:16:32 +0000 Subject: load type and typesbg from theme ini for selects added type definitions to deluxe themes selects git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@2235 b956fd51-792f-4845-bead-9b4dfca2ff2c --- game/themes/Deluxe.ini | 92 +++++++++++++++++++++++++++++++++++++++++++++++++- src/base/UThemes.pas | 4 +++ src/menu/UMenu.pas | 4 +-- 3 files changed, 97 insertions(+), 3 deletions(-) diff --git a/game/themes/Deluxe.ini b/game/themes/Deluxe.ini index 0903af85..5947248a 100644 --- a/game/themes/Deluxe.ini +++ b/game/themes/Deluxe.ini @@ -2973,6 +2973,7 @@ Text = SING_OPTIONS_GAME_PLAYERS Tex = MainBar Type = Colorized TexSBG = SelectBG +TypeSBG = Colorized X = 70 Y = 130 W = 250 @@ -2994,6 +2995,7 @@ Text = SING_OPTIONS_GAME_DIFFICULTY Tex = MainBar Type = Colorized TexSBG = SelectBG +TypeSBG = Colorized X = 70 Y = 180 W = 250 @@ -3015,6 +3017,7 @@ Text = SING_OPTIONS_GAME_LANGUAGE Tex = MainBar Type = Colorized TexSBG = SelectBG +TypeSBG = Colorized X = 70 Y = 230 W = 250 @@ -3036,6 +3039,7 @@ Text = SING_OPTIONS_GAME_TABS Tex = MainBar Type = Colorized TexSBG = SelectBG +TypeSBG = Colorized X = 70 Y = 280 W = 250 @@ -3057,6 +3061,7 @@ Text = SING_OPTIONS_GAME_SORTING Tex = MainBar Type = Colorized TexSBG = SelectBG +TypeSBG = Colorized X = 70 Y = 330 W = 250 @@ -3078,6 +3083,7 @@ Text = SING_OPTIONS_GAME_DEBUG Tex = MainBar Type = Colorized TexSBG = SelectBG +TypeSBG = Colorized X = 70 Y = 380 W = 250 @@ -3212,6 +3218,7 @@ Text = SING_OPTIONS_GRAPHICS_RESOLUTION Tex = MainBar Type = Colorized TexSBG = SelectBG +TypeSBG = Colorized X = 70 Y = 130 W = 250 @@ -3233,6 +3240,7 @@ Text = SING_OPTIONS_GRAPHICS_FULLSCREEN Tex = MainBar Type = Colorized TexSBG = SelectBG +TypeSBG = Colorized X = 70 Y = 180 W = 250 @@ -3254,6 +3262,7 @@ Text = SING_OPTIONS_GRAPHICS_DEPTH Tex = MainBar Type = Colorized TexSBG = SelectBG +TypeSBG = Colorized X = 70 Y = 230 W = 250 @@ -3275,6 +3284,7 @@ Text = SING_OPTIONS_GRAPHICS_VISUALIZER Tex = MainBar Type = Colorized TexSBG = SelectBG +TypeSBG = Colorized X = 70 Y = 280 W = 250 @@ -3296,6 +3306,7 @@ Text = SING_OPTIONS_GRAPHICS_OSCILLOSCOPE Tex = MainBar Type = Colorized TexSBG = SelectBG +TypeSBG = Colorized X = 70 Y = 330 W = 250 @@ -3317,6 +3328,7 @@ Text = SING_OPTIONS_GRAPHICS_MOVIE_SIZE Tex = MainBar Type = Colorized TexSBG = SelectBG +TypeSBG = Colorized X = 70 Y = 380 W = 250 @@ -3447,7 +3459,9 @@ ReflectionSpacing = 20 [OptionsSoundSelectVoicePassthrough] Tex = MainBar +Type = Colorized TexSBG = SelectBG +TypeSBG = Colorized Text = SING_OPTIONS_SOUND_VOICEPASSTHROUGH X = 70 Y = 130 @@ -3467,7 +3481,9 @@ STDColor = GrayDark [OptionsSoundSelectBackgroundMusic] Tex = MainBar +Type = Colorized TexSBG = SelectBG +TypeSBG = Colorized Text = SING_OPTIONS_SOUND_BACKGROUNDMUSIC X = 70 Y = 170 @@ -3487,7 +3503,9 @@ STDColor = GrayDark [OptionsSoundSelectMicBoost] Tex = MainBar +Type = Colorized TexSBG = SelectBG +TypeSBG = Colorized Text = SING_OPTIONS_SOUND_MIC_BOOST X = 70 Y = 210 @@ -3507,7 +3525,9 @@ STDColor = GrayDark [OptionsSoundSelectClickAssist] Tex = MainBar +Type = Colorized TexSBG = SelectBG +TypeSBG = Colorized Text = SING_OPTIONS_SOUND_CLICK_ASSIST X = 70 Y = 250 @@ -3527,7 +3547,9 @@ STDColor = GrayDark [OptionsSoundSelectBeatClick] Tex = MainBar +Type = Colorized TexSBG = SelectBG +TypeSBG = Colorized Text = SING_OPTIONS_SOUND_BEAT_CLICK X = 70 Y = 290 @@ -3547,7 +3569,9 @@ STDColor = GrayDark [OptionsSoundSelectThreshold] Tex = MainBar +Type = Colorized TexSBG = SelectBG +TypeSBG = Colorized Text = SING_OPTIONS_SOUND_THRESHOLD X = 70 Y = 330 @@ -3567,7 +3591,9 @@ STDColor = GrayDark [OptionsSoundSelectSlidePreviewVolume] Tex = MainBar +Type = Colorized TexSBG = SelectBG +TypeSBG = Colorized Text = SING_OPTIONS_SOUND_PREVIEWVOLUME X = 70 Y = 370 @@ -3587,7 +3613,9 @@ STDColor = GrayDark [OptionsSoundSelectSlidePreviewFADING] Tex = MainBar +Type = Colorized TexSBG = SelectBG +TypeSBG = Colorized Text = SING_OPTIONS_SOUND_PREVIEWFADING X = 70 Y = 410 @@ -3719,7 +3747,9 @@ ReflectionSpacing = 20 [OptionsLyricsSelectLyricsFont] Tex = MainBar +Type = Colorized TexSBG = SelectBG +TypeSBG = Colorized Text = SING_OPTIONS_LYRICS_FONT X = 70 Y = 130 @@ -3739,7 +3769,9 @@ STDColor = GrayDark [OptionsLyricsSelectLyricsEffect] Tex = MainBar +Type = Colorized TexSBG = SelectBG +TypeSBG = Colorized Text = SING_OPTIONS_LYRICS_EFFECT X = 70 Y = 180 @@ -3759,7 +3791,9 @@ STDColor = GrayDark [OptionsLyricsSelectNoteLines] Tex = MainBar +Type = Colorized TexSBG = SelectBG +TypeSBG = Colorized Text = SING_OPTIONS_LYRICS_NOTELINES X = 70 Y = 230 @@ -3892,7 +3926,9 @@ Text = SING_LEGEND_ESC [OptionsThemesSelectTheme] Text = SING_OPTIONS_THEMES_THEME Tex = MainBar +Type = Colorized TexSBG = SelectBG +TypeSBG = Colorized X = 70 Y = 130 W = 250 @@ -3912,7 +3948,9 @@ STDColor = GrayDark [OptionsThemesSelectSkin] Text = SING_OPTIONS_THEMES_SKIN Tex = MainBar +Type = Colorized TexSBG = SelectBG +TypeSBG = Colorized X = 70 Y = 180 W = 250 @@ -3932,7 +3970,9 @@ STDColor = GrayDark [OptionsThemesSelectColor] Text = SING_OPTIONS_THEMES_COLOR Tex = MainBar +Type = Colorized TexSBG = SelectBG +TypeSBG = Colorized X = 70 Y = 230 W = 250 @@ -4064,7 +4104,9 @@ Text = SING_LEGEND_ESC [OptionsRecordSelectSlideCard] Text = SING_OPTIONS_RECORD_CARD Tex = MainBar +Type = Colorized TexSBG = SelectBG +TypeSBG = Colorized X = 70 Y = 130 W = 250 @@ -4084,7 +4126,9 @@ STDColor = GrayDark [OptionsRecordSelectSlideInput] Text = SING_OPTIONS_RECORD_INPUT Tex = MainBar +Type = Colorized TexSBG = SelectBG +TypeSBG = Colorized X = 70 Y = 180 W = 250 @@ -4104,7 +4148,9 @@ STDColor = GrayDark [OptionsRecordSelectSlideChannel] Text = SING_OPTIONS_RECORD_CHANNEL Tex = MainBar +Type = Colorized TexSBG = SelectBG +TypeSBG = Colorized X = 70 Y = 230 W = 250 @@ -4257,7 +4303,9 @@ Text = SING_LEGEND_ESC [OptionsAdvancedSelectScreenFade] Text = SING_OPTIONS_ADVANCED_SCREENFADE Tex = MainBar +Type = Colorized TexSBG = SelectBG +TypeSBG = Colorized X = 70 Y = 130 W = 250 @@ -4277,7 +4325,9 @@ STDColor = GrayDark [OptionsAdvancedSelectEffectSing] Text = SING_OPTIONS_ADVANCED_EFFECTSING Tex = MainBar +Type = Colorized TexSBG = SelectBG +TypeSBG = Colorized X = 70 Y = 180 W = 250 @@ -4297,7 +4347,9 @@ STDColor = GrayDark [OptionsAdvancedSelectLineBonus] Text = SING_OPTIONS_GRAPHICS_LINEBONUS Tex = MainBar +Type = Colorized TexSBG = SelectBG +TypeSBG = Colorized X = 70 Y = 230 W = 250 @@ -4317,7 +4369,9 @@ STDColor = GrayDark [OptionsAdvancedSelectSlideOnSongClick] Text = SING_OPTIONS_ADVANCED_ONSONGCLICK Tex = MainBar +Type = Colorized TexSBG = SelectBG +TypeSBG = Colorized X = 70 Y = 280 W = 250 @@ -4337,7 +4391,9 @@ STDColor = GrayDark [OptionsAdvancedSelectAskbeforeDel] Text = SING_OPTIONS_ADVANCED_ASKBEFOREDEL Tex = MainBar +Type = Colorized TexSBG = SelectBG +TypeSBG = Colorized X = 70 Y = 330 W = 250 @@ -4357,7 +4413,9 @@ STDColor = GrayDark [OptionsAdvancedSelectPartyPopup] Text = SING_OPTIONS_ADVANCED_PARTYPOPUP Tex = MainBar +Type = Colorized TexSBG = SelectBG +TypeSBG = Colorized X = 70 Y = 380 W = 250 @@ -6731,7 +6789,9 @@ Text = SING_LEGEND_CONTINUE [PartyOptionsSelectLevel] Tex = MainBar +Type = Colorized TexSBG = SelectBG +TypeSBG = Colorized Text = PARTY_DIFFICULTY X = 70 Y = 110 @@ -6757,7 +6817,9 @@ STDColor = GrayDark [PartyOptionsSelectPlayList] Tex = MainBar +Type = Colorized TexSBG = SelectBG +TypeSBG = Colorized Text = PARTY_PLAYLIST X = 70 Y = 165 @@ -6778,7 +6840,9 @@ STDColor = GrayDark [PartyOptionsSelectPlayList2] Tex = MainBar +Type = Colorized TexSBG = SelectBG +TypeSBG = Colorized Text = PARTY_PLAYLIST X = 70 Y = 220 @@ -6799,7 +6863,9 @@ STDColor = GrayDark [PartyOptionsSelectRounds] Tex = MainBar +Type = Colorized TexSBG = SelectBG +TypeSBG = Colorized Text = PARTY_ROUNDS X = 70 Y = 250 @@ -6948,6 +7014,8 @@ Text = SING_LEGEND_CONTINUE [PartyPlayerSelectTeams] Tex = MainBar TexSBG = SelectBG +Type = Colorized +TypeSBG = Colorized Text = PARTY_TEAMS X = 45 Y = 90 @@ -6969,6 +7037,8 @@ STDColor = GrayDark [PartyPlayerSelectPlayers1] Tex = MainBar TexSBG = PartyPlayerSelectBG +Type = Colorized +TypeSBG = Colorized Text = PARTY_TEAMS_PLAYER1 X = 365 Y = 145 @@ -6991,6 +7061,8 @@ STDColor = GrayDark [PartyPlayerSelectPlayers2] Tex = MainBar TexSBG = PartyPlayerSelectBG +Type = Colorized +TypeSBG = Colorized Text = PARTY_TEAMS_PLAYER2 X = 365 Y = 285 @@ -7012,6 +7084,8 @@ STDColor = GrayDark [PartyPlayerSelectPlayers3] Tex = MainBar +Type = Colorized +TypeSBG = Colorized TexSBG = PartyPlayerSelectBG Text = PARTY_TEAMS_PLAYER3 X = 365 @@ -7464,7 +7538,9 @@ Text = PARTY_ROUNDS_LEGEND_CONTINUE [PartyRoundsSelectRoundCount] Tex = MainBar +Type = Colorized TexSBG = SelectBG +TypeSBG = Colorized Text = PARTY_ROUNDCOUNT X = 70 Y = 100 @@ -7485,7 +7561,9 @@ STDColor = GrayDark [PartyRoundsSelectRound1] Tex = MainBar +Type = Colorized TexSBG = SelectBG +TypeSBG = Colorized Text = PARTY_SELECTMODE1 X = 70 Y = 155 @@ -7506,7 +7584,9 @@ STDColor = GrayDark [PartyRoundsSelectRound2] Tex = MainBar +Type = Colorized TexSBG = SelectBG +TypeSBG = Colorized Text = PARTY_SELECTMODE2 X = 70 Y = 210 @@ -7527,7 +7607,9 @@ STDColor = GrayDark [PartyRoundsSelectRound3] Tex = MainBar +Type = Colorized TexSBG = SelectBG +TypeSBG = Colorized Text = PARTY_SELECTMODE3 X = 70 Y = 265 @@ -7548,7 +7630,9 @@ STDColor = GrayDark [PartyRoundsSelectRound4] Tex = MainBar +Type = Colorized TexSBG = SelectBG +TypeSBG = Colorized Text = PARTY_SELECTMODE4 X = 70 Y = 320 @@ -7569,7 +7653,9 @@ STDColor = GrayDark [PartyRoundsSelectRound5] Tex = MainBar +Type = Colorized TexSBG = SelectBG +TypeSBG = Colorized Text = PARTY_SELECTMODE5 X = 70 Y = 375 @@ -7590,7 +7676,9 @@ STDColor = GrayDark [PartyRoundsSelectRound6] Tex = MainBar +Type = Colorized TexSBG = SelectBG +TypeSBG = Colorized Text = PARTY_SELECTMODE6 X = 70 Y = 430 @@ -7611,7 +7699,9 @@ STDColor = GrayDark [PartyRoundsSelectRound7] Tex = MainBar +Type = Colorized TexSBG = SelectBG +TypeSBG = Colorized Text = PARTY_SELECTMODE7 X = 70 Y = 485 @@ -7738,7 +7828,7 @@ Z = 0.97 [SongMenuSelectSlide3] TexSBG = Rectangle Text = -Type = Colorized +TypeSBG = Colorized ShowArrows = 1 OneItemOnly = 1 X = 530 diff --git a/src/base/UThemes.pas b/src/base/UThemes.pas index 11598207..aa89af43 100644 --- a/src/base/UThemes.pas +++ b/src/base/UThemes.pas @@ -170,7 +170,9 @@ type TThemeSelectSlide = record Tex: string; + Typ: TTextureType; TexSBG: string; + TypSBG: TTextureType; X: integer; Y: integer; W: integer; @@ -1790,7 +1792,9 @@ begin ThemeSelectS.Text := Language.Translate(ThemeIni.ReadString(Name, 'Text', '')); ThemeSelectS.Tex := {Skin.SkinPath + }ThemeIni.ReadString(Name, 'Tex', ''); + ThemeSelectS.Typ := ParseTextureType(ThemeIni.ReadString(Name, 'Type', ''), TEXTURE_TYPE_PLAIN); ThemeSelectS.TexSBG := {Skin.SkinPath + }ThemeIni.ReadString(Name, 'TexSBG', ''); + ThemeSelectS.TypSBG := ParseTextureType(ThemeIni.ReadString(Name, 'TypeSBG', ''), TEXTURE_TYPE_PLAIN); ThemeSelectS.X := ThemeIni.ReadInteger(Name, 'X', 0); ThemeSelectS.Y := ThemeIni.ReadInteger(Name, 'Y', 0); diff --git a/src/menu/UMenu.pas b/src/menu/UMenu.pas index d30efaa7..b4ea3d00 100644 --- a/src/menu/UMenu.pas +++ b/src/menu/UMenu.pas @@ -1278,8 +1278,8 @@ begin ThemeSelectS.SBGDColR, ThemeSelectS.SBGDColG, ThemeSelectS.SBGDColB, ThemeSelectS.SBGDInt, ThemeSelectS.STColR, ThemeSelectS.STColG, ThemeSelectS.STColB, ThemeSelectS.STInt, ThemeSelectS.STDColR, ThemeSelectS.STDColG, ThemeSelectS.STDColB, ThemeSelectS.STDInt, - Skin.GetTextureFileName(ThemeSelectS.Tex), TEXTURE_TYPE_COLORIZED, - Skin.GetTextureFileName(ThemeSelectS.TexSBG), TEXTURE_TYPE_COLORIZED, + Skin.GetTextureFileName(ThemeSelectS.Tex), ThemeSelectS.Typ, + Skin.GetTextureFileName(ThemeSelectS.TexSBG), ThemeSelectS.TypSBG, ThemeSelectS.Text, Data); for SO := 0 to High(Values) do AddSelectSlideOption(Values[SO]); -- cgit v1.2.3