adjustable lyric style

Vocaluxe/Base/CConfig.cs

@@ -152,6 +152,14 @@ namespace Vocaluxe.Base
         TR_CONFIG_ONLY_OWN_MUSIC
     }
 
+    public enum ELyricStyle
+    {
+        Fill,
+        Jump,
+        Slide,
+        Zoom
+    }
+
     #endregion Enums
 
     static class CConfig
@@ -186,6 +194,7 @@ namespace Vocaluxe.Base
         public static EOffOn DrawToneHelper = EOffOn.TR_CONFIG_ON;
         public static ETimerLook TimerLook = ETimerLook.TR_CONFIG_TIMERLOOK_EXPANDED;
         public static ECoverLoading CoverLoading = ECoverLoading.TR_CONFIG_COVERLOADING_ATSTART;
+        public static ELyricStyle LyricStyle = ELyricStyle.Slide;
 
         // Sound
         public static EPlaybackLib PlayBackLib = EPlaybackLib.PortAudio;
@@ -302,6 +311,7 @@ namespace Vocaluxe.Base
                 CHelper.TryGetEnumValueFromXML("//root/Theme/DrawToneHelper", navigator, ref DrawToneHelper);
                 CHelper.TryGetEnumValueFromXML("//root/Theme/TimerLook", navigator, ref TimerLook);
                 CHelper.TryGetEnumValueFromXML("//root/Theme/CoverLoading", navigator, ref CoverLoading);
+                CHelper.TryGetEnumValueFromXML("//root/Theme/LyricStyle", navigator, ref LyricStyle);
                 #endregion Theme
 
                 #region Sound
@@ -501,6 +511,9 @@ namespace Vocaluxe.Base
             writer.WriteComment("Cover Loading:" + ListStrings(Enum.GetNames(typeof(ECoverLoading))));
             writer.WriteElementString("CoverLoading", Enum.GetName(typeof(ECoverLoading), CoverLoading));
 
+            writer.WriteComment("Lyric Style:" + ListStrings(Enum.GetNames(typeof(ELyricStyle))));
+            writer.WriteElementString("LyricStyle", Enum.GetName(typeof(ELyricStyle), LyricStyle));
+
             writer.WriteEndElement();
             #endregion Theme
 

Vocaluxe/Menu/CLyric.cs

@@ -11,14 +11,6 @@ using Vocaluxe.Lib.Song;
 
 namespace Vocaluxe.Menu
 {
-    enum ELyricStyle
-    {
-        Fill,
-        Jump,
-        Slide,
-        Zoom
-    }
-
     struct SNote
     {
         public string Text;
@@ -84,6 +76,12 @@ namespace Vocaluxe.Menu
             }
         }
 
+        public ELyricStyle LyricStyle
+        {
+            get { return _Style; }
+            set { _Style = value; }
+        }
+
         public CLyric()
         {
             _Theme = new SThemeLyrics();
@@ -100,7 +98,7 @@ namespace Vocaluxe.Menu
             _Notes = new List<SNote>();
             _Text = new CText();
 
-            _Style = ELyricStyle.Slide;
+            _Style = ELyricStyle.Fill;
         }
 
         public bool LoadTheme(string XmlPath, string ElementName, XPathNavigator navigator, int SkinIndex)

Vocaluxe/Screens/CScreenSing.cs

@@ -325,6 +325,10 @@ namespace Vocaluxe.Screens
                 NoteLines[i] = -1;
             }
 
+            for (int i = 0; i < Lyrics.Length; i++)
+            {
+                Lyrics[i].LyricStyle = CConfig.LyricStyle;
+            }
             SetVisuability();
             CBackgroundMusic.Disabled = true;
         }