Added custom setting function for each game

2025-02-06 20:12:56 +10:00
parent 131fe71205
commit 2640f083b6
22 changed files with 776 additions and 104 deletions
--- a/src/Ryujinx/UI/Controls/ApplicationContextMenu.axaml
+++ b/src/Ryujinx/UI/Controls/ApplicationContextMenu.axaml
@@ -19,6 +19,11 @@
        Header="{ext:Locale GameListContextMenuCreateShortcut}"
        Icon="{ext:Icon fa-solid fa-bookmark}"
        ToolTip.Tip="{OnPlatform Default={ext:Locale GameListContextMenuCreateShortcutToolTip}, macOS={ext:Locale GameListContextMenuCreateShortcutToolTipMacOS}}" />
+    <MenuItem
+       Click="EditGameConfiguration_Click"
+       Header="Edit Game Configuration"
+       Icon="{ext:Icon fa-solid fa-gear}"
+       ToolTip.Tip="{ext:Locale EditGameConfigurationToolTip}" />
    <MenuItem
        IsVisible="{Binding HasCompatibilityEntry}"
        Click="OpenApplicationCompatibility_Click"
--- a/src/Ryujinx/UI/Controls/ApplicationContextMenu.axaml.cs
+++ b/src/Ryujinx/UI/Controls/ApplicationContextMenu.axaml.cs
@@ -13,6 +13,7 @@ using Ryujinx.Ava.UI.Windows;
 using Ryujinx.Ava.Utilities;
 using Ryujinx.Ava.Utilities.AppLibrary;
 using Ryujinx.Ava.Utilities.Compat;
+using Ryujinx.Common;
 using Ryujinx.Common.Configuration;
 using Ryujinx.Common.Helper;
 using Ryujinx.HLE.HOS;
@@ -36,6 +37,21 @@ namespace Ryujinx.Ava.UI.Controls
            AvaloniaXamlLoader.Load(this);
        }

+        public void ToggleUserControl_Click(object sender, RoutedEventArgs args)
+        {
+            if (sender is not MenuItem { DataContext: MainWindowViewModel { SelectedApplication: not null } viewModel })
+                return;
+
+            viewModel.SelectedApplication.Favorite = !viewModel.SelectedApplication.Favorite;
+
+            ApplicationLibrary.LoadAndSaveMetaData(viewModel.SelectedApplication.IdString, appMetadata =>
+            {
+                appMetadata.Favorite = viewModel.SelectedApplication.Favorite;
+            });
+
+            viewModel.RefreshView();
+        }
+
        public void ToggleFavorite_Click(object sender, RoutedEventArgs args)
        {
            if (sender is not MenuItem { DataContext: MainWindowViewModel { SelectedApplication: not null } viewModel })
@@ -386,13 +402,27 @@ namespace Ryujinx.Ava.UI.Controls
                    viewModel.SelectedApplication.Icon
                );
        }
-        
+
+        public async void EditGameConfiguration_Click(object sender, RoutedEventArgs args)
+        {
+            if (sender is MenuItem { DataContext: MainWindowViewModel { SelectedApplication: not null } viewModel })
+            {
+                await new UserConfigWindows(viewModel).ShowDialog((Window)viewModel.TopLevel);
+
+                //just checking for file presence
+                viewModel.SelectedApplication.UserConfig = File.Exists(Program.GetDirGameUserConfig(viewModel.SelectedApplication.IdString,false,false));
+
+                viewModel.RefreshView();
+            }
+
+        }
+
        public async void OpenApplicationCompatibility_Click(object sender, RoutedEventArgs args)
        {
            if (sender is MenuItem { DataContext: MainWindowViewModel { SelectedApplication: not null } viewModel })
                await CompatibilityList.Show(viewModel.SelectedApplication.IdString);
        }
