From ce3aa66501fb05e791f969a7e9c125192675b502 Mon Sep 17 00:00:00 2001 From: sophie Date: Thu, 25 Jan 2024 17:17:04 +0000 Subject: [PATCH] wip: wip --- FoxTunes.UI.Windows.Layout/UIComponentContainer.cs | 4 ---- .../Behaviours/MiniPlayerBehaviourConfiguration.cs | 2 -- FoxTunes.UI.Windows.MiniPlayer/NowPlaying.xaml | 4 ++-- FoxTunes.UI.Windows.MiniPlayer/NowPlaying.xaml.cs | 2 +- .../NowPlayingConfiguration.cs | 14 ++++++++++++++ 5 files changed, 17 insertions(+), 9 deletions(-) create mode 100644 FoxTunes.UI.Windows.MiniPlayer/NowPlayingConfiguration.cs diff --git a/FoxTunes.UI.Windows.Layout/UIComponentContainer.cs b/FoxTunes.UI.Windows.Layout/UIComponentContainer.cs index 717ae9afe..595ee21e8 100644 --- a/FoxTunes.UI.Windows.Layout/UIComponentContainer.cs +++ b/FoxTunes.UI.Windows.Layout/UIComponentContainer.cs @@ -311,10 +311,6 @@ public virtual IEnumerable Invocations } foreach (var alternative in LayoutManager.Instance.GetComponents(UIComponentRole.Container)) { - if (string.Equals(this.Configuration.Component.Id, alternative.Id, StringComparison.OrdinalIgnoreCase)) - { - continue; - } yield return new InvocationComponent(InvocationComponent.CATEGORY_GLOBAL, WRAP, alternative.Name, path: Strings.UIComponentContainer_Wrap, attributes: attributes); attributes = InvocationComponent.ATTRIBUTE_NONE; } diff --git a/FoxTunes.UI.Windows.MiniPlayer/Behaviours/MiniPlayerBehaviourConfiguration.cs b/FoxTunes.UI.Windows.MiniPlayer/Behaviours/MiniPlayerBehaviourConfiguration.cs index 4db86be40..2fbb30157 100644 --- a/FoxTunes.UI.Windows.MiniPlayer/Behaviours/MiniPlayerBehaviourConfiguration.cs +++ b/FoxTunes.UI.Windows.MiniPlayer/Behaviours/MiniPlayerBehaviourConfiguration.cs @@ -7,8 +7,6 @@ public static class MiniPlayerBehaviourConfiguration { public const string SECTION = "F3E58830-97C0-4BA2-9E07-3EC27E3D4418"; - public const string NOW_PLAYING_SCRIPT_ELEMENT = "BBBB78F3-B32F-4A8C-B566-9A8B39A896C7"; - public const string TOPMOST_ELEMENT = "CCCC7F71-A506-48DF-9420-E6926465FFDC"; public const string SHOW_ARTWORK_ELEMENT = "FFFFB3A4-E59D-46CE-B80A-86EAB9427108"; diff --git a/FoxTunes.UI.Windows.MiniPlayer/NowPlaying.xaml b/FoxTunes.UI.Windows.MiniPlayer/NowPlaying.xaml index f47f2d1e4..18e85c7e2 100644 --- a/FoxTunes.UI.Windows.MiniPlayer/NowPlaying.xaml +++ b/FoxTunes.UI.Windows.MiniPlayer/NowPlaying.xaml @@ -1,4 +1,4 @@ - - + diff --git a/FoxTunes.UI.Windows.MiniPlayer/NowPlaying.xaml.cs b/FoxTunes.UI.Windows.MiniPlayer/NowPlaying.xaml.cs index 1c804e51e..17b52a370 100644 --- a/FoxTunes.UI.Windows.MiniPlayer/NowPlaying.xaml.cs +++ b/FoxTunes.UI.Windows.MiniPlayer/NowPlaying.xaml.cs @@ -6,7 +6,7 @@ namespace FoxTunes /// Interaction logic for NowPlaying.xaml /// [UIComponent("CFF16494-CB86-4483-99C7-07E496FE894A", role: UIComponentRole.Info)] - public partial class NowPlaying : UIComponentBase + public partial class NowPlaying : ConfigurableUIComponentBase { public NowPlaying() { diff --git a/FoxTunes.UI.Windows.MiniPlayer/NowPlayingConfiguration.cs b/FoxTunes.UI.Windows.MiniPlayer/NowPlayingConfiguration.cs new file mode 100644 index 000000000..b15f5d57f --- /dev/null +++ b/FoxTunes.UI.Windows.MiniPlayer/NowPlayingConfiguration.cs @@ -0,0 +1,14 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; + +namespace FoxTunes +{ + public static class NowPlayingConfiguration + { + public const string SECTION = "A9F63A1C-16F8-4F68-8E49-3C4C62172FFA"; + + public const string NOW_PLAYING_SCRIPT_ELEMENT = "BBBB78F3-B32F-4A8C-B566-9A8B39A896C7"; + } +}