Implement ToolWindowExtension and related changes

src/Beutl.Extensibility/PageExtension.cs

@@ -1,23 +1,22 @@
-using System.Diagnostics.CodeAnalysis;
-
-using Avalonia.Controls;
+using Avalonia.Controls;
 
 using FluentAvalonia.UI.Controls;
 
 namespace Beutl.Extensibility;
 
+[Obsolete("Use ToolWindowExtension instead.")]
 public abstract class PageExtension : Extension
 {
     public abstract Control CreateControl();
 
     public abstract IPageContext CreateContext();
 
-    [Obsolete]
     public abstract IconSource GetFilledIcon();
 
     public abstract IconSource GetRegularIcon();
 }
 
+[Obsolete("Use ToolWindowContext instead.")]
 public interface IPageContext : IDisposable
 {
     PageExtension Extension { get; }

src/Beutl.Extensibility/ToolWindowExtension.cs

@@ -0,0 +1,21 @@
+using Avalonia.Controls;
+
+namespace Beutl.Extensibility;
+
+public abstract class ToolWindowExtension : Extension
+{
+    public abstract bool AllowMultiple { get; }
+
+    public abstract bool ShowAsDialog { get; }
+
+    public abstract bool RequiresEditorContext { get; }
+
+    public abstract Window? CreateWindow(IEditorContext? editorContext);
+
+    public abstract IToolWindowContext? CreateContext(IEditorContext? editorContext);
+}
+
+public interface IToolWindowContext : IDisposable
+{
+    ToolWindowExtension Extension { get; }
+}

src/Beutl/Pages/ExtensionsPage.axaml → src/Beutl/Pages/ExtensionsDialog.axaml

@@ -1,13 +1,14 @@
-<UserControl x:Class="Beutl.Pages.ExtensionsPage"
-             xmlns="https://github.com/avaloniaui"
-             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-             xmlns:lang="using:Beutl.Language"
-             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-             xmlns:ui="using:FluentAvalonia.UI.Controls"
-             d:DesignHeight="450"
-             d:DesignWidth="800"
-             mc:Ignorable="d">
+<Window x:Class="Beutl.Pages.ExtensionsDialog"
+        xmlns="https://github.com/avaloniaui"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+        xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+        xmlns:lang="using:Beutl.Language"
+        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+        xmlns:ui="using:FluentAvalonia.UI.Controls"
+        Title="{x:Static lang:Strings.Extensions}"
+        d:DesignHeight="450"
+        d:DesignWidth="800"
+        mc:Ignorable="d">
     <Panel>
         <ui:NavigationView x:Name="nav"
                            IsBackButtonVisible="True"
@@ -79,4 +80,4 @@
             </Grid>
         </StackPanel>
     </Panel>
-</UserControl>
+</Window>

src/Beutl/Pages/ExtensionsPage.axaml.cs → src/Beutl/Pages/ExtensionsDialog.axaml.cs

@@ -1,33 +1,40 @@
 using Avalonia;
 using Avalonia.Controls;
+using Avalonia.Controls.ApplicationLifetimes;
 using Avalonia.Interactivity;
-using Avalonia.LogicalTree;
-
+using Avalonia.Platform;
 using Beutl.Logging;
 using Beutl.Pages.ExtensionsPages;
 using Beutl.Pages.ExtensionsPages.DevelopPages;
 using Beutl.Pages.ExtensionsPages.DiscoverPages;
-using Beutl.Services;
 using Beutl.ViewModels;
 using Beutl.ViewModels.ExtensionsPages;
 using Beutl.ViewModels.ExtensionsPages.DiscoverPages;
-using Beutl.Views;
-
 using FluentAvalonia.UI.Controls;
 using FluentAvalonia.UI.Media.Animation;
 using FluentAvalonia.UI.Navigation;
-
+using FluentAvalonia.UI.Windowing;
 using Microsoft.Extensions.Logging;
 
 namespace Beutl.Pages;
 
-public sealed partial class ExtensionsPage : UserControl
+public sealed partial class ExtensionsDialog : AppWindow
 {
-    private readonly ILogger _logger = Log.CreateLogger<ExtensionsPage>();
+    private readonly ILogger _logger = Log.CreateLogger<ExtensionsDialog>();
 
-    public ExtensionsPage()
+    public ExtensionsDialog()
     {
         InitializeComponent();
+        if (OperatingSystem.IsWindows())
+        {
+            TitleBar.ExtendsContentIntoTitleBar = true;
+            TitleBar.Height = 40;
+        }
+        else if (OperatingSystem.IsMacOS())
+        {
+            ExtendClientAreaToDecorationsHint = true;
+            ExtendClientAreaChromeHints = ExtendClientAreaChromeHints.PreferSystemChrome;
+        }
 
         List<NavigationViewItem> items = GetItems();
         nav.MenuItemsSource = items;
@@ -41,38 +48,31 @@ public ExtensionsPage()
         nav.SelectedItem = selected;
     }
 
-    protected override void OnAttachedToVisualTree(VisualTreeAttachmentEventArgs e)
+    protected override void OnOpened(EventArgs e)
     {
-        base.OnAttachedToVisualTree(e);
+        base.OnOpened(e);
         if (nav.SelectedItem is NavigationViewItem selected)
         {
             OnItemInvoked(selected);
         }
     }
 
-    protected override void OnDetachedFromVisualTree(VisualTreeAttachmentEventArgs e)
-    {
-        base.OnDetachedFromVisualTree(e);
-        frame.SetNavigationState("|\n0\n0");
-    }
-
     private void Search_Click(object? sender, RoutedEventArgs e)
     {
         frame.Navigate(typeof(SearchPage), searchTextBox.Text);
     }
 
     private async void OpenSettings_Click(object? sender, RoutedEventArgs e)
     {
-        if (this.FindLogicalAncestorOfType<MainView>() is not { DataContext: MainViewModel viewModel })
-            return;
-
-        if (TopLevel.GetTopLevel(this) is not Window window)
-            return;
+        var mainViewModel = Application.Current!.ApplicationLifetime is IClassicDesktopStyleApplicationLifetime lifetime
+            ? lifetime.MainWindow!.DataContext as MainViewModel
+            : null;
+        if (mainViewModel is null) return;
 
-        var dialogViewModel = viewModel.SettingsDialog;
+        var dialogViewModel = mainViewModel.SettingsDialog;
         var dialog = new SettingsDialog { DataContext = dialogViewModel };
         dialogViewModel.GoToAccountSettingsPage();
-        await dialog.ShowDialog(window);
+        await dialog.ShowDialog(this);
     }
 
     private static List<NavigationViewItem> GetItems()
@@ -83,28 +83,19 @@ private static List<NavigationViewItem> GetItems()
             {
                 Content = "Home",
                 Tag = typeof(DiscoverPage),
-                IconSource = new SymbolIconSource
-                {
-                    Symbol = Symbol.Home
-                }
+                IconSource = new SymbolIconSource { Symbol = Symbol.Home }
             },
             new NavigationViewItem()
             {
                 Content = "Library",
                 Tag = typeof(LibraryPage),
-                IconSource = new SymbolIconSource
-                {
-                    Symbol = Symbol.Library
-                }
+                IconSource = new SymbolIconSource { Symbol = Symbol.Library }
             },
             new NavigationViewItem()
             {
                 Content = "Develop",
                 Tag = typeof(DevelopPage),
-                IconSource = new SymbolIconSource
-                {
-                    Symbol = Symbol.Code
-                }
+                IconSource = new SymbolIconSource { Symbol = Symbol.Code }
             }
         ];
     }