-        
+               
        public async void OpenApplicationData_Click(object sender, RoutedEventArgs args)
        {
            if (sender is MenuItem { DataContext: MainWindowViewModel { SelectedApplication: not null } viewModel })
--- a/src/Ryujinx/UI/Controls/ApplicationGridView.axaml
+++ b/src/Ryujinx/UI/Controls/ApplicationGridView.axaml
@@ -73,12 +73,18 @@
                                    HorizontalAlignment="Stretch"
                                    VerticalAlignment="Stretch"
                                    IsVisible="{Binding $parent[UserControl].((viewModels:MainWindowViewModel)DataContext).ShowNames}">
-                                    <TextBlock
-                                        HorizontalAlignment="Center"
-                                        VerticalAlignment="Center"
-                                        Text="{Binding Name}"
-                                        TextAlignment="Center"
-                                        TextWrapping="Wrap" />
+                                    <StackPanel HorizontalAlignment="Center" VerticalAlignment="Center">
+                                        <TextBlock
+                                            Text="{Binding Name}"
+                                            TextAlignment="Center"
+                                            TextWrapping="Wrap" />
+                                        <TextBlock
+                                            IsVisible="{Binding UserConfig}"
+                                            Text="User Config"
+                                            TextAlignment="Center"
+                                            TextWrapping="Wrap"
+                                            Foreground="{DynamicResource Warning}" />
+                                    </StackPanel>
                                </Panel>
                            </Grid>
                        </Border>
@@ -86,10 +92,28 @@
                            Margin="5,5,0,0"
                            HorizontalAlignment="Left"
                            VerticalAlignment="Top"
-                            FontSize="16"
+                            FontSize="18"
                            Foreground="{DynamicResource FavoriteApplicationIconColor}"
                            IsVisible="{Binding Favorite}"
                            Symbol="StarFilled" />
+                        <Grid IsVisible="{Binding !$parent[UserControl].((viewModels:MainWindowViewModel)DataContext).ShowNames}">
+                            <Border
+                                Margin="15,35,5,15"
+                                HorizontalAlignment="Left"
+                                VerticalAlignment="Bottom"
+                                Width="90" 
+                                Height="20"
+                                CornerRadius="4"
+                                IsVisible="{Binding UserConfig}"
+                                Background="{DynamicResource ThemeContentBackgroundColor}">
+                                <TextBlock
+                                    HorizontalAlignment="Center"
+                                    VerticalAlignment="Center"
+                                    Text="User Config"
+                                    TextAlignment="Center"
+                                    TextWrapping="Wrap" />   
+                            </Border>
+                        </Grid>
                    </Grid>
                </DataTemplate>
            </ListBox.ItemTemplate>
--- a/src/Ryujinx/UI/Controls/ApplicationListView.axaml
+++ b/src/Ryujinx/UI/Controls/ApplicationListView.axaml
@@ -145,6 +145,13 @@
                                        Text="{Binding Converter={x:Static helpers:MultiplayerInfoConverter.Instance}}"
                                        TextAlignment="Start"
                                        TextWrapping="Wrap"/>
+                                    <TextBlock
+                                        HorizontalAlignment="Stretch"
+                                        IsVisible="{Binding UserConfig}"
+                                        Text="User Config"
+                                        TextAlignment="Start"
+                                        TextWrapping="Wrap"
+                                        Foreground="{DynamicResource Warning}" />
                                </StackPanel>
                                <StackPanel
                                    Grid.Column="4"
--- a/src/Ryujinx/UI/Controls/ApplicationListView.axaml.cs
+++ b/src/Ryujinx/UI/Controls/ApplicationListView.axaml.cs
@@ -4,6 +4,7 @@ using Avalonia.Input.Platform;
 using Avalonia.Interactivity;
 using Ryujinx.Ava.UI.Helpers;
 using Ryujinx.Ava.UI.ViewModels;
+using Ryujinx.Ava.UI.Windows;
 using Ryujinx.Ava.Utilities.AppLibrary;
 using Ryujinx.Ava.Utilities.Compat;
 using System;
@@ -42,6 +43,19 @@ namespace Ryujinx.Ava.UI.Controls
            await CompatibilityList.Show((string)playabilityLabel.Tag);
        }

+        public async void EditGameConfiguration_Click(object sender, RoutedEventArgs args)
+        {
+            if (sender is MenuItem { DataContext: MainWindowViewModel { SelectedApplication: not null } viewModel })
+            {
+                await new UserConfigWindows(viewModel).ShowDialog((Window)viewModel.TopLevel);
+
+                //viewModel.SelectedApplication.UserConfig = File.Exists(Program.GetDirGameUserConfig(viewModel.SelectedApplication.IdString));
+
+                viewModel.RefreshView();
+            }
+
+        }
+
        private async void IdString_OnClick(object sender, RoutedEventArgs e)
        {
            if (DataContext is not MainWindowViewModel mwvm)
--- a/src/Ryujinx/UI/ViewModels/MainWindowViewModel.cs
+++ b/src/Ryujinx/UI/ViewModels/MainWindowViewModel.cs
@@ -1076,7 +1076,7 @@ namespace Ryujinx.Ava.UI.ViewModels
            _rendererWaitEvent.WaitOne();

            AppHost?.Start();
-
+            
            AppHost?.DisposeContext();
        }

