Merge branch 'master' into master

src/Ryujinx/Assets/locales.json

@@ -6122,6 +6122,56 @@
         "zh_TW": "關閉"
       }
     },
+    {
+      "ID": "SettingsButtonReset",
+      "Translations": {
+        "ar_SA": "",
+        "de_DE": "",
+        "el_GR": "",
+        "en_US": "Reset Settings",
+        "es_ES": "",
+        "fr_FR": "",
+        "he_IL": "",
+        "it_IT": "",
+        "ja_JP": "",
+        "ko_KR": "",
+        "no_NO": "",
+        "pl_PL": "",
+        "pt_BR": "",
+        "ru_RU": "",
+        "sv_SE": "",
+        "th_TH": "",
+        "tr_TR": "",
+        "uk_UA": "",
+        "zh_CN": "",
+        "zh_TW": ""
+      }
+    },
+    {
+      "ID": "SettingsButtonResetConfirm",
+      "Translations": {
+        "ar_SA": "",
+        "de_DE": "",
+        "el_GR": "",
+        "en_US": "I want to reset my settings.",
+        "es_ES": "",
+        "fr_FR": "",
+        "he_IL": "",
+        "it_IT": "",
+        "ja_JP": "",
+        "ko_KR": "",
+        "no_NO": "",
+        "pl_PL": "",
+        "pt_BR": "",
+        "ru_RU": "",
+        "sv_SE": "",
+        "th_TH": "",
+        "tr_TR": "",
+        "uk_UA": "",
+        "zh_CN": "",
+        "zh_TW": ""
+      }
+    },
     {
       "ID": "SettingsButtonOk",
       "Translations": {

src/Ryujinx/UI/ViewModels/SettingsViewModel.cs

@@ -2,7 +2,7 @@ using Avalonia.Collections;
 using Avalonia.Controls;
 using Avalonia.Threading;
 using CommunityToolkit.Mvvm.ComponentModel;
-using Gommon;
+using CommunityToolkit.Mvvm.Input;
 using LibHac.Tools.FsSystem;
 using Ryujinx.Audio.Backends.OpenAL;
 using Ryujinx.Audio.Backends.SDL2;
@@ -28,8 +28,6 @@ using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Linq;
 using System.Net.NetworkInformation;
-using System.Runtime.InteropServices;
-using System.Text.RegularExpressions;
 using System.Threading.Tasks;
 using TimeZone = Ryujinx.Ava.UI.Models.TimeZone;
 
@@ -722,6 +720,25 @@ namespace Ryujinx.Ava.UI.ViewModels
             CloseWindow?.Invoke();
         }
 
+        [ObservableProperty] private bool _wantsToReset;
+
+        public AsyncRelayCommand ResetButton => Commands.Create(async () =>
+        {
+            if (!WantsToReset) return;
+            
+            CloseWindow?.Invoke();
+            ConfigurationState.Instance.LoadDefault();
+            ConfigurationState.Instance.ToFileFormat().SaveConfig(Program.ConfigurationPath);
+            RyujinxApp.MainWindow.LoadApplications();
+
+            await ContentDialogHelper.CreateInfoDialog(
+                $"Your {RyujinxApp.FullAppName} configuration has been reset.",
+                "",
+                string.Empty,
+                LocaleManager.Instance[LocaleKeys.SettingsButtonClose],
+                "Configuration Reset");
+        });
+
         public void CancelButton()
         {
             RevertIfNotSaved();

src/Ryujinx/UI/Windows/SettingsWindow.axaml

@@ -108,24 +108,36 @@
                 </Style>
             </ui:NavigationView.Styles>
         </ui:NavigationView>
-        <ReversibleStackPanel
+        <Grid Grid.Row="2"
-            Grid.Row="2"
+              ColumnDefinitions="Auto,*,Auto">
-            Margin="10"
+            <StackPanel Grid.Column="0" Orientation="Horizontal">
-            Spacing="10"
+                <Button
-            Orientation="Horizontal"
+                    IsEnabled="{Binding WantsToReset}"
-            HorizontalAlignment="Right"
+                    Margin="10"
-            ReverseOrder="{x:Static helper:RunningPlatform.IsMacOS}">
+                    Content="{ext:Locale SettingsButtonReset}"
-            <Button
+                    Command="{Binding ResetButton}" />
-                Classes="accent"
+                <CheckBox IsChecked="{Binding WantsToReset}"/>
-                Content="{ext:Locale SettingsButtonOk}"
+                <TextBlock Text="{ext:Locale SettingsButtonResetConfirm}"/>
-                Command="{Binding OkButton}" />
+            </StackPanel>
-            <Button
+            <ReversibleStackPanel
-                HotKey="Escape"
+                Grid.Column="2"
-                Content="{ext:Locale SettingsButtonCancel}"
+                Margin="10"
-                Command="{Binding CancelButton}" />
+                Spacing="10"
-            <Button
+                Orientation="Horizontal"
-                Content="{ext:Locale SettingsButtonApply}"
+                HorizontalAlignment="Right"
-                Command="{Binding ApplyButton}" />
+                ReverseOrder="{x:Static helper:RunningPlatform.IsMacOS}">
-        </ReversibleStackPanel>
+                <Button
+                    Classes="accent"
+                    Content="{ext:Locale SettingsButtonOk}"
+                    Command="{Binding OkButton}" />
+                <Button
+                    HotKey="Escape"
+                    Content="{ext:Locale SettingsButtonCancel}"
+                    Command="{Binding CancelButton}" />
+                <Button
+                    Content="{ext:Locale SettingsButtonApply}"
+                    Command="{Binding ApplyButton}" />
+            </ReversibleStackPanel>
+        </Grid>
     </Grid>
 </window:StyleableAppWindow>