@@ -125,7 +116,7 @@ private void Nav_ItemInvoked(object? sender, NavigationViewItemInvokedEventArgs
     private void OnItemInvoked(NavigationViewItem nvi)
     {
         if (nvi.Tag is Type typ
-            && DataContext is ExtensionsPageViewModel { IsAuthorized.Value: true } viewModel)
+            && DataContext is ExtensionsDialogViewModel { IsAuthorized.Value: true } viewModel)
         {
             NavigationTransitionInfo transitionInfo = SharedNavigationTransitionInfo.Instance;
             if (typ == typeof(DevelopPage))
@@ -179,6 +170,7 @@ private void Frame_Navigating(object sender, NavigatingCancelEventArgs e)
                     entrance.FromHorizontalOffset = 28;
                 }
             }
+
             entrance.FromVerticalOffset = 0;
         }
     }
@@ -212,8 +204,8 @@ private static int ToNumber(Type type)
             return 0;
         }
         else if (type == typeof(PackageDetailsPage)
-            || type == typeof(PublicPackageDetailsPage)
-            || type == typeof(RankingPageViewModel))
+                 || type == typeof(PublicPackageDetailsPage)
+                 || type == typeof(RankingPageViewModel))
         {
             return 1;
         }

src/Beutl/Pages/ExtensionsPages/DevelopPages/PackageDetailsPage.axaml.cs

