diff --git a/ModpackUpdater/FormSettings.Designer.vb b/ModpackUpdater/FormSettings.Designer.vb index c162022..f040029 100644 --- a/ModpackUpdater/FormSettings.Designer.vb +++ b/ModpackUpdater/FormSettings.Designer.vb @@ -32,6 +32,8 @@ Partial Class FormSettings Me.RadLabel3 = New Telerik.WinControls.UI.RadLabel() Me.RadLabel2 = New Telerik.WinControls.UI.RadLabel() Me.RadLabel1 = New Telerik.WinControls.UI.RadLabel() + Me.RadTextBoxControl_UpdateUrl = New Telerik.WinControls.UI.RadTextBoxControl() + Me.RadLabel4 = New Telerik.WinControls.UI.RadLabel() Me.Panel1.SuspendLayout() CType(Me.RadTextBoxControl_WebdavPassword, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.RadTextBoxControl_WebdavUsername, System.ComponentModel.ISupportInitialize).BeginInit() @@ -41,13 +43,16 @@ Partial Class FormSettings CType(Me.RadLabel3, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.RadLabel2, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.RadLabel1, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.RadTextBoxControl_UpdateUrl, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.RadLabel4, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me, System.ComponentModel.ISupportInitialize).BeginInit() Me.SuspendLayout() ' 'Panel1 ' - resources.ApplyResources(Me.Panel1, "Panel1") Me.Panel1.BackColor = System.Drawing.Color.Transparent + Me.Panel1.Controls.Add(Me.RadTextBoxControl_UpdateUrl) + Me.Panel1.Controls.Add(Me.RadLabel4) Me.Panel1.Controls.Add(Me.RadTextBoxControl_WebdavPassword) Me.Panel1.Controls.Add(Me.RadTextBoxControl_WebdavUsername) Me.Panel1.Controls.Add(Me.RadTextBoxControl_WebdavURL) @@ -56,6 +61,7 @@ Partial Class FormSettings Me.Panel1.Controls.Add(Me.RadLabel3) Me.Panel1.Controls.Add(Me.RadLabel2) Me.Panel1.Controls.Add(Me.RadLabel1) + resources.ApplyResources(Me.Panel1, "Panel1") Me.Panel1.Name = "Panel1" ' 'RadTextBoxControl_WebdavPassword @@ -100,6 +106,16 @@ Partial Class FormSettings resources.ApplyResources(Me.RadLabel1, "RadLabel1") Me.RadLabel1.Name = "RadLabel1" ' + 'RadTextBoxControl_UpdateUrl + ' + resources.ApplyResources(Me.RadTextBoxControl_UpdateUrl, "RadTextBoxControl_UpdateUrl") + Me.RadTextBoxControl_UpdateUrl.Name = "RadTextBoxControl_UpdateUrl" + ' + 'RadLabel4 + ' + resources.ApplyResources(Me.RadLabel4, "RadLabel4") + Me.RadLabel4.Name = "RadLabel4" + ' 'FormSettings ' resources.ApplyResources(Me, "$this") @@ -107,10 +123,6 @@ Partial Class FormSettings Me.Controls.Add(Me.Panel1) Me.MaximizeBox = False Me.Name = "FormSettings" - ' - ' - ' - Me.RootElement.ApplyShapeToControl = True Me.Panel1.ResumeLayout(False) Me.Panel1.PerformLayout() CType(Me.RadTextBoxControl_WebdavPassword, System.ComponentModel.ISupportInitialize).EndInit() @@ -121,6 +133,8 @@ Partial Class FormSettings CType(Me.RadLabel3, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.RadLabel2, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.RadLabel1, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.RadTextBoxControl_UpdateUrl, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.RadLabel4, System.ComponentModel.ISupportInitialize).EndInit() CType(Me, System.ComponentModel.ISupportInitialize).EndInit() Me.ResumeLayout(False) @@ -135,4 +149,6 @@ Partial Class FormSettings Friend WithEvents RadButton_SaveAs As Telerik.WinControls.UI.RadButton Friend WithEvents RadLabel3 As Telerik.WinControls.UI.RadLabel Friend WithEvents RadLabel2 As Telerik.WinControls.UI.RadLabel + Friend WithEvents RadTextBoxControl_UpdateUrl As Telerik.WinControls.UI.RadTextBoxControl + Friend WithEvents RadLabel4 As Telerik.WinControls.UI.RadLabel End Class diff --git a/ModpackUpdater/FormSettings.resx b/ModpackUpdater/FormSettings.resx index 1983327..df6582a 100644 --- a/ModpackUpdater/FormSettings.resx +++ b/ModpackUpdater/FormSettings.resx @@ -1,64 +1,4 @@ - - - + @@ -117,60 +57,318 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 6 - - - - ImageBeforeText - - - - 0 - - - 2 - - - Save && Close + + + Top, Left, Right - - MiddleLeft + + 118, 87 - - Telerik.WinControls.UI.RadForm, Telerik.WinControls.UI, Version=2022.2.510.40, Culture=neutral, PublicKeyToken=5bb2a467cbec794e + + 389, 22 - + + + 9 + + + RadTextBoxControl_UpdateUrl + + + Telerik.WinControls.UI.RadTextBoxControl, Telerik.WinControls.UI, Culture=neutral, PublicKeyToken=5bb2a467cbec794e + + Panel1 - - RadTextBoxControl_WebdavPassword + + 0 - - Bottom, Left + + 3, 89 + + + 70, 18 + + + 8 + + + Update-URL: + + + RadLabel4 + + + Telerik.WinControls.UI.RadLabel, Telerik.WinControls.UI, Culture=neutral, PublicKeyToken=5bb2a467cbec794e + + + Panel1 + + + 1 + + + Top, Left, Right + + + 118, 59 + + + Obsulete! Do not use for new Modpack Configs! 389, 22 + + 7 + + + RadTextBoxControl_WebdavPassword + + + Telerik.WinControls.UI.RadTextBoxControl, Telerik.WinControls.UI, Culture=neutral, PublicKeyToken=5bb2a467cbec794e + + + Panel1 + + + 2 + + + Top, Left, Right + + + 118, 31 + + + Obsulete! Do not use for new Modpack Configs! + + + 389, 22 + + + 6 + + + RadTextBoxControl_WebdavUsername + - Telerik.WinControls.UI.RadTextBoxControl, Telerik.WinControls.UI, Version=2022.2.510.40, Culture=neutral, PublicKeyToken=5bb2a467cbec794e + Telerik.WinControls.UI.RadTextBoxControl, Telerik.WinControls.UI, Culture=neutral, PublicKeyToken=5bb2a467cbec794e + + + Panel1 + + + 3 + + + Top, Left, Right + + + 118, 3 + + + Obsulete! Do not use for new Modpack Configs! + + + 389, 22 + + + 5 + + + RadTextBoxControl_WebdavURL + + + Telerik.WinControls.UI.RadTextBoxControl, Telerik.WinControls.UI, Culture=neutral, PublicKeyToken=5bb2a467cbec794e + + + Panel1 + + + 4 + + + Bottom, Right + + + MiddleRight + + + 387, 115 + + + 120, 24 + + + 4 + + + Save && Close + + + MiddleLeft + + + ImageBeforeText + + + RadButton_SaveAndClose + + + Telerik.WinControls.UI.RadButton, Telerik.WinControls.UI, Culture=neutral, PublicKeyToken=5bb2a467cbec794e + + + Panel1 + + + 5 + + + Bottom, Left + + + MiddleRight + + + 3, 115 + + + 100, 24 + + + 3 Save as ... - + + MiddleLeft + + + ImageBeforeText + + + RadButton_SaveAs + + + Telerik.WinControls.UI.RadButton, Telerik.WinControls.UI, Culture=neutral, PublicKeyToken=5bb2a467cbec794e + + + Panel1 + + + 6 + + + 3, 61 + + + 100, 18 + + + 2 + + + Webdav Password: + + + RadLabel3 + + + Telerik.WinControls.UI.RadLabel, Telerik.WinControls.UI, Culture=neutral, PublicKeyToken=5bb2a467cbec794e + + + Panel1 + + 7 + + 3, 33 + + + 103, 18 + 1 - - CenterParent + + Webdav Username: + + + RadLabel2 + + + Telerik.WinControls.UI.RadLabel, Telerik.WinControls.UI, Culture=neutral, PublicKeyToken=5bb2a467cbec794e + + + Panel1 + + + 8 + + + 3, 5 + + + 73, 18 + + + 0 + + + Webdav URL: + + + RadLabel1 + + + Telerik.WinControls.UI.RadLabel, Telerik.WinControls.UI, Culture=neutral, PublicKeyToken=5bb2a467cbec794e + + + Panel1 + + + 9 Fill + + 0, 0 + + + 510, 142 + + + 0 + + + Panel1 + + + System.Windows.Forms.Panel, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 0 + + + True + + + 7, 15 + + + 7, 15 + + + 510, 142 + AAABAAYAEBAAAAEAIABoBAAAZgAAACAgAAABACAAqBAAAM4EAAAwMAAAAQAgAKglAAB2FQAAQEAAAAEA @@ -1940,214 +2138,16 @@ AAAAAAAAAAAAAAAAAAAAAAAA2Aul/h9Vn+BP9E5eXwAAAABJRU5ErkJggg== - - 510, 114 - - - Telerik.WinControls.UI.RadLabel, Telerik.WinControls.UI, Version=2022.2.510.40, Culture=neutral, PublicKeyToken=5bb2a467cbec794e - - - Webdav URL: - - - Top, Left, Right - - - 100, 24 - - - Panel1 - - - ImageBeforeText - - - $this - - - 7 - - - MiddleRight - - - 3, 33 - - - Panel1 - - - 3, 5 - - - Panel1 - - - Bottom, Right - - - RadLabel1 - - - RadLabel2 - - - Panel1 - - - Telerik.WinControls.UI.RadButton, Telerik.WinControls.UI, Version=2022.2.510.40, Culture=neutral, PublicKeyToken=5bb2a467cbec794e - - - 0, 0 - - - 0 - - - 3 - - - 118, 31 + + CenterParent Modpack Configs - - Top, Left, Right - - - 118, 59 - - - 112, 19 - - - RadButton_SaveAs - - - 4 - - - Telerik.WinControls.UI.RadTextBoxControl, Telerik.WinControls.UI, Version=2022.2.510.40, Culture=neutral, PublicKeyToken=5bb2a467cbec794e - - - Panel1 - - - RadLabel3 - - - Panel1 - - - RadTextBoxControl_WebdavUsername - - - Panel1 - - - 387, 87 - - - 510, 114 - - - RadButton_SaveAndClose - - - 6, 13 - - - 389, 22 - - - 120, 24 - - - 3 - - - 2 - - - Telerik.WinControls.UI.RadLabel, Telerik.WinControls.UI, Version=2022.2.510.40, Culture=neutral, PublicKeyToken=5bb2a467cbec794e - - - 79, 19 - - - 389, 22 - - - 5 - FormSettings - - 5 + + Telerik.WinControls.UI.RadForm, Telerik.WinControls.UI, Culture=neutral, PublicKeyToken=5bb2a467cbec794e - - MiddleLeft - - - 109, 19 - - - 3, 61 - - - 0 - - - 1 - - - Webdav Password: - - - 3, 87 - - - RadTextBoxControl_WebdavURL - - - Telerik.WinControls.UI.RadLabel, Telerik.WinControls.UI, Version=2022.2.510.40, Culture=neutral, PublicKeyToken=5bb2a467cbec794e - - - Top, Left, Right - - - Telerik.WinControls.UI.RadTextBoxControl, Telerik.WinControls.UI, Version=2022.2.510.40, Culture=neutral, PublicKeyToken=5bb2a467cbec794e - - - System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - Telerik.WinControls.UI.RadButton, Telerik.WinControls.UI, Version=2022.2.510.40, Culture=neutral, PublicKeyToken=5bb2a467cbec794e - - - 4 - - - 6 - - - 0 - - - Panel1 - - - MiddleRight - - - 118, 3 - - - Webdav Username: - - - True - \ No newline at end of file diff --git a/ModpackUpdater/FormSettings.vb b/ModpackUpdater/FormSettings.vb index a156fb4..7e99caf 100644 --- a/ModpackUpdater/FormSettings.vb +++ b/ModpackUpdater/FormSettings.vb @@ -15,12 +15,14 @@ Public Class FormSettings RadTextBoxControl_WebdavURL.Text = updateConfig.WebdavURL RadTextBoxControl_WebdavUsername.Text = updateConfig.WebdavUsername RadTextBoxControl_WebdavPassword.Text = updateConfig.WebdavPassword + RadTextBoxControl_UpdateUrl.Text = updateConfig.UpdateUrl End Sub Private Sub SaveConfig() updateConfig.WebdavURL = RadTextBoxControl_WebdavURL.Text.Trim updateConfig.WebdavUsername = RadTextBoxControl_WebdavUsername.Text.Trim updateConfig.WebdavPassword = RadTextBoxControl_WebdavPassword.Text + updateConfig.UpdateUrl = RadTextBoxControl_UpdateUrl.Text End Sub Private Sub ButtonX_SaveAs_Click(sender As Object, e As EventArgs) Handles RadButton_SaveAs.Click