From a6cb64d69c4a8eaeb9d4d5fea90cc6b64205bf51 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Florian=20K=C3=BCpper?= <florian.kuepper@googlemail.com>
Date: Wed, 3 Dec 2014 12:19:20 +0100
Subject: [PATCH 1/2] Fix some theme-issues.

---
 Output/Themes/Ambient/Screens/ScreenOptionsGame.xml   | 4 ++--
 Output/Themes/Ambient/Screens/ScreenOptionsRecord.xml | 2 +-
 Output/Themes/Ambient/Screens/ScreenOptionsVideo.xml  | 4 ++--
 Output/Themes/Ambient/Screens/ScreenProfiles.xml      | 4 ++--
 Output/Themes/Ambient/Screens/ScreenSing.xml          | 8 ++++----
 Vocaluxe/Screens/CScreenSing.cs                       | 4 ++++
 6 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/Output/Themes/Ambient/Screens/ScreenOptionsGame.xml b/Output/Themes/Ambient/Screens/ScreenOptionsGame.xml
index 0058725e..cd75ed75 100644
--- a/Output/Themes/Ambient/Screens/ScreenOptionsGame.xml
+++ b/Output/Themes/Ambient/Screens/ScreenOptionsGame.xml
@@ -16,7 +16,7 @@
   <Statics>
     <Static Name="Static1">
       <Skin>Menu</Skin>
-      <Color Name="Invisible" />
+      <Color Name="StaticColor" />
       <Rect>
         <X>40</X>
         <Y>40</Y>
@@ -526,4 +526,4 @@
   <Playlists />
   <ParticleEffects />
   <ScreenSettings />
-</Screen>
\ No newline at end of file
+</Screen>
diff --git a/Output/Themes/Ambient/Screens/ScreenOptionsRecord.xml b/Output/Themes/Ambient/Screens/ScreenOptionsRecord.xml
index f7e99edf..f5696725 100644
--- a/Output/Themes/Ambient/Screens/ScreenOptionsRecord.xml
+++ b/Output/Themes/Ambient/Screens/ScreenOptionsRecord.xml
@@ -16,7 +16,7 @@
   <Statics>
     <Static Name="Static1">
       <Skin>Menu</Skin>
-      <Color Name="Invisible" />
+      <Color Name="StaticColor" />
       <Rect>
         <X>40</X>
         <Y>40</Y>
diff --git a/Output/Themes/Ambient/Screens/ScreenOptionsVideo.xml b/Output/Themes/Ambient/Screens/ScreenOptionsVideo.xml
index 8d43038f..b5740cc5 100644
--- a/Output/Themes/Ambient/Screens/ScreenOptionsVideo.xml
+++ b/Output/Themes/Ambient/Screens/ScreenOptionsVideo.xml
@@ -16,7 +16,7 @@
   <Statics>
     <Static Name="Static1">
       <Skin>Menu</Skin>
-      <Color Name="Invisible" />
+      <Color Name="StaticColor" />
       <Rect>
         <X>40</X>
         <Y>40</Y>
@@ -504,4 +504,4 @@
   <Playlists />
   <ParticleEffects />
   <ScreenSettings />
-</Screen>
\ No newline at end of file
+</Screen>
diff --git a/Output/Themes/Ambient/Screens/ScreenProfiles.xml b/Output/Themes/Ambient/Screens/ScreenProfiles.xml
index 1b052f4a..ca84426b 100644
--- a/Output/Themes/Ambient/Screens/ScreenProfiles.xml
+++ b/Output/Themes/Ambient/Screens/ScreenProfiles.xml
@@ -16,7 +16,7 @@
   <Statics>
     <Static Name="Static1">
       <Skin>Menu</Skin>
-      <Color Name="Invisible" />
+      <Color Name="StaticColor" />
       <Rect>
         <X>40</X>
         <Y>40</Y>
@@ -691,4 +691,4 @@
   <Playlists />
   <ParticleEffects />
   <ScreenSettings />
-</Screen>
\ No newline at end of file
+</Screen>
diff --git a/Output/Themes/Ambient/Screens/ScreenSing.xml b/Output/Themes/Ambient/Screens/ScreenSing.xml
index aee9420a..ed9bcb15 100644
--- a/Output/Themes/Ambient/Screens/ScreenSing.xml
+++ b/Output/Themes/Ambient/Screens/ScreenSing.xml
@@ -78,7 +78,7 @@
       <Skin>TimeLine</Skin>
       <Color Name="StaticColor" />
       <Rect>
-        <X>44</X>
+        <X>50</X>
         <Y>702</Y>
         <W>1090</W>
         <H>10</H>
@@ -89,7 +89,7 @@
       <Skin>TimeLine</Skin>
       <Color Name="TimeBar" />
       <Rect>
-        <X>44</X>
+        <X>50</X>
         <Y>696</Y>
         <W>1090</W>
         <H>9</H>
@@ -100,7 +100,7 @@
       <Skin>TimeLine</Skin>
       <Color Name="TimeBarSentence" />
       <Rect>
-        <X>44</X>
+        <X>50</X>
         <Y>696</Y>
         <W>1090</W>
         <H>9</H>
@@ -1900,4 +1900,4 @@
   <Playlists />
   <ParticleEffects />
   <ScreenSettings />
-</Screen>
\ No newline at end of file
+</Screen>
diff --git a/Vocaluxe/Screens/CScreenSing.cs b/Vocaluxe/Screens/CScreenSing.cs
index 1b1eec3a..d2331c1a 100644
--- a/Vocaluxe/Screens/CScreenSing.cs
+++ b/Vocaluxe/Screens/CScreenSing.cs
@@ -894,6 +894,10 @@ namespace Vocaluxe.Screens
 
             _Statics[_StaticLyricsDuet].Alpha = 0f;
             _Statics[_StaticLyricHelperDuet].Alpha = 0f;
+
+            _Statics[_StaticTimeLine].Visible = CConfig.Config.Theme.TimerLook == ETimerLook.TR_CONFIG_TIMERLOOK_NORMAL;
+            _Statics[_StaticTimeLineExpandedHighlighted].Visible = false;
+            _Statics[_StaticTimeLineExpandedNormal].Visible = false;
         }
 
         private void _UpdateMedleyCountdown()

From 94ee6c041880d104cf85b42384b80080f585f105 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Florian=20K=C3=BCpper?= <florian.kuepper@googlemail.com>
Date: Thu, 4 Dec 2014 17:20:51 +0100
Subject: [PATCH 2/2] Right use of GetUniqueFileName-method.

---
 VocaluxeLib/Profile/CProfile.cs | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/VocaluxeLib/Profile/CProfile.cs b/VocaluxeLib/Profile/CProfile.cs
index a0ee3ee4..2e168b97 100644
--- a/VocaluxeLib/Profile/CProfile.cs
+++ b/VocaluxeLib/Profile/CProfile.cs
@@ -139,8 +139,7 @@ namespace VocaluxeLib.Profile
                 if (filename == "")
                     filename = "1";
 
-                FilePath = Path.Combine(CBase.Settings.GetDataPath(), CBase.Settings.GetFolderProfiles());
-                FilePath = Path.Combine(FilePath, CHelper.GetUniqueFileName(FilePath, filename + ".xml", false));
+                FilePath = CHelper.GetUniqueFileName(Path.Combine(CBase.Settings.GetDataPath(), CBase.Settings.GetFolderProfiles()), filename + ".xml");
             }
 
             var xml = new CXmlSerializer();