added medley icons (we need some nicer icons)

Output/Themes/Ambient/Screens/ScreenSong.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <root>
   <ScreenSong>
-    <ScreenVersion>1</ScreenVersion>
+    <ScreenVersion>2</ScreenVersion>
     <Background1>
       <!--<Type>: Background type: None, Color, Texture, Video-->
       <Type>Video</Type>
@@ -180,6 +180,10 @@
       <DuetIcon>DuetIcon</DuetIcon>
       <!--<VideoIcon>: Texture name of video icon-->
       <VideoIcon>VideoIcon</VideoIcon>
+      <!--<MedleyCalcIcon>: Texture name of medley calc (calculated) icon-->
+      <MedleyCalcIcon>MedleyCalcIcon</MedleyCalcIcon>
+      <!--<MedleyTagIcon>: Texture name of medley tag (manuelly set) icon-->
+      <MedleyTagIcon>MedleyTagIcon</MedleyTagIcon>
       <!--<X>, <Y>, <Z>, <W>, <H>: SongMenu position, width and height-->
       <X>40</X>
       <Y>100</Y>
@@ -356,6 +360,38 @@
           <!--   <Space>: Reflection Space-->
           <!--   <Height>: Reflection Height-->
         </StaticVideoIcon>
+        <StaticMedleyCalcIcon>
+          <!--<Skin>: Texture name-->
+          <Skin>MedleyCalcIcon</Skin>
+          <!--<X>, <Y>, <Z>, <W>, <H>: Static position, width and height-->
+          <X>280</X>
+          <Y>530</Y>
+          <Z>-1,00</Z>
+          <W>40</W>
+          <H>40</H>
+          <!--<Color>: Static color from ColorScheme (high priority)-->
+          <!--or <R>, <G>, <B>, <A> (lower priority)-->
+          <Color>StaticColor</Color>
+          <!--<Reflection> If exists:-->
+          <!--   <Space>: Reflection Space-->
+          <!--   <Height>: Reflection Height-->
+        </StaticMedleyCalcIcon>
+        <StaticMedleyTagIcon>
+          <!--<Skin>: Texture name-->
+          <Skin>MedleyTagIcon</Skin>
+          <!--<X>, <Y>, <Z>, <W>, <H>: Static position, width and height-->
+          <X>280</X>
+          <Y>530</Y>
+          <Z>-1,00</Z>
+          <W>40</W>
+          <H>40</H>
+          <!--<Color>: Static color from ColorScheme (high priority)-->
+          <!--or <R>, <G>, <B>, <A> (lower priority)-->
+          <Color>StaticColor</Color>
+          <!--<Reflection> If exists:-->
+          <!--   <Space>: Reflection Space-->
+          <!--   <Height>: Reflection Height-->
+        </StaticMedleyTagIcon>
       </SongMenuTileBoard>
     </SongMenu>
   </ScreenSong>

Output/Themes/Ambient/Skin Blue.xml

@@ -214,13 +214,13 @@
       <B>0,300</B>
       <A>1,000</A>
     </LyricSubColor>
-	<TimeBar>
+    <TimeBar>
-	  <R>0,800</R>
+      <R>0,800</R>
       <G>0,950</G>
       <B>1,000</B>
       <A>0,500</A>
-	</TimeBar>
+    </TimeBar>
-	<TimeBarSentence>
+    <TimeBarSentence>
       <R>0,800</R>
       <G>0,950</G>
       <B>1,000</B>
@@ -263,6 +263,8 @@
     <EnergyBeam>EnergyBeam.png</EnergyBeam>
     <DuetIcon>DuetIcon.png</DuetIcon>
     <VideoIcon>VideoIcon.png</VideoIcon>
+    <MedleyCalcIcon>MedleyCalcIcon.png</MedleyCalcIcon>
+    <MedleyTagIcon>MedleyTagIcon.png</MedleyTagIcon>
     <Invisible>Invisible.png</Invisible>
   </Skins>
   <Videos>

Output/Themes/Ambient/Skin Green.xml

@@ -214,13 +214,13 @@
       <B>0,300</B>
       <A>1,000</A>
     </LyricSubColor>
-	<TimeBar>
+    <TimeBar>
-	  <R>0,800</R>
+      <R>0,800</R>
       <G>0,950</G>
       <B>1,000</B>
       <A>0,500</A>
-	</TimeBar>
+    </TimeBar>
-	<TimeBarSentence>
+    <TimeBarSentence>
       <R>0,800</R>
       <G>0,950</G>
       <B>1,000</B>
@@ -263,6 +263,8 @@
     <EnergyBeam>EnergyBeam.png</EnergyBeam>
     <DuetIcon>DuetIcon.png</DuetIcon>
     <VideoIcon>VideoIcon.png</VideoIcon>
