diff --git a/ModpackUpdater/AppSymbolFactory.cs b/ModpackUpdater/AppSymbolFactory.cs new file mode 100644 index 0000000..f219305 --- /dev/null +++ b/ModpackUpdater/AppSymbolFactory.cs @@ -0,0 +1,19 @@ +using Pilz.UI.Telerik; +using System.Reflection; + +namespace ModpackUpdater; + +public class AppSymbolFactory : SymbolFactory +{ + public static AppSymbolFactory Instance { get; } = new(); + + public override Assembly GetSvgImageResourceAssembly() + { + return Assembly.GetExecutingAssembly(); + } + + public override string GetSvgImageRessourcePath(AppSymbols svgImage) + { + return $"{GetType().Namespace}.Symbols.{svgImage}.svg"; + } +} diff --git a/ModpackUpdater/AppSymbols.cs b/ModpackUpdater/AppSymbols.cs new file mode 100644 index 0000000..fdb37f1 --- /dev/null +++ b/ModpackUpdater/AppSymbols.cs @@ -0,0 +1,20 @@ +namespace ModpackUpdater; + +public enum AppSymbols +{ + checkmark, + close, + delete, + done, + download_from_ftp, + general_warning_sign, + opened_folder, + paste, + refresh, + reload, + save, + services, + software_installer, + update_done, + wrench, +} diff --git a/ModpackUpdater/Form1.Designer.cs b/ModpackUpdater/Form1.Designer.cs index f8ed450..11979be 100644 --- a/ModpackUpdater/Form1.Designer.cs +++ b/ModpackUpdater/Form1.Designer.cs @@ -48,6 +48,7 @@ namespace ModpackUpdater RadButton_SearchModpackConfig = new Telerik.WinControls.UI.RadButton(); RadButton_SearchMinecraftProfileFolder = new Telerik.WinControls.UI.RadButton(); tableLayoutPanel1 = new TableLayoutPanel(); + radButton_RefreshConfig = new Telerik.WinControls.UI.RadButton(); ((System.ComponentModel.ISupportInitialize)RadLabel1).BeginInit(); ((System.ComponentModel.ISupportInitialize)RadLabel2).BeginInit(); ((System.ComponentModel.ISupportInitialize)RadLabel3).BeginInit(); @@ -61,6 +62,7 @@ namespace ModpackUpdater ((System.ComponentModel.ISupportInitialize)RadButton_SearchModpackConfig).BeginInit(); ((System.ComponentModel.ISupportInitialize)RadButton_SearchMinecraftProfileFolder).BeginInit(); tableLayoutPanel1.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)radButton_RefreshConfig).BeginInit(); ((System.ComponentModel.ISupportInitialize)this).BeginInit(); SuspendLayout(); // @@ -132,7 +134,6 @@ namespace ModpackUpdater // RadButton_Install.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right; tableLayoutPanel1.SetColumnSpan(RadButton_Install, 2); - RadButton_Install.Image = My.Resources.MySymbols.icons8_software_installer_16px; RadButton_Install.ImageAlignment = ContentAlignment.MiddleRight; RadButton_Install.Location = new Point(325, 147); RadButton_Install.Name = "RadButton_Install"; @@ -147,7 +148,6 @@ namespace ModpackUpdater // RadButton_CheckForUpdates.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right; tableLayoutPanel1.SetColumnSpan(RadButton_CheckForUpdates, 3); - RadButton_CheckForUpdates.Image = My.Resources.MySymbols.icons8_update_16px; RadButton_CheckForUpdates.ImageAlignment = ContentAlignment.MiddleRight; RadButton_CheckForUpdates.Location = new Point(175, 147); RadButton_CheckForUpdates.Name = "RadButton_CheckForUpdates"; @@ -161,7 +161,6 @@ namespace ModpackUpdater // RadButton_EditModpackConfig // RadButton_EditModpackConfig.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right; - RadButton_EditModpackConfig.Image = My.Resources.MySymbols.icons8_wrench_16px; RadButton_EditModpackConfig.ImageAlignment = ContentAlignment.MiddleRight; RadButton_EditModpackConfig.Location = new Point(3, 147); RadButton_EditModpackConfig.Name = "RadButton_EditModpackConfig"; @@ -176,7 +175,6 @@ namespace ModpackUpdater // RadButton_PasteModpackConfig.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right; tableLayoutPanel1.SetColumnSpan(RadButton_PasteModpackConfig, 2); - RadButton_PasteModpackConfig.Image = (Image)resources.GetObject("RadButton_PasteModpackConfig.Image"); RadButton_PasteModpackConfig.ImageAlignment = ContentAlignment.MiddleRight; RadButton_PasteModpackConfig.Location = new Point(225, 89); RadButton_PasteModpackConfig.Name = "RadButton_PasteModpackConfig"; @@ -191,7 +189,6 @@ namespace ModpackUpdater // RadButton_SearchModpackConfig.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right; tableLayoutPanel1.SetColumnSpan(RadButton_SearchModpackConfig, 2); - RadButton_SearchModpackConfig.Image = (Image)resources.GetObject("RadButton_SearchModpackConfig.Image"); RadButton_SearchModpackConfig.ImageAlignment = ContentAlignment.MiddleRight; RadButton_SearchModpackConfig.Location = new Point(325, 89); RadButton_SearchModpackConfig.Name = "RadButton_SearchModpackConfig"; @@ -206,7 +203,6 @@ namespace ModpackUpdater // RadButton_SearchMinecraftProfileFolder.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right; tableLayoutPanel1.SetColumnSpan(RadButton_SearchMinecraftProfileFolder, 2); - RadButton_SearchMinecraftProfileFolder.Image = (Image)resources.GetObject("RadButton_SearchMinecraftProfileFolder.Image"); RadButton_SearchMinecraftProfileFolder.ImageAlignment = ContentAlignment.MiddleRight; RadButton_SearchMinecraftProfileFolder.Location = new Point(325, 31); RadButton_SearchMinecraftProfileFolder.Name = "RadButton_SearchMinecraftProfileFolder"; @@ -239,6 +235,7 @@ namespace ModpackUpdater tableLayoutPanel1.Controls.Add(RadButton_SearchModpackConfig, 5, 3); tableLayoutPanel1.Controls.Add(RadButton_PasteModpackConfig, 3, 3); tableLayoutPanel1.Controls.Add(RadButton_Install, 5, 5); + tableLayoutPanel1.Controls.Add(radButton_RefreshConfig, 2, 3); tableLayoutPanel1.Dock = DockStyle.Fill; tableLayoutPanel1.Location = new Point(0, 0); tableLayoutPanel1.Name = "tableLayoutPanel1"; @@ -252,6 +249,18 @@ namespace ModpackUpdater tableLayoutPanel1.Size = new Size(422, 174); tableLayoutPanel1.TabIndex = 7; // + // radButton_RefreshConfig + // + radButton_RefreshConfig.Anchor = AnchorStyles.Top | AnchorStyles.Right; + radButton_RefreshConfig.DisplayStyle = Telerik.WinControls.DisplayStyle.Image; + radButton_RefreshConfig.ImageAlignment = ContentAlignment.MiddleCenter; + radButton_RefreshConfig.Location = new Point(195, 89); + radButton_RefreshConfig.Name = "radButton_RefreshConfig"; + radButton_RefreshConfig.Size = new Size(24, 24); + radButton_RefreshConfig.TabIndex = 11; + radButton_RefreshConfig.Text = "Reload"; + radButton_RefreshConfig.Click += RadButton_RefreshConfig_Click; + // // Form1 // AutoScaleBaseSize = new Size(7, 15); @@ -280,6 +289,7 @@ namespace ModpackUpdater ((System.ComponentModel.ISupportInitialize)RadButton_SearchModpackConfig).EndInit(); ((System.ComponentModel.ISupportInitialize)RadButton_SearchMinecraftProfileFolder).EndInit(); tableLayoutPanel1.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)radButton_RefreshConfig).EndInit(); ((System.ComponentModel.ISupportInitialize)this).EndInit(); ResumeLayout(false); } @@ -297,5 +307,6 @@ namespace ModpackUpdater internal Telerik.WinControls.UI.RadButton RadButton_SearchMinecraftProfileFolder; internal Telerik.WinControls.UI.RadButton RadButton_PasteModpackConfig; private TableLayoutPanel tableLayoutPanel1; + private Telerik.WinControls.UI.RadButton radButton_RefreshConfig; } } \ No newline at end of file diff --git a/ModpackUpdater/Form1.cs b/ModpackUpdater/Form1.cs index 73b498a..2877a03 100644 --- a/ModpackUpdater/Form1.cs +++ b/ModpackUpdater/Form1.cs @@ -1,6 +1,7 @@ using ModpackUpdater.Manager; using ModpackUpdater.Model; using ModpackUpdater.My.Resources; +using Pilz.UI.Telerik; using System.Diagnostics; using Telerik.WinControls; using Telerik.WinControls.UI; @@ -28,7 +29,16 @@ public partial class Form1 public Form1() { InitializeComponent(); + Text = $"{Text} (v{Application.ProductVersion})"; + + RadButton_Install.SvgImage = AppSymbolFactory.Instance.GetSvgImage(AppSymbols.software_installer, SvgImageSize.Small); + RadButton_CheckForUpdates.SvgImage = AppSymbolFactory.Instance.GetSvgImage(AppSymbols.update_done, SvgImageSize.Small); + RadButton_EditModpackConfig.SvgImage = AppSymbolFactory.Instance.GetSvgImage(AppSymbols.wrench, SvgImageSize.Small); + radButton_RefreshConfig.SvgImage = AppSymbolFactory.Instance.GetSvgImage(AppSymbols.refresh, SvgImageSize.Small); + RadButton_SearchMinecraftProfileFolder.SvgImage = AppSymbolFactory.Instance.GetSvgImage(AppSymbols.opened_folder, SvgImageSize.Small); + RadButton_SearchModpackConfig.SvgImage = AppSymbolFactory.Instance.GetSvgImage(AppSymbols.opened_folder, SvgImageSize.Small); + RadButton_PasteModpackConfig.SvgImage = AppSymbolFactory.Instance.GetSvgImage(AppSymbols.paste, SvgImageSize.Small); } private bool IsMinecaftProfileLoaded() @@ -57,12 +67,12 @@ public partial class Form1 if (!IsMinecaftProfileLoaded() || !MinecraftProfileChecker.CheckProfile(GetMinecraftProfilePath())) { - SetStatus(LangRes.StatusText_MinecraftProfileWarning, MySymbols.icons8_general_warning_sign_16px); + SetStatus(LangRes.StatusText_MinecraftProfileWarning, AppSymbolFactory.Instance.GetSvgImage(AppSymbols.general_warning_sign, SvgImageSize.Small)); CheckStatusRet = false; } else if (!IsUpdateConfigLoaded()) { - SetStatus(LangRes.StatusText_MinecraftProfileWarning, MySymbols.icons8_general_warning_sign_16px); + SetStatus(LangRes.StatusText_MinecraftProfileWarning, AppSymbolFactory.Instance.GetSvgImage(AppSymbols.general_warning_sign, SvgImageSize.Small)); CheckStatusRet = false; } else @@ -71,16 +81,16 @@ public partial class Form1 return CheckStatusRet; } - private void SetStatus(string statusText, Image image) + private void SetStatus(string statusText, RadSvgImage image) { RadLabel_Status.Text = statusText; - RadLabel_Status.Image = image; + RadLabel_Status.SvgImage = image; } private void ClearStatus() { RadLabel_Status.Text = "-"; - RadLabel_Status.Image = null; + RadLabel_Status.SvgImage = null; } private void LoadMinecraftProfile(string folderPath) @@ -107,7 +117,9 @@ public partial class Form1 RadTextBoxControl_ModpackConfig.Text = string.Empty; } - if (IsMinecaftProfileLoaded()) + if (updateConfig != null && updateConfig.Maintenance && !updateOptions.IgnoreMaintenance) + SetStatus(LangRes.StatusText_Maintenance, AppSymbolFactory.Instance.GetSvgImage(AppSymbols.services, SvgImageSize.Small)); + else if (IsMinecaftProfileLoaded()) RadButton_CheckForUpdates.PerformClick(); else ClearStatus(); @@ -122,7 +134,7 @@ public partial class Form1 // Check only if not pressed "install", not really needed otherwise. if (lastUpdateCheckResult is null || !doInstall) { - SetStatus(LangRes.StatusText_CheckingForUpdates, MySymbols.icons8_update_16px); + SetStatus(LangRes.StatusText_CheckingForUpdates, AppSymbolFactory.Instance.GetSvgImage(AppSymbols.update_done, SvgImageSize.Small)); try { @@ -130,7 +142,7 @@ public partial class Form1 } catch { - SetStatus(LangRes.StatusText_ErrorWhileUpdateCheckOrUpdate, MySymbols.icons8_delete_16px); + SetStatus(LangRes.StatusText_ErrorWhileUpdateCheckOrUpdate, AppSymbolFactory.Instance.GetSvgImage(AppSymbols.close, SvgImageSize.Small)); } finally { @@ -138,12 +150,12 @@ public partial class Form1 } if (lastUpdateCheckResult is null || lastUpdateCheckResult.HasError) - SetStatus(LangRes.StatusText_ErrorWhileUpdateCheckOrUpdate, MySymbols.icons8_delete_16px); + SetStatus(LangRes.StatusText_ErrorWhileUpdateCheckOrUpdate, AppSymbolFactory.Instance.GetSvgImage(AppSymbols.close, SvgImageSize.Small)); else if (lastUpdateCheckResult.HasUpdates) { if (doInstall) { - SetStatus(LangRes.StatusText_Installing, MySymbols.icons8_software_installer_16px); + SetStatus(LangRes.StatusText_Installing, AppSymbolFactory.Instance.GetSvgImage(AppSymbols.software_installer, SvgImageSize.Small)); currentUpdating = true; try @@ -151,14 +163,14 @@ public partial class Form1 if (await updater.Install(lastUpdateCheckResult) == true) { lastUpdateCheckResult = null; // Reset last update check, a new one would be needed now. - SetStatus(LangRes.StatusTest_EverythingOk, MySymbols.icons8_checkmark_16px); + SetStatus(LangRes.StatusTest_EverythingOk, AppSymbolFactory.Instance.GetSvgImage(AppSymbols.done, SvgImageSize.Small)); } else - SetStatus(LangRes.StatusText_ErrorWhileUpdateCheckOrUpdate, MySymbols.icons8_delete_16px); + SetStatus(LangRes.StatusText_ErrorWhileUpdateCheckOrUpdate, AppSymbolFactory.Instance.GetSvgImage(AppSymbols.close, SvgImageSize.Small)); } - catch(Exception) + catch (Exception) { - SetStatus(LangRes.StatusText_ErrorWhileUpdateCheckOrUpdate, MySymbols.icons8_delete_16px); + SetStatus(LangRes.StatusText_ErrorWhileUpdateCheckOrUpdate, AppSymbolFactory.Instance.GetSvgImage(AppSymbols.close, SvgImageSize.Small)); if (Debugger.IsAttached) throw; } @@ -168,21 +180,21 @@ public partial class Form1 } } else - SetStatus(LangRes.StatusText_UpdateAvailable, MySymbols.icons8_software_installer_16px); + SetStatus(LangRes.StatusText_UpdateAvailable, AppSymbolFactory.Instance.GetSvgImage(AppSymbols.software_installer, SvgImageSize.Small)); } else - SetStatus(LangRes.StatusTest_EverythingOk, MySymbols.icons8_checkmark_16px); + SetStatus(LangRes.StatusTest_EverythingOk, AppSymbolFactory.Instance.GetSvgImage(AppSymbols.done, SvgImageSize.Small)); } private void Update_InstallProgessUpdated(UpdateCheckResult result, int processedSyncs) { int actionCount = result.Actions.Count; - SetStatus(Math.Round(processedSyncs / (double)actionCount * 100d, 1) + "%", MySymbols.icons8_software_installer_16px); + SetStatus(Math.Round(processedSyncs / (double)actionCount * 100d, 1) + "%", AppSymbolFactory.Instance.GetSvgImage(AppSymbols.software_installer, SvgImageSize.Small)); } private void Updated_CheckingProgresssUpdated(int toCheck, int processed) { - SetStatus(Math.Round(processed / (double)toCheck * 100d, 1) + "%", MySymbols.icons8_update_16px); + SetStatus(Math.Round(processed / (double)toCheck * 100d, 1) + "%", AppSymbolFactory.Instance.GetSvgImage(AppSymbols.update_done, SvgImageSize.Small)); } private void ButtonX_SearchMinecraftProfile_Click(object sender, EventArgs e) @@ -208,6 +220,11 @@ public partial class Form1 LoadUpdateConfigFile(text); } + private void RadButton_RefreshConfig_Click(object sender, EventArgs e) + { + LoadUpdateConfigFile(RadTextBoxControl_ModpackConfig.Text); + } + private async void ButtonX_CheckForUpdates_Click(object sender, EventArgs e) { ClearStatus(); @@ -244,7 +261,7 @@ public partial class Form1 var updater = new AppUpdater(); if (!updateOptions.NoUpdate && await updater.Check() && RadMessageBox.Show(LangRes.MsgBox_UpdateAvailable, LangRes.MsgBox_UpdateAvailable_Title, MessageBoxButtons.YesNo, RadMessageIcon.Info) == DialogResult.Yes) { - SetStatus(LangRes.StatusText_InstallingAppUpdate, MySymbols.icons8_software_installer_16px); + SetStatus(LangRes.StatusText_InstallingAppUpdate, AppSymbolFactory.Instance.GetSvgImage(AppSymbols.software_installer, SvgImageSize.Small)); Enabled = false; await updater.Install(); Application.Restart(); diff --git a/ModpackUpdater/Form1.resx b/ModpackUpdater/Form1.resx index ae1db40..7abadd4 100644 --- a/ModpackUpdater/Form1.resx +++ b/ModpackUpdater/Form1.resx @@ -118,34 +118,6 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAMhJREFUOE9j - GBzg/34Glv8LGNz+z2cIheNFDNxQacIAqLkZiP+j4PkMB4g25P9ChlUYBuDGP4F4DlQrBJBoAAj/gWqF - ALgBi5j+/z+o8P//SY3//08RxHf/n9GWQzVgNTc2hXiwZjiqAZuFsSjCg09rGaIasFsKu0Ls+Pf/2yrs - qAYcVsSmEBe+CtYMAmADFjICBdXRFeHB6iug2oEGLGBo+b+CA4sifFgzC6odaAAoKa/lDPy/S6KMKLxf - Kvz/fwZGqPYBBQwMAFjinO6ZYVu0AAAAAElFTkSuQmCC - - - - - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAMhJREFUOE9j - GBzg/34Glv8LGNz+z2cIheNFDNxQacIAqLkZiP+j4PkMB4g25P9ChlUYBuDGP4F4DlQrBJBoAAj/gWqF - ALgBi5j+/z+o8P//SY3//08RxHf/n9GWQzVgNTc2hXiwZjiqAZuFsSjCg09rGaIasFsKu0Ls+Pf/2yrs - qAYcVsSmEBe+CtYMAmADFjICBdXRFeHB6iug2oEGLGBo+b+CA4sifFgzC6odaAAoKa/lDPy/S6KMKLxf - Kvz/fwZGqPYBBQwMAFjinO6ZYVu0AAAAAElFTkSuQmCC - - - - - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAO9JREFUOE9j - wAUmLFujB8JQLmlg0uJ1+hOWrFsFwn1LNuhChfED16iUeUD8E6jpPwj3Llrzsm/hmlcwPkgOiOdAlWMC - oOTfHz9//Z+7bjtYAzKeu37Hf5AcUM0fqHJMAJT8TwiA1ECVYwJkAz7//Pf/1tu/GDiuftr/CSd/hoIw - VBsCIBsAUjzh1E+8GKoNAWhigMOk+xg4eukL4g3IWPcGBcNsp58BFHsBXTPMdqwGuESlfNp9+Nj/gydO - /9944haKYmwYqg0BXCJTg12jU1a6RqWuSutaegybJmQM1YYdTDrxy2LiyZ+r8WGISgYGAOT2/8PrpxzK - AAAAAElFTkSuQmCC - - AAABAAYAEBAAAAEAIABoBAAAZgAAACAgAAABACAAqBAAAM4EAAAwMAAAAQAgAKglAAB2FQAAQEAAAAEA diff --git a/ModpackUpdater/LangRes.Designer.cs b/ModpackUpdater/LangRes.Designer.cs index 78993dd..0b29250 100644 --- a/ModpackUpdater/LangRes.Designer.cs +++ b/ModpackUpdater/LangRes.Designer.cs @@ -1,183 +1,162 @@ -// ------------------------------------------------------------------------------ +//------------------------------------------------------------------------------ // -// Dieser Code wurde von einem Tool generiert. -// Laufzeitversion:4.0.30319.42000 -// -// Änderungen an dieser Datei können falsches Verhalten verursachen und gehen verloren, wenn -// der Code erneut generiert wird. +// Dieser Code wurde von einem Tool generiert. +// Laufzeitversion:4.0.30319.42000 +// +// Änderungen an dieser Datei können falsches Verhalten verursachen und gehen verloren, wenn +// der Code erneut generiert wird. // -// ------------------------------------------------------------------------------ - - -using System.Diagnostics; - -namespace ModpackUpdater.My.Resources -{ +//------------------------------------------------------------------------------ +namespace ModpackUpdater.My.Resources { + 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. - /// - /// Eine stark typisierte Ressourcenklasse zum Suchen von lokalisierten Zeichenfolgen usw. - /// - [System.CodeDom.Compiler.GeneratedCode("System.Resources.Tools.StronglyTypedResourceBuilder", "17.0.0.0")] - [DebuggerNonUserCode()] - [System.Runtime.CompilerServices.CompilerGenerated()] - internal class LangRes - { - - private static System.Resources.ResourceManager resourceMan; - - private static System.Globalization.CultureInfo resourceCulture; - - [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")] - internal LangRes() : base() - { + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "17.0.0.0")] + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] + internal class LangRes { + + private static global::System.Resources.ResourceManager resourceMan; + + private static global::System.Globalization.CultureInfo resourceCulture; + + [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")] + internal LangRes() { } - + /// - /// Gibt die zwischengespeicherte ResourceManager-Instanz zurück, die von dieser Klasse verwendet wird. + /// Gibt die zwischengespeicherte ResourceManager-Instanz zurück, die von dieser Klasse verwendet wird. /// - [System.ComponentModel.EditorBrowsable(System.ComponentModel.EditorBrowsableState.Advanced)] - internal static System.Resources.ResourceManager ResourceManager - { - get - { - if (ReferenceEquals(resourceMan, null)) - { - var temp = new System.Resources.ResourceManager("ModpackUpdater.LangRes", typeof(LangRes).Assembly); + [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] + internal static global::System.Resources.ResourceManager ResourceManager { + get { + if (object.ReferenceEquals(resourceMan, null)) { + global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("ModpackUpdater.LangRes", typeof(LangRes).Assembly); resourceMan = temp; } return resourceMan; } } - + /// - /// Überschreibt die CurrentUICulture-Eigenschaft des aktuellen Threads für alle - /// Ressourcenzuordnungen, die diese stark typisierte Ressourcenklasse verwenden. + /// Überschreibt die CurrentUICulture-Eigenschaft des aktuellen Threads für alle + /// Ressourcenzuordnungen, die diese stark typisierte Ressourcenklasse verwenden. /// - [System.ComponentModel.EditorBrowsable(System.ComponentModel.EditorBrowsableState.Advanced)] - internal static System.Globalization.CultureInfo Culture - { - get - { + [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] + internal static global::System.Globalization.CultureInfo Culture { + get { return resourceCulture; } - set - { + set { resourceCulture = value; } } - + /// - /// Sucht eine lokalisierte Zeichenfolge, die A new version of this program is available. If you confirm, the update will be installed automatically. It takes just a few seconds. Continue? ähnelt. + /// Sucht eine lokalisierte Zeichenfolge, die A new version of this program is available. If you confirm, the update will be installed automatically. It takes just a few seconds. Continue? ähnelt. /// - internal static string MsgBox_UpdateAvailable - { - get - { + internal static string MsgBox_UpdateAvailable { + get { return ResourceManager.GetString("MsgBox_UpdateAvailable", resourceCulture); } } - + /// - /// Sucht eine lokalisierte Zeichenfolge, die New program version available ähnelt. + /// Sucht eine lokalisierte Zeichenfolge, die New program version available ähnelt. /// - internal static string MsgBox_UpdateAvailable_Title - { - get - { + internal static string MsgBox_UpdateAvailable_Title { + get { return ResourceManager.GetString("MsgBox_UpdateAvailable_Title", resourceCulture); } } - + /// - /// Sucht eine lokalisierte Zeichenfolge, die Everything is right and up-to-date. ähnelt. + /// Sucht eine lokalisierte Zeichenfolge, die Everything is right and up-to-date. ähnelt. /// - internal static string StatusTest_EverythingOk - { - get - { + internal static string StatusTest_EverythingOk { + get { return ResourceManager.GetString("StatusTest_EverythingOk", resourceCulture); } } - + /// - /// Sucht eine lokalisierte Zeichenfolge, die Checking for Updates... ähnelt. + /// Sucht eine lokalisierte Zeichenfolge, die Checking for Updates... ähnelt. /// - internal static string StatusText_CheckingForUpdates - { - get - { + internal static string StatusText_CheckingForUpdates { + get { return ResourceManager.GetString("StatusText_CheckingForUpdates", resourceCulture); } } - + /// - /// Sucht eine lokalisierte Zeichenfolge, die Config incomplete or not loaded! ähnelt. + /// Sucht eine lokalisierte Zeichenfolge, die Config incomplete or not loaded! ähnelt. /// - internal static string StatusText_ConfigIncompleteOrNotLoaded - { - get - { + internal static string StatusText_ConfigIncompleteOrNotLoaded { + get { return ResourceManager.GetString("StatusText_ConfigIncompleteOrNotLoaded", resourceCulture); } } - + /// - /// Sucht eine lokalisierte Zeichenfolge, die Error on update check or while updating! ähnelt. + /// Sucht eine lokalisierte Zeichenfolge, die Error on update check or while updating! ähnelt. /// - internal static string StatusText_ErrorWhileUpdateCheckOrUpdate - { - get - { + internal static string StatusText_ErrorWhileUpdateCheckOrUpdate { + get { return ResourceManager.GetString("StatusText_ErrorWhileUpdateCheckOrUpdate", resourceCulture); } } - + /// - /// Sucht eine lokalisierte Zeichenfolge, die Installing... ähnelt. + /// Sucht eine lokalisierte Zeichenfolge, die Installing... ähnelt. /// - internal static string StatusText_Installing - { - get - { + internal static string StatusText_Installing { + get { return ResourceManager.GetString("StatusText_Installing", resourceCulture); } } - + /// - /// Sucht eine lokalisierte Zeichenfolge, die Downloading program update... ähnelt. + /// Sucht eine lokalisierte Zeichenfolge, die Downloading program update... ähnelt. /// - internal static string StatusText_InstallingAppUpdate - { - get - { + internal static string StatusText_InstallingAppUpdate { + get { return ResourceManager.GetString("StatusText_InstallingAppUpdate", resourceCulture); } } - + /// - /// Sucht eine lokalisierte Zeichenfolge, die Minecraft profile folder seems to be not valid. ähnelt. + /// Sucht eine lokalisierte Zeichenfolge, die The update server is currently in maintenance mode. ähnelt. /// - internal static string StatusText_MinecraftProfileWarning - { - get - { + internal static string StatusText_Maintenance { + get { + return ResourceManager.GetString("StatusText_Maintenance", resourceCulture); + } + } + + /// + /// Sucht eine lokalisierte Zeichenfolge, die Minecraft profile folder seems to be not valid. ähnelt. + /// + internal static string StatusText_MinecraftProfileWarning { + get { return ResourceManager.GetString("StatusText_MinecraftProfileWarning", resourceCulture); } } - + /// - /// Sucht eine lokalisierte Zeichenfolge, die An update is available! ähnelt. + /// Sucht eine lokalisierte Zeichenfolge, die An update is available! ähnelt. /// - internal static string StatusText_UpdateAvailable - { - get - { + internal static string StatusText_UpdateAvailable { + get { return ResourceManager.GetString("StatusText_UpdateAvailable", resourceCulture); } } } -} \ No newline at end of file +} diff --git a/ModpackUpdater/LangRes.resx b/ModpackUpdater/LangRes.resx index 6c0d2ec..513032f 100644 --- a/ModpackUpdater/LangRes.resx +++ b/ModpackUpdater/LangRes.resx @@ -141,6 +141,9 @@ Downloading program update... + + The update server is currently in maintenance mode. + Minecraft profile folder seems to be not valid. diff --git a/ModpackUpdater/ModpackUpdater.csproj b/ModpackUpdater/ModpackUpdater.csproj index 17e02a8..79fab66 100644 --- a/ModpackUpdater/ModpackUpdater.csproj +++ b/ModpackUpdater/ModpackUpdater.csproj @@ -30,11 +30,6 @@ True LangRes.resx - - True - True - MySymbols.resx - @@ -48,11 +43,6 @@ ModpackUpdater.My.Resources LangRes.Designer.cs - - ResXFileCodeGenerator - ModpackUpdater.My.Resources - MySymbols.Designer.cs - @@ -61,6 +51,7 @@ + @@ -69,5 +60,9 @@ + + + + \ No newline at end of file diff --git a/ModpackUpdater/MySymbols.Designer.cs b/ModpackUpdater/MySymbols.Designer.cs deleted file mode 100644 index ca7dc7f..0000000 --- a/ModpackUpdater/MySymbols.Designer.cs +++ /dev/null @@ -1,182 +0,0 @@ -// ------------------------------------------------------------------------------ -// -// Dieser Code wurde von einem Tool generiert. -// Laufzeitversion:4.0.30319.42000 -// -// Änderungen an dieser Datei können falsches Verhalten verursachen und gehen verloren, wenn -// der Code erneut generiert wird. -// -// ------------------------------------------------------------------------------ - - -using System.Diagnostics; -using System.Drawing; - -namespace ModpackUpdater.My.Resources -{ - - // 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. - /// - /// Eine stark typisierte Ressourcenklasse zum Suchen von lokalisierten Zeichenfolgen usw. - /// - [System.CodeDom.Compiler.GeneratedCode("System.Resources.Tools.StronglyTypedResourceBuilder", "17.0.0.0")] - [DebuggerNonUserCode()] - [System.Runtime.CompilerServices.CompilerGenerated()] - internal class MySymbols - { - - private static System.Resources.ResourceManager resourceMan; - - private static System.Globalization.CultureInfo resourceCulture; - - [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")] - internal MySymbols() : base() - { - } - - /// - /// Gibt die zwischengespeicherte ResourceManager-Instanz zurück, die von dieser Klasse verwendet wird. - /// - [System.ComponentModel.EditorBrowsable(System.ComponentModel.EditorBrowsableState.Advanced)] - internal static System.Resources.ResourceManager ResourceManager - { - get - { - if (ReferenceEquals(resourceMan, null)) - { - var temp = new System.Resources.ResourceManager("ModpackUpdater.MySymbols", typeof(MySymbols).Assembly); - resourceMan = temp; - } - return resourceMan; - } - } - - /// - /// Überschreibt die CurrentUICulture-Eigenschaft des aktuellen Threads für alle - /// Ressourcenzuordnungen, die diese stark typisierte Ressourcenklasse verwenden. - /// - [System.ComponentModel.EditorBrowsable(System.ComponentModel.EditorBrowsableState.Advanced)] - internal static System.Globalization.CultureInfo Culture - { - get - { - return resourceCulture; - } - set - { - resourceCulture = value; - } - } - - /// - /// Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. - /// - internal static Bitmap icons8_checkmark_16px - { - get - { - var obj = ResourceManager.GetObject("icons8_checkmark_16px", resourceCulture); - return (Bitmap)obj; - } - } - - /// - /// Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. - /// - internal static Bitmap icons8_delete_16px - { - get - { - var obj = ResourceManager.GetObject("icons8_delete_16px", resourceCulture); - return (Bitmap)obj; - } - } - - /// - /// Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. - /// - internal static Bitmap icons8_download_from_ftp_16px - { - get - { - var obj = ResourceManager.GetObject("icons8_download_from_ftp_16px", resourceCulture); - return (Bitmap)obj; - } - } - - /// - /// Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. - /// - internal static Bitmap icons8_general_warning_sign_16px - { - get - { - var obj = ResourceManager.GetObject("icons8_general_warning_sign_16px", resourceCulture); - return (Bitmap)obj; - } - } - - /// - /// Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. - /// - internal static Bitmap icons8_opened_folder_16px - { - get - { - var obj = ResourceManager.GetObject("icons8_opened_folder_16px", resourceCulture); - return (Bitmap)obj; - } - } - - /// - /// Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. - /// - internal static Bitmap icons8_save_16px - { - get - { - var obj = ResourceManager.GetObject("icons8_save_16px", resourceCulture); - return (Bitmap)obj; - } - } - - /// - /// Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. - /// - internal static Bitmap icons8_software_installer_16px - { - get - { - var obj = ResourceManager.GetObject("icons8_software_installer_16px", resourceCulture); - return (Bitmap)obj; - } - } - - /// - /// Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. - /// - internal static Bitmap icons8_update_16px - { - get - { - var obj = ResourceManager.GetObject("icons8_update_16px", resourceCulture); - return (Bitmap)obj; - } - } - - /// - /// Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. - /// - internal static Bitmap icons8_wrench_16px - { - get - { - var obj = ResourceManager.GetObject("icons8_wrench_16px", resourceCulture); - return (Bitmap)obj; - } - } - } -} \ No newline at end of file diff --git a/ModpackUpdater/MySymbols.resx b/ModpackUpdater/MySymbols.resx deleted file mode 100644 index 5ab8ecc..0000000 --- a/ModpackUpdater/MySymbols.resx +++ /dev/null @@ -1,148 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - text/microsoft-resx - - - 2.0 - - - System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - - Resources\icons8_checkmark_16px.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - Resources\icons8_delete_16px.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - Resources\icons8_download_from_ftp_16px.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - Resources\icons8_general_warning_sign_16px.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - Resources\icons8_opened_folder_16px.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - Resources\icons8_save_16px.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - Resources\icons8_software_installer_16px.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - Resources\icons8_update_16px.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - Resources\icons8_wrench_16px.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - \ No newline at end of file diff --git a/ModpackUpdater/Resources/icons8_checkmark_16px.png b/ModpackUpdater/Resources/icons8_checkmark_16px.png deleted file mode 100644 index 15b6e2c..0000000 Binary files a/ModpackUpdater/Resources/icons8_checkmark_16px.png and /dev/null differ diff --git a/ModpackUpdater/Resources/icons8_delete_16px.png b/ModpackUpdater/Resources/icons8_delete_16px.png deleted file mode 100644 index 8282e7e..0000000 Binary files a/ModpackUpdater/Resources/icons8_delete_16px.png and /dev/null differ diff --git a/ModpackUpdater/Resources/icons8_download_from_ftp_16px.png b/ModpackUpdater/Resources/icons8_download_from_ftp_16px.png deleted file mode 100644 index 5a7b062..0000000 Binary files a/ModpackUpdater/Resources/icons8_download_from_ftp_16px.png and /dev/null differ diff --git a/ModpackUpdater/Resources/icons8_general_warning_sign_16px.png b/ModpackUpdater/Resources/icons8_general_warning_sign_16px.png deleted file mode 100644 index 3db6b05..0000000 Binary files a/ModpackUpdater/Resources/icons8_general_warning_sign_16px.png and /dev/null differ diff --git a/ModpackUpdater/Resources/icons8_opened_folder_16px.png b/ModpackUpdater/Resources/icons8_opened_folder_16px.png deleted file mode 100644 index 94708b7..0000000 Binary files a/ModpackUpdater/Resources/icons8_opened_folder_16px.png and /dev/null differ diff --git a/ModpackUpdater/Resources/icons8_save_16px.png b/ModpackUpdater/Resources/icons8_save_16px.png deleted file mode 100644 index 0e51657..0000000 Binary files a/ModpackUpdater/Resources/icons8_save_16px.png and /dev/null differ diff --git a/ModpackUpdater/Resources/icons8_software_installer_16px.png b/ModpackUpdater/Resources/icons8_software_installer_16px.png deleted file mode 100644 index e5663b5..0000000 Binary files a/ModpackUpdater/Resources/icons8_software_installer_16px.png and /dev/null differ diff --git a/ModpackUpdater/Resources/icons8_update_16px.png b/ModpackUpdater/Resources/icons8_update_16px.png deleted file mode 100644 index 8582ae8..0000000 Binary files a/ModpackUpdater/Resources/icons8_update_16px.png and /dev/null differ diff --git a/ModpackUpdater/Resources/icons8_wrench_16px.png b/ModpackUpdater/Resources/icons8_wrench_16px.png deleted file mode 100644 index ef9d803..0000000 Binary files a/ModpackUpdater/Resources/icons8_wrench_16px.png and /dev/null differ diff --git a/ModpackUpdater/Symbols/checkmark.svg b/ModpackUpdater/Symbols/checkmark.svg new file mode 100644 index 0000000..0ec54cb --- /dev/null +++ b/ModpackUpdater/Symbols/checkmark.svg @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/ModpackUpdater/Symbols/close.svg b/ModpackUpdater/Symbols/close.svg new file mode 100644 index 0000000..fb5ed9c --- /dev/null +++ b/ModpackUpdater/Symbols/close.svg @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/ModpackUpdater/Symbols/delete.svg b/ModpackUpdater/Symbols/delete.svg new file mode 100644 index 0000000..72b0583 --- /dev/null +++ b/ModpackUpdater/Symbols/delete.svg @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/ModpackUpdater/Symbols/done.svg b/ModpackUpdater/Symbols/done.svg new file mode 100644 index 0000000..126184a --- /dev/null +++ b/ModpackUpdater/Symbols/done.svg @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/ModpackUpdater/Symbols/download_from_ftp.svg b/ModpackUpdater/Symbols/download_from_ftp.svg new file mode 100644 index 0000000..340a861 --- /dev/null +++ b/ModpackUpdater/Symbols/download_from_ftp.svg @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/ModpackUpdater/Symbols/general_warning_sign.svg b/ModpackUpdater/Symbols/general_warning_sign.svg new file mode 100644 index 0000000..78eca79 --- /dev/null +++ b/ModpackUpdater/Symbols/general_warning_sign.svg @@ -0,0 +1,7 @@ + + + + + + + \ No newline at end of file diff --git a/ModpackUpdater/Symbols/opened_folder.svg b/ModpackUpdater/Symbols/opened_folder.svg new file mode 100644 index 0000000..9cb2635 --- /dev/null +++ b/ModpackUpdater/Symbols/opened_folder.svg @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/ModpackUpdater/Symbols/paste.svg b/ModpackUpdater/Symbols/paste.svg new file mode 100644 index 0000000..cee7a6a --- /dev/null +++ b/ModpackUpdater/Symbols/paste.svg @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/ModpackUpdater/Symbols/refresh.svg b/ModpackUpdater/Symbols/refresh.svg new file mode 100644 index 0000000..e762078 --- /dev/null +++ b/ModpackUpdater/Symbols/refresh.svg @@ -0,0 +1,7 @@ + + + + + + + \ No newline at end of file diff --git a/ModpackUpdater/Symbols/replay.svg b/ModpackUpdater/Symbols/replay.svg new file mode 100644 index 0000000..65e6af4 --- /dev/null +++ b/ModpackUpdater/Symbols/replay.svg @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/ModpackUpdater/Symbols/save.svg b/ModpackUpdater/Symbols/save.svg new file mode 100644 index 0000000..b5040fc --- /dev/null +++ b/ModpackUpdater/Symbols/save.svg @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/ModpackUpdater/Symbols/services.svg b/ModpackUpdater/Symbols/services.svg new file mode 100644 index 0000000..4c45fd3 --- /dev/null +++ b/ModpackUpdater/Symbols/services.svg @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/ModpackUpdater/Symbols/software_installer.svg b/ModpackUpdater/Symbols/software_installer.svg new file mode 100644 index 0000000..ca6fe34 --- /dev/null +++ b/ModpackUpdater/Symbols/software_installer.svg @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/ModpackUpdater/Symbols/update_done.svg b/ModpackUpdater/Symbols/update_done.svg new file mode 100644 index 0000000..f9a2318 --- /dev/null +++ b/ModpackUpdater/Symbols/update_done.svg @@ -0,0 +1,7 @@ + + + + + + + \ No newline at end of file diff --git a/ModpackUpdater/Symbols/wrench.svg b/ModpackUpdater/Symbols/wrench.svg new file mode 100644 index 0000000..92b079d --- /dev/null +++ b/ModpackUpdater/Symbols/wrench.svg @@ -0,0 +1,4 @@ + + + + \ No newline at end of file