From 1402d92c5b9cd5cc09f156974ba182087d0107ff Mon Sep 17 00:00:00 2001 From: Flamefire Date: Tue, 30 Apr 2013 19:53:44 +0200 Subject: [PATCH] Changed config for lyrics position --- Vocaluxe/Base/CConfig.cs | 6 +++--- VocaluxeLib/Menu/Enums.cs | 2 ++ 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/Vocaluxe/Base/CConfig.cs b/Vocaluxe/Base/CConfig.cs index 7a939e8d..baf4b93c 100644 --- a/Vocaluxe/Base/CConfig.cs +++ b/Vocaluxe/Base/CConfig.cs @@ -222,7 +222,7 @@ namespace Vocaluxe.Base xmlReader.TryGetIntValue("//root/Game/NumPlayer", ref NumPlayer); xmlReader.TryGetEnumValue("//root/Game/Tabs", ref Tabs); xmlReader.GetValue("//root/Game/Language", out Language, Language); - xmlReader.TryGetEnumValue("//root/Game/LyricsOnTop", ref LyricsPosition); + xmlReader.TryGetEnumValue("//root/Game/LyricsPosition", ref LyricsPosition); xmlReader.TryGetFloatValue("//root/Game/MinLineBreakTime", ref MinLineBreakTime); if ((ScoreAnimationTime > 0 && ScoreAnimationTime < 1) || ScoreAnimationTime < 0) @@ -461,8 +461,8 @@ namespace Vocaluxe.Base writer.WriteComment("Order songs in tabs: " + CHelper.ListStrings(Enum.GetNames(typeof(EOffOn)))); writer.WriteElementString("Tabs", Enum.GetName(typeof(EOffOn), Tabs)); - writer.WriteComment("Lyrics also on Top of screen: " + CHelper.ListStrings(Enum.GetNames(typeof(ELyricsPosition)))); - writer.WriteElementString("LyricsOnTop", Enum.GetName(typeof(ELyricsPosition), LyricsPosition)); + writer.WriteComment("Position if lyrics on screen: " + CHelper.ListStrings(Enum.GetNames(typeof(ELyricsPosition)))); + writer.WriteElementString("LyricsPosition", Enum.GetName(typeof(ELyricsPosition), LyricsPosition)); writer.WriteComment("MinLineBreakTime: Value >= 0 in s. Minimum time the text is shown before it is to be sung"); writer.WriteElementString("MinLineBreakTime", MinLineBreakTime.ToString()); diff --git a/VocaluxeLib/Menu/Enums.cs b/VocaluxeLib/Menu/Enums.cs index 126575ce..6f05dd61 100644 --- a/VocaluxeLib/Menu/Enums.cs +++ b/VocaluxeLib/Menu/Enums.cs @@ -274,10 +274,12 @@ namespace VocaluxeLib.Menu public enum ELyricsPosition { + // ReSharper disable InconsistentNaming TR_CONFIG_LYRICSPOSITION_BOTTOM, TR_CONFIG_LYRICSPOSITION_TOP, TR_CONFIG_LYRICSPOSITION_BOTH, TR_CONFIG_LYRICSPOSITION_DYNAMIC + // ReSharper restore InconsistentNaming } public enum ELyricStyle