+    <MedleyCalcIcon>MedleyCalcIcon.png</MedleyCalcIcon>
+    <MedleyTagIcon>MedleyTagIcon.png</MedleyTagIcon>
     <Invisible>Invisible.png</Invisible>
   </Skins>
   <Videos>

Output/Themes/Ambient/Skin Red.xml

@@ -214,13 +214,13 @@
       <B>0,300</B>
       <A>1,000</A>
     </LyricSubColor>
-	<TimeBar>
+    <TimeBar>
-	  <R>0,800</R>
+      <R>0,800</R>
       <G>0,950</G>
       <B>1,000</B>
       <A>0,500</A>
-	</TimeBar>
+    </TimeBar>
-	<TimeBarSentence>
+    <TimeBarSentence>
       <R>0,800</R>
       <G>0,950</G>
       <B>1,000</B>
@@ -263,6 +263,8 @@
     <EnergyBeam>EnergyBeam.png</EnergyBeam>
     <DuetIcon>DuetIcon.png</DuetIcon>
     <VideoIcon>VideoIcon.png</VideoIcon>
+    <MedleyCalcIcon>MedleyCalcIcon.png</MedleyCalcIcon>
+    <MedleyTagIcon>MedleyTagIcon.png</MedleyTagIcon>
     <Invisible>Invisible.png</Invisible>
   </Skins>
   <Videos>

Output/Themes/Ambient/Skin Yellow.xml

@@ -214,13 +214,13 @@
       <B>0,300</B>
       <A>1,000</A>
     </LyricSubColor>
-	<TimeBar>
+    <TimeBar>
-	  <R>0,800</R>
+      <R>0,800</R>
       <G>0,950</G>
       <B>1,000</B>
       <A>0,500</A>
-	</TimeBar>
+    </TimeBar>
-	<TimeBarSentence>
+    <TimeBarSentence>
       <R>0,800</R>
       <G>0,950</G>
       <B>1,000</B>
@@ -263,6 +263,8 @@
     <EnergyBeam>EnergyBeam.png</EnergyBeam>
     <DuetIcon>DuetIcon.png</DuetIcon>
     <VideoIcon>VideoIcon.png</VideoIcon>
+    <MedleyCalcIcon>MedleyCalcIcon.png</MedleyCalcIcon>
+    <MedleyTagIcon>MedleyTagIcon.png</MedleyTagIcon>
     <Invisible>Invisible.png</Invisible>
   </Skins>
   <Videos>

Output/Themes/Changelog/Changelog_ScreenSong.txt

@@ -0,0 +1,13 @@
+ScreenSong
+
+++++++++++
+Version 2:
+
+Add:
+<MedleyCalcIcon> and <MedleyTagIcon>
+to SongMenu
+
+Add:
+<StaticMedleyCalcIcon> and <StaticMedleyTagIcon> 
+to SongMenu.SongMenuTileBoard
+++++++++++ 

Vocaluxe/Menu/SongMenu/CSongMenuFramework.cs

@@ -20,6 +20,9 @@ namespace Vocaluxe.Menu.SongMenu
         public string DuetIconName;
         public string VideoIconName;
 
+        public string MedleyCalcIcon;
+        public string MedleyTagIcon;
+
         public string ColorName;
 
         //public SThemeSongMenuBook songMenuBook;
@@ -72,6 +75,8 @@ namespace Vocaluxe.Menu.SongMenu
         public CStatic StaticTextBG;
         public CStatic StaticDuetIcon;
         public CStatic StaticVideoIcon;
+        public CStatic StaticMedleyCalcIcon;
+        public CStatic StaticMedleyTagIcon;
     }
 
     abstract class CSongMenuFramework : ISongMenu
@@ -225,6 +230,8 @@ namespace Vocaluxe.Menu.SongMenu
             _Theme.songMenuTileBoard.StaticTextBG = new CStatic();
             _Theme.songMenuTileBoard.StaticDuetIcon = new CStatic();
             _Theme.songMenuTileBoard.StaticVideoIcon = new CStatic();
+            _Theme.songMenuTileBoard.StaticMedleyCalcIcon = new CStatic();
+            _Theme.songMenuTileBoard.StaticMedleyTagIcon = new CStatic();
 
             _ThemeLoaded = false;
         }
@@ -238,8 +245,9 @@ namespace Vocaluxe.Menu.SongMenu
             _ThemeLoaded &= CHelper.GetValueFromXML(item + "/CoverBigBackground", navigator, ref _Theme.CoverBigBackgroundName, String.Empty);
             _ThemeLoaded &= CHelper.GetValueFromXML(item + "/DuetIcon", navigator, ref _Theme.DuetIconName, String.Empty);
             _ThemeLoaded &= CHelper.GetValueFromXML(item + "/VideoIcon", navigator, ref _Theme.VideoIconName, String.Empty);
