mirrors/ryujinx
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Infra: Capitalisation Consistency (#6296)

Browse source 
* Rename Ryujinx.UI.Common

* Rename Ryujinx.UI.LocaleGenerator

* Update in Files

AboutWindow

* Configuration State

* Rename projects

* Ryujinx/UI

* Fix build

* Main remaining inconsistencies

* HLE.UI Namespace

* HLE.UI Files

* Namespace

* Ryujinx.UI.Common.Configuration.UI

* Ryujinx.UI.Common,Configuration.UI Files

* More instances
This commit is contained in:
Isaac Marovitz 2024-02-11 02:09:18 +00:00 • committed by GitHub
parent 84d6e8d121
commit f06d22d6f0
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
189 changed files with 648 additions and 648 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/Ryujinx/Modules/Updater/UpdateDialog.cs
View file

@ -2,9 +2,9 @@ using Gdk;
using Gtk;
using Ryujinx.Common;
using Ryujinx.Common.Configuration;
using Ryujinx.Ui;
using Ryujinx.Ui.Common.Configuration;
using Ryujinx.Ui.Common.Helper;
using Ryujinx.UI;
using Ryujinx.UI.Common.Configuration;
using Ryujinx.UI.Common.Helper;
using System;
using System.Diagnostics;
using System.Reflection;
@ -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.UI.Common.Resources.Logo_Ryujinx.png");
MainText.Text = "Do you want to update Ryujinx to the latest version?";
SecondaryText.Text = $"{Program.Version} -> {newVersion}";

6
src/Ryujinx/Modules/Updater/Updater.cs
View file

@ -5,9 +5,9 @@ using ICSharpCode.SharpZipLib.Zip;
using Ryujinx.Common;
using Ryujinx.Common.Logging;
using Ryujinx.Common.Utilities;
using Ryujinx.Ui;
using Ryujinx.Ui.Common.Models.Github;
using Ryujinx.Ui.Widgets;
using Ryujinx.UI;
using Ryujinx.UI.Common.Models.Github;
using Ryujinx.UI.Widgets;
using System;
using System.Collections.Generic;
using System.IO;

12
src/Ryujinx/Program.cs
View file

@ -6,12 +6,12 @@ using Ryujinx.Common.Logging;
using Ryujinx.Common.SystemInterop;
using Ryujinx.Modules;
using Ryujinx.SDL2.Common;
using Ryujinx.Ui;
using Ryujinx.Ui.Common;
using Ryujinx.Ui.Common.Configuration;
using Ryujinx.Ui.Common.Helper;
using Ryujinx.Ui.Common.SystemInfo;
using Ryujinx.Ui.Widgets;
using Ryujinx.UI;
using Ryujinx.UI.Common;
using Ryujinx.UI.Common.Configuration;
using Ryujinx.UI.Common.Helper;
using Ryujinx.UI.Common.SystemInfo;
using Ryujinx.UI.Widgets;
using SixLabors.ImageSharp.Formats.Jpeg;
using System;
using System.Collections.Generic;

30
src/Ryujinx/Ryujinx.csproj
View file

@ -45,7 +45,7 @@
<ProjectReference Include="..\Ryujinx.Graphics.OpenGL\Ryujinx.Graphics.OpenGL.csproj" />
<ProjectReference Include="..\Ryujinx.Graphics.Vulkan\Ryujinx.Graphics.Vulkan.csproj" />
<ProjectReference Include="..\Ryujinx.Graphics.Gpu\Ryujinx.Graphics.Gpu.csproj" />
<ProjectReference Include="..\Ryujinx.Ui.Common\Ryujinx.Ui.Common.csproj" />
<ProjectReference Include="..\Ryujinx.UI.Common\Ryujinx.UI.Common.csproj" />
</ItemGroup>
<ItemGroup>
@ -80,24 +80,24 @@
</PropertyGroup>
<ItemGroup>
<None Remove="Ui\MainWindow.glade" />
<None Remove="Ui\Widgets\ProfileDialog.glade" />
<None Remove="Ui\Windows\CheatWindow.glade" />
<None Remove="Ui\Windows\ControllerWindow.glade" />
<None Remove="Ui\Windows\DlcWindow.glade" />
<None Remove="Ui\Windows\SettingsWindow.glade" />
<None Remove="Ui\Windows\TitleUpdateWindow.glade" />
<None Remove="UI\MainWindow.glade" />
<None Remove="UI\Widgets\ProfileDialog.glade" />
<None Remove="UI\Windows\CheatWindow.glade" />
<None Remove="UI\Windows\ControllerWindow.glade" />
<None Remove="UI\Windows\DlcWindow.glade" />
<None Remove="UI\Windows\SettingsWindow.glade" />
<None Remove="UI\Windows\TitleUpdateWindow.glade" />
<None Remove="Modules\Updater\UpdateDialog.glade" />
</ItemGroup>
<ItemGroup>
<EmbeddedResource Include="Ui\MainWindow.glade" />
<EmbeddedResource Include="Ui\Widgets\ProfileDialog.glade" />
<EmbeddedResource Include="Ui\Windows\CheatWindow.glade" />
<EmbeddedResource Include="Ui\Windows\ControllerWindow.glade" />
<EmbeddedResource Include="Ui\Windows\DlcWindow.glade" />
<EmbeddedResource Include="Ui\Windows\SettingsWindow.glade" />
<EmbeddedResource Include="Ui\Windows\TitleUpdateWindow.glade" />
<EmbeddedResource Include="UI\MainWindow.glade" />
<EmbeddedResource Include="UI\Widgets\ProfileDialog.glade" />
<EmbeddedResource Include="UI\Windows\CheatWindow.glade" />
<EmbeddedResource Include="UI\Windows\ControllerWindow.glade" />
<EmbeddedResource Include="UI\Windows\DlcWindow.glade" />
<EmbeddedResource Include="UI\Windows\SettingsWindow.glade" />
<EmbeddedResource Include="UI\Windows\TitleUpdateWindow.glade" />
<EmbeddedResource Include="Modules\Updater\UpdateDialog.glade" />
</ItemGroup>

6
src/Ryujinx/Ui/Applet/ErrorAppletDialog.cs → src/Ryujinx/UI/Applet/ErrorAppletDialog.cs
View file

@ -1,14 +1,14 @@
using Gtk;
using Ryujinx.Ui.Common.Configuration;
using Ryujinx.UI.Common.Configuration;
using System.Reflection;
namespace Ryujinx.Ui.Applet
namespace Ryujinx.UI.Applet
{
internal class ErrorAppletDialog : MessageDialog
{
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.UI.Common.Resources.Logo_Ryujinx.png");
int responseId = 0;

6
src/Ryujinx/Ui/Applet/GtkDynamicTextInputHandler.cs → src/Ryujinx/UI/Applet/GtkDynamicTextInputHandler.cs
View file

@ -1,10 +1,10 @@
using Gtk;
using Ryujinx.HLE.Ui;
using Ryujinx.HLE.UI;
using Ryujinx.Input.GTK3;
using Ryujinx.Ui.Widgets;
using Ryujinx.UI.Widgets;
using System.Threading;
namespace Ryujinx.Ui.Applet
namespace Ryujinx.UI.Applet
{
/// <summary>
/// Class that forwards key events to a GTK Entry so they can be processed into text.

18
src/Ryujinx/Ui/Applet/GtkHostUiHandler.cs → src/Ryujinx/UI/Applet/GtkHostUIHandler.cs
View file

@ -1,27 +1,27 @@
using Gtk;
using Ryujinx.HLE.HOS.Applets;
using Ryujinx.HLE.HOS.Services.Am.AppletOE.ApplicationProxyService.ApplicationProxy.Types;
using Ryujinx.HLE.Ui;
using Ryujinx.Ui.Widgets;
using Ryujinx.HLE.UI;
using Ryujinx.UI.Widgets;
using System;
using System.Threading;
namespace Ryujinx.Ui.Applet
namespace Ryujinx.UI.Applet
{
internal class GtkHostUiHandler : IHostUiHandler
internal class GtkHostUIHandler : IHostUIHandler
{
private readonly Window _parent;
public IHostUiTheme HostUiTheme { get; }
public IHostUITheme HostUITheme { get; }
public GtkHostUiHandler(Window parent)
public GtkHostUIHandler(Window parent)
{
_parent = parent;
HostUiTheme = new GtkHostUiTheme(parent);
HostUITheme = new GtkHostUITheme(parent);
}
public bool DisplayMessageDialog(ControllerAppletUiArgs args)
public bool DisplayMessageDialog(ControllerAppletUIArgs args)
{
string playerCount = args.PlayerCountMin == args.PlayerCountMax ? $"exactly {args.PlayerCountMin}" : $"{args.PlayerCountMin}-{args.PlayerCountMax}";
@ -81,7 +81,7 @@ namespace Ryujinx.Ui.Applet
return okPressed;
}
public bool DisplayInputDialog(SoftwareKeyboardUiArgs args, out string userText)
public bool DisplayInputDialog(SoftwareKeyboardUIArgs args, out string userText)
{
ManualResetEvent dialogCloseEvent = new(false);

8
src/Ryujinx/Ui/Applet/GtkHostUiTheme.cs → src/Ryujinx/UI/Applet/GtkHostUITheme.cs
View file

@ -1,10 +1,10 @@
using Gtk;
using Ryujinx.HLE.Ui;
using Ryujinx.HLE.UI;
using System.Diagnostics;
namespace Ryujinx.Ui.Applet
namespace Ryujinx.UI.Applet
{
internal class GtkHostUiTheme : IHostUiTheme
internal class GtkHostUITheme : IHostUITheme
{
private const int RenderSurfaceWidth = 32;
private const int RenderSurfaceHeight = 32;
@ -17,7 +17,7 @@ namespace Ryujinx.Ui.Applet
public ThemeColor SelectionBackgroundColor { get; }
public ThemeColor SelectionForegroundColor { get; }
public GtkHostUiTheme(Window parent)
public GtkHostUITheme(Window parent)
{
Entry entry = new();
entry.SetStateFlags(StateFlags.Selected, true);

2
src/Ryujinx/Ui/Applet/SwkbdAppletDialog.cs → src/Ryujinx/UI/Applet/SwkbdAppletDialog.cs
View file

@ -3,7 +3,7 @@ using Ryujinx.HLE.HOS.Applets.SoftwareKeyboard;
using System;
using System.Linq;
namespace Ryujinx.Ui.Applet
namespace Ryujinx.UI.Applet
{
public class SwkbdAppletDialog : MessageDialog
{

2
src/Ryujinx/Ui/Helper/MetalHelper.cs → src/Ryujinx/UI/Helper/MetalHelper.cs
View file

@ -3,7 +3,7 @@ using System;
using System.Runtime.InteropServices;
using System.Runtime.Versioning;
namespace Ryujinx.Ui.Helper
namespace Ryujinx.UI.Helper
{
public delegate void UpdateBoundsCallbackDelegate(Window window);

4
src/Ryujinx/Ui/Helper/SortHelper.cs → src/Ryujinx/UI/Helper/SortHelper.cs
View file

@ -1,8 +1,8 @@
using Gtk;
using Ryujinx.Ui.Common.Helper;
using Ryujinx.UI.Common.Helper;
using System;
namespace Ryujinx.Ui.Helper
namespace Ryujinx.UI.Helper
{
static class SortHelper
{

16
src/Ryujinx/Ui/Helper/ThemeHelper.cs → src/Ryujinx/UI/Helper/ThemeHelper.cs
View file

@ -1,34 +1,34 @@
using Gtk;
using Ryujinx.Common;
using Ryujinx.Common.Logging;
using Ryujinx.Ui.Common.Configuration;
using Ryujinx.UI.Common.Configuration;
using System.IO;
namespace Ryujinx.Ui.Helper
namespace Ryujinx.UI.Helper
{
static class ThemeHelper
{
public static void ApplyTheme()
{
if (!ConfigurationState.Instance.Ui.EnableCustomTheme)
if (!ConfigurationState.Instance.UI.EnableCustomTheme)
{
return;
}
if (File.Exists(ConfigurationState.Instance.Ui.CustomThemePath) && (Path.GetExtension(ConfigurationState.Instance.Ui.CustomThemePath) == ".css"))
if (File.Exists(ConfigurationState.Instance.UI.CustomThemePath) && (Path.GetExtension(ConfigurationState.Instance.UI.CustomThemePath) == ".css"))
{
CssProvider cssProvider = new();
cssProvider.LoadFromPath(ConfigurationState.Instance.Ui.CustomThemePath);
cssProvider.LoadFromPath(ConfigurationState.Instance.UI.CustomThemePath);
StyleContext.AddProviderForScreen(Gdk.Screen.Default, cssProvider, 800);
}
else
{
Logger.Warning?.Print(LogClass.Application, $"The \"custom_theme_path\" section in \"{ReleaseInformation.ConfigName}\" contains an invalid path: \"{ConfigurationState.Instance.Ui.CustomThemePath}\".");
Logger.Warning?.Print(LogClass.Application, $"The \"custom_theme_path\" section in \"{ReleaseInformation.ConfigName}\" contains an invalid path: \"{ConfigurationState.Instance.UI.CustomThemePath}\".");
ConfigurationState.Instance.Ui.CustomThemePath.Value = "";
ConfigurationState.Instance.Ui.EnableCustomTheme.Value = false;
ConfigurationState.Instance.UI.CustomThemePath.Value = "";
ConfigurationState.Instance.UI.EnableCustomTheme.Value = false;
ConfigurationState.Instance.ToFileFormat().SaveConfig(Program.ConfigurationPath);
}
}

160
src/Ryujinx/Ui/MainWindow.cs → src/Ryujinx/UI/MainWindow.cs
View file

@ -26,14 +26,14 @@ using Ryujinx.Input.GTK3;
using Ryujinx.Input.HLE;
using Ryujinx.Input.SDL2;
using Ryujinx.Modules;
using Ryujinx.Ui.App.Common;
using Ryujinx.Ui.Applet;
using Ryujinx.Ui.Common;
using Ryujinx.Ui.Common.Configuration;
using Ryujinx.Ui.Common.Helper;
using Ryujinx.Ui.Helper;
using Ryujinx.Ui.Widgets;
using Ryujinx.Ui.Windows;
using Ryujinx.UI.App.Common;
using Ryujinx.UI.Applet;
using Ryujinx.UI.Common;
using Ryujinx.UI.Common.Configuration;
using Ryujinx.UI.Common.Helper;
using Ryujinx.UI.Helper;
using Ryujinx.UI.Widgets;
using Ryujinx.UI.Windows;
using Silk.NET.Vulkan;
using SPB.Graphics.Vulkan;
using System;
@ -45,7 +45,7 @@ using System.Threading.Tasks;
using GUI = Gtk.Builder.ObjectAttribute;
using ShaderCacheLoadingState = Ryujinx.Graphics.Gpu.Shader.ShaderCacheState;
namespace Ryujinx.Ui
namespace Ryujinx.UI
{
public class MainWindow : Window
{
@ -61,7 +61,7 @@ namespace Ryujinx.Ui
private WindowsMultimediaTimerResolution _windowsMultimediaTimerResolution;
private readonly ApplicationLibrary _applicationLibrary;
private readonly GtkHostUiHandler _uiHandler;
private readonly GtkHostUIHandler _uiHandler;
private readonly AutoResetEvent _deviceExitStatus;
private readonly ListStore _tableStore;
@ -99,7 +99,7 @@ namespace Ryujinx.Ui
[GUI] MenuItem _simulateWakeUpMessage;
[GUI] MenuItem _scanAmiibo;
[GUI] MenuItem _takeScreenshot;
[GUI] MenuItem _hideUi;
[GUI] MenuItem _hideUI;
[GUI] MenuItem _fullScreen;
[GUI] CheckMenuItem _startFullScreen;
[GUI] CheckMenuItem _showConsole;
@ -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.UI.MainWindow.glade")) { }
private MainWindow(Builder builder) : base(builder.GetRawOwnedObject("_mainWin"))
{
@ -154,7 +154,7 @@ namespace Ryujinx.Ui
SetWindowSizePosition();
Icon = new Gdk.Pixbuf(Assembly.GetAssembly(typeof(ConfigurationState)), "Ryujinx.Ui.Common.Resources.Logo_Ryujinx.png");
Icon = new Gdk.Pixbuf(Assembly.GetAssembly(typeof(ConfigurationState)), "Ryujinx.UI.Common.Resources.Logo_Ryujinx.png");
Title = $"Ryujinx {Program.Version}";
// Hide emulation context status bar.
@ -182,7 +182,7 @@ namespace Ryujinx.Ui
// Instantiate GUI objects.
_applicationLibrary = new ApplicationLibrary(_virtualFileSystem);
_uiHandler = new GtkHostUiHandler(this);
_uiHandler = new GtkHostUIHandler(this);
_deviceExitStatus = new AutoResetEvent(false);
WindowStateEvent += WindowStateEvent_Changed;
@ -210,24 +210,24 @@ namespace Ryujinx.Ui
ConfigurationState.Instance.Multiplayer.Mode.Event += UpdateMultiplayerMode;
ConfigurationState.Instance.Multiplayer.LanInterfaceId.Event += UpdateMultiplayerLanInterfaceId;
if (ConfigurationState.Instance.Ui.StartFullscreen)
if (ConfigurationState.Instance.UI.StartFullscreen)
{
_startFullScreen.Active = true;
}
_showConsole.Active = ConfigurationState.Instance.Ui.ShowConsole.Value;
_showConsole.Active = ConfigurationState.Instance.UI.ShowConsole.Value;
_showConsole.Visible = ConsoleHelper.SetConsoleWindowStateSupported;
_actionMenu.Sensitive = false;
_pauseEmulation.Sensitive = false;
_resumeEmulation.Sensitive = false;
_nspShown.Active = ConfigurationState.Instance.Ui.ShownFileTypes.NSP.Value;
_pfs0Shown.Active = ConfigurationState.Instance.Ui.ShownFileTypes.PFS0.Value;
_xciShown.Active = ConfigurationState.Instance.Ui.ShownFileTypes.XCI.Value;
_ncaShown.Active = ConfigurationState.Instance.Ui.ShownFileTypes.NCA.Value;
_nroShown.Active = ConfigurationState.Instance.Ui.ShownFileTypes.NRO.Value;
_nsoShown.Active = ConfigurationState.Instance.Ui.ShownFileTypes.NSO.Value;
_nspShown.Active = ConfigurationState.Instance.UI.ShownFileTypes.NSP.Value;
_pfs0Shown.Active = ConfigurationState.Instance.UI.ShownFileTypes.PFS0.Value;
_xciShown.Active = ConfigurationState.Instance.UI.ShownFileTypes.XCI.Value;
_ncaShown.Active = ConfigurationState.Instance.UI.ShownFileTypes.NCA.Value;
_nroShown.Active = ConfigurationState.Instance.UI.ShownFileTypes.NRO.Value;
_nsoShown.Active = ConfigurationState.Instance.UI.ShownFileTypes.NSO.Value;
_nspShown.Toggled += NSP_Shown_Toggled;
_pfs0Shown.Toggled += PFS0_Shown_Toggled;
@ -238,43 +238,43 @@ namespace Ryujinx.Ui
_fileTypesSubMenu.Visible = FileAssociationHelper.IsTypeAssociationSupported;
if (ConfigurationState.Instance.Ui.GuiColumns.FavColumn)
if (ConfigurationState.Instance.UI.GuiColumns.FavColumn)
{
_favToggle.Active = true;
}
if (ConfigurationState.Instance.Ui.GuiColumns.IconColumn)
if (ConfigurationState.Instance.UI.GuiColumns.IconColumn)
{
_iconToggle.Active = true;
}
if (ConfigurationState.Instance.Ui.GuiColumns.AppColumn)
if (ConfigurationState.Instance.UI.GuiColumns.AppColumn)
{
_appToggle.Active = true;
}
if (ConfigurationState.Instance.Ui.GuiColumns.DevColumn)
if (ConfigurationState.Instance.UI.GuiColumns.DevColumn)
{
_developerToggle.Active = true;
}
if (ConfigurationState.Instance.Ui.GuiColumns.VersionColumn)
if (ConfigurationState.Instance.UI.GuiColumns.VersionColumn)
{
_versionToggle.Active = true;
}
if (ConfigurationState.Instance.Ui.GuiColumns.TimePlayedColumn)
if (ConfigurationState.Instance.UI.GuiColumns.TimePlayedColumn)
{
_timePlayedToggle.Active = true;
}
if (ConfigurationState.Instance.Ui.GuiColumns.LastPlayedColumn)
if (ConfigurationState.Instance.UI.GuiColumns.LastPlayedColumn)
{
_lastPlayedToggle.Active = true;
}
if (ConfigurationState.Instance.Ui.GuiColumns.FileExtColumn)
if (ConfigurationState.Instance.UI.GuiColumns.FileExtColumn)
{
_fileExtToggle.Active = true;
}
if (ConfigurationState.Instance.Ui.GuiColumns.FileSizeColumn)
if (ConfigurationState.Instance.UI.GuiColumns.FileSizeColumn)
{
_fileSizeToggle.Active = true;
}
if (ConfigurationState.Instance.Ui.GuiColumns.PathColumn)
if (ConfigurationState.Instance.UI.GuiColumns.PathColumn)
{
_pathToggle.Active = true;
}
@ -307,8 +307,8 @@ namespace Ryujinx.Ui
_tableStore.SetSortFunc(6, SortHelper.LastPlayedSort);
_tableStore.SetSortFunc(8, SortHelper.FileSizeSort);
int columnId = ConfigurationState.Instance.Ui.ColumnSort.SortColumnId;
bool ascending = ConfigurationState.Instance.Ui.ColumnSort.SortAscending;
int columnId = ConfigurationState.Instance.UI.ColumnSort.SortColumnId;
bool ascending = ConfigurationState.Instance.UI.ColumnSort.SortAscending;
_tableStore.SetSortColumnId(columnId, ascending ? SortType.Ascending : SortType.Descending);
@ -316,12 +316,12 @@ namespace Ryujinx.Ui
_gameTable.SearchColumn = 2;
_gameTable.SearchEqualFunc = (model, col, key, iter) => !((string)model.GetValue(iter, col)).Contains(key, StringComparison.InvariantCultureIgnoreCase);
_hideUi.Label = _hideUi.Label.Replace("SHOWUIKEY", ConfigurationState.Instance.Hid.Hotkeys.Value.ShowUi.ToString());
_hideUI.Label = _hideUI.Label.Replace("SHOWUIKEY", ConfigurationState.Instance.Hid.Hotkeys.Value.ShowUI.ToString());
UpdateColumns();
UpdateGameTable();
ConfigurationState.Instance.Ui.GameDirs.Event += (sender, args) =>
ConfigurationState.Instance.UI.GameDirs.Event += (sender, args) =>
{
if (args.OldValue != args.NewValue)
{
@ -401,43 +401,43 @@ namespace Ryujinx.Ui
CellRendererToggle favToggle = new();
favToggle.Toggled += FavToggle_Toggled;
if (ConfigurationState.Instance.Ui.GuiColumns.FavColumn)
if (ConfigurationState.Instance.UI.GuiColumns.FavColumn)
{
_gameTable.AppendColumn("Fav", favToggle, "active", 0);
}
if (ConfigurationState.Instance.Ui.GuiColumns.IconColumn)
if (ConfigurationState.Instance.UI.GuiColumns.IconColumn)
{
_gameTable.AppendColumn("Icon", new CellRendererPixbuf(), "pixbuf", 1);
}
if (ConfigurationState.Instance.Ui.GuiColumns.AppColumn)
if (ConfigurationState.Instance.UI.GuiColumns.AppColumn)
{
_gameTable.AppendColumn("Application", new CellRendererText(), "text", 2);
}
if (ConfigurationState.Instance.Ui.GuiColumns.DevColumn)
if (ConfigurationState.Instance.UI.GuiColumns.DevColumn)
{
_gameTable.AppendColumn("Developer", new CellRendererText(), "text", 3);
}
if (ConfigurationState.Instance.Ui.GuiColumns.VersionColumn)
if (ConfigurationState.Instance.UI.GuiColumns.VersionColumn)
{
_gameTable.AppendColumn("Version", new CellRendererText(), "text", 4);
}
if (ConfigurationState.Instance.Ui.GuiColumns.TimePlayedColumn)
if (ConfigurationState.Instance.UI.GuiColumns.TimePlayedColumn)
{
_gameTable.AppendColumn("Time Played", new CellRendererText(), "text", 5);
}
if (ConfigurationState.Instance.Ui.GuiColumns.LastPlayedColumn)
if (ConfigurationState.Instance.UI.GuiColumns.LastPlayedColumn)
{
_gameTable.AppendColumn("Last Played", new CellRendererText(), "text", 6);
}
if (ConfigurationState.Instance.Ui.GuiColumns.FileExtColumn)
if (ConfigurationState.Instance.UI.GuiColumns.FileExtColumn)
{
_gameTable.AppendColumn("File Ext", new CellRendererText(), "text", 7);
}
if (ConfigurationState.Instance.Ui.GuiColumns.FileSizeColumn)
if (ConfigurationState.Instance.UI.GuiColumns.FileSizeColumn)
{
_gameTable.AppendColumn("File Size", new CellRendererText(), "text", 8);
}
if (ConfigurationState.Instance.Ui.GuiColumns.PathColumn)
if (ConfigurationState.Instance.UI.GuiColumns.PathColumn)
{
_gameTable.AppendColumn("Path", new CellRendererText(), "text", 9);
}
@ -679,7 +679,7 @@ namespace Ryujinx.Ui
return new SurfaceKHR((ulong)((VulkanRenderer)RendererWidget).CreateWindowSurface(instance.Handle));
}
private void SetupProgressUiHandlers()
private void SetupProgressUIHandlers()
{
if (_emulationContext.Processes.ActiveApplication.DiskCacheLoadState != null)
{
@ -732,7 +732,7 @@ namespace Ryujinx.Ui
Thread applicationLibraryThread = new(() =>
{
_applicationLibrary.LoadApplications(ConfigurationState.Instance.Ui.GameDirs, ConfigurationState.Instance.System.Language);
_applicationLibrary.LoadApplications(ConfigurationState.Instance.UI.GameDirs, ConfigurationState.Instance.System.Language);
_updatingGameTable = false;
})
@ -924,7 +924,7 @@ namespace Ryujinx.Ui
return;
}
SetupProgressUiHandlers();
SetupProgressUIHandlers();
_currentEmulatedGamePath = path;
@ -981,7 +981,7 @@ namespace Ryujinx.Ui
{
ToggleExtraWidgets(false);
}
else if (startFullscreen || ConfigurationState.Instance.Ui.StartFullscreen.Value)
else if (startFullscreen || ConfigurationState.Instance.UI.StartFullscreen.Value)
{
FullScreen_Toggled(null, null);
}
@ -1243,8 +1243,8 @@ namespace Ryujinx.Ui
{
TreeViewColumn column = (TreeViewColumn)sender;
ConfigurationState.Instance.Ui.ColumnSort.SortColumnId.Value = column.SortColumnId;
ConfigurationState.Instance.Ui.ColumnSort.SortAscending.Value = column.SortOrder == SortType.Ascending;
ConfigurationState.Instance.UI.ColumnSort.SortColumnId.Value = column.SortColumnId;
ConfigurationState.Instance.UI.ColumnSort.SortAscending.Value = column.SortOrder == SortType.Ascending;
SaveConfig();
}
@ -1407,12 +1407,12 @@ namespace Ryujinx.Ui
private void SetWindowSizePosition()
{
DefaultWidth = ConfigurationState.Instance.Ui.WindowStartup.WindowSizeWidth;
DefaultHeight = ConfigurationState.Instance.Ui.WindowStartup.WindowSizeHeight;
DefaultWidth = ConfigurationState.Instance.UI.WindowStartup.WindowSizeWidth;
DefaultHeight = ConfigurationState.Instance.UI.WindowStartup.WindowSizeHeight;
Move(ConfigurationState.Instance.Ui.WindowStartup.WindowPositionX, ConfigurationState.Instance.Ui.WindowStartup.WindowPositionY);
Move(ConfigurationState.Instance.UI.WindowStartup.WindowPositionX, ConfigurationState.Instance.UI.WindowStartup.WindowPositionY);
if (ConfigurationState.Instance.Ui.WindowStartup.WindowMaximized)
if (ConfigurationState.Instance.UI.WindowStartup.WindowMaximized)
{
Maximize();
}
@ -1423,11 +1423,11 @@ namespace Ryujinx.Ui
GetSize(out int windowWidth, out int windowHeight);
GetPosition(out int windowXPos, out int windowYPos);
ConfigurationState.Instance.Ui.WindowStartup.WindowMaximized.Value = IsMaximized;
ConfigurationState.Instance.Ui.WindowStartup.WindowSizeWidth.Value = windowWidth;
ConfigurationState.Instance.Ui.WindowStartup.WindowSizeHeight.Value = windowHeight;
ConfigurationState.Instance.Ui.WindowStartup.WindowPositionX.Value = windowXPos;
ConfigurationState.Instance.Ui.WindowStartup.WindowPositionY.Value = windowYPos;
ConfigurationState.Instance.UI.WindowStartup.WindowMaximized.Value = IsMaximized;
ConfigurationState.Instance.UI.WindowStartup.WindowSizeWidth.Value = windowWidth;
ConfigurationState.Instance.UI.WindowStartup.WindowSizeHeight.Value = windowHeight;
ConfigurationState.Instance.UI.WindowStartup.WindowPositionX.Value = windowXPos;
ConfigurationState.Instance.UI.WindowStartup.WindowPositionY.Value = windowYPos;
SaveConfig();
}
@ -1677,14 +1677,14 @@ namespace Ryujinx.Ui
private void StartFullScreen_Toggled(object sender, EventArgs args)
{
ConfigurationState.Instance.Ui.StartFullscreen.Value = _startFullScreen.Active;
ConfigurationState.Instance.UI.StartFullscreen.Value = _startFullScreen.Active;
SaveConfig();
}
private void ShowConsole_Toggled(object sender, EventArgs args)
{
ConfigurationState.Instance.Ui.ShowConsole.Value = _showConsole.Active;
ConfigurationState.Instance.UI.ShowConsole.Value = _showConsole.Active;
SaveConfig();
}
@ -1702,7 +1702,7 @@ namespace Ryujinx.Ui
settingsWindow.Show();
}
private void HideUi_Pressed(object sender, EventArgs args)
private void HideUI_Pressed(object sender, EventArgs args)
{
ToggleExtraWidgets(false);
}
@ -1807,7 +1807,7 @@ namespace Ryujinx.Ui
private void Fav_Toggled(object sender, EventArgs args)
{
ConfigurationState.Instance.Ui.GuiColumns.FavColumn.Value = _favToggle.Active;
ConfigurationState.Instance.UI.GuiColumns.FavColumn.Value = _favToggle.Active;
SaveConfig();
UpdateColumns();
@ -1815,7 +1815,7 @@ namespace Ryujinx.Ui
private void Icon_Toggled(object sender, EventArgs args)
{
ConfigurationState.Instance.Ui.GuiColumns.IconColumn.Value = _iconToggle.Active;
ConfigurationState.Instance.UI.GuiColumns.IconColumn.Value = _iconToggle.Active;
SaveConfig();
UpdateColumns();
@ -1823,7 +1823,7 @@ namespace Ryujinx.Ui
private void App_Toggled(object sender, EventArgs args)
{
ConfigurationState.Instance.Ui.GuiColumns.AppColumn.Value = _appToggle.Active;
ConfigurationState.Instance.UI.GuiColumns.AppColumn.Value = _appToggle.Active;
SaveConfig();
UpdateColumns();
@ -1831,7 +1831,7 @@ namespace Ryujinx.Ui
private void Developer_Toggled(object sender, EventArgs args)
{
ConfigurationState.Instance.Ui.GuiColumns.DevColumn.Value = _developerToggle.Active;
ConfigurationState.Instance.UI.GuiColumns.DevColumn.Value = _developerToggle.Active;
SaveConfig();
UpdateColumns();
@ -1839,7 +1839,7 @@ namespace Ryujinx.Ui
private void Version_Toggled(object sender, EventArgs args)
{
ConfigurationState.Instance.Ui.GuiColumns.VersionColumn.Value = _versionToggle.Active;
ConfigurationState.Instance.UI.GuiColumns.VersionColumn.Value = _versionToggle.Active;
SaveConfig();
UpdateColumns();
@ -1847,7 +1847,7 @@ namespace Ryujinx.Ui
private void TimePlayed_Toggled(object sender, EventArgs args)
{
ConfigurationState.Instance.Ui.GuiColumns.TimePlayedColumn.Value = _timePlayedToggle.Active;
ConfigurationState.Instance.UI.GuiColumns.TimePlayedColumn.Value = _timePlayedToggle.Active;
SaveConfig();
UpdateColumns();
@ -1855,7 +1855,7 @@ namespace Ryujinx.Ui
private void LastPlayed_Toggled(object sender, EventArgs args)
{
ConfigurationState.Instance.Ui.GuiColumns.LastPlayedColumn.Value = _lastPlayedToggle.Active;
ConfigurationState.Instance.UI.GuiColumns.LastPlayedColumn.Value = _lastPlayedToggle.Active;
SaveConfig();
UpdateColumns();
@ -1863,7 +1863,7 @@ namespace Ryujinx.Ui
private void FileExt_Toggled(object sender, EventArgs args)
{
ConfigurationState.Instance.Ui.GuiColumns.FileExtColumn.Value = _fileExtToggle.Active;
ConfigurationState.Instance.UI.GuiColumns.FileExtColumn.Value = _fileExtToggle.Active;
SaveConfig();
UpdateColumns();
@ -1871,7 +1871,7 @@ namespace Ryujinx.Ui
private void FileSize_Toggled(object sender, EventArgs args)
{
ConfigurationState.Instance.Ui.GuiColumns.FileSizeColumn.Value = _fileSizeToggle.Active;
ConfigurationState.Instance.UI.GuiColumns.FileSizeColumn.Value = _fileSizeToggle.Active;
SaveConfig();
UpdateColumns();
@ -1879,7 +1879,7 @@ namespace Ryujinx.Ui
private void Path_Toggled(object sender, EventArgs args)
{
ConfigurationState.Instance.Ui.GuiColumns.PathColumn.Value = _pathToggle.Active;
ConfigurationState.Instance.UI.GuiColumns.PathColumn.Value = _pathToggle.Active;
SaveConfig();
UpdateColumns();
@ -1887,7 +1887,7 @@ namespace Ryujinx.Ui
private void NSP_Shown_Toggled(object sender, EventArgs args)
{
ConfigurationState.Instance.Ui.ShownFileTypes.NSP.Value = _nspShown.Active;
ConfigurationState.Instance.UI.ShownFileTypes.NSP.Value = _nspShown.Active;
SaveConfig();
UpdateGameTable();
@ -1895,7 +1895,7 @@ namespace Ryujinx.Ui
private void PFS0_Shown_Toggled(object sender, EventArgs args)
{
ConfigurationState.Instance.Ui.ShownFileTypes.PFS0.Value = _pfs0Shown.Active;
ConfigurationState.Instance.UI.ShownFileTypes.PFS0.Value = _pfs0Shown.Active;
SaveConfig();
UpdateGameTable();
@ -1903,7 +1903,7 @@ namespace Ryujinx.Ui
private void XCI_Shown_Toggled(object sender, EventArgs args)
{
ConfigurationState.Instance.Ui.ShownFileTypes.XCI.Value = _xciShown.Active;
ConfigurationState.Instance.UI.ShownFileTypes.XCI.Value = _xciShown.Active;
SaveConfig();
UpdateGameTable();
@ -1911,7 +1911,7 @@ namespace Ryujinx.Ui
private void NCA_Shown_Toggled(object sender, EventArgs args)
{
ConfigurationState.Instance.Ui.ShownFileTypes.NCA.Value = _ncaShown.Active;
ConfigurationState.Instance.UI.ShownFileTypes.NCA.Value = _ncaShown.Active;
SaveConfig();
UpdateGameTable();
@ -1919,7 +1919,7 @@ namespace Ryujinx.Ui
private void NRO_Shown_Toggled(object sender, EventArgs args)
{
ConfigurationState.Instance.Ui.ShownFileTypes.NRO.Value = _nroShown.Active;
ConfigurationState.Instance.UI.ShownFileTypes.NRO.Value = _nroShown.Active;
SaveConfig();
UpdateGameTable();
@ -1927,7 +1927,7 @@ namespace Ryujinx.Ui
private void NSO_Shown_Toggled(object sender, EventArgs args)
{
ConfigurationState.Instance.Ui.ShownFileTypes.NSO.Value = _nsoShown.Active;
ConfigurationState.Instance.UI.ShownFileTypes.NSO.Value = _nsoShown.Active;
SaveConfig();
UpdateGameTable();

4
src/Ryujinx/Ui/MainWindow.glade → src/Ryujinx/UI/MainWindow.glade
View file

@ -437,12 +437,12 @@
</object>
</child>
<child>
<object class="GtkMenuItem" id="_hideUi">
<object class="GtkMenuItem" id="_hideUI">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="label" translatable="yes">Hide UI (SHOWUIKEY to show)</property>
<property name="use-underline">True</property>
<signal name="activate" handler="HideUi_Pressed" swapped="no"/>
<signal name="activate" handler="HideUI_Pressed" swapped="no"/>
</object>
</child>
<child>

6
src/Ryujinx/Ui/OpenGLRenderer.cs → src/Ryujinx/UI/OpenGLRenderer.cs
View file

@ -12,7 +12,7 @@ using SPB.Windowing;
using System;
using System.Runtime.InteropServices;
namespace Ryujinx.Ui
namespace Ryujinx.UI
{
public partial class OpenGLRenderer : RendererWidgetBase
{
@ -120,7 +120,7 @@ namespace Ryujinx.Ui
}
catch (ContextException e)
{
Logger.Warning?.Print(LogClass.Ui, $"Failed to bind OpenGL context: {e}");
Logger.Warning?.Print(LogClass.UI, $"Failed to bind OpenGL context: {e}");
}
Device?.DisposeGpu();
@ -133,7 +133,7 @@ namespace Ryujinx.Ui
}
catch (ContextException e)
{
Logger.Warning?.Print(LogClass.Ui, $"Failed to unbind OpenGL context: {e}");
Logger.Warning?.Print(LogClass.UI, $"Failed to unbind OpenGL context: {e}");
}
_openGLContext?.Dispose();

2
src/Ryujinx/Ui/OpenToolkitBindingsContext.cs → src/Ryujinx/UI/OpenToolkitBindingsContext.cs
View file

@ -1,7 +1,7 @@
using SPB.Graphics;
using System;
namespace Ryujinx.Ui
namespace Ryujinx.UI
{
public class OpenToolkitBindingsContext : OpenTK.IBindingsContext
{

18
src/Ryujinx/Ui/RendererWidgetBase.cs → src/Ryujinx/UI/RendererWidgetBase.cs
View file

@ -9,9 +9,9 @@ using Ryujinx.Graphics.Gpu;
using Ryujinx.Input;
using Ryujinx.Input.GTK3;
using Ryujinx.Input.HLE;
using Ryujinx.Ui.Common.Configuration;
using Ryujinx.Ui.Common.Helper;
using Ryujinx.Ui.Widgets;
using Ryujinx.UI.Common.Configuration;
using Ryujinx.UI.Common.Helper;
using Ryujinx.UI.Widgets;
using SixLabors.ImageSharp;
using SixLabors.ImageSharp.Formats.Png;
using SixLabors.ImageSharp.PixelFormats;
@ -26,7 +26,7 @@ using Key = Ryujinx.Input.Key;
using ScalingFilter = Ryujinx.Graphics.GAL.ScalingFilter;
using Switch = Ryujinx.HLE.Switch;
namespace Ryujinx.Ui
namespace Ryujinx.UI
{
public abstract class RendererWidgetBase : DrawingArea
{
@ -659,8 +659,8 @@ namespace Ryujinx.Ui
Renderer.Screenshot();
}
if (currentHotkeyState.HasFlag(KeyboardHotkeyState.ShowUi) &&
!_prevHotkeyState.HasFlag(KeyboardHotkeyState.ShowUi))
if (currentHotkeyState.HasFlag(KeyboardHotkeyState.ShowUI) &&
!_prevHotkeyState.HasFlag(KeyboardHotkeyState.ShowUI))
{
(Toplevel as MainWindow).ToggleExtraWidgets(true);
}
@ -739,7 +739,7 @@ namespace Ryujinx.Ui
None = 0,
ToggleVSync = 1 << 0,
Screenshot = 1 << 1,
ShowUi = 1 << 2,
ShowUI = 1 << 2,
Pause = 1 << 3,
ToggleMute = 1 << 4,
ResScaleUp = 1 << 5,
@ -762,9 +762,9 @@ namespace Ryujinx.Ui
state |= KeyboardHotkeyState.Screenshot;
}
if (_keyboardInterface.IsPressed((Key)ConfigurationState.Instance.Hid.Hotkeys.Value.ShowUi))
if (_keyboardInterface.IsPressed((Key)ConfigurationState.Instance.Hid.Hotkeys.Value.ShowUI))
{
state |= KeyboardHotkeyState.ShowUi;
state |= KeyboardHotkeyState.ShowUI;
}
if (_keyboardInterface.IsPressed((Key)ConfigurationState.Instance.Hid.Hotkeys.Value.Pause))

2
src/Ryujinx/Ui/SPBOpenGLContext.cs → src/Ryujinx/UI/SPBOpenGLContext.cs
View file

@ -5,7 +5,7 @@ using SPB.Graphics.OpenGL;
using SPB.Platform;
using SPB.Windowing;
namespace Ryujinx.Ui
namespace Ryujinx.UI
{
class SPBOpenGLContext : IOpenGLContext
{

2
src/Ryujinx/Ui/StatusUpdatedEventArgs.cs → src/Ryujinx/UI/StatusUpdatedEventArgs.cs
View file

@ -1,6 +1,6 @@
using System;
namespace Ryujinx.Ui
namespace Ryujinx.UI
{
public class StatusUpdatedEventArgs : EventArgs
{

4
src/Ryujinx/Ui/VulkanRenderer.cs → src/Ryujinx/UI/VulkanRenderer.cs
View file

@ -1,7 +1,7 @@
using Gdk;
using Ryujinx.Common.Configuration;
using Ryujinx.Input.HLE;
using Ryujinx.Ui.Helper;
using Ryujinx.UI.Helper;
using SPB.Graphics.Vulkan;
using SPB.Platform.Metal;
using SPB.Platform.Win32;
@ -10,7 +10,7 @@ using SPB.Windowing;
using System;
using System.Runtime.InteropServices;
namespace Ryujinx.Ui
namespace Ryujinx.UI
{
public partial class VulkanRenderer : RendererWidgetBase
{

2
src/Ryujinx/Ui/Widgets/GameTableContextMenu.Designer.cs → src/Ryujinx/UI/Widgets/GameTableContextMenu.Designer.cs generated
View file

@ -1,7 +1,7 @@
using Gtk;
using System;
namespace Ryujinx.Ui.Widgets
namespace Ryujinx.UI.Widgets
{
public partial class GameTableContextMenu : Menu
{

14
src/Ryujinx/Ui/Widgets/GameTableContextMenu.cs → src/Ryujinx/UI/Widgets/GameTableContextMenu.cs
View file

@ -16,10 +16,10 @@ using Ryujinx.Common.Logging;
using Ryujinx.HLE.FileSystem;
using Ryujinx.HLE.HOS;
using Ryujinx.HLE.HOS.Services.Account.Acc;
using Ryujinx.Ui.App.Common;
using Ryujinx.Ui.Common.Configuration;
using Ryujinx.Ui.Common.Helper;
using Ryujinx.Ui.Windows;
using Ryujinx.UI.App.Common;
using Ryujinx.UI.Common.Configuration;
using Ryujinx.UI.Common.Helper;
using Ryujinx.UI.Windows;
using System;
using System.Buffers;
using System.Collections.Generic;
@ -28,7 +28,7 @@ using System.IO;
using System.Reflection;
using System.Threading;
namespace Ryujinx.Ui.Widgets
namespace Ryujinx.UI.Widgets
{
public partial class GameTableContextMenu : Menu
{
@ -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.UI.Common.Resources.Logo_Ryujinx.png"),
SecondaryText = $"Extracting {ncaSectionType} section from {System.IO.Path.GetFileName(_titleFilePath)}...",
WindowPosition = WindowPosition.Center,
};
@ -320,7 +320,7 @@ namespace Ryujinx.Ui.Widgets
MessageDialog dialog = new(null, DialogFlags.DestroyWithParent, MessageType.Info, ButtonsType.Ok, 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.UI.Common.Resources.Logo_Ryujinx.png"),
SecondaryText = "Extraction completed successfully.",
WindowPosition = WindowPosition.Center,
};

6
src/Ryujinx/Ui/Widgets/GtkDialog.cs → src/Ryujinx/UI/Widgets/GtkDialog.cs
View file

@ -1,10 +1,10 @@
using Gtk;
using Ryujinx.Common.Logging;
using Ryujinx.Ui.Common.Configuration;
using Ryujinx.UI.Common.Configuration;
using System.Collections.Generic;
using System.Reflection;
namespace Ryujinx.Ui.Widgets
namespace Ryujinx.UI.Widgets
{
internal class GtkDialog : MessageDialog
{
@ -14,7 +14,7 @@ namespace Ryujinx.Ui.Widgets
: base(null, DialogFlags.Modal, messageType, buttonsType, null)
{
Title = title;
Icon = new Gdk.Pixbuf(Assembly.GetAssembly(typeof(ConfigurationState)), "Ryujinx.Ui.Common.Resources.Logo_Ryujinx.png");
Icon = new Gdk.Pixbuf(Assembly.GetAssembly(typeof(ConfigurationState)), "Ryujinx.UI.Common.Resources.Logo_Ryujinx.png");
Text = mainText;
SecondaryText = secondaryText;
WindowPosition = WindowPosition.Center;

2
src/Ryujinx/Ui/Widgets/GtkInputDialog.cs → src/Ryujinx/UI/Widgets/GtkInputDialog.cs
View file

@ -1,6 +1,6 @@
using Gtk;
namespace Ryujinx.Ui.Widgets
namespace Ryujinx.UI.Widgets
{
public class GtkInputDialog : MessageDialog
{

8
src/Ryujinx/Ui/Widgets/ProfileDialog.cs → src/Ryujinx/UI/Widgets/ProfileDialog.cs
View file

@ -1,10 +1,10 @@
using Gtk;
using Ryujinx.Ui.Common.Configuration;
using Ryujinx.UI.Common.Configuration;
using System;
using System.Reflection;
using GUI = Gtk.Builder.ObjectAttribute;
namespace Ryujinx.Ui.Widgets
namespace Ryujinx.UI.Widgets
{
public class ProfileDialog : Dialog
{
@ -15,12 +15,12 @@ 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.UI.Widgets.ProfileDialog.glade")) { }
private ProfileDialog(Builder builder) : base(builder.GetRawOwnedObject("_profileDialog"))
{
builder.Autoconnect(this);
Icon = new Gdk.Pixbuf(Assembly.GetAssembly(typeof(ConfigurationState)), "Ryujinx.Ui.Common.Resources.Logo_Ryujinx.png");
Icon = new Gdk.Pixbuf(Assembly.GetAssembly(typeof(ConfigurationState)), "Ryujinx.UI.Common.Resources.Logo_Ryujinx.png");
}
private void OkToggle_Activated(object sender, EventArgs args)

0
src/Ryujinx/Ui/Widgets/ProfileDialog.glade → src/Ryujinx/UI/Widgets/ProfileDialog.glade
View file

2
src/Ryujinx/Ui/Widgets/RawInputToTextEntry.cs → src/Ryujinx/UI/Widgets/RawInputToTextEntry.cs
View file

@ -1,6 +1,6 @@
using Gtk;
namespace Ryujinx.Ui.Widgets
namespace Ryujinx.UI.Widgets
{
public class RawInputToTextEntry : Entry
{

6
src/Ryujinx/Ui/Widgets/UserErrorDialog.cs → src/Ryujinx/UI/Widgets/UserErrorDialog.cs
View file

@ -1,8 +1,8 @@
using Gtk;
using Ryujinx.Ui.Common;
using Ryujinx.Ui.Common.Helper;
using Ryujinx.UI.Common;
using Ryujinx.UI.Common.Helper;
namespace Ryujinx.Ui.Widgets
namespace Ryujinx.UI.Widgets
{
internal class UserErrorDialog : MessageDialog
{

14
src/Ryujinx/Ui/Windows/AboutWindow.Designer.cs → src/Ryujinx/UI/Windows/AboutWindow.Designer.cs generated
View file

@ -1,9 +1,9 @@
using Gtk;
using Pango;
using Ryujinx.Ui.Common.Configuration;
using Ryujinx.UI.Common.Configuration;
using System.Reflection;
namespace Ryujinx.Ui.Windows
namespace Ryujinx.UI.Windows
{
public partial class AboutWindow : Window
{
@ -88,7 +88,7 @@ namespace Ryujinx.Ui.Windows
//
// _ryujinxLogo
//
_ryujinxLogo = new Image(new Gdk.Pixbuf(Assembly.GetAssembly(typeof(ConfigurationState)), "Ryujinx.Ui.Common.Resources.Logo_Ryujinx.png", 100, 100))
_ryujinxLogo = new Image(new Gdk.Pixbuf(Assembly.GetAssembly(typeof(ConfigurationState)), "Ryujinx.UI.Common.Resources.Logo_Ryujinx.png", 100, 100))
{
Margin = 10,
MarginStart = 15,
@ -223,7 +223,7 @@ namespace Ryujinx.Ui.Windows
//
// _patreonLogo
//
_patreonLogo = new Image(new Gdk.Pixbuf(Assembly.GetAssembly(typeof(ConfigurationState)), "Ryujinx.Ui.Common.Resources.Logo_Patreon_Light.png", 30, 30))
_patreonLogo = new Image(new Gdk.Pixbuf(Assembly.GetAssembly(typeof(ConfigurationState)), "Ryujinx.UI.Common.Resources.Logo_Patreon_Light.png", 30, 30))
{
Margin = 10,
};
@ -253,7 +253,7 @@ namespace Ryujinx.Ui.Windows
//
// _githubLogo
//
_githubLogo = new Image(new Gdk.Pixbuf(Assembly.GetAssembly(typeof(ConfigurationState)), "Ryujinx.Ui.Common.Resources.Logo_GitHub_Light.png", 30, 30))
_githubLogo = new Image(new Gdk.Pixbuf(Assembly.GetAssembly(typeof(ConfigurationState)), "Ryujinx.UI.Common.Resources.Logo_GitHub_Light.png", 30, 30))
{
Margin = 10,
};
@ -283,7 +283,7 @@ namespace Ryujinx.Ui.Windows
//
// _discordLogo
//
_discordLogo = new Image(new Gdk.Pixbuf(Assembly.GetAssembly(typeof(ConfigurationState)), "Ryujinx.Ui.Common.Resources.Logo_Discord_Light.png", 30, 30))
_discordLogo = new Image(new Gdk.Pixbuf(Assembly.GetAssembly(typeof(ConfigurationState)), "Ryujinx.UI.Common.Resources.Logo_Discord_Light.png", 30, 30))
{
Margin = 10,
};
@ -313,7 +313,7 @@ namespace Ryujinx.Ui.Windows
//
// _twitterLogo
//
_twitterLogo = new Image(new Gdk.Pixbuf(Assembly.GetAssembly(typeof(ConfigurationState)), "Ryujinx.Ui.Common.Resources.Logo_Twitter_Light.png", 30, 30))
_twitterLogo = new Image(new Gdk.Pixbuf(Assembly.GetAssembly(typeof(ConfigurationState)), "Ryujinx.UI.Common.Resources.Logo_Twitter_Light.png", 30, 30))
{
Margin = 10,
};

6
src/Ryujinx/Ui/Windows/AboutWindow.cs → src/Ryujinx/UI/Windows/AboutWindow.cs
View file

@ -1,18 +1,18 @@
using Gtk;
using Ryujinx.Common.Utilities;
using Ryujinx.Ui.Common.Helper;
using Ryujinx.UI.Common.Helper;
using System.Net.Http;
using System.Net.NetworkInformation;
using System.Reflection;
using System.Threading.Tasks;
namespace Ryujinx.Ui.Windows
namespace Ryujinx.UI.Windows
{
public partial class AboutWindow : Window
{
public AboutWindow() : base($"Ryujinx {Program.Version} - About")
{
Icon = new Gdk.Pixbuf(Assembly.GetAssembly(typeof(OpenHelper)), "Ryujinx.Ui.Common.Resources.Logo_Ryujinx.png");
Icon = new Gdk.Pixbuf(Assembly.GetAssembly(typeof(OpenHelper)), "Ryujinx.UI.Common.Resources.Logo_Ryujinx.png");
InitializeComponent();
_ = DownloadPatronsJson();

2
src/Ryujinx/Ui/Windows/AmiiboWindow.Designer.cs → src/Ryujinx/UI/Windows/AmiiboWindow.Designer.cs generated
View file

@ -1,6 +1,6 @@
using Gtk;
namespace Ryujinx.Ui.Windows
namespace Ryujinx.UI.Windows
{
public partial class AmiiboWindow : Window
{

12
src/Ryujinx/Ui/Windows/AmiiboWindow.cs → src/Ryujinx/UI/Windows/AmiiboWindow.cs
View file

@ -4,9 +4,9 @@ using Ryujinx.Common;
using Ryujinx.Common.Configuration;
using Ryujinx.Common.Logging;
using Ryujinx.Common.Utilities;
using Ryujinx.Ui.Common.Configuration;
using Ryujinx.Ui.Common.Models.Amiibo;
using Ryujinx.Ui.Widgets;
using Ryujinx.UI.Common.Configuration;
using Ryujinx.UI.Common.Models.Amiibo;
using Ryujinx.UI.Widgets;
using System;
using System.Collections.Generic;
using System.IO;
@ -18,7 +18,7 @@ using System.Text.Json;
using System.Threading.Tasks;
using Window = Gtk.Window;
namespace Ryujinx.Ui.Windows
namespace Ryujinx.UI.Windows
{
public partial class AmiiboWindow : Window
{
@ -52,7 +52,7 @@ namespace Ryujinx.Ui.Windows
public AmiiboWindow() : base($"Ryujinx {Program.Version} - Amiibo")
{
Icon = new Pixbuf(Assembly.GetAssembly(typeof(ConfigurationState)), "Ryujinx.Ui.Common.Resources.Logo_Ryujinx.png");
Icon = new Pixbuf(Assembly.GetAssembly(typeof(ConfigurationState)), "Ryujinx.UI.Common.Resources.Logo_Ryujinx.png");
InitializeComponent();
@ -66,7 +66,7 @@ namespace Ryujinx.Ui.Windows
_amiiboJsonPath = System.IO.Path.Join(AppDataManager.BaseDirPath, "system", "amiibo", "Amiibo.json");
_amiiboList = new List<AmiiboApi>();
_amiiboLogoBytes = EmbeddedResources.Read("Ryujinx.Ui.Common/Resources/Logo_Amiibo.png");
_amiiboLogoBytes = EmbeddedResources.Read("Ryujinx.UI.Common/Resources/Logo_Amiibo.png");
_amiiboImage.Pixbuf = new Pixbuf(_amiiboLogoBytes);
_scanButton.Sensitive = false;

6
src/Ryujinx/Ui/Windows/AvatarWindow.cs → src/Ryujinx/UI/Windows/AvatarWindow.cs
View file

@ -8,7 +8,7 @@ using LibHac.Tools.FsSystem;
using LibHac.Tools.FsSystem.NcaUtils;
using Ryujinx.Common.Memory;
using Ryujinx.HLE.FileSystem;
using Ryujinx.Ui.Common.Configuration;
using Ryujinx.UI.Common.Configuration;
using SixLabors.ImageSharp;
using SixLabors.ImageSharp.Formats.Png;
using SixLabors.ImageSharp.PixelFormats;
@ -20,7 +20,7 @@ using System.IO;
using System.Reflection;
using Image = SixLabors.ImageSharp.Image;
namespace Ryujinx.Ui.Windows
namespace Ryujinx.UI.Windows
{
public class AvatarWindow : Window
{
@ -36,7 +36,7 @@ namespace Ryujinx.Ui.Windows
public AvatarWindow() : base($"Ryujinx {Program.Version} - Manage Accounts - Avatar")
{
Icon = new Gdk.Pixbuf(Assembly.GetAssembly(typeof(ConfigurationState)), "Ryujinx.Ui.Common.Resources.Logo_Ryujinx.png");
Icon = new Gdk.Pixbuf(Assembly.GetAssembly(typeof(ConfigurationState)), "Ryujinx.UI.Common.Resources.Logo_Ryujinx.png");
CanFocus = false;
Resizable = false;

6
src/Ryujinx/Ui/Windows/CheatWindow.cs → src/Ryujinx/UI/Windows/CheatWindow.cs
View file

@ -1,14 +1,14 @@
using Gtk;
using Ryujinx.HLE.FileSystem;
using Ryujinx.HLE.HOS;
using Ryujinx.Ui.App.Common;
using Ryujinx.UI.App.Common;
using System;
using System.Collections.Generic;
using System.IO;
using System.Linq;
using GUI = Gtk.Builder.ObjectAttribute;
namespace Ryujinx.Ui.Windows
namespace Ryujinx.UI.Windows
{
public class CheatWindow : Window
{
@ -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.UI.Windows.CheatWindow.glade"), virtualFileSystem, titleId, titleName, titlePath) { }
private CheatWindow(Builder builder, VirtualFileSystem virtualFileSystem, ulong titleId, string titleName, string titlePath) : base(builder.GetRawOwnedObject("_cheatWindow"))
{

0
src/Ryujinx/Ui/Windows/CheatWindow.glade → src/Ryujinx/UI/Windows/CheatWindow.glade
View file

18
src/Ryujinx/Ui/Windows/ControllerWindow.cs → src/Ryujinx/UI/Windows/ControllerWindow.cs
View file

@ -9,8 +9,8 @@ using Ryujinx.Common.Utilities;
using Ryujinx.Input;
using Ryujinx.Input.Assigner;
using Ryujinx.Input.GTK3;
using Ryujinx.Ui.Common.Configuration;
using Ryujinx.Ui.Widgets;
using Ryujinx.UI.Common.Configuration;
using Ryujinx.UI.Widgets;
using System;
using System.Collections.Generic;
using System.IO;
@ -22,7 +22,7 @@ using ConfigStickInputId = Ryujinx.Common.Configuration.Hid.Controller.StickInpu
using GUI = Gtk.Builder.ObjectAttribute;
using Key = Ryujinx.Common.Configuration.Hid.Key;
namespace Ryujinx.Ui.Windows
namespace Ryujinx.UI.Windows
{
public class ControllerWindow : Window
{
@ -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.UI.Windows.ControllerWindow.glade"), controllerId) { }
private ControllerWindow(MainWindow mainWindow, Builder builder, PlayerIndex controllerId) : base(builder.GetRawOwnedObject("_controllerWin"))
{
@ -127,7 +127,7 @@ namespace Ryujinx.Ui.Windows
// NOTE: To get input in this window, we need to bind a custom keyboard driver instead of using the InputManager one as the main window isn't focused...
_gtk3KeyboardDriver = new GTK3KeyboardDriver(this);
Icon = new Gdk.Pixbuf(Assembly.GetAssembly(typeof(ConfigurationState)), "Ryujinx.Ui.Common.Resources.Logo_Ryujinx.png");
Icon = new Gdk.Pixbuf(Assembly.GetAssembly(typeof(ConfigurationState)), "Ryujinx.UI.Common.Resources.Logo_Ryujinx.png");
builder.Autoconnect(this);
@ -377,10 +377,10 @@ namespace Ryujinx.Ui.Windows
{
_controllerImage.Pixbuf = _controllerType.ActiveId switch
{
"ProController" => new Gdk.Pixbuf(Assembly.GetAssembly(typeof(ConfigurationState)), "Ryujinx.Ui.Common.Resources.Controller_ProCon.svg", 400, 400),
"JoyconLeft" => new Gdk.Pixbuf(Assembly.GetAssembly(typeof(ConfigurationState)), "Ryujinx.Ui.Common.Resources.Controller_JoyConLeft.svg", 400, 500),
"JoyconRight" => new Gdk.Pixbuf(Assembly.GetAssembly(typeof(ConfigurationState)), "Ryujinx.Ui.Common.Resources.Controller_JoyConRight.svg", 400, 500),
_ => new Gdk.Pixbuf(Assembly.GetAssembly(typeof(ConfigurationState)), "Ryujinx.Ui.Common.Resources.Controller_JoyConPair.svg", 400, 500),
"ProController" => new Gdk.Pixbuf(Assembly.GetAssembly(typeof(ConfigurationState)), "Ryujinx.UI.Common.Resources.Controller_ProCon.svg", 400, 400),
"JoyconLeft" => new Gdk.Pixbuf(Assembly.GetAssembly(typeof(ConfigurationState)), "Ryujinx.UI.Common.Resources.Controller_JoyConLeft.svg", 400, 500),
"JoyconRight" => new Gdk.Pixbuf(Assembly.GetAssembly(typeof(ConfigurationState)), "Ryujinx.UI.Common.Resources.Controller_JoyConRight.svg", 400, 500),
_ => new Gdk.Pixbuf(Assembly.GetAssembly(typeof(ConfigurationState)), "Ryujinx.UI.Common.Resources.Controller_JoyConPair.svg", 400, 500),
};
}
}

0
src/Ryujinx/Ui/Windows/ControllerWindow.glade → src/Ryujinx/UI/Windows/ControllerWindow.glade
View file

6
src/Ryujinx/Ui/Windows/DlcWindow.cs → src/Ryujinx/UI/Windows/DlcWindow.cs
View file

@ -9,13 +9,13 @@ using LibHac.Tools.FsSystem.NcaUtils;
using Ryujinx.Common.Configuration;
using Ryujinx.Common.Utilities;
using Ryujinx.HLE.FileSystem;
using Ryujinx.Ui.Widgets;
using Ryujinx.UI.Widgets;
using System;
using System.Collections.Generic;
using System.IO;
using GUI = Gtk.Builder.ObjectAttribute;
namespace Ryujinx.Ui.Windows
namespace Ryujinx.UI.Windows
{
public class DlcWindow : Window
{
@ -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.UI.Windows.DlcWindow.glade"), virtualFileSystem, titleId, titleName) { }
private DlcWindow(Builder builder, VirtualFileSystem virtualFileSystem, string titleId, string titleName) : base(builder.GetRawOwnedObject("_dlcWindow"))
{

0
src/Ryujinx/Ui/Windows/DlcWindow.glade → src/Ryujinx/UI/Windows/DlcWindow.glade
View file

26
src/Ryujinx/Ui/Windows/SettingsWindow.cs → src/Ryujinx/UI/Windows/SettingsWindow.cs
View file

@ -9,10 +9,10 @@ using Ryujinx.Common.Configuration.Multiplayer;
using Ryujinx.Common.GraphicsDriver;
using Ryujinx.HLE.FileSystem;
using Ryujinx.HLE.HOS.Services.Time.TimeZone;
using Ryujinx.Ui.Common.Configuration;
using Ryujinx.Ui.Common.Configuration.System;
using Ryujinx.Ui.Helper;
using Ryujinx.Ui.Widgets;
using Ryujinx.UI.Common.Configuration;
using Ryujinx.UI.Common.Configuration.System;
using Ryujinx.UI.Helper;
using Ryujinx.UI.Widgets;
using System;
using System.Collections.Generic;
using System.Globalization;
@ -23,7 +23,7 @@ using System.Text.RegularExpressions;
using System.Threading.Tasks;
using GUI = Gtk.Builder.ObjectAttribute;
namespace Ryujinx.Ui.Windows
namespace Ryujinx.UI.Windows
{
public class SettingsWindow : Window
{
@ -120,11 +120,11 @@ 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.UI.Windows.SettingsWindow.glade"), virtualFileSystem, contentManager) { }
private SettingsWindow(MainWindow parent, Builder builder, VirtualFileSystem virtualFileSystem, ContentManager contentManager) : base(builder.GetRawOwnedObject("_settingsWin"))
{
Icon = new Gdk.Pixbuf(Assembly.GetAssembly(typeof(ConfigurationState)), "Ryujinx.Ui.Common.Resources.Logo_Ryujinx.png");
Icon = new Gdk.Pixbuf(Assembly.GetAssembly(typeof(ConfigurationState)), "Ryujinx.UI.Common.Resources.Logo_Ryujinx.png");
_parent = parent;
@ -311,7 +311,7 @@ namespace Ryujinx.Ui.Windows
_directMouseAccess.Click();
}
if (ConfigurationState.Instance.Ui.EnableCustomTheme)
if (ConfigurationState.Instance.UI.EnableCustomTheme)
{
_custThemeToggle.Click();
}
@ -366,7 +366,7 @@ namespace Ryujinx.Ui.Windows
_multiLanSelect.SetActiveId(ConfigurationState.Instance.Multiplayer.LanInterfaceId.Value);
_multiModeSelect.SetActiveId(ConfigurationState.Instance.Multiplayer.Mode.Value.ToString());
_custThemePath.Buffer.Text = ConfigurationState.Instance.Ui.CustomThemePath;
_custThemePath.Buffer.Text = ConfigurationState.Instance.UI.CustomThemePath;
_resScaleText.Buffer.Text = ConfigurationState.Instance.Graphics.ResScaleCustom.Value.ToString();
_scalingFilterLevel.Value = ConfigurationState.Instance.Graphics.ScalingFilterLevel.Value;
_resScaleText.Visible = _resScaleCombo.ActiveId == "-1";
@ -379,7 +379,7 @@ namespace Ryujinx.Ui.Windows
_gameDirsBoxStore = new ListStore(typeof(string));
_gameDirsBox.Model = _gameDirsBoxStore;
foreach (string gameDir in ConfigurationState.Instance.Ui.GameDirs.Value)
foreach (string gameDir in ConfigurationState.Instance.UI.GameDirs.Value)
{
_gameDirsBoxStore.AppendValues(gameDir);
}
@ -568,7 +568,7 @@ namespace Ryujinx.Ui.Windows
_gameDirsBoxStore.IterNext(ref treeIter);
}
ConfigurationState.Instance.Ui.GameDirs.Value = gameDirs;
ConfigurationState.Instance.UI.GameDirs.Value = gameDirs;
_directoryChanged = false;
}
@ -640,11 +640,11 @@ namespace Ryujinx.Ui.Windows
ConfigurationState.Instance.System.IgnoreMissingServices.Value = _ignoreToggle.Active;
ConfigurationState.Instance.Hid.EnableKeyboard.Value = _directKeyboardAccess.Active;
ConfigurationState.Instance.Hid.EnableMouse.Value = _directMouseAccess.Active;
ConfigurationState.Instance.Ui.EnableCustomTheme.Value = _custThemeToggle.Active;
ConfigurationState.Instance.UI.EnableCustomTheme.Value = _custThemeToggle.Active;
ConfigurationState.Instance.System.Language.Value = Enum.Parse<Language>(_systemLanguageSelect.ActiveId);
ConfigurationState.Instance.System.Region.Value = Enum.Parse<Common.Configuration.System.Region>(_systemRegionSelect.ActiveId);
ConfigurationState.Instance.System.SystemTimeOffset.Value = _systemTimeOffset;
ConfigurationState.Instance.Ui.CustomThemePath.Value = _custThemePath.Buffer.Text;
ConfigurationState.Instance.UI.CustomThemePath.Value = _custThemePath.Buffer.Text;
ConfigurationState.Instance.Graphics.ShadersDumpPath.Value = _graphicsShadersDumpPath.Buffer.Text;
ConfigurationState.Instance.System.FsGlobalAccessLogMode.Value = (int)_fsLogSpinAdjustment.Value;
ConfigurationState.Instance.Graphics.MaxAnisotropy.Value = float.Parse(_anisotropy.ActiveId, CultureInfo.InvariantCulture);

0
src/Ryujinx/Ui/Windows/SettingsWindow.glade → src/Ryujinx/UI/Windows/SettingsWindow.glade
View file

8
src/Ryujinx/Ui/Windows/TitleUpdateWindow.cs → src/Ryujinx/UI/Windows/TitleUpdateWindow.cs
View file

@ -9,8 +9,8 @@ using LibHac.Tools.FsSystem.NcaUtils;
using Ryujinx.Common.Configuration;
using Ryujinx.Common.Utilities;
using Ryujinx.HLE.FileSystem;
using Ryujinx.Ui.App.Common;
using Ryujinx.Ui.Widgets;
using Ryujinx.UI.App.Common;
using Ryujinx.UI.Widgets;
using System;
using System.Collections.Generic;
using System.IO;
@ -18,7 +18,7 @@ using System.Linq;
using GUI = Gtk.Builder.ObjectAttribute;
using SpanHelpers = LibHac.Common.SpanHelpers;
namespace Ryujinx.Ui.Windows
namespace Ryujinx.UI.Windows
{
public class TitleUpdateWindow : Window
{
@ -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.UI.Windows.TitleUpdateWindow.glade"), parent, virtualFileSystem, titleId, titleName) { }
private TitleUpdateWindow(Builder builder, MainWindow parent, VirtualFileSystem virtualFileSystem, string titleId, string titleName) : base(builder.GetRawOwnedObject("_titleUpdateWindow"))
{

0
src/Ryujinx/Ui/Windows/TitleUpdateWindow.glade → src/Ryujinx/UI/Windows/TitleUpdateWindow.glade
View file

2
src/Ryujinx/Ui/Windows/UserProfilesManagerWindow.Designer.cs → src/Ryujinx/UI/Windows/UserProfilesManagerWindow.Designer.cs generated
View file

@ -2,7 +2,7 @@
using Pango;
using System;
namespace Ryujinx.Ui.Windows
namespace Ryujinx.UI.Windows
{
public partial class UserProfilesManagerWindow : Window
{

8
src/Ryujinx/Ui/Windows/UserProfilesManagerWindow.cs → src/Ryujinx/UI/Windows/UserProfilesManagerWindow.cs
View file

@ -2,8 +2,8 @@ using Gtk;
using Ryujinx.Common.Memory;
using Ryujinx.HLE.FileSystem;
using Ryujinx.HLE.HOS.Services.Account.Acc;
using Ryujinx.Ui.Common.Configuration;
using Ryujinx.Ui.Widgets;
using Ryujinx.UI.Common.Configuration;
using Ryujinx.UI.Widgets;
using SixLabors.ImageSharp;
using SixLabors.ImageSharp.Processing;
using System;
@ -14,7 +14,7 @@ using System.Threading;
using System.Threading.Tasks;
using Image = SixLabors.ImageSharp.Image;
namespace Ryujinx.Ui.Windows
namespace Ryujinx.UI.Windows
{
public partial class UserProfilesManagerWindow : Window
{
@ -32,7 +32,7 @@ namespace Ryujinx.Ui.Windows
public UserProfilesManagerWindow(AccountManager accountManager, ContentManager contentManager, VirtualFileSystem virtualFileSystem) : base($"Ryujinx {Program.Version} - Manage User Profiles")
{
Icon = new Gdk.Pixbuf(Assembly.GetAssembly(typeof(ConfigurationState)), "Ryujinx.Ui.Common.Resources.Logo_Ryujinx.png");
Icon = new Gdk.Pixbuf(Assembly.GetAssembly(typeof(ConfigurationState)), "Ryujinx.UI.Common.Resources.Logo_Ryujinx.png");
InitializeComponent();