From 9f43598a0791c25f526eb596837239bba27d82df Mon Sep 17 00:00:00 2001 From: Pilzinsel64 Date: Tue, 14 Jun 2022 09:35:01 +0200 Subject: [PATCH] yea, finish work! .NET 6 + Telerik --- Pilz.Updating.Administration.GUI/App.config | 2 +- .../ApplicationVersionInput.Designer.cs | 22 +++---- .../DiscordPostDialog.Designer.cs | 32 ++++----- .../PackageDescriptionEditor.Designer.cs | 62 ++++++++--------- .../ProxyConfigEditor.Designer.cs | 50 +++++++------- .../UpdateServerInfoEditor.Designer.cs | 66 +++++++++---------- 6 files changed, 117 insertions(+), 117 deletions(-) diff --git a/Pilz.Updating.Administration.GUI/App.config b/Pilz.Updating.Administration.GUI/App.config index 03f2357..44f1d1c 100644 --- a/Pilz.Updating.Administration.GUI/App.config +++ b/Pilz.Updating.Administration.GUI/App.config @@ -24,6 +24,6 @@ - + \ No newline at end of file diff --git a/Pilz.Updating.Administration.GUI/ApplicationVersionInput.Designer.cs b/Pilz.Updating.Administration.GUI/ApplicationVersionInput.Designer.cs index 73a0125..1719242 100644 --- a/Pilz.Updating.Administration.GUI/ApplicationVersionInput.Designer.cs +++ b/Pilz.Updating.Administration.GUI/ApplicationVersionInput.Designer.cs @@ -62,7 +62,7 @@ namespace Pilz.Updating.Administration.GUI // this.radLabel1.Location = new System.Drawing.Point(3, 5); this.radLabel1.Name = "radLabel1"; - this.radLabel1.Size = new System.Drawing.Size(46, 18); + this.radLabel1.Size = new System.Drawing.Size(50, 19); this.radLabel1.TabIndex = 0; this.radLabel1.Text = "Version:"; // @@ -70,15 +70,15 @@ namespace Pilz.Updating.Administration.GUI // this.radLabel2.Location = new System.Drawing.Point(3, 33); this.radLabel2.Name = "radLabel2"; - this.radLabel2.Size = new System.Drawing.Size(36, 18); + this.radLabel2.Size = new System.Drawing.Size(39, 19); this.radLabel2.TabIndex = 1; this.radLabel2.Text = "Kanal:"; // // radLabel3 // - this.radLabel3.Location = new System.Drawing.Point(3, 63); + this.radLabel3.Location = new System.Drawing.Point(3, 61); this.radLabel3.Name = "radLabel3"; - this.radLabel3.Size = new System.Drawing.Size(34, 18); + this.radLabel3.Size = new System.Drawing.Size(37, 19); this.radLabel3.TabIndex = 2; this.radLabel3.Text = "Build:"; // @@ -100,7 +100,7 @@ namespace Pilz.Updating.Administration.GUI this.radDropDownList_Channel.DropDownStyle = Telerik.WinControls.RadDropDownStyle.DropDownList; this.radDropDownList_Channel.Location = new System.Drawing.Point(74, 31); this.radDropDownList_Channel.Name = "radDropDownList_Channel"; - this.radDropDownList_Channel.Size = new System.Drawing.Size(255, 24); + this.radDropDownList_Channel.Size = new System.Drawing.Size(255, 22); this.radDropDownList_Channel.TabIndex = 0; // // panel1 @@ -117,14 +117,14 @@ namespace Pilz.Updating.Administration.GUI this.panel1.Dock = System.Windows.Forms.DockStyle.Fill; this.panel1.Location = new System.Drawing.Point(0, 0); this.panel1.Name = "panel1"; - this.panel1.Size = new System.Drawing.Size(332, 118); + this.panel1.Size = new System.Drawing.Size(332, 114); this.panel1.TabIndex = 3; // // radSpinEditor_Build // this.radSpinEditor_Build.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) | System.Windows.Forms.AnchorStyles.Right))); - this.radSpinEditor_Build.Location = new System.Drawing.Point(74, 61); + this.radSpinEditor_Build.Location = new System.Drawing.Point(74, 59); this.radSpinEditor_Build.Minimum = new decimal(new int[] { 1, 0, @@ -136,7 +136,7 @@ namespace Pilz.Updating.Administration.GUI 0, 0, 0}); - this.radSpinEditor_Build.Size = new System.Drawing.Size(255, 24); + this.radSpinEditor_Build.Size = new System.Drawing.Size(255, 22); this.radSpinEditor_Build.TabIndex = 5; this.radSpinEditor_Build.Value = new decimal(new int[] { 1, @@ -150,7 +150,7 @@ namespace Pilz.Updating.Administration.GUI this.radButton_Cancel.DialogResult = System.Windows.Forms.DialogResult.Cancel; this.radButton_Cancel.Image = global::Pilz.Updating.Administration.GUI.My.Resources.Resources.icons8_delete_sign_16px; this.radButton_Cancel.ImageAlignment = System.Drawing.ContentAlignment.MiddleRight; - this.radButton_Cancel.Location = new System.Drawing.Point(123, 91); + this.radButton_Cancel.Location = new System.Drawing.Point(123, 87); this.radButton_Cancel.Name = "radButton_Cancel"; this.radButton_Cancel.Size = new System.Drawing.Size(100, 24); this.radButton_Cancel.TabIndex = 0; @@ -163,7 +163,7 @@ namespace Pilz.Updating.Administration.GUI this.radButton_Accept.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); this.radButton_Accept.Image = global::Pilz.Updating.Administration.GUI.My.Resources.Resources.icons8_checkmark_16px; this.radButton_Accept.ImageAlignment = System.Drawing.ContentAlignment.MiddleRight; - this.radButton_Accept.Location = new System.Drawing.Point(229, 91); + this.radButton_Accept.Location = new System.Drawing.Point(229, 87); this.radButton_Accept.Name = "radButton_Accept"; this.radButton_Accept.Size = new System.Drawing.Size(100, 24); this.radButton_Accept.TabIndex = 4; @@ -178,7 +178,7 @@ namespace Pilz.Updating.Administration.GUI this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.CancelButton = this.radButton_Cancel; - this.ClientSize = new System.Drawing.Size(332, 118); + this.ClientSize = new System.Drawing.Size(332, 114); this.Controls.Add(this.panel1); this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow; this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); diff --git a/Pilz.Updating.Administration.GUI/DiscordPostDialog.Designer.cs b/Pilz.Updating.Administration.GUI/DiscordPostDialog.Designer.cs index d648597..8f4521c 100644 --- a/Pilz.Updating.Administration.GUI/DiscordPostDialog.Designer.cs +++ b/Pilz.Updating.Administration.GUI/DiscordPostDialog.Designer.cs @@ -31,22 +31,22 @@ System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(DiscordPostDialog)); this.radTreeView_Channels = new Telerik.WinControls.UI.RadTreeView(); this.panel1 = new System.Windows.Forms.Panel(); - this.radLabel1 = new Telerik.WinControls.UI.RadLabel(); this.radLabel2 = new Telerik.WinControls.UI.RadLabel(); this.radTextBoxControl_ProgramName = new Telerik.WinControls.UI.RadTextBoxControl(); this.radRichTextEditor_Message = new Telerik.WinControls.UI.RadRichTextEditor(); this.radCheckBoxPingAtEveryone = new Telerik.WinControls.UI.RadCheckBox(); this.radCheckBox_AttachDescription = new Telerik.WinControls.UI.RadCheckBox(); this.radButton_Send = new Telerik.WinControls.UI.RadButton(); + this.radLabel1 = new Telerik.WinControls.UI.RadLabel(); ((System.ComponentModel.ISupportInitialize)(this.radTreeView_Channels)).BeginInit(); this.panel1.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)(this.radLabel1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.radLabel2)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.radTextBoxControl_ProgramName)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.radRichTextEditor_Message)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.radCheckBoxPingAtEveryone)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.radCheckBox_AttachDescription)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.radButton_Send)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.radLabel1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this)).BeginInit(); this.SuspendLayout(); // @@ -77,19 +77,11 @@ this.panel1.Size = new System.Drawing.Size(514, 461); this.panel1.TabIndex = 1; // - // radLabel1 - // - this.radLabel1.Location = new System.Drawing.Point(6, 5); - this.radLabel1.Name = "radLabel1"; - this.radLabel1.Size = new System.Drawing.Size(89, 18); - this.radLabel1.TabIndex = 0; - this.radLabel1.Text = "Programmname:"; - // // radLabel2 // this.radLabel2.Location = new System.Drawing.Point(6, 33); this.radLabel2.Name = "radLabel2"; - this.radLabel2.Size = new System.Drawing.Size(57, 18); + this.radLabel2.Size = new System.Drawing.Size(62, 19); this.radLabel2.TabIndex = 2; this.radLabel2.Text = "Nachricht:"; // @@ -118,9 +110,9 @@ // radCheckBoxPingAtEveryone // this.radCheckBoxPingAtEveryone.CheckState = System.Windows.Forms.CheckState.Checked; - this.radCheckBoxPingAtEveryone.Location = new System.Drawing.Point(170, 437); + this.radCheckBoxPingAtEveryone.Location = new System.Drawing.Point(155, 437); this.radCheckBoxPingAtEveryone.Name = "radCheckBoxPingAtEveryone"; - this.radCheckBoxPingAtEveryone.Size = new System.Drawing.Size(105, 18); + this.radCheckBoxPingAtEveryone.Size = new System.Drawing.Size(111, 17); this.radCheckBoxPingAtEveryone.TabIndex = 0; this.radCheckBoxPingAtEveryone.Text = "Ping @everyone"; this.radCheckBoxPingAtEveryone.ToggleState = Telerik.WinControls.Enumerations.ToggleState.On; @@ -128,9 +120,9 @@ // radCheckBox_AttachDescription // this.radCheckBox_AttachDescription.CheckState = System.Windows.Forms.CheckState.Checked; - this.radCheckBox_AttachDescription.Location = new System.Drawing.Point(281, 437); + this.radCheckBox_AttachDescription.Location = new System.Drawing.Point(272, 437); this.radCheckBox_AttachDescription.Name = "radCheckBox_AttachDescription"; - this.radCheckBox_AttachDescription.Size = new System.Drawing.Size(144, 18); + this.radCheckBox_AttachDescription.Size = new System.Drawing.Size(153, 17); this.radCheckBox_AttachDescription.TabIndex = 3; this.radCheckBox_AttachDescription.Text = "Beschreibung anhängen"; this.radCheckBox_AttachDescription.ToggleState = Telerik.WinControls.Enumerations.ToggleState.On; @@ -149,6 +141,14 @@ this.radButton_Send.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageBeforeText; this.radButton_Send.Click += new System.EventHandler(this.ButtonX_SendMsg_Click); // + // radLabel1 + // + this.radLabel1.Location = new System.Drawing.Point(6, 5); + this.radLabel1.Name = "radLabel1"; + this.radLabel1.Size = new System.Drawing.Size(97, 19); + this.radLabel1.TabIndex = 0; + this.radLabel1.Text = "Programmname:"; + // // DiscordPostDialog // this.AutoScaleBaseSize = new System.Drawing.Size(7, 15); @@ -168,13 +168,13 @@ ((System.ComponentModel.ISupportInitialize)(this.radTreeView_Channels)).EndInit(); this.panel1.ResumeLayout(false); this.panel1.PerformLayout(); - ((System.ComponentModel.ISupportInitialize)(this.radLabel1)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.radLabel2)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.radTextBoxControl_ProgramName)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.radRichTextEditor_Message)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.radCheckBoxPingAtEveryone)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.radCheckBox_AttachDescription)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.radButton_Send)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.radLabel1)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this)).EndInit(); this.ResumeLayout(false); diff --git a/Pilz.Updating.Administration.GUI/PackageDescriptionEditor.Designer.cs b/Pilz.Updating.Administration.GUI/PackageDescriptionEditor.Designer.cs index 7a71a35..f06b828 100644 --- a/Pilz.Updating.Administration.GUI/PackageDescriptionEditor.Designer.cs +++ b/Pilz.Updating.Administration.GUI/PackageDescriptionEditor.Designer.cs @@ -43,18 +43,18 @@ namespace Pilz.Updating.Administration.GUI this.radTextBoxControl_Titel = new Telerik.WinControls.UI.RadTextBoxControl(); this.radRichTextEditor_Description = new Telerik.WinControls.UI.RadRichTextEditor(); this.panel1 = new System.Windows.Forms.Panel(); - this.radButton_Okay = new Telerik.WinControls.UI.RadButton(); - this.radButton_Cancel = new Telerik.WinControls.UI.RadButton(); this.radDropDownList_Formatting = new Telerik.WinControls.UI.RadDropDownList(); + this.radButton_Cancel = new Telerik.WinControls.UI.RadButton(); + this.radButton_Okay = new Telerik.WinControls.UI.RadButton(); ((System.ComponentModel.ISupportInitialize)(this.radLabel1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.radLabel2)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.radLabel3)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.radTextBoxControl_Titel)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.radRichTextEditor_Description)).BeginInit(); this.panel1.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)(this.radButton_Okay)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.radButton_Cancel)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.radDropDownList_Formatting)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.radButton_Cancel)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.radButton_Okay)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this)).BeginInit(); this.SuspendLayout(); // @@ -62,7 +62,7 @@ namespace Pilz.Updating.Administration.GUI // this.radLabel1.Location = new System.Drawing.Point(3, 5); this.radLabel1.Name = "radLabel1"; - this.radLabel1.Size = new System.Drawing.Size(30, 18); + this.radLabel1.Size = new System.Drawing.Size(32, 19); this.radLabel1.TabIndex = 0; this.radLabel1.Text = "Titel:"; // @@ -70,16 +70,16 @@ namespace Pilz.Updating.Administration.GUI // this.radLabel2.Location = new System.Drawing.Point(3, 33); this.radLabel2.Name = "radLabel2"; - this.radLabel2.Size = new System.Drawing.Size(76, 18); + this.radLabel2.Size = new System.Drawing.Size(83, 19); this.radLabel2.TabIndex = 1; this.radLabel2.Text = "Beschreibung:"; // // radLabel3 // this.radLabel3.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); - this.radLabel3.Location = new System.Drawing.Point(3, 240); + this.radLabel3.Location = new System.Drawing.Point(3, 241); this.radLabel3.Name = "radLabel3"; - this.radLabel3.Size = new System.Drawing.Size(76, 18); + this.radLabel3.Size = new System.Drawing.Size(83, 19); this.radLabel3.TabIndex = 2; this.radLabel3.Text = "Formatierung:"; // @@ -102,7 +102,7 @@ namespace Pilz.Updating.Administration.GUI this.radRichTextEditor_Description.Name = "radRichTextEditor_Description"; this.radRichTextEditor_Description.SelectionFill = System.Drawing.Color.FromArgb(((int)(((byte)(128)))), ((int)(((byte)(179)))), ((int)(((byte)(236)))), ((int)(((byte)(248))))); this.radRichTextEditor_Description.SelectionStroke = System.Drawing.Color.FromArgb(((int)(((byte)(179)))), ((int)(((byte)(236)))), ((int)(((byte)(248))))); - this.radRichTextEditor_Description.Size = new System.Drawing.Size(292, 200); + this.radRichTextEditor_Description.Size = new System.Drawing.Size(292, 202); this.radRichTextEditor_Description.TabIndex = 3; // // panel1 @@ -122,19 +122,15 @@ namespace Pilz.Updating.Administration.GUI this.panel1.Size = new System.Drawing.Size(384, 294); this.panel1.TabIndex = 4; // - // radButton_Okay + // radDropDownList_Formatting // - this.radButton_Okay.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); - this.radButton_Okay.DialogResult = System.Windows.Forms.DialogResult.OK; - this.radButton_Okay.Image = global::Pilz.Updating.Administration.GUI.My.Resources.Resources.icons8_checkmark_16px; - this.radButton_Okay.ImageAlignment = System.Drawing.ContentAlignment.MiddleRight; - this.radButton_Okay.Location = new System.Drawing.Point(281, 267); - this.radButton_Okay.Name = "radButton_Okay"; - this.radButton_Okay.Size = new System.Drawing.Size(100, 24); - this.radButton_Okay.TabIndex = 4; - this.radButton_Okay.Text = "Okay"; - this.radButton_Okay.TextAlignment = System.Drawing.ContentAlignment.MiddleLeft; - this.radButton_Okay.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageBeforeText; + this.radDropDownList_Formatting.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); + this.radDropDownList_Formatting.DropDownAnimationEnabled = true; + this.radDropDownList_Formatting.DropDownStyle = Telerik.WinControls.RadDropDownStyle.DropDownList; + this.radDropDownList_Formatting.Location = new System.Drawing.Point(89, 239); + this.radDropDownList_Formatting.Name = "radDropDownList_Formatting"; + this.radDropDownList_Formatting.Size = new System.Drawing.Size(292, 22); + this.radDropDownList_Formatting.TabIndex = 6; // // radButton_Cancel // @@ -150,15 +146,19 @@ namespace Pilz.Updating.Administration.GUI this.radButton_Cancel.TextAlignment = System.Drawing.ContentAlignment.MiddleLeft; this.radButton_Cancel.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageBeforeText; // - // radDropDownList_Formatting + // radButton_Okay // - this.radDropDownList_Formatting.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); - this.radDropDownList_Formatting.DropDownAnimationEnabled = true; - this.radDropDownList_Formatting.DropDownStyle = Telerik.WinControls.RadDropDownStyle.DropDownList; - this.radDropDownList_Formatting.Location = new System.Drawing.Point(89, 237); - this.radDropDownList_Formatting.Name = "radDropDownList_Formatting"; - this.radDropDownList_Formatting.Size = new System.Drawing.Size(292, 24); - this.radDropDownList_Formatting.TabIndex = 6; + this.radButton_Okay.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); + this.radButton_Okay.DialogResult = System.Windows.Forms.DialogResult.OK; + this.radButton_Okay.Image = global::Pilz.Updating.Administration.GUI.My.Resources.Resources.icons8_checkmark_16px; + this.radButton_Okay.ImageAlignment = System.Drawing.ContentAlignment.MiddleRight; + this.radButton_Okay.Location = new System.Drawing.Point(281, 267); + this.radButton_Okay.Name = "radButton_Okay"; + this.radButton_Okay.Size = new System.Drawing.Size(100, 24); + this.radButton_Okay.TabIndex = 4; + this.radButton_Okay.Text = "Okay"; + this.radButton_Okay.TextAlignment = System.Drawing.ContentAlignment.MiddleLeft; + this.radButton_Okay.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageBeforeText; // // PackageDescriptionEditor // @@ -186,9 +186,9 @@ namespace Pilz.Updating.Administration.GUI ((System.ComponentModel.ISupportInitialize)(this.radRichTextEditor_Description)).EndInit(); this.panel1.ResumeLayout(false); this.panel1.PerformLayout(); - ((System.ComponentModel.ISupportInitialize)(this.radButton_Okay)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.radButton_Cancel)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.radDropDownList_Formatting)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.radButton_Cancel)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.radButton_Okay)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this)).EndInit(); this.ResumeLayout(false); diff --git a/Pilz.Updating.Administration.GUI/ProxyConfigEditor.Designer.cs b/Pilz.Updating.Administration.GUI/ProxyConfigEditor.Designer.cs index 736cf85..4f16b18 100644 --- a/Pilz.Updating.Administration.GUI/ProxyConfigEditor.Designer.cs +++ b/Pilz.Updating.Administration.GUI/ProxyConfigEditor.Designer.cs @@ -35,18 +35,18 @@ this.radToggleSwitch_UserProxy = new Telerik.WinControls.UI.RadToggleSwitch(); this.radTextBoxControl_Username = new Telerik.WinControls.UI.RadTextBoxControl(); this.radTextBoxControl_Password = new Telerik.WinControls.UI.RadTextBoxControl(); - this.radButton_Accept = new Telerik.WinControls.UI.RadButton(); this.radButton_Cancel = new Telerik.WinControls.UI.RadButton(); this.panel1 = new System.Windows.Forms.Panel(); + this.radButton_Accept = new Telerik.WinControls.UI.RadButton(); ((System.ComponentModel.ISupportInitialize)(this.radLabel1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.radLabel2)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.radLabel3)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.radToggleSwitch_UserProxy)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.radTextBoxControl_Username)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.radTextBoxControl_Password)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.radButton_Accept)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.radButton_Cancel)).BeginInit(); this.panel1.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.radButton_Accept)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this)).BeginInit(); this.SuspendLayout(); // @@ -54,7 +54,7 @@ // this.radLabel1.Location = new System.Drawing.Point(3, 5); this.radLabel1.Name = "radLabel1"; - this.radLabel1.Size = new System.Drawing.Size(127, 18); + this.radLabel1.Size = new System.Drawing.Size(139, 19); this.radLabel1.TabIndex = 0; this.radLabel1.Text = "Proxy-Authentifizierung:"; // @@ -62,7 +62,7 @@ // this.radLabel2.Location = new System.Drawing.Point(3, 33); this.radLabel2.Name = "radLabel2"; - this.radLabel2.Size = new System.Drawing.Size(81, 18); + this.radLabel2.Size = new System.Drawing.Size(88, 19); this.radLabel2.TabIndex = 1; this.radLabel2.Text = "Benutzername:"; // @@ -70,13 +70,13 @@ // this.radLabel3.Location = new System.Drawing.Point(3, 61); this.radLabel3.Name = "radLabel3"; - this.radLabel3.Size = new System.Drawing.Size(53, 18); + this.radLabel3.Size = new System.Drawing.Size(58, 19); this.radLabel3.TabIndex = 2; this.radLabel3.Text = "Passwort:"; // // radToggleSwitch_UserProxy // - this.radToggleSwitch_UserProxy.Location = new System.Drawing.Point(135, 4); + this.radToggleSwitch_UserProxy.Location = new System.Drawing.Point(145, 4); this.radToggleSwitch_UserProxy.Name = "radToggleSwitch_UserProxy"; this.radToggleSwitch_UserProxy.Size = new System.Drawing.Size(50, 20); this.radToggleSwitch_UserProxy.TabIndex = 0; @@ -85,33 +85,20 @@ // this.radTextBoxControl_Username.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) | System.Windows.Forms.AnchorStyles.Right))); - this.radTextBoxControl_Username.Location = new System.Drawing.Point(135, 31); + this.radTextBoxControl_Username.Location = new System.Drawing.Point(145, 31); this.radTextBoxControl_Username.Name = "radTextBoxControl_Username"; - this.radTextBoxControl_Username.Size = new System.Drawing.Size(361, 22); + this.radTextBoxControl_Username.Size = new System.Drawing.Size(351, 22); this.radTextBoxControl_Username.TabIndex = 0; // // radTextBoxControl_Password // this.radTextBoxControl_Password.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) | System.Windows.Forms.AnchorStyles.Right))); - this.radTextBoxControl_Password.Location = new System.Drawing.Point(135, 59); + this.radTextBoxControl_Password.Location = new System.Drawing.Point(145, 59); this.radTextBoxControl_Password.Name = "radTextBoxControl_Password"; - this.radTextBoxControl_Password.Size = new System.Drawing.Size(361, 22); + this.radTextBoxControl_Password.Size = new System.Drawing.Size(351, 22); this.radTextBoxControl_Password.TabIndex = 3; // - // radButton_Accept - // - this.radButton_Accept.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); - this.radButton_Accept.Image = global::Pilz.Updating.Administration.GUI.My.Resources.Resources.icons8_checkmark_16px; - this.radButton_Accept.ImageAlignment = System.Drawing.ContentAlignment.MiddleRight; - this.radButton_Accept.Location = new System.Drawing.Point(396, 87); - this.radButton_Accept.Name = "radButton_Accept"; - this.radButton_Accept.Size = new System.Drawing.Size(100, 24); - this.radButton_Accept.TabIndex = 0; - this.radButton_Accept.Text = "Speichern"; - this.radButton_Accept.TextAlignment = System.Drawing.ContentAlignment.MiddleLeft; - this.radButton_Accept.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageBeforeText; - // // radButton_Cancel // this.radButton_Cancel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); @@ -142,6 +129,19 @@ this.panel1.Size = new System.Drawing.Size(499, 114); this.panel1.TabIndex = 5; // + // radButton_Accept + // + this.radButton_Accept.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); + this.radButton_Accept.Image = global::Pilz.Updating.Administration.GUI.My.Resources.Resources.icons8_checkmark_16px; + this.radButton_Accept.ImageAlignment = System.Drawing.ContentAlignment.MiddleRight; + this.radButton_Accept.Location = new System.Drawing.Point(396, 87); + this.radButton_Accept.Name = "radButton_Accept"; + this.radButton_Accept.Size = new System.Drawing.Size(100, 24); + this.radButton_Accept.TabIndex = 0; + this.radButton_Accept.Text = "Speichern"; + this.radButton_Accept.TextAlignment = System.Drawing.ContentAlignment.MiddleLeft; + this.radButton_Accept.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageBeforeText; + // // ProxyConfigEditor // this.AcceptButton = this.radButton_Accept; @@ -168,10 +168,10 @@ ((System.ComponentModel.ISupportInitialize)(this.radToggleSwitch_UserProxy)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.radTextBoxControl_Username)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.radTextBoxControl_Password)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.radButton_Accept)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.radButton_Cancel)).EndInit(); this.panel1.ResumeLayout(false); this.panel1.PerformLayout(); + ((System.ComponentModel.ISupportInitialize)(this.radButton_Accept)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this)).EndInit(); this.ResumeLayout(false); @@ -185,8 +185,8 @@ private Telerik.WinControls.UI.RadToggleSwitch radToggleSwitch_UserProxy; private Telerik.WinControls.UI.RadTextBoxControl radTextBoxControl_Username; private Telerik.WinControls.UI.RadTextBoxControl radTextBoxControl_Password; - private Telerik.WinControls.UI.RadButton radButton_Accept; private Telerik.WinControls.UI.RadButton radButton_Cancel; private System.Windows.Forms.Panel panel1; + private Telerik.WinControls.UI.RadButton radButton_Accept; } } \ No newline at end of file diff --git a/Pilz.Updating.Administration.GUI/UpdateServerInfoEditor.Designer.cs b/Pilz.Updating.Administration.GUI/UpdateServerInfoEditor.Designer.cs index 5f6a740..7990c75 100644 --- a/Pilz.Updating.Administration.GUI/UpdateServerInfoEditor.Designer.cs +++ b/Pilz.Updating.Administration.GUI/UpdateServerInfoEditor.Designer.cs @@ -42,8 +42,8 @@ this.radTextBoxControl_Password = new Telerik.WinControls.UI.RadTextBoxControl(); this.radToggleSwitch_UseProxyForWebDAV = new Telerik.WinControls.UI.RadToggleSwitch(); this.panel1 = new System.Windows.Forms.Panel(); - this.radButton_Cancel = new Telerik.WinControls.UI.RadButton(); this.radButton_Save = new Telerik.WinControls.UI.RadButton(); + this.radButton_Cancel = new Telerik.WinControls.UI.RadButton(); ((System.ComponentModel.ISupportInitialize)(this.radLabel1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.radLabel2)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.radLabel3)).BeginInit(); @@ -57,8 +57,8 @@ ((System.ComponentModel.ISupportInitialize)(this.radTextBoxControl_Password)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.radToggleSwitch_UseProxyForWebDAV)).BeginInit(); this.panel1.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)(this.radButton_Cancel)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.radButton_Save)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.radButton_Cancel)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this)).BeginInit(); this.SuspendLayout(); // @@ -66,7 +66,7 @@ // this.radLabel1.Location = new System.Drawing.Point(3, 5); this.radLabel1.Name = "radLabel1"; - this.radLabel1.Size = new System.Drawing.Size(84, 18); + this.radLabel1.Size = new System.Drawing.Size(91, 19); this.radLabel1.TabIndex = 0; this.radLabel1.Text = "Server-Adresse:"; // @@ -74,7 +74,7 @@ // this.radLabel2.Location = new System.Drawing.Point(3, 33); this.radLabel2.Name = "radLabel2"; - this.radLabel2.Size = new System.Drawing.Size(116, 18); + this.radLabel2.Size = new System.Drawing.Size(126, 19); this.radLabel2.TabIndex = 1; this.radLabel2.Text = "Öffentliche Basis-URL:"; // @@ -82,7 +82,7 @@ // this.radLabel3.Location = new System.Drawing.Point(3, 61); this.radLabel3.Name = "radLabel3"; - this.radLabel3.Size = new System.Drawing.Size(161, 18); + this.radLabel3.Size = new System.Drawing.Size(176, 19); this.radLabel3.TabIndex = 2; this.radLabel3.Text = "Paketkonfigurationsdateiname:"; // @@ -90,7 +90,7 @@ // this.radLabel4.Location = new System.Drawing.Point(3, 89); this.radLabel4.Name = "radLabel4"; - this.radLabel4.Size = new System.Drawing.Size(81, 18); + this.radLabel4.Size = new System.Drawing.Size(88, 19); this.radLabel4.TabIndex = 3; this.radLabel4.Text = "Benutzername:"; // @@ -98,7 +98,7 @@ // this.radLabel5.Location = new System.Drawing.Point(3, 117); this.radLabel5.Name = "radLabel5"; - this.radLabel5.Size = new System.Drawing.Size(53, 18); + this.radLabel5.Size = new System.Drawing.Size(58, 19); this.radLabel5.TabIndex = 4; this.radLabel5.Text = "Passwort:"; // @@ -106,7 +106,7 @@ // this.radLabel6.Location = new System.Drawing.Point(3, 145); this.radLabel6.Name = "radLabel6"; - this.radLabel6.Size = new System.Drawing.Size(145, 18); + this.radLabel6.Size = new System.Drawing.Size(158, 19); this.radLabel6.TabIndex = 5; this.radLabel6.Text = "Benutze Proxy für WebDAV:"; // @@ -114,51 +114,51 @@ // this.radTextBoxControl_ServerAddress.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) | System.Windows.Forms.AnchorStyles.Right))); - this.radTextBoxControl_ServerAddress.Location = new System.Drawing.Point(171, 3); + this.radTextBoxControl_ServerAddress.Location = new System.Drawing.Point(185, 3); this.radTextBoxControl_ServerAddress.Name = "radTextBoxControl_ServerAddress"; - this.radTextBoxControl_ServerAddress.Size = new System.Drawing.Size(325, 22); + this.radTextBoxControl_ServerAddress.Size = new System.Drawing.Size(311, 22); this.radTextBoxControl_ServerAddress.TabIndex = 6; // // radTextBoxControl_PublicBasisURL // this.radTextBoxControl_PublicBasisURL.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) | System.Windows.Forms.AnchorStyles.Right))); - this.radTextBoxControl_PublicBasisURL.Location = new System.Drawing.Point(171, 31); + this.radTextBoxControl_PublicBasisURL.Location = new System.Drawing.Point(185, 31); this.radTextBoxControl_PublicBasisURL.Name = "radTextBoxControl_PublicBasisURL"; - this.radTextBoxControl_PublicBasisURL.Size = new System.Drawing.Size(325, 22); + this.radTextBoxControl_PublicBasisURL.Size = new System.Drawing.Size(311, 22); this.radTextBoxControl_PublicBasisURL.TabIndex = 7; // // radTextBoxControl_PackageConfigurationFileName // this.radTextBoxControl_PackageConfigurationFileName.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) | System.Windows.Forms.AnchorStyles.Right))); - this.radTextBoxControl_PackageConfigurationFileName.Location = new System.Drawing.Point(171, 59); + this.radTextBoxControl_PackageConfigurationFileName.Location = new System.Drawing.Point(185, 59); this.radTextBoxControl_PackageConfigurationFileName.Name = "radTextBoxControl_PackageConfigurationFileName"; - this.radTextBoxControl_PackageConfigurationFileName.Size = new System.Drawing.Size(325, 22); + this.radTextBoxControl_PackageConfigurationFileName.Size = new System.Drawing.Size(311, 22); this.radTextBoxControl_PackageConfigurationFileName.TabIndex = 8; // // radTextBoxControl_Username // this.radTextBoxControl_Username.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) | System.Windows.Forms.AnchorStyles.Right))); - this.radTextBoxControl_Username.Location = new System.Drawing.Point(171, 87); + this.radTextBoxControl_Username.Location = new System.Drawing.Point(185, 87); this.radTextBoxControl_Username.Name = "radTextBoxControl_Username"; - this.radTextBoxControl_Username.Size = new System.Drawing.Size(325, 22); + this.radTextBoxControl_Username.Size = new System.Drawing.Size(311, 22); this.radTextBoxControl_Username.TabIndex = 9; // // radTextBoxControl_Password // this.radTextBoxControl_Password.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) | System.Windows.Forms.AnchorStyles.Right))); - this.radTextBoxControl_Password.Location = new System.Drawing.Point(171, 115); + this.radTextBoxControl_Password.Location = new System.Drawing.Point(185, 115); this.radTextBoxControl_Password.Name = "radTextBoxControl_Password"; - this.radTextBoxControl_Password.Size = new System.Drawing.Size(325, 22); + this.radTextBoxControl_Password.Size = new System.Drawing.Size(311, 22); this.radTextBoxControl_Password.TabIndex = 10; this.radTextBoxControl_Password.UseSystemPasswordChar = true; // // radToggleSwitch_UseProxyForWebDAV // - this.radToggleSwitch_UseProxyForWebDAV.Location = new System.Drawing.Point(171, 144); + this.radToggleSwitch_UseProxyForWebDAV.Location = new System.Drawing.Point(185, 144); this.radToggleSwitch_UseProxyForWebDAV.Name = "radToggleSwitch_UseProxyForWebDAV"; this.radToggleSwitch_UseProxyForWebDAV.Size = new System.Drawing.Size(50, 20); this.radToggleSwitch_UseProxyForWebDAV.TabIndex = 11; @@ -186,19 +186,6 @@ this.panel1.Size = new System.Drawing.Size(499, 197); this.panel1.TabIndex = 12; // - // radButton_Cancel - // - this.radButton_Cancel.DialogResult = System.Windows.Forms.DialogResult.Cancel; - this.radButton_Cancel.Image = global::Pilz.Updating.Administration.GUI.My.Resources.Resources.icons8_delete_sign_16px; - this.radButton_Cancel.ImageAlignment = System.Drawing.ContentAlignment.MiddleRight; - this.radButton_Cancel.Location = new System.Drawing.Point(290, 170); - this.radButton_Cancel.Name = "radButton_Cancel"; - this.radButton_Cancel.Size = new System.Drawing.Size(100, 24); - this.radButton_Cancel.TabIndex = 12; - this.radButton_Cancel.Text = "Abbrechen"; - this.radButton_Cancel.TextAlignment = System.Drawing.ContentAlignment.MiddleLeft; - this.radButton_Cancel.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageBeforeText; - // // radButton_Save // this.radButton_Save.Image = global::Pilz.Updating.Administration.GUI.My.Resources.Resources.icons8_checkmark_16px; @@ -212,6 +199,19 @@ this.radButton_Save.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageBeforeText; this.radButton_Save.Click += new System.EventHandler(this.ButtonX_OK_Click); // + // radButton_Cancel + // + this.radButton_Cancel.DialogResult = System.Windows.Forms.DialogResult.Cancel; + this.radButton_Cancel.Image = global::Pilz.Updating.Administration.GUI.My.Resources.Resources.icons8_delete_sign_16px; + this.radButton_Cancel.ImageAlignment = System.Drawing.ContentAlignment.MiddleRight; + this.radButton_Cancel.Location = new System.Drawing.Point(290, 170); + this.radButton_Cancel.Name = "radButton_Cancel"; + this.radButton_Cancel.Size = new System.Drawing.Size(100, 24); + this.radButton_Cancel.TabIndex = 12; + this.radButton_Cancel.Text = "Abbrechen"; + this.radButton_Cancel.TextAlignment = System.Drawing.ContentAlignment.MiddleLeft; + this.radButton_Cancel.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageBeforeText; + // // UpdateServerInfoEditor // this.AcceptButton = this.radButton_Save; @@ -246,8 +246,8 @@ ((System.ComponentModel.ISupportInitialize)(this.radToggleSwitch_UseProxyForWebDAV)).EndInit(); this.panel1.ResumeLayout(false); this.panel1.PerformLayout(); - ((System.ComponentModel.ISupportInitialize)(this.radButton_Cancel)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.radButton_Save)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.radButton_Cancel)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this)).EndInit(); this.ResumeLayout(false);