@@ -49,7 +49,7 @@ private void DestoryDataContext()
 
     private DataContextFactory GetDataContextFactory()
     {
-        return ((ExtensionsPageViewModel)this.FindLogicalAncestorOfType<ExtensionsPage>()!.DataContext!).Develop.DataContextFactory;
+        return ((ExtensionsDialogViewModel)this.FindLogicalAncestorOfType<ExtensionsDialog>()!.DataContext!).Develop.DataContextFactory;
     }
 
     private void NavigatePackageSettingsPage_Click(object? sender, RoutedEventArgs e)

src/Beutl/Pages/ExtensionsPages/DevelopPages/PackageReleasesPage.axaml.cs

@@ -57,7 +57,7 @@ private void DestoryDataContext()
 
     private DataContextFactory GetDataContextFactory()
     {
-        return ((ExtensionsPageViewModel)this.FindLogicalAncestorOfType<ExtensionsPage>()!.DataContext!).Develop.DataContextFactory;
+        return ((ExtensionsDialogViewModel)this.FindLogicalAncestorOfType<ExtensionsDialog>()!.DataContext!).Develop.DataContextFactory;
     }
 
     private void OnReleasesListPointerReleased(object? sender, PointerReleasedEventArgs e)

src/Beutl/Pages/ExtensionsPages/DevelopPages/PackageSettingsPage.axaml.cs

@@ -51,7 +51,7 @@ private void DestoryDataContext()
 
     private DataContextFactory GetDataContextFactory()
     {
-        return ((ExtensionsPageViewModel)this.FindLogicalAncestorOfType<ExtensionsPage>()!.DataContext!).Develop.DataContextFactory;
+        return ((ExtensionsDialogViewModel)this.FindLogicalAncestorOfType<ExtensionsDialog>()!.DataContext!).Develop.DataContextFactory;
     }
 
     private void NavigatePackageDetailsPage_Click(object? sender, RoutedEventArgs e)

src/Beutl/Pages/ExtensionsPages/DevelopPages/ReleasePage.axaml.cs

@@ -51,7 +51,7 @@ private void DestoryDataContext()
 
     private DataContextFactory GetDataContextFactory()
     {
-        return ((ExtensionsPageViewModel)this.FindLogicalAncestorOfType<ExtensionsPage>()!.DataContext!).Develop.DataContextFactory;
+        return ((ExtensionsDialogViewModel)this.FindLogicalAncestorOfType<ExtensionsDialog>()!.DataContext!).Develop.DataContextFactory;
     }
 
     private void NavigatePackageDetailsPage_Click(object? sender, RoutedEventArgs e)

