diff --git a/Output/Themes/Ambient/MedleyIcon.png b/Output/Themes/Ambient/MedleyCalcIcon.png similarity index 100% rename from Output/Themes/Ambient/MedleyIcon.png rename to Output/Themes/Ambient/MedleyCalcIcon.png diff --git a/Output/Themes/Ambient/MedleyTagIcon.png b/Output/Themes/Ambient/MedleyTagIcon.png new file mode 100644 index 00000000..2cfe3f20 Binary files /dev/null and b/Output/Themes/Ambient/MedleyTagIcon.png differ diff --git a/Output/Themes/Ambient/Screens/ScreenSong.xml b/Output/Themes/Ambient/Screens/ScreenSong.xml index f693065d..84bfa297 100644 --- a/Output/Themes/Ambient/Screens/ScreenSong.xml +++ b/Output/Themes/Ambient/Screens/ScreenSong.xml @@ -1,7 +1,7 @@  - 1 + 2 Video @@ -180,6 +180,10 @@ DuetIcon VideoIcon + + MedleyCalcIcon + + MedleyTagIcon 40 100 @@ -356,6 +360,38 @@ + + + MedleyCalcIcon + + 280 + 530 + -1,00 + 40 + 40 + + + StaticColor + + + + + + + MedleyTagIcon + + 280 + 530 + -1,00 + 40 + 40 + + + StaticColor + + + + diff --git a/Output/Themes/Ambient/Skin Blue.xml b/Output/Themes/Ambient/Skin Blue.xml index 62fefa5d..7f5b16ab 100644 --- a/Output/Themes/Ambient/Skin Blue.xml +++ b/Output/Themes/Ambient/Skin Blue.xml @@ -214,13 +214,13 @@ 0,300 1,000 - - 0,800 + + 0,800 0,950 1,000 0,500 - - + + 0,800 0,950 1,000 @@ -263,6 +263,8 @@ EnergyBeam.png DuetIcon.png VideoIcon.png + MedleyCalcIcon.png + MedleyTagIcon.png Invisible.png diff --git a/Output/Themes/Ambient/Skin Green.xml b/Output/Themes/Ambient/Skin Green.xml index 9d6047ae..bee2b2ba 100644 --- a/Output/Themes/Ambient/Skin Green.xml +++ b/Output/Themes/Ambient/Skin Green.xml @@ -214,13 +214,13 @@ 0,300 1,000 - - 0,800 + + 0,800 0,950 1,000 0,500 - - + + 0,800 0,950 1,000 @@ -263,6 +263,8 @@ EnergyBeam.png DuetIcon.png VideoIcon.png + MedleyCalcIcon.png + MedleyTagIcon.png Invisible.png diff --git a/Output/Themes/Ambient/Skin Red.xml b/Output/Themes/Ambient/Skin Red.xml index b74a054b..42b71d2c 100644 --- a/Output/Themes/Ambient/Skin Red.xml +++ b/Output/Themes/Ambient/Skin Red.xml @@ -214,13 +214,13 @@ 0,300 1,000 - - 0,800 + + 0,800 0,950 1,000 0,500 - - + + 0,800 0,950 1,000 @@ -263,6 +263,8 @@ EnergyBeam.png DuetIcon.png VideoIcon.png + MedleyCalcIcon.png + MedleyTagIcon.png Invisible.png diff --git a/Output/Themes/Ambient/Skin Yellow.xml b/Output/Themes/Ambient/Skin Yellow.xml index 5d63b033..1207b7fe 100644 --- a/Output/Themes/Ambient/Skin Yellow.xml +++ b/Output/Themes/Ambient/Skin Yellow.xml @@ -214,13 +214,13 @@ 0,300 1,000 - - 0,800 + + 0,800 0,950 1,000 0,500 - - + + 0,800 0,950 1,000 @@ -263,6 +263,8 @@ EnergyBeam.png DuetIcon.png VideoIcon.png + MedleyCalcIcon.png + MedleyTagIcon.png Invisible.png diff --git a/Output/Themes/Changelog/Changelog_ScreenSong.txt b/Output/Themes/Changelog/Changelog_ScreenSong.txt new file mode 100644 index 00000000..1303abb5 --- /dev/null +++ b/Output/Themes/Changelog/Changelog_ScreenSong.txt @@ -0,0 +1,13 @@ +ScreenSong + +++++++++++ +Version 2: + +Add: + and +to SongMenu + +Add: + and +to SongMenu.SongMenuTileBoard +++++++++++ \ No newline at end of file diff --git a/Vocaluxe/Menu/SongMenu/CSongMenuFramework.cs b/Vocaluxe/Menu/SongMenu/CSongMenuFramework.cs index 4e6a14d0..92c0a431 100644 --- a/Vocaluxe/Menu/SongMenu/CSongMenuFramework.cs +++ b/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(": Texture name of video icon"); writer.WriteElementString("VideoIcon", _Theme.VideoIconName); + writer.WriteComment(": Texture name of medley calc (calculated) icon"); + writer.WriteElementString("MedleyCalcIcon", _Theme.MedleyCalcIcon); + + writer.WriteComment(": Texture name of medley tag (manuelly set) icon"); + writer.WriteElementString("MedleyTagIcon", _Theme.MedleyTagIcon); + writer.WriteComment(", , , , : 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() diff --git a/Vocaluxe/Menu/SongMenu/CSongMenuTileBoard.cs b/Vocaluxe/Menu/SongMenu/CSongMenuTileBoard.cs index 558cb093..becc1bdc 100644 --- a/Vocaluxe/Menu/SongMenu/CSongMenuTileBoard.cs +++ b/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 = true; - } - else - { - _VideoIcon.Visible = false; - } + _VideoIcon.Visible = song.VideoFileName.Length > 0; + _MedleyCalcIcon.Visible = song.Medley.Source == EMedleySource.Calculated; + _MedleyTagIcon.Visible = song.Medley.Source == EMedleySource.Tag; 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(); diff --git a/Vocaluxe/Screens/CScreenSong.cs b/Vocaluxe/Screens/CScreenSong.cs index 58b0322e..20022427 100644 --- a/Vocaluxe/Screens/CScreenSong.cs +++ b/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";