From 41a9118c27629982859cf1c1c9cd9e7f08ea0340 Mon Sep 17 00:00:00 2001
From: Florian Kuepper <florian.kueper@googlemail.com>
Date: Sat, 29 Sep 2012 13:31:59 +0200
Subject: [PATCH 1/4] Fix equalizer-saving.

---
 Vocaluxe/Menu/CEqualizer.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Vocaluxe/Menu/CEqualizer.cs b/Vocaluxe/Menu/CEqualizer.cs
index a3c6767d..8f0a8ab3 100644
--- a/Vocaluxe/Menu/CEqualizer.cs
+++ b/Vocaluxe/Menu/CEqualizer.cs
@@ -158,7 +158,7 @@ namespace Vocaluxe.Menu
                 writer.WriteComment("<Style>: Style of equalizer-elements: " + CConfig.ListStrings(Enum.GetNames(typeof(EEqualizerStyle))));
                 writer.WriteElementString("Style", Enum.GetName(typeof(EEqualizerStyle), _Theme.Style));
                 writer.WriteComment("<DrawNegative>: Draw negative values: " + CConfig.ListStrings(Enum.GetNames(typeof(EOffOn))));
-                writer.WriteElementString("Style", Enum.GetName(typeof(EOffOn), _Theme.DrawNegative));
+                writer.WriteElementString("DrawNegative", Enum.GetName(typeof(EOffOn), _Theme.DrawNegative));
 
                 writer.WriteComment("<Color>: Equalizer color from ColorScheme (high priority)");
                 writer.WriteComment("or <R>, <G>, <B>, <A> (lower priority)");

From 621925cec4b8716b891078ff870737397be6c7b3 Mon Sep 17 00:00:00 2001
From: Florian Kuepper <florian.kueper@googlemail.com>
Date: Sat, 29 Sep 2012 14:45:01 +0200
Subject: [PATCH 2/4] Fix saving of theme-fonts.

---
 Vocaluxe/Base/CFont.cs | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/Vocaluxe/Base/CFont.cs b/Vocaluxe/Base/CFont.cs
index 97fcd8a4..0e13f8e2 100644
--- a/Vocaluxe/Base/CFont.cs
+++ b/Vocaluxe/Base/CFont.cs
@@ -803,10 +803,10 @@ namespace Vocaluxe.Base
                     writer.WriteElementString("Folder", _Fonts[Index].Folder);
 
                     writer.WriteElementString("Outline", _Fonts[Index].Outline.ToString("#0.00"));
-                    writer.WriteElementString("ColorR", _Fonts[Index].OutlineColor.R.ToString("#0.00"));
-                    writer.WriteElementString("ColorG", _Fonts[Index].OutlineColor.G.ToString("#0.00"));
-                    writer.WriteElementString("ColorB", _Fonts[Index].OutlineColor.B.ToString("#0.00"));
-                    writer.WriteElementString("ColorA", _Fonts[Index].OutlineColor.A.ToString("#0.00"));
+                    writer.WriteElementString("OutlineColorR", _Fonts[Index].OutlineColor.R.ToString("#0.00"));
+                    writer.WriteElementString("OutlineColorG", _Fonts[Index].OutlineColor.G.ToString("#0.00"));
+                    writer.WriteElementString("OutlineColorB", _Fonts[Index].OutlineColor.B.ToString("#0.00"));
+                    writer.WriteElementString("OutlineColorA", _Fonts[Index].OutlineColor.A.ToString("#0.00"));
 
                     writer.WriteElementString("FileNormal", _Fonts[Index].FileNormal);
                     writer.WriteElementString("FileBold", _Fonts[Index].FileBold);

From 48d60d070f08be8aa4284db80cb2ba4fcb73ad95 Mon Sep 17 00:00:00 2001
From: Florian Kuepper <florian.kueper@googlemail.com>
Date: Sat, 29 Sep 2012 15:23:18 +0200
Subject: [PATCH 3/4] Show BG-Music-Controls only if bg-music is on.

