diff --git a/ModpackUpdater.Apps.Manager/Features/SharedFunctions.cs b/ModpackUpdater.Apps.Manager/Features/SharedFunctions.cs index 318dc9d..f621958 100644 --- a/ModpackUpdater.Apps.Manager/Features/SharedFunctions.cs +++ b/ModpackUpdater.Apps.Manager/Features/SharedFunctions.cs @@ -1,9 +1,7 @@ using System.Text; -using Avalonia.Controls; using ModpackUpdater.Apps.Manager.Api.Model; using ModpackUpdater.Apps.Manager.LangRes; using ModpackUpdater.Apps.Manager.Ui; -using ModpackUpdater.Apps.Manager.Ui.Models; using ModpackUpdater.Apps.Manager.Ui.Models.MainWindow; using ModpackUpdater.Apps.Manager.Ui.Models.UpdatesCollectorViewMode; using ModpackUpdater.Manager; diff --git a/ModpackUpdater.Apps.Manager/LangRes/ActionsListLangRes.Designer.cs b/ModpackUpdater.Apps.Manager/LangRes/ActionsListLangRes.Designer.cs index dff9749..39cbc3e 100644 --- a/ModpackUpdater.Apps.Manager/LangRes/ActionsListLangRes.Designer.cs +++ b/ModpackUpdater.Apps.Manager/LangRes/ActionsListLangRes.Designer.cs @@ -1,10 +1,9 @@ //------------------------------------------------------------------------------ // -// 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. // //------------------------------------------------------------------------------ @@ -12,46 +11,32 @@ namespace ModpackUpdater.Apps.Manager.LangRes { using System; - /// - /// Eine stark typisierte Ressourcenklasse zum Suchen von lokalisierten Zeichenfolgen usw. - /// - // 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 ActionsListLangRes { + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")] + [System.Diagnostics.DebuggerNonUserCodeAttribute()] + [System.Runtime.CompilerServices.CompilerGeneratedAttribute()] + public class ActionsListLangRes { - 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 ActionsListLangRes() { } - /// - /// Gibt die zwischengespeicherte ResourceManager-Instanz zurück, die von dieser Klasse verwendet wird. - /// - [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.ActionsListLangRes", typeof(ActionsListLangRes).Assembly); + if (object.Equals(null, resourceMan)) { + System.Resources.ResourceManager temp = new System.Resources.ResourceManager("ModpackUpdater.Apps.Manager.LangRes.ActionsListLangRes", typeof(ActionsListLangRes).Assembly); resourceMan = temp; } return resourceMan; } } - /// - /// Überschreibt die CurrentUICulture-Eigenschaft des aktuellen Threads für alle - /// Ressourcenzuordnungen, die diese stark typisierte Ressourcenklasse verwenden. - /// - [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,163 +45,109 @@ namespace ModpackUpdater.Apps.Manager.LangRes { } } - /// - /// Sucht eine lokalisierte Zeichenfolge, die Destination path ähnelt. - /// - internal static string Col_DestPath { + public static string Col_DestPath { get { return ResourceManager.GetString("Col_DestPath", resourceCulture); } } - /// - /// Sucht eine lokalisierte Zeichenfolge, die Id ähnelt. - /// - internal static string Col_Id { + public static string Col_Id { get { return ResourceManager.GetString("Col_Id", resourceCulture); } } - /// - /// Sucht eine lokalisierte Zeichenfolge, die Inherit from ähnelt. - /// - internal static string Col_InheritFrom { + public static string Col_InheritFrom { get { return ResourceManager.GetString("Col_InheritFrom", resourceCulture); } } - /// - /// Sucht eine lokalisierte Zeichenfolge, die Is directory ähnelt. - /// - internal static string Col_IsDir { + public static string Col_IsDir { get { return ResourceManager.GetString("Col_IsDir", resourceCulture); } } - /// - /// Sucht eine lokalisierte Zeichenfolge, die Is Extra ähnelt. - /// - internal static string Col_IsExtra { + public static string Col_IsExtra { get { return ResourceManager.GetString("Col_IsExtra", resourceCulture); } } - /// - /// Sucht eine lokalisierte Zeichenfolge, die Is ZIP ähnelt. - /// - internal static string Col_IsZip { + public static string Col_IsZip { get { return ResourceManager.GetString("Col_IsZip", resourceCulture); } } - /// - /// Sucht eine lokalisierte Zeichenfolge, die Name ähnelt. - /// - internal static string Col_Name { + public static string Col_Name { get { return ResourceManager.GetString("Col_Name", resourceCulture); } } - /// - /// Sucht eine lokalisierte Zeichenfolge, die Side ähnelt. - /// - internal static string Col_Side { + public static string Col_Side { get { return ResourceManager.GetString("Col_Side", resourceCulture); } } - /// - /// Sucht eine lokalisierte Zeichenfolge, die Source name ähnelt. - /// - internal static string Col_SrcName { + public static string Col_SrcName { get { return ResourceManager.GetString("Col_SrcName", resourceCulture); } } - /// - /// Sucht eine lokalisierte Zeichenfolge, die Source owner ähnelt. - /// - internal static string Col_SrcOwner { + public static string Col_SrcOwner { get { return ResourceManager.GetString("Col_SrcOwner", resourceCulture); } } - /// - /// Sucht eine lokalisierte Zeichenfolge, die Source path ähnelt. - /// - internal static string Col_SrcPath { + public static string Col_SrcPath { get { return ResourceManager.GetString("Col_SrcPath", resourceCulture); } } - /// - /// Sucht eine lokalisierte Zeichenfolge, die Source RegEx ähnelt. - /// - internal static string Col_SrcRegEx { + public static string Col_SrcRegEx { get { return ResourceManager.GetString("Col_SrcRegEx", resourceCulture); } } - /// - /// Sucht eine lokalisierte Zeichenfolge, die Source tag ähnelt. - /// - internal static string Col_SrcTag { + public static string Col_SrcTag { get { return ResourceManager.GetString("Col_SrcTag", resourceCulture); } } - /// - /// Sucht eine lokalisierte Zeichenfolge, die Source type ähnelt. - /// - internal static string Col_SrcType { + public static string Col_SrcType { get { return ResourceManager.GetString("Col_SrcType", resourceCulture); } } - /// - /// Sucht eine lokalisierte Zeichenfolge, die Source URL ähnelt. - /// - internal static string Col_SrcUrl { + public static string Col_SrcUrl { get { return ResourceManager.GetString("Col_SrcUrl", resourceCulture); } } - /// - /// Sucht eine lokalisierte Zeichenfolge, die Update type ähnelt. - /// - internal static string Col_UpdateType { + public static string Col_UpdateType { get { return ResourceManager.GetString("Col_UpdateType", resourceCulture); } } - /// - /// Sucht eine lokalisierte Zeichenfolge, die Website ähnelt. - /// - internal static string Col_Website { + public static string Col_Website { get { return ResourceManager.GetString("Col_Website", resourceCulture); } } - /// - /// Sucht eine lokalisierte Zeichenfolge, die ZIP archive path ähnelt. - /// - internal static string Col_ZipPath { + public static string Col_ZipPath { get { return ResourceManager.GetString("Col_ZipPath", resourceCulture); } diff --git a/ModpackUpdater.Apps.Manager/LangRes/GeneralLangRes.Designer.cs b/ModpackUpdater.Apps.Manager/LangRes/GeneralLangRes.Designer.cs index 851e7f3..4d23cce 100644 --- a/ModpackUpdater.Apps.Manager/LangRes/GeneralLangRes.Designer.cs +++ b/ModpackUpdater.Apps.Manager/LangRes/GeneralLangRes.Designer.cs @@ -45,18 +45,6 @@ namespace ModpackUpdater.Apps.Manager.LangRes { } } - public static string Node_Install { - get { - return ResourceManager.GetString("Node_Install", resourceCulture); - } - } - - public static string Node_Update { - get { - return ResourceManager.GetString("Node_Update", resourceCulture); - } - } - public static string ModlistForVersionX { get { return ResourceManager.GetString("ModlistForVersionX", resourceCulture); @@ -98,5 +86,209 @@ namespace ModpackUpdater.Apps.Manager.LangRes { return ResourceManager.GetString("ModpackConfigUrl", resourceCulture); } } + + public static string Remove { + get { + return ResourceManager.GetString("Remove", resourceCulture); + } + } + + public static string WorkspacePreferences { + get { + return ResourceManager.GetString("WorkspacePreferences", resourceCulture); + } + } + + public static string SaveWorkspace { + get { + return ResourceManager.GetString("SaveWorkspace", resourceCulture); + } + } + + public static string NewWorkspace { + get { + return ResourceManager.GetString("NewWorkspace", resourceCulture); + } + } + + public static string RecentWorkspaces { + get { + return ResourceManager.GetString("RecentWorkspaces", resourceCulture); + } + } + + public static string Workspace { + get { + return ResourceManager.GetString("Workspace", resourceCulture); + } + } + + public static string CreateUpdate { + get { + return ResourceManager.GetString("CreateUpdate", resourceCulture); + } + } + + public static string RemoveUpdate { + get { + return ResourceManager.GetString("RemoveUpdate", resourceCulture); + } + } + + public static string Update { + get { + return ResourceManager.GetString("Update", resourceCulture); + } + } + + public static string Tools { + get { + return ResourceManager.GetString("Tools", resourceCulture); + } + } + + public static string Updates { + get { + return ResourceManager.GetString("Updates", resourceCulture); + } + } + + public static string Add { + get { + return ResourceManager.GetString("Add", resourceCulture); + } + } + + public static string Public { + get { + return ResourceManager.GetString("Public", resourceCulture); + } + } + + public static string Id { + get { + return ResourceManager.GetString("Id", resourceCulture); + } + } + + public static string Side { + get { + return ResourceManager.GetString("Side", resourceCulture); + } + } + + public static string UpdateType { + get { + return ResourceManager.GetString("UpdateType", resourceCulture); + } + } + + public static string SourceType { + get { + return ResourceManager.GetString("SourceType", resourceCulture); + } + } + + public static string DestinationPath { + get { + return ResourceManager.GetString("DestinationPath", resourceCulture); + } + } + + public static string InheritFrom { + get { + return ResourceManager.GetString("InheritFrom", resourceCulture); + } + } + + public static string SourcePath { + get { + return ResourceManager.GetString("SourcePath", resourceCulture); + } + } + + public static string IsDirectory { + get { + return ResourceManager.GetString("IsDirectory", resourceCulture); + } + } + + public static string General { + get { + return ResourceManager.GetString("General", resourceCulture); + } + } + + public static string Name { + get { + return ResourceManager.GetString("Name", resourceCulture); + } + } + + public static string IsExtra { + get { + return ResourceManager.GetString("IsExtra", resourceCulture); + } + } + + public static string Destination { + get { + return ResourceManager.GetString("Destination", resourceCulture); + } + } + + public static string Source { + get { + return ResourceManager.GetString("Source", resourceCulture); + } + } + + public static string IsZipArchive { + get { + return ResourceManager.GetString("IsZipArchive", resourceCulture); + } + } + + public static string SourceOwner { + get { + return ResourceManager.GetString("SourceOwner", resourceCulture); + } + } + + public static string SourceName { + get { + return ResourceManager.GetString("SourceName", resourceCulture); + } + } + + public static string SourceRegex { + get { + return ResourceManager.GetString("SourceRegex", resourceCulture); + } + } + + public static string SourceUrl { + get { + return ResourceManager.GetString("SourceUrl", resourceCulture); + } + } + + public static string ZipArchivePath { + get { + return ResourceManager.GetString("ZipArchivePath", resourceCulture); + } + } + + public static string Metadata { + get { + return ResourceManager.GetString("Metadata", resourceCulture); + } + } + + public static string Website { + get { + return ResourceManager.GetString("Website", resourceCulture); + } + } } } diff --git a/ModpackUpdater.Apps.Manager/LangRes/GeneralLangRes.resx b/ModpackUpdater.Apps.Manager/LangRes/GeneralLangRes.resx index eded90d..f8e1f03 100644 --- a/ModpackUpdater.Apps.Manager/LangRes/GeneralLangRes.resx +++ b/ModpackUpdater.Apps.Manager/LangRes/GeneralLangRes.resx @@ -117,12 +117,6 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - Installation: {0} - - - Update: {0} - Modlist for v{0} @@ -144,4 +138,106 @@ Modpack config url + + Remove + + + Workspace preferences + + + Save workspace + + + New workspace + + + Recent workspace + + + Workspace + + + Create update + + + Remove update + + + Update + + + Tools + + + Updates + + + Add + + + Public + + + Id + + + Side + + + Update type + + + Source type + + + Destination path + + + Inherit from + + + Source path + + + Is directory + + + General + + + Name + + + Is extra + + + Destination + + + Source + + + Is Zip archive + + + Source owner + + + Source name + + + Source RegEx + + + Source URL + + + ZIP archive path + + + Metadata + + + Website + \ No newline at end of file diff --git a/ModpackUpdater.Apps.Manager/Ui/MainWindow.axaml b/ModpackUpdater.Apps.Manager/Ui/MainWindow.axaml index 4d495e1..505a640 100644 --- a/ModpackUpdater.Apps.Manager/Ui/MainWindow.axaml +++ b/ModpackUpdater.Apps.Manager/Ui/MainWindow.axaml @@ -4,10 +4,10 @@ xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:local="clr-namespace:ModpackUpdater.Apps.Manager.Ui" - xmlns:vm="clr-namespace:ModpackUpdater.Apps.Manager.Ui.Models" xmlns:pilz="https://git.pilzinsel64.de/pilz-framework/pilz" xmlns:symbols="clr-namespace:Pilz.UI.Symbols;assembly=Pilz.UI" xmlns:mainWindow="clr-namespace:ModpackUpdater.Apps.Manager.Ui.Models.MainWindow" + xmlns:langRes="clr-namespace:ModpackUpdater.Apps.Manager.LangRes" mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450" x:Class="ModpackUpdater.Apps.Manager.Ui.MainWindow" x:DataType="mainWindow:MainWindowViewModel" @@ -32,18 +32,18 @@ - - + + - + - + @@ -52,14 +52,14 @@ - - + + @@ -68,7 +68,7 @@ @@ -115,7 +115,7 @@ @@ -123,7 +123,7 @@ @@ -137,7 +137,7 @@ @@ -158,24 +158,24 @@ @@ -206,18 +206,18 @@ Spacing="6"> - + -