@@ -1540,6 +1540,14 @@ namespace Ryujinx.Ava.UI.ViewModels
 #if RELEASE
            await PerformanceCheck();
 #endif
+            // If a configuration is found in the "/games/xxxxxxxxxxxxxx" folder, the program will load the user setting.
+            string gameDir = Program.GetDirGameUserConfig(application.IdBaseString, true, true);
+
+            if (ConfigurationFileFormat.TryLoad(gameDir, out ConfigurationFileFormat configurationFileFormat))
+            {
+                //Program.GetDirGameUserConfig(application.IdBaseString, false);
+                ConfigurationState.Instance.Load(configurationFileFormat, gameDir, application.IdBaseString);
+            }

            Logger.RestartTime();

@@ -1585,6 +1593,7 @@ namespace Ryujinx.Ava.UI.ViewModels

            Thread gameThread = new(InitializeGame) { Name = "GUI.WindowThread" };
            gameThread.Start();
+            
        }

        public void SwitchToRenderer(bool startFullscreen) =>
--- a/src/Ryujinx/UI/ViewModels/SettingsViewModel.cs
+++ b/src/Ryujinx/UI/ViewModels/SettingsViewModel.cs
@@ -1,8 +1,10 @@
 using Avalonia.Collections;
 using Avalonia.Controls;
+using Avalonia.Media.Imaging;
 using Avalonia.Threading;
 using CommunityToolkit.Mvvm.ComponentModel;
 using CommunityToolkit.Mvvm.Input;
+using Humanizer;
 using LibHac.Tools.FsSystem;
 using Ryujinx.Audio.Backends.OpenAL;
 using Ryujinx.Audio.Backends.SDL2;
@@ -26,6 +28,7 @@ using Ryujinx.HLE.HOS.Services.Time.TimeZone;
 using System;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
+using System.IO;
 using System.Linq;
 using System.Net.NetworkInformation;
 using System.Threading.Tasks;
@@ -67,6 +70,49 @@ namespace Ryujinx.Ava.UI.ViewModels
        [ObservableProperty] private string _ldnServer;

        public SettingsHacksViewModel DirtyHacks { get; }
+        public string GamePath { get; }
+        public string GameName { get; }
+
+        private Bitmap _gameIcon;
+
+        private string _gameTitle;
+        private string _gameId;
+        public Bitmap GameIcon
+        {
+            get => _gameIcon;
+            set
+            {
+                if (_gameIcon != value)
+                {
+                    _gameIcon = value;
+                }
+            }
+        }
+
+        public string GameTitle
+        {
+            get => _gameTitle;
+            set
+            {
+                if (_gameTitle != value)
+                {
+                    _gameTitle = value;
+                }
+            }
+        }
+
+        public string GameId
+        {
+            get => _gameId;
+            set
+            {
+                if (_gameId != value)
+                {
+                    _gameId = value;
+                }
+            }
+        }
+

        public int ResolutionScale
        {
@@ -342,6 +388,37 @@ namespace Ryujinx.Ava.UI.ViewModels
            }
        }

