Add button to restart automatically upon language change

Lauriethefish · Jul 1, 2024 · 20ab0e1 · 20ab0e1
1 parent 74d0073
commit 20ab0e1
Show file tree

Hide file tree

Showing 4 changed files with 38 additions and 4 deletions.
diff --git a/QuestPatcher/QuestPatcher.csproj.user b/QuestPatcher/QuestPatcher.csproj.user
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup />
+  <ItemGroup>
+    <EmbeddedResource Update="Resources\Strings.resx">
+      <SubType>Designer</SubType>
+    </EmbeddedResource>
+  </ItemGroup>
+</Project>
diff --git a/QuestPatcher/Resources/Strings.Designer.cs b/QuestPatcher/Resources/Strings.Designer.cs
diff --git a/QuestPatcher/Services/QuestPatcherUiService.cs b/QuestPatcher/Services/QuestPatcherUiService.cs
@@ -84,7 +84,7 @@ private Window PrepareUi()
                     new ManageModsViewModel(ModManager, InstallManager, window, _operationLocker, progressViewModel, _browseManager),
                     _loggingViewModel,
                     new ToolsViewModel(Config, progressViewModel, _operationLocker, window, SpecialFolders, InstallManager, DebugBridge, this, InfoDumper,
-                        _themeManager),
+                        _themeManager, ExitApplication),
                     _otherItemsView,
                     Config,
                     InstallManager,

diff --git a/QuestPatcher/ViewModels/ToolsViewModel.cs b/QuestPatcher/ViewModels/ToolsViewModel.cs
@@ -2,6 +2,7 @@
 using System.Diagnostics;
 using System.IO;
 using System.Threading.Tasks;
+using Avalonia;
 using Avalonia.Controls;
 using QuestPatcher.Core;
 using QuestPatcher.Core.Models;
@@ -46,8 +47,9 @@ public Language SelectedLanguage
         private readonly AndroidDebugBridge _debugBridge;
         private readonly QuestPatcherUiService _uiService;
         private readonly InfoDumper _dumper;
+        private readonly Action _quit;
 
-        public ToolsViewModel(Config config, ProgressViewModel progressView, OperationLocker locker, Window mainWindow, SpecialFolders specialFolders, InstallManager installManager, AndroidDebugBridge debugBridge, QuestPatcherUiService uiService, InfoDumper dumper, ThemeManager themeManager)
+        public ToolsViewModel(Config config, ProgressViewModel progressView, OperationLocker locker, Window mainWindow, SpecialFolders specialFolders, InstallManager installManager, AndroidDebugBridge debugBridge, QuestPatcherUiService uiService, InfoDumper dumper, ThemeManager themeManager, Action quit)
         {
             Config = config;
             ProgressView = progressView;
@@ -60,6 +62,7 @@ public ToolsViewModel(Config config, ProgressViewModel progressView, OperationLo
             _debugBridge = debugBridge;
             _uiService = uiService;
             _dumper = dumper;
+            _quit = quit;
 
             _debugBridge.StoppedLogging += (_, _) =>
             {
@@ -253,8 +256,20 @@ private async void ShowLanguageChangeDialog()
             {
                 Title = Strings.Tools_Option_Language_Title,
                 Text = Strings.Tools_Option_Language_Text,
-                HideCancelButton = true
             };
+            builder.OkButton.Text = Strings.Generic_OK;
+            builder.CancelButton.Text = Strings.Generic_NotNow;
+            builder.OkButton.OnClick = () =>
+            {
+                string? exePath = Process.GetCurrentProcess().MainModule?.FileName;
+                if(exePath != null)
+                {
+                    Process.Start(exePath);
+                }
+
+                _quit();
+            };
+
 
             await builder.OpenDialogue(_mainWindow);
         }