From a986686467df2391487c86fb161e09b6c8477dc6 Mon Sep 17 00:00:00 2001 From: Alexander Eckart Date: Sat, 24 Mar 2012 18:24:21 +0100 Subject: [PATCH] added medley icons (we need some nicer icons) --- .../{MedleyIcon.png => MedleyCalcIcon.png} | Bin Output/Themes/Ambient/MedleyTagIcon.png | Bin 0 -> 10385 bytes Output/Themes/Ambient/Screens/ScreenSong.xml | 38 +++++++++++++++++- Output/Themes/Ambient/Skin Blue.xml | 10 +++-- Output/Themes/Ambient/Skin Green.xml | 10 +++-- Output/Themes/Ambient/Skin Red.xml | 10 +++-- Output/Themes/Ambient/Skin Yellow.xml | 10 +++-- .../Themes/Changelog/Changelog_ScreenSong.txt | 13 ++++++ Vocaluxe/Menu/SongMenu/CSongMenuFramework.cs | 30 +++++++++----- Vocaluxe/Menu/SongMenu/CSongMenuTileBoard.cs | 25 ++++++++---- Vocaluxe/Screens/CScreenSong.cs | 2 +- 11 files changed, 112 insertions(+), 36 deletions(-) rename Output/Themes/Ambient/{MedleyIcon.png => MedleyCalcIcon.png} (100%) create mode 100644 Output/Themes/Ambient/MedleyTagIcon.png create mode 100644 Output/Themes/Changelog/Changelog_ScreenSong.txt 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 0000000000000000000000000000000000000000..2cfe3f20dc4486de7cd6e11cc7737a4c149fb500 GIT binary patch literal 10385 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 T_mO{$7zD`6s7RMfng;wIAqgrI literal 0 HcmV?d00001 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";