src/Beutl/Pages/ExtensionsPages/DiscoverPages/PublicPackageDetailsPage.axaml.cs

@@ -48,7 +48,7 @@ private void DestoryDataContext()
 
     private DataContextFactory GetDataContextFactory()
     {
-        return ((ExtensionsPageViewModel)this.FindLogicalAncestorOfType<ExtensionsPage>()!.DataContext!).Discover.DataContextFactory;
+        return ((ExtensionsDialogViewModel)this.FindLogicalAncestorOfType<ExtensionsDialog>()!.DataContext!).Discover.DataContextFactory;
     }
 
     private async void OpenWebSite_Click(object? sender, RoutedEventArgs e)

src/Beutl/Pages/ExtensionsPages/DiscoverPages/RankingPage.axaml.cs

@@ -48,7 +48,7 @@ private void DestoryDataContext()
 
     private DataContextFactory GetDataContextFactory()
     {
-        return ((ExtensionsPageViewModel)this.FindLogicalAncestorOfType<ExtensionsPage>()!.DataContext!).Discover.DataContextFactory;
+        return ((ExtensionsDialogViewModel)this.FindLogicalAncestorOfType<ExtensionsDialog>()!.DataContext!).Discover.DataContextFactory;
     }
 
     private void Package_Click(object? sender, RoutedEventArgs e)

src/Beutl/Pages/ExtensionsPages/DiscoverPages/SearchPage.axaml.cs

@@ -48,7 +48,7 @@ private void DestoryDataContext()
 
     private DataContextFactory GetDataContextFactory()
     {
-        return ((ExtensionsPageViewModel)this.FindLogicalAncestorOfType<ExtensionsPage>()!.DataContext!).Discover.DataContextFactory;
+        return ((ExtensionsDialogViewModel)this.FindLogicalAncestorOfType<ExtensionsDialog>()!.DataContext!).Discover.DataContextFactory;
     }
 
     private void Package_Click(object? sender, RoutedEventArgs e)

src/Beutl/Pages/OutputDialog.axaml

@@ -8,7 +8,7 @@
              xmlns:viewModel="using:Beutl.ViewModels"
              d:DesignHeight="450"
              d:DesignWidth="800"
-             x:DataType="viewModel:OutputPageViewModel"
+             x:DataType="viewModel:OutputDialogViewModel"
              mc:Ignorable="d">
     <Grid Name="Grid"
           ColumnDefinitions="300,*"

src/Beutl/Pages/OutputDialog.axaml.cs

@@ -38,7 +38,7 @@ public OutputDialog()
     protected override void OnOpened(EventArgs e)
     {
         base.OnOpened(e);
-        if (DataContext is OutputPageViewModel viewModel)
+        if (DataContext is OutputDialogViewModel viewModel)
         {
             viewModel.Restore();
         }
@@ -47,15 +47,15 @@ protected override void OnOpened(EventArgs e)
     protected override void OnClosed(EventArgs e)
     {
         base.OnClosed(e);
-        if (DataContext is OutputPageViewModel viewModel)
+        if (DataContext is OutputDialogViewModel viewModel)
         {
             viewModel.Save();
         }
     }
 
     private async void OnAddClick(object? sender, RoutedEventArgs e)
     {
-        if (DataContext is OutputPageViewModel viewModel)
+        if (DataContext is OutputDialogViewModel viewModel)
         {
             var dialogViewModel = new AddOutputQueueViewModel();
             var dialog = new AddOutputQueueDialog { DataContext = dialogViewModel };
@@ -69,7 +69,7 @@ private async void OnAddClick(object? sender, RoutedEventArgs e)
 
     private void OnRemoveClick(object? sender, RoutedEventArgs e)
     {
-        if (DataContext is OutputPageViewModel viewModel)
+        if (DataContext is OutputDialogViewModel viewModel)
         {
             viewModel.RemoveSelected();
             viewModel.Save();