-
+            _ThemeLoaded &= CHelper.GetValueFromXML(item + "/MedleyCalcIcon", navigator, ref _Theme.MedleyCalcIcon, String.Empty);
-
+            _ThemeLoaded &= CHelper.GetValueFromXML(item + "/MedleyTagIcon", navigator, ref _Theme.MedleyTagIcon, String.Empty);
+            
             _ThemeLoaded &= CHelper.TryGetFloatValueFromXML(item + "/X", navigator, ref _Rect.X);
             _ThemeLoaded &= CHelper.TryGetFloatValueFromXML(item + "/Y", navigator, ref _Rect.Y);
             _ThemeLoaded &= CHelper.TryGetFloatValueFromXML(item + "/Z", navigator, ref _Rect.Z);
@@ -272,6 +280,8 @@ namespace Vocaluxe.Menu.SongMenu
             _ThemeLoaded &= _Theme.songMenuTileBoard.StaticTextBG.LoadTheme(item + "/SongMenuTileBoard", "StaticTextBG", navigator, SkinIndex);
             _ThemeLoaded &= _Theme.songMenuTileBoard.StaticDuetIcon.LoadTheme(item + "/SongMenuTileBoard", "StaticDuetIcon", navigator, SkinIndex);
             _ThemeLoaded &= _Theme.songMenuTileBoard.StaticVideoIcon.LoadTheme(item + "/SongMenuTileBoard", "StaticVideoIcon", navigator, SkinIndex);
+            _ThemeLoaded &= _Theme.songMenuTileBoard.StaticMedleyCalcIcon.LoadTheme(item + "/SongMenuTileBoard", "StaticMedleyCalcIcon", navigator, SkinIndex);
+            _ThemeLoaded &= _Theme.songMenuTileBoard.StaticMedleyTagIcon.LoadTheme(item + "/SongMenuTileBoard", "StaticMedleyTagIcon", navigator, SkinIndex);
 
             _ThemeLoaded &= CHelper.TryGetFloatValueFromXML(item + "/SongMenuTileBoard/TileRectX", navigator, ref _Theme.songMenuTileBoard.TileRect.X);
             _ThemeLoaded &= CHelper.TryGetFloatValueFromXML(item + "/SongMenuTileBoard/TileRectY", navigator, ref _Theme.songMenuTileBoard.TileRect.Y);
@@ -309,6 +319,12 @@ namespace Vocaluxe.Menu.SongMenu
                 writer.WriteComment("<VideoIcon>: Texture name of video icon");
                 writer.WriteElementString("VideoIcon", _Theme.VideoIconName);
 
+                writer.WriteComment("<MedleyCalcIcon>: Texture name of medley calc (calculated) icon");
+                writer.WriteElementString("MedleyCalcIcon", _Theme.MedleyCalcIcon);
+
+                writer.WriteComment("<MedleyTagIcon>: Texture name of medley tag (manuelly set) icon");
+                writer.WriteElementString("MedleyTagIcon", _Theme.MedleyTagIcon);
+
                 writer.WriteComment("<X>, <Y>, <Z>, <W>, <H>: SongMenu position, width and height");
                 writer.WriteElementString("X", _Rect.X.ToString("#0"));
                 writer.WriteElementString("Y", _Rect.Y.ToString("#0"));
@@ -361,6 +377,8 @@ namespace Vocaluxe.Menu.SongMenu
                 _Theme.songMenuTileBoard.StaticTextBG.SaveTheme(writer);
                 _Theme.songMenuTileBoard.StaticDuetIcon.SaveTheme(writer);
                 _Theme.songMenuTileBoard.StaticVideoIcon.SaveTheme(writer);
+                _Theme.songMenuTileBoard.StaticMedleyCalcIcon.SaveTheme(writer);
+                _Theme.songMenuTileBoard.StaticMedleyTagIcon.SaveTheme(writer);
                                 
                 writer.WriteEndElement();
                 #endregion SongMenuTileBoard
@@ -491,14 +509,6 @@ namespace Vocaluxe.Menu.SongMenu
 
             if (_Theme.ColorName != String.Empty)
                 _Color = CTheme.GetColor(_Theme.ColorName);
-
-            _Theme.songMenuTileBoard.StaticCoverBig.ReloadTextures();
-            _Theme.songMenuTileBoard.StaticTextBG.ReloadTextures();
-            _Theme.songMenuTileBoard.StaticDuetIcon.ReloadTextures();
-            _Theme.songMenuTileBoard.StaticVideoIcon.ReloadTextures();
-
-            _Theme.songMenuTileBoard.TextArtist.ReloadTextures();
-            _Theme.songMenuTileBoard.TextTitle.ReloadTextures();
         }
 
         public void ReloadTextures()