+        public SettingsViewModel(VirtualFileSystem virtualFileSystem, ContentManager contentManager, string gamePath, string gameName, string gameId, byte[] gameIconData) : this()
+        {
+            _virtualFileSystem = virtualFileSystem;
+            _contentManager = contentManager;
+  
+            if (gameIconData != null && gameIconData.Length > 0)
+            {
+                using (var ms = new MemoryStream(gameIconData))
+                {
+                    GameIcon = new Bitmap(ms);
+                }
+            }
+
+            GameTitle = gameName;
+            GameId = gameId;
+
+            string gameDir = Program.GetDirGameUserConfig(gameId,false,true);
+            if (ConfigurationFileFormat.TryLoad(gameDir, out ConfigurationFileFormat configurationFileFormat))
+            {
+                ConfigurationState.Instance.Load(configurationFileFormat, gameDir, gameId);
+                LoadCurrentConfiguration(); // Needed to load custom configuration
+            }
+
+            if (Program.PreviewerDetached)
+            {
+                Task.Run(LoadTimeZones);
+
+                DirtyHacks = new SettingsHacksViewModel(this);
+            }
+        }
+
        public SettingsViewModel()
        {
            GameDirectories = [];
@@ -468,27 +545,30 @@ namespace Ryujinx.Ava.UI.ViewModels
        {
            ConfigurationState config = ConfigurationState.Instance;

-            // User Interface
-            EnableDiscordIntegration = config.EnableDiscordIntegration;
-            CheckUpdatesOnStart = config.CheckUpdatesOnStart;
-            ShowConfirmExit = config.ShowConfirmExit;
-            RememberWindowState = config.RememberWindowState;
-            ShowTitleBar = config.ShowTitleBar;
-            HideCursor = (int)config.HideCursor.Value;
-
-            GameDirectories.Clear();
-            GameDirectories.AddRange(config.UI.GameDirs.Value);
-
-            AutoloadDirectories.Clear();
-            AutoloadDirectories.AddRange(config.UI.AutoloadDirs.Value);
-
-            BaseStyleIndex = config.UI.BaseStyle.Value switch
+            if (string.IsNullOrEmpty(GameId))
            {
-                "Auto" => 0,
-                "Light" => 1,
-                "Dark" => 2,
-                _ => 0
-            };
+                // User Interface
+                EnableDiscordIntegration = config.EnableDiscordIntegration;
+                CheckUpdatesOnStart = config.CheckUpdatesOnStart;
+                ShowConfirmExit = config.ShowConfirmExit;
+                RememberWindowState = config.RememberWindowState;
+                ShowTitleBar = config.ShowTitleBar;
+                HideCursor = (int)config.HideCursor.Value;
+
+                GameDirectories.Clear();
+                GameDirectories.AddRange(config.UI.GameDirs.Value);
+
+                AutoloadDirectories.Clear();
+                AutoloadDirectories.AddRange(config.UI.AutoloadDirs.Value);
+
+                BaseStyleIndex = config.UI.BaseStyle.Value switch
+                {
+                    "Auto" => 0,
+                    "Light" => 1,
+                    "Dark" => 2,
+                    _ => 0
+                };
+            }

            // Input
            EnableDockedMode = config.System.EnableDockedMode;
@@ -569,7 +649,7 @@ namespace Ryujinx.Ava.UI.ViewModels
            LdnServer = config.Multiplayer.LdnServer;
        }

-        public void SaveSettings()
+        public void SaveSettings2()
        {
            ConfigurationState config = ConfigurationState.Instance;

@@ -583,12 +663,12 @@ namespace Ryujinx.Ava.UI.ViewModels

            if (GameDirectoryChanged)
            {
-                config.UI.GameDirs.Value = [..GameDirectories];
+                config.UI.GameDirs.Value = [.. GameDirectories];
            }

            if (AutoloadDirectoryChanged)
            {
-                config.UI.AutoloadDirs.Value = [..AutoloadDirectories];
+                config.UI.AutoloadDirs.Value = [.. AutoloadDirectories];
            }

            config.UI.BaseStyle.Value = BaseStyleIndex switch
@@ -599,6 +679,50 @@ namespace Ryujinx.Ava.UI.ViewModels
                _ => "Auto"
            };

