diff --git a/ModpackUpdater.Apps.Client/App.config b/ModpackUpdater.Apps.Client/App.config index 8871323..f749b33 100644 --- a/ModpackUpdater.Apps.Client/App.config +++ b/ModpackUpdater.Apps.Client/App.config @@ -1,6 +1,6 @@  - + \ No newline at end of file diff --git a/ModpackUpdater.Apps.Client/Form1.Designer.cs b/ModpackUpdater.Apps.Client/Form1.Designer.cs index 9a03e67..2ebff1b 100644 --- a/ModpackUpdater.Apps.Client/Form1.Designer.cs +++ b/ModpackUpdater.Apps.Client/Form1.Designer.cs @@ -34,35 +34,35 @@ namespace ModpackUpdater.Apps.Client [DebuggerStepThrough()] private void InitializeComponent() { - System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Form1)); + var resources = new System.ComponentModel.ComponentResourceManager(typeof(Form1)); RadLabel1 = new Telerik.WinControls.UI.RadLabel(); RadLabel2 = new Telerik.WinControls.UI.RadLabel(); RadLabel3 = new Telerik.WinControls.UI.RadLabel(); RadLabel_Status = new Telerik.WinControls.UI.RadLabel(); - RadTextBoxControl_MinecraftProfileFolder = new Telerik.WinControls.UI.RadTextBoxControl(); - RadTextBoxControl_ModpackConfig = new Telerik.WinControls.UI.RadTextBoxControl(); + RadTextBox_MinecraftProfileFolder = new Telerik.WinControls.UI.RadTextBox(); + RadTextBox_ModpackConfig = new Telerik.WinControls.UI.RadTextBox(); RadButton_Install = new Telerik.WinControls.UI.RadButton(); RadButton_CheckForUpdates = new Telerik.WinControls.UI.RadButton(); RadButton_PasteModpackConfig = new Telerik.WinControls.UI.RadButton(); RadButton_SearchMinecraftProfileFolder = new Telerik.WinControls.UI.RadButton(); tableLayoutPanel1 = new TableLayoutPanel(); radLabel4 = new Telerik.WinControls.UI.RadLabel(); - radTextBoxControl_InstallKey = new Telerik.WinControls.UI.RadTextBoxControl(); + radTextBox_InstallKey = new Telerik.WinControls.UI.RadTextBox(); radButton_PasteInstallKey = new Telerik.WinControls.UI.RadButton(); radButton_RefreshConfig = new Telerik.WinControls.UI.RadButton(); ((System.ComponentModel.ISupportInitialize)RadLabel1).BeginInit(); ((System.ComponentModel.ISupportInitialize)RadLabel2).BeginInit(); ((System.ComponentModel.ISupportInitialize)RadLabel3).BeginInit(); ((System.ComponentModel.ISupportInitialize)RadLabel_Status).BeginInit(); - ((System.ComponentModel.ISupportInitialize)RadTextBoxControl_MinecraftProfileFolder).BeginInit(); - ((System.ComponentModel.ISupportInitialize)RadTextBoxControl_ModpackConfig).BeginInit(); + ((System.ComponentModel.ISupportInitialize)RadTextBox_MinecraftProfileFolder).BeginInit(); + ((System.ComponentModel.ISupportInitialize)RadTextBox_ModpackConfig).BeginInit(); ((System.ComponentModel.ISupportInitialize)RadButton_Install).BeginInit(); ((System.ComponentModel.ISupportInitialize)RadButton_CheckForUpdates).BeginInit(); ((System.ComponentModel.ISupportInitialize)RadButton_PasteModpackConfig).BeginInit(); ((System.ComponentModel.ISupportInitialize)RadButton_SearchMinecraftProfileFolder).BeginInit(); tableLayoutPanel1.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)radLabel4).BeginInit(); - ((System.ComponentModel.ISupportInitialize)radTextBoxControl_InstallKey).BeginInit(); + ((System.ComponentModel.ISupportInitialize)radTextBox_InstallKey).BeginInit(); ((System.ComponentModel.ISupportInitialize)radButton_PasteInstallKey).BeginInit(); ((System.ComponentModel.ISupportInitialize)radButton_RefreshConfig).BeginInit(); ((System.ComponentModel.ISupportInitialize)this).BeginInit(); @@ -70,31 +70,31 @@ namespace ModpackUpdater.Apps.Client // // RadLabel1 // - RadLabel1.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right; + RadLabel1.Anchor = AnchorStyles.Top | AnchorStyles.Bottom | AnchorStyles.Left | AnchorStyles.Right; RadLabel1.AutoSize = false; RadLabel1.Location = new Point(3, 3); RadLabel1.Name = "RadLabel1"; - RadLabel1.Size = new Size(144, 22); + RadLabel1.Size = new Size(144, 24); RadLabel1.TabIndex = 0; RadLabel1.Text = "Minecraft profile folder:"; // // RadLabel2 // - RadLabel2.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right; + RadLabel2.Anchor = AnchorStyles.Top | AnchorStyles.Bottom | AnchorStyles.Left | AnchorStyles.Right; RadLabel2.AutoSize = false; - RadLabel2.Location = new Point(3, 61); + RadLabel2.Location = new Point(3, 63); RadLabel2.Name = "RadLabel2"; - RadLabel2.Size = new Size(144, 22); + RadLabel2.Size = new Size(144, 24); RadLabel2.TabIndex = 1; RadLabel2.Text = "Modpack config:"; // // RadLabel3 // - RadLabel3.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right; + RadLabel3.Anchor = AnchorStyles.Top | AnchorStyles.Bottom | AnchorStyles.Left | AnchorStyles.Right; RadLabel3.AutoSize = false; - RadLabel3.Location = new Point(3, 177); + RadLabel3.Location = new Point(3, 183); RadLabel3.Name = "RadLabel3"; - RadLabel3.Size = new Size(144, 22); + RadLabel3.Size = new Size(144, 24); RadLabel3.TabIndex = 2; RadLabel3.Text = "Status:"; // @@ -103,41 +103,41 @@ namespace ModpackUpdater.Apps.Client RadLabel_Status.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right; RadLabel_Status.AutoSize = false; tableLayoutPanel1.SetColumnSpan(RadLabel_Status, 6); - RadLabel_Status.Location = new Point(153, 177); + RadLabel_Status.Location = new Point(153, 183); RadLabel_Status.Name = "RadLabel_Status"; - RadLabel_Status.Size = new Size(266, 22); + RadLabel_Status.Size = new Size(266, 24); RadLabel_Status.TabIndex = 3; RadLabel_Status.Text = "-"; RadLabel_Status.TextImageRelation = TextImageRelation.ImageBeforeText; // - // RadTextBoxControl_MinecraftProfileFolder + // RadTextBox_MinecraftProfileFolder // - RadTextBoxControl_MinecraftProfileFolder.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right; - tableLayoutPanel1.SetColumnSpan(RadTextBoxControl_MinecraftProfileFolder, 6); - RadTextBoxControl_MinecraftProfileFolder.IsReadOnly = true; - RadTextBoxControl_MinecraftProfileFolder.Location = new Point(153, 3); - RadTextBoxControl_MinecraftProfileFolder.Name = "RadTextBoxControl_MinecraftProfileFolder"; - RadTextBoxControl_MinecraftProfileFolder.NullText = "No file loaded!"; - RadTextBoxControl_MinecraftProfileFolder.Size = new Size(266, 22); - RadTextBoxControl_MinecraftProfileFolder.TabIndex = 4; + RadTextBox_MinecraftProfileFolder.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right; + tableLayoutPanel1.SetColumnSpan(RadTextBox_MinecraftProfileFolder, 6); + RadTextBox_MinecraftProfileFolder.Location = new Point(153, 3); + RadTextBox_MinecraftProfileFolder.Name = "RadTextBox_MinecraftProfileFolder"; + RadTextBox_MinecraftProfileFolder.NullText = "No file loaded!"; + RadTextBox_MinecraftProfileFolder.ReadOnly = true; + RadTextBox_MinecraftProfileFolder.Size = new Size(266, 24); + RadTextBox_MinecraftProfileFolder.TabIndex = 4; // - // RadTextBoxControl_ModpackConfig + // RadTextBox_ModpackConfig // - RadTextBoxControl_ModpackConfig.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right; - tableLayoutPanel1.SetColumnSpan(RadTextBoxControl_ModpackConfig, 6); - RadTextBoxControl_ModpackConfig.IsReadOnly = true; - RadTextBoxControl_ModpackConfig.Location = new Point(153, 61); - RadTextBoxControl_ModpackConfig.Name = "RadTextBoxControl_ModpackConfig"; - RadTextBoxControl_ModpackConfig.NullText = "No config url provided."; - RadTextBoxControl_ModpackConfig.Size = new Size(266, 22); - RadTextBoxControl_ModpackConfig.TabIndex = 5; + RadTextBox_ModpackConfig.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right; + tableLayoutPanel1.SetColumnSpan(RadTextBox_ModpackConfig, 6); + RadTextBox_ModpackConfig.Location = new Point(153, 63); + RadTextBox_ModpackConfig.Name = "RadTextBox_ModpackConfig"; + RadTextBox_ModpackConfig.NullText = "No config url provided."; + RadTextBox_ModpackConfig.ReadOnly = true; + RadTextBox_ModpackConfig.Size = new Size(266, 24); + RadTextBox_ModpackConfig.TabIndex = 5; // // RadButton_Install // RadButton_Install.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right; tableLayoutPanel1.SetColumnSpan(RadButton_Install, 2); RadButton_Install.ImageAlignment = ContentAlignment.MiddleRight; - RadButton_Install.Location = new Point(325, 205); + RadButton_Install.Location = new Point(325, 213); RadButton_Install.Name = "RadButton_Install"; RadButton_Install.Size = new Size(94, 24); RadButton_Install.TabIndex = 10; @@ -151,7 +151,7 @@ namespace ModpackUpdater.Apps.Client RadButton_CheckForUpdates.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right; tableLayoutPanel1.SetColumnSpan(RadButton_CheckForUpdates, 3); RadButton_CheckForUpdates.ImageAlignment = ContentAlignment.MiddleRight; - RadButton_CheckForUpdates.Location = new Point(175, 205); + RadButton_CheckForUpdates.Location = new Point(175, 213); RadButton_CheckForUpdates.Name = "RadButton_CheckForUpdates"; RadButton_CheckForUpdates.Size = new Size(144, 24); RadButton_CheckForUpdates.TabIndex = 0; @@ -165,7 +165,7 @@ namespace ModpackUpdater.Apps.Client RadButton_PasteModpackConfig.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right; tableLayoutPanel1.SetColumnSpan(RadButton_PasteModpackConfig, 2); RadButton_PasteModpackConfig.ImageAlignment = ContentAlignment.MiddleRight; - RadButton_PasteModpackConfig.Location = new Point(325, 89); + RadButton_PasteModpackConfig.Location = new Point(325, 93); RadButton_PasteModpackConfig.Name = "RadButton_PasteModpackConfig"; RadButton_PasteModpackConfig.Size = new Size(94, 24); RadButton_PasteModpackConfig.TabIndex = 7; @@ -179,7 +179,7 @@ namespace ModpackUpdater.Apps.Client RadButton_SearchMinecraftProfileFolder.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right; tableLayoutPanel1.SetColumnSpan(RadButton_SearchMinecraftProfileFolder, 2); RadButton_SearchMinecraftProfileFolder.ImageAlignment = ContentAlignment.MiddleRight; - RadButton_SearchMinecraftProfileFolder.Location = new Point(325, 31); + RadButton_SearchMinecraftProfileFolder.Location = new Point(325, 33); RadButton_SearchMinecraftProfileFolder.Name = "RadButton_SearchMinecraftProfileFolder"; RadButton_SearchMinecraftProfileFolder.Size = new Size(94, 24); RadButton_SearchMinecraftProfileFolder.TabIndex = 6; @@ -190,6 +190,8 @@ namespace ModpackUpdater.Apps.Client // // tableLayoutPanel1 // + tableLayoutPanel1.AutoSize = true; + tableLayoutPanel1.AutoSizeMode = AutoSizeMode.GrowAndShrink; tableLayoutPanel1.ColumnCount = 7; tableLayoutPanel1.ColumnStyles.Add(new ColumnStyle(SizeType.Absolute, 150F)); tableLayoutPanel1.ColumnStyles.Add(new ColumnStyle(SizeType.Percent, 100F)); @@ -201,14 +203,14 @@ namespace ModpackUpdater.Apps.Client tableLayoutPanel1.Controls.Add(RadButton_CheckForUpdates, 2, 7); tableLayoutPanel1.Controls.Add(RadLabel1, 0, 0); tableLayoutPanel1.Controls.Add(RadLabel2, 0, 2); - tableLayoutPanel1.Controls.Add(RadTextBoxControl_MinecraftProfileFolder, 1, 0); - tableLayoutPanel1.Controls.Add(RadTextBoxControl_ModpackConfig, 1, 2); + tableLayoutPanel1.Controls.Add(RadTextBox_MinecraftProfileFolder, 1, 0); + tableLayoutPanel1.Controls.Add(RadTextBox_ModpackConfig, 1, 2); tableLayoutPanel1.Controls.Add(RadLabel_Status, 1, 6); tableLayoutPanel1.Controls.Add(RadLabel3, 0, 6); tableLayoutPanel1.Controls.Add(RadButton_SearchMinecraftProfileFolder, 5, 1); tableLayoutPanel1.Controls.Add(RadButton_Install, 5, 7); tableLayoutPanel1.Controls.Add(radLabel4, 0, 4); - tableLayoutPanel1.Controls.Add(radTextBoxControl_InstallKey, 1, 4); + tableLayoutPanel1.Controls.Add(radTextBox_InstallKey, 1, 4); tableLayoutPanel1.Controls.Add(radButton_PasteInstallKey, 5, 5); tableLayoutPanel1.Controls.Add(RadButton_PasteModpackConfig, 5, 3); tableLayoutPanel1.Controls.Add(radButton_RefreshConfig, 4, 3); @@ -224,36 +226,36 @@ namespace ModpackUpdater.Apps.Client tableLayoutPanel1.RowStyles.Add(new RowStyle()); tableLayoutPanel1.RowStyles.Add(new RowStyle()); tableLayoutPanel1.RowStyles.Add(new RowStyle()); - tableLayoutPanel1.Size = new Size(422, 232); + tableLayoutPanel1.Size = new Size(422, 249); tableLayoutPanel1.TabIndex = 7; // // radLabel4 // - radLabel4.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right; + radLabel4.Anchor = AnchorStyles.Top | AnchorStyles.Bottom | AnchorStyles.Left | AnchorStyles.Right; radLabel4.AutoSize = false; - radLabel4.Location = new Point(3, 119); + radLabel4.Location = new Point(3, 123); radLabel4.Name = "radLabel4"; - radLabel4.Size = new Size(144, 22); + radLabel4.Size = new Size(144, 24); radLabel4.TabIndex = 12; radLabel4.Text = "Installation key:"; // - // radTextBoxControl_InstallKey + // radTextBox_InstallKey // - radTextBoxControl_InstallKey.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right; - tableLayoutPanel1.SetColumnSpan(radTextBoxControl_InstallKey, 6); - radTextBoxControl_InstallKey.IsReadOnly = true; - radTextBoxControl_InstallKey.Location = new Point(153, 119); - radTextBoxControl_InstallKey.Name = "radTextBoxControl_InstallKey"; - radTextBoxControl_InstallKey.NullText = "No key provided. Only for private servers."; - radTextBoxControl_InstallKey.Size = new Size(266, 22); - radTextBoxControl_InstallKey.TabIndex = 13; + radTextBox_InstallKey.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right; + tableLayoutPanel1.SetColumnSpan(radTextBox_InstallKey, 6); + radTextBox_InstallKey.Location = new Point(153, 123); + radTextBox_InstallKey.Name = "radTextBox_InstallKey"; + radTextBox_InstallKey.NullText = "No key provided. Only for private servers."; + radTextBox_InstallKey.ReadOnly = true; + radTextBox_InstallKey.Size = new Size(266, 24); + radTextBox_InstallKey.TabIndex = 13; // // radButton_PasteInstallKey // radButton_PasteInstallKey.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right; tableLayoutPanel1.SetColumnSpan(radButton_PasteInstallKey, 2); radButton_PasteInstallKey.ImageAlignment = ContentAlignment.MiddleRight; - radButton_PasteInstallKey.Location = new Point(325, 147); + radButton_PasteInstallKey.Location = new Point(325, 153); radButton_PasteInstallKey.Name = "radButton_PasteInstallKey"; radButton_PasteInstallKey.Size = new Size(94, 24); radButton_PasteInstallKey.TabIndex = 14; @@ -267,7 +269,7 @@ namespace ModpackUpdater.Apps.Client radButton_RefreshConfig.Anchor = AnchorStyles.Top | AnchorStyles.Right; radButton_RefreshConfig.DisplayStyle = Telerik.WinControls.DisplayStyle.Image; radButton_RefreshConfig.ImageAlignment = ContentAlignment.MiddleCenter; - radButton_RefreshConfig.Location = new Point(295, 89); + radButton_RefreshConfig.Location = new Point(295, 93); radButton_RefreshConfig.Name = "radButton_RefreshConfig"; radButton_RefreshConfig.Size = new Size(24, 24); radButton_RefreshConfig.TabIndex = 11; @@ -279,10 +281,13 @@ namespace ModpackUpdater.Apps.Client AutoScaleBaseSize = new Size(7, 15); AutoScaleDimensions = new SizeF(7F, 15F); AutoScaleMode = AutoScaleMode.Font; - ClientSize = new Size(422, 232); + AutoSize = true; + AutoSizeMode = AutoSizeMode.GrowAndShrink; + ClientSize = new Size(422, 249); Controls.Add(tableLayoutPanel1); Icon = (Icon)resources.GetObject("$this.Icon"); MaximizeBox = false; + MinimumSize = new Size(430, 0); Name = "Form1"; StartPosition = FormStartPosition.CenterScreen; Text = "Minecraft Modpack Updater"; @@ -293,27 +298,29 @@ namespace ModpackUpdater.Apps.Client ((System.ComponentModel.ISupportInitialize)RadLabel2).EndInit(); ((System.ComponentModel.ISupportInitialize)RadLabel3).EndInit(); ((System.ComponentModel.ISupportInitialize)RadLabel_Status).EndInit(); - ((System.ComponentModel.ISupportInitialize)RadTextBoxControl_MinecraftProfileFolder).EndInit(); - ((System.ComponentModel.ISupportInitialize)RadTextBoxControl_ModpackConfig).EndInit(); + ((System.ComponentModel.ISupportInitialize)RadTextBox_MinecraftProfileFolder).EndInit(); + ((System.ComponentModel.ISupportInitialize)RadTextBox_ModpackConfig).EndInit(); ((System.ComponentModel.ISupportInitialize)RadButton_Install).EndInit(); ((System.ComponentModel.ISupportInitialize)RadButton_CheckForUpdates).EndInit(); ((System.ComponentModel.ISupportInitialize)RadButton_PasteModpackConfig).EndInit(); ((System.ComponentModel.ISupportInitialize)RadButton_SearchMinecraftProfileFolder).EndInit(); tableLayoutPanel1.ResumeLayout(false); + tableLayoutPanel1.PerformLayout(); ((System.ComponentModel.ISupportInitialize)radLabel4).EndInit(); - ((System.ComponentModel.ISupportInitialize)radTextBoxControl_InstallKey).EndInit(); + ((System.ComponentModel.ISupportInitialize)radTextBox_InstallKey).EndInit(); ((System.ComponentModel.ISupportInitialize)radButton_PasteInstallKey).EndInit(); ((System.ComponentModel.ISupportInitialize)radButton_RefreshConfig).EndInit(); ((System.ComponentModel.ISupportInitialize)this).EndInit(); ResumeLayout(false); + PerformLayout(); } internal Telerik.WinControls.UI.RadLabel RadLabel1; internal Telerik.WinControls.UI.RadLabel RadLabel2; internal Telerik.WinControls.UI.RadLabel RadLabel3; internal Telerik.WinControls.UI.RadLabel RadLabel_Status; - internal Telerik.WinControls.UI.RadTextBoxControl RadTextBoxControl_MinecraftProfileFolder; - internal Telerik.WinControls.UI.RadTextBoxControl RadTextBoxControl_ModpackConfig; + internal Telerik.WinControls.UI.RadTextBox RadTextBox_MinecraftProfileFolder; + internal Telerik.WinControls.UI.RadTextBox RadTextBox_ModpackConfig; internal Telerik.WinControls.UI.RadButton RadButton_Install; internal Telerik.WinControls.UI.RadButton RadButton_CheckForUpdates; internal Telerik.WinControls.UI.RadButton RadButton_SearchMinecraftProfileFolder; @@ -321,7 +328,7 @@ namespace ModpackUpdater.Apps.Client private TableLayoutPanel tableLayoutPanel1; private Telerik.WinControls.UI.RadButton radButton_RefreshConfig; internal Telerik.WinControls.UI.RadLabel radLabel4; - internal Telerik.WinControls.UI.RadTextBoxControl radTextBoxControl_InstallKey; + internal Telerik.WinControls.UI.RadTextBox radTextBox_InstallKey; internal Telerik.WinControls.UI.RadButton radButton_PasteInstallKey; } } \ No newline at end of file diff --git a/ModpackUpdater.Apps.Client/Form1.cs b/ModpackUpdater.Apps.Client/Form1.cs index 5be97f5..95f2ca6 100644 --- a/ModpackUpdater.Apps.Client/Form1.cs +++ b/ModpackUpdater.Apps.Client/Form1.cs @@ -43,20 +43,20 @@ public partial class Form1 private void LoadMinecraftProfile(string folderPath) { - RadTextBoxControl_MinecraftProfileFolder.Text = folderPath; + RadTextBox_MinecraftProfileFolder.Text = folderPath; AppConfig.Instance.LastMinecraftProfilePath = folderPath; CheckStatusAndUpdate(loadedProfile: true); } private void LoadUpdateConfigFile(string filePath) { - RadTextBoxControl_ModpackConfig.Text = filePath; + RadTextBox_ModpackConfig.Text = filePath; CheckStatusAndUpdate(); } private void LoadInstallKey(string installKey) { - radTextBoxControl_InstallKey.Text = modpackInfo.ExtrasKey = installKey; + radTextBox_InstallKey.Text = modpackInfo.ExtrasKey = installKey; CheckStatusAndUpdate(); } @@ -82,11 +82,11 @@ public partial class Form1 { try { - modpackInfo = ModpackInfo.TryLoad(RadTextBoxControl_MinecraftProfileFolder.Text.Trim()); + modpackInfo = ModpackInfo.TryLoad(RadTextBox_MinecraftProfileFolder.Text.Trim()); if (loadedProfile) { - RadTextBoxControl_ModpackConfig.Text = modpackInfo.ConfigUrl; - radTextBoxControl_InstallKey.Text = modpackInfo.ExtrasKey; + RadTextBox_ModpackConfig.Text = modpackInfo.ConfigUrl; + radTextBox_InstallKey.Text = modpackInfo.ExtrasKey; } } catch @@ -95,7 +95,7 @@ public partial class Form1 try { - updateConfig = ModpackConfig.LoadFromUrl(RadTextBoxControl_ModpackConfig.Text); + updateConfig = ModpackConfig.LoadFromUrl(RadTextBox_ModpackConfig.Text); } catch (Exception) { @@ -104,7 +104,7 @@ public partial class Form1 if (modpackInfo != null) features = new(updateConfig); - if (modpackInfo == null || string.IsNullOrWhiteSpace(RadTextBoxControl_MinecraftProfileFolder.Text) /*|| modpackInfo.Valid*/) + if (modpackInfo == null || string.IsNullOrWhiteSpace(RadTextBox_MinecraftProfileFolder.Text) /*|| modpackInfo.Valid*/) { SetStatus(LangRes.StatusText_MinecraftProfileWarning, AppGlobals.Symbols.GetSvgImage(AppSymbols.general_warning_sign, SymbolSize.Small)); RadButton_PasteModpackConfig.Enabled = false; @@ -113,7 +113,7 @@ public partial class Form1 RadButton_Install.Enabled = false; return false; } - else if (updateConfig == null || string.IsNullOrWhiteSpace(RadTextBoxControl_ModpackConfig.Text)) + else if (updateConfig == null || string.IsNullOrWhiteSpace(RadTextBox_ModpackConfig.Text)) { SetStatus(LangRes.StatusText_ConfigIncompleteOrNotLoaded, AppGlobals.Symbols.GetSvgImage(AppSymbols.general_warning_sign, SymbolSize.Small)); RadButton_PasteModpackConfig.Enabled = true; @@ -264,7 +264,7 @@ public partial class Form1 private void RadButton_RefreshConfig_Click(object sender, EventArgs e) { - LoadUpdateConfigFile(RadTextBoxControl_ModpackConfig.Text); + LoadUpdateConfigFile(RadTextBox_ModpackConfig.Text); } private async void ButtonX_CheckForUpdates_Click(object sender, EventArgs e) @@ -284,7 +284,7 @@ public partial class Form1 private void Form1_FormClosing(object sender, FormClosingEventArgs e) { - AppConfig.Instance.LastMinecraftProfilePath = RadTextBoxControl_MinecraftProfileFolder.Text; + AppConfig.Instance.LastMinecraftProfilePath = RadTextBox_MinecraftProfileFolder.Text; } private void Form1_Load(object sender, EventArgs e) diff --git a/ModpackUpdater.Apps.Client/Form1.resx b/ModpackUpdater.Apps.Client/Form1.resx index 7abadd4..2893370 100644 --- a/ModpackUpdater.Apps.Client/Form1.resx +++ b/ModpackUpdater.Apps.Client/Form1.resx @@ -1,7 +1,7 @@