From d87d3235e9a25d7bdcf9e2486d59f697ca8580aa Mon Sep 17 00:00:00 2001 From: Evan Husted Date: Wed, 5 Mar 2025 22:06:20 -0600 Subject: [PATCH] misc: chore: Move the windows that are shown via ContentDialogs out of Ryujinx.Ava.UI.Windows (they're not windows) --- src/Ryujinx/AppHost.cs | 2 -- .../UI/Controls/ApplicationContextMenu.axaml.cs | 7 ++++--- src/Ryujinx/UI/{Windows => Helpers}/IconColorPicker.cs | 4 ++-- src/Ryujinx/{ => UI}/RyujinxApp.axaml | 0 src/Ryujinx/{ => UI}/RyujinxApp.axaml.cs | 4 +++- .../AboutWindow.axaml => Views/Dialog/AboutView.axaml} | 2 +- .../Dialog/AboutView.axaml.cs} | 10 ++++------ .../Views/{Misc => Dialog}/ApplicationDataView.axaml | 2 +- .../{Misc => Dialog}/ApplicationDataView.axaml.cs | 2 +- .../UI/Views/{Misc => Dialog}/DlcSelectView.axaml | 2 +- .../UI/Views/{Misc => Dialog}/DlcSelectView.axaml.cs | 2 +- .../Dialog/DownloadableContentManagerView.axaml} | 2 +- .../Dialog/DownloadableContentManagerView.axaml.cs} | 10 +++++----- .../Dialog/ModManagerView.axaml} | 2 +- .../Dialog/ModManagerView.axaml.cs} | 10 +++++----- .../Dialog/TitleUpdateManagerView.axaml} | 2 +- .../Dialog/TitleUpdateManagerView.axaml.cs} | 10 +++++----- .../Dialog/XciTrimmerView.axaml} | 2 +- .../Dialog/XciTrimmerView.axaml.cs} | 10 +++++----- src/Ryujinx/UI/Views/Main/MainMenuBarView.axaml.cs | 6 +++--- 20 files changed, 45 insertions(+), 46 deletions(-) rename src/Ryujinx/UI/{Windows => Helpers}/IconColorPicker.cs (98%) rename src/Ryujinx/{ => UI}/RyujinxApp.axaml (100%) rename src/Ryujinx/{ => UI}/RyujinxApp.axaml.cs (98%) rename src/Ryujinx/UI/{Windows/AboutWindow.axaml => Views/Dialog/AboutView.axaml} (99%) rename src/Ryujinx/UI/{Windows/AboutWindow.axaml.cs => Views/Dialog/AboutView.axaml.cs} (85%) rename src/Ryujinx/UI/Views/{Misc => Dialog}/ApplicationDataView.axaml (99%) rename src/Ryujinx/UI/Views/{Misc => Dialog}/ApplicationDataView.axaml.cs (98%) rename src/Ryujinx/UI/Views/{Misc => Dialog}/DlcSelectView.axaml (98%) rename src/Ryujinx/UI/Views/{Misc => Dialog}/DlcSelectView.axaml.cs (96%) rename src/Ryujinx/UI/{Windows/DownloadableContentManagerWindow.axaml => Views/Dialog/DownloadableContentManagerView.axaml} (99%) rename src/Ryujinx/UI/{Windows/DownloadableContentManagerWindow.axaml.cs => Views/Dialog/DownloadableContentManagerView.axaml.cs} (88%) rename src/Ryujinx/UI/{Windows/ModManagerWindow.axaml => Views/Dialog/ModManagerView.axaml} (99%) rename src/Ryujinx/UI/{Windows/ModManagerWindow.axaml.cs => Views/Dialog/ModManagerView.axaml.cs} (93%) rename src/Ryujinx/UI/{Windows/TitleUpdateWindow.axaml => Views/Dialog/TitleUpdateManagerView.axaml} (99%) rename src/Ryujinx/UI/{Windows/TitleUpdateWindow.axaml.cs => Views/Dialog/TitleUpdateManagerView.axaml.cs} (87%) rename src/Ryujinx/UI/{Windows/XCITrimmerWindow.axaml => Views/Dialog/XciTrimmerView.axaml} (99%) rename src/Ryujinx/UI/{Windows/XCITrimmerWindow.axaml.cs => Views/Dialog/XciTrimmerView.axaml.cs} (90%) diff --git a/src/Ryujinx/AppHost.cs b/src/Ryujinx/AppHost.cs index 13f36d695..04aae204b 100644 --- a/src/Ryujinx/AppHost.cs +++ b/src/Ryujinx/AppHost.cs @@ -6,7 +6,6 @@ using Avalonia.Threading; using DiscordRPC; using LibHac.Common; using LibHac.Ns; -using LibHac.Tools.FsSystem; using Ryujinx.Audio.Backends.Dummy; using Ryujinx.Audio.Backends.OpenAL; using Ryujinx.Audio.Backends.SDL2; @@ -35,7 +34,6 @@ using Ryujinx.Graphics.GAL.Multithreading; using Ryujinx.Graphics.Gpu; using Ryujinx.Graphics.OpenGL; using Ryujinx.Graphics.Vulkan; -using Ryujinx.HLE; using Ryujinx.HLE.FileSystem; using Ryujinx.HLE.HOS; using Ryujinx.HLE.HOS.Services.Account.Acc; diff --git a/src/Ryujinx/UI/Controls/ApplicationContextMenu.axaml.cs b/src/Ryujinx/UI/Controls/ApplicationContextMenu.axaml.cs index 9635582c8..cd1f47483 100644 --- a/src/Ryujinx/UI/Controls/ApplicationContextMenu.axaml.cs +++ b/src/Ryujinx/UI/Controls/ApplicationContextMenu.axaml.cs @@ -13,6 +13,7 @@ using Ryujinx.Ava.UI.Views.Misc; using Ryujinx.Ava.UI.Windows; using Ryujinx.Ava.Utilities; using Ryujinx.Ava.Systems.AppLibrary; +using Ryujinx.Ava.UI.Views.Dialog; using Ryujinx.Common.Configuration; using Ryujinx.Common.Helper; using Ryujinx.HLE.HOS; @@ -80,13 +81,13 @@ namespace Ryujinx.Ava.UI.Controls public async void OpenTitleUpdateManager_Click(object sender, RoutedEventArgs args) { if (sender is MenuItem { DataContext: MainWindowViewModel { SelectedApplication: not null } viewModel }) - await TitleUpdateWindow.Show(viewModel.ApplicationLibrary, viewModel.SelectedApplication); + await TitleUpdateManagerView.Show(viewModel.ApplicationLibrary, viewModel.SelectedApplication); } public async void OpenDownloadableContentManager_Click(object sender, RoutedEventArgs args) { if (sender is MenuItem { DataContext: MainWindowViewModel { SelectedApplication: not null } viewModel }) - await DownloadableContentManagerWindow.Show(viewModel.ApplicationLibrary, viewModel.SelectedApplication); + await DownloadableContentManagerView.Show(viewModel.ApplicationLibrary, viewModel.SelectedApplication); } public async void OpenCheatManager_Click(object sender, RoutedEventArgs args) @@ -127,7 +128,7 @@ namespace Ryujinx.Ava.UI.Controls public async void OpenModManager_Click(object sender, RoutedEventArgs args) { if (sender is MenuItem { DataContext: MainWindowViewModel { SelectedApplication: not null } viewModel }) - await ModManagerWindow.Show( + await ModManagerView.Show( viewModel.SelectedApplication.Id, viewModel.SelectedApplication.IdBase, viewModel.ApplicationLibrary, diff --git a/src/Ryujinx/UI/Windows/IconColorPicker.cs b/src/Ryujinx/UI/Helpers/IconColorPicker.cs similarity index 98% rename from src/Ryujinx/UI/Windows/IconColorPicker.cs rename to src/Ryujinx/UI/Helpers/IconColorPicker.cs index ca9ac2c05..b6ee8bbbf 100644 --- a/src/Ryujinx/UI/Windows/IconColorPicker.cs +++ b/src/Ryujinx/UI/Helpers/IconColorPicker.cs @@ -2,9 +2,9 @@ using SkiaSharp; using System; using System.Collections.Generic; -namespace Ryujinx.Ava.UI.Windows +namespace Ryujinx.Ava.UI.Helpers { - static class IconColorPicker + public static class IconColorPicker { private const int ColorsPerLine = 64; private const int TotalColors = ColorsPerLine * ColorsPerLine; diff --git a/src/Ryujinx/RyujinxApp.axaml b/src/Ryujinx/UI/RyujinxApp.axaml similarity index 100% rename from src/Ryujinx/RyujinxApp.axaml rename to src/Ryujinx/UI/RyujinxApp.axaml diff --git a/src/Ryujinx/RyujinxApp.axaml.cs b/src/Ryujinx/UI/RyujinxApp.axaml.cs similarity index 98% rename from src/Ryujinx/RyujinxApp.axaml.cs rename to src/Ryujinx/UI/RyujinxApp.axaml.cs index 0a0f0a13c..c84454d50 100644 --- a/src/Ryujinx/RyujinxApp.axaml.cs +++ b/src/Ryujinx/UI/RyujinxApp.axaml.cs @@ -13,6 +13,8 @@ using Ryujinx.Ava.UI.Helpers; using Ryujinx.Ava.UI.Windows; using Ryujinx.Ava.Utilities; using Ryujinx.Ava.Systems.Configuration; +using Ryujinx.Ava.UI.Views.Dialog; +using Ryujinx.Ava.UI.Views.Misc; using Ryujinx.Common; using Ryujinx.Common.Logging; using System; @@ -150,7 +152,7 @@ namespace Ryujinx.Ava private async void AboutRyujinx_OnClick(object sender, EventArgs e) { - await AboutWindow.Show(); + await AboutView.Show(); } } } diff --git a/src/Ryujinx/UI/Windows/AboutWindow.axaml b/src/Ryujinx/UI/Views/Dialog/AboutView.axaml similarity index 99% rename from src/Ryujinx/UI/Windows/AboutWindow.axaml rename to src/Ryujinx/UI/Views/Dialog/AboutView.axaml index e215cf27e..4c3da21e4 100644 --- a/src/Ryujinx/UI/Windows/AboutWindow.axaml +++ b/src/Ryujinx/UI/Views/Dialog/AboutView.axaml @@ -1,5 +1,5 @@ + public partial class AboutView : RyujinxControl { - public AboutWindow() + public AboutView() { InitializeComponent(); @@ -34,7 +32,7 @@ namespace Ryujinx.Ava.UI.Windows PrimaryButtonText = string.Empty, SecondaryButtonText = string.Empty, CloseButtonText = LocaleManager.Instance[LocaleKeys.UserProfilesClose], - Content = new AboutWindow { ViewModel = viewModel } + Content = new AboutView { ViewModel = viewModel } }; await ContentDialogHelper.ShowAsync(contentDialog.ApplyStyles()); diff --git a/src/Ryujinx/UI/Views/Misc/ApplicationDataView.axaml b/src/Ryujinx/UI/Views/Dialog/ApplicationDataView.axaml similarity index 99% rename from src/Ryujinx/UI/Views/Misc/ApplicationDataView.axaml rename to src/Ryujinx/UI/Views/Dialog/ApplicationDataView.axaml index a36b637ec..7ba4ad784 100644 --- a/src/Ryujinx/UI/Views/Misc/ApplicationDataView.axaml +++ b/src/Ryujinx/UI/Views/Dialog/ApplicationDataView.axaml @@ -7,7 +7,7 @@ xmlns:ui="using:FluentAvalonia.UI.Controls" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450" - x:Class="Ryujinx.Ava.UI.Views.Misc.ApplicationDataView" + x:Class="Ryujinx.Ava.UI.Views.Dialog.ApplicationDataView" x:DataType="viewModels:ApplicationDataViewModel"> { diff --git a/src/Ryujinx/UI/Views/Misc/DlcSelectView.axaml b/src/Ryujinx/UI/Views/Dialog/DlcSelectView.axaml similarity index 98% rename from src/Ryujinx/UI/Views/Misc/DlcSelectView.axaml rename to src/Ryujinx/UI/Views/Dialog/DlcSelectView.axaml index f44bc3261..05d1f7ae5 100644 --- a/src/Ryujinx/UI/Views/Misc/DlcSelectView.axaml +++ b/src/Ryujinx/UI/Views/Dialog/DlcSelectView.axaml @@ -7,7 +7,7 @@ xmlns:models="using:Ryujinx.Ava.Common.Models" xmlns:viewModels="using:Ryujinx.Ava.UI.ViewModels" mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450" - x:Class="Ryujinx.Ava.UI.Views.Misc.DlcSelectView" + x:Class="Ryujinx.Ava.UI.Views.Dialog.DlcSelectView" x:DataType="viewModels:DlcSelectViewModel"> { diff --git a/src/Ryujinx/UI/Windows/DownloadableContentManagerWindow.axaml b/src/Ryujinx/UI/Views/Dialog/DownloadableContentManagerView.axaml similarity index 99% rename from src/Ryujinx/UI/Windows/DownloadableContentManagerWindow.axaml rename to src/Ryujinx/UI/Views/Dialog/DownloadableContentManagerView.axaml index e2c4fe16e..8b97a4822 100644 --- a/src/Ryujinx/UI/Windows/DownloadableContentManagerWindow.axaml +++ b/src/Ryujinx/UI/Views/Dialog/DownloadableContentManagerView.axaml @@ -1,5 +1,5 @@ diff --git a/src/Ryujinx/UI/Windows/ModManagerWindow.axaml.cs b/src/Ryujinx/UI/Views/Dialog/ModManagerView.axaml.cs similarity index 93% rename from src/Ryujinx/UI/Windows/ModManagerWindow.axaml.cs rename to src/Ryujinx/UI/Views/Dialog/ModManagerView.axaml.cs index e51d1ca4a..08a956aa7 100644 --- a/src/Ryujinx/UI/Windows/ModManagerWindow.axaml.cs +++ b/src/Ryujinx/UI/Views/Dialog/ModManagerView.axaml.cs @@ -11,20 +11,20 @@ using Ryujinx.Common.Helper; using System.Threading.Tasks; using Button = Avalonia.Controls.Button; -namespace Ryujinx.Ava.UI.Windows +namespace Ryujinx.Ava.UI.Views.Dialog { - public partial class ModManagerWindow : UserControl + public partial class ModManagerView : UserControl { public readonly ModManagerViewModel ViewModel; - public ModManagerWindow() + public ModManagerView() { DataContext = this; InitializeComponent(); } - public ModManagerWindow(ulong titleId, ulong titleIdBase, ApplicationLibrary applicationLibrary) + public ModManagerView(ulong titleId, ulong titleIdBase, ApplicationLibrary applicationLibrary) { DataContext = ViewModel = new ModManagerViewModel(titleId, titleIdBase, applicationLibrary); @@ -38,7 +38,7 @@ namespace Ryujinx.Ava.UI.Windows PrimaryButtonText = string.Empty, SecondaryButtonText = string.Empty, CloseButtonText = string.Empty, - Content = new ModManagerWindow(titleId, titleIdBase, appLibrary), + Content = new ModManagerView(titleId, titleIdBase, appLibrary), Title = string.Format(LocaleManager.Instance[LocaleKeys.ModWindowTitle], titleName, titleId.ToString("X16")), }; diff --git a/src/Ryujinx/UI/Windows/TitleUpdateWindow.axaml b/src/Ryujinx/UI/Views/Dialog/TitleUpdateManagerView.axaml similarity index 99% rename from src/Ryujinx/UI/Windows/TitleUpdateWindow.axaml rename to src/Ryujinx/UI/Views/Dialog/TitleUpdateManagerView.axaml index 4da727db5..ba3e85e8b 100644 --- a/src/Ryujinx/UI/Windows/TitleUpdateWindow.axaml +++ b/src/Ryujinx/UI/Views/Dialog/TitleUpdateManagerView.axaml @@ -1,5 +1,5 @@ CompatibilityListWindow.Show()); UpdateMenuItem.Command = MainWindowViewModel.UpdateCommand;