diff --git a/Pilz.Updating.Administration.GUI/ApplicationVersionInput.Designer.cs b/Pilz.Updating.Administration.GUI/ApplicationVersionInput.Designer.cs index 30d11fc..5760826 100644 --- a/Pilz.Updating.Administration.GUI/ApplicationVersionInput.Designer.cs +++ b/Pilz.Updating.Administration.GUI/ApplicationVersionInput.Designer.cs @@ -7,7 +7,7 @@ using Microsoft.VisualBasic.CompilerServices; namespace Pilz.Updating.Administration.GUI { [DesignerGenerated()] - public partial class ApplicationVersionInput : DevComponents.DotNetBar.OfficeForm + public partial class ApplicationVersionInput : Telerik.WinControls.UI.RadForm { // Form overrides dispose to clean up the component list. @@ -36,244 +36,183 @@ namespace Pilz.Updating.Administration.GUI [DebuggerStepThrough()] private void InitializeComponent() { - this.components = new System.ComponentModel.Container(); System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(ApplicationVersionInput)); - this.TextBoxX_Version = new DevComponents.DotNetBar.Controls.TextBoxX(); - this.ComboBoxEx_Channel = new DevComponents.DotNetBar.Controls.ComboBoxEx(); - this.IntegerInput_Build = new DevComponents.Editors.IntegerInput(); - this.LayoutControl1 = new DevComponents.DotNetBar.Layout.LayoutControl(); - this.ButtonX_Cancel = new DevComponents.DotNetBar.ButtonX(); - this.ButtonX_Okay = new DevComponents.DotNetBar.ButtonX(); - this.LayoutControlItem2 = new DevComponents.DotNetBar.Layout.LayoutControlItem(); - this.LayoutControlItem3 = new DevComponents.DotNetBar.Layout.LayoutControlItem(); - this.LayoutControlItem4 = new DevComponents.DotNetBar.Layout.LayoutControlItem(); - this.LayoutSpacerItem1 = new DevComponents.DotNetBar.Layout.LayoutSpacerItem(); - this.LayoutControlItem5 = new DevComponents.DotNetBar.Layout.LayoutControlItem(); - this.LayoutControlItem6 = new DevComponents.DotNetBar.Layout.LayoutControlItem(); - ((System.ComponentModel.ISupportInitialize)(this.IntegerInput_Build)).BeginInit(); - this.LayoutControl1.SuspendLayout(); + this.radLabel1 = new Telerik.WinControls.UI.RadLabel(); + this.radLabel2 = new Telerik.WinControls.UI.RadLabel(); + this.radLabel3 = new Telerik.WinControls.UI.RadLabel(); + this.radTextBoxControl_Version = new Telerik.WinControls.UI.RadTextBoxControl(); + this.radDropDownList_Channel = new Telerik.WinControls.UI.RadDropDownList(); + this.panel1 = new System.Windows.Forms.Panel(); + this.radButton_Cancel = new Telerik.WinControls.UI.RadButton(); + this.radButton_Accept = new Telerik.WinControls.UI.RadButton(); + this.radSpinEditor_Build = new Telerik.WinControls.UI.RadSpinEditor(); + ((System.ComponentModel.ISupportInitialize)(this.radLabel1)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.radLabel2)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.radLabel3)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.radTextBoxControl_Version)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.radDropDownList_Channel)).BeginInit(); + this.panel1.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.radButton_Cancel)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.radButton_Accept)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.radSpinEditor_Build)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this)).BeginInit(); this.SuspendLayout(); // - // TextBoxX_Version + // radLabel1 // - this.TextBoxX_Version.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) + this.radLabel1.Location = new System.Drawing.Point(3, 5); + this.radLabel1.Name = "radLabel1"; + this.radLabel1.Size = new System.Drawing.Size(46, 18); + this.radLabel1.TabIndex = 0; + this.radLabel1.Text = "Version:"; + // + // radLabel2 + // + this.radLabel2.Location = new System.Drawing.Point(3, 33); + this.radLabel2.Name = "radLabel2"; + this.radLabel2.Size = new System.Drawing.Size(36, 18); + this.radLabel2.TabIndex = 1; + this.radLabel2.Text = "Kanal:"; + // + // radLabel3 + // + this.radLabel3.Location = new System.Drawing.Point(3, 63); + this.radLabel3.Name = "radLabel3"; + this.radLabel3.Size = new System.Drawing.Size(34, 18); + this.radLabel3.TabIndex = 2; + this.radLabel3.Text = "Build:"; + // + // radTextBoxControl_Version + // + this.radTextBoxControl_Version.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) | System.Windows.Forms.AnchorStyles.Right))); - this.TextBoxX_Version.BackColor = System.Drawing.Color.White; + this.radTextBoxControl_Version.Location = new System.Drawing.Point(74, 3); + this.radTextBoxControl_Version.Name = "radTextBoxControl_Version"; + this.radTextBoxControl_Version.NullText = "Bspw. 1.2.5.0"; + this.radTextBoxControl_Version.Size = new System.Drawing.Size(255, 22); + this.radTextBoxControl_Version.TabIndex = 0; // + // radDropDownList_Channel // - // - this.TextBoxX_Version.Border.Class = "TextBoxBorder"; - this.TextBoxX_Version.Border.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.TextBoxX_Version.DisabledBackColor = System.Drawing.Color.White; - this.TextBoxX_Version.ForeColor = System.Drawing.Color.Black; - this.TextBoxX_Version.Location = new System.Drawing.Point(53, 4); - this.TextBoxX_Version.Margin = new System.Windows.Forms.Padding(0); - this.TextBoxX_Version.Name = "TextBoxX_Version"; - this.TextBoxX_Version.PreventEnterBeep = true; - this.TextBoxX_Version.Size = new System.Drawing.Size(275, 20); - this.TextBoxX_Version.TabIndex = 0; - this.TextBoxX_Version.WatermarkBehavior = DevComponents.DotNetBar.eWatermarkBehavior.HideNonEmpty; - this.TextBoxX_Version.WatermarkText = "Bspw.: 1.2.5.0"; - // - // ComboBoxEx_Channel - // - this.ComboBoxEx_Channel.DisplayMember = "Text"; - this.ComboBoxEx_Channel.DrawMode = System.Windows.Forms.DrawMode.OwnerDrawFixed; - this.ComboBoxEx_Channel.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; - this.ComboBoxEx_Channel.ForeColor = System.Drawing.Color.Black; - this.ComboBoxEx_Channel.FormattingEnabled = true; - this.ComboBoxEx_Channel.ItemHeight = 15; - this.ComboBoxEx_Channel.Location = new System.Drawing.Point(53, 32); - this.ComboBoxEx_Channel.Margin = new System.Windows.Forms.Padding(0); - this.ComboBoxEx_Channel.Name = "ComboBoxEx_Channel"; - this.ComboBoxEx_Channel.Size = new System.Drawing.Size(275, 21); - this.ComboBoxEx_Channel.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ComboBoxEx_Channel.TabIndex = 1; - // - // IntegerInput_Build - // - this.IntegerInput_Build.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) + this.radDropDownList_Channel.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) | System.Windows.Forms.AnchorStyles.Right))); + this.radDropDownList_Channel.DropDownAnimationEnabled = true; + 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.TabIndex = 0; // + // panel1 // + this.panel1.BackColor = System.Drawing.Color.Transparent; + this.panel1.Controls.Add(this.radSpinEditor_Build); + this.panel1.Controls.Add(this.radButton_Cancel); + this.panel1.Controls.Add(this.radLabel1); + this.panel1.Controls.Add(this.radButton_Accept); + this.panel1.Controls.Add(this.radLabel2); + this.panel1.Controls.Add(this.radLabel3); + this.panel1.Controls.Add(this.radTextBoxControl_Version); + this.panel1.Controls.Add(this.radDropDownList_Channel); + 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.TabIndex = 3; // - this.IntegerInput_Build.BackgroundStyle.Class = "DateTimeInputBackground"; - this.IntegerInput_Build.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.IntegerInput_Build.ButtonFreeText.Shortcut = DevComponents.DotNetBar.eShortcut.F2; - this.IntegerInput_Build.InputHorizontalAlignment = DevComponents.Editors.eHorizontalAlignment.Left; - this.IntegerInput_Build.Location = new System.Drawing.Point(53, 61); - this.IntegerInput_Build.Margin = new System.Windows.Forms.Padding(0); - this.IntegerInput_Build.MinValue = 0; - this.IntegerInput_Build.Name = "IntegerInput_Build"; - this.IntegerInput_Build.ShowUpDown = true; - this.IntegerInput_Build.Size = new System.Drawing.Size(275, 20); - this.IntegerInput_Build.TabIndex = 2; + // radButton_Cancel // - // LayoutControl1 + this.radButton_Cancel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); + 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.Name = "radButton_Cancel"; + this.radButton_Cancel.Size = new System.Drawing.Size(100, 24); + this.radButton_Cancel.TabIndex = 0; + this.radButton_Cancel.Text = "Abbrechen"; + this.radButton_Cancel.TextAlignment = System.Drawing.ContentAlignment.MiddleLeft; + this.radButton_Cancel.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageBeforeText; // - this.LayoutControl1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(255))))); - this.LayoutControl1.Controls.Add(this.TextBoxX_Version); - this.LayoutControl1.Controls.Add(this.ComboBoxEx_Channel); - this.LayoutControl1.Controls.Add(this.IntegerInput_Build); - this.LayoutControl1.Controls.Add(this.ButtonX_Cancel); - this.LayoutControl1.Controls.Add(this.ButtonX_Okay); - this.LayoutControl1.Dock = System.Windows.Forms.DockStyle.Fill; - this.LayoutControl1.ForeColor = System.Drawing.Color.Black; - this.LayoutControl1.Location = new System.Drawing.Point(0, 0); - this.LayoutControl1.Name = "LayoutControl1"; + // 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(229, 91); + this.radButton_Accept.Name = "radButton_Accept"; + this.radButton_Accept.Size = new System.Drawing.Size(100, 24); + this.radButton_Accept.TabIndex = 4; + this.radButton_Accept.Text = "Okay"; + this.radButton_Accept.TextAlignment = System.Drawing.ContentAlignment.MiddleLeft; + this.radButton_Accept.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageBeforeText; // + // radSpinEditor_Build // - this.LayoutControl1.RootGroup.Items.AddRange(new DevComponents.DotNetBar.Layout.LayoutItemBase[] { - this.LayoutControlItem2, - this.LayoutControlItem3, - this.LayoutControlItem4, - this.LayoutSpacerItem1, - this.LayoutControlItem5, - this.LayoutControlItem6}); - this.LayoutControl1.Size = new System.Drawing.Size(332, 116); - this.LayoutControl1.TabIndex = 5; - // - // ButtonX_Cancel - // - this.ButtonX_Cancel.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; - this.ButtonX_Cancel.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; - this.ButtonX_Cancel.DialogResult = System.Windows.Forms.DialogResult.Cancel; - this.ButtonX_Cancel.Image = global::Pilz.Updating.Administration.GUI.My.Resources.Resources.icons8_delete_sign_16px; - this.ButtonX_Cancel.Location = new System.Drawing.Point(170, 89); - this.ButtonX_Cancel.Margin = new System.Windows.Forms.Padding(0); - this.ButtonX_Cancel.Name = "ButtonX_Cancel"; - this.ButtonX_Cancel.Size = new System.Drawing.Size(75, 23); - this.ButtonX_Cancel.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ButtonX_Cancel.TabIndex = 4; - this.ButtonX_Cancel.Text = "Abbrechen"; - // - // ButtonX_Okay - // - this.ButtonX_Okay.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; - this.ButtonX_Okay.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; - this.ButtonX_Okay.DialogResult = System.Windows.Forms.DialogResult.OK; - this.ButtonX_Okay.Image = global::Pilz.Updating.Administration.GUI.My.Resources.Resources.icons8_checkmark_16px; - this.ButtonX_Okay.Location = new System.Drawing.Point(253, 89); - this.ButtonX_Okay.Margin = new System.Windows.Forms.Padding(0); - this.ButtonX_Okay.Name = "ButtonX_Okay"; - this.ButtonX_Okay.Size = new System.Drawing.Size(75, 23); - this.ButtonX_Okay.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ButtonX_Okay.TabIndex = 5; - this.ButtonX_Okay.Text = "Okay"; - // - // LayoutControlItem2 - // - this.LayoutControlItem2.Control = this.TextBoxX_Version; - this.LayoutControlItem2.Height = 28; - this.LayoutControlItem2.MinSize = new System.Drawing.Size(120, 0); - this.LayoutControlItem2.Name = "LayoutControlItem2"; - this.LayoutControlItem2.Text = "Version:"; - this.LayoutControlItem2.TextLineAlignment = DevComponents.DotNetBar.Layout.eTextLineAlignment.Middle; - this.LayoutControlItem2.Width = 100; - this.LayoutControlItem2.WidthType = DevComponents.DotNetBar.Layout.eLayoutSizeType.Percent; - // - // LayoutControlItem3 - // - this.LayoutControlItem3.Control = this.ComboBoxEx_Channel; - this.LayoutControlItem3.Height = 29; - this.LayoutControlItem3.MinSize = new System.Drawing.Size(64, 18); - this.LayoutControlItem3.Name = "LayoutControlItem3"; - this.LayoutControlItem3.Text = "Kanal:"; - this.LayoutControlItem3.TextLineAlignment = DevComponents.DotNetBar.Layout.eTextLineAlignment.Middle; - this.LayoutControlItem3.Width = 100; - this.LayoutControlItem3.WidthType = DevComponents.DotNetBar.Layout.eLayoutSizeType.Percent; - // - // LayoutControlItem4 - // - this.LayoutControlItem4.Control = this.IntegerInput_Build; - this.LayoutControlItem4.Height = 28; - this.LayoutControlItem4.MinSize = new System.Drawing.Size(120, 0); - this.LayoutControlItem4.Name = "LayoutControlItem4"; - this.LayoutControlItem4.Text = "Build:"; - this.LayoutControlItem4.TextLineAlignment = DevComponents.DotNetBar.Layout.eTextLineAlignment.Middle; - this.LayoutControlItem4.Width = 100; - this.LayoutControlItem4.WidthType = DevComponents.DotNetBar.Layout.eLayoutSizeType.Percent; - // - // LayoutSpacerItem1 - // - this.LayoutSpacerItem1.Height = 31; - this.LayoutSpacerItem1.HeightType = DevComponents.DotNetBar.Layout.eLayoutSizeType.Percent; - this.LayoutSpacerItem1.Name = "LayoutSpacerItem1"; - this.LayoutSpacerItem1.Width = 99; - this.LayoutSpacerItem1.WidthType = DevComponents.DotNetBar.Layout.eLayoutSizeType.Percent; - // - // LayoutControlItem5 - // - this.LayoutControlItem5.Control = this.ButtonX_Cancel; - this.LayoutControlItem5.Height = 31; - this.LayoutControlItem5.MinSize = new System.Drawing.Size(32, 20); - this.LayoutControlItem5.Name = "LayoutControlItem5"; - this.LayoutControlItem5.Width = 83; - // - // LayoutControlItem6 - // - this.LayoutControlItem6.Control = this.ButtonX_Okay; - this.LayoutControlItem6.Height = 31; - this.LayoutControlItem6.MinSize = new System.Drawing.Size(32, 20); - this.LayoutControlItem6.Name = "LayoutControlItem6"; - this.LayoutControlItem6.Width = 83; + 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.Minimum = new decimal(new int[] { + 1, + 0, + 0, + 0}); + this.radSpinEditor_Build.Name = "radSpinEditor_Build"; + this.radSpinEditor_Build.NullableValue = new decimal(new int[] { + 1, + 0, + 0, + 0}); + this.radSpinEditor_Build.Size = new System.Drawing.Size(255, 24); + this.radSpinEditor_Build.TabIndex = 5; + this.radSpinEditor_Build.Value = new decimal(new int[] { + 1, + 0, + 0, + 0}); // // ApplicationVersionInput // - this.AcceptButton = this.ButtonX_Okay; - this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); + this.AcceptButton = this.radButton_Accept; + this.AutoScaleBaseSize = new System.Drawing.Size(7, 15); + this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.CancelButton = this.ButtonX_Cancel; - this.ClientSize = new System.Drawing.Size(332, 116); - this.Controls.Add(this.LayoutControl1); + this.CancelButton = this.radButton_Cancel; + this.ClientSize = new System.Drawing.Size(332, 118); + this.Controls.Add(this.panel1); this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow; this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); this.MaximizeBox = false; this.MinimizeBox = false; this.Name = "ApplicationVersionInput"; + // + // + // + this.RootElement.ApplyShapeToControl = true; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent; this.Text = "Version"; - this.TopLeftCornerSize = 0; - this.TopRightCornerSize = 0; - ((System.ComponentModel.ISupportInitialize)(this.IntegerInput_Build)).EndInit(); - this.LayoutControl1.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)(this.radLabel1)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.radLabel2)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.radLabel3)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.radTextBoxControl_Version)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.radDropDownList_Channel)).EndInit(); + this.panel1.ResumeLayout(false); + this.panel1.PerformLayout(); + ((System.ComponentModel.ISupportInitialize)(this.radButton_Cancel)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.radButton_Accept)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.radSpinEditor_Build)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this)).EndInit(); this.ResumeLayout(false); } - - private DevComponents.DotNetBar.Controls.TextBoxX TextBoxX_Version; - - - private DevComponents.DotNetBar.Controls.ComboBoxEx ComboBoxEx_Channel; - - - private DevComponents.Editors.IntegerInput IntegerInput_Build; - - - private DevComponents.DotNetBar.Layout.LayoutControl LayoutControl1; - - - - private DevComponents.DotNetBar.Layout.LayoutControlItem LayoutControlItem2; - - - private DevComponents.DotNetBar.Layout.LayoutControlItem LayoutControlItem3; - - - private DevComponents.DotNetBar.Layout.LayoutControlItem LayoutControlItem4; - - - private DevComponents.DotNetBar.ButtonX ButtonX_Cancel; - - - private DevComponents.DotNetBar.ButtonX ButtonX_Okay; - - private DevComponents.DotNetBar.Layout.LayoutSpacerItem LayoutSpacerItem1; - - private DevComponents.DotNetBar.Layout.LayoutControlItem LayoutControlItem5; - - private DevComponents.DotNetBar.Layout.LayoutControlItem LayoutControlItem6; + private Telerik.WinControls.UI.RadLabel radLabel1; + private Telerik.WinControls.UI.RadLabel radLabel2; + private Telerik.WinControls.UI.RadLabel radLabel3; + private Telerik.WinControls.UI.RadTextBoxControl radTextBoxControl_Version; + private Telerik.WinControls.UI.RadDropDownList radDropDownList_Channel; + private Panel panel1; + private Telerik.WinControls.UI.RadButton radButton_Cancel; + private Telerik.WinControls.UI.RadButton radButton_Accept; + private Telerik.WinControls.UI.RadSpinEditor radSpinEditor_Build; } } \ No newline at end of file diff --git a/Pilz.Updating.Administration.GUI/ApplicationVersionInput.cs b/Pilz.Updating.Administration.GUI/ApplicationVersionInput.cs index 97661e4..4335bd4 100644 --- a/Pilz.Updating.Administration.GUI/ApplicationVersionInput.cs +++ b/Pilz.Updating.Administration.GUI/ApplicationVersionInput.cs @@ -1,6 +1,7 @@ using System; using global::DevComponents.Editors; using Microsoft.VisualBasic.CompilerServices; +using Telerik.WinControls.UI; namespace Pilz.Updating.Administration.GUI { @@ -14,11 +15,11 @@ namespace Pilz.Updating.Administration.GUI InitializeComponent(); // Init Channel-ComboBox - ComboBoxEx_Channel.Items.Add(new ComboItem() { Text = My.Resources.UpdatingAdministrationLangRes.Channel_Stable, Tag = Channels.Stable }); - ComboBoxEx_Channel.Items.Add(new ComboItem() { Text = My.Resources.UpdatingAdministrationLangRes.Channel_PreRelease, Tag = Channels.PreRelease }); - ComboBoxEx_Channel.Items.Add(new ComboItem() { Text = My.Resources.UpdatingAdministrationLangRes.Channel_Beta, Tag = Channels.Beta }); - ComboBoxEx_Channel.Items.Add(new ComboItem() { Text = My.Resources.UpdatingAdministrationLangRes.Channel_Alpha, Tag = Channels.Alpha }); - ComboBoxEx_Channel.SelectedIndex = 0; + radDropDownList_Channel.Items.Add(new RadListDataItem() { Text = My.Resources.UpdatingAdministrationLangRes.Channel_Stable, Tag = Channels.Stable }); + radDropDownList_Channel.Items.Add(new RadListDataItem() { Text = My.Resources.UpdatingAdministrationLangRes.Channel_PreRelease, Tag = Channels.PreRelease }); + radDropDownList_Channel.Items.Add(new RadListDataItem() { Text = My.Resources.UpdatingAdministrationLangRes.Channel_Beta, Tag = Channels.Beta }); + radDropDownList_Channel.Items.Add(new RadListDataItem() { Text = My.Resources.UpdatingAdministrationLangRes.Channel_Alpha, Tag = Channels.Alpha }); + radDropDownList_Channel.SelectedIndex = 0; } // P r o p e r t i e s @@ -27,12 +28,12 @@ namespace Pilz.Updating.Administration.GUI { get { - return new Version(TextBoxX_Version.Text.Trim()); + return new Version(radTextBoxControl_Version.Text.Trim()); } set { - TextBoxX_Version.Text = value.ToString(); + radTextBoxControl_Version.Text = value.ToString(); } } @@ -40,16 +41,16 @@ namespace Pilz.Updating.Administration.GUI { get { - return (Channels)((ComboItem)ComboBoxEx_Channel.SelectedItem).Tag; + return (Channels)radDropDownList_Channel.SelectedItem.Tag; } set { - foreach (ComboItem ci in ComboBoxEx_Channel.Items) + foreach (var ci in radDropDownList_Channel.Items) { if ((Channels)ci.Tag == value) { - ComboBoxEx_Channel.SelectedItem = ci; + radDropDownList_Channel.SelectedItem = ci; } } } @@ -59,12 +60,12 @@ namespace Pilz.Updating.Administration.GUI { get { - return IntegerInput_Build.Value; + return (int)Math.Round(radSpinEditor_Build.Value); } set { - IntegerInput_Build.Value = value; + radSpinEditor_Build.Value = value; } } } diff --git a/Pilz.Updating.Administration.GUI/ApplicationVersionInput.resx b/Pilz.Updating.Administration.GUI/ApplicationVersionInput.resx index 96f590b..d2235dd 100644 --- a/Pilz.Updating.Administration.GUI/ApplicationVersionInput.resx +++ b/Pilz.Updating.Administration.GUI/ApplicationVersionInput.resx @@ -1,64 +1,4 @@ - - - + diff --git a/Pilz.Updating.Administration.GUI/DiscordBotSettingsWindow.Designer.cs b/Pilz.Updating.Administration.GUI/DiscordBotSettingsWindow.Designer.cs index bb223fc..67d13c5 100644 --- a/Pilz.Updating.Administration.GUI/DiscordBotSettingsWindow.Designer.cs +++ b/Pilz.Updating.Administration.GUI/DiscordBotSettingsWindow.Designer.cs @@ -29,255 +29,190 @@ namespace Pilz.Updating.Administration.GUI private void InitializeComponent() { System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(DiscordBotSettingsWindow)); - this.layoutControl1 = new DevComponents.DotNetBar.Layout.LayoutControl(); - this.TextBoxX_AppName = new DevComponents.DotNetBar.Controls.TextBoxX(); - this.TextBoxX_Msg = new DevComponents.DotNetBar.Controls.TextBoxX(); - this.TextBoxX_BotToken = new DevComponents.DotNetBar.Controls.TextBoxX(); - this.ButtonX_Cancel = new DevComponents.DotNetBar.ButtonX(); - this.ButtonX_Okay = new DevComponents.DotNetBar.ButtonX(); - this.switchButton_UseProxy = new DevComponents.DotNetBar.Controls.SwitchButton(); - this.layoutControlItem3 = new DevComponents.DotNetBar.Layout.LayoutControlItem(); - this.layoutControlItem6 = new DevComponents.DotNetBar.Layout.LayoutControlItem(); - this.layoutSpacerItem2 = new DevComponents.DotNetBar.Layout.LayoutSpacerItem(); - this.layoutControlItem1 = new DevComponents.DotNetBar.Layout.LayoutControlItem(); - this.layoutControlItem2 = new DevComponents.DotNetBar.Layout.LayoutControlItem(); - this.layoutSpacerItem1 = new DevComponents.DotNetBar.Layout.LayoutSpacerItem(); - this.layoutControlItem4 = new DevComponents.DotNetBar.Layout.LayoutControlItem(); - this.layoutControlItem5 = new DevComponents.DotNetBar.Layout.LayoutControlItem(); - this.layoutControl1.SuspendLayout(); + this.panel1 = new System.Windows.Forms.Panel(); + this.radLabel1 = new Telerik.WinControls.UI.RadLabel(); + this.radLabel2 = new Telerik.WinControls.UI.RadLabel(); + this.radLabel3 = new Telerik.WinControls.UI.RadLabel(); + this.radLabel4 = new Telerik.WinControls.UI.RadLabel(); + this.radTextBoxControl_BotToken = new Telerik.WinControls.UI.RadTextBoxControl(); + this.radTextBoxControl_DefaultProgramName = new Telerik.WinControls.UI.RadTextBoxControl(); + this.radRichTextEditor_DefaultMessage = new Telerik.WinControls.UI.RadRichTextEditor(); + this.radToggleSwitch_UseProxy = new Telerik.WinControls.UI.RadToggleSwitch(); + this.radButton_Abbrechen = new Telerik.WinControls.UI.RadButton(); + this.radButton_Okay = new Telerik.WinControls.UI.RadButton(); + this.panel1.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.radLabel1)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.radLabel2)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.radLabel3)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.radLabel4)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.radTextBoxControl_BotToken)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.radTextBoxControl_DefaultProgramName)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.radRichTextEditor_DefaultMessage)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.radToggleSwitch_UseProxy)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.radButton_Abbrechen)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.radButton_Okay)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this)).BeginInit(); this.SuspendLayout(); // - // layoutControl1 + // panel1 // - this.layoutControl1.BackColor = System.Drawing.Color.Transparent; - this.layoutControl1.Controls.Add(this.TextBoxX_AppName); - this.layoutControl1.Controls.Add(this.TextBoxX_Msg); - this.layoutControl1.Controls.Add(this.TextBoxX_BotToken); - this.layoutControl1.Controls.Add(this.ButtonX_Cancel); - this.layoutControl1.Controls.Add(this.ButtonX_Okay); - this.layoutControl1.Controls.Add(this.switchButton_UseProxy); - this.layoutControl1.Dock = System.Windows.Forms.DockStyle.Fill; - this.layoutControl1.ForeColor = System.Drawing.Color.Black; - this.layoutControl1.Location = new System.Drawing.Point(0, 0); - this.layoutControl1.Name = "layoutControl1"; + this.panel1.BackColor = System.Drawing.Color.Transparent; + this.panel1.Controls.Add(this.radLabel4); + this.panel1.Controls.Add(this.radTextBoxControl_BotToken); + this.panel1.Controls.Add(this.radLabel3); + this.panel1.Controls.Add(this.radTextBoxControl_DefaultProgramName); + this.panel1.Controls.Add(this.radLabel2); + this.panel1.Controls.Add(this.radRichTextEditor_DefaultMessage); + this.panel1.Controls.Add(this.radToggleSwitch_UseProxy); + this.panel1.Controls.Add(this.radButton_Abbrechen); + this.panel1.Controls.Add(this.radButton_Okay); + this.panel1.Controls.Add(this.radLabel1); + 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(736, 471); + this.panel1.TabIndex = 0; // + // radLabel1 // + this.radLabel1.Location = new System.Drawing.Point(3, 5); + this.radLabel1.Name = "radLabel1"; + this.radLabel1.Size = new System.Drawing.Size(61, 18); + this.radLabel1.TabIndex = 0; + this.radLabel1.Text = "Bot-Token:"; // - this.layoutControl1.RootGroup.Items.AddRange(new DevComponents.DotNetBar.Layout.LayoutItemBase[] { - this.layoutControlItem3, - this.layoutControlItem6, - this.layoutSpacerItem2, - this.layoutControlItem1, - this.layoutControlItem2, - this.layoutSpacerItem1, - this.layoutControlItem4, - this.layoutControlItem5}); - this.layoutControl1.Size = new System.Drawing.Size(736, 471); - this.layoutControl1.TabIndex = 0; + // radLabel2 // - // TextBoxX_AppName + this.radLabel2.Location = new System.Drawing.Point(3, 33); + this.radLabel2.Name = "radLabel2"; + this.radLabel2.Size = new System.Drawing.Size(94, 18); + this.radLabel2.TabIndex = 1; + this.radLabel2.Text = "Proxy verwenden:"; // - this.TextBoxX_AppName.BackColor = System.Drawing.Color.White; + // radLabel3 // + this.radLabel3.Location = new System.Drawing.Point(3, 61); + this.radLabel3.Name = "radLabel3"; + this.radLabel3.Size = new System.Drawing.Size(114, 18); + this.radLabel3.TabIndex = 2; + this.radLabel3.Text = "Standart-Programme:"; // + // radLabel4 // - this.TextBoxX_AppName.Border.Class = "TextBoxBorder"; - this.TextBoxX_AppName.Border.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.TextBoxX_AppName.DisabledBackColor = System.Drawing.Color.White; - this.TextBoxX_AppName.ForeColor = System.Drawing.Color.Black; - this.TextBoxX_AppName.Location = new System.Drawing.Point(142, 62); - this.TextBoxX_AppName.Margin = new System.Windows.Forms.Padding(0); - this.TextBoxX_AppName.Name = "TextBoxX_AppName"; - this.TextBoxX_AppName.PreventEnterBeep = true; - this.TextBoxX_AppName.Size = new System.Drawing.Size(590, 20); - this.TextBoxX_AppName.TabIndex = 3; - this.TextBoxX_AppName.TextChanged += new System.EventHandler(this.TextBoxX_AppName_TextChanged); + this.radLabel4.Location = new System.Drawing.Point(3, 89); + this.radLabel4.Name = "radLabel4"; + this.radLabel4.Size = new System.Drawing.Size(103, 18); + this.radLabel4.TabIndex = 3; + this.radLabel4.Text = "Standart-Nachricht:"; // - // TextBoxX_Msg + // radTextBoxControl_BotToken // - this.TextBoxX_Msg.BackColor = System.Drawing.Color.White; + this.radTextBoxControl_BotToken.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); + this.radTextBoxControl_BotToken.Location = new System.Drawing.Point(127, 3); + this.radTextBoxControl_BotToken.Name = "radTextBoxControl_BotToken"; + this.radTextBoxControl_BotToken.Size = new System.Drawing.Size(606, 22); + this.radTextBoxControl_BotToken.TabIndex = 0; // + // radTextBoxControl_DefaultProgramName // + this.radTextBoxControl_DefaultProgramName.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); + this.radTextBoxControl_DefaultProgramName.Location = new System.Drawing.Point(127, 59); + this.radTextBoxControl_DefaultProgramName.Name = "radTextBoxControl_DefaultProgramName"; + this.radTextBoxControl_DefaultProgramName.Size = new System.Drawing.Size(606, 22); + this.radTextBoxControl_DefaultProgramName.TabIndex = 4; // - this.TextBoxX_Msg.Border.Class = "TextBoxBorder"; - this.TextBoxX_Msg.Border.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.TextBoxX_Msg.DisabledBackColor = System.Drawing.Color.White; - this.TextBoxX_Msg.ForeColor = System.Drawing.Color.Black; - this.TextBoxX_Msg.Location = new System.Drawing.Point(142, 90); - this.TextBoxX_Msg.Margin = new System.Windows.Forms.Padding(0); - this.TextBoxX_Msg.Multiline = true; - this.TextBoxX_Msg.Name = "TextBoxX_Msg"; - this.TextBoxX_Msg.PreventEnterBeep = true; - this.TextBoxX_Msg.ScrollBars = System.Windows.Forms.ScrollBars.Both; - this.TextBoxX_Msg.Size = new System.Drawing.Size(590, 346); - this.TextBoxX_Msg.TabIndex = 4; - this.TextBoxX_Msg.TextChanged += new System.EventHandler(this.TextBoxX_Msg_TextChanged); + // radRichTextEditor_DefaultMessage // - // TextBoxX_BotToken + this.radRichTextEditor_DefaultMessage.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) + | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); + this.radRichTextEditor_DefaultMessage.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(204)))), ((int)(((byte)(204)))), ((int)(((byte)(204))))); + this.radRichTextEditor_DefaultMessage.Location = new System.Drawing.Point(127, 87); + this.radRichTextEditor_DefaultMessage.Name = "radRichTextEditor_DefaultMessage"; + this.radRichTextEditor_DefaultMessage.SelectionFill = System.Drawing.Color.FromArgb(((int)(((byte)(128)))), ((int)(((byte)(179)))), ((int)(((byte)(236)))), ((int)(((byte)(248))))); + this.radRichTextEditor_DefaultMessage.SelectionStroke = System.Drawing.Color.FromArgb(((int)(((byte)(179)))), ((int)(((byte)(236)))), ((int)(((byte)(248))))); + this.radRichTextEditor_DefaultMessage.Size = new System.Drawing.Size(606, 351); + this.radRichTextEditor_DefaultMessage.TabIndex = 0; // - this.TextBoxX_BotToken.BackColor = System.Drawing.Color.White; + // radToggleSwitch_UseProxy // + this.radToggleSwitch_UseProxy.Location = new System.Drawing.Point(127, 32); + this.radToggleSwitch_UseProxy.Name = "radToggleSwitch_UseProxy"; + this.radToggleSwitch_UseProxy.Size = new System.Drawing.Size(50, 20); + this.radToggleSwitch_UseProxy.TabIndex = 0; // + // radButton_Abbrechen // - this.TextBoxX_BotToken.Border.Class = "TextBoxBorder"; - this.TextBoxX_BotToken.Border.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.TextBoxX_BotToken.DisabledBackColor = System.Drawing.Color.White; - this.TextBoxX_BotToken.ForeColor = System.Drawing.Color.Black; - this.TextBoxX_BotToken.Location = new System.Drawing.Point(142, 4); - this.TextBoxX_BotToken.Margin = new System.Windows.Forms.Padding(0); - this.TextBoxX_BotToken.Name = "TextBoxX_BotToken"; - this.TextBoxX_BotToken.PreventEnterBeep = true; - this.TextBoxX_BotToken.Size = new System.Drawing.Size(590, 20); - this.TextBoxX_BotToken.TabIndex = 0; - this.TextBoxX_BotToken.TextChanged += new System.EventHandler(this.TextBoxX_BotToken_TextChanged); + this.radButton_Abbrechen.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); + this.radButton_Abbrechen.DialogResult = System.Windows.Forms.DialogResult.Cancel; + this.radButton_Abbrechen.Image = global::Pilz.Updating.Administration.GUI.My.Resources.Resources.icons8_delete_sign_16px; + this.radButton_Abbrechen.ImageAlignment = System.Drawing.ContentAlignment.MiddleRight; + this.radButton_Abbrechen.Location = new System.Drawing.Point(527, 444); + this.radButton_Abbrechen.Name = "radButton_Abbrechen"; + this.radButton_Abbrechen.Size = new System.Drawing.Size(100, 24); + this.radButton_Abbrechen.TabIndex = 0; + this.radButton_Abbrechen.Text = "Abbrechen"; + this.radButton_Abbrechen.TextAlignment = System.Drawing.ContentAlignment.MiddleLeft; + this.radButton_Abbrechen.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageBeforeText; // - // ButtonX_Cancel + // radButton_Okay // - this.ButtonX_Cancel.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; - this.ButtonX_Cancel.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; - this.ButtonX_Cancel.DialogResult = System.Windows.Forms.DialogResult.Cancel; - this.ButtonX_Cancel.Image = global::Pilz.Updating.Administration.GUI.My.Resources.Resources.icons8_delete_sign_16px; - this.ButtonX_Cancel.Location = new System.Drawing.Point(574, 444); - this.ButtonX_Cancel.Margin = new System.Windows.Forms.Padding(0); - this.ButtonX_Cancel.Name = "ButtonX_Cancel"; - this.ButtonX_Cancel.Size = new System.Drawing.Size(75, 23); - this.ButtonX_Cancel.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ButtonX_Cancel.TabIndex = 6; - this.ButtonX_Cancel.Text = "Abbrechen"; - // - // ButtonX_Okay - // - this.ButtonX_Okay.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; - this.ButtonX_Okay.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; - this.ButtonX_Okay.DialogResult = System.Windows.Forms.DialogResult.OK; - this.ButtonX_Okay.Image = global::Pilz.Updating.Administration.GUI.My.Resources.Resources.icons8_checkmark_16px; - this.ButtonX_Okay.Location = new System.Drawing.Point(657, 444); - this.ButtonX_Okay.Margin = new System.Windows.Forms.Padding(0); - this.ButtonX_Okay.Name = "ButtonX_Okay"; - this.ButtonX_Okay.Size = new System.Drawing.Size(75, 23); - this.ButtonX_Okay.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ButtonX_Okay.TabIndex = 7; - this.ButtonX_Okay.Text = "Okay"; - this.ButtonX_Okay.Click += new System.EventHandler(this.ButtonX_Okay_Click); - // - // switchButton_UseProxy - // - // - // - // - this.switchButton_UseProxy.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.switchButton_UseProxy.Location = new System.Drawing.Point(142, 32); - this.switchButton_UseProxy.Margin = new System.Windows.Forms.Padding(0); - this.switchButton_UseProxy.Name = "switchButton_UseProxy"; - this.switchButton_UseProxy.OffText = "Nein"; - this.switchButton_UseProxy.OnText = "Ja"; - this.switchButton_UseProxy.Size = new System.Drawing.Size(104, 22); - this.switchButton_UseProxy.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.switchButton_UseProxy.TabIndex = 1; - // - // layoutControlItem3 - // - this.layoutControlItem3.Control = this.TextBoxX_BotToken; - this.layoutControlItem3.Height = 28; - this.layoutControlItem3.MinSize = new System.Drawing.Size(120, 0); - this.layoutControlItem3.Name = "layoutControlItem3"; - this.layoutControlItem3.Text = "Bot-Token:"; - this.layoutControlItem3.Width = 100; - this.layoutControlItem3.WidthType = DevComponents.DotNetBar.Layout.eLayoutSizeType.Percent; - // - // layoutControlItem6 - // - this.layoutControlItem6.Control = this.switchButton_UseProxy; - this.layoutControlItem6.Height = 30; - this.layoutControlItem6.MinSize = new System.Drawing.Size(64, 18); - this.layoutControlItem6.Name = "layoutControlItem6"; - this.layoutControlItem6.Text = "Proxy verwenden:"; - this.layoutControlItem6.TextPadding = new System.Windows.Forms.Padding(0, 4, 0, 0); - this.layoutControlItem6.Width = 250; - // - // layoutSpacerItem2 - // - this.layoutSpacerItem2.Height = 30; - this.layoutSpacerItem2.Name = "layoutSpacerItem2"; - this.layoutSpacerItem2.Width = 99; - this.layoutSpacerItem2.WidthType = DevComponents.DotNetBar.Layout.eLayoutSizeType.Percent; - // - // layoutControlItem1 - // - this.layoutControlItem1.Control = this.TextBoxX_AppName; - this.layoutControlItem1.Height = 28; - this.layoutControlItem1.MinSize = new System.Drawing.Size(120, 0); - this.layoutControlItem1.Name = "layoutControlItem1"; - this.layoutControlItem1.Text = "Standart-Programmname:"; - this.layoutControlItem1.Width = 100; - this.layoutControlItem1.WidthType = DevComponents.DotNetBar.Layout.eLayoutSizeType.Percent; - // - // layoutControlItem2 - // - this.layoutControlItem2.Control = this.TextBoxX_Msg; - this.layoutControlItem2.Height = 100; - this.layoutControlItem2.HeightType = DevComponents.DotNetBar.Layout.eLayoutSizeType.Percent; - this.layoutControlItem2.MinSize = new System.Drawing.Size(120, 0); - this.layoutControlItem2.Name = "layoutControlItem2"; - this.layoutControlItem2.Text = "Standart-Nachricht:"; - this.layoutControlItem2.Width = 100; - this.layoutControlItem2.WidthType = DevComponents.DotNetBar.Layout.eLayoutSizeType.Percent; - // - // layoutSpacerItem1 - // - this.layoutSpacerItem1.Height = 31; - this.layoutSpacerItem1.Name = "layoutSpacerItem1"; - this.layoutSpacerItem1.Width = 99; - this.layoutSpacerItem1.WidthType = DevComponents.DotNetBar.Layout.eLayoutSizeType.Percent; - // - // layoutControlItem4 - // - this.layoutControlItem4.Control = this.ButtonX_Cancel; - this.layoutControlItem4.Height = 31; - this.layoutControlItem4.MinSize = new System.Drawing.Size(32, 20); - this.layoutControlItem4.Name = "layoutControlItem4"; - this.layoutControlItem4.Width = 83; - // - // layoutControlItem5 - // - this.layoutControlItem5.Control = this.ButtonX_Okay; - this.layoutControlItem5.Height = 31; - this.layoutControlItem5.MinSize = new System.Drawing.Size(32, 20); - this.layoutControlItem5.Name = "layoutControlItem5"; - this.layoutControlItem5.Width = 83; + 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(633, 444); + this.radButton_Okay.Name = "radButton_Okay"; + this.radButton_Okay.Size = new System.Drawing.Size(100, 24); + this.radButton_Okay.TabIndex = 5; + this.radButton_Okay.Text = "Okay"; + this.radButton_Okay.TextAlignment = System.Drawing.ContentAlignment.MiddleLeft; + this.radButton_Okay.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageBeforeText; // // DiscordBotSettingsWindow // - this.CancelButton = this.ButtonX_Cancel; + this.CancelButton = this.radButton_Abbrechen; this.ClientSize = new System.Drawing.Size(736, 471); - this.Controls.Add(this.layoutControl1); + this.Controls.Add(this.panel1); this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); this.Name = "DiscordBotSettingsWindow"; + // + // + // + this.RootElement.ApplyShapeToControl = true; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent; this.Text = "Discord Bot-Einstellungen"; - this.TopLeftCornerSize = 0; - this.TopRightCornerSize = 0; - this.layoutControl1.ResumeLayout(false); + this.panel1.ResumeLayout(false); + this.panel1.PerformLayout(); + ((System.ComponentModel.ISupportInitialize)(this.radLabel1)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.radLabel2)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.radLabel3)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.radLabel4)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.radTextBoxControl_BotToken)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.radTextBoxControl_DefaultProgramName)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.radRichTextEditor_DefaultMessage)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.radToggleSwitch_UseProxy)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.radButton_Abbrechen)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.radButton_Okay)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this)).EndInit(); this.ResumeLayout(false); } #endregion - private DevComponents.DotNetBar.Layout.LayoutControl layoutControl1; - private DevComponents.DotNetBar.Controls.TextBoxX TextBoxX_AppName; - private DevComponents.DotNetBar.Layout.LayoutControlItem layoutControlItem1; - private DevComponents.DotNetBar.Controls.TextBoxX TextBoxX_Msg; - private DevComponents.DotNetBar.Layout.LayoutControlItem layoutControlItem2; - private DevComponents.DotNetBar.Controls.TextBoxX TextBoxX_BotToken; - private DevComponents.DotNetBar.Layout.LayoutControlItem layoutControlItem3; - private DevComponents.DotNetBar.ButtonX ButtonX_Cancel; - private DevComponents.DotNetBar.ButtonX ButtonX_Okay; - private DevComponents.DotNetBar.Layout.LayoutSpacerItem layoutSpacerItem1; - private DevComponents.DotNetBar.Layout.LayoutControlItem layoutControlItem4; - private DevComponents.DotNetBar.Layout.LayoutControlItem layoutControlItem5; - private DevComponents.DotNetBar.Controls.SwitchButton switchButton_UseProxy; - private DevComponents.DotNetBar.Layout.LayoutControlItem layoutControlItem6; - private DevComponents.DotNetBar.Layout.LayoutSpacerItem layoutSpacerItem2; + private System.Windows.Forms.Panel panel1; + private Telerik.WinControls.UI.RadLabel radLabel4; + private Telerik.WinControls.UI.RadTextBoxControl radTextBoxControl_BotToken; + private Telerik.WinControls.UI.RadLabel radLabel3; + private Telerik.WinControls.UI.RadTextBoxControl radTextBoxControl_DefaultProgramName; + private Telerik.WinControls.UI.RadLabel radLabel2; + private Telerik.WinControls.UI.RadRichTextEditor radRichTextEditor_DefaultMessage; + private Telerik.WinControls.UI.RadToggleSwitch radToggleSwitch_UseProxy; + private Telerik.WinControls.UI.RadButton radButton_Abbrechen; + private Telerik.WinControls.UI.RadButton radButton_Okay; + private Telerik.WinControls.UI.RadLabel radLabel1; } } \ No newline at end of file diff --git a/Pilz.Updating.Administration.GUI/DiscordBotSettingsWindow.cs b/Pilz.Updating.Administration.GUI/DiscordBotSettingsWindow.cs index 297404e..0289a55 100644 --- a/Pilz.Updating.Administration.GUI/DiscordBotSettingsWindow.cs +++ b/Pilz.Updating.Administration.GUI/DiscordBotSettingsWindow.cs @@ -7,10 +7,11 @@ using System.Text; using System.Windows.Forms; using DevComponents.DotNetBar; using Pilz.Updating.Administration.Discord; +using Telerik.WinControls.UI; namespace Pilz.Updating.Administration.GUI { - public partial class DiscordBotSettingsWindow : DevComponents.DotNetBar.OfficeForm + public partial class DiscordBotSettingsWindow : RadForm { private readonly DiscordBotConfig config = null; @@ -19,32 +20,19 @@ namespace Pilz.Updating.Administration.GUI this.config = config; InitializeComponent(); - UpdateAmbientColors(); - TextBoxX_BotToken.Text = config.DiscordBotToken; - TextBoxX_AppName.Text = config.DefaultAppName; - TextBoxX_Msg.Text = config.DefaultUpdateMessage; - switchButton_UseProxy.Value = config.UseProxy; - } - - private void TextBoxX_Msg_TextChanged(object sender, EventArgs e) - { - } - - private void TextBoxX_AppName_TextChanged(object sender, EventArgs e) - { - } - - private void TextBoxX_BotToken_TextChanged(object sender, EventArgs e) - { + radTextBoxControl_BotToken.Text = config.DiscordBotToken; + radTextBoxControl_DefaultProgramName.Text = config.DefaultAppName; + radRichTextEditor_DefaultMessage.Text = config.DefaultUpdateMessage; + radToggleSwitch_UseProxy.Value = config.UseProxy; } private void ButtonX_Okay_Click(object sender, EventArgs e) { - config.DefaultUpdateMessage = TextBoxX_Msg.Text.Trim(); - config.DefaultAppName = TextBoxX_AppName.Text.Trim(); - config.DiscordBotToken = TextBoxX_BotToken.Text.Trim(); - config.UseProxy = switchButton_UseProxy.Value; + config.DefaultUpdateMessage = radTextBoxControl_BotToken.Text.Trim(); + config.DefaultAppName = radTextBoxControl_DefaultProgramName.Text.Trim(); + config.DiscordBotToken = radRichTextEditor_DefaultMessage.Text.Trim(); + config.UseProxy = radToggleSwitch_UseProxy.Value; } } } \ No newline at end of file diff --git a/Pilz.Updating.Administration.GUI/DiscordBotSettingsWindow.resx b/Pilz.Updating.Administration.GUI/DiscordBotSettingsWindow.resx index 5b569f9..e408efc 100644 --- a/Pilz.Updating.Administration.GUI/DiscordBotSettingsWindow.resx +++ b/Pilz.Updating.Administration.GUI/DiscordBotSettingsWindow.resx @@ -1,64 +1,4 @@ - - - + diff --git a/Pilz.Updating.Administration.GUI/DiscordPostDialog.Designer.cs b/Pilz.Updating.Administration.GUI/DiscordPostDialog.Designer.cs index 16d8ac5..d648597 100644 --- a/Pilz.Updating.Administration.GUI/DiscordPostDialog.Designer.cs +++ b/Pilz.Updating.Administration.GUI/DiscordPostDialog.Designer.cs @@ -29,223 +29,167 @@ private void InitializeComponent() { System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(DiscordPostDialog)); - this.advTree1 = new DevComponents.AdvTree.AdvTree(); - this.nodeConnector1 = new DevComponents.AdvTree.NodeConnector(); - this.elementStyle1 = new DevComponents.DotNetBar.ElementStyle(); - this.ButtonX_SendMsg = new DevComponents.DotNetBar.ButtonX(); + this.radTreeView_Channels = new Telerik.WinControls.UI.RadTreeView(); this.panel1 = new System.Windows.Forms.Panel(); - this.checkBoxX_AddChangelog = new DevComponents.DotNetBar.Controls.CheckBoxX(); - this.checkBoxX_PingAtEveryone = new DevComponents.DotNetBar.Controls.CheckBoxX(); - this.textBoxX_Msg = new DevComponents.DotNetBar.Controls.TextBoxX(); - this.layoutControl1 = new DevComponents.DotNetBar.Layout.LayoutControl(); - this.textBoxX_AppName = new DevComponents.DotNetBar.Controls.TextBoxX(); - this.layoutControlItem2 = new DevComponents.DotNetBar.Layout.LayoutControlItem(); - this.layoutControlItem1 = new DevComponents.DotNetBar.Layout.LayoutControlItem(); - ((System.ComponentModel.ISupportInitialize)(this.advTree1)).BeginInit(); + 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(); + ((System.ComponentModel.ISupportInitialize)(this.radTreeView_Channels)).BeginInit(); this.panel1.SuspendLayout(); - this.layoutControl1.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)).BeginInit(); this.SuspendLayout(); // - // advTree1 + // radTreeView_Channels // - this.advTree1.AccessibleRole = System.Windows.Forms.AccessibleRole.Outline; - this.advTree1.BackColor = System.Drawing.SystemColors.Window; - // - // - // - this.advTree1.BackgroundStyle.Class = "TreeBorderKey"; - this.advTree1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.advTree1.Dock = System.Windows.Forms.DockStyle.Left; - this.advTree1.DragDropEnabled = false; - this.advTree1.DragDropNodeCopyEnabled = false; - this.advTree1.LicenseKey = "F962CEC7-CD8F-4911-A9E9-CAB39962FC1F"; - this.advTree1.Location = new System.Drawing.Point(0, 0); - this.advTree1.Name = "advTree1"; - this.advTree1.NodesConnector = this.nodeConnector1; - this.advTree1.NodeStyle = this.elementStyle1; - this.advTree1.PathSeparator = ";"; - this.advTree1.Size = new System.Drawing.Size(237, 461); - this.advTree1.Styles.Add(this.elementStyle1); - this.advTree1.TabIndex = 0; - this.advTree1.Text = "advTree1"; - // - // nodeConnector1 - // - this.nodeConnector1.LineColor = System.Drawing.SystemColors.ControlText; - // - // elementStyle1 - // - this.elementStyle1.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.elementStyle1.Name = "elementStyle1"; - this.elementStyle1.TextColor = System.Drawing.SystemColors.ControlText; - // - // ButtonX_SendMsg - // - this.ButtonX_SendMsg.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; - this.ButtonX_SendMsg.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); - this.ButtonX_SendMsg.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; - this.ButtonX_SendMsg.Image = global::Pilz.Updating.Administration.GUI.My.Resources.Resources.icons8_email_send_16px; - this.ButtonX_SendMsg.Location = new System.Drawing.Point(469, 3); - this.ButtonX_SendMsg.Name = "ButtonX_SendMsg"; - this.ButtonX_SendMsg.Size = new System.Drawing.Size(75, 23); - this.ButtonX_SendMsg.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ButtonX_SendMsg.TabIndex = 2; - this.ButtonX_SendMsg.Text = "Senden"; - this.ButtonX_SendMsg.Click += new System.EventHandler(this.ButtonX_SendMsg_Click); + this.radTreeView_Channels.Dock = System.Windows.Forms.DockStyle.Left; + this.radTreeView_Channels.ItemHeight = 28; + this.radTreeView_Channels.LineColor = System.Drawing.Color.FromArgb(((int)(((byte)(204)))), ((int)(((byte)(204)))), ((int)(((byte)(204))))); + this.radTreeView_Channels.LineStyle = Telerik.WinControls.UI.TreeLineStyle.Solid; + this.radTreeView_Channels.Location = new System.Drawing.Point(0, 0); + this.radTreeView_Channels.Name = "radTreeView_Channels"; + this.radTreeView_Channels.Size = new System.Drawing.Size(270, 461); + this.radTreeView_Channels.TabIndex = 0; // // panel1 // this.panel1.BackColor = System.Drawing.Color.Transparent; - this.panel1.Controls.Add(this.checkBoxX_AddChangelog); - this.panel1.Controls.Add(this.checkBoxX_PingAtEveryone); - this.panel1.Controls.Add(this.ButtonX_SendMsg); - this.panel1.Dock = System.Windows.Forms.DockStyle.Bottom; - this.panel1.Location = new System.Drawing.Point(237, 432); + this.panel1.Controls.Add(this.radLabel2); + this.panel1.Controls.Add(this.radTextBoxControl_ProgramName); + this.panel1.Controls.Add(this.radRichTextEditor_Message); + this.panel1.Controls.Add(this.radCheckBoxPingAtEveryone); + this.panel1.Controls.Add(this.radCheckBox_AttachDescription); + this.panel1.Controls.Add(this.radButton_Send); + this.panel1.Controls.Add(this.radLabel1); + this.panel1.Dock = System.Windows.Forms.DockStyle.Fill; + this.panel1.Location = new System.Drawing.Point(270, 0); this.panel1.Name = "panel1"; - this.panel1.Size = new System.Drawing.Size(547, 29); - this.panel1.TabIndex = 3; + this.panel1.Size = new System.Drawing.Size(514, 461); + this.panel1.TabIndex = 1; // - // checkBoxX_AddChangelog + // 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.TabIndex = 2; + this.radLabel2.Text = "Nachricht:"; // - this.checkBoxX_AddChangelog.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.checkBoxX_AddChangelog.Checked = true; - this.checkBoxX_AddChangelog.CheckState = System.Windows.Forms.CheckState.Checked; - this.checkBoxX_AddChangelog.CheckValue = "Y"; - this.checkBoxX_AddChangelog.Location = new System.Drawing.Point(322, 3); - this.checkBoxX_AddChangelog.Name = "checkBoxX_AddChangelog"; - this.checkBoxX_AddChangelog.Size = new System.Drawing.Size(141, 23); - this.checkBoxX_AddChangelog.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.checkBoxX_AddChangelog.TabIndex = 4; - this.checkBoxX_AddChangelog.Text = "Beschreibung anhängen"; + // radTextBoxControl_ProgramName // - // checkBoxX_PingAtEveryone + this.radTextBoxControl_ProgramName.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); + this.radTextBoxControl_ProgramName.Location = new System.Drawing.Point(101, 3); + this.radTextBoxControl_ProgramName.Name = "radTextBoxControl_ProgramName"; + this.radTextBoxControl_ProgramName.Size = new System.Drawing.Size(410, 22); + this.radTextBoxControl_ProgramName.TabIndex = 0; // + // radRichTextEditor_Message // + this.radRichTextEditor_Message.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) + | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); + this.radRichTextEditor_Message.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(204)))), ((int)(((byte)(204)))), ((int)(((byte)(204))))); + this.radRichTextEditor_Message.Location = new System.Drawing.Point(101, 31); + this.radRichTextEditor_Message.Name = "radRichTextEditor_Message"; + this.radRichTextEditor_Message.SelectionFill = System.Drawing.Color.FromArgb(((int)(((byte)(128)))), ((int)(((byte)(179)))), ((int)(((byte)(236)))), ((int)(((byte)(248))))); + this.radRichTextEditor_Message.SelectionStroke = System.Drawing.Color.FromArgb(((int)(((byte)(179)))), ((int)(((byte)(236)))), ((int)(((byte)(248))))); + this.radRichTextEditor_Message.Size = new System.Drawing.Size(410, 397); + this.radRichTextEditor_Message.TabIndex = 0; // + // radCheckBoxPingAtEveryone // - this.checkBoxX_PingAtEveryone.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.checkBoxX_PingAtEveryone.Checked = true; - this.checkBoxX_PingAtEveryone.CheckState = System.Windows.Forms.CheckState.Checked; - this.checkBoxX_PingAtEveryone.CheckValue = "Y"; - this.checkBoxX_PingAtEveryone.Location = new System.Drawing.Point(211, 3); - this.checkBoxX_PingAtEveryone.Name = "checkBoxX_PingAtEveryone"; - this.checkBoxX_PingAtEveryone.Size = new System.Drawing.Size(105, 23); - this.checkBoxX_PingAtEveryone.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.checkBoxX_PingAtEveryone.TabIndex = 3; - this.checkBoxX_PingAtEveryone.Text = "Ping @everyone"; + this.radCheckBoxPingAtEveryone.CheckState = System.Windows.Forms.CheckState.Checked; + this.radCheckBoxPingAtEveryone.Location = new System.Drawing.Point(170, 437); + this.radCheckBoxPingAtEveryone.Name = "radCheckBoxPingAtEveryone"; + this.radCheckBoxPingAtEveryone.Size = new System.Drawing.Size(105, 18); + this.radCheckBoxPingAtEveryone.TabIndex = 0; + this.radCheckBoxPingAtEveryone.Text = "Ping @everyone"; + this.radCheckBoxPingAtEveryone.ToggleState = Telerik.WinControls.Enumerations.ToggleState.On; // - // textBoxX_Msg + // radCheckBox_AttachDescription // - this.textBoxX_Msg.BackColor = System.Drawing.Color.White; + this.radCheckBox_AttachDescription.CheckState = System.Windows.Forms.CheckState.Checked; + this.radCheckBox_AttachDescription.Location = new System.Drawing.Point(281, 437); + this.radCheckBox_AttachDescription.Name = "radCheckBox_AttachDescription"; + this.radCheckBox_AttachDescription.Size = new System.Drawing.Size(144, 18); + this.radCheckBox_AttachDescription.TabIndex = 3; + this.radCheckBox_AttachDescription.Text = "Beschreibung anhängen"; + this.radCheckBox_AttachDescription.ToggleState = Telerik.WinControls.Enumerations.ToggleState.On; // + // radButton_Send // - // - this.textBoxX_Msg.Border.Class = "TextBoxBorder"; - this.textBoxX_Msg.Border.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.textBoxX_Msg.DisabledBackColor = System.Drawing.Color.White; - this.textBoxX_Msg.ForeColor = System.Drawing.Color.Black; - this.textBoxX_Msg.Location = new System.Drawing.Point(96, 32); - this.textBoxX_Msg.Margin = new System.Windows.Forms.Padding(0); - this.textBoxX_Msg.Multiline = true; - this.textBoxX_Msg.Name = "textBoxX_Msg"; - this.textBoxX_Msg.PreventEnterBeep = true; - this.textBoxX_Msg.ScrollBars = System.Windows.Forms.ScrollBars.Both; - this.textBoxX_Msg.Size = new System.Drawing.Size(447, 396); - this.textBoxX_Msg.TabIndex = 1; - // - // layoutControl1 - // - this.layoutControl1.BackColor = System.Drawing.Color.Transparent; - this.layoutControl1.Controls.Add(this.textBoxX_Msg); - this.layoutControl1.Controls.Add(this.textBoxX_AppName); - this.layoutControl1.Dock = System.Windows.Forms.DockStyle.Fill; - this.layoutControl1.ForeColor = System.Drawing.Color.Black; - this.layoutControl1.Location = new System.Drawing.Point(237, 0); - this.layoutControl1.Name = "layoutControl1"; - // - // - // - this.layoutControl1.RootGroup.Items.AddRange(new DevComponents.DotNetBar.Layout.LayoutItemBase[] { - this.layoutControlItem2, - this.layoutControlItem1}); - this.layoutControl1.Size = new System.Drawing.Size(547, 432); - this.layoutControl1.TabIndex = 6; - // - // textBoxX_AppName - // - this.textBoxX_AppName.BackColor = System.Drawing.Color.White; - // - // - // - this.textBoxX_AppName.Border.Class = "TextBoxBorder"; - this.textBoxX_AppName.Border.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.textBoxX_AppName.DisabledBackColor = System.Drawing.Color.White; - this.textBoxX_AppName.ForeColor = System.Drawing.Color.Black; - this.textBoxX_AppName.Location = new System.Drawing.Point(96, 4); - this.textBoxX_AppName.Margin = new System.Windows.Forms.Padding(0); - this.textBoxX_AppName.Name = "textBoxX_AppName"; - this.textBoxX_AppName.PreventEnterBeep = true; - this.textBoxX_AppName.Size = new System.Drawing.Size(447, 20); - this.textBoxX_AppName.TabIndex = 0; - // - // layoutControlItem2 - // - this.layoutControlItem2.Control = this.textBoxX_AppName; - this.layoutControlItem2.Height = 28; - this.layoutControlItem2.MinSize = new System.Drawing.Size(120, 0); - this.layoutControlItem2.Name = "layoutControlItem2"; - this.layoutControlItem2.Text = "Programmname:"; - this.layoutControlItem2.Width = 100; - this.layoutControlItem2.WidthType = DevComponents.DotNetBar.Layout.eLayoutSizeType.Percent; - // - // layoutControlItem1 - // - this.layoutControlItem1.Control = this.textBoxX_Msg; - this.layoutControlItem1.Height = 100; - this.layoutControlItem1.HeightType = DevComponents.DotNetBar.Layout.eLayoutSizeType.Percent; - this.layoutControlItem1.MinSize = new System.Drawing.Size(120, 0); - this.layoutControlItem1.Name = "layoutControlItem1"; - this.layoutControlItem1.Text = "Nachricht:"; - this.layoutControlItem1.Width = 100; - this.layoutControlItem1.WidthType = DevComponents.DotNetBar.Layout.eLayoutSizeType.Percent; + this.radButton_Send.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); + this.radButton_Send.Image = global::Pilz.Updating.Administration.GUI.My.Resources.Resources.icons8_email_send_16px; + this.radButton_Send.ImageAlignment = System.Drawing.ContentAlignment.MiddleRight; + this.radButton_Send.Location = new System.Drawing.Point(431, 434); + this.radButton_Send.Name = "radButton_Send"; + this.radButton_Send.Size = new System.Drawing.Size(80, 24); + this.radButton_Send.TabIndex = 0; + this.radButton_Send.Text = "Senden"; + this.radButton_Send.TextAlignment = System.Drawing.ContentAlignment.MiddleLeft; + this.radButton_Send.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageBeforeText; + this.radButton_Send.Click += new System.EventHandler(this.ButtonX_SendMsg_Click); // // DiscordPostDialog // - this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); + this.AutoScaleBaseSize = new System.Drawing.Size(7, 15); + this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.ClientSize = new System.Drawing.Size(784, 461); - this.Controls.Add(this.layoutControl1); this.Controls.Add(this.panel1); - this.Controls.Add(this.advTree1); + this.Controls.Add(this.radTreeView_Channels); this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); this.Name = "DiscordPostDialog"; + // + // + // + this.RootElement.ApplyShapeToControl = true; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent; this.Text = "Aktuallisierungspost auf Discord"; - this.TopLeftCornerSize = 0; - this.TopRightCornerSize = 0; - ((System.ComponentModel.ISupportInitialize)(this.advTree1)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.radTreeView_Channels)).EndInit(); this.panel1.ResumeLayout(false); - this.layoutControl1.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)).EndInit(); this.ResumeLayout(false); } #endregion - private DevComponents.AdvTree.AdvTree advTree1; - private DevComponents.AdvTree.NodeConnector nodeConnector1; - private DevComponents.DotNetBar.ElementStyle elementStyle1; - private DevComponents.DotNetBar.ButtonX ButtonX_SendMsg; + private Telerik.WinControls.UI.RadTreeView radTreeView_Channels; private System.Windows.Forms.Panel panel1; - private DevComponents.DotNetBar.Controls.CheckBoxX checkBoxX_PingAtEveryone; - private DevComponents.DotNetBar.Controls.TextBoxX textBoxX_Msg; - private DevComponents.DotNetBar.Layout.LayoutControl layoutControl1; - private DevComponents.DotNetBar.Controls.TextBoxX textBoxX_AppName; - private DevComponents.DotNetBar.Layout.LayoutControlItem layoutControlItem2; - private DevComponents.DotNetBar.Layout.LayoutControlItem layoutControlItem1; - private DevComponents.DotNetBar.Controls.CheckBoxX checkBoxX_AddChangelog; + private Telerik.WinControls.UI.RadCheckBox radCheckBoxPingAtEveryone; + private Telerik.WinControls.UI.RadCheckBox radCheckBox_AttachDescription; + private Telerik.WinControls.UI.RadButton radButton_Send; + private Telerik.WinControls.UI.RadLabel radLabel1; + private Telerik.WinControls.UI.RadLabel radLabel2; + private Telerik.WinControls.UI.RadTextBoxControl radTextBoxControl_ProgramName; + private Telerik.WinControls.UI.RadRichTextEditor radRichTextEditor_Message; } } \ No newline at end of file diff --git a/Pilz.Updating.Administration.GUI/DiscordPostDialog.cs b/Pilz.Updating.Administration.GUI/DiscordPostDialog.cs index a312c63..96e6e9d 100644 --- a/Pilz.Updating.Administration.GUI/DiscordPostDialog.cs +++ b/Pilz.Updating.Administration.GUI/DiscordPostDialog.cs @@ -10,10 +10,11 @@ using System.Linq; using System.Text; using System.Threading.Tasks; using System.Windows.Forms; +using Telerik.WinControls.UI; namespace Pilz.Updating.Administration.GUI { - public partial class DiscordPostDialog : OfficeForm + public partial class DiscordPostDialog : RadForm { // F i e l d s @@ -28,22 +29,21 @@ namespace Pilz.Updating.Administration.GUI this.package = package; InitializeComponent(); - UpdateAmbientColors(); - textBoxX_AppName.Text = General.CurProject.DiscordBotConfig.DefaultAppName; - textBoxX_Msg.Text = General.CurProject.DiscordBotConfig.DefaultUpdateMessage; + radTextBoxControl_ProgramName.Text = General.CurProject.DiscordBotConfig.DefaultAppName; + radRichTextEditor_Message.Text = General.CurProject.DiscordBotConfig.DefaultUpdateMessage; LoadBgrTree(); } private void LoadBgrTree() { - advTree1.BeginUpdate(); - advTree1.Nodes.Clear(); + radTreeView_Channels.BeginUpdate(); + radTreeView_Channels.Nodes.Clear(); foreach (var guild in bot.GetGuilds()) { - var nGuild = new Node() + var nGuild = new RadTreeNode() { Name = "g" + guild.Key, Text = guild.Value, @@ -53,7 +53,7 @@ namespace Pilz.Updating.Administration.GUI foreach (var channel in bot.GetTextChannels(guild.Key).OrderBy((n) => n.Value)) { - var nChannel = new Node() + var nChannel = new RadTreeNode() { Name = "c" + channel.Key, Text = "#" + channel.Value, @@ -63,22 +63,22 @@ namespace Pilz.Updating.Administration.GUI nGuild.Nodes.Add(nChannel); } - advTree1.Nodes.Add(nGuild); + radTreeView_Channels.Nodes.Add(nGuild); } - advTree1.EndUpdate(); + radTreeView_Channels.EndUpdate(); } private async void ButtonX_SendMsg_Click(object sender, EventArgs e) { try { - var selNode = advTree1.SelectedNode; + var selNode = radTreeView_Channels.SelectedNode; ulong gID = (ulong)selNode.Parent.Tag; ulong cID = (ulong)selNode.Tag; - var msg = textBoxX_Msg.Text; + var msg = radRichTextEditor_Message.Text; - await bot.SendUpdateNotification(package, gID, cID, textBoxX_AppName.Text, msg, checkBoxX_AddChangelog.Checked, checkBoxX_PingAtEveryone.Checked); + await bot.SendUpdateNotification(package, gID, cID, radTextBoxControl_ProgramName.Text, msg, radCheckBox_AttachDescription.Checked, radCheckBoxPingAtEveryone.Checked); MessageBoxEx.Show(this, "Nachricht erfolgreich gesendet.", string.Empty, MessageBoxButtons.OK, MessageBoxIcon.Information); DialogResult = DialogResult.OK; diff --git a/Pilz.Updating.Administration.GUI/DiscordPostDialog.resx b/Pilz.Updating.Administration.GUI/DiscordPostDialog.resx index 5b569f9..e408efc 100644 --- a/Pilz.Updating.Administration.GUI/DiscordPostDialog.resx +++ b/Pilz.Updating.Administration.GUI/DiscordPostDialog.resx @@ -1,64 +1,4 @@ - - - + diff --git a/Pilz.Updating.Administration.GUI/PackageDescriptionEditor.Designer.cs b/Pilz.Updating.Administration.GUI/PackageDescriptionEditor.Designer.cs index 4983b32..7a71a35 100644 --- a/Pilz.Updating.Administration.GUI/PackageDescriptionEditor.Designer.cs +++ b/Pilz.Updating.Administration.GUI/PackageDescriptionEditor.Designer.cs @@ -7,7 +7,7 @@ using Microsoft.VisualBasic.CompilerServices; namespace Pilz.Updating.Administration.GUI { [DesignerGenerated()] - public partial class PackageDescriptionEditor : DevComponents.DotNetBar.OfficeForm + public partial class PackageDescriptionEditor : Telerik.WinControls.UI.RadForm { // Form overrides dispose to clean up the component list. @@ -37,223 +37,171 @@ namespace Pilz.Updating.Administration.GUI private void InitializeComponent() { System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(PackageDescriptionEditor)); - this.LayoutControl1 = new DevComponents.DotNetBar.Layout.LayoutControl(); - this.ButtonX_Cancel = new DevComponents.DotNetBar.ButtonX(); - this.ButtonX_Okay = new DevComponents.DotNetBar.ButtonX(); - this.textBoxX1 = new DevComponents.DotNetBar.Controls.TextBoxX(); - this.textBoxX2 = new DevComponents.DotNetBar.Controls.RichTextBoxEx(); - this.comboBoxEx_Format = new DevComponents.DotNetBar.Controls.ComboBoxEx(); - this.layoutControlItem1 = new DevComponents.DotNetBar.Layout.LayoutControlItem(); - this.layoutControlItem2 = new DevComponents.DotNetBar.Layout.LayoutControlItem(); - this.layoutControlItem3 = new DevComponents.DotNetBar.Layout.LayoutControlItem(); - this.LayoutSpacerItem1 = new DevComponents.DotNetBar.Layout.LayoutSpacerItem(); - this.LayoutControlItem5 = new DevComponents.DotNetBar.Layout.LayoutControlItem(); - this.LayoutControlItem6 = new DevComponents.DotNetBar.Layout.LayoutControlItem(); - this.LayoutControl1.SuspendLayout(); + this.radLabel1 = new Telerik.WinControls.UI.RadLabel(); + this.radLabel2 = new Telerik.WinControls.UI.RadLabel(); + this.radLabel3 = new Telerik.WinControls.UI.RadLabel(); + 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(); + ((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)).BeginInit(); this.SuspendLayout(); // - // LayoutControl1 + // radLabel1 // - this.LayoutControl1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(255))))); - this.LayoutControl1.Controls.Add(this.ButtonX_Cancel); - this.LayoutControl1.Controls.Add(this.ButtonX_Okay); - this.LayoutControl1.Controls.Add(this.textBoxX1); - this.LayoutControl1.Controls.Add(this.textBoxX2); - this.LayoutControl1.Controls.Add(this.comboBoxEx_Format); - this.LayoutControl1.Dock = System.Windows.Forms.DockStyle.Fill; - this.LayoutControl1.ForeColor = System.Drawing.Color.Black; - this.LayoutControl1.Location = new System.Drawing.Point(0, 0); - this.LayoutControl1.Name = "LayoutControl1"; + this.radLabel1.Location = new System.Drawing.Point(3, 5); + this.radLabel1.Name = "radLabel1"; + this.radLabel1.Size = new System.Drawing.Size(30, 18); + this.radLabel1.TabIndex = 0; + this.radLabel1.Text = "Titel:"; // + // radLabel2 // + this.radLabel2.Location = new System.Drawing.Point(3, 33); + this.radLabel2.Name = "radLabel2"; + this.radLabel2.Size = new System.Drawing.Size(76, 18); + this.radLabel2.TabIndex = 1; + this.radLabel2.Text = "Beschreibung:"; // - this.LayoutControl1.RootGroup.Items.AddRange(new DevComponents.DotNetBar.Layout.LayoutItemBase[] { - this.layoutControlItem1, - this.layoutControlItem2, - this.layoutControlItem3, - this.LayoutSpacerItem1, - this.LayoutControlItem5, - this.LayoutControlItem6}); - this.LayoutControl1.Size = new System.Drawing.Size(384, 311); - this.LayoutControl1.TabIndex = 5; + // radLabel3 // - // ButtonX_Cancel + 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.Name = "radLabel3"; + this.radLabel3.Size = new System.Drawing.Size(76, 18); + this.radLabel3.TabIndex = 2; + this.radLabel3.Text = "Formatierung:"; // - this.ButtonX_Cancel.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; - this.ButtonX_Cancel.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; - this.ButtonX_Cancel.DialogResult = System.Windows.Forms.DialogResult.Cancel; - this.ButtonX_Cancel.Image = global::Pilz.Updating.Administration.GUI.My.Resources.Resources.icons8_delete_sign_16px; - this.ButtonX_Cancel.Location = new System.Drawing.Point(222, 284); - this.ButtonX_Cancel.Margin = new System.Windows.Forms.Padding(0); - this.ButtonX_Cancel.Name = "ButtonX_Cancel"; - this.ButtonX_Cancel.Size = new System.Drawing.Size(75, 23); - this.ButtonX_Cancel.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ButtonX_Cancel.TabIndex = 4; - this.ButtonX_Cancel.Text = "Abbrechen"; + // radTextBoxControl_Titel // - // ButtonX_Okay + this.radTextBoxControl_Titel.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); + this.radTextBoxControl_Titel.Location = new System.Drawing.Point(89, 3); + this.radTextBoxControl_Titel.Name = "radTextBoxControl_Titel"; + this.radTextBoxControl_Titel.Size = new System.Drawing.Size(292, 22); + this.radTextBoxControl_Titel.TabIndex = 0; // - this.ButtonX_Okay.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; - this.ButtonX_Okay.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; - this.ButtonX_Okay.DialogResult = System.Windows.Forms.DialogResult.OK; - this.ButtonX_Okay.Image = global::Pilz.Updating.Administration.GUI.My.Resources.Resources.icons8_checkmark_16px; - this.ButtonX_Okay.Location = new System.Drawing.Point(305, 284); - this.ButtonX_Okay.Margin = new System.Windows.Forms.Padding(0); - this.ButtonX_Okay.Name = "ButtonX_Okay"; - this.ButtonX_Okay.Size = new System.Drawing.Size(75, 23); - this.ButtonX_Okay.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ButtonX_Okay.TabIndex = 5; - this.ButtonX_Okay.Text = "Okay"; + // radRichTextEditor_Description // - // textBoxX1 + this.radRichTextEditor_Description.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) + | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); + this.radRichTextEditor_Description.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(204)))), ((int)(((byte)(204)))), ((int)(((byte)(204))))); + this.radRichTextEditor_Description.Location = new System.Drawing.Point(89, 31); + 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.TabIndex = 3; // - this.textBoxX1.BackColor = System.Drawing.Color.White; + // panel1 // + this.panel1.BackColor = System.Drawing.Color.Transparent; + this.panel1.Controls.Add(this.radDropDownList_Formatting); + this.panel1.Controls.Add(this.radButton_Cancel); + this.panel1.Controls.Add(this.radButton_Okay); + this.panel1.Controls.Add(this.radTextBoxControl_Titel); + this.panel1.Controls.Add(this.radLabel1); + this.panel1.Controls.Add(this.radRichTextEditor_Description); + this.panel1.Controls.Add(this.radLabel2); + this.panel1.Controls.Add(this.radLabel3); + 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(384, 294); + this.panel1.TabIndex = 4; // + // radButton_Okay // - this.textBoxX1.Border.Class = "TextBoxBorder"; - this.textBoxX1.Border.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.textBoxX1.DisabledBackColor = System.Drawing.Color.White; - this.textBoxX1.ForeColor = System.Drawing.Color.Black; - this.textBoxX1.Location = new System.Drawing.Point(84, 4); - this.textBoxX1.Margin = new System.Windows.Forms.Padding(0); - this.textBoxX1.Name = "textBoxX1"; - this.textBoxX1.PreventEnterBeep = true; - this.textBoxX1.Size = new System.Drawing.Size(296, 20); - this.textBoxX1.TabIndex = 0; + 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; // - // textBoxX2 + // radButton_Cancel // - this.textBoxX2.BackColor = System.Drawing.Color.White; + this.radButton_Cancel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); + 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(175, 267); + this.radButton_Cancel.Name = "radButton_Cancel"; + this.radButton_Cancel.Size = new System.Drawing.Size(100, 24); + this.radButton_Cancel.TabIndex = 5; + this.radButton_Cancel.Text = "Abbrechen"; + this.radButton_Cancel.TextAlignment = System.Drawing.ContentAlignment.MiddleLeft; + this.radButton_Cancel.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageBeforeText; // + // radDropDownList_Formatting // - // - this.textBoxX2.BackgroundStyle.Class = "TextBoxBorder"; - this.textBoxX2.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.textBoxX2.ForeColor = System.Drawing.Color.Black; - this.textBoxX2.Location = new System.Drawing.Point(84, 32); - this.textBoxX2.Margin = new System.Windows.Forms.Padding(0); - this.textBoxX2.Name = "textBoxX2"; - this.textBoxX2.Rtf = "{\\rtf1\\ansi\\ansicpg1252\\deff0\\deflang1031{\\fonttbl{\\f0\\fnil\\fcharset0 Microsoft S" + - "ans Serif;}}\r\n\\viewkind4\\uc1\\pard\\f0\\fs17\\par\r\n}\r\n"; - this.textBoxX2.Size = new System.Drawing.Size(296, 216); - this.textBoxX2.TabIndex = 1; - // - // comboBoxEx_Format - // - this.comboBoxEx_Format.DisplayMember = "Text"; - this.comboBoxEx_Format.DrawMode = System.Windows.Forms.DrawMode.OwnerDrawFixed; - this.comboBoxEx_Format.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; - this.comboBoxEx_Format.FormattingEnabled = true; - this.comboBoxEx_Format.ItemHeight = 15; - this.comboBoxEx_Format.Location = new System.Drawing.Point(84, 256); - this.comboBoxEx_Format.Margin = new System.Windows.Forms.Padding(0); - this.comboBoxEx_Format.Name = "comboBoxEx_Format"; - this.comboBoxEx_Format.Size = new System.Drawing.Size(296, 21); - this.comboBoxEx_Format.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.comboBoxEx_Format.TabIndex = 2; - // - // layoutControlItem1 - // - this.layoutControlItem1.Control = this.textBoxX1; - this.layoutControlItem1.Height = 28; - this.layoutControlItem1.MinSize = new System.Drawing.Size(120, 0); - this.layoutControlItem1.Name = "layoutControlItem1"; - this.layoutControlItem1.Text = "Titel:"; - this.layoutControlItem1.Width = 100; - this.layoutControlItem1.WidthType = DevComponents.DotNetBar.Layout.eLayoutSizeType.Percent; - // - // layoutControlItem2 - // - this.layoutControlItem2.Control = this.textBoxX2; - this.layoutControlItem2.Height = 100; - this.layoutControlItem2.HeightType = DevComponents.DotNetBar.Layout.eLayoutSizeType.Percent; - this.layoutControlItem2.MinSize = new System.Drawing.Size(120, 0); - this.layoutControlItem2.Name = "layoutControlItem2"; - this.layoutControlItem2.Text = "Beschreibung:"; - this.layoutControlItem2.Width = 100; - this.layoutControlItem2.WidthType = DevComponents.DotNetBar.Layout.eLayoutSizeType.Percent; - // - // layoutControlItem3 - // - this.layoutControlItem3.Control = this.comboBoxEx_Format; - this.layoutControlItem3.Height = 28; - this.layoutControlItem3.MinSize = new System.Drawing.Size(64, 18); - this.layoutControlItem3.Name = "layoutControlItem3"; - this.layoutControlItem3.Text = "Formatierung:"; - this.layoutControlItem3.Width = 100; - this.layoutControlItem3.WidthType = DevComponents.DotNetBar.Layout.eLayoutSizeType.Percent; - // - // LayoutSpacerItem1 - // - this.LayoutSpacerItem1.Height = 31; - this.LayoutSpacerItem1.Name = "LayoutSpacerItem1"; - this.LayoutSpacerItem1.Width = 99; - this.LayoutSpacerItem1.WidthType = DevComponents.DotNetBar.Layout.eLayoutSizeType.Percent; - // - // LayoutControlItem5 - // - this.LayoutControlItem5.Control = this.ButtonX_Cancel; - this.LayoutControlItem5.Height = 31; - this.LayoutControlItem5.MinSize = new System.Drawing.Size(32, 20); - this.LayoutControlItem5.Name = "LayoutControlItem5"; - this.LayoutControlItem5.Width = 83; - // - // LayoutControlItem6 - // - this.LayoutControlItem6.Control = this.ButtonX_Okay; - this.LayoutControlItem6.Height = 31; - this.LayoutControlItem6.MinSize = new System.Drawing.Size(32, 20); - this.LayoutControlItem6.Name = "LayoutControlItem6"; - this.LayoutControlItem6.Width = 83; + 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; // // PackageDescriptionEditor // - this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); + this.AutoScaleBaseSize = new System.Drawing.Size(7, 15); + this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.CancelButton = this.ButtonX_Cancel; - this.ClientSize = new System.Drawing.Size(384, 311); - this.Controls.Add(this.LayoutControl1); + this.CancelButton = this.radButton_Cancel; + this.ClientSize = new System.Drawing.Size(384, 294); + this.Controls.Add(this.panel1); this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.SizableToolWindow; this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); this.MaximizeBox = false; this.MinimizeBox = false; this.Name = "PackageDescriptionEditor"; + // + // + // + this.RootElement.ApplyShapeToControl = true; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent; this.Text = "Beschreibung"; - this.TopLeftCornerSize = 0; - this.TopRightCornerSize = 0; - this.LayoutControl1.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)(this.radLabel1)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.radLabel2)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.radLabel3)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.radTextBoxControl_Titel)).EndInit(); + ((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)).EndInit(); this.ResumeLayout(false); } - - - - - private DevComponents.DotNetBar.Layout.LayoutControl LayoutControl1; - - - - - - - private DevComponents.DotNetBar.ButtonX ButtonX_Cancel; - - - private DevComponents.DotNetBar.ButtonX ButtonX_Okay; - - private DevComponents.DotNetBar.Layout.LayoutSpacerItem LayoutSpacerItem1; - - private DevComponents.DotNetBar.Layout.LayoutControlItem LayoutControlItem5; - - private DevComponents.DotNetBar.Layout.LayoutControlItem LayoutControlItem6; - private DevComponents.DotNetBar.Controls.TextBoxX textBoxX1; - private DevComponents.DotNetBar.Controls.RichTextBoxEx textBoxX2; - private DevComponents.DotNetBar.Layout.LayoutControlItem layoutControlItem1; - private DevComponents.DotNetBar.Layout.LayoutControlItem layoutControlItem2; - private DevComponents.DotNetBar.Controls.ComboBoxEx comboBoxEx_Format; - private DevComponents.DotNetBar.Layout.LayoutControlItem layoutControlItem3; + private Telerik.WinControls.UI.RadLabel radLabel1; + private Telerik.WinControls.UI.RadLabel radLabel2; + private Telerik.WinControls.UI.RadLabel radLabel3; + private Telerik.WinControls.UI.RadTextBoxControl radTextBoxControl_Titel; + private Telerik.WinControls.UI.RadRichTextEditor radRichTextEditor_Description; + private Panel panel1; + private Telerik.WinControls.UI.RadDropDownList radDropDownList_Formatting; + private Telerik.WinControls.UI.RadButton radButton_Cancel; + private Telerik.WinControls.UI.RadButton radButton_Okay; } } \ No newline at end of file diff --git a/Pilz.Updating.Administration.GUI/PackageDescriptionEditor.cs b/Pilz.Updating.Administration.GUI/PackageDescriptionEditor.cs index 54bee5f..6021cc4 100644 --- a/Pilz.Updating.Administration.GUI/PackageDescriptionEditor.cs +++ b/Pilz.Updating.Administration.GUI/PackageDescriptionEditor.cs @@ -2,6 +2,7 @@ using DevComponents.DotNetBar; using global::DevComponents.Editors; using Microsoft.VisualBasic.CompilerServices; +using Telerik.WinControls.UI; namespace Pilz.Updating.Administration.GUI { @@ -14,14 +15,12 @@ namespace Pilz.Updating.Administration.GUI { InitializeComponent(); - comboBoxEx_Format.Items.AddRange(new ComboItem[] + radDropDownList_Formatting.Items.AddRange(new RadListDataItem[] { - new ComboItem { Text = "Nur Text", Tag = UpdateNotesContentType.PlainText }, - new ComboItem { Text = "Markdown", Tag = UpdateNotesContentType.Markdown }, - new ComboItem { Text = "HTML", Tag = UpdateNotesContentType.HTML }, + new RadListDataItem { Text = "Nur Text", Tag = UpdateNotesContentType.PlainText }, + new RadListDataItem { Text = "Markdown", Tag = UpdateNotesContentType.Markdown }, + new RadListDataItem { Text = "HTML", Tag = UpdateNotesContentType.HTML }, }); - - UpdateAmbientColors(); } // P r o p e r t i e s @@ -30,11 +29,11 @@ namespace Pilz.Updating.Administration.GUI { get { - return textBoxX1.Text; + return radTextBoxControl_Titel.Text; } set { - textBoxX1.Text = value; + radTextBoxControl_Titel.Text = value; } } @@ -42,23 +41,23 @@ namespace Pilz.Updating.Administration.GUI { get { - return textBoxX2.Text; + return radRichTextEditor_Description.Text; } set { - textBoxX2.Text = value; + radRichTextEditor_Description.Text = value; } } public UpdateNotesContentType DescriptionType { get => - (UpdateNotesContentType)(comboBoxEx_Format.SelectedItem as ComboItem)?.Tag; + (UpdateNotesContentType)radDropDownList_Formatting.SelectedItem?.Tag; set { - foreach (ComboItem item in comboBoxEx_Format.Items) + foreach (var item in radDropDownList_Formatting.Items) if ((UpdateNotesContentType)item.Tag == value) - comboBoxEx_Format.SelectedItem = item; + radDropDownList_Formatting.SelectedItem = item; } } } diff --git a/Pilz.Updating.Administration.GUI/PackageDescriptionEditor.resx b/Pilz.Updating.Administration.GUI/PackageDescriptionEditor.resx index 96f590b..d2235dd 100644 --- a/Pilz.Updating.Administration.GUI/PackageDescriptionEditor.resx +++ b/Pilz.Updating.Administration.GUI/PackageDescriptionEditor.resx @@ -1,64 +1,4 @@ - - - + diff --git a/Pilz.Updating.Administration.GUI/Pilz.Updating.Administration.GUI.csproj b/Pilz.Updating.Administration.GUI/Pilz.Updating.Administration.GUI.csproj index 7fd87de..f33c81d 100644 --- a/Pilz.Updating.Administration.GUI/Pilz.Updating.Administration.GUI.csproj +++ b/Pilz.Updating.Administration.GUI/Pilz.Updating.Administration.GUI.csproj @@ -100,9 +100,7 @@ DiscordPostDialog.cs - - Form - + PackageDescriptionEditor.cs @@ -136,9 +134,7 @@ ProxyConfigEditor.cs - - Form - + UpdateServerInfoEditor.cs diff --git a/Pilz.Updating.Administration.GUI/ProxyConfigEditor.Designer.cs b/Pilz.Updating.Administration.GUI/ProxyConfigEditor.Designer.cs index 467ebf7..736cf85 100644 --- a/Pilz.Updating.Administration.GUI/ProxyConfigEditor.Designer.cs +++ b/Pilz.Updating.Administration.GUI/ProxyConfigEditor.Designer.cs @@ -29,221 +29,164 @@ private void InitializeComponent() { System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(ProxyConfigEditor)); - this.TextBoxX_ProxyUsr = new DevComponents.DotNetBar.Controls.TextBoxX(); - this.layoutControl1 = new DevComponents.DotNetBar.Layout.LayoutControl(); - this.TextBoxX_ProxyPW = new DevComponents.DotNetBar.Controls.TextBoxX(); - this.ButtonX_OK = new DevComponents.DotNetBar.ButtonX(); - this.ButtonX_Cancel = new DevComponents.DotNetBar.ButtonX(); - this.switchButton_UseProxyAuth = new DevComponents.DotNetBar.Controls.SwitchButton(); - this.layoutControlItem8 = new DevComponents.DotNetBar.Layout.LayoutControlItem(); - this.layoutSpacerItem2 = new DevComponents.DotNetBar.Layout.LayoutSpacerItem(); - this.layoutControlItem1 = new DevComponents.DotNetBar.Layout.LayoutControlItem(); - this.layoutControlItem2 = new DevComponents.DotNetBar.Layout.LayoutControlItem(); - this.layoutSpacerItem1 = new DevComponents.DotNetBar.Layout.LayoutSpacerItem(); - this.layoutControlItem7 = new DevComponents.DotNetBar.Layout.LayoutControlItem(); - this.layoutControlItem6 = new DevComponents.DotNetBar.Layout.LayoutControlItem(); - this.layoutControl1.SuspendLayout(); + this.radLabel1 = new Telerik.WinControls.UI.RadLabel(); + this.radLabel2 = new Telerik.WinControls.UI.RadLabel(); + this.radLabel3 = new Telerik.WinControls.UI.RadLabel(); + 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(); + ((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)).BeginInit(); this.SuspendLayout(); // - // TextBoxX_ProxyUsr + // radLabel1 // - this.TextBoxX_ProxyUsr.BackColor = System.Drawing.Color.White; + this.radLabel1.Location = new System.Drawing.Point(3, 5); + this.radLabel1.Name = "radLabel1"; + this.radLabel1.Size = new System.Drawing.Size(127, 18); + this.radLabel1.TabIndex = 0; + this.radLabel1.Text = "Proxy-Authentifizierung:"; // + // radLabel2 // + this.radLabel2.Location = new System.Drawing.Point(3, 33); + this.radLabel2.Name = "radLabel2"; + this.radLabel2.Size = new System.Drawing.Size(81, 18); + this.radLabel2.TabIndex = 1; + this.radLabel2.Text = "Benutzername:"; // - this.TextBoxX_ProxyUsr.Border.Class = "TextBoxBorder"; - this.TextBoxX_ProxyUsr.Border.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.TextBoxX_ProxyUsr.DisabledBackColor = System.Drawing.Color.White; - this.TextBoxX_ProxyUsr.ForeColor = System.Drawing.Color.Black; - this.TextBoxX_ProxyUsr.Location = new System.Drawing.Point(132, 34); - this.TextBoxX_ProxyUsr.Margin = new System.Windows.Forms.Padding(0); - this.TextBoxX_ProxyUsr.Name = "TextBoxX_ProxyUsr"; - this.TextBoxX_ProxyUsr.PreventEnterBeep = true; - this.TextBoxX_ProxyUsr.Size = new System.Drawing.Size(363, 20); - this.TextBoxX_ProxyUsr.TabIndex = 2; + // radLabel3 // - // layoutControl1 + this.radLabel3.Location = new System.Drawing.Point(3, 61); + this.radLabel3.Name = "radLabel3"; + this.radLabel3.Size = new System.Drawing.Size(53, 18); + this.radLabel3.TabIndex = 2; + this.radLabel3.Text = "Passwort:"; // - this.layoutControl1.BackColor = System.Drawing.Color.Transparent; - this.layoutControl1.Controls.Add(this.TextBoxX_ProxyUsr); - this.layoutControl1.Controls.Add(this.TextBoxX_ProxyPW); - this.layoutControl1.Controls.Add(this.ButtonX_OK); - this.layoutControl1.Controls.Add(this.ButtonX_Cancel); - this.layoutControl1.Controls.Add(this.switchButton_UseProxyAuth); - this.layoutControl1.Dock = System.Windows.Forms.DockStyle.Fill; - this.layoutControl1.ForeColor = System.Drawing.Color.Black; - this.layoutControl1.Location = new System.Drawing.Point(0, 0); - this.layoutControl1.Name = "layoutControl1"; + // radToggleSwitch_UserProxy // + this.radToggleSwitch_UserProxy.Location = new System.Drawing.Point(135, 4); + this.radToggleSwitch_UserProxy.Name = "radToggleSwitch_UserProxy"; + this.radToggleSwitch_UserProxy.Size = new System.Drawing.Size(50, 20); + this.radToggleSwitch_UserProxy.TabIndex = 0; // + // radTextBoxControl_Username // - this.layoutControl1.RootGroup.Items.AddRange(new DevComponents.DotNetBar.Layout.LayoutItemBase[] { - this.layoutControlItem8, - this.layoutSpacerItem2, - this.layoutControlItem1, - this.layoutControlItem2, - this.layoutSpacerItem1, - this.layoutControlItem7, - this.layoutControlItem6}); - this.layoutControl1.Size = new System.Drawing.Size(499, 117); - this.layoutControl1.TabIndex = 1; + 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.Name = "radTextBoxControl_Username"; + this.radTextBoxControl_Username.Size = new System.Drawing.Size(361, 22); + this.radTextBoxControl_Username.TabIndex = 0; // - // TextBoxX_ProxyPW + // radTextBoxControl_Password // - this.TextBoxX_ProxyPW.BackColor = System.Drawing.Color.White; + 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.Name = "radTextBoxControl_Password"; + this.radTextBoxControl_Password.Size = new System.Drawing.Size(361, 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; // - this.TextBoxX_ProxyPW.Border.Class = "TextBoxBorder"; - this.TextBoxX_ProxyPW.Border.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.TextBoxX_ProxyPW.DisabledBackColor = System.Drawing.Color.White; - this.TextBoxX_ProxyPW.ForeColor = System.Drawing.Color.Black; - this.TextBoxX_ProxyPW.Location = new System.Drawing.Point(132, 62); - this.TextBoxX_ProxyPW.Margin = new System.Windows.Forms.Padding(0); - this.TextBoxX_ProxyPW.Name = "TextBoxX_ProxyPW"; - this.TextBoxX_ProxyPW.PreventEnterBeep = true; - this.TextBoxX_ProxyPW.Size = new System.Drawing.Size(363, 20); - this.TextBoxX_ProxyPW.TabIndex = 3; - this.TextBoxX_ProxyPW.UseSystemPasswordChar = true; + // radButton_Cancel // - // ButtonX_OK + this.radButton_Cancel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); + 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, 87); + this.radButton_Cancel.Name = "radButton_Cancel"; + this.radButton_Cancel.Size = new System.Drawing.Size(100, 24); + this.radButton_Cancel.TabIndex = 4; + this.radButton_Cancel.Text = "Abbrechen"; + this.radButton_Cancel.TextAlignment = System.Drawing.ContentAlignment.MiddleLeft; + this.radButton_Cancel.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageBeforeText; // - this.ButtonX_OK.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; - this.ButtonX_OK.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; - this.ButtonX_OK.DialogResult = System.Windows.Forms.DialogResult.OK; - this.ButtonX_OK.Image = global::Pilz.Updating.Administration.GUI.My.Resources.Resources.icons8_checkmark_16px; - this.ButtonX_OK.Location = new System.Drawing.Point(403, 90); - this.ButtonX_OK.Margin = new System.Windows.Forms.Padding(0); - this.ButtonX_OK.Name = "ButtonX_OK"; - this.ButtonX_OK.Size = new System.Drawing.Size(92, 23); - this.ButtonX_OK.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ButtonX_OK.TabIndex = 6; - this.ButtonX_OK.Text = "Speichern"; - this.ButtonX_OK.Click += new System.EventHandler(this.ButtonX_OK_Click); + // panel1 // - // ButtonX_Cancel - // - this.ButtonX_Cancel.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; - this.ButtonX_Cancel.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; - this.ButtonX_Cancel.DialogResult = System.Windows.Forms.DialogResult.Cancel; - this.ButtonX_Cancel.Image = global::Pilz.Updating.Administration.GUI.My.Resources.Resources.icons8_delete_sign_16px; - this.ButtonX_Cancel.Location = new System.Drawing.Point(303, 90); - this.ButtonX_Cancel.Margin = new System.Windows.Forms.Padding(0); - this.ButtonX_Cancel.Name = "ButtonX_Cancel"; - this.ButtonX_Cancel.Size = new System.Drawing.Size(92, 23); - this.ButtonX_Cancel.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ButtonX_Cancel.TabIndex = 5; - this.ButtonX_Cancel.Text = "Abbrechen"; - // - // switchButton_UseProxyAuth - // - // - // - // - this.switchButton_UseProxyAuth.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.switchButton_UseProxyAuth.Location = new System.Drawing.Point(132, 4); - this.switchButton_UseProxyAuth.Margin = new System.Windows.Forms.Padding(0); - this.switchButton_UseProxyAuth.Name = "switchButton_UseProxyAuth"; - this.switchButton_UseProxyAuth.OffText = "Nein"; - this.switchButton_UseProxyAuth.OnText = "Ja"; - this.switchButton_UseProxyAuth.Size = new System.Drawing.Size(114, 22); - this.switchButton_UseProxyAuth.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.switchButton_UseProxyAuth.TabIndex = 0; - // - // layoutControlItem8 - // - this.layoutControlItem8.Control = this.switchButton_UseProxyAuth; - this.layoutControlItem8.Height = 30; - this.layoutControlItem8.MinSize = new System.Drawing.Size(64, 18); - this.layoutControlItem8.Name = "layoutControlItem8"; - this.layoutControlItem8.Text = "Proxy-Authentifizierung:"; - this.layoutControlItem8.TextPadding = new System.Windows.Forms.Padding(0, 4, 0, 0); - this.layoutControlItem8.Width = 250; - // - // layoutSpacerItem2 - // - this.layoutSpacerItem2.Height = 30; - this.layoutSpacerItem2.Name = "layoutSpacerItem2"; - this.layoutSpacerItem2.Width = 99; - this.layoutSpacerItem2.WidthType = DevComponents.DotNetBar.Layout.eLayoutSizeType.Percent; - // - // layoutControlItem1 - // - this.layoutControlItem1.Control = this.TextBoxX_ProxyUsr; - this.layoutControlItem1.Height = 28; - this.layoutControlItem1.MinSize = new System.Drawing.Size(120, 0); - this.layoutControlItem1.Name = "layoutControlItem1"; - this.layoutControlItem1.Text = "Benutzername:"; - this.layoutControlItem1.Width = 100; - this.layoutControlItem1.WidthType = DevComponents.DotNetBar.Layout.eLayoutSizeType.Percent; - // - // layoutControlItem2 - // - this.layoutControlItem2.Control = this.TextBoxX_ProxyPW; - this.layoutControlItem2.Height = 28; - this.layoutControlItem2.MinSize = new System.Drawing.Size(120, 0); - this.layoutControlItem2.Name = "layoutControlItem2"; - this.layoutControlItem2.Text = "Passwort:"; - this.layoutControlItem2.Width = 100; - this.layoutControlItem2.WidthType = DevComponents.DotNetBar.Layout.eLayoutSizeType.Percent; - // - // layoutSpacerItem1 - // - this.layoutSpacerItem1.Height = 31; - this.layoutSpacerItem1.Name = "layoutSpacerItem1"; - this.layoutSpacerItem1.Width = 99; - this.layoutSpacerItem1.WidthType = DevComponents.DotNetBar.Layout.eLayoutSizeType.Percent; - // - // layoutControlItem7 - // - this.layoutControlItem7.Control = this.ButtonX_Cancel; - this.layoutControlItem7.Height = 31; - this.layoutControlItem7.MinSize = new System.Drawing.Size(32, 20); - this.layoutControlItem7.Name = "layoutControlItem7"; - this.layoutControlItem7.Width = 100; - // - // layoutControlItem6 - // - this.layoutControlItem6.Control = this.ButtonX_OK; - this.layoutControlItem6.Height = 31; - this.layoutControlItem6.MinSize = new System.Drawing.Size(32, 20); - this.layoutControlItem6.Name = "layoutControlItem6"; - this.layoutControlItem6.Width = 100; + this.panel1.Controls.Add(this.radToggleSwitch_UserProxy); + this.panel1.Controls.Add(this.radTextBoxControl_Username); + this.panel1.Controls.Add(this.radButton_Accept); + this.panel1.Controls.Add(this.radLabel1); + this.panel1.Controls.Add(this.radButton_Cancel); + this.panel1.Controls.Add(this.radLabel2); + this.panel1.Controls.Add(this.radTextBoxControl_Password); + this.panel1.Controls.Add(this.radLabel3); + 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(499, 114); + this.panel1.TabIndex = 5; // // ProxyConfigEditor // - this.AcceptButton = this.ButtonX_OK; - this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); + this.AcceptButton = this.radButton_Accept; + this.AutoScaleBaseSize = new System.Drawing.Size(7, 15); + this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.CancelButton = this.ButtonX_Cancel; - this.ClientSize = new System.Drawing.Size(499, 117); - this.Controls.Add(this.layoutControl1); + this.CancelButton = this.radButton_Cancel; + this.ClientSize = new System.Drawing.Size(499, 114); + this.Controls.Add(this.panel1); this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle; this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); this.MaximizeBox = false; this.Name = "ProxyConfigEditor"; + // + // + // + this.RootElement.ApplyShapeToControl = true; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent; - this.Text = "UpdateServerInfoEditor"; + this.Text = "Updateserverinfo"; this.Shown += new System.EventHandler(this.UpdateServerInfoEditor_Shown); - this.layoutControl1.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)(this.radLabel1)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.radLabel2)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.radLabel3)).EndInit(); + ((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)).EndInit(); this.ResumeLayout(false); } #endregion - private DevComponents.DotNetBar.Controls.TextBoxX TextBoxX_ProxyUsr; - private DevComponents.DotNetBar.Layout.LayoutControl layoutControl1; - private DevComponents.DotNetBar.Layout.LayoutControlItem layoutControlItem1; - private DevComponents.DotNetBar.Controls.TextBoxX TextBoxX_ProxyPW; - private DevComponents.DotNetBar.Layout.LayoutControlItem layoutControlItem2; - private DevComponents.DotNetBar.ButtonX ButtonX_OK; - private DevComponents.DotNetBar.Layout.LayoutSpacerItem layoutSpacerItem1; - private DevComponents.DotNetBar.Layout.LayoutControlItem layoutControlItem6; - private DevComponents.DotNetBar.ButtonX ButtonX_Cancel; - private DevComponents.DotNetBar.Layout.LayoutControlItem layoutControlItem7; - private DevComponents.DotNetBar.Controls.SwitchButton switchButton_UseProxyAuth; - private DevComponents.DotNetBar.Layout.LayoutControlItem layoutControlItem8; - private DevComponents.DotNetBar.Layout.LayoutSpacerItem layoutSpacerItem2; + private Telerik.WinControls.UI.RadLabel radLabel1; + private Telerik.WinControls.UI.RadLabel radLabel2; + private Telerik.WinControls.UI.RadLabel radLabel3; + 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; } } \ No newline at end of file diff --git a/Pilz.Updating.Administration.GUI/ProxyConfigEditor.cs b/Pilz.Updating.Administration.GUI/ProxyConfigEditor.cs index c45bb54..288b720 100644 --- a/Pilz.Updating.Administration.GUI/ProxyConfigEditor.cs +++ b/Pilz.Updating.Administration.GUI/ProxyConfigEditor.cs @@ -8,10 +8,11 @@ using System.Linq; using System.Text; using System.Threading.Tasks; using System.Windows.Forms; +using Telerik.WinControls.UI; namespace Pilz.Updating.Administration.GUI { - public partial class ProxyConfigEditor : OfficeForm + public partial class ProxyConfigEditor : RadForm { private readonly ProxyConfiguration config = null; @@ -19,21 +20,20 @@ namespace Pilz.Updating.Administration.GUI { this.config = config; InitializeComponent(); - UpdateAmbientColors(); } private void UpdateServerInfoEditor_Shown(object sender, EventArgs e) { - switchButton_UseProxyAuth.Value = config.UseProxyAuth; - TextBoxX_ProxyUsr.Text = config.Username; - TextBoxX_ProxyPW.Text = config.Password ?? string.Empty; + radToggleSwitch_UserProxy.Value = config.UseProxyAuth; + radTextBoxControl_Username.Text = config.Username; + radTextBoxControl_Password.Text = config.Password ?? string.Empty; } private void ButtonX_OK_Click(object sender, EventArgs e) { - config.UseProxyAuth = switchButton_UseProxyAuth.Value; - config.Username = TextBoxX_ProxyUsr.Text.Trim(); - config.Password = TextBoxX_ProxyPW.Text; + config.UseProxyAuth = radToggleSwitch_UserProxy.Value; + config.Username = radTextBoxControl_Username.Text.Trim(); + config.Password = radTextBoxControl_Password.Text; } } } diff --git a/Pilz.Updating.Administration.GUI/ProxyConfigEditor.resx b/Pilz.Updating.Administration.GUI/ProxyConfigEditor.resx index 96f590b..d2235dd 100644 --- a/Pilz.Updating.Administration.GUI/ProxyConfigEditor.resx +++ b/Pilz.Updating.Administration.GUI/ProxyConfigEditor.resx @@ -1,64 +1,4 @@ - - - + diff --git a/Pilz.Updating.Administration.GUI/UpdateServerInfoEditor.Designer.cs b/Pilz.Updating.Administration.GUI/UpdateServerInfoEditor.Designer.cs index 07fc8e3..5f6a740 100644 --- a/Pilz.Updating.Administration.GUI/UpdateServerInfoEditor.Designer.cs +++ b/Pilz.Updating.Administration.GUI/UpdateServerInfoEditor.Designer.cs @@ -29,320 +29,246 @@ private void InitializeComponent() { System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(UpdateServerInfoEditor)); - this.TextBoxX_ServerAddress = new DevComponents.DotNetBar.Controls.TextBoxX(); - this.layoutControl1 = new DevComponents.DotNetBar.Layout.LayoutControl(); - this.TextBoxX_PublicBaseURL = new DevComponents.DotNetBar.Controls.TextBoxX(); - this.TextBoxX_PackageInfoFilename = new DevComponents.DotNetBar.Controls.TextBoxX(); - this.TextBoxX_Username = new DevComponents.DotNetBar.Controls.TextBoxX(); - this.TextBoxX_Password = new DevComponents.DotNetBar.Controls.TextBoxX(); - this.ButtonX_OK = new DevComponents.DotNetBar.ButtonX(); - this.ButtonX_Cancel = new DevComponents.DotNetBar.ButtonX(); - this.switchButton_UseProxyForWebDAV = new DevComponents.DotNetBar.Controls.SwitchButton(); - this.layoutControlItem1 = new DevComponents.DotNetBar.Layout.LayoutControlItem(); - this.layoutControlItem2 = new DevComponents.DotNetBar.Layout.LayoutControlItem(); - this.layoutControlItem3 = new DevComponents.DotNetBar.Layout.LayoutControlItem(); - this.layoutControlItem4 = new DevComponents.DotNetBar.Layout.LayoutControlItem(); - this.layoutControlItem5 = new DevComponents.DotNetBar.Layout.LayoutControlItem(); - this.layoutControlItem8 = new DevComponents.DotNetBar.Layout.LayoutControlItem(); - this.layoutSpacerItem2 = new DevComponents.DotNetBar.Layout.LayoutSpacerItem(); - this.layoutSpacerItem1 = new DevComponents.DotNetBar.Layout.LayoutSpacerItem(); - this.layoutControlItem7 = new DevComponents.DotNetBar.Layout.LayoutControlItem(); - this.layoutControlItem6 = new DevComponents.DotNetBar.Layout.LayoutControlItem(); - this.layoutControl1.SuspendLayout(); + this.radLabel1 = new Telerik.WinControls.UI.RadLabel(); + this.radLabel2 = new Telerik.WinControls.UI.RadLabel(); + this.radLabel3 = new Telerik.WinControls.UI.RadLabel(); + this.radLabel4 = new Telerik.WinControls.UI.RadLabel(); + this.radLabel5 = new Telerik.WinControls.UI.RadLabel(); + this.radLabel6 = new Telerik.WinControls.UI.RadLabel(); + this.radTextBoxControl_ServerAddress = new Telerik.WinControls.UI.RadTextBoxControl(); + this.radTextBoxControl_PublicBasisURL = new Telerik.WinControls.UI.RadTextBoxControl(); + this.radTextBoxControl_PackageConfigurationFileName = new Telerik.WinControls.UI.RadTextBoxControl(); + this.radTextBoxControl_Username = new Telerik.WinControls.UI.RadTextBoxControl(); + 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(); + ((System.ComponentModel.ISupportInitialize)(this.radLabel1)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.radLabel2)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.radLabel3)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.radLabel4)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.radLabel5)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.radLabel6)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.radTextBoxControl_ServerAddress)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.radTextBoxControl_PublicBasisURL)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.radTextBoxControl_PackageConfigurationFileName)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.radTextBoxControl_Username)).BeginInit(); + ((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)).BeginInit(); this.SuspendLayout(); // - // TextBoxX_ServerAddress + // radLabel1 // - this.TextBoxX_ServerAddress.BackColor = System.Drawing.Color.White; + this.radLabel1.Location = new System.Drawing.Point(3, 5); + this.radLabel1.Name = "radLabel1"; + this.radLabel1.Size = new System.Drawing.Size(84, 18); + this.radLabel1.TabIndex = 0; + this.radLabel1.Text = "Server-Adresse:"; // + // radLabel2 // + this.radLabel2.Location = new System.Drawing.Point(3, 33); + this.radLabel2.Name = "radLabel2"; + this.radLabel2.Size = new System.Drawing.Size(116, 18); + this.radLabel2.TabIndex = 1; + this.radLabel2.Text = "Öffentliche Basis-URL:"; // - this.TextBoxX_ServerAddress.Border.Class = "TextBoxBorder"; - this.TextBoxX_ServerAddress.Border.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.TextBoxX_ServerAddress.DisabledBackColor = System.Drawing.Color.White; - this.TextBoxX_ServerAddress.ForeColor = System.Drawing.Color.Black; - this.TextBoxX_ServerAddress.Location = new System.Drawing.Point(167, 4); - this.TextBoxX_ServerAddress.Margin = new System.Windows.Forms.Padding(0); - this.TextBoxX_ServerAddress.Name = "TextBoxX_ServerAddress"; - this.TextBoxX_ServerAddress.PreventEnterBeep = true; - this.TextBoxX_ServerAddress.Size = new System.Drawing.Size(328, 20); - this.TextBoxX_ServerAddress.TabIndex = 0; + // radLabel3 // - // layoutControl1 + this.radLabel3.Location = new System.Drawing.Point(3, 61); + this.radLabel3.Name = "radLabel3"; + this.radLabel3.Size = new System.Drawing.Size(161, 18); + this.radLabel3.TabIndex = 2; + this.radLabel3.Text = "Paketkonfigurationsdateiname:"; // - this.layoutControl1.BackColor = System.Drawing.Color.Transparent; - this.layoutControl1.Controls.Add(this.TextBoxX_ServerAddress); - this.layoutControl1.Controls.Add(this.TextBoxX_PublicBaseURL); - this.layoutControl1.Controls.Add(this.TextBoxX_PackageInfoFilename); - this.layoutControl1.Controls.Add(this.TextBoxX_Username); - this.layoutControl1.Controls.Add(this.TextBoxX_Password); - this.layoutControl1.Controls.Add(this.ButtonX_OK); - this.layoutControl1.Controls.Add(this.ButtonX_Cancel); - this.layoutControl1.Controls.Add(this.switchButton_UseProxyForWebDAV); - this.layoutControl1.Dock = System.Windows.Forms.DockStyle.Fill; - this.layoutControl1.ForeColor = System.Drawing.Color.Black; - this.layoutControl1.Location = new System.Drawing.Point(0, 0); - this.layoutControl1.Name = "layoutControl1"; + // radLabel4 // + this.radLabel4.Location = new System.Drawing.Point(3, 89); + this.radLabel4.Name = "radLabel4"; + this.radLabel4.Size = new System.Drawing.Size(81, 18); + this.radLabel4.TabIndex = 3; + this.radLabel4.Text = "Benutzername:"; // + // radLabel5 // - this.layoutControl1.RootGroup.Items.AddRange(new DevComponents.DotNetBar.Layout.LayoutItemBase[] { - this.layoutControlItem1, - this.layoutControlItem2, - this.layoutControlItem3, - this.layoutControlItem4, - this.layoutControlItem5, - this.layoutControlItem8, - this.layoutSpacerItem2, - this.layoutSpacerItem1, - this.layoutControlItem7, - this.layoutControlItem6}); - this.layoutControl1.Size = new System.Drawing.Size(499, 201); - this.layoutControl1.TabIndex = 1; + this.radLabel5.Location = new System.Drawing.Point(3, 117); + this.radLabel5.Name = "radLabel5"; + this.radLabel5.Size = new System.Drawing.Size(53, 18); + this.radLabel5.TabIndex = 4; + this.radLabel5.Text = "Passwort:"; // - // TextBoxX_PublicBaseURL + // radLabel6 // - this.TextBoxX_PublicBaseURL.BackColor = System.Drawing.Color.White; + this.radLabel6.Location = new System.Drawing.Point(3, 145); + this.radLabel6.Name = "radLabel6"; + this.radLabel6.Size = new System.Drawing.Size(145, 18); + this.radLabel6.TabIndex = 5; + this.radLabel6.Text = "Benutze Proxy für WebDAV:"; // + // radTextBoxControl_ServerAddress // + 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.Name = "radTextBoxControl_ServerAddress"; + this.radTextBoxControl_ServerAddress.Size = new System.Drawing.Size(325, 22); + this.radTextBoxControl_ServerAddress.TabIndex = 6; // - this.TextBoxX_PublicBaseURL.Border.Class = "TextBoxBorder"; - this.TextBoxX_PublicBaseURL.Border.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.TextBoxX_PublicBaseURL.DisabledBackColor = System.Drawing.Color.White; - this.TextBoxX_PublicBaseURL.ForeColor = System.Drawing.Color.Black; - this.TextBoxX_PublicBaseURL.Location = new System.Drawing.Point(167, 32); - this.TextBoxX_PublicBaseURL.Margin = new System.Windows.Forms.Padding(0); - this.TextBoxX_PublicBaseURL.Name = "TextBoxX_PublicBaseURL"; - this.TextBoxX_PublicBaseURL.PreventEnterBeep = true; - this.TextBoxX_PublicBaseURL.Size = new System.Drawing.Size(328, 20); - this.TextBoxX_PublicBaseURL.TabIndex = 1; + // radTextBoxControl_PublicBasisURL // - // TextBoxX_PackageInfoFilename + 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.Name = "radTextBoxControl_PublicBasisURL"; + this.radTextBoxControl_PublicBasisURL.Size = new System.Drawing.Size(325, 22); + this.radTextBoxControl_PublicBasisURL.TabIndex = 7; // - this.TextBoxX_PackageInfoFilename.BackColor = System.Drawing.Color.White; + // 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.Name = "radTextBoxControl_PackageConfigurationFileName"; + this.radTextBoxControl_PackageConfigurationFileName.Size = new System.Drawing.Size(325, 22); + this.radTextBoxControl_PackageConfigurationFileName.TabIndex = 8; // + // radTextBoxControl_Username // - this.TextBoxX_PackageInfoFilename.Border.Class = "TextBoxBorder"; - this.TextBoxX_PackageInfoFilename.Border.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.TextBoxX_PackageInfoFilename.DisabledBackColor = System.Drawing.Color.White; - this.TextBoxX_PackageInfoFilename.ForeColor = System.Drawing.Color.Black; - this.TextBoxX_PackageInfoFilename.Location = new System.Drawing.Point(167, 60); - this.TextBoxX_PackageInfoFilename.Margin = new System.Windows.Forms.Padding(0); - this.TextBoxX_PackageInfoFilename.Name = "TextBoxX_PackageInfoFilename"; - this.TextBoxX_PackageInfoFilename.PreventEnterBeep = true; - this.TextBoxX_PackageInfoFilename.Size = new System.Drawing.Size(328, 20); - this.TextBoxX_PackageInfoFilename.TabIndex = 2; + 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.Name = "radTextBoxControl_Username"; + this.radTextBoxControl_Username.Size = new System.Drawing.Size(325, 22); + this.radTextBoxControl_Username.TabIndex = 9; // - // TextBoxX_Username + // radTextBoxControl_Password // - this.TextBoxX_Username.BackColor = System.Drawing.Color.White; + 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.Name = "radTextBoxControl_Password"; + this.radTextBoxControl_Password.Size = new System.Drawing.Size(325, 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.Name = "radToggleSwitch_UseProxyForWebDAV"; + this.radToggleSwitch_UseProxyForWebDAV.Size = new System.Drawing.Size(50, 20); + this.radToggleSwitch_UseProxyForWebDAV.TabIndex = 11; // - this.TextBoxX_Username.Border.Class = "TextBoxBorder"; - this.TextBoxX_Username.Border.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.TextBoxX_Username.DisabledBackColor = System.Drawing.Color.White; - this.TextBoxX_Username.ForeColor = System.Drawing.Color.Black; - this.TextBoxX_Username.Location = new System.Drawing.Point(167, 88); - this.TextBoxX_Username.Margin = new System.Windows.Forms.Padding(0); - this.TextBoxX_Username.Name = "TextBoxX_Username"; - this.TextBoxX_Username.PreventEnterBeep = true; - this.TextBoxX_Username.Size = new System.Drawing.Size(328, 20); - this.TextBoxX_Username.TabIndex = 3; + // panel1 // - // TextBoxX_Password + this.panel1.BackColor = System.Drawing.Color.Transparent; + this.panel1.Controls.Add(this.radButton_Save); + this.panel1.Controls.Add(this.radButton_Cancel); + this.panel1.Controls.Add(this.radLabel1); + this.panel1.Controls.Add(this.radToggleSwitch_UseProxyForWebDAV); + this.panel1.Controls.Add(this.radLabel2); + this.panel1.Controls.Add(this.radTextBoxControl_Password); + this.panel1.Controls.Add(this.radLabel3); + this.panel1.Controls.Add(this.radTextBoxControl_Username); + this.panel1.Controls.Add(this.radLabel4); + this.panel1.Controls.Add(this.radTextBoxControl_PackageConfigurationFileName); + this.panel1.Controls.Add(this.radLabel5); + this.panel1.Controls.Add(this.radTextBoxControl_PublicBasisURL); + this.panel1.Controls.Add(this.radLabel6); + this.panel1.Controls.Add(this.radTextBoxControl_ServerAddress); + 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(499, 197); + this.panel1.TabIndex = 12; // - this.TextBoxX_Password.BackColor = System.Drawing.Color.White; + // 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.TextBoxX_Password.Border.Class = "TextBoxBorder"; - this.TextBoxX_Password.Border.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.TextBoxX_Password.DisabledBackColor = System.Drawing.Color.White; - this.TextBoxX_Password.ForeColor = System.Drawing.Color.Black; - this.TextBoxX_Password.Location = new System.Drawing.Point(167, 116); - this.TextBoxX_Password.Margin = new System.Windows.Forms.Padding(0); - this.TextBoxX_Password.Name = "TextBoxX_Password"; - this.TextBoxX_Password.PreventEnterBeep = true; - this.TextBoxX_Password.Size = new System.Drawing.Size(328, 20); - this.TextBoxX_Password.TabIndex = 4; - this.TextBoxX_Password.UseSystemPasswordChar = true; - // - // ButtonX_OK - // - this.ButtonX_OK.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; - this.ButtonX_OK.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; - this.ButtonX_OK.DialogResult = System.Windows.Forms.DialogResult.OK; - this.ButtonX_OK.Image = global::Pilz.Updating.Administration.GUI.My.Resources.Resources.icons8_checkmark_16px; - this.ButtonX_OK.Location = new System.Drawing.Point(403, 174); - this.ButtonX_OK.Margin = new System.Windows.Forms.Padding(0); - this.ButtonX_OK.Name = "ButtonX_OK"; - this.ButtonX_OK.Size = new System.Drawing.Size(92, 23); - this.ButtonX_OK.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ButtonX_OK.TabIndex = 9; - this.ButtonX_OK.Text = "Speichern"; - this.ButtonX_OK.Click += new System.EventHandler(this.ButtonX_OK_Click); - // - // ButtonX_Cancel - // - this.ButtonX_Cancel.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; - this.ButtonX_Cancel.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; - this.ButtonX_Cancel.DialogResult = System.Windows.Forms.DialogResult.Cancel; - this.ButtonX_Cancel.Image = global::Pilz.Updating.Administration.GUI.My.Resources.Resources.icons8_delete_sign_16px; - this.ButtonX_Cancel.Location = new System.Drawing.Point(303, 174); - this.ButtonX_Cancel.Margin = new System.Windows.Forms.Padding(0); - this.ButtonX_Cancel.Name = "ButtonX_Cancel"; - this.ButtonX_Cancel.Size = new System.Drawing.Size(92, 23); - this.ButtonX_Cancel.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ButtonX_Cancel.TabIndex = 8; - this.ButtonX_Cancel.Text = "Abbrechen"; - // - // switchButton_UseProxyForWebDAV - // - // - // - // - this.switchButton_UseProxyForWebDAV.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.switchButton_UseProxyForWebDAV.Location = new System.Drawing.Point(167, 144); - this.switchButton_UseProxyForWebDAV.Margin = new System.Windows.Forms.Padding(0); - this.switchButton_UseProxyForWebDAV.Name = "switchButton_UseProxyForWebDAV"; - this.switchButton_UseProxyForWebDAV.OffText = "Nein"; - this.switchButton_UseProxyForWebDAV.OnText = "Ja"; - this.switchButton_UseProxyForWebDAV.Size = new System.Drawing.Size(79, 22); - this.switchButton_UseProxyForWebDAV.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.switchButton_UseProxyForWebDAV.TabIndex = 5; - // - // layoutControlItem1 - // - this.layoutControlItem1.Control = this.TextBoxX_ServerAddress; - this.layoutControlItem1.Height = 28; - this.layoutControlItem1.MinSize = new System.Drawing.Size(120, 0); - this.layoutControlItem1.Name = "layoutControlItem1"; - this.layoutControlItem1.Text = "Server-Adresse:"; - this.layoutControlItem1.Width = 100; - this.layoutControlItem1.WidthType = DevComponents.DotNetBar.Layout.eLayoutSizeType.Percent; - // - // layoutControlItem2 - // - this.layoutControlItem2.Control = this.TextBoxX_PublicBaseURL; - this.layoutControlItem2.Height = 28; - this.layoutControlItem2.MinSize = new System.Drawing.Size(120, 0); - this.layoutControlItem2.Name = "layoutControlItem2"; - this.layoutControlItem2.Text = "Öffentliche Basis-URL:"; - this.layoutControlItem2.Width = 100; - this.layoutControlItem2.WidthType = DevComponents.DotNetBar.Layout.eLayoutSizeType.Percent; - // - // layoutControlItem3 - // - this.layoutControlItem3.Control = this.TextBoxX_PackageInfoFilename; - this.layoutControlItem3.Height = 28; - this.layoutControlItem3.MinSize = new System.Drawing.Size(120, 0); - this.layoutControlItem3.Name = "layoutControlItem3"; - this.layoutControlItem3.Text = "Paketkonfigurationsdateiname:"; - this.layoutControlItem3.Width = 100; - this.layoutControlItem3.WidthType = DevComponents.DotNetBar.Layout.eLayoutSizeType.Percent; - // - // layoutControlItem4 - // - this.layoutControlItem4.Control = this.TextBoxX_Username; - this.layoutControlItem4.Height = 28; - this.layoutControlItem4.MinSize = new System.Drawing.Size(120, 0); - this.layoutControlItem4.Name = "layoutControlItem4"; - this.layoutControlItem4.Text = "Benutzername:"; - this.layoutControlItem4.Width = 100; - this.layoutControlItem4.WidthType = DevComponents.DotNetBar.Layout.eLayoutSizeType.Percent; - // - // layoutControlItem5 - // - this.layoutControlItem5.Control = this.TextBoxX_Password; - this.layoutControlItem5.Height = 28; - this.layoutControlItem5.MinSize = new System.Drawing.Size(120, 0); - this.layoutControlItem5.Name = "layoutControlItem5"; - this.layoutControlItem5.Text = "Passwort:"; - this.layoutControlItem5.Width = 100; - this.layoutControlItem5.WidthType = DevComponents.DotNetBar.Layout.eLayoutSizeType.Percent; - // - // layoutControlItem8 - // - this.layoutControlItem8.Control = this.switchButton_UseProxyForWebDAV; - this.layoutControlItem8.Height = 30; - this.layoutControlItem8.MinSize = new System.Drawing.Size(64, 18); - this.layoutControlItem8.Name = "layoutControlItem8"; - this.layoutControlItem8.Text = "Benutze Proxy für WebDAV:"; - this.layoutControlItem8.TextPadding = new System.Windows.Forms.Padding(0, 4, 0, 0); - this.layoutControlItem8.Width = 250; - // - // layoutSpacerItem2 - // - this.layoutSpacerItem2.Height = 30; - this.layoutSpacerItem2.Name = "layoutSpacerItem2"; - this.layoutSpacerItem2.Width = 99; - this.layoutSpacerItem2.WidthType = DevComponents.DotNetBar.Layout.eLayoutSizeType.Percent; - // - // layoutSpacerItem1 - // - this.layoutSpacerItem1.Height = 31; - this.layoutSpacerItem1.Name = "layoutSpacerItem1"; - this.layoutSpacerItem1.Width = 99; - this.layoutSpacerItem1.WidthType = DevComponents.DotNetBar.Layout.eLayoutSizeType.Percent; - // - // layoutControlItem7 - // - this.layoutControlItem7.Control = this.ButtonX_Cancel; - this.layoutControlItem7.Height = 31; - this.layoutControlItem7.MinSize = new System.Drawing.Size(32, 20); - this.layoutControlItem7.Name = "layoutControlItem7"; - this.layoutControlItem7.Width = 100; - // - // layoutControlItem6 - // - this.layoutControlItem6.Control = this.ButtonX_OK; - this.layoutControlItem6.Height = 31; - this.layoutControlItem6.MinSize = new System.Drawing.Size(32, 20); - this.layoutControlItem6.Name = "layoutControlItem6"; - this.layoutControlItem6.Width = 100; + this.radButton_Save.Image = global::Pilz.Updating.Administration.GUI.My.Resources.Resources.icons8_checkmark_16px; + this.radButton_Save.ImageAlignment = System.Drawing.ContentAlignment.MiddleRight; + this.radButton_Save.Location = new System.Drawing.Point(396, 170); + this.radButton_Save.Name = "radButton_Save"; + this.radButton_Save.Size = new System.Drawing.Size(100, 24); + this.radButton_Save.TabIndex = 13; + this.radButton_Save.Text = "Speichern"; + this.radButton_Save.TextAlignment = System.Drawing.ContentAlignment.MiddleLeft; + this.radButton_Save.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageBeforeText; + this.radButton_Save.Click += new System.EventHandler(this.ButtonX_OK_Click); // // UpdateServerInfoEditor // - this.AcceptButton = this.ButtonX_OK; - this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); + this.AcceptButton = this.radButton_Save; + this.AutoScaleBaseSize = new System.Drawing.Size(7, 15); + this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.CancelButton = this.ButtonX_Cancel; - this.ClientSize = new System.Drawing.Size(499, 201); - this.Controls.Add(this.layoutControl1); + this.CancelButton = this.radButton_Cancel; + this.ClientSize = new System.Drawing.Size(499, 197); + this.Controls.Add(this.panel1); this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle; this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); this.MaximizeBox = false; this.Name = "UpdateServerInfoEditor"; + // + // + // + this.RootElement.ApplyShapeToControl = true; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent; this.Text = "UpdateServerInfoEditor"; this.Shown += new System.EventHandler(this.UpdateServerInfoEditor_Shown); - this.layoutControl1.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)(this.radLabel1)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.radLabel2)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.radLabel3)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.radLabel4)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.radLabel5)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.radLabel6)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.radTextBoxControl_ServerAddress)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.radTextBoxControl_PublicBasisURL)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.radTextBoxControl_PackageConfigurationFileName)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.radTextBoxControl_Username)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.radTextBoxControl_Password)).EndInit(); + ((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)).EndInit(); this.ResumeLayout(false); } #endregion - private DevComponents.DotNetBar.Controls.TextBoxX TextBoxX_ServerAddress; - private DevComponents.DotNetBar.Layout.LayoutControl layoutControl1; - private DevComponents.DotNetBar.Layout.LayoutControlItem layoutControlItem1; - private DevComponents.DotNetBar.Controls.TextBoxX TextBoxX_PublicBaseURL; - private DevComponents.DotNetBar.Controls.TextBoxX TextBoxX_PackageInfoFilename; - private DevComponents.DotNetBar.Controls.TextBoxX TextBoxX_Username; - private DevComponents.DotNetBar.Controls.TextBoxX TextBoxX_Password; - private DevComponents.DotNetBar.Layout.LayoutControlItem layoutControlItem2; - private DevComponents.DotNetBar.Layout.LayoutControlItem layoutControlItem3; - private DevComponents.DotNetBar.Layout.LayoutControlItem layoutControlItem4; - private DevComponents.DotNetBar.Layout.LayoutControlItem layoutControlItem5; - private DevComponents.DotNetBar.ButtonX ButtonX_OK; - private DevComponents.DotNetBar.Layout.LayoutSpacerItem layoutSpacerItem1; - private DevComponents.DotNetBar.Layout.LayoutControlItem layoutControlItem6; - private DevComponents.DotNetBar.ButtonX ButtonX_Cancel; - private DevComponents.DotNetBar.Layout.LayoutControlItem layoutControlItem7; - private DevComponents.DotNetBar.Controls.SwitchButton switchButton_UseProxyForWebDAV; - private DevComponents.DotNetBar.Layout.LayoutControlItem layoutControlItem8; - private DevComponents.DotNetBar.Layout.LayoutSpacerItem layoutSpacerItem2; + private Telerik.WinControls.UI.RadLabel radLabel1; + private Telerik.WinControls.UI.RadLabel radLabel2; + private Telerik.WinControls.UI.RadLabel radLabel3; + private Telerik.WinControls.UI.RadLabel radLabel4; + private Telerik.WinControls.UI.RadLabel radLabel5; + private Telerik.WinControls.UI.RadLabel radLabel6; + private Telerik.WinControls.UI.RadTextBoxControl radTextBoxControl_ServerAddress; + private Telerik.WinControls.UI.RadTextBoxControl radTextBoxControl_PublicBasisURL; + private Telerik.WinControls.UI.RadTextBoxControl radTextBoxControl_PackageConfigurationFileName; + private Telerik.WinControls.UI.RadTextBoxControl radTextBoxControl_Username; + private Telerik.WinControls.UI.RadTextBoxControl radTextBoxControl_Password; + private Telerik.WinControls.UI.RadToggleSwitch radToggleSwitch_UseProxyForWebDAV; + private System.Windows.Forms.Panel panel1; + private Telerik.WinControls.UI.RadButton radButton_Save; + private Telerik.WinControls.UI.RadButton radButton_Cancel; } } \ No newline at end of file diff --git a/Pilz.Updating.Administration.GUI/UpdateServerInfoEditor.cs b/Pilz.Updating.Administration.GUI/UpdateServerInfoEditor.cs index 37f746d..e200533 100644 --- a/Pilz.Updating.Administration.GUI/UpdateServerInfoEditor.cs +++ b/Pilz.Updating.Administration.GUI/UpdateServerInfoEditor.cs @@ -8,35 +8,35 @@ using System.Linq; using System.Text; using System.Threading.Tasks; using System.Windows.Forms; +using Telerik.WinControls.UI; namespace Pilz.Updating.Administration.GUI { - public partial class UpdateServerInfoEditor : OfficeForm + public partial class UpdateServerInfoEditor : RadForm { public UpdateServerInfoEditor() { InitializeComponent(); - UpdateAmbientColors(); } private void UpdateServerInfoEditor_Shown(object sender, EventArgs e) { - TextBoxX_ServerAddress.Text = General.CurProject.UpdateServerConfig.ServerAdress; - TextBoxX_PublicBaseURL.Text = General.CurProject.UpdateServerConfig.PublicPackageBaseURL; - TextBoxX_PackageInfoFilename.Text = General.CurProject.UpdateServerConfig.UpdateInfoFilename; - TextBoxX_Username.Text = General.CurProject.UpdateServerConfig.Username; - TextBoxX_Password.Text = General.CurProject.UpdateServerConfig.Password; - switchButton_UseProxyForWebDAV.Value = General.CurProject.UpdateServerConfig.UseProxyForWebDAV; + radTextBoxControl_ServerAddress.Text = General.CurProject.UpdateServerConfig.ServerAdress; + radTextBoxControl_PublicBasisURL.Text = General.CurProject.UpdateServerConfig.PublicPackageBaseURL; + radTextBoxControl_PackageConfigurationFileName.Text = General.CurProject.UpdateServerConfig.UpdateInfoFilename; + radTextBoxControl_Username.Text = General.CurProject.UpdateServerConfig.Username; + radTextBoxControl_Password.Text = General.CurProject.UpdateServerConfig.Password; + radToggleSwitch_UseProxyForWebDAV.Value = General.CurProject.UpdateServerConfig.UseProxyForWebDAV; } private void ButtonX_OK_Click(object sender, EventArgs e) { - General.CurProject.UpdateServerConfig.ServerAdress = TextBoxX_ServerAddress.Text.Trim(); - General.CurProject.UpdateServerConfig.PublicPackageBaseURL = TextBoxX_PublicBaseURL.Text.Trim(); - General.CurProject.UpdateServerConfig.UpdateInfoFilename = TextBoxX_PackageInfoFilename.Text.Trim(); - General.CurProject.UpdateServerConfig.Username = TextBoxX_Username.Text.Trim(); - General.CurProject.UpdateServerConfig.Password = TextBoxX_Password.Text; - General.CurProject.UpdateServerConfig.UseProxyForWebDAV = switchButton_UseProxyForWebDAV.Value; + General.CurProject.UpdateServerConfig.ServerAdress = radTextBoxControl_ServerAddress.Text.Trim(); + General.CurProject.UpdateServerConfig.PublicPackageBaseURL = radTextBoxControl_PublicBasisURL.Text.Trim(); + General.CurProject.UpdateServerConfig.UpdateInfoFilename = radTextBoxControl_PackageConfigurationFileName.Text.Trim(); + General.CurProject.UpdateServerConfig.Username = radTextBoxControl_Username.Text.Trim(); + General.CurProject.UpdateServerConfig.Password = radTextBoxControl_Password.Text; + General.CurProject.UpdateServerConfig.UseProxyForWebDAV = radToggleSwitch_UseProxyForWebDAV.Value; } } } diff --git a/Pilz.Updating.Administration.GUI/UpdateServerInfoEditor.resx b/Pilz.Updating.Administration.GUI/UpdateServerInfoEditor.resx index 96f590b..d2235dd 100644 --- a/Pilz.Updating.Administration.GUI/UpdateServerInfoEditor.resx +++ b/Pilz.Updating.Administration.GUI/UpdateServerInfoEditor.resx @@ -1,64 +1,4 @@ - - - +