From 69bbb673e34b88602c6bfd014f6af0c103697c7c Mon Sep 17 00:00:00 2001 From: Mary Guillemard Date: Sat, 2 Mar 2024 10:45:31 +0100 Subject: [PATCH] misc: Move Ryujinx project to Ryujinx.Gtk3 This breaks release CI for now but that's fine. Signed-off-by: Mary Guillemard --- Ryujinx.sln | 2 +- .../Input/GTK3/GTK3Keyboard.cs | 0 .../Input/GTK3/GTK3KeyboardDriver.cs | 0 .../Input/GTK3/GTK3MappingHelper.cs | 0 .../Input/GTK3/GTK3Mouse.cs | 0 .../Input/GTK3/GTK3MouseDriver.cs | 0 .../Modules/Updater/UpdateDialog.cs | 4 ++-- .../Modules/Updater/UpdateDialog.glade | 0 .../Modules/Updater/Updater.cs | 0 src/{Ryujinx => Ryujinx.Gtk3}/Program.cs | 0 .../Ryujinx.Gtk3.csproj} | 0 src/{Ryujinx => Ryujinx.Gtk3}/Ryujinx.ico | Bin .../UI/Applet/ErrorAppletDialog.cs | 2 +- .../UI/Applet/GtkDynamicTextInputHandler.cs | 0 .../UI/Applet/GtkHostUIHandler.cs | 0 .../UI/Applet/GtkHostUITheme.cs | 0 .../UI/Applet/SwkbdAppletDialog.cs | 0 .../UI/Helper/MetalHelper.cs | 0 .../UI/Helper/SortHelper.cs | 0 .../UI/Helper/ThemeHelper.cs | 0 src/{Ryujinx => Ryujinx.Gtk3}/UI/MainWindow.cs | 2 +- src/{Ryujinx => Ryujinx.Gtk3}/UI/MainWindow.glade | 0 src/{Ryujinx => Ryujinx.Gtk3}/UI/OpenGLRenderer.cs | 0 .../UI/OpenToolkitBindingsContext.cs | 0 .../UI/RendererWidgetBase.cs | 0 .../UI/SPBOpenGLContext.cs | 0 .../UI/StatusUpdatedEventArgs.cs | 0 src/{Ryujinx => Ryujinx.Gtk3}/UI/VulkanRenderer.cs | 0 .../UI/Widgets/GameTableContextMenu.Designer.cs | 0 .../UI/Widgets/GameTableContextMenu.cs | 2 +- .../UI/Widgets/GtkDialog.cs | 0 .../UI/Widgets/GtkInputDialog.cs | 0 .../UI/Widgets/ProfileDialog.cs | 2 +- .../UI/Widgets/ProfileDialog.glade | 0 .../UI/Widgets/RawInputToTextEntry.cs | 0 .../UI/Widgets/UserErrorDialog.cs | 0 .../UI/Windows/AboutWindow.Designer.cs | 0 .../UI/Windows/AboutWindow.cs | 0 .../UI/Windows/AmiiboWindow.Designer.cs | 0 .../UI/Windows/AmiiboWindow.cs | 0 .../UI/Windows/AvatarWindow.cs | 0 .../UI/Windows/CheatWindow.cs | 2 +- .../UI/Windows/CheatWindow.glade | 0 .../UI/Windows/ControllerWindow.cs | 2 +- .../UI/Windows/ControllerWindow.glade | 0 .../UI/Windows/DlcWindow.cs | 2 +- .../UI/Windows/DlcWindow.glade | 0 .../UI/Windows/SettingsWindow.cs | 2 +- .../UI/Windows/SettingsWindow.glade | 0 .../UI/Windows/TitleUpdateWindow.cs | 2 +- .../UI/Windows/TitleUpdateWindow.glade | 0 .../Windows/UserProfilesManagerWindow.Designer.cs | 0 .../UI/Windows/UserProfilesManagerWindow.cs | 0 53 files changed, 12 insertions(+), 12 deletions(-) rename src/{Ryujinx => Ryujinx.Gtk3}/Input/GTK3/GTK3Keyboard.cs (100%) rename src/{Ryujinx => Ryujinx.Gtk3}/Input/GTK3/GTK3KeyboardDriver.cs (100%) rename src/{Ryujinx => Ryujinx.Gtk3}/Input/GTK3/GTK3MappingHelper.cs (100%) rename src/{Ryujinx => Ryujinx.Gtk3}/Input/GTK3/GTK3Mouse.cs (100%) rename src/{Ryujinx => Ryujinx.Gtk3}/Input/GTK3/GTK3MouseDriver.cs (100%) rename src/{Ryujinx => Ryujinx.Gtk3}/Modules/Updater/UpdateDialog.cs (93%) rename src/{Ryujinx => Ryujinx.Gtk3}/Modules/Updater/UpdateDialog.glade (100%) rename src/{Ryujinx => Ryujinx.Gtk3}/Modules/Updater/Updater.cs (100%) rename src/{Ryujinx => Ryujinx.Gtk3}/Program.cs (100%) rename src/{Ryujinx/Ryujinx.csproj => Ryujinx.Gtk3/Ryujinx.Gtk3.csproj} (100%) rename src/{Ryujinx => Ryujinx.Gtk3}/Ryujinx.ico (100%) rename src/{Ryujinx => Ryujinx.Gtk3}/UI/Applet/ErrorAppletDialog.cs (91%) rename src/{Ryujinx => Ryujinx.Gtk3}/UI/Applet/GtkDynamicTextInputHandler.cs (100%) rename src/{Ryujinx => Ryujinx.Gtk3}/UI/Applet/GtkHostUIHandler.cs (100%) rename src/{Ryujinx => Ryujinx.Gtk3}/UI/Applet/GtkHostUITheme.cs (100%) rename src/{Ryujinx => Ryujinx.Gtk3}/UI/Applet/SwkbdAppletDialog.cs (100%) rename src/{Ryujinx => Ryujinx.Gtk3}/UI/Helper/MetalHelper.cs (100%) rename src/{Ryujinx => Ryujinx.Gtk3}/UI/Helper/SortHelper.cs (100%) rename src/{Ryujinx => Ryujinx.Gtk3}/UI/Helper/ThemeHelper.cs (100%) rename src/{Ryujinx => Ryujinx.Gtk3}/UI/MainWindow.cs (99%) rename src/{Ryujinx => Ryujinx.Gtk3}/UI/MainWindow.glade (100%) rename src/{Ryujinx => Ryujinx.Gtk3}/UI/OpenGLRenderer.cs (100%) rename src/{Ryujinx => Ryujinx.Gtk3}/UI/OpenToolkitBindingsContext.cs (100%) rename src/{Ryujinx => Ryujinx.Gtk3}/UI/RendererWidgetBase.cs (100%) rename src/{Ryujinx => Ryujinx.Gtk3}/UI/SPBOpenGLContext.cs (100%) rename src/{Ryujinx => Ryujinx.Gtk3}/UI/StatusUpdatedEventArgs.cs (100%) rename src/{Ryujinx => Ryujinx.Gtk3}/UI/VulkanRenderer.cs (100%) rename src/{Ryujinx => Ryujinx.Gtk3}/UI/Widgets/GameTableContextMenu.Designer.cs (100%) rename src/{Ryujinx => Ryujinx.Gtk3}/UI/Widgets/GameTableContextMenu.cs (99%) rename src/{Ryujinx => Ryujinx.Gtk3}/UI/Widgets/GtkDialog.cs (100%) rename src/{Ryujinx => Ryujinx.Gtk3}/UI/Widgets/GtkInputDialog.cs (100%) rename src/{Ryujinx => Ryujinx.Gtk3}/UI/Widgets/ProfileDialog.cs (94%) rename src/{Ryujinx => Ryujinx.Gtk3}/UI/Widgets/ProfileDialog.glade (100%) rename src/{Ryujinx => Ryujinx.Gtk3}/UI/Widgets/RawInputToTextEntry.cs (100%) rename src/{Ryujinx => Ryujinx.Gtk3}/UI/Widgets/UserErrorDialog.cs (100%) rename src/{Ryujinx => Ryujinx.Gtk3}/UI/Windows/AboutWindow.Designer.cs (100%) rename src/{Ryujinx => Ryujinx.Gtk3}/UI/Windows/AboutWindow.cs (100%) rename src/{Ryujinx => Ryujinx.Gtk3}/UI/Windows/AmiiboWindow.Designer.cs (100%) rename src/{Ryujinx => Ryujinx.Gtk3}/UI/Windows/AmiiboWindow.cs (100%) rename src/{Ryujinx => Ryujinx.Gtk3}/UI/Windows/AvatarWindow.cs (100%) rename src/{Ryujinx => Ryujinx.Gtk3}/UI/Windows/CheatWindow.cs (98%) rename src/{Ryujinx => Ryujinx.Gtk3}/UI/Windows/CheatWindow.glade (100%) rename src/{Ryujinx => Ryujinx.Gtk3}/UI/Windows/ControllerWindow.cs (99%) rename src/{Ryujinx => Ryujinx.Gtk3}/UI/Windows/ControllerWindow.glade (100%) rename src/{Ryujinx => Ryujinx.Gtk3}/UI/Windows/DlcWindow.cs (98%) rename src/{Ryujinx => Ryujinx.Gtk3}/UI/Windows/DlcWindow.glade (100%) rename src/{Ryujinx => Ryujinx.Gtk3}/UI/Windows/SettingsWindow.cs (99%) rename src/{Ryujinx => Ryujinx.Gtk3}/UI/Windows/SettingsWindow.glade (100%) rename src/{Ryujinx => Ryujinx.Gtk3}/UI/Windows/TitleUpdateWindow.cs (98%) rename src/{Ryujinx => Ryujinx.Gtk3}/UI/Windows/TitleUpdateWindow.glade (100%) rename src/{Ryujinx => Ryujinx.Gtk3}/UI/Windows/UserProfilesManagerWindow.Designer.cs (100%) rename src/{Ryujinx => Ryujinx.Gtk3}/UI/Windows/UserProfilesManagerWindow.cs (100%) diff --git a/Ryujinx.sln b/Ryujinx.sln index 47a5c714c1..48adfdf5ff 100644 --- a/Ryujinx.sln +++ b/Ryujinx.sln @@ -3,7 +3,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio Version 17 VisualStudioVersion = 17.1.32228.430 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Ryujinx", "src\Ryujinx\Ryujinx.csproj", "{074045D4-3ED2-4711-9169-E385F2BFB5A0}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Ryujinx.Gtk3", "src\Ryujinx.Gtk3\Ryujinx.Gtk3.csproj", "{074045D4-3ED2-4711-9169-E385F2BFB5A0}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Ryujinx.Tests", "src\Ryujinx.Tests\Ryujinx.Tests.csproj", "{EBB55AEA-C7D7-4DEB-BF96-FA1789E225E9}" EndProject diff --git a/src/Ryujinx/Input/GTK3/GTK3Keyboard.cs b/src/Ryujinx.Gtk3/Input/GTK3/GTK3Keyboard.cs similarity index 100% rename from src/Ryujinx/Input/GTK3/GTK3Keyboard.cs rename to src/Ryujinx.Gtk3/Input/GTK3/GTK3Keyboard.cs diff --git a/src/Ryujinx/Input/GTK3/GTK3KeyboardDriver.cs b/src/Ryujinx.Gtk3/Input/GTK3/GTK3KeyboardDriver.cs similarity index 100% rename from src/Ryujinx/Input/GTK3/GTK3KeyboardDriver.cs rename to src/Ryujinx.Gtk3/Input/GTK3/GTK3KeyboardDriver.cs diff --git a/src/Ryujinx/Input/GTK3/GTK3MappingHelper.cs b/src/Ryujinx.Gtk3/Input/GTK3/GTK3MappingHelper.cs similarity index 100% rename from src/Ryujinx/Input/GTK3/GTK3MappingHelper.cs rename to src/Ryujinx.Gtk3/Input/GTK3/GTK3MappingHelper.cs diff --git a/src/Ryujinx/Input/GTK3/GTK3Mouse.cs b/src/Ryujinx.Gtk3/Input/GTK3/GTK3Mouse.cs similarity index 100% rename from src/Ryujinx/Input/GTK3/GTK3Mouse.cs rename to src/Ryujinx.Gtk3/Input/GTK3/GTK3Mouse.cs diff --git a/src/Ryujinx/Input/GTK3/GTK3MouseDriver.cs b/src/Ryujinx.Gtk3/Input/GTK3/GTK3MouseDriver.cs similarity index 100% rename from src/Ryujinx/Input/GTK3/GTK3MouseDriver.cs rename to src/Ryujinx.Gtk3/Input/GTK3/GTK3MouseDriver.cs diff --git a/src/Ryujinx/Modules/Updater/UpdateDialog.cs b/src/Ryujinx.Gtk3/Modules/Updater/UpdateDialog.cs similarity index 93% rename from src/Ryujinx/Modules/Updater/UpdateDialog.cs rename to src/Ryujinx.Gtk3/Modules/Updater/UpdateDialog.cs index ec24cdc890..43bde94207 100644 --- a/src/Ryujinx/Modules/Updater/UpdateDialog.cs +++ b/src/Ryujinx.Gtk3/Modules/Updater/UpdateDialog.cs @@ -25,7 +25,7 @@ namespace Ryujinx.Modules private readonly string _buildUrl; private bool _restartQuery; - public UpdateDialog(MainWindow mainWindow, Version newVersion, string buildUrl) : this(new Builder("Ryujinx.Modules.Updater.UpdateDialog.glade"), mainWindow, newVersion, buildUrl) { } + public UpdateDialog(MainWindow mainWindow, Version newVersion, string buildUrl) : this(new Builder("Ryujinx.Gtk3.Modules.Updater.UpdateDialog.glade"), mainWindow, newVersion, buildUrl) { } private UpdateDialog(Builder builder, MainWindow mainWindow, Version newVersion, string buildUrl) : base(builder.GetRawOwnedObject("UpdateDialog")) { @@ -34,7 +34,7 @@ namespace Ryujinx.Modules _mainWindow = mainWindow; _buildUrl = buildUrl; - Icon = new Pixbuf(Assembly.GetAssembly(typeof(ConfigurationState)), "Ryujinx.UI.Common.Resources.Logo_Ryujinx.png"); + Icon = new Pixbuf(Assembly.GetAssembly(typeof(ConfigurationState)), "Ryujinx.Gtk3.UI.Common.Resources.Logo_Ryujinx.png"); MainText.Text = "Do you want to update Ryujinx to the latest version?"; SecondaryText.Text = $"{Program.Version} -> {newVersion}"; diff --git a/src/Ryujinx/Modules/Updater/UpdateDialog.glade b/src/Ryujinx.Gtk3/Modules/Updater/UpdateDialog.glade similarity index 100% rename from src/Ryujinx/Modules/Updater/UpdateDialog.glade rename to src/Ryujinx.Gtk3/Modules/Updater/UpdateDialog.glade diff --git a/src/Ryujinx/Modules/Updater/Updater.cs b/src/Ryujinx.Gtk3/Modules/Updater/Updater.cs similarity index 100% rename from src/Ryujinx/Modules/Updater/Updater.cs rename to src/Ryujinx.Gtk3/Modules/Updater/Updater.cs diff --git a/src/Ryujinx/Program.cs b/src/Ryujinx.Gtk3/Program.cs similarity index 100% rename from src/Ryujinx/Program.cs rename to src/Ryujinx.Gtk3/Program.cs diff --git a/src/Ryujinx/Ryujinx.csproj b/src/Ryujinx.Gtk3/Ryujinx.Gtk3.csproj similarity index 100% rename from src/Ryujinx/Ryujinx.csproj rename to src/Ryujinx.Gtk3/Ryujinx.Gtk3.csproj diff --git a/src/Ryujinx/Ryujinx.ico b/src/Ryujinx.Gtk3/Ryujinx.ico similarity index 100% rename from src/Ryujinx/Ryujinx.ico rename to src/Ryujinx.Gtk3/Ryujinx.ico diff --git a/src/Ryujinx/UI/Applet/ErrorAppletDialog.cs b/src/Ryujinx.Gtk3/UI/Applet/ErrorAppletDialog.cs similarity index 91% rename from src/Ryujinx/UI/Applet/ErrorAppletDialog.cs rename to src/Ryujinx.Gtk3/UI/Applet/ErrorAppletDialog.cs index 7f8cc0e95e..cb8103caec 100644 --- a/src/Ryujinx/UI/Applet/ErrorAppletDialog.cs +++ b/src/Ryujinx.Gtk3/UI/Applet/ErrorAppletDialog.cs @@ -8,7 +8,7 @@ namespace Ryujinx.UI.Applet { public ErrorAppletDialog(Window parentWindow, DialogFlags dialogFlags, MessageType messageType, string[] buttons) : base(parentWindow, dialogFlags, messageType, ButtonsType.None, null) { - Icon = new Gdk.Pixbuf(Assembly.GetAssembly(typeof(ConfigurationState)), "Ryujinx.UI.Common.Resources.Logo_Ryujinx.png"); + Icon = new Gdk.Pixbuf(Assembly.GetAssembly(typeof(ConfigurationState)), "Ryujinx.Gtk3.UI.Common.Resources.Logo_Ryujinx.png"); int responseId = 0; diff --git a/src/Ryujinx/UI/Applet/GtkDynamicTextInputHandler.cs b/src/Ryujinx.Gtk3/UI/Applet/GtkDynamicTextInputHandler.cs similarity index 100% rename from src/Ryujinx/UI/Applet/GtkDynamicTextInputHandler.cs rename to src/Ryujinx.Gtk3/UI/Applet/GtkDynamicTextInputHandler.cs diff --git a/src/Ryujinx/UI/Applet/GtkHostUIHandler.cs b/src/Ryujinx.Gtk3/UI/Applet/GtkHostUIHandler.cs similarity index 100% rename from src/Ryujinx/UI/Applet/GtkHostUIHandler.cs rename to src/Ryujinx.Gtk3/UI/Applet/GtkHostUIHandler.cs diff --git a/src/Ryujinx/UI/Applet/GtkHostUITheme.cs b/src/Ryujinx.Gtk3/UI/Applet/GtkHostUITheme.cs similarity index 100% rename from src/Ryujinx/UI/Applet/GtkHostUITheme.cs rename to src/Ryujinx.Gtk3/UI/Applet/GtkHostUITheme.cs diff --git a/src/Ryujinx/UI/Applet/SwkbdAppletDialog.cs b/src/Ryujinx.Gtk3/UI/Applet/SwkbdAppletDialog.cs similarity index 100% rename from src/Ryujinx/UI/Applet/SwkbdAppletDialog.cs rename to src/Ryujinx.Gtk3/UI/Applet/SwkbdAppletDialog.cs diff --git a/src/Ryujinx/UI/Helper/MetalHelper.cs b/src/Ryujinx.Gtk3/UI/Helper/MetalHelper.cs similarity index 100% rename from src/Ryujinx/UI/Helper/MetalHelper.cs rename to src/Ryujinx.Gtk3/UI/Helper/MetalHelper.cs diff --git a/src/Ryujinx/UI/Helper/SortHelper.cs b/src/Ryujinx.Gtk3/UI/Helper/SortHelper.cs similarity index 100% rename from src/Ryujinx/UI/Helper/SortHelper.cs rename to src/Ryujinx.Gtk3/UI/Helper/SortHelper.cs diff --git a/src/Ryujinx/UI/Helper/ThemeHelper.cs b/src/Ryujinx.Gtk3/UI/Helper/ThemeHelper.cs similarity index 100% rename from src/Ryujinx/UI/Helper/ThemeHelper.cs rename to src/Ryujinx.Gtk3/UI/Helper/ThemeHelper.cs diff --git a/src/Ryujinx/UI/MainWindow.cs b/src/Ryujinx.Gtk3/UI/MainWindow.cs similarity index 99% rename from src/Ryujinx/UI/MainWindow.cs rename to src/Ryujinx.Gtk3/UI/MainWindow.cs index 2908f1a8de..d1ca6ce6ab 100644 --- a/src/Ryujinx/UI/MainWindow.cs +++ b/src/Ryujinx.Gtk3/UI/MainWindow.cs @@ -143,7 +143,7 @@ namespace Ryujinx.UI #pragma warning restore CS0649, IDE0044, CS0169, IDE0051 - public MainWindow() : this(new Builder("Ryujinx.UI.MainWindow.glade")) { } + public MainWindow() : this(new Builder("Ryujinx.Gtk3.UI.MainWindow.glade")) { } private MainWindow(Builder builder) : base(builder.GetRawOwnedObject("_mainWin")) { diff --git a/src/Ryujinx/UI/MainWindow.glade b/src/Ryujinx.Gtk3/UI/MainWindow.glade similarity index 100% rename from src/Ryujinx/UI/MainWindow.glade rename to src/Ryujinx.Gtk3/UI/MainWindow.glade diff --git a/src/Ryujinx/UI/OpenGLRenderer.cs b/src/Ryujinx.Gtk3/UI/OpenGLRenderer.cs similarity index 100% rename from src/Ryujinx/UI/OpenGLRenderer.cs rename to src/Ryujinx.Gtk3/UI/OpenGLRenderer.cs diff --git a/src/Ryujinx/UI/OpenToolkitBindingsContext.cs b/src/Ryujinx.Gtk3/UI/OpenToolkitBindingsContext.cs similarity index 100% rename from src/Ryujinx/UI/OpenToolkitBindingsContext.cs rename to src/Ryujinx.Gtk3/UI/OpenToolkitBindingsContext.cs diff --git a/src/Ryujinx/UI/RendererWidgetBase.cs b/src/Ryujinx.Gtk3/UI/RendererWidgetBase.cs similarity index 100% rename from src/Ryujinx/UI/RendererWidgetBase.cs rename to src/Ryujinx.Gtk3/UI/RendererWidgetBase.cs diff --git a/src/Ryujinx/UI/SPBOpenGLContext.cs b/src/Ryujinx.Gtk3/UI/SPBOpenGLContext.cs similarity index 100% rename from src/Ryujinx/UI/SPBOpenGLContext.cs rename to src/Ryujinx.Gtk3/UI/SPBOpenGLContext.cs diff --git a/src/Ryujinx/UI/StatusUpdatedEventArgs.cs b/src/Ryujinx.Gtk3/UI/StatusUpdatedEventArgs.cs similarity index 100% rename from src/Ryujinx/UI/StatusUpdatedEventArgs.cs rename to src/Ryujinx.Gtk3/UI/StatusUpdatedEventArgs.cs diff --git a/src/Ryujinx/UI/VulkanRenderer.cs b/src/Ryujinx.Gtk3/UI/VulkanRenderer.cs similarity index 100% rename from src/Ryujinx/UI/VulkanRenderer.cs rename to src/Ryujinx.Gtk3/UI/VulkanRenderer.cs diff --git a/src/Ryujinx/UI/Widgets/GameTableContextMenu.Designer.cs b/src/Ryujinx.Gtk3/UI/Widgets/GameTableContextMenu.Designer.cs similarity index 100% rename from src/Ryujinx/UI/Widgets/GameTableContextMenu.Designer.cs rename to src/Ryujinx.Gtk3/UI/Widgets/GameTableContextMenu.Designer.cs diff --git a/src/Ryujinx/UI/Widgets/GameTableContextMenu.cs b/src/Ryujinx.Gtk3/UI/Widgets/GameTableContextMenu.cs similarity index 99% rename from src/Ryujinx/UI/Widgets/GameTableContextMenu.cs rename to src/Ryujinx.Gtk3/UI/Widgets/GameTableContextMenu.cs index dc0dd4c508..c8236223ab 100644 --- a/src/Ryujinx/UI/Widgets/GameTableContextMenu.cs +++ b/src/Ryujinx.Gtk3/UI/Widgets/GameTableContextMenu.cs @@ -189,7 +189,7 @@ namespace Ryujinx.UI.Widgets _dialog = new MessageDialog(null, DialogFlags.DestroyWithParent, MessageType.Info, ButtonsType.Cancel, null) { Title = "Ryujinx - NCA Section Extractor", - Icon = new Gdk.Pixbuf(Assembly.GetAssembly(typeof(ConfigurationState)), "Ryujinx.UI.Common.Resources.Logo_Ryujinx.png"), + Icon = new Gdk.Pixbuf(Assembly.GetAssembly(typeof(ConfigurationState)), "Ryujinx.Gtk3.UI.Common.Resources.Logo_Ryujinx.png"), SecondaryText = $"Extracting {ncaSectionType} section from {System.IO.Path.GetFileName(_titleFilePath)}...", WindowPosition = WindowPosition.Center, }; diff --git a/src/Ryujinx/UI/Widgets/GtkDialog.cs b/src/Ryujinx.Gtk3/UI/Widgets/GtkDialog.cs similarity index 100% rename from src/Ryujinx/UI/Widgets/GtkDialog.cs rename to src/Ryujinx.Gtk3/UI/Widgets/GtkDialog.cs diff --git a/src/Ryujinx/UI/Widgets/GtkInputDialog.cs b/src/Ryujinx.Gtk3/UI/Widgets/GtkInputDialog.cs similarity index 100% rename from src/Ryujinx/UI/Widgets/GtkInputDialog.cs rename to src/Ryujinx.Gtk3/UI/Widgets/GtkInputDialog.cs diff --git a/src/Ryujinx/UI/Widgets/ProfileDialog.cs b/src/Ryujinx.Gtk3/UI/Widgets/ProfileDialog.cs similarity index 94% rename from src/Ryujinx/UI/Widgets/ProfileDialog.cs rename to src/Ryujinx.Gtk3/UI/Widgets/ProfileDialog.cs index f8aa6345fb..3b3e2fbbe6 100644 --- a/src/Ryujinx/UI/Widgets/ProfileDialog.cs +++ b/src/Ryujinx.Gtk3/UI/Widgets/ProfileDialog.cs @@ -15,7 +15,7 @@ namespace Ryujinx.UI.Widgets [GUI] Label _errorMessage; #pragma warning restore CS0649, IDE0044 - public ProfileDialog() : this(new Builder("Ryujinx.UI.Widgets.ProfileDialog.glade")) { } + public ProfileDialog() : this(new Builder("Ryujinx.Gtk3.UI.Widgets.ProfileDialog.glade")) { } private ProfileDialog(Builder builder) : base(builder.GetRawOwnedObject("_profileDialog")) { diff --git a/src/Ryujinx/UI/Widgets/ProfileDialog.glade b/src/Ryujinx.Gtk3/UI/Widgets/ProfileDialog.glade similarity index 100% rename from src/Ryujinx/UI/Widgets/ProfileDialog.glade rename to src/Ryujinx.Gtk3/UI/Widgets/ProfileDialog.glade diff --git a/src/Ryujinx/UI/Widgets/RawInputToTextEntry.cs b/src/Ryujinx.Gtk3/UI/Widgets/RawInputToTextEntry.cs similarity index 100% rename from src/Ryujinx/UI/Widgets/RawInputToTextEntry.cs rename to src/Ryujinx.Gtk3/UI/Widgets/RawInputToTextEntry.cs diff --git a/src/Ryujinx/UI/Widgets/UserErrorDialog.cs b/src/Ryujinx.Gtk3/UI/Widgets/UserErrorDialog.cs similarity index 100% rename from src/Ryujinx/UI/Widgets/UserErrorDialog.cs rename to src/Ryujinx.Gtk3/UI/Widgets/UserErrorDialog.cs diff --git a/src/Ryujinx/UI/Windows/AboutWindow.Designer.cs b/src/Ryujinx.Gtk3/UI/Windows/AboutWindow.Designer.cs similarity index 100% rename from src/Ryujinx/UI/Windows/AboutWindow.Designer.cs rename to src/Ryujinx.Gtk3/UI/Windows/AboutWindow.Designer.cs diff --git a/src/Ryujinx/UI/Windows/AboutWindow.cs b/src/Ryujinx.Gtk3/UI/Windows/AboutWindow.cs similarity index 100% rename from src/Ryujinx/UI/Windows/AboutWindow.cs rename to src/Ryujinx.Gtk3/UI/Windows/AboutWindow.cs diff --git a/src/Ryujinx/UI/Windows/AmiiboWindow.Designer.cs b/src/Ryujinx.Gtk3/UI/Windows/AmiiboWindow.Designer.cs similarity index 100% rename from src/Ryujinx/UI/Windows/AmiiboWindow.Designer.cs rename to src/Ryujinx.Gtk3/UI/Windows/AmiiboWindow.Designer.cs diff --git a/src/Ryujinx/UI/Windows/AmiiboWindow.cs b/src/Ryujinx.Gtk3/UI/Windows/AmiiboWindow.cs similarity index 100% rename from src/Ryujinx/UI/Windows/AmiiboWindow.cs rename to src/Ryujinx.Gtk3/UI/Windows/AmiiboWindow.cs diff --git a/src/Ryujinx/UI/Windows/AvatarWindow.cs b/src/Ryujinx.Gtk3/UI/Windows/AvatarWindow.cs similarity index 100% rename from src/Ryujinx/UI/Windows/AvatarWindow.cs rename to src/Ryujinx.Gtk3/UI/Windows/AvatarWindow.cs diff --git a/src/Ryujinx/UI/Windows/CheatWindow.cs b/src/Ryujinx.Gtk3/UI/Windows/CheatWindow.cs similarity index 98% rename from src/Ryujinx/UI/Windows/CheatWindow.cs rename to src/Ryujinx.Gtk3/UI/Windows/CheatWindow.cs index 73ee870cd7..96ed0723ed 100644 --- a/src/Ryujinx/UI/Windows/CheatWindow.cs +++ b/src/Ryujinx.Gtk3/UI/Windows/CheatWindow.cs @@ -22,7 +22,7 @@ namespace Ryujinx.UI.Windows [GUI] Button _saveButton; #pragma warning restore CS0649, IDE0044 - public CheatWindow(VirtualFileSystem virtualFileSystem, ulong titleId, string titleName, string titlePath) : this(new Builder("Ryujinx.UI.Windows.CheatWindow.glade"), virtualFileSystem, titleId, titleName, titlePath) { } + public CheatWindow(VirtualFileSystem virtualFileSystem, ulong titleId, string titleName, string titlePath) : this(new Builder("Ryujinx.Gtk3.UI.Windows.CheatWindow.glade"), virtualFileSystem, titleId, titleName, titlePath) { } private CheatWindow(Builder builder, VirtualFileSystem virtualFileSystem, ulong titleId, string titleName, string titlePath) : base(builder.GetRawOwnedObject("_cheatWindow")) { diff --git a/src/Ryujinx/UI/Windows/CheatWindow.glade b/src/Ryujinx.Gtk3/UI/Windows/CheatWindow.glade similarity index 100% rename from src/Ryujinx/UI/Windows/CheatWindow.glade rename to src/Ryujinx.Gtk3/UI/Windows/CheatWindow.glade diff --git a/src/Ryujinx/UI/Windows/ControllerWindow.cs b/src/Ryujinx.Gtk3/UI/Windows/ControllerWindow.cs similarity index 99% rename from src/Ryujinx/UI/Windows/ControllerWindow.cs rename to src/Ryujinx.Gtk3/UI/Windows/ControllerWindow.cs index 9541134432..6712657f8d 100644 --- a/src/Ryujinx/UI/Windows/ControllerWindow.cs +++ b/src/Ryujinx.Gtk3/UI/Windows/ControllerWindow.cs @@ -117,7 +117,7 @@ namespace Ryujinx.UI.Windows private static readonly InputConfigJsonSerializerContext _serializerContext = new(JsonHelper.GetDefaultSerializerOptions()); - public ControllerWindow(MainWindow mainWindow, PlayerIndex controllerId) : this(mainWindow, new Builder("Ryujinx.UI.Windows.ControllerWindow.glade"), controllerId) { } + public ControllerWindow(MainWindow mainWindow, PlayerIndex controllerId) : this(mainWindow, new Builder("Ryujinx.Gtk3.UI.Windows.ControllerWindow.glade"), controllerId) { } private ControllerWindow(MainWindow mainWindow, Builder builder, PlayerIndex controllerId) : base(builder.GetRawOwnedObject("_controllerWin")) { diff --git a/src/Ryujinx/UI/Windows/ControllerWindow.glade b/src/Ryujinx.Gtk3/UI/Windows/ControllerWindow.glade similarity index 100% rename from src/Ryujinx/UI/Windows/ControllerWindow.glade rename to src/Ryujinx.Gtk3/UI/Windows/ControllerWindow.glade diff --git a/src/Ryujinx/UI/Windows/DlcWindow.cs b/src/Ryujinx.Gtk3/UI/Windows/DlcWindow.cs similarity index 98% rename from src/Ryujinx/UI/Windows/DlcWindow.cs rename to src/Ryujinx.Gtk3/UI/Windows/DlcWindow.cs index aed1a015d5..388f110893 100644 --- a/src/Ryujinx/UI/Windows/DlcWindow.cs +++ b/src/Ryujinx.Gtk3/UI/Windows/DlcWindow.cs @@ -32,7 +32,7 @@ namespace Ryujinx.UI.Windows [GUI] TreeSelection _dlcTreeSelection; #pragma warning restore CS0649, IDE0044 - public DlcWindow(VirtualFileSystem virtualFileSystem, string titleId, string titleName) : this(new Builder("Ryujinx.UI.Windows.DlcWindow.glade"), virtualFileSystem, titleId, titleName) { } + public DlcWindow(VirtualFileSystem virtualFileSystem, string titleId, string titleName) : this(new Builder("Ryujinx.Gtk3.UI.Windows.DlcWindow.glade"), virtualFileSystem, titleId, titleName) { } private DlcWindow(Builder builder, VirtualFileSystem virtualFileSystem, string titleId, string titleName) : base(builder.GetRawOwnedObject("_dlcWindow")) { diff --git a/src/Ryujinx/UI/Windows/DlcWindow.glade b/src/Ryujinx.Gtk3/UI/Windows/DlcWindow.glade similarity index 100% rename from src/Ryujinx/UI/Windows/DlcWindow.glade rename to src/Ryujinx.Gtk3/UI/Windows/DlcWindow.glade diff --git a/src/Ryujinx/UI/Windows/SettingsWindow.cs b/src/Ryujinx.Gtk3/UI/Windows/SettingsWindow.cs similarity index 99% rename from src/Ryujinx/UI/Windows/SettingsWindow.cs rename to src/Ryujinx.Gtk3/UI/Windows/SettingsWindow.cs index 270a8ad4a5..dc467c0f21 100644 --- a/src/Ryujinx/UI/Windows/SettingsWindow.cs +++ b/src/Ryujinx.Gtk3/UI/Windows/SettingsWindow.cs @@ -120,7 +120,7 @@ namespace Ryujinx.UI.Windows #pragma warning restore CS0649, IDE0044 - public SettingsWindow(MainWindow parent, VirtualFileSystem virtualFileSystem, ContentManager contentManager) : this(parent, new Builder("Ryujinx.UI.Windows.SettingsWindow.glade"), virtualFileSystem, contentManager) { } + public SettingsWindow(MainWindow parent, VirtualFileSystem virtualFileSystem, ContentManager contentManager) : this(parent, new Builder("Ryujinx.Gtk3.UI.Windows.SettingsWindow.glade"), virtualFileSystem, contentManager) { } private SettingsWindow(MainWindow parent, Builder builder, VirtualFileSystem virtualFileSystem, ContentManager contentManager) : base(builder.GetRawOwnedObject("_settingsWin")) { diff --git a/src/Ryujinx/UI/Windows/SettingsWindow.glade b/src/Ryujinx.Gtk3/UI/Windows/SettingsWindow.glade similarity index 100% rename from src/Ryujinx/UI/Windows/SettingsWindow.glade rename to src/Ryujinx.Gtk3/UI/Windows/SettingsWindow.glade diff --git a/src/Ryujinx/UI/Windows/TitleUpdateWindow.cs b/src/Ryujinx.Gtk3/UI/Windows/TitleUpdateWindow.cs similarity index 98% rename from src/Ryujinx/UI/Windows/TitleUpdateWindow.cs rename to src/Ryujinx.Gtk3/UI/Windows/TitleUpdateWindow.cs index 1df9293366..74b2330ee9 100644 --- a/src/Ryujinx/UI/Windows/TitleUpdateWindow.cs +++ b/src/Ryujinx.Gtk3/UI/Windows/TitleUpdateWindow.cs @@ -38,7 +38,7 @@ namespace Ryujinx.UI.Windows [GUI] RadioButton _noUpdateRadioButton; #pragma warning restore CS0649, IDE0044 - public TitleUpdateWindow(MainWindow parent, VirtualFileSystem virtualFileSystem, string titleId, string titleName) : this(new Builder("Ryujinx.UI.Windows.TitleUpdateWindow.glade"), parent, virtualFileSystem, titleId, titleName) { } + public TitleUpdateWindow(MainWindow parent, VirtualFileSystem virtualFileSystem, string titleId, string titleName) : this(new Builder("Ryujinx.Gtk3.UI.Windows.TitleUpdateWindow.glade"), parent, virtualFileSystem, titleId, titleName) { } private TitleUpdateWindow(Builder builder, MainWindow parent, VirtualFileSystem virtualFileSystem, string titleId, string titleName) : base(builder.GetRawOwnedObject("_titleUpdateWindow")) { diff --git a/src/Ryujinx/UI/Windows/TitleUpdateWindow.glade b/src/Ryujinx.Gtk3/UI/Windows/TitleUpdateWindow.glade similarity index 100% rename from src/Ryujinx/UI/Windows/TitleUpdateWindow.glade rename to src/Ryujinx.Gtk3/UI/Windows/TitleUpdateWindow.glade diff --git a/src/Ryujinx/UI/Windows/UserProfilesManagerWindow.Designer.cs b/src/Ryujinx.Gtk3/UI/Windows/UserProfilesManagerWindow.Designer.cs similarity index 100% rename from src/Ryujinx/UI/Windows/UserProfilesManagerWindow.Designer.cs rename to src/Ryujinx.Gtk3/UI/Windows/UserProfilesManagerWindow.Designer.cs diff --git a/src/Ryujinx/UI/Windows/UserProfilesManagerWindow.cs b/src/Ryujinx.Gtk3/UI/Windows/UserProfilesManagerWindow.cs similarity index 100% rename from src/Ryujinx/UI/Windows/UserProfilesManagerWindow.cs rename to src/Ryujinx.Gtk3/UI/Windows/UserProfilesManagerWindow.cs