appupdater
This commit is contained in:
@@ -51,7 +51,7 @@ internal static class SharedFunctions
|
||||
api.Model.Progress.Set(i);
|
||||
}
|
||||
|
||||
api.Model.Progress.End();
|
||||
api.Model.Progress.Stop();
|
||||
}
|
||||
|
||||
public static async Task<bool> CollectUpdates(IMainApi api, params InstallAction[] actions)
|
||||
@@ -122,7 +122,7 @@ internal static class SharedFunctions
|
||||
api.Model.Progress.Set(i);
|
||||
}
|
||||
|
||||
api.Model.Progress.End();
|
||||
api.Model.Progress.Stop();
|
||||
}
|
||||
|
||||
public static void ClearDirectLinks(IMainApi api, params MainWindowGridRow[] rows)
|
||||
@@ -138,7 +138,7 @@ internal static class SharedFunctions
|
||||
api.Model.Progress.Set(i);
|
||||
}
|
||||
|
||||
api.Model.Progress.End();
|
||||
api.Model.Progress.Stop();
|
||||
}
|
||||
|
||||
public static string GenerateChangelog(InstallInfos installInfos, UpdateInfo updateInfos)
|
||||
|
||||
@@ -1,10 +1,9 @@
|
||||
//------------------------------------------------------------------------------
|
||||
// <auto-generated>
|
||||
// Dieser Code wurde von einem Tool generiert.
|
||||
// Laufzeitversion:4.0.30319.42000
|
||||
// This code was generated by a tool.
|
||||
//
|
||||
// Änderungen an dieser Datei können falsches Verhalten verursachen und gehen verloren, wenn
|
||||
// der Code erneut generiert wird.
|
||||
// Changes to this file may cause incorrect behavior and will be lost if
|
||||
// the code is regenerated.
|
||||
// </auto-generated>
|
||||
//------------------------------------------------------------------------------
|
||||
|
||||
@@ -12,46 +11,32 @@ namespace ModpackUpdater.Apps.Manager.LangRes {
|
||||
using System;
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// Eine stark typisierte Ressourcenklasse zum Suchen von lokalisierten Zeichenfolgen usw.
|
||||
/// </summary>
|
||||
// Diese Klasse wurde von der StronglyTypedResourceBuilder automatisch generiert
|
||||
// -Klasse über ein Tool wie ResGen oder Visual Studio automatisch generiert.
|
||||
// Um einen Member hinzuzufügen oder zu entfernen, bearbeiten Sie die .ResX-Datei und führen dann ResGen
|
||||
// mit der /str-Option erneut aus, oder Sie erstellen Ihr VS-Projekt neu.
|
||||
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "17.0.0.0")]
|
||||
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
|
||||
[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
|
||||
internal class MsgBoxLangRes {
|
||||
[System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "17.0.0.0")]
|
||||
[System.Diagnostics.DebuggerNonUserCodeAttribute()]
|
||||
[System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
|
||||
public class MsgBoxLangRes {
|
||||
|
||||
private static global::System.Resources.ResourceManager resourceMan;
|
||||
private static System.Resources.ResourceManager resourceMan;
|
||||
|
||||
private static global::System.Globalization.CultureInfo resourceCulture;
|
||||
private static System.Globalization.CultureInfo resourceCulture;
|
||||
|
||||
[global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
|
||||
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
|
||||
internal MsgBoxLangRes() {
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Gibt die zwischengespeicherte ResourceManager-Instanz zurück, die von dieser Klasse verwendet wird.
|
||||
/// </summary>
|
||||
[global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
|
||||
internal static global::System.Resources.ResourceManager ResourceManager {
|
||||
[System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Advanced)]
|
||||
public static System.Resources.ResourceManager ResourceManager {
|
||||
get {
|
||||
if (object.ReferenceEquals(resourceMan, null)) {
|
||||
global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("ModpackUpdater.Apps.Manager.LangRes.MsgBoxLangRes", typeof(MsgBoxLangRes).Assembly);
|
||||
if (object.Equals(null, resourceMan)) {
|
||||
System.Resources.ResourceManager temp = new System.Resources.ResourceManager("ModpackUpdater.Apps.Manager.LangRes.MsgBoxLangRes", typeof(MsgBoxLangRes).Assembly);
|
||||
resourceMan = temp;
|
||||
}
|
||||
return resourceMan;
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Überschreibt die CurrentUICulture-Eigenschaft des aktuellen Threads für alle
|
||||
/// Ressourcenzuordnungen, die diese stark typisierte Ressourcenklasse verwenden.
|
||||
/// </summary>
|
||||
[global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
|
||||
internal static global::System.Globalization.CultureInfo Culture {
|
||||
[System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Advanced)]
|
||||
public static System.Globalization.CultureInfo Culture {
|
||||
get {
|
||||
return resourceCulture;
|
||||
}
|
||||
@@ -60,76 +45,64 @@ namespace ModpackUpdater.Apps.Manager.LangRes {
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Sucht eine lokalisierte Zeichenfolge, die The changelog for the selected version has been generated and copied to the clipboard. ähnelt.
|
||||
/// </summary>
|
||||
internal static string ChangelogCopiedToClipboard {
|
||||
public static string ChangelogCopiedToClipboard {
|
||||
get {
|
||||
return ResourceManager.GetString("ChangelogCopiedToClipboard", resourceCulture);
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Sucht eine lokalisierte Zeichenfolge, die Changelog generated successfully ähnelt.
|
||||
/// </summary>
|
||||
internal static string ChangelogCopiedToClipboard_Title {
|
||||
public static string ChangelogCopiedToClipboard_Title {
|
||||
get {
|
||||
return ResourceManager.GetString("ChangelogCopiedToClipboard_Title", resourceCulture);
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Sucht eine lokalisierte Zeichenfolge, die The modlist has been generated and copied to the clipboard. ähnelt.
|
||||
/// </summary>
|
||||
internal static string ModlistCopiedToClipboard {
|
||||
public static string ModlistCopiedToClipboard {
|
||||
get {
|
||||
return ResourceManager.GetString("ModlistCopiedToClipboard", resourceCulture);
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Sucht eine lokalisierte Zeichenfolge, die Modlist generated successfully ähnelt.
|
||||
/// </summary>
|
||||
internal static string ModlistCopiedToClipboard_Title {
|
||||
public static string ModlistCopiedToClipboard_Title {
|
||||
get {
|
||||
return ResourceManager.GetString("ModlistCopiedToClipboard_Title", resourceCulture);
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Sucht eine lokalisierte Zeichenfolge, die The modlist has been generated successfully and saved to the selected location. ähnelt.
|
||||
/// </summary>
|
||||
internal static string ModlistGenerated {
|
||||
public static string ModlistGenerated {
|
||||
get {
|
||||
return ResourceManager.GetString("ModlistGenerated", resourceCulture);
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Sucht eine lokalisierte Zeichenfolge, die Modlist generated successfully ähnelt.
|
||||
/// </summary>
|
||||
internal static string ModlistGenerated_Title {
|
||||
public static string ModlistGenerated_Title {
|
||||
get {
|
||||
return ResourceManager.GetString("ModlistGenerated_Title", resourceCulture);
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Sucht eine lokalisierte Zeichenfolge, die Are you sure that you want to delete this update? ähnelt.
|
||||
/// </summary>
|
||||
internal static string RemoveUpdate {
|
||||
public static string RemoveUpdate {
|
||||
get {
|
||||
return ResourceManager.GetString("RemoveUpdate", resourceCulture);
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Sucht eine lokalisierte Zeichenfolge, die Remove update ähnelt.
|
||||
/// </summary>
|
||||
internal static string RemoveUpdate_Title {
|
||||
public static string RemoveUpdate_Title {
|
||||
get {
|
||||
return ResourceManager.GetString("RemoveUpdate_Title", resourceCulture);
|
||||
}
|
||||
}
|
||||
|
||||
public static string UpdateAvailable {
|
||||
get {
|
||||
return ResourceManager.GetString("UpdateAvailable", resourceCulture);
|
||||
}
|
||||
}
|
||||
|
||||
public static string UpdateAvailable_Title {
|
||||
get {
|
||||
return ResourceManager.GetString("UpdateAvailable_Title", resourceCulture);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -141,4 +141,11 @@
|
||||
<data name="RemoveUpdate_Title" xml:space="preserve">
|
||||
<value>Remove update</value>
|
||||
</data>
|
||||
<data name="UpdateAvailable" xml:space="preserve">
|
||||
<value>A new version of this program is available! Install now?
|
||||
If you confirm, the update will be installed automatically within a few seconds.</value>
|
||||
</data>
|
||||
<data name="UpdateAvailable_Title" xml:space="preserve">
|
||||
<value>New program version available</value>
|
||||
</data>
|
||||
</root>
|
||||
@@ -7,6 +7,8 @@ namespace ModpackUpdater.Apps.Manager;
|
||||
|
||||
public static class Program
|
||||
{
|
||||
public const string UpdateUrl = "https://git.pilzinsel64.de/litw-refined/minecraft-modpack-updater/-/snippets/3/raw/main/updates-manager.json";
|
||||
|
||||
internal static readonly SettingsManager settingsManager;
|
||||
|
||||
public static ISettings Settings => settingsManager.Instance;
|
||||
|
||||
@@ -7,8 +7,11 @@ 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;
|
||||
@@ -91,7 +94,7 @@ public partial class MainWindow : Window, IMainApi
|
||||
|
||||
Model.Progress.Start();
|
||||
await ws.Save();
|
||||
Model.Progress.End();
|
||||
Model.Progress.Stop();
|
||||
}
|
||||
|
||||
private void LoadRecentWorkspaces()
|
||||
@@ -126,8 +129,13 @@ public partial class MainWindow : Window, IMainApi
|
||||
settings.Workspaces.RemoveAt(20);
|
||||
}
|
||||
|
||||
private void Window_OnLoaded(object? sender, RoutedEventArgs e)
|
||||
private async void Window_OnLoaded(object? sender, RoutedEventArgs e)
|
||||
{
|
||||
var updater = new AppUpdates(Program.UpdateUrl, this);
|
||||
updater.OnDownloadProgramUpdate += (o, args) => Model.Progress.Start();
|
||||
await updater.UpdateApp();
|
||||
Model.Progress.Stop();
|
||||
|
||||
LoadRecentWorkspaces();
|
||||
}
|
||||
|
||||
|
||||
@@ -40,7 +40,7 @@ public class ProgressInfos : INotifyPropertyChanged
|
||||
Value += 1;
|
||||
}
|
||||
|
||||
public void End()
|
||||
public void Stop()
|
||||
{
|
||||
IsVisible = false;
|
||||
IsGeneric = false;
|
||||
|
||||
@@ -42,7 +42,7 @@ public partial class UpdatesCollectorView : AvaloniaFlyoutBase
|
||||
break;
|
||||
}
|
||||
|
||||
Model.Progress.End();
|
||||
Model.Progress.Stop();
|
||||
}
|
||||
|
||||
protected override object GetResult()
|
||||
|
||||
Reference in New Issue
Block a user