+            if (!string.IsNullOrEmpty(GameId))
+            {
+                config.ToFileFormat().SaveConfig(Program.ConfigurationPath);
+            }
+            else
+            {
+                config.ToFileFormat().SaveConfig(Program.ConfigurationPath);
+            }
+        }
+
+        public void SaveSettings()
+        {
+            ConfigurationState config = ConfigurationState.Instance;
+
+
+            if (string.IsNullOrEmpty(GameId))
+            {
+                // User Interface
+                config.EnableDiscordIntegration.Value = EnableDiscordIntegration;
+                config.CheckUpdatesOnStart.Value = CheckUpdatesOnStart;
+                config.ShowConfirmExit.Value = ShowConfirmExit;
+                config.RememberWindowState.Value = RememberWindowState;
+                config.ShowTitleBar.Value = ShowTitleBar;
+                config.HideCursor.Value = (HideCursorMode)HideCursor;
+
+                if (GameDirectoryChanged)
+                {
+                    config.UI.GameDirs.Value = [.. GameDirectories];
+                }
+
+                if (AutoloadDirectoryChanged)
+                {
+                    config.UI.AutoloadDirs.Value = [.. AutoloadDirectories];
+                }
+
+                config.UI.BaseStyle.Value = BaseStyleIndex switch
+                {
+                    0 => "Auto",
+                    1 => "Light",
+                    2 => "Dark",
+                    _ => "Auto"
+                };
+            }
+
            // Input
            config.System.EnableDockedMode.Value = EnableDockedMode;
            config.Hid.EnableKeyboard.Value = EnableKeyboard;
@@ -693,7 +817,9 @@ namespace Ryujinx.Ava.UI.ViewModels
            config.Hacks.EnableShaderTranslationDelay.Value = DirtyHacks.ShaderTranslationDelayEnabled;
            config.Hacks.ShaderTranslationDelay.Value = DirtyHacks.ShaderTranslationDelay;

-            config.ToFileFormat().SaveConfig(Program.ConfigurationPath);
+
+                config.ToFileFormat().SaveConfig(Program.ConfigurationPath);
+

            MainWindow.UpdateGraphicsConfig();
            RyujinxApp.MainWindow.ViewModel.VSyncModeSettingChanged();
@@ -706,7 +832,11 @@ namespace Ryujinx.Ava.UI.ViewModels

        private static void RevertIfNotSaved()
        {
-            Program.ReloadConfig();
+            // maybe this is an unnecessary check(all options need to be tested)
+            if (string.IsNullOrEmpty(Program.GlobalConfigurationPath))
+            {
+                Program.ReloadConfig();
+            }
        }

        public void ApplyButton()
@@ -714,6 +844,25 @@ namespace Ryujinx.Ava.UI.ViewModels
            SaveSettings();
        }