Vocaluxe/Menu/SongMenu/CSongMenuTileBoard.cs

@@ -18,6 +18,8 @@ namespace Vocaluxe.Menu.SongMenu
         private CStatic _TextBG;
         private CStatic _DuetIcon;
         private CStatic _VideoIcon;
+        private CStatic _MedleyCalcIcon;
+        private CStatic _MedleyTagIcon;
 
         private STexture _CoverBigTexture;
         private STexture _CoverTexture;
@@ -81,6 +83,8 @@ namespace Vocaluxe.Menu.SongMenu
             _TextBG = _Theme.songMenuTileBoard.StaticTextBG;
             _DuetIcon = _Theme.songMenuTileBoard.StaticDuetIcon;
             _VideoIcon = _Theme.songMenuTileBoard.StaticVideoIcon;
+            _MedleyCalcIcon = _Theme.songMenuTileBoard.StaticMedleyCalcIcon;
+            _MedleyTagIcon = _Theme.songMenuTileBoard.StaticMedleyTagIcon;
 
             _Artist = _Theme.songMenuTileBoard.TextArtist;
             _Title = _Theme.songMenuTileBoard.TextTitle;
@@ -113,6 +117,8 @@ namespace Vocaluxe.Menu.SongMenu
                 _Locked = 0;
                 _DuetIcon.Visible = false;
                 _VideoIcon.Visible = false;
+                _MedleyCalcIcon.Visible = false;
+                _MedleyTagIcon.Visible = false;
             }
 
             if (CSongs.NumVisibleSongs == 0 && CSongs.SearchFilter != String.Empty)
@@ -125,6 +131,8 @@ namespace Vocaluxe.Menu.SongMenu
                 _Locked = -1;
                 _DuetIcon.Visible = false;
                 _VideoIcon.Visible = false;
+                _MedleyCalcIcon.Visible = false;
+                _MedleyTagIcon.Visible = false;
             }
         }
 
@@ -406,14 +414,9 @@ namespace Vocaluxe.Menu.SongMenu
                     _Artist.Text = song.Artist;
                     _Title.Text = song.Title;
                     _DuetIcon.Visible = song.IsDuet;
-                    if (song.VideoFileName.Length > 0)
+                    _VideoIcon.Visible = song.VideoFileName.Length > 0;
-                    {
+                    _MedleyCalcIcon.Visible = song.Medley.Source == EMedleySource.Calculated;
-                        _VideoIcon.Visible = true;
+                    _MedleyTagIcon.Visible = song.Medley.Source == EMedleySource.Tag;
-                    }
-                    else
-                    {
-                        _VideoIcon.Visible = false;
-                    }
 
                     float Time = CSound.GetLength(_SongStream);
                     if (song.Finish != 0)
@@ -442,6 +445,8 @@ namespace Vocaluxe.Menu.SongMenu
                     _SongLength.Text = String.Empty;
                     _DuetIcon.Visible = false;
                     _VideoIcon.Visible = false;
+                    _MedleyCalcIcon.Visible = false;
+                    _MedleyTagIcon.Visible = false;
                 }
             }
 
@@ -465,6 +470,8 @@ namespace Vocaluxe.Menu.SongMenu
             _SongLength.Draw();
             _DuetIcon.Draw();
             _VideoIcon.Draw();
+            _MedleyCalcIcon.Draw();
+            _MedleyTagIcon.Draw();
                       
         }
 
@@ -651,6 +658,8 @@ namespace Vocaluxe.Menu.SongMenu
             _Theme.songMenuTileBoard.StaticTextBG.ReloadTextures();
             _Theme.songMenuTileBoard.StaticDuetIcon.ReloadTextures();
             _Theme.songMenuTileBoard.StaticVideoIcon.ReloadTextures();
+            _Theme.songMenuTileBoard.StaticMedleyCalcIcon.ReloadTextures();
+            _Theme.songMenuTileBoard.StaticMedleyTagIcon.ReloadTextures();
 
             _Theme.songMenuTileBoard.TextArtist.ReloadTextures();
             _Theme.songMenuTileBoard.TextTitle.ReloadTextures();

Vocaluxe/Screens/CScreenSong.cs

@@ -17,7 +17,7 @@ namespace Vocaluxe.Screens
     class CScreenSong : CMenu
     {
         // Version number for theme files. Increment it, if you've changed something on the theme files!
-        const int ScreenVersion = 1;
+        const int ScreenVersion = 2;
 
         private const string TextCategory = "TextCategory";
         private const string TextSelection = "TextSelection";