Merge pull request #477 from Vocaluxe/SongScreen_Year

Added displaying song year on song screen

Output/Themes/Changelog/Changelog_ScreenSong.txt

@@ -1,5 +1,22 @@
 ScreenSong
 
+++++++++++
+Version 9:
+
+Add:
+<TextSongYear>
+
+Changed values at:
+<TextSongLength>
+
+++++++++++
+Version 8:
+
+Add:
+<ButtonOptionsHighscore> to SongMenu
+<TextShortInfoTop>
+<StaticShortInfoTop>
+
 ++++++++++
 Version 7:
 

Output/Themes/Genius/Screens/ScreenSong.xml

@@ -2,7 +2,7 @@
 <Screen xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <Informations>
     <ScreenName>ScreenSong</ScreenName>
-    <ScreenVersion>8</ScreenVersion>
+    <ScreenVersion>9</ScreenVersion>
   </Informations>
   <Backgrounds>
     <Background Name="Background1">
@@ -905,19 +905,33 @@
           <Text />
         </TextTitle>
         <TextSongLength Name="TextSongLength">
-          <X>222</X>
+          <X>391</X>
           <Y>490</Y>
           <Z>-1.01</Z>
           <H>28</H>
-          <MaxW>340</MaxW>
+          <MaxW>100</MaxW>
           <Color Name="TextColor" />
           <SelColor Name="TextSelColor" />
-          <Align>Center</Align>
+          <Align>Right</Align>
           <ResizeAlign>Top</ResizeAlign>
           <Style>Bold</Style>
           <Font>Outline</Font>
           <Text />
         </TextSongLength>
+        <TextSongYear Name="TextSongYear">
+          <X>52</X>
+          <Y>490</Y>
+          <Z>-1.01</Z>
+          <H>28</H>
+          <MaxW>100</MaxW>
+          <Color Name="TextColor" />
+          <SelColor Name="TextSelColor" />
+          <Align>Left</Align>
+          <ResizeAlign>Top</ResizeAlign>
+          <Style>Bold</Style>
+          <Font>Outline</Font>
+          <Text />
+        </TextSongYear>
         <StaticCoverBig Name="StaticCoverBig">
           <Skin />
           <Color Name="Visible" />
@@ -1032,19 +1046,33 @@
           <Text />
         </TextTitle>
         <TextSongLength Name="TextSongLength">
-          <X>222</X>
+          <X>391</X>
           <Y>490</Y>
           <Z>-1.01</Z>
           <H>28</H>
-          <MaxW>340</MaxW>
+          <MaxW>100</MaxW>
           <Color Name="TextColor" />
           <SelColor Name="TextSelColor" />
-          <Align>Center</Align>
+          <Align>Right</Align>
           <ResizeAlign>Top</ResizeAlign>
           <Style>Bold</Style>
           <Font>Outline</Font>
           <Text />
         </TextSongLength>
+        <TextSongYear Name="TextSongYear">
+          <X>52</X>
+          <Y>490</Y>
+          <Z>-1.01</Z>
+          <H>28</H>
+          <MaxW>100</MaxW>
+          <Color Name="TextColor" />
+          <SelColor Name="TextSelColor" />
+          <Align>Left</Align>
+          <ResizeAlign>Top</ResizeAlign>
+          <Style>Bold</Style>
+          <Font>Outline</Font>
+          <Text />
+        </TextSongYear>
         <StaticCoverBig Name="StaticCoverBig">
           <Skin />
           <Color Name="Visible" />

Vocaluxe/Screens/CScreenSong.cs

@@ -43,7 +43,7 @@ namespace Vocaluxe.Screens
         // Version number for theme files. Increment it, if you've changed something on the theme files!
         protected override int _ScreenVersion
         {
-            get { return 8; }
+            get { return 9; }
         }
 
         private const string _TextCategory = "TextCategory";

VocaluxeLib/Menu/SongMenu/CSongMenuFramework.cs