---
 Vocaluxe/Menu/CGraphics.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Vocaluxe/Menu/CGraphics.cs b/Vocaluxe/Menu/CGraphics.cs
index d0363134..d7543aac 100644
--- a/Vocaluxe/Menu/CGraphics.cs
+++ b/Vocaluxe/Menu/CGraphics.cs
@@ -464,7 +464,7 @@ namespace Vocaluxe.Menu
                 
                 if (PopupPlayerControlAllowed && KeyEvent.Key == Keys.Tab)
                 {
-                    if (_CurrentPopupScreen == EPopupScreens.NoPopup)
+                    if (_CurrentPopupScreen == EPopupScreens.NoPopup && CConfig.BackgroundMusic == EOffOn.TR_CONFIG_ON)
                         ShowPopup(EPopupScreens.PopupPlayerControl);
                     else
                         HidePopup(EPopupScreens.PopupPlayerControl);
@@ -509,7 +509,7 @@ namespace Vocaluxe.Menu
                 bool isOverPopupPlayerControl = CHelper.IsInBounds(_PopupScreens[(int)EPopupScreens.PopupPlayerControl].ScreenArea, MouseEvent);
                 if (PopupPlayerControlAllowed && isOverPopupPlayerControl)
                 {
-                    if (_CurrentPopupScreen == EPopupScreens.NoPopup)
+                    if (_CurrentPopupScreen == EPopupScreens.NoPopup && CConfig.BackgroundMusic == EOffOn.TR_CONFIG_ON)
                         ShowPopup(EPopupScreens.PopupPlayerControl);
                 }
 

From 2a18c124463612df35b251de18dead05217fc572 Mon Sep 17 00:00:00 2001
From: Florian Kuepper <florian.kueper@googlemail.com>
Date: Mon, 1 Oct 2012 12:07:33 +0200
Subject: [PATCH 4/4] Fix: Draw reflection of video in song-screen.

---
 Vocaluxe/Menu/SongMenu/CSongMenuTileBoard.cs | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/Vocaluxe/Menu/SongMenu/CSongMenuTileBoard.cs b/Vocaluxe/Menu/SongMenu/CSongMenuTileBoard.cs
index 56c6c325..86221f47 100644
--- a/Vocaluxe/Menu/SongMenu/CSongMenuTileBoard.cs
+++ b/Vocaluxe/Menu/SongMenu/CSongMenuTileBoard.cs
@@ -451,8 +451,8 @@ namespace Vocaluxe.Menu.SongMenu
                 }
             }
 
-
-            _CoverBig.Draw(1f, true);
+            if (_vidtex.color.A < 1)
+                _CoverBig.Draw(1f, true);
             _TextBG.Draw();
 
             if (_vidtex.index != -1 && _Video != -1)
@@ -462,9 +462,12 @@ namespace Vocaluxe.Menu.SongMenu
                 CHelper.SetRect(bounds, ref rect, rect.Width / rect.Height, EAspect.Crop);
 
                 CDraw.DrawTexture(_vidtex, new SRectF(rect.X, rect.Y, rect.Width, rect.Height, _CoverBig.Rect.Z),
-                    _vidtex.color, new SRectF(bounds.X, bounds.Y, bounds.Width, bounds.Height, 0f), false); 
+                    _vidtex.color, new SRectF(bounds.X, bounds.Y, bounds.Width, bounds.Height, 0f), false);
+                CDraw.DrawTextureReflection(_vidtex, new SRectF(rect.X, rect.Y, rect.Width, rect.Height, _CoverBig.Rect.Z),
+                    _vidtex.color, new SRectF(bounds.X, bounds.Y, bounds.Width, bounds.Height, 0f), _CoverBig.ReflectionSpace, _CoverBig.ReflectionHeight);
             }
 
+
             
             _Artist.Draw();
             _Title.Draw();