From 1826959cb9f60f6f26c55115292703fe1ecfde5a Mon Sep 17 00:00:00 2001 From: Jiiniasu Date: Sat, 26 Mar 2016 20:16:22 +0100 Subject: [PATCH] Make lyric styles translatable --- Output/Languages/English.xml | 4 ++++ Vocaluxe/Base/CConfig.cs | 2 +- VocaluxeLib/Enums.cs | 8 ++++---- VocaluxeLib/Menu/CLyric.cs | 14 +++++++------- 4 files changed, 16 insertions(+), 12 deletions(-) diff --git a/Output/Languages/English.xml b/Output/Languages/English.xml index 4a783eef..34ebb162 100644 --- a/Output/Languages/English.xml +++ b/Output/Languages/English.xml @@ -80,6 +80,10 @@ All Only names and avatars Nothing + Fill + Jump + Slide + Zoom Bottom Top Top and bottom diff --git a/Vocaluxe/Base/CConfig.cs b/Vocaluxe/Base/CConfig.cs index 67d6bcac..85d7d409 100644 --- a/Vocaluxe/Base/CConfig.cs +++ b/Vocaluxe/Base/CConfig.cs @@ -104,7 +104,7 @@ namespace Vocaluxe.Base [DefaultValue(EPlayerInfo.TR_CONFIG_PLAYERINFO_BOTH)] public EPlayerInfo PlayerInfo; [DefaultValue(EFadePlayerInfo.TR_CONFIG_FADEPLAYERINFO_OFF)] public EFadePlayerInfo FadePlayerInfo; [DefaultValue(ECoverLoading.TR_CONFIG_COVERLOADING_DYNAMIC)] public ECoverLoading CoverLoading; - [DefaultValue(ELyricStyle.Slide)] public ELyricStyle LyricStyle; + [DefaultValue(ELyricStyle.TR_CONFIG_LYRICSTYLE_SLIDE)] public ELyricStyle LyricStyle; } public struct SConfigSound diff --git a/VocaluxeLib/Enums.cs b/VocaluxeLib/Enums.cs index 40d69883..fb4f08a2 100644 --- a/VocaluxeLib/Enums.cs +++ b/VocaluxeLib/Enums.cs @@ -321,10 +321,10 @@ namespace VocaluxeLib public enum ELyricStyle { - Fill, - Jump, - Slide, - Zoom + TR_CONFIG_LYRICSTYLE_FILL, + TR_CONFIG_LYRICSTYLE_JUMP, + TR_CONFIG_LYRICSTYLE_SLIDE, + TR_CONFIG_LYRICSTYLE_ZOOM } #endregion Config diff --git a/VocaluxeLib/Menu/CLyric.cs b/VocaluxeLib/Menu/CLyric.cs index 7b17d0c0..1fa29533 100644 --- a/VocaluxeLib/Menu/CLyric.cs +++ b/VocaluxeLib/Menu/CLyric.cs @@ -88,7 +88,7 @@ namespace VocaluxeLib.Menu _Line = new CSongLine(); _Text = new CText(_PartyModeID); - LyricStyle = ELyricStyle.Fill; + LyricStyle = ELyricStyle.TR_CONFIG_LYRICSTYLE_FILL; } public CLyric(SThemeLyrics theme, int partyModeID) @@ -100,7 +100,7 @@ namespace VocaluxeLib.Menu _Text = new CText(_PartyModeID); _Width = 1f; - LyricStyle = ELyricStyle.Fill; + LyricStyle = ELyricStyle.TR_CONFIG_LYRICSTYLE_FILL; ThemeLoaded = true; } @@ -185,14 +185,14 @@ namespace VocaluxeLib.Menu { switch (LyricStyle) { - case ELyricStyle.Fill: + case ELyricStyle.TR_CONFIG_LYRICSTYLE_FILL: _DrawFill(); break; - case ELyricStyle.Slide: + case ELyricStyle.TR_CONFIG_LYRICSTYLE_SLIDE: _DrawSlide(); break; - case ELyricStyle.Zoom: - case ELyricStyle.Jump: + case ELyricStyle.TR_CONFIG_LYRICSTYLE_ZOOM: + case ELyricStyle.TR_CONFIG_LYRICSTYLE_JUMP: _DrawZoomOrJump(); break; default: @@ -368,7 +368,7 @@ namespace VocaluxeLib.Menu return; _SetText(highlightNote); _Text.X = hX; - if (LyricStyle == ELyricStyle.Jump) + if (LyricStyle == ELyricStyle.TR_CONFIG_LYRICSTYLE_JUMP) _DrawJumpingNode(highlightNote); else _DrawZoomedNote(highlightNote, hEndBeat);