@@ -63,6 +63,7 @@ namespace VocaluxeLib.Menu.SongMenu
         public SThemeText TextArtist;
         public SThemeText TextTitle;
         public SThemeText TextSongLength;
+        public SThemeText TextSongYear;
 
         public SThemeStatic StaticCoverBig;
         public SThemeStatic StaticTextBG;
@@ -111,6 +112,7 @@ namespace VocaluxeLib.Menu.SongMenu
         public SThemeText TextArtist;
         public SThemeText TextTitle;
         public SThemeText TextSongLength;
+        public SThemeText TextSongYear;
 
         public SThemeStatic StaticCoverBig;
         public SThemeStatic StaticTextBG;

VocaluxeLib/Menu/SongMenu/CSongMenuList.cs

@@ -43,6 +43,7 @@ namespace VocaluxeLib.Menu.SongMenu
         private readonly CText _Artist;
         private readonly CText _Title;
         private readonly CText _SongLength;
+        private readonly CText _SongYear;
 
         private float _SpaceW;
         private float _SpaceH;
@@ -118,19 +119,21 @@ namespace VocaluxeLib.Menu.SongMenu
             _Artist = new CText(_Theme.SongMenuList.TextArtist, _PartyModeID);
             _Title = new CText(_Theme.SongMenuList.TextTitle, _PartyModeID);
             _SongLength = new CText(_Theme.SongMenuList.TextSongLength, _PartyModeID);
+            _SongYear = new CText(_Theme.SongMenuList.TextSongYear, _PartyModeID);
             _CoverBig = new CStatic(_Theme.SongMenuList.StaticCoverBig, _PartyModeID);
             _TextBG = new CStatic(_Theme.SongMenuList.StaticTextBG, _PartyModeID);
             _DuetIcon = new CStatic(_Theme.SongMenuList.StaticDuetIcon, _PartyModeID);
             _VideoIcon = new CStatic(_Theme.SongMenuList.StaticVideoIcon, _PartyModeID);
             _MedleyCalcIcon = new CStatic(_Theme.SongMenuList.StaticMedleyCalcIcon, _PartyModeID);
             _MedleyTagIcon = new CStatic(_Theme.SongMenuList.StaticMedleyTagIcon, _PartyModeID);