+        public void DeleteConfigGame()
+        {
+            string gameDir = Program.GetDirGameUserConfig(GameId,false,false);
+
+            if (File.Exists(gameDir))
+            {
+                File.Delete(gameDir);
+            }
+            RevertIfNotSaved();
+            CloseWindow?.Invoke();
+        }
+
+        public void SaveUserConfig()
+        {
+            SaveSettings();
+            RevertIfNotSaved();
+            CloseWindow?.Invoke();
+        }
+
        public void OkButton()
        {
            SaveSettings();
--- a/src/Ryujinx/UI/Windows/UserConfigWindows.axaml
+++ b/src/Ryujinx/UI/Windows/UserConfigWindows.axaml
@@ -0,0 +1,139 @@
+<window:StyleableAppWindow
+    x:Class="Ryujinx.Ava.UI.Windows.UserConfigWindows"
+    xmlns="https://github.com/avaloniaui"
+    xmlns:ui="clr-namespace:FluentAvalonia.UI.Controls;assembly=FluentAvalonia"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:ext="clr-namespace:Ryujinx.Ava.Common.Markup"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:window="clr-namespace:Ryujinx.Ava.UI.Windows"
+    xmlns:viewModels="clr-namespace:Ryujinx.Ava.UI.ViewModels"
+    xmlns:settings="clr-namespace:Ryujinx.Ava.UI.Views.Settings"
+    xmlns:helpers="clr-namespace:Ryujinx.Ava.UI.Helpers"
+    xmlns:helper="clr-namespace:Ryujinx.Common.Helper;assembly=Ryujinx.Common"
+    Width="1100"
+    Height="768"
+    MinWidth="800"
+    MinHeight="480"
+    WindowStartupLocation="CenterOwner"
+    x:DataType="viewModels:SettingsViewModel"
+    mc:Ignorable="d"
+    Focusable="True">
+    <Design.DataContext>
+        <viewModels:SettingsViewModel />
+    </Design.DataContext>
+    <Grid HorizontalAlignment="Stretch" VerticalAlignment="Stretch" MinWidth="600" RowDefinitions="Auto,*,Auto">
+        <ContentPresenter
+            x:Name="ContentPresenter"
+            Grid.Row="1"
+            IsVisible="False"
+            KeyboardNavigation.IsTabStop="False"/>
+        <Grid Name="Pages" IsVisible="False" Grid.Row="2">
+            <settings:SettingsSystemView Name="SystemPage" />
+            <settings:SettingsCPUView Name="CpuPage" />
+            <settings:SettingsGraphicsView Name="GraphicsPage" />
+            <settings:SettingsAudioView Name="AudioPage" />
+            <settings:SettingsNetworkView Name="NetworkPage" />
+            <settings:SettingsLoggingView Name="LoggingPage" />
+            <settings:SettingsHacksView Name="HacksPage" />
+        </Grid>
+        <ui:NavigationView
+            Grid.Row="1"
+            IsSettingsVisible="False"
+            Name="NavPanel"
+            IsBackEnabled="False"
+            PaneDisplayMode="Left"
+            Margin="2,10,10,0"
+            VerticalAlignment="Stretch"
+            HorizontalAlignment="Stretch"
+            OpenPaneLength="200"
+            IsPaneToggleButtonVisible="False">
+
+            <!-- For image -->
+            <ui:NavigationView.PaneHeader>
+                <Grid HorizontalAlignment="Center" VerticalAlignment="Center">
+                    <Grid.RowDefinitions>
+                        <RowDefinition Height="Auto"/>
+                        <RowDefinition Height="Auto"/>
+                        <RowDefinition Height="Auto"/>
+                        <RowDefinition Height="5"/>
+                    </Grid.RowDefinitions>
+                    <TextBlock Text="{Binding GameId}"
+                        HorizontalAlignment="Center"
+                        VerticalAlignment="Center"
+                        Margin="0,0,0,10"
+                        TextAlignment="Center" Grid.Row="0" />
+                    <Image Source="{Binding GameIcon}" 
+                        Width="160" 
+                        Height="160" 
+                        Grid.Row="1" 
+                        Margin="0,0,0,10"
+                        HorizontalAlignment="Center" />
+                    <TextBlock Text="{Binding GameTitle}"
+                        HorizontalAlignment="Center"
+                        VerticalAlignment="Center"
+                        Margin="0,0,0,10"
+                        TextAlignment="Center" Grid.Row="2" />
+                    <Separator Height="1" Grid.Row="3" Margin="0,0,0,10" HorizontalAlignment="Stretch"/>
+                </Grid>
+            </ui:NavigationView.PaneHeader>
+                      
+            <ui:NavigationView.MenuItems>
+                <ui:NavigationViewItem
+                    Content="{ext:Locale SettingsTabSystem}"
+                    Tag="SystemPage"
+                    IconSource="Settings" />
+                <ui:NavigationViewItem
+                    Content="{ext:Locale SettingsTabCpu}"
+                    Tag="CpuPage">
+                    <ui:NavigationViewItem.IconSource>
+                        <ui:FontIconSource
+                            FontFamily="avares://Ryujinx/Assets/Fonts#Segoe Fluent Icons"
+                            Glyph="{helpers:GlyphValueConverter Chip}" />
+                    </ui:NavigationViewItem.IconSource>
+                </ui:NavigationViewItem>
+                <ui:NavigationViewItem
+                    Content="{ext:Locale SettingsTabGraphics}"
+                    Tag="GraphicsPage"
+                    IconSource="Image" />
+                <ui:NavigationViewItem
+                    Content="{ext:Locale SettingsTabAudio}"
+                    IconSource="Audio"
+                    Tag="AudioPage" />
+                <ui:NavigationViewItem
+                    Content="{ext:Locale SettingsTabNetwork}"
+                    Tag="NetworkPage"
+                    IconSource="Globe" />
+                <ui:NavigationViewItem
+                    Content="{ext:Locale SettingsTabLogging}"
+                    Tag="LoggingPage"
+                    IconSource="Document" />
+                <ui:NavigationViewItem
+                    IsVisible="{Binding ShowDirtyHacks}"
+                    Content="Dirty Hacks"
+                    Tag="HacksPage"
+                    IconSource="Code" />
+            </ui:NavigationView.MenuItems>
+        </ui:NavigationView>
+       
+        <ReversibleStackPanel
+            Grid.Row="2"
+            Margin="10"
+            Spacing="10"
+            Orientation="Horizontal"
+            HorizontalAlignment="Right"
+            ReverseOrder="{x:Static helper:RunningPlatform.IsMacOS}">
+            <Button
+                Content="{ext:Locale SettingsButtonSave}"
+                Command="{Binding SaveUserConfig}" />
+            <Button
+                HotKey="Escape"
+                Content="{ext:Locale SettingsButtonClose}"
+                Command="{Binding CancelButton}" />
+            <Button
+                Content="{ext:Locale UserProfilesDelete}"
+                Command="{Binding DeleteConfigGame}"
+                Classes="red"/>
+        </ReversibleStackPanel>
+    </Grid>
+</window:StyleableAppWindow>
--- a/src/Ryujinx/UI/Windows/UserConfigWindows.axaml.cs
+++ b/src/Ryujinx/UI/Windows/UserConfigWindows.axaml.cs
@@ -0,0 +1,108 @@
+using Avalonia;
+using Avalonia.Controls;
+using Avalonia.Controls.Shapes;
+using Avalonia.Input;
+using Avalonia.Media.Imaging;
+using FluentAvalonia.Core;
+using FluentAvalonia.UI.Controls;
+using Projektanker.Icons.Avalonia;
+using Ryujinx.Ava.Common.Locale;
+using Ryujinx.Ava.UI.Models;
+using Ryujinx.Ava.UI.ViewModels;
+using Ryujinx.Ava.UI.ViewModels.Input;
+using Ryujinx.Ava.Utilities;
+using Ryujinx.Ava.Utilities.Configuration;
+using Ryujinx.Common.Configuration;
+using Ryujinx.HLE.FileSystem;
+using Ryujinx.HLE.HOS.SystemState;
+using Ryujinx.Input;
+using System;
+using System.IO;
+using System.Linq;
+using Key = Avalonia.Input.Key;
+
+
+namespace Ryujinx.Ava.UI.Windows
+{
+    public partial class UserConfigWindows : StyleableAppWindow
+    {
+        internal readonly SettingsViewModel ViewModel;
+
+        public UserConfigWindows(MainWindowViewModel viewModel)
+        {
+            Title = RyujinxApp.FormatTitle(LocaleKeys.Settings);
+
+            DataContext = ViewModel = new SettingsViewModel(
+                viewModel.VirtualFileSystem, 
+                viewModel.ContentManager,
+                viewModel.SelectedApplication.Path,
+                viewModel.SelectedApplication.Name,
+                viewModel.SelectedApplication.IdString,
+                viewModel.SelectedApplication.Icon);
+
+            ViewModel.CloseWindow += Close;
+
+            InitializeComponent();
+            Load();
+
+#if DEBUG
+            this.AttachDevTools(new KeyGesture(Key.F12, KeyModifiers.Alt));
+#endif
+           
+        }
+
+
+        private void Load()
+        {
+            Pages.Children.Clear();
+            NavPanel.SelectionChanged += NavPanelOnSelectionChanged;
+            NavPanel.SelectedItem = NavPanel.MenuItems.ElementAt(0);
+            
+        }
+
+        private void NavPanelOnSelectionChanged(object sender, NavigationViewSelectionChangedEventArgs e)
+        {
+            
+            if (e.SelectedItem is NavigationViewItem navItem && navItem.Tag is not null)
+            {
+                switch (navItem.Tag.ToString())
+                {
+                    //case nameof(InputPage):
+                    //   NavPanel.Content = InputPage;
+                    //   break;
+                    case nameof(SystemPage):
+                        SystemPage.ViewModel = ViewModel;
+                        NavPanel.Content = SystemPage;
+                        break;
+                    case nameof(CpuPage):
+                        NavPanel.Content = CpuPage;
+                        break;
+                    case nameof(GraphicsPage):
+                        NavPanel.Content = GraphicsPage;
+                        break;
+                    case nameof(AudioPage):
+                        NavPanel.Content = AudioPage;
+                        break;
+                    case nameof(NetworkPage):
+                        NetworkPage.ViewModel = ViewModel;
+                        NavPanel.Content = NetworkPage;
+                        break;
+                    case nameof(LoggingPage):
+                        NavPanel.Content = LoggingPage;
+                        break;
+                    case nameof(HacksPage):
+                        HacksPage.DataContext = ViewModel;
+                        NavPanel.Content = HacksPage;
+                        break;
+                    default:
+                        throw new NotImplementedException();
+                }
+            }        
+        }
+
+        protected override void OnClosing(WindowClosingEventArgs e)
+        {   
+            base.OnClosing(e);
+        }
+    }
+}