diff --git a/ModpackUpdater.Apps.Client.Gui/Program.cs b/ModpackUpdater.Apps.Client.Gui/Program.cs
index e66b401..b013a09 100644
--- a/ModpackUpdater.Apps.Client.Gui/Program.cs
+++ b/ModpackUpdater.Apps.Client.Gui/Program.cs
@@ -12,7 +12,6 @@ public static class Program
private static readonly SettingsManager settingsManager;
- public static string ProcessPath = EnvironmentEx.ProcessPath!;
public static ISettings Settings => settingsManager.Instance;
public static ILogger Log { get; } = new ConsoleLogger();
@@ -25,7 +24,6 @@ public static class Program
[STAThread]
internal static void Main(string[] args)
{
- AppGlobals.Initialize();
BuildAvaloniaApp().StartWithClassicDesktopLifetime(args);
}
diff --git a/ModpackUpdater.Apps.Manager/Ui/MainWindow.axaml.cs b/ModpackUpdater.Apps.Manager/Ui/MainWindow.axaml.cs
index 8e49b0d..06108c3 100644
--- a/ModpackUpdater.Apps.Manager/Ui/MainWindow.axaml.cs
+++ b/ModpackUpdater.Apps.Manager/Ui/MainWindow.axaml.cs
@@ -7,11 +7,8 @@ using ModpackUpdater.Apps.Manager.Api;
using ModpackUpdater.Apps.Manager.Api.Model;
using ModpackUpdater.Apps.Manager.Api.Plugins.Features;
using ModpackUpdater.Apps.Manager.Api.Plugins.Params;
-using ModpackUpdater.Apps.Manager.LangRes;
using ModpackUpdater.Apps.Manager.Settings;
using ModpackUpdater.Apps.Manager.Ui.Models.MainWindow;
-using MsBox.Avalonia;
-using MsBox.Avalonia.Enums;
using Pilz.Extensions;
using Pilz.Features;
using Pilz.UI.AvaloniaUI.Features;
diff --git a/ModpackUpdater.Apps/AppUpdates.cs b/ModpackUpdater.Apps/AppUpdates.cs
index d75d0d9..f4e2575 100644
--- a/ModpackUpdater.Apps/AppUpdates.cs
+++ b/ModpackUpdater.Apps/AppUpdates.cs
@@ -23,7 +23,7 @@ public class AppUpdates(string updateUrl, Window mainWindow)
}
catch (Exception ex)
{
- await MessageBoxManager.GetMessageBoxStandard(MsgBoxLangRes.UpdateAvailable_Title, string.Format(MsgBoxLangRes.UpdateAvailable, ex.Message), ButtonEnum.YesNo, MsBox.Avalonia.Enums.Icon.Info).ShowWindowAsync();
+ await MessageBoxManager.GetMessageBoxStandard(GeneralMsgBoxLangRes.UpdateAvailable_Title, string.Format(GeneralMsgBoxLangRes.UpdateAvailable, ex.Message), ButtonEnum.YesNo, MsBox.Avalonia.Enums.Icon.Info).ShowWindowAsync();
mainWindow.IsEnabled = true;
}
#endif
@@ -41,7 +41,7 @@ public class AppUpdates(string updateUrl, Window mainWindow)
};
if (await updater.CheckForUpdate() is {} packageToInstall
- && await MessageBoxManager.GetMessageBoxStandard(MsgBoxLangRes.UpdateAvailable_Title, MsgBoxLangRes.UpdateAvailable, ButtonEnum.YesNo, MsBox.Avalonia.Enums.Icon.Info).ShowWindowDialogAsync(mainWindow) == ButtonResult.Yes)
+ && await MessageBoxManager.GetMessageBoxStandard(GeneralMsgBoxLangRes.UpdateAvailable_Title, GeneralMsgBoxLangRes.UpdateAvailable, ButtonEnum.YesNo, MsBox.Avalonia.Enums.Icon.Info).ShowWindowDialogAsync(mainWindow) == ButtonResult.Yes)
{
OnDownloadProgramUpdate?.Invoke(this, EventArgs.Empty);
mainWindow.IsEnabled = false;
diff --git a/ModpackUpdater.Apps/LangRes/MsgBoxLangRes.Designer.cs b/ModpackUpdater.Apps/LangRes/GeneralMsgBoxLangRes.Designer.cs
similarity index 79%
rename from ModpackUpdater.Apps/LangRes/MsgBoxLangRes.Designer.cs
rename to ModpackUpdater.Apps/LangRes/GeneralMsgBoxLangRes.Designer.cs
index 7af782a..54c2a8d 100644
--- a/ModpackUpdater.Apps/LangRes/MsgBoxLangRes.Designer.cs
+++ b/ModpackUpdater.Apps/LangRes/GeneralMsgBoxLangRes.Designer.cs
@@ -14,21 +14,21 @@ namespace ModpackUpdater.Apps {
[System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "17.0.0.0")]
[System.Diagnostics.DebuggerNonUserCodeAttribute()]
[System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
- public class MsgBoxLangRes {
+ internal class GeneralMsgBoxLangRes {
private static System.Resources.ResourceManager resourceMan;
private static System.Globalization.CultureInfo resourceCulture;
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
- internal MsgBoxLangRes() {
+ internal GeneralMsgBoxLangRes() {
}
[System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Advanced)]
- public static System.Resources.ResourceManager ResourceManager {
+ internal static System.Resources.ResourceManager ResourceManager {
get {
if (object.Equals(null, resourceMan)) {
- System.Resources.ResourceManager temp = new System.Resources.ResourceManager("ModpackUpdater.Apps.LangRes.MsgBoxLangRes", typeof(MsgBoxLangRes).Assembly);
+ System.Resources.ResourceManager temp = new System.Resources.ResourceManager("ModpackUpdater.Apps.LangRes.GeneralMsgBoxLangRes", typeof(GeneralMsgBoxLangRes).Assembly);
resourceMan = temp;
}
return resourceMan;
@@ -36,7 +36,7 @@ namespace ModpackUpdater.Apps {
}
[System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Advanced)]
- public static System.Globalization.CultureInfo Culture {
+ internal static System.Globalization.CultureInfo Culture {
get {
return resourceCulture;
}
@@ -45,25 +45,25 @@ namespace ModpackUpdater.Apps {
}
}
- public static string UpdateAvailable {
+ internal static string UpdateAvailable {
get {
return ResourceManager.GetString("UpdateAvailable", resourceCulture);
}
}
- public static string UpdateAvailable_Title {
+ internal static string UpdateAvailable_Title {
get {
return ResourceManager.GetString("UpdateAvailable_Title", resourceCulture);
}
}
- public static string ErrorWhileUpdate_Title {
+ internal static string ErrorWhileUpdate_Title {
get {
return ResourceManager.GetString("ErrorWhileUpdate_Title", resourceCulture);
}
}
- public static string ErrorWhileUpdate {
+ internal static string ErrorWhileUpdate {
get {
return ResourceManager.GetString("ErrorWhileUpdate", resourceCulture);
}
diff --git a/ModpackUpdater.Apps/LangRes/MsgBoxLangRes.resx b/ModpackUpdater.Apps/LangRes/GeneralMsgBoxLangRes.resx
similarity index 100%
rename from ModpackUpdater.Apps/LangRes/MsgBoxLangRes.resx
rename to ModpackUpdater.Apps/LangRes/GeneralMsgBoxLangRes.resx
diff --git a/ModpackUpdater.Apps/ModpackUpdater.Apps.csproj b/ModpackUpdater.Apps/ModpackUpdater.Apps.csproj
index 49750fb..1f38140 100644
--- a/ModpackUpdater.Apps/ModpackUpdater.Apps.csproj
+++ b/ModpackUpdater.Apps/ModpackUpdater.Apps.csproj
@@ -12,8 +12,8 @@
-
- PublicResXFileCodeGenerator
+
+ ResXFileCodeGenerator
MsgBoxLangRes.Designer.cs
@@ -43,10 +43,10 @@
True
GeneralLangRes.resx
-
+
True
True
- MsgBoxLangRes.resx
+ GeneralMsgBoxLangRes.resx
True