-            _SubElements.AddRange(new IMenuElement[] {_Artist, _Title, _SongLength, _DuetIcon, _VideoIcon, _MedleyCalcIcon, _MedleyTagIcon});
+            _SubElements.AddRange(new IMenuElement[] {_Artist, _Title, _SongLength, _SongYear, _DuetIcon, _VideoIcon, _MedleyCalcIcon, _MedleyTagIcon});
         }
 
         private void _ReadSubTheme()
         {
             _Theme.SongMenuList.TextArtist = (SThemeText)_Artist.GetTheme();
             _Theme.SongMenuList.TextSongLength = (SThemeText)_SongLength.GetTheme();
+            _Theme.SongMenuList.TextSongYear = (SThemeText)_SongYear.GetTheme();
             _Theme.SongMenuList.TextTitle = (SThemeText)_Title.GetTheme();
             _Theme.SongMenuList.StaticCoverBig = (SThemeStatic)_CoverBig.GetTheme();
             _Theme.SongMenuList.StaticDuetIcon = (SThemeStatic)_DuetIcon.GetTheme();
@@ -217,6 +220,7 @@ namespace VocaluxeLib.Menu.SongMenu
             _Artist.Text = String.Empty;
             _Title.Text = String.Empty;
             _SongLength.Text = String.Empty;
+            _SongYear.Text = String.Empty;
             _DuetIcon.Visible = false;
             _VideoIcon.Visible = false;
             _MedleyCalcIcon.Visible = false;
@@ -245,6 +249,7 @@ namespace VocaluxeLib.Menu.SongMenu
                 _CoverBig.Texture = song.CoverTextureBig;
                 _Artist.Text = song.Artist;
                 _Title.Text = song.Title;
+                _SongYear.Text = song.Year;
                 _DuetIcon.Visible = song.IsDuet;
                 _VideoIcon.Visible = song.VideoFileName != "";
                 _MedleyCalcIcon.Visible = song.Medley.Source == EDataSource.Calculated;

VocaluxeLib/Menu/SongMenu/CSongMenuTileBoard.cs

@@ -42,6 +42,7 @@ namespace VocaluxeLib.Menu.SongMenu
         private CText _Artist;
         private CText _Title;
         private CText _SongLength;
+        private CText _SongYear;
 
         private int _NumW;
         private int _NumH;
@@ -113,13 +114,14 @@ namespace VocaluxeLib.Menu.SongMenu
             _Artist = new CText(_Theme.SongMenuTileBoard.TextArtist, _PartyModeID);
             _Title = new CText(_Theme.SongMenuTileBoard.TextTitle, _PartyModeID);
             _SongLength = new CText(_Theme.SongMenuTileBoard.TextSongLength, _PartyModeID);
+            _SongYear = new CText(_Theme.SongMenuTileBoard.TextSongYear, _PartyModeID);
             _CoverBig = new CStatic(_Theme.SongMenuTileBoard.StaticCoverBig, _PartyModeID);
             _TextBG = new CStatic(_Theme.SongMenuTileBoard.StaticTextBG, _PartyModeID);
             _DuetIcon = new CStatic(_Theme.SongMenuTileBoard.StaticDuetIcon, _PartyModeID);
             _VideoIcon = new CStatic(_Theme.SongMenuTileBoard.StaticVideoIcon, _PartyModeID);
             _MedleyCalcIcon = new CStatic(_Theme.SongMenuTileBoard.StaticMedleyCalcIcon, _PartyModeID);
             _MedleyTagIcon = new CStatic(_Theme.SongMenuTileBoard.StaticMedleyTagIcon, _PartyModeID);
-            _SubElements.AddRange(new IMenuElement[] {_Artist, _Title, _SongLength, _DuetIcon, _VideoIcon, _MedleyCalcIcon, _MedleyTagIcon});
+            _SubElements.AddRange(new IMenuElement[] {_Artist, _Title, _SongLength, _SongYear, _DuetIcon, _VideoIcon, _MedleyCalcIcon, _MedleyTagIcon});
         }
 
         private void _UpdateTileSelection()
@@ -135,6 +137,7 @@ namespace VocaluxeLib.Menu.SongMenu
         {
             _Theme.SongMenuTileBoard.TextArtist = (SThemeText)_Artist.GetTheme();
             _Theme.SongMenuTileBoard.TextSongLength = (SThemeText)_SongLength.GetTheme();
+            _Theme.SongMenuTileBoard.TextSongYear = (SThemeText)_SongYear.GetTheme();
             _Theme.SongMenuTileBoard.TextTitle = (SThemeText)_Title.GetTheme();
             _Theme.SongMenuTileBoard.StaticCoverBig = (SThemeStatic)_CoverBig.GetTheme();
             _Theme.SongMenuTileBoard.StaticDuetIcon = (SThemeStatic)_DuetIcon.GetTheme();
@@ -208,6 +211,7 @@ namespace VocaluxeLib.Menu.SongMenu
             _Artist.Text = String.Empty;
             _Title.Text = String.Empty;
             _SongLength.Text = String.Empty;
+            _SongYear.Text = String.Empty;
             _DuetIcon.Visible = false;
             _VideoIcon.Visible = false;
             _MedleyCalcIcon.Visible = false;
@@ -236,6 +240,7 @@ namespace VocaluxeLib.Menu.SongMenu
                 _CoverBig.Texture = song.CoverTextureBig;
                 _Artist.Text = song.Artist;
                 _Title.Text = song.Title;
+                _SongYear.Text = song.Year;
                 _DuetIcon.Visible = song.IsDuet;
                 _VideoIcon.Visible = song.VideoFileName != "";
                 _MedleyCalcIcon.Visible = song.Medley.Source == EDataSource.Calculated;