diff --git a/Output/Languages/English.xml b/Output/Languages/English.xml index 2ad11503..8827da1a 100644 --- a/Output/Languages/English.xml +++ b/Output/Languages/English.xml @@ -46,7 +46,7 @@ Level 2 Level 3 Max - List + Song List Dreidel TileBoard Book diff --git a/Output/Languages/German.xml b/Output/Languages/German.xml index 82924766..24c141fa 100644 --- a/Output/Languages/German.xml +++ b/Output/Languages/German.xml @@ -46,7 +46,7 @@ Level 2 Level 3 Maximal - Liste + Songliste Dreidel TileBoard Book diff --git a/Output/Themes/Ambient/Screens/ScreenSong.xml b/Output/Themes/Ambient/Screens/ScreenSong.xml index 62dba236..536f5b06 100644 --- a/Output/Themes/Ambient/Screens/ScreenSong.xml +++ b/Output/Themes/Ambient/Screens/ScreenSong.xml @@ -2,7 +2,7 @@ ScreenSong - 5 + 6 @@ -860,6 +860,135 @@ + + + 15 + 10 + 10 + + 410 + 40 + 830 + 550 + -1 + + + 410 + 40 + 555 + 550 + -1 + + + 222 + 416 + -1.01 + 39 + 340 + + + Center + Top + + Outline + + + + 222 + 456 + -1.01 + 32 + 340 + + + Center + Top + + Outline + + + + 222 + 490 + -1.01 + 28 + 340 + + + Center + Top + + Outline + + + + CoverBackground + + + 40 + 40 + 360 + 360 + -1 + + + + CoverBackground + + + 40 + 40 + 360 + 550 + -1 + + + + DuetIcon + + + 200 + 530 + 40 + 40 + -1 + + + + VideoIcon + + + 120 + 530 + 40 + 40 + -1 + + + + MedleyCalcIcon + + + 280 + 530 + 40 + 40 + -1 + + + + MedleyTagIcon + + + 280 + 530 + 40 + 40 + -1 + + + + @@ -1277,4 +1406,4 @@ - \ No newline at end of file + diff --git a/Output/Themes/Changelog/Changelog_ScreenSong.txt b/Output/Themes/Changelog/Changelog_ScreenSong.txt index 84b853fb..4b71ef3c 100644 --- a/Output/Themes/Changelog/Changelog_ScreenSong.txt +++ b/Output/Themes/Changelog/Changelog_ScreenSong.txt @@ -1,5 +1,11 @@ ScreenSong +++++++++++ +Version 6: + +Add: + to + ++++++++++ Version 5: diff --git a/Vocaluxe/Base/CConfig.cs b/Vocaluxe/Base/CConfig.cs index b2b523cf..d827af8d 100644 --- a/Vocaluxe/Base/CConfig.cs +++ b/Vocaluxe/Base/CConfig.cs @@ -126,7 +126,9 @@ namespace Vocaluxe.Base { [DefaultValue(CSettings.FallbackLanguage)] public string Language; public string[] SongFolder; + // ReSharper disable MemberHidesStaticFromOuterClass [DefaultValue(ESongMenu.TR_CONFIG_TILE_BOARD)] public ESongMenu SongMenu; + // ReSharper restore MemberHidesStaticFromOuterClass [DefaultValue(ESongSorting.TR_CONFIG_ARTIST)] public ESongSorting SongSorting; [DefaultValue(EOffOn.TR_CONFIG_ON)] public EOffOn IgnoreArticles; [DefaultValue(10)] public float ScoreAnimationTime; @@ -181,6 +183,7 @@ namespace Vocaluxe.Base public static SConfig Config; public static bool LoadOldThemeFiles; + public static event OnSongMenuChanged SongMenuChanged; //Folders public static readonly List SongFolders = new List @@ -275,6 +278,19 @@ namespace Vocaluxe.Base } } + public static ESongMenu SongMenu + { + get { return Config.Game.SongMenu; } + set + { + if (Config.Game.SongMenu == value) + return; + Config.Game.SongMenu = value; + if (SongMenuChanged != null) + SongMenuChanged(); + } + } + public static void Init() { if (_Initialized) diff --git a/Vocaluxe/Base/CMain.cs b/Vocaluxe/Base/CMain.cs index 1224a1c0..b5d2e0c7 100644 --- a/Vocaluxe/Base/CMain.cs +++ b/Vocaluxe/Base/CMain.cs @@ -88,7 +88,7 @@ namespace Vocaluxe.Base public ESongMenu GetSongMenuType() { - return CConfig.Config.Game.SongMenu; + return CConfig.SongMenu; } public EOffOn GetVideosToBackground() @@ -155,6 +155,16 @@ namespace Vocaluxe.Base { return CConfig.LoadOldThemeFiles; } + + public void AddSongMenuListener(OnSongMenuChanged onSongMenuChanged) + { + CConfig.SongMenuChanged += onSongMenuChanged; + } + + public void RemoveSongMenuListener(OnSongMenuChanged onSongMenuChanged) + { + CConfig.SongMenuChanged -= onSongMenuChanged; + } } class CBsettings : ISettings diff --git a/Vocaluxe/Screens/CScreenOptionsGame.cs b/Vocaluxe/Screens/CScreenOptionsGame.cs index 71794199..71ff7197 100644 --- a/Vocaluxe/Screens/CScreenOptionsGame.cs +++ b/Vocaluxe/Screens/CScreenOptionsGame.cs @@ -56,7 +56,7 @@ namespace Vocaluxe.Screens _SelectSlides[_SelectSlideLanguage].Selection = CLanguage.LanguageId; _SelectSlides[_SelectSlideDebugLevel].SetValues((int)CConfig.Config.Debug.DebugLevel); - _SelectSlides[_SelectSlideSongMenu].SetValues((int)CConfig.Config.Game.SongMenu); + _SelectSlides[_SelectSlideSongMenu].SetValues((int)CConfig.SongMenu); _SelectSlides[_SelectSlideSongSorting].SetValues((int)CConfig.Config.Game.SongSorting); _SelectSlides[_SelectSlideTabs].SetValues((int)CConfig.Config.Game.Tabs); _SelectSlides[_SelectSlideTimerMode].SetValues((int)CConfig.Config.Game.TimerMode); @@ -136,7 +136,7 @@ namespace Vocaluxe.Screens CLanguage.LanguageId = _SelectSlides[_SelectSlideLanguage].Selection; CConfig.Config.Game.Language = _SelectSlides[_SelectSlideLanguage].SelectedValue; CConfig.Config.Debug.DebugLevel = (EDebugLevel)_SelectSlides[_SelectSlideDebugLevel].Selection; - CConfig.Config.Game.SongMenu = (ESongMenu)_SelectSlides[_SelectSlideSongMenu].Selection; + CConfig.SongMenu = (ESongMenu)_SelectSlides[_SelectSlideSongMenu].Selection; CConfig.Config.Game.SongSorting = (ESongSorting)_SelectSlides[_SelectSlideSongSorting].Selection; CConfig.Config.Game.Tabs = (EOffOn)_SelectSlides[_SelectSlideTabs].Selection; CConfig.Config.Game.TimerMode = (ETimerMode)_SelectSlides[_SelectSlideTimerMode].Selection; diff --git a/Vocaluxe/Screens/CScreenSong.cs b/Vocaluxe/Screens/CScreenSong.cs index 9713baca..51aca1ce 100644 --- a/Vocaluxe/Screens/CScreenSong.cs +++ b/Vocaluxe/Screens/CScreenSong.cs @@ -42,7 +42,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 5; } + get { return 6; } } private const string _TextCategory = "TextCategory"; @@ -146,6 +146,12 @@ namespace Vocaluxe.Screens _DragAndDropCover = GetNewStatic(); } + protected override void _OnSongMenuChanged() + { + base._OnSongMenuChanged(); + _SongMenu = _SongMenus[_SongMenuName]; + } + public override void LoadTheme(string xmlPath) { base.LoadTheme(xmlPath); @@ -678,7 +684,7 @@ namespace Vocaluxe.Screens { int song = _SongMenu.GetSelectedSongNr(); if (song >= 0 && song < CSongs.VisibleSongs.Count) - selectionText = CSongs.VisibleSongs[song].Artist + " - " + CSongs.VisibleSongs[song].Title; + selectionText = CSongs.VisibleSongs[song].Artist + " - " + CSongs.VisibleSongs[song].Title + " ( "+(song+1)+" / "+CSongs.NumAllSongs+" )"; } else { diff --git a/VocaluxeLib/Enums.cs b/VocaluxeLib/Enums.cs index 82746f4e..40d69883 100644 --- a/VocaluxeLib/Enums.cs +++ b/VocaluxeLib/Enums.cs @@ -200,10 +200,10 @@ namespace VocaluxeLib public enum ESongMenu { // ReSharper disable InconsistentNaming - //TR_CONFIG_LIST, //a simple list - //TR_CONFIG_DREIDEL, //as in ultrastar deluxe + TR_CONFIG_LIST, // list of covers and artist - title + //TR_CONFIG_DREIDEL, //as in ultrastar deluxe TR_CONFIG_TILE_BOARD, //chessboard like - //TR_CONFIG_BOOK //for playlists + //TR_CONFIG_BOOK //for playlists // ReSharper restore InconsistentNaming } diff --git a/VocaluxeLib/IBasic.cs b/VocaluxeLib/IBasic.cs index 6c18ddde..1374ae86 100644 --- a/VocaluxeLib/IBasic.cs +++ b/VocaluxeLib/IBasic.cs @@ -27,6 +27,8 @@ using VocaluxeLib.Songs; namespace VocaluxeLib { + public delegate void OnSongMenuChanged(); + public interface IConfig { EOffOn GetSaveModifiedSongs(); @@ -58,6 +60,8 @@ namespace VocaluxeLib int GetMaxNumMics(); bool GetLoadOldThemeFiles(); + void AddSongMenuListener(OnSongMenuChanged onSongMenuChanged); + void RemoveSongMenuListener(OnSongMenuChanged onSongMenuChanged); } public interface ISettings diff --git a/VocaluxeLib/Menu/CMenu.cs b/VocaluxeLib/Menu/CMenu.cs index 7bb87d13..27b6d316 100644 --- a/VocaluxeLib/Menu/CMenu.cs +++ b/VocaluxeLib/Menu/CMenu.cs @@ -89,6 +89,12 @@ namespace VocaluxeLib.Menu protected CMenu() { PartyModeID = -1; + CBase.Config.AddSongMenuListener(_OnSongMenuChanged); + } + + ~CMenu() + { + CBase.Config.RemoveSongMenuListener(_OnSongMenuChanged); } public override void Init() @@ -113,6 +119,16 @@ namespace VocaluxeLib.Menu _ThemeScreenSettings = null; } + protected virtual void _OnSongMenuChanged() + { + for (int i = 0; i < _SongMenus.Count; i++) + { + SThemeSongMenu theme = (SThemeSongMenu)_SongMenus[i].GetTheme(); + _SongMenus[i] = CSongMenuFactory.CreateSongMenu(theme, PartyModeID); + _SongMenus[i].LoadSkin(); + } + } + #region ThemeHandler protected override void _ClearElements() { diff --git a/VocaluxeLib/Menu/COrderedDictionaryLite.cs b/VocaluxeLib/Menu/COrderedDictionaryLite.cs index d1d5463f..3bb7d995 100644 --- a/VocaluxeLib/Menu/COrderedDictionaryLite.cs +++ b/VocaluxeLib/Menu/COrderedDictionaryLite.cs @@ -36,6 +36,11 @@ namespace VocaluxeLib.Menu _ParentName = _ParentName.Remove(0, 1); } + public int Count + { + get { return _Items.Count; } + } + public T this[int index] { get { return _Items[index]; } diff --git a/VocaluxeLib/Menu/SongMenu/CSongMenuFactory.cs b/VocaluxeLib/Menu/SongMenu/CSongMenuFactory.cs index e512721d..fe4bbb73 100644 --- a/VocaluxeLib/Menu/SongMenu/CSongMenuFactory.cs +++ b/VocaluxeLib/Menu/SongMenu/CSongMenuFactory.cs @@ -25,9 +25,8 @@ namespace VocaluxeLib.Menu.SongMenu { switch (CBase.Config.GetSongMenuType()) { - //case ESongMenu.TR_CONFIG_LIST: - // _SongMenu = new CSongMenuList(); - // break; + case ESongMenu.TR_CONFIG_LIST: + return new CSongMenuList(theme, partyModeID); //case ESongMenu.TR_CONFIG_DREIDEL: // _SongMenu = new CSongMenuDreidel(); @@ -49,23 +48,7 @@ namespace VocaluxeLib.Menu.SongMenu /// public static ISongMenu CreateSongMenu(int partyModeID) { - switch (CBase.Config.GetSongMenuType()) - { - //case ESongMenu.TR_CONFIG_LIST: - // _SongMenu = new CSongMenuList(); - // break; - - //case ESongMenu.TR_CONFIG_DREIDEL: - // _SongMenu = new CSongMenuDreidel(); - // break; - case ESongMenu.TR_CONFIG_TILE_BOARD: - return new CSongMenuTileBoard(partyModeID); - - //case ESongMenu.TR_CONFIG_BOOK: - // _SongMenu = new CSongMenuBook(); - // break; - } - throw new ArgumentException("Invalid songmenu type: " + CBase.Config.GetSongMenuType()); + return new CSongMenuTileBoard(partyModeID); } } } \ No newline at end of file diff --git a/VocaluxeLib/Menu/SongMenu/CSongMenuFramework.cs b/VocaluxeLib/Menu/SongMenu/CSongMenuFramework.cs index c0bfb6f3..1cc4fa0a 100644 --- a/VocaluxeLib/Menu/SongMenu/CSongMenuFramework.cs +++ b/VocaluxeLib/Menu/SongMenu/CSongMenuFramework.cs @@ -39,9 +39,41 @@ namespace VocaluxeLib.Menu.SongMenu //public SThemeSongMenuBook songMenuBook; //public SThemeSongMenuDreidel songMenuDreidel; - //public SThemeSongMenuList songMenuList; + public SThemeSongMenuList SongMenuList; public SThemeSongMenuTileBoard SongMenuTileBoard; } + public struct SThemeSongMenuList + { + /// + /// Number of visible songs in list + /// + public int ListLength; + + /// + /// Space between tiles horizontal + /// + public float SpaceW; + + /// + /// Space between tiles vertical + /// + public float SpaceH; + + public SRectF TileRect; + public SRectF TileRectSmall; + + public SThemeText TextArtist; + public SThemeText TextTitle; + public SThemeText TextSongLength; + + public SThemeStatic StaticCoverBig; + public SThemeStatic StaticTextBG; + public SThemeStatic StaticDuetIcon; + public SThemeStatic StaticVideoIcon; + public SThemeStatic StaticMedleyCalcIcon; + public SThemeStatic StaticMedleyTagIcon; + } + public struct SThemeSongMenuTileBoard { @@ -215,6 +247,24 @@ namespace VocaluxeLib.Menu.SongMenu ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/SongMenuTileBoard/TileRectSmallH", ref _Theme.SongMenuTileBoard.TileRectSmall.H); #endregion SongMenuTileBoard + #region SongMenuList + ThemeLoaded &= xmlReader.TryGetIntValue(item + "/SongMenuList/ListLength", ref _Theme.SongMenuList.ListLength); + ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/SongMenuList/SpaceW", ref _Theme.SongMenuList.SpaceW); + ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/SongMenuList/SpaceH", ref _Theme.SongMenuList.SpaceH); + + ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/SongMenuList/TileRect/X", ref _Theme.SongMenuList.TileRect.X); + ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/SongMenuList/TileRect/Y", ref _Theme.SongMenuList.TileRect.Y); + ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/SongMenuList/TileRect/Z", ref _Theme.SongMenuList.TileRect.Z); + ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/SongMenuList/TileRect/W", ref _Theme.SongMenuList.TileRect.W); + ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/SongMenuList/TileRect/H", ref _Theme.SongMenuList.TileRect.H); + + ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/SongMenuList/TileRectSmall/X", ref _Theme.SongMenuList.TileRectSmall.X); + ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/SongMenuList/TileRectSmall/Y", ref _Theme.SongMenuList.TileRectSmall.Y); + ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/SongMenuList/TileRectSmall/Z", ref _Theme.SongMenuList.TileRectSmall.Z); + ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/SongMenuList/TileRectSmall/W", ref _Theme.SongMenuList.TileRectSmall.W); + ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/SongMenuList/TileRectSmall/H", ref _Theme.SongMenuList.TileRectSmall.H); + #endregion SongMenuList + if (ThemeLoaded) { _Theme.Name = elementName; @@ -256,7 +306,7 @@ namespace VocaluxeLib.Menu.SongMenu CBase.Drawing.DrawTexture(CBase.BackgroundMusic.GetVideoTexture(), new SRectF(0, 0, 1280, 720, 0)); } - public bool IsMouseOverSelectedSong(SMouseEvent mEvent) + public virtual bool IsMouseOverSelectedSong(SMouseEvent mEvent) { CStatic selCov = GetSelectedSongCover(); return selCov != null && CHelper.IsInBounds(selCov.Rect.Scale(SelectedTileZoomFactor), mEvent); diff --git a/VocaluxeLib/Menu/SongMenu/CSongMenuList.cs b/VocaluxeLib/Menu/SongMenu/CSongMenuList.cs new file mode 100644 index 00000000..8d1b3821 --- /dev/null +++ b/VocaluxeLib/Menu/SongMenu/CSongMenuList.cs @@ -0,0 +1,653 @@ +#region license +// This file is part of Vocaluxe. +// +// Vocaluxe is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// Vocaluxe is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with Vocaluxe. If not, see . +#endregion + +using System; +using System.Collections.Generic; +using System.Linq; +using System.Windows.Forms; +using VocaluxeLib.Draw; +using VocaluxeLib.PartyModes; +using VocaluxeLib.Songs; + +namespace VocaluxeLib.Menu.SongMenu +{ + class CSongMenuList : CSongMenuFramework + { + private SRectF _ScrollRect; + private List _Tiles; + private List _Texts; + private readonly CStatic _CoverBig; + private readonly CStatic _TextBG; + private readonly CStatic _DuetIcon; + private readonly CStatic _VideoIcon; + private readonly CStatic _MedleyCalcIcon; + private readonly CStatic _MedleyTagIcon; + + private CTextureRef _CoverBigBGTexture; + private CTextureRef _CoverBGTexture; + + private readonly CText _Artist; + private readonly CText _Title; + private readonly CText _SongLength; + + private float _SpaceW; + private float _SpaceH; + + private int _TileW; + private int _TileH; + + private int _ListLength; + private float _CoverTileWidth; + private float _ListTextWidth; + + // Offset is the song or categoryNr of the tile in the left upper corner + private int _Offset; + + private float _Length = -1f; + private int _LastKnownElements; + private int _LastKnownCategory; + + private bool _MouseWasInRect; + + private readonly List _SubElements = new List(); + + public override float SelectedTileZoomFactor + { + get { return 1.2f; } + } + + protected override int _SelectionNr + { + set + { + int max = CBase.Songs.IsInCategory() ? CBase.Songs.GetNumSongsVisible() : CBase.Songs.GetNumCategories(); + base._SelectionNr = value.Clamp(-1, max - 1, true); + //Update list in case we scrolled + _UpdateList(); + + _UpdateTileSelection(); + } + } + + public override bool SmallView + { + set + { + if (SmallView == value) + return; + base.SmallView = value; + _InitTiles(); + _UpdateList(true); + _UpdateTileSelection(); + } + } + + protected override int _PreviewNr + { + set + { + if (value == base._PreviewNr) + { + if (!CBase.BackgroundMusic.IsPlaying() && value != -1) + CBase.BackgroundMusic.PlayPreview(); + return; + } + base._PreviewNr = value; + _UpdatePreview(); + } + } + + public CSongMenuList(SThemeSongMenu theme, int partyModeID) : base(theme, partyModeID) + { + _ListLength = _Theme.SongMenuList.ListLength; + _SpaceW = _Theme.SongMenuList.SpaceW; + _SpaceH = _Theme.SongMenuList.SpaceH; + _Artist = new CText(_Theme.SongMenuList.TextArtist, _PartyModeID); + _Title = new CText(_Theme.SongMenuList.TextTitle, _PartyModeID); + _SongLength = new CText(_Theme.SongMenuList.TextSongLength, _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}); + } + + private void _ReadSubTheme() + { + _Theme.SongMenuList.TextArtist = (SThemeText)_Artist.GetTheme(); + _Theme.SongMenuList.TextSongLength = (SThemeText)_SongLength.GetTheme(); + _Theme.SongMenuList.TextTitle = (SThemeText)_Title.GetTheme(); + _Theme.SongMenuList.StaticCoverBig = (SThemeStatic)_CoverBig.GetTheme(); + _Theme.SongMenuList.StaticDuetIcon = (SThemeStatic)_DuetIcon.GetTheme(); + _Theme.SongMenuList.StaticMedleyCalcIcon = (SThemeStatic)_MedleyCalcIcon.GetTheme(); + _Theme.SongMenuList.StaticMedleyTagIcon = (SThemeStatic)_MedleyTagIcon.GetTheme(); + _Theme.SongMenuList.StaticTextBG = (SThemeStatic)_TextBG.GetTheme(); + _Theme.SongMenuList.StaticVideoIcon = (SThemeStatic)_VideoIcon.GetTheme(); + } + + public override object GetTheme() + { + _ReadSubTheme(); + return base.GetTheme(); + } + + public override void Init() + { + base.Init(); + + _PreviewNr = -1; + _InitTiles(); + } + + private void _InitTiles() + { + MaxRect = SmallView ? _Theme.SongMenuList.TileRectSmall : _Theme.SongMenuList.TileRect; + + _ListTextWidth = MaxRect.W - _ListTextWidth; + + _TileW = (int)((MaxRect.H - _SpaceH * (_ListLength - 1)) / _ListLength); + _TileH = _TileW; + + _CoverBGTexture = CBase.Themes.GetSkinTexture(_Theme.CoverBackground, _PartyModeID); + _CoverBigBGTexture = CBase.Themes.GetSkinTexture(_Theme.CoverBigBackground, _PartyModeID); + + //Create cover tiles + _Tiles = new List(); + _Texts = new List(); + + for (int i = 0; i < _ListLength; i++) + { + //Create Cover + var rect = new SRectF(Rect.X + (_TileW + _SpaceW), Rect.Y + i * (_TileH + _SpaceH), _TileW, _TileH, Rect.Z); + var tile = new CStatic(_PartyModeID, _CoverBGTexture, _Color, rect); + _Tiles.Add(tile); + + //Create text + var textRect = new SRectF(MaxRect.X + 2 * (_TileW + _SpaceW), Rect.Y + i * (_TileH + _SpaceH), _ListTextWidth, _TileH, Rect.Z); + CText text = new CText(textRect.X, textRect.Y, textRect.Z, + textRect.H, textRect.W, EAlignment.Left, EStyle.Normal, + "Normal", _Artist.Color, ""); + text.MaxRect = new SRectF(text.MaxRect.X, text.MaxRect.Y, MaxRect.W + MaxRect.X - text.Rect.X - 5f, text.MaxRect.H, text.MaxRect.Z); + text.ResizeAlign = EHAlignment.Center; + + _Texts.Add(text); + } + + _ScrollRect = CBase.Settings.GetRenderRect(); + } + + private void _UpdateTileSelection() + { + foreach (CStatic tile in _Tiles) + tile.Selected = false; + + int tileNr = _SelectionNr - _Offset; + if (tileNr >= 0 && tileNr < _Tiles.Count) + _Tiles[tileNr].Selected = true; + } + + public override void Update(SScreenSongOptions songOptions) + { + if (songOptions.Selection.RandomOnly) + _PreviewNr = _SelectionNr; + + if (_Length < 0 && CBase.Songs.IsInCategory() && CBase.BackgroundMusic.GetLength() > 0) + _UpdateLength(CBase.Songs.GetVisibleSong(_PreviewNr)); + } + + private void _UpdatePreview() + { + //First hide everything so we just have to set what we actually want + _CoverBig.Texture = _CoverBigBGTexture; + _Artist.Text = String.Empty; + _Title.Text = String.Empty; + _SongLength.Text = String.Empty; + _DuetIcon.Visible = false; + _VideoIcon.Visible = false; + _MedleyCalcIcon.Visible = false; + _MedleyTagIcon.Visible = false; + _Length = -1f; + + //Check if nothing is selected (for preview) + if (_PreviewNr < 0) + return; + + if (CBase.Songs.IsInCategory()) + { + CSong song = CBase.Songs.GetVisibleSong(_PreviewNr); + //Check if we have a valid song (song still visible, index >=0 etc is checked by framework) + if (song == null) + { + //Display at least the category + CCategory category = CBase.Songs.GetCategory(CBase.Songs.GetCurrentCategoryIndex()); + //Check if we have a valid category + if (category == null) + return; + _CoverBig.Texture = category.CoverTextureBig; + _Artist.Text = category.Name; + return; + } + _CoverBig.Texture = song.CoverTextureBig; + _Artist.Text = song.Artist; + _Title.Text = song.Title; + _DuetIcon.Visible = song.IsDuet; + _VideoIcon.Visible = song.VideoFileName != ""; + _MedleyCalcIcon.Visible = song.Medley.Source == EDataSource.Calculated; + _MedleyTagIcon.Visible = song.Medley.Source == EDataSource.Tag; + + _UpdateLength(song); + } + else + { + CCategory category = CBase.Songs.GetCategory(_PreviewNr); + //Check if we have a valid category + if (category == null) + return; + _CoverBig.Texture = category.CoverTextureBig; + _Artist.Text = category.Name; + + int num = category.GetNumSongsNotSung(); + String songOrSongs = (num == 1) ? "TR_SCREENSONG_NUMSONG" : "TR_SCREENSONG_NUMSONGS"; + _Title.Text = CBase.Language.Translate(songOrSongs).Replace("%v", num.ToString()); + } + } + + private void _UpdateLength(CSong song) + { + if (song == null) + return; + float time = CBase.BackgroundMusic.GetLength(); + if (Math.Abs(song.Finish) > 0.001) + time = song.Finish; + + // The audiobackend is ready to return the length + if (time > 0) + { + time -= song.Start; + var min = (int)Math.Floor(time / 60f); + var sec = (int)(time - min * 60f); + _SongLength.Text = min.ToString("00") + ":" + sec.ToString("00"); + _Length = time; + } + else + _SongLength.Text = "..."; + } + + public override void OnShow() + { + _LastKnownElements = -1; //Force refresh of list + if (!CBase.Songs.IsInCategory()) + { + if ((CBase.Songs.GetTabs() == EOffOn.TR_CONFIG_OFF && CBase.Songs.GetNumCategories() > 0) || CBase.Songs.GetNumCategories() == 1) + _EnterCategory(0); + } + if (CBase.Songs.IsInCategory()) + SetSelectedSong(_SelectionNr < 0 ? 0 : _SelectionNr); + else + SetSelectedCategory(_SelectionNr < 0 ? 0 : _SelectionNr); + _PreviewNr = _SelectionNr; + _UpdateListIfRequired(); + } + + public override bool HandleInput(ref SKeyEvent keyEvent, SScreenSongOptions options) + { + if (keyEvent.KeyPressed) + return false; + + bool moveAllowed = !options.Selection.RandomOnly || (options.Selection.CategoryChangeAllowed && !CBase.Songs.IsInCategory()); + bool catChangePossible = CBase.Songs.GetTabs() == EOffOn.TR_CONFIG_ON && options.Selection.CategoryChangeAllowed; + + //If nothing selected set a reasonable default value + if (keyEvent.IsArrowKey() && moveAllowed && _SelectionNr < 0) + _SelectionNr = (_PreviewNr < 0) ? _Offset : _PreviewNr; + + switch (keyEvent.Key) + { + case Keys.Enter: + if (CBase.Songs.IsInCategory()) + { + if (_SelectionNr >= 0 && _PreviewNr != _SelectionNr) + { + _PreviewNr = _SelectionNr; + keyEvent.Handled = true; + } + } + else + { + _EnterCategory(_PreviewNr); + keyEvent.Handled = true; + } + break; + + case Keys.Escape: + case Keys.Back: + if (CBase.Songs.IsInCategory() && catChangePossible) + { + _LeaveCategory(); + keyEvent.Handled = true; + } + break; + + case Keys.PageUp: + if (catChangePossible) + { + _PrevCategory(); + keyEvent.Handled = true; + } + break; + + case Keys.PageDown: + if (catChangePossible) + { + _NextCategory(); + keyEvent.Handled = true; + } + break; + + case Keys.Left: + //Check for >0 so we do not allow selection of nothing (-1) + if (_SelectionNr > 0 && moveAllowed) + { + _SelectionNr--; + keyEvent.Handled = true; + } + break; + + case Keys.Right: + if (moveAllowed) + { + _SelectionNr++; + keyEvent.Handled = true; + } + break; + + case Keys.Up: + if (keyEvent.ModShift) + { + if (catChangePossible) + { + _PrevCategory(); + keyEvent.Handled = true; + } + } + else if (_SelectionNr >= 1 && moveAllowed) + { + _SelectionNr -= 1; + keyEvent.Handled = true; + } + break; + + case Keys.Down: + if (keyEvent.ModShift) + { + if (catChangePossible) + { + _NextCategory(); + keyEvent.Handled = true; + } + } + else if (moveAllowed) + { + _SelectionNr += 1; + keyEvent.Handled = true; + } + break; + } + if (!CBase.Songs.IsInCategory()) + _PreviewNr = _SelectionNr; + return keyEvent.Handled; + } + + public override bool HandleMouse(ref SMouseEvent mouseEvent, SScreenSongOptions songOptions) + { + if (!songOptions.Selection.RandomOnly || (!CBase.Songs.IsInCategory() && songOptions.Selection.CategoryChangeAllowed)) + { + if (mouseEvent.Wheel != 0 && CHelper.IsInBounds(_ScrollRect, mouseEvent)) + _UpdateList(_Offset + mouseEvent.Wheel); + + int lastSelection = _SelectionNr; + int i = 0; + bool somethingSelected = false; + + foreach (CStatic tile in _Tiles) + { + //create a rect including the cover and text of the song. + //(this way mouse over text should make a selection as well) + SRectF songRect = new SRectF(tile.Rect.X, tile.Rect.Y, Rect.W, tile.Rect.H, tile.Rect.Z); + if (tile.Texture != _CoverBGTexture && CHelper.IsInBounds(songRect, mouseEvent) && tile.Color.A != 0) + { + somethingSelected = true; + _SelectionNr = i + _Offset; + if (!CBase.Songs.IsInCategory()) + _PreviewNr = i + _Offset; + break; + } + i++; + } + //Reset selection only if we moved out of the rect to avoid loosing it when selecting random songs + if (_MouseWasInRect && !somethingSelected) + _SelectionNr = -1; + if (mouseEvent.Sender == ESender.WiiMote && _SelectionNr != lastSelection && _SelectionNr != -1) + CBase.Controller.SetRumble(0.050f); + } + _MouseWasInRect = CHelper.IsInBounds(Rect, mouseEvent); + + if (mouseEvent.RB) + { + if (CBase.Songs.IsInCategory() && CBase.Songs.GetNumCategories() > 0 && CBase.Songs.GetTabs() == EOffOn.TR_CONFIG_ON && + songOptions.Selection.CategoryChangeAllowed) + { + _LeaveCategory(); + return true; + } + if (CBase.Songs.GetTabs() == EOffOn.TR_CONFIG_OFF && !songOptions.Selection.PartyMode) + { + CBase.Graphics.FadeTo(EScreen.Main); + return true; + } + } + else if (mouseEvent.LB) + { + if (_SelectionNr >= 0 && _MouseWasInRect) + { + if (CBase.Songs.IsInCategory()) + { + if (_PreviewNr == _SelectionNr) + return false; + _PreviewNr = _SelectionNr; + } + else + EnterSelectedCategory(); + return true; + } + } + return false; + } + + public override void Draw() + { + foreach (CStatic tile in _Tiles) + { + if (tile.Selected) + tile.Draw(EAspect.Crop, SelectedTileZoomFactor, -0.1f); + else + { + EAspect aspect = (tile.Texture != _CoverBGTexture) ? EAspect.Crop : EAspect.Stretch; + tile.Draw(aspect); + } + } + + //highlight the text of the selected song + int i = 0; + foreach (CText text in _Texts) + { + if (i < _Tiles.Count && _Tiles[i].Selected) + text.Font.Style = EStyle.BoldItalic; + else if (i < _Tiles.Count) + text.Font.Style = EStyle.Normal; + else + text.Text = ""; + text.Draw(); + i++; + } + _TextBG.Draw(); + + CTextureRef vidtex = CBase.BackgroundMusic.IsPlayingPreview() ? CBase.BackgroundMusic.GetVideoTexture() : null; + + if (vidtex != null) + { + if (vidtex.Color.A < 1) + _CoverBig.Draw(EAspect.Crop); + SRectF rect = CHelper.FitInBounds(_CoverBig.Rect, vidtex.OrigAspect, EAspect.Crop); + CBase.Drawing.DrawTexture(vidtex, rect, vidtex.Color, _CoverBig.Rect); + CBase.Drawing.DrawTextureReflection(vidtex, rect, vidtex.Color, _CoverBig.Rect, _CoverBig.ReflectionSpace, _CoverBig.ReflectionHeight); + } + else + _CoverBig.Draw(EAspect.Crop); + + foreach (IMenuElement element in _SubElements) + element.Draw(); + } + + public override CStatic GetSelectedSongCover() + { + return _Tiles.FirstOrDefault(tile => tile.Selected); + } + + public override bool IsMouseOverSelectedSong(SMouseEvent mEvent) + { + for (int i = 0; i < _Tiles.Count; i++) + { + if (!_Tiles[i].Selected) + continue; + return CHelper.IsInBounds(_Tiles[i].Rect, mEvent) || CHelper.IsInBounds(_Texts[i].Rect, mEvent); + } + return false; + } + + protected override void _EnterCategory(int categoryNr) + { + base._EnterCategory(categoryNr); + + SetSelectedSong(0); + _UpdateListIfRequired(); + } + + protected override void _LeaveCategory() + { + base._LeaveCategory(); + + SetSelectedCategory(0); + _UpdateListIfRequired(); + } + + private void _NextCategory() + { + if (CBase.Songs.IsInCategory()) + { + CBase.Songs.NextCategory(); + _EnterCategory(CBase.Songs.GetCurrentCategoryIndex()); + } + } + + private void _PrevCategory() + { + if (CBase.Songs.IsInCategory()) + { + CBase.Songs.PrevCategory(); + _EnterCategory(CBase.Songs.GetCurrentCategoryIndex()); + } + } + + private void _UpdateListIfRequired() + { + int curElements = CBase.Songs.IsInCategory() ? CBase.Songs.GetNumSongsVisible() : CBase.Songs.GetNumCategories(); + if ((_LastKnownElements == curElements) && (_LastKnownCategory == CBase.Songs.GetCurrentCategoryIndex())) + return; + + _LastKnownCategory = CBase.Songs.GetCurrentCategoryIndex(); + _LastKnownElements = curElements; + CBase.Songs.UpdateRandomSongList(); + _UpdateList(true); + } + + private void _UpdateList(bool force = false) + { + int offset; + if (_SelectionNr < _Offset && _SelectionNr >= 0) + offset = _SelectionNr; + else if (_SelectionNr >= _Offset + _ListLength) + offset = _SelectionNr - _ListLength + 1; + else + offset = _Offset; + _UpdateList(offset, force); + } + + private void _UpdateList(int offset, bool force = false) + { + bool isInCategory = CBase.Songs.IsInCategory(); + int itemCount = isInCategory ? CBase.Songs.GetNumSongsVisible() : CBase.Songs.GetNumCategories(); + int totalSongNumber = CBase.Songs.GetNumSongs(); + + offset = offset.Clamp(0, itemCount - _ListLength, true); + + if (offset == _Offset && !force) + return; + + for (int i = 0; i < _Tiles.Count; i++) + { + if (i + offset < itemCount) + { + _Tiles[i].Color = new SColorF(1f, 1f, 1f, 1f); + if (isInCategory) + { + CSong currentSong = CBase.Songs.GetVisibleSong(i + offset); + _Tiles[i].Texture = currentSong.CoverTextureSmall; + _Texts[i].Text = currentSong.Artist + " - " + currentSong.Title; + } + else + { + CCategory currentCat = CBase.Songs.GetCategory(i + offset); + _Tiles[i].Texture = currentCat.CoverTextureSmall; + int num = currentCat.GetNumSongsNotSung(); + String songOrSongs = (num == 1) ? "TR_SCREENSONG_NUMSONG" : "TR_SCREENSONG_NUMSONGS"; + _Texts[i].Text = currentCat.Name + " " + CBase.Language.Translate(songOrSongs).Replace("%v", num.ToString()); + } + } + else + { + _Tiles[i].Color.A = 0; + _Texts[i].Text = ""; + } + } + _Offset = offset; + } + + public override void LoadSkin() + { + foreach (IThemeable themeable in _SubElements.OfType()) + themeable.LoadSkin(); + // Those are drawn seperately so they are not in the above list + _CoverBig.LoadSkin(); + _TextBG.LoadSkin(); + + base.LoadSkin(); + } + } +} \ No newline at end of file diff --git a/VocaluxeLib/Menu/SongMenu/CSongMenuTileBoard.cs b/VocaluxeLib/Menu/SongMenu/CSongMenuTileBoard.cs index f74e81f9..66079637 100644 --- a/VocaluxeLib/Menu/SongMenu/CSongMenuTileBoard.cs +++ b/VocaluxeLib/Menu/SongMenu/CSongMenuTileBoard.cs @@ -30,19 +30,19 @@ namespace VocaluxeLib.Menu.SongMenu { private SRectF _ScrollRect; private List _Tiles; - private CStatic _CoverBig; - private CStatic _TextBG; - private CStatic _DuetIcon; - private CStatic _VideoIcon; - private CStatic _MedleyCalcIcon; - private CStatic _MedleyTagIcon; + private readonly CStatic _CoverBig; + private readonly CStatic _TextBG; + private readonly CStatic _DuetIcon; + private readonly CStatic _VideoIcon; + private readonly CStatic _MedleyCalcIcon; + private readonly CStatic _MedleyTagIcon; private CTextureRef _CoverBigBGTexture; private CTextureRef _CoverBGTexture; - private CText _Artist; - private CText _Title; - private CText _SongLength; + private readonly CText _Artist; + private readonly CText _Title; + private readonly CText _SongLength; private int _NumW; private int _NumH; diff --git a/VocaluxeLib/VocaluxeLib.csproj b/VocaluxeLib/VocaluxeLib.csproj index 7ee6d24c..454792de 100644 --- a/VocaluxeLib/VocaluxeLib.csproj +++ b/VocaluxeLib/VocaluxeLib.csproj @@ -120,6 +120,7 @@ +