Pilz.NET/Pilz.Updating
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

merge branche 'net6' in master

Browse Source
This commit is contained in:
Pascal
2022-06-14 09:26:29 +02:00
parent 01dad30e32 a4e5b29de2
commit 2461353f5f
66 changed files with 5242 additions and 6919 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
NuGet.Config
View File

@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<configuration> <configuration>
<packageSources> <packageSources>
<add key="nuget.org" value="https://api.nuget.org/v3/index.json" protocolVersion="3" /> <add key="Telerik UI for WinForms 2022.2.510.0" value="C:\Program Files (x86)\Progress\Telerik UI for WinForms R2 2022\Bin60\NuGet" />
</packageSources> </packageSources>
</configuration> </configuration>

3
Pilz.Updating.Administration.GUI/App.config
View File

@@ -23,4 +23,7 @@
</dependentAssembly> </dependentAssembly>
</assemblyBinding> </assemblyBinding>
</runtime> </runtime>
<appSettings>
<add key="TelerikWinFormsThemeName" value="Fluent" />
</appSettings>
</configuration> </configuration>

358
Pilz.Updating.Administration.GUI/ApplicationVersionInput.Designer.cs generated
View File

@@ -7,7 +7,7 @@ using Microsoft.VisualBasic.CompilerServices;
namespace Pilz.Updating.Administration.GUI namespace Pilz.Updating.Administration.GUI
{ {
[DesignerGenerated()] [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. // Form overrides dispose to clean up the component list.
@@ -36,244 +36,184 @@ namespace Pilz.Updating.Administration.GUI
[DebuggerStepThrough()] [DebuggerStepThrough()]
private void InitializeComponent() private void InitializeComponent()
{ {
this.components = new System.ComponentModel.Container();
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(ApplicationVersionInput)); System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(ApplicationVersionInput));
this.TextBoxX_Version = new DevComponents.DotNetBar.Controls.TextBoxX(); this.radLabel1 = new Telerik.WinControls.UI.RadLabel();
this.ComboBoxEx_Channel = new DevComponents.DotNetBar.Controls.ComboBoxEx(); this.radLabel2 = new Telerik.WinControls.UI.RadLabel();
this.IntegerInput_Build = new DevComponents.Editors.IntegerInput(); this.radLabel3 = new Telerik.WinControls.UI.RadLabel();
this.LayoutControl1 = new DevComponents.DotNetBar.Layout.LayoutControl(); this.radTextBoxControl_Version = new Telerik.WinControls.UI.RadTextBoxControl();
this.ButtonX_Cancel = new DevComponents.DotNetBar.ButtonX(); this.radDropDownList_Channel = new Telerik.WinControls.UI.RadDropDownList();
this.ButtonX_Okay = new DevComponents.DotNetBar.ButtonX(); this.panel1 = new System.Windows.Forms.Panel();
this.LayoutControlItem2 = new DevComponents.DotNetBar.Layout.LayoutControlItem(); this.radSpinEditor_Build = new Telerik.WinControls.UI.RadSpinEditor();
this.LayoutControlItem3 = new DevComponents.DotNetBar.Layout.LayoutControlItem(); this.radButton_Cancel = new Telerik.WinControls.UI.RadButton();
this.LayoutControlItem4 = new DevComponents.DotNetBar.Layout.LayoutControlItem(); this.radButton_Accept = new Telerik.WinControls.UI.RadButton();
this.LayoutSpacerItem1 = new DevComponents.DotNetBar.Layout.LayoutSpacerItem(); ((System.ComponentModel.ISupportInitialize)(this.radLabel1)).BeginInit();
this.LayoutControlItem5 = new DevComponents.DotNetBar.Layout.LayoutControlItem(); ((System.ComponentModel.ISupportInitialize)(this.radLabel2)).BeginInit();
this.LayoutControlItem6 = new DevComponents.DotNetBar.Layout.LayoutControlItem(); ((System.ComponentModel.ISupportInitialize)(this.radLabel3)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.IntegerInput_Build)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.radTextBoxControl_Version)).BeginInit();
this.LayoutControl1.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.radDropDownList_Channel)).BeginInit();
this.panel1.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.radSpinEditor_Build)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.radButton_Cancel)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.radButton_Accept)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this)).BeginInit();
this.SuspendLayout(); 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))); | 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.radDropDownList_Channel.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
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)
| System.Windows.Forms.AnchorStyles.Right))); | System.Windows.Forms.AnchorStyles.Right)));
this.radDropDownList_Channel.DropDownAnimationEnabled = true;
this.radDropDownList_Channel.DropDownStyle = Telerik.WinControls.RadDropDownStyle.DropDownList;
this.radDropDownList_Channel.Location = new System.Drawing.Point(74, 31);
this.radDropDownList_Channel.Name = "radDropDownList_Channel";
this.radDropDownList_Channel.Size = new System.Drawing.Size(255, 24);
this.radDropDownList_Channel.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"; // radSpinEditor_Build
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;
// //
// LayoutControl1 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});
// //
this.LayoutControl1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(255))))); // radButton_Cancel
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";
// //
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;
// //
// radButton_Accept
// //
this.LayoutControl1.RootGroup.Items.AddRange(new DevComponents.DotNetBar.Layout.LayoutItemBase[] { this.radButton_Accept.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
this.LayoutControlItem2, this.radButton_Accept.Image = global::Pilz.Updating.Administration.GUI.My.Resources.Resources.icons8_checkmark_16px;
this.LayoutControlItem3, this.radButton_Accept.ImageAlignment = System.Drawing.ContentAlignment.MiddleRight;
this.LayoutControlItem4, this.radButton_Accept.Location = new System.Drawing.Point(229, 91);
this.LayoutSpacerItem1, this.radButton_Accept.Name = "radButton_Accept";
this.LayoutControlItem5, this.radButton_Accept.Size = new System.Drawing.Size(100, 24);
this.LayoutControlItem6}); this.radButton_Accept.TabIndex = 4;
this.LayoutControl1.Size = new System.Drawing.Size(332, 116); this.radButton_Accept.Text = "Okay";
this.LayoutControl1.TabIndex = 5; this.radButton_Accept.TextAlignment = System.Drawing.ContentAlignment.MiddleLeft;
// this.radButton_Accept.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageBeforeText;
// 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;
// //
// ApplicationVersionInput // ApplicationVersionInput
// //
this.AcceptButton = this.ButtonX_Okay; this.AcceptButton = this.radButton_Accept;
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.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.CancelButton = this.ButtonX_Cancel; this.CancelButton = this.radButton_Cancel;
this.ClientSize = new System.Drawing.Size(332, 116); this.ClientSize = new System.Drawing.Size(332, 118);
this.Controls.Add(this.LayoutControl1); this.Controls.Add(this.panel1);
this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow; this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow;
this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
this.MaximizeBox = false; this.MaximizeBox = false;
this.MinimizeBox = false; this.MinimizeBox = false;
this.Name = "ApplicationVersionInput"; this.Name = "ApplicationVersionInput";
//
//
//
this.RootElement.ApplyShapeToControl = true;
this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
this.Text = "Version"; this.Text = "Version";
this.TopLeftCornerSize = 0; ((System.ComponentModel.ISupportInitialize)(this.radLabel1)).EndInit();
this.TopRightCornerSize = 0; ((System.ComponentModel.ISupportInitialize)(this.radLabel2)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.IntegerInput_Build)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.radLabel3)).EndInit();
this.LayoutControl1.ResumeLayout(false); ((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.radSpinEditor_Build)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.radButton_Cancel)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.radButton_Accept)).EndInit();
((System.ComponentModel.ISupportInitialize)(this)).EndInit();
this.ResumeLayout(false); this.ResumeLayout(false);
} }
private Telerik.WinControls.UI.RadLabel radLabel1;
private DevComponents.DotNetBar.Controls.TextBoxX TextBoxX_Version; private Telerik.WinControls.UI.RadLabel radLabel2;
private Telerik.WinControls.UI.RadLabel radLabel3;
private Telerik.WinControls.UI.RadTextBoxControl radTextBoxControl_Version;
private DevComponents.DotNetBar.Controls.ComboBoxEx ComboBoxEx_Channel; private Telerik.WinControls.UI.RadDropDownList radDropDownList_Channel;
private Panel panel1;
private Telerik.WinControls.UI.RadButton radButton_Cancel;
private DevComponents.Editors.IntegerInput IntegerInput_Build; private Telerik.WinControls.UI.RadButton radButton_Accept;
private Telerik.WinControls.UI.RadSpinEditor radSpinEditor_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;
} }
} }

25
Pilz.Updating.Administration.GUI/ApplicationVersionInput.cs
View File

@@ -1,6 +1,7 @@
using System; using System;
using global::DevComponents.Editors; using global::DevComponents.Editors;
using Microsoft.VisualBasic.CompilerServices; using Microsoft.VisualBasic.CompilerServices;
using Telerik.WinControls.UI;
namespace Pilz.Updating.Administration.GUI namespace Pilz.Updating.Administration.GUI
{ {
@@ -14,11 +15,11 @@ namespace Pilz.Updating.Administration.GUI
InitializeComponent(); InitializeComponent();
// Init Channel-ComboBox // Init Channel-ComboBox
ComboBoxEx_Channel.Items.Add(new ComboItem() { Text = My.Resources.UpdatingAdministrationLangRes.Channel_Stable, Tag = Channels.Stable }); radDropDownList_Channel.Items.Add(new RadListDataItem() { Text = My.Resources.UpdatingAdministrationLangRes.Channel_Stable, Tag = Channels.Stable });
ComboBoxEx_Channel.Items.Add(new ComboItem() { Text = My.Resources.UpdatingAdministrationLangRes.Channel_PreRelease, Tag = Channels.PreRelease }); radDropDownList_Channel.Items.Add(new RadListDataItem() { Text = My.Resources.UpdatingAdministrationLangRes.Channel_PreRelease, Tag = Channels.PreRelease });
ComboBoxEx_Channel.Items.Add(new ComboItem() { Text = My.Resources.UpdatingAdministrationLangRes.Channel_Beta, Tag = Channels.Beta }); radDropDownList_Channel.Items.Add(new RadListDataItem() { Text = My.Resources.UpdatingAdministrationLangRes.Channel_Beta, Tag = Channels.Beta });
ComboBoxEx_Channel.Items.Add(new ComboItem() { Text = My.Resources.UpdatingAdministrationLangRes.Channel_Alpha, Tag = Channels.Alpha }); radDropDownList_Channel.Items.Add(new RadListDataItem() { Text = My.Resources.UpdatingAdministrationLangRes.Channel_Alpha, Tag = Channels.Alpha });
ComboBoxEx_Channel.SelectedIndex = 0; radDropDownList_Channel.SelectedIndex = 0;
} }
// P r o p e r t i e s // P r o p e r t i e s
@@ -27,12 +28,12 @@ namespace Pilz.Updating.Administration.GUI
{ {
get get
{ {
return new Version(TextBoxX_Version.Text.Trim()); return new Version(radTextBoxControl_Version.Text.Trim());
} }
set set
{ {
TextBoxX_Version.Text = value.ToString(); radTextBoxControl_Version.Text = value.ToString();
} }
} }
@@ -40,16 +41,16 @@ namespace Pilz.Updating.Administration.GUI
{ {
get get
{ {
return (Channels)((ComboItem)ComboBoxEx_Channel.SelectedItem).Tag; return (Channels)radDropDownList_Channel.SelectedItem.Tag;
} }
set set
{ {
foreach (ComboItem ci in ComboBoxEx_Channel.Items) foreach (var ci in radDropDownList_Channel.Items)
{ {
if ((Channels)ci.Tag == value) if ((Channels)ci.Tag == value)
{ {
ComboBoxEx_Channel.SelectedItem = ci; radDropDownList_Channel.SelectedItem = ci;
} }
} }
} }
@@ -59,12 +60,12 @@ namespace Pilz.Updating.Administration.GUI
{ {
get get
{ {
return IntegerInput_Build.Value; return (int)Math.Round(radSpinEditor_Build.Value);
} }
set set
{ {
IntegerInput_Build.Value = value; radSpinEditor_Build.Value = value;
} }
} }
} }

62
Pilz.Updating.Administration.GUI/ApplicationVersionInput.resx
View File

@@ -1,64 +1,4 @@
<?xml version="1.0" encoding="utf-8"?> <root>
<root>
<!--
Microsoft ResX Schema
Version 2.0
The primary goals of this format is to allow a simple XML format
that is mostly human readable. The generation and parsing of the
various data types are done through the TypeConverter classes
associated with the data types.
Example:
... ado.net/XML headers & schema ...
<resheader name="resmimetype">text/microsoft-resx</resheader>
<resheader name="version">2.0</resheader>
<resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
<resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
<data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
<data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
<data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
<value>[base64 mime encoded serialized .NET Framework object]</value>
</data>
<data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
<comment>This is a comment</comment>
</data>
There are any number of "resheader" rows that contain simple
name/value pairs.
Each data row contains a name, and value. The row also contains a
type or mimetype. Type corresponds to a .NET class that support
text/value conversion through the TypeConverter architecture.
Classes that don't support this are serialized and stored with the
mimetype set.
The mimetype is used for serialized objects, and tells the
ResXResourceReader how to depersist the object. This is currently not
extensible. For a given mimetype the value must be set accordingly:
Note - application/x-microsoft.net.object.binary.base64 is the format
that the ResXResourceWriter will generate, however the reader can
read any of the formats listed below.
mimetype: application/x-microsoft.net.object.binary.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.soap.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Soap.SoapFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.bytearray.base64
value : The object must be serialized into a byte array
: using a System.ComponentModel.TypeConverter
: and then encoded with base64 encoding.
-->
<xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata"> <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
<xsd:import namespace="http://www.w3.org/XML/1998/namespace" /> <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
<xsd:element name="root" msdata:IsDataSet="true"> <xsd:element name="root" msdata:IsDataSet="true">

355
Pilz.Updating.Administration.GUI/CustomThemes/FluentDarkPurple.tssp Normal file
View File

File diff suppressed because one or more lines are too long

355
Pilz.Updating.Administration.GUI/CustomThemes/FluentPurple.tssp Normal file
View File

File diff suppressed because one or more lines are too long

355
Pilz.Updating.Administration.GUI/CustomThemes/Office2019DarkPurple.tssp Normal file
View File

File diff suppressed because one or more lines are too long

355
Pilz.Updating.Administration.GUI/CustomThemes/Office2019GrayPurple.tssp Normal file
View File

File diff suppressed because one or more lines are too long

355
Pilz.Updating.Administration.GUI/CustomThemes/Office2019LightPurple.tssp Normal file
View File

File diff suppressed because one or more lines are too long

361
Pilz.Updating.Administration.GUI/DiscordBotSettingsWindow.Designer.cs generated
View File

@@ -29,255 +29,190 @@ namespace Pilz.Updating.Administration.GUI
private void InitializeComponent() private void InitializeComponent()
{ {
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(DiscordBotSettingsWindow)); System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(DiscordBotSettingsWindow));
this.layoutControl1 = new DevComponents.DotNetBar.Layout.LayoutControl(); this.panel1 = new System.Windows.Forms.Panel();
this.TextBoxX_AppName = new DevComponents.DotNetBar.Controls.TextBoxX(); this.radLabel1 = new Telerik.WinControls.UI.RadLabel();
this.TextBoxX_Msg = new DevComponents.DotNetBar.Controls.TextBoxX(); this.radLabel2 = new Telerik.WinControls.UI.RadLabel();
this.TextBoxX_BotToken = new DevComponents.DotNetBar.Controls.TextBoxX(); this.radLabel3 = new Telerik.WinControls.UI.RadLabel();
this.ButtonX_Cancel = new DevComponents.DotNetBar.ButtonX(); this.radLabel4 = new Telerik.WinControls.UI.RadLabel();
this.ButtonX_Okay = new DevComponents.DotNetBar.ButtonX(); this.radTextBoxControl_BotToken = new Telerik.WinControls.UI.RadTextBoxControl();
this.switchButton_UseProxy = new DevComponents.DotNetBar.Controls.SwitchButton(); this.radTextBoxControl_DefaultProgramName = new Telerik.WinControls.UI.RadTextBoxControl();
this.layoutControlItem3 = new DevComponents.DotNetBar.Layout.LayoutControlItem(); this.radRichTextEditor_DefaultMessage = new Telerik.WinControls.UI.RadRichTextEditor();
this.layoutControlItem6 = new DevComponents.DotNetBar.Layout.LayoutControlItem(); this.radToggleSwitch_UseProxy = new Telerik.WinControls.UI.RadToggleSwitch();
this.layoutSpacerItem2 = new DevComponents.DotNetBar.Layout.LayoutSpacerItem(); this.radButton_Abbrechen = new Telerik.WinControls.UI.RadButton();
this.layoutControlItem1 = new DevComponents.DotNetBar.Layout.LayoutControlItem(); this.radButton_Okay = new Telerik.WinControls.UI.RadButton();
this.layoutControlItem2 = new DevComponents.DotNetBar.Layout.LayoutControlItem(); this.panel1.SuspendLayout();
this.layoutSpacerItem1 = new DevComponents.DotNetBar.Layout.LayoutSpacerItem(); ((System.ComponentModel.ISupportInitialize)(this.radLabel1)).BeginInit();
this.layoutControlItem4 = new DevComponents.DotNetBar.Layout.LayoutControlItem(); ((System.ComponentModel.ISupportInitialize)(this.radLabel2)).BeginInit();
this.layoutControlItem5 = new DevComponents.DotNetBar.Layout.LayoutControlItem(); ((System.ComponentModel.ISupportInitialize)(this.radLabel3)).BeginInit();
this.layoutControl1.SuspendLayout(); ((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(); this.SuspendLayout();
// //
// layoutControl1 // panel1
// //
this.layoutControl1.BackColor = System.Drawing.Color.Transparent; this.panel1.BackColor = System.Drawing.Color.Transparent;
this.layoutControl1.Controls.Add(this.TextBoxX_AppName); this.panel1.Controls.Add(this.radLabel4);
this.layoutControl1.Controls.Add(this.TextBoxX_Msg); this.panel1.Controls.Add(this.radTextBoxControl_BotToken);
this.layoutControl1.Controls.Add(this.TextBoxX_BotToken); this.panel1.Controls.Add(this.radLabel3);
this.layoutControl1.Controls.Add(this.ButtonX_Cancel); this.panel1.Controls.Add(this.radTextBoxControl_DefaultProgramName);
this.layoutControl1.Controls.Add(this.ButtonX_Okay); this.panel1.Controls.Add(this.radLabel2);
this.layoutControl1.Controls.Add(this.switchButton_UseProxy); this.panel1.Controls.Add(this.radRichTextEditor_DefaultMessage);
this.layoutControl1.Dock = System.Windows.Forms.DockStyle.Fill; this.panel1.Controls.Add(this.radToggleSwitch_UseProxy);
this.layoutControl1.ForeColor = System.Drawing.Color.Black; this.panel1.Controls.Add(this.radButton_Abbrechen);
this.layoutControl1.Location = new System.Drawing.Point(0, 0); this.panel1.Controls.Add(this.radButton_Okay);
this.layoutControl1.Name = "layoutControl1"; 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[] { // radLabel2
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;
// //
// 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.radLabel4.Location = new System.Drawing.Point(3, 89);
this.TextBoxX_AppName.Border.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.radLabel4.Name = "radLabel4";
this.TextBoxX_AppName.DisabledBackColor = System.Drawing.Color.White; this.radLabel4.Size = new System.Drawing.Size(103, 18);
this.TextBoxX_AppName.ForeColor = System.Drawing.Color.Black; this.radLabel4.TabIndex = 3;
this.TextBoxX_AppName.Location = new System.Drawing.Point(142, 62); this.radLabel4.Text = "Standart-Nachricht:";
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);
// //
// 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"; // radRichTextEditor_DefaultMessage
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);
// //
// 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.radButton_Abbrechen.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
this.TextBoxX_BotToken.Border.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.radButton_Abbrechen.DialogResult = System.Windows.Forms.DialogResult.Cancel;
this.TextBoxX_BotToken.DisabledBackColor = System.Drawing.Color.White; this.radButton_Abbrechen.Image = global::Pilz.Updating.Administration.GUI.My.Resources.Resources.icons8_delete_sign_16px;
this.TextBoxX_BotToken.ForeColor = System.Drawing.Color.Black; this.radButton_Abbrechen.ImageAlignment = System.Drawing.ContentAlignment.MiddleRight;
this.TextBoxX_BotToken.Location = new System.Drawing.Point(142, 4); this.radButton_Abbrechen.Location = new System.Drawing.Point(527, 444);
this.TextBoxX_BotToken.Margin = new System.Windows.Forms.Padding(0); this.radButton_Abbrechen.Name = "radButton_Abbrechen";
this.TextBoxX_BotToken.Name = "TextBoxX_BotToken"; this.radButton_Abbrechen.Size = new System.Drawing.Size(100, 24);
this.TextBoxX_BotToken.PreventEnterBeep = true; this.radButton_Abbrechen.TabIndex = 0;
this.TextBoxX_BotToken.Size = new System.Drawing.Size(590, 20); this.radButton_Abbrechen.Text = "Abbrechen";
this.TextBoxX_BotToken.TabIndex = 0; this.radButton_Abbrechen.TextAlignment = System.Drawing.ContentAlignment.MiddleLeft;
this.TextBoxX_BotToken.TextChanged += new System.EventHandler(this.TextBoxX_BotToken_TextChanged); this.radButton_Abbrechen.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageBeforeText;
// //
// ButtonX_Cancel // radButton_Okay
// //
this.ButtonX_Cancel.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; this.radButton_Okay.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
this.ButtonX_Cancel.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; this.radButton_Okay.DialogResult = System.Windows.Forms.DialogResult.OK;
this.ButtonX_Cancel.DialogResult = System.Windows.Forms.DialogResult.Cancel; this.radButton_Okay.Image = global::Pilz.Updating.Administration.GUI.My.Resources.Resources.icons8_checkmark_16px;
this.ButtonX_Cancel.Image = global::Pilz.Updating.Administration.GUI.My.Resources.Resources.icons8_delete_sign_16px; this.radButton_Okay.ImageAlignment = System.Drawing.ContentAlignment.MiddleRight;
this.ButtonX_Cancel.Location = new System.Drawing.Point(574, 444); this.radButton_Okay.Location = new System.Drawing.Point(633, 444);
this.ButtonX_Cancel.Margin = new System.Windows.Forms.Padding(0); this.radButton_Okay.Name = "radButton_Okay";
this.ButtonX_Cancel.Name = "ButtonX_Cancel"; this.radButton_Okay.Size = new System.Drawing.Size(100, 24);
this.ButtonX_Cancel.Size = new System.Drawing.Size(75, 23); this.radButton_Okay.TabIndex = 5;
this.ButtonX_Cancel.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.radButton_Okay.Text = "Okay";
this.ButtonX_Cancel.TabIndex = 6; this.radButton_Okay.TextAlignment = System.Drawing.ContentAlignment.MiddleLeft;
this.ButtonX_Cancel.Text = "Abbrechen"; this.radButton_Okay.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageBeforeText;
//
// 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;
// //
// DiscordBotSettingsWindow // DiscordBotSettingsWindow
// //
this.CancelButton = this.ButtonX_Cancel; this.CancelButton = this.radButton_Abbrechen;
this.ClientSize = new System.Drawing.Size(736, 471); 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.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
this.Name = "DiscordBotSettingsWindow"; this.Name = "DiscordBotSettingsWindow";
//
//
//
this.RootElement.ApplyShapeToControl = true;
this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
this.Text = "Discord Bot-Einstellungen"; this.Text = "Discord Bot-Einstellungen";
this.TopLeftCornerSize = 0; this.panel1.ResumeLayout(false);
this.TopRightCornerSize = 0; this.panel1.PerformLayout();
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.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); this.ResumeLayout(false);
} }
#endregion #endregion
private DevComponents.DotNetBar.Layout.LayoutControl layoutControl1; private System.Windows.Forms.Panel panel1;
private DevComponents.DotNetBar.Controls.TextBoxX TextBoxX_AppName; private Telerik.WinControls.UI.RadLabel radLabel4;
private DevComponents.DotNetBar.Layout.LayoutControlItem layoutControlItem1; private Telerik.WinControls.UI.RadTextBoxControl radTextBoxControl_BotToken;
private DevComponents.DotNetBar.Controls.TextBoxX TextBoxX_Msg; private Telerik.WinControls.UI.RadLabel radLabel3;
private DevComponents.DotNetBar.Layout.LayoutControlItem layoutControlItem2; private Telerik.WinControls.UI.RadTextBoxControl radTextBoxControl_DefaultProgramName;
private DevComponents.DotNetBar.Controls.TextBoxX TextBoxX_BotToken; private Telerik.WinControls.UI.RadLabel radLabel2;
private DevComponents.DotNetBar.Layout.LayoutControlItem layoutControlItem3; private Telerik.WinControls.UI.RadRichTextEditor radRichTextEditor_DefaultMessage;
private DevComponents.DotNetBar.ButtonX ButtonX_Cancel; private Telerik.WinControls.UI.RadToggleSwitch radToggleSwitch_UseProxy;
private DevComponents.DotNetBar.ButtonX ButtonX_Okay; private Telerik.WinControls.UI.RadButton radButton_Abbrechen;
private DevComponents.DotNetBar.Layout.LayoutSpacerItem layoutSpacerItem1; private Telerik.WinControls.UI.RadButton radButton_Okay;
private DevComponents.DotNetBar.Layout.LayoutControlItem layoutControlItem4; private Telerik.WinControls.UI.RadLabel radLabel1;
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;
} }
} }

32
Pilz.Updating.Administration.GUI/DiscordBotSettingsWindow.cs
View File

@@ -7,10 +7,11 @@ using System.Text;
using System.Windows.Forms; using System.Windows.Forms;
using DevComponents.DotNetBar; using DevComponents.DotNetBar;
using Pilz.Updating.Administration.Discord; using Pilz.Updating.Administration.Discord;
using Telerik.WinControls.UI;
namespace Pilz.Updating.Administration.GUI namespace Pilz.Updating.Administration.GUI
{ {
public partial class DiscordBotSettingsWindow : DevComponents.DotNetBar.OfficeForm public partial class DiscordBotSettingsWindow : RadForm
{ {
private readonly DiscordBotConfig config = null; private readonly DiscordBotConfig config = null;
@@ -19,32 +20,19 @@ namespace Pilz.Updating.Administration.GUI
this.config = config; this.config = config;
InitializeComponent(); InitializeComponent();
UpdateAmbientColors();
TextBoxX_BotToken.Text = config.DiscordBotToken; radTextBoxControl_BotToken.Text = config.DiscordBotToken;
TextBoxX_AppName.Text = config.DefaultAppName; radTextBoxControl_DefaultProgramName.Text = config.DefaultAppName;
TextBoxX_Msg.Text = config.DefaultUpdateMessage; radRichTextEditor_DefaultMessage.Text = config.DefaultUpdateMessage;
switchButton_UseProxy.Value = config.UseProxy; radToggleSwitch_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)
{
} }
private void ButtonX_Okay_Click(object sender, EventArgs e) private void ButtonX_Okay_Click(object sender, EventArgs e)
{ {
config.DefaultUpdateMessage = TextBoxX_Msg.Text.Trim(); config.DefaultUpdateMessage = radTextBoxControl_BotToken.Text.Trim();
config.DefaultAppName = TextBoxX_AppName.Text.Trim(); config.DefaultAppName = radTextBoxControl_DefaultProgramName.Text.Trim();
config.DiscordBotToken = TextBoxX_BotToken.Text.Trim(); config.DiscordBotToken = radRichTextEditor_DefaultMessage.Text.Trim();
config.UseProxy = switchButton_UseProxy.Value; config.UseProxy = radToggleSwitch_UseProxy.Value;
} }
} }
} }

62
Pilz.Updating.Administration.GUI/DiscordBotSettingsWindow.resx
View File

@@ -1,64 +1,4 @@
<?xml version="1.0" encoding="utf-8"?> <root>
<root>
<!--
Microsoft ResX Schema
Version 2.0
The primary goals of this format is to allow a simple XML format
that is mostly human readable. The generation and parsing of the
various data types are done through the TypeConverter classes
associated with the data types.
Example:
... ado.net/XML headers & schema ...
<resheader name="resmimetype">text/microsoft-resx</resheader>
<resheader name="version">2.0</resheader>
<resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
<resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
<data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
<data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
<data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
<value>[base64 mime encoded serialized .NET Framework object]</value>
</data>
<data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
<comment>This is a comment</comment>
</data>
There are any number of "resheader" rows that contain simple
name/value pairs.
Each data row contains a name, and value. The row also contains a
type or mimetype. Type corresponds to a .NET class that support
text/value conversion through the TypeConverter architecture.
Classes that don't support this are serialized and stored with the
mimetype set.
The mimetype is used for serialized objects, and tells the
ResXResourceReader how to depersist the object. This is currently not
extensible. For a given mimetype the value must be set accordingly:
Note - application/x-microsoft.net.object.binary.base64 is the format
that the ResXResourceWriter will generate, however the reader can
read any of the formats listed below.
mimetype: application/x-microsoft.net.object.binary.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.soap.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Soap.SoapFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.bytearray.base64
value : The object must be serialized into a byte array
: using a System.ComponentModel.TypeConverter
: and then encoded with base64 encoding.
-->
<xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata"> <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
<xsd:import namespace="http://www.w3.org/XML/1998/namespace" /> <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
<xsd:element name="root" msdata:IsDataSet="true"> <xsd:element name="root" msdata:IsDataSet="true">

296
Pilz.Updating.Administration.GUI/DiscordPostDialog.Designer.cs generated
View File

@@ -29,223 +29,167 @@
private void InitializeComponent() private void InitializeComponent()
{ {
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(DiscordPostDialog)); System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(DiscordPostDialog));
this.advTree1 = new DevComponents.AdvTree.AdvTree(); this.radTreeView_Channels = new Telerik.WinControls.UI.RadTreeView();
this.nodeConnector1 = new DevComponents.AdvTree.NodeConnector();
this.elementStyle1 = new DevComponents.DotNetBar.ElementStyle();
this.ButtonX_SendMsg = new DevComponents.DotNetBar.ButtonX();
this.panel1 = new System.Windows.Forms.Panel(); this.panel1 = new System.Windows.Forms.Panel();
this.checkBoxX_AddChangelog = new DevComponents.DotNetBar.Controls.CheckBoxX(); this.radLabel1 = new Telerik.WinControls.UI.RadLabel();
this.checkBoxX_PingAtEveryone = new DevComponents.DotNetBar.Controls.CheckBoxX(); this.radLabel2 = new Telerik.WinControls.UI.RadLabel();
this.textBoxX_Msg = new DevComponents.DotNetBar.Controls.TextBoxX(); this.radTextBoxControl_ProgramName = new Telerik.WinControls.UI.RadTextBoxControl();
this.layoutControl1 = new DevComponents.DotNetBar.Layout.LayoutControl(); this.radRichTextEditor_Message = new Telerik.WinControls.UI.RadRichTextEditor();
this.textBoxX_AppName = new DevComponents.DotNetBar.Controls.TextBoxX(); this.radCheckBoxPingAtEveryone = new Telerik.WinControls.UI.RadCheckBox();
this.layoutControlItem2 = new DevComponents.DotNetBar.Layout.LayoutControlItem(); this.radCheckBox_AttachDescription = new Telerik.WinControls.UI.RadCheckBox();
this.layoutControlItem1 = new DevComponents.DotNetBar.Layout.LayoutControlItem(); this.radButton_Send = new Telerik.WinControls.UI.RadButton();
((System.ComponentModel.ISupportInitialize)(this.advTree1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.radTreeView_Channels)).BeginInit();
this.panel1.SuspendLayout(); 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(); this.SuspendLayout();
// //
// advTree1 // radTreeView_Channels
// //
this.advTree1.AccessibleRole = System.Windows.Forms.AccessibleRole.Outline; this.radTreeView_Channels.Dock = System.Windows.Forms.DockStyle.Left;
this.advTree1.BackColor = System.Drawing.SystemColors.Window; 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.advTree1.BackgroundStyle.Class = "TreeBorderKey"; this.radTreeView_Channels.Name = "radTreeView_Channels";
this.advTree1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.radTreeView_Channels.Size = new System.Drawing.Size(270, 461);
this.advTree1.Dock = System.Windows.Forms.DockStyle.Left; this.radTreeView_Channels.TabIndex = 0;
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);
// //
// panel1 // panel1
// //
this.panel1.BackColor = System.Drawing.Color.Transparent; this.panel1.BackColor = System.Drawing.Color.Transparent;
this.panel1.Controls.Add(this.checkBoxX_AddChangelog); this.panel1.Controls.Add(this.radLabel2);
this.panel1.Controls.Add(this.checkBoxX_PingAtEveryone); this.panel1.Controls.Add(this.radTextBoxControl_ProgramName);
this.panel1.Controls.Add(this.ButtonX_SendMsg); this.panel1.Controls.Add(this.radRichTextEditor_Message);
this.panel1.Dock = System.Windows.Forms.DockStyle.Bottom; this.panel1.Controls.Add(this.radCheckBoxPingAtEveryone);
this.panel1.Location = new System.Drawing.Point(237, 432); 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.Name = "panel1";
this.panel1.Size = new System.Drawing.Size(547, 29); this.panel1.Size = new System.Drawing.Size(514, 461);
this.panel1.TabIndex = 3; 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; // radTextBoxControl_ProgramName
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";
// //
// 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.radCheckBoxPingAtEveryone.CheckState = System.Windows.Forms.CheckState.Checked;
this.checkBoxX_PingAtEveryone.Checked = true; this.radCheckBoxPingAtEveryone.Location = new System.Drawing.Point(170, 437);
this.checkBoxX_PingAtEveryone.CheckState = System.Windows.Forms.CheckState.Checked; this.radCheckBoxPingAtEveryone.Name = "radCheckBoxPingAtEveryone";
this.checkBoxX_PingAtEveryone.CheckValue = "Y"; this.radCheckBoxPingAtEveryone.Size = new System.Drawing.Size(105, 18);
this.checkBoxX_PingAtEveryone.Location = new System.Drawing.Point(211, 3); this.radCheckBoxPingAtEveryone.TabIndex = 0;
this.checkBoxX_PingAtEveryone.Name = "checkBoxX_PingAtEveryone"; this.radCheckBoxPingAtEveryone.Text = "Ping @everyone";
this.checkBoxX_PingAtEveryone.Size = new System.Drawing.Size(105, 23); this.radCheckBoxPingAtEveryone.ToggleState = Telerik.WinControls.Enumerations.ToggleState.On;
this.checkBoxX_PingAtEveryone.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
this.checkBoxX_PingAtEveryone.TabIndex = 3;
this.checkBoxX_PingAtEveryone.Text = "Ping @everyone";
// //
// 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.radButton_Send.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
this.textBoxX_Msg.Border.Class = "TextBoxBorder"; this.radButton_Send.Image = global::Pilz.Updating.Administration.GUI.My.Resources.Resources.icons8_email_send_16px;
this.textBoxX_Msg.Border.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.radButton_Send.ImageAlignment = System.Drawing.ContentAlignment.MiddleRight;
this.textBoxX_Msg.DisabledBackColor = System.Drawing.Color.White; this.radButton_Send.Location = new System.Drawing.Point(431, 434);
this.textBoxX_Msg.ForeColor = System.Drawing.Color.Black; this.radButton_Send.Name = "radButton_Send";
this.textBoxX_Msg.Location = new System.Drawing.Point(96, 32); this.radButton_Send.Size = new System.Drawing.Size(80, 24);
this.textBoxX_Msg.Margin = new System.Windows.Forms.Padding(0); this.radButton_Send.TabIndex = 0;
this.textBoxX_Msg.Multiline = true; this.radButton_Send.Text = "Senden";
this.textBoxX_Msg.Name = "textBoxX_Msg"; this.radButton_Send.TextAlignment = System.Drawing.ContentAlignment.MiddleLeft;
this.textBoxX_Msg.PreventEnterBeep = true; this.radButton_Send.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageBeforeText;
this.textBoxX_Msg.ScrollBars = System.Windows.Forms.ScrollBars.Both; this.radButton_Send.Click += new System.EventHandler(this.ButtonX_SendMsg_Click);
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;
// //
// DiscordPostDialog // 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.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.ClientSize = new System.Drawing.Size(784, 461); this.ClientSize = new System.Drawing.Size(784, 461);
this.Controls.Add(this.layoutControl1);
this.Controls.Add(this.panel1); 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.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
this.Name = "DiscordPostDialog"; this.Name = "DiscordPostDialog";
//
//
//
this.RootElement.ApplyShapeToControl = true;
this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
this.Text = "Aktuallisierungspost auf Discord"; this.Text = "Aktuallisierungspost auf Discord";
this.TopLeftCornerSize = 0; ((System.ComponentModel.ISupportInitialize)(this.radTreeView_Channels)).EndInit();
this.TopRightCornerSize = 0;
((System.ComponentModel.ISupportInitialize)(this.advTree1)).EndInit();
this.panel1.ResumeLayout(false); 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); this.ResumeLayout(false);
} }
#endregion #endregion
private DevComponents.AdvTree.AdvTree advTree1; private Telerik.WinControls.UI.RadTreeView radTreeView_Channels;
private DevComponents.AdvTree.NodeConnector nodeConnector1;
private DevComponents.DotNetBar.ElementStyle elementStyle1;
private DevComponents.DotNetBar.ButtonX ButtonX_SendMsg;
private System.Windows.Forms.Panel panel1; private System.Windows.Forms.Panel panel1;
private DevComponents.DotNetBar.Controls.CheckBoxX checkBoxX_PingAtEveryone; private Telerik.WinControls.UI.RadCheckBox radCheckBoxPingAtEveryone;
private DevComponents.DotNetBar.Controls.TextBoxX textBoxX_Msg; private Telerik.WinControls.UI.RadCheckBox radCheckBox_AttachDescription;
private DevComponents.DotNetBar.Layout.LayoutControl layoutControl1; private Telerik.WinControls.UI.RadButton radButton_Send;
private DevComponents.DotNetBar.Controls.TextBoxX textBoxX_AppName; private Telerik.WinControls.UI.RadLabel radLabel1;
private DevComponents.DotNetBar.Layout.LayoutControlItem layoutControlItem2; private Telerik.WinControls.UI.RadLabel radLabel2;
private DevComponents.DotNetBar.Layout.LayoutControlItem layoutControlItem1; private Telerik.WinControls.UI.RadTextBoxControl radTextBoxControl_ProgramName;
private DevComponents.DotNetBar.Controls.CheckBoxX checkBoxX_AddChangelog; private Telerik.WinControls.UI.RadRichTextEditor radRichTextEditor_Message;
} }
} }

26
Pilz.Updating.Administration.GUI/DiscordPostDialog.cs
View File

@@ -10,10 +10,11 @@ using System.Linq;
using System.Text; using System.Text;
using System.Threading.Tasks; using System.Threading.Tasks;
using System.Windows.Forms; using System.Windows.Forms;
using Telerik.WinControls.UI;
namespace Pilz.Updating.Administration.GUI namespace Pilz.Updating.Administration.GUI
{ {
public partial class DiscordPostDialog : OfficeForm public partial class DiscordPostDialog : RadForm
{ {
// F i e l d s // F i e l d s
@@ -28,22 +29,21 @@ namespace Pilz.Updating.Administration.GUI
this.package = package; this.package = package;
InitializeComponent(); InitializeComponent();
UpdateAmbientColors();
textBoxX_AppName.Text = General.CurProject.DiscordBotConfig.DefaultAppName; radTextBoxControl_ProgramName.Text = General.CurProject.DiscordBotConfig.DefaultAppName;
textBoxX_Msg.Text = General.CurProject.DiscordBotConfig.DefaultUpdateMessage; radRichTextEditor_Message.Text = General.CurProject.DiscordBotConfig.DefaultUpdateMessage;
LoadBgrTree(); LoadBgrTree();
} }
private void LoadBgrTree() private void LoadBgrTree()
{ {
advTree1.BeginUpdate(); radTreeView_Channels.BeginUpdate();
advTree1.Nodes.Clear(); radTreeView_Channels.Nodes.Clear();
foreach (var guild in bot.GetGuilds()) foreach (var guild in bot.GetGuilds())
{ {
var nGuild = new Node() var nGuild = new RadTreeNode()
{ {
Name = "g" + guild.Key, Name = "g" + guild.Key,
Text = guild.Value, Text = guild.Value,
@@ -53,7 +53,7 @@ namespace Pilz.Updating.Administration.GUI
foreach (var channel in bot.GetTextChannels(guild.Key).OrderBy((n) => n.Value)) foreach (var channel in bot.GetTextChannels(guild.Key).OrderBy((n) => n.Value))
{ {
var nChannel = new Node() var nChannel = new RadTreeNode()
{ {
Name = "c" + channel.Key, Name = "c" + channel.Key,
Text = "#" + channel.Value, Text = "#" + channel.Value,
@@ -63,22 +63,22 @@ namespace Pilz.Updating.Administration.GUI
nGuild.Nodes.Add(nChannel); 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) private async void ButtonX_SendMsg_Click(object sender, EventArgs e)
{ {
try try
{ {
var selNode = advTree1.SelectedNode; var selNode = radTreeView_Channels.SelectedNode;
ulong gID = (ulong)selNode.Parent.Tag; ulong gID = (ulong)selNode.Parent.Tag;
ulong cID = (ulong)selNode.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); MessageBoxEx.Show(this, "Nachricht erfolgreich gesendet.", string.Empty, MessageBoxButtons.OK, MessageBoxIcon.Information);
DialogResult = DialogResult.OK; DialogResult = DialogResult.OK;

62
Pilz.Updating.Administration.GUI/DiscordPostDialog.resx
View File

@@ -1,64 +1,4 @@
<?xml version="1.0" encoding="utf-8"?> <root>
<root>
<!--
Microsoft ResX Schema
Version 2.0
The primary goals of this format is to allow a simple XML format
that is mostly human readable. The generation and parsing of the
various data types are done through the TypeConverter classes
associated with the data types.
Example:
... ado.net/XML headers & schema ...
<resheader name="resmimetype">text/microsoft-resx</resheader>
<resheader name="version">2.0</resheader>
<resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
<resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
<data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
<data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
<data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
<value>[base64 mime encoded serialized .NET Framework object]</value>
</data>
<data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
<comment>This is a comment</comment>
</data>
There are any number of "resheader" rows that contain simple
name/value pairs.
Each data row contains a name, and value. The row also contains a
type or mimetype. Type corresponds to a .NET class that support
text/value conversion through the TypeConverter architecture.
Classes that don't support this are serialized and stored with the
mimetype set.
The mimetype is used for serialized objects, and tells the
ResXResourceReader how to depersist the object. This is currently not
extensible. For a given mimetype the value must be set accordingly:
Note - application/x-microsoft.net.object.binary.base64 is the format
that the ResXResourceWriter will generate, however the reader can
read any of the formats listed below.
mimetype: application/x-microsoft.net.object.binary.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.soap.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Soap.SoapFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.bytearray.base64
value : The object must be serialized into a byte array
: using a System.ComponentModel.TypeConverter
: and then encoded with base64 encoding.
-->
<xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata"> <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
<xsd:import namespace="http://www.w3.org/XML/1998/namespace" /> <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
<xsd:element name="root" msdata:IsDataSet="true"> <xsd:element name="root" msdata:IsDataSet="true">

46
Pilz.Updating.Administration.GUI/My Project/MyNamespace.Dynamic.Designer.cs generated
View File

@@ -31,29 +31,6 @@ namespace Pilz.Updating.Administration.GUI.My
} }
} }
[EditorBrowsable(EditorBrowsableState.Never)]
public PackageCreationDialog m_PackageCreationDialog;
public PackageCreationDialog PackageCreationDialog
{
[DebuggerHidden]
get
{
m_PackageCreationDialog = MyForms.Create__Instance__(m_PackageCreationDialog);
return m_PackageCreationDialog;
}
[DebuggerHidden]
set
{
if (value == m_PackageCreationDialog)
return;
if (value is object)
throw new ArgumentException("Property can only be set to Nothing");
Dispose__Instance__(ref m_PackageCreationDialog);
}
}
[EditorBrowsable(EditorBrowsableState.Never)] [EditorBrowsable(EditorBrowsableState.Never)]
public UpdateManagerWindow m_UpdateManagerWindow; public UpdateManagerWindow m_UpdateManagerWindow;
@@ -77,29 +54,6 @@ namespace Pilz.Updating.Administration.GUI.My
} }
} }
[EditorBrowsable(EditorBrowsableState.Never)]
public ToolSelectionWindow m_ToolSelectionWindow;
public ToolSelectionWindow ToolSelectionWindow
{
[DebuggerHidden]
get
{
m_ToolSelectionWindow = MyForms.Create__Instance__(m_ToolSelectionWindow);
return m_ToolSelectionWindow;
}
[DebuggerHidden]
set
{
if (value == m_ToolSelectionWindow)
return;
if (value is object)
throw new ArgumentException("Property can only be set to Nothing");
Dispose__Instance__(ref m_ToolSelectionWindow);
}
}
[EditorBrowsable(EditorBrowsableState.Never)] [EditorBrowsable(EditorBrowsableState.Never)]
public UpdateServerInfoEditor m_UpdateServerInfoEditor; public UpdateServerInfoEditor m_UpdateServerInfoEditor;

29
Pilz.Updating.Administration.GUI/MyApplicationExtension.cs Normal file
View File

@@ -0,0 +1,29 @@
using Microsoft.VisualBasic.ApplicationServices;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Reflection;
using System.Text;
using System.Threading.Tasks;
using Telerik.WinControls;
using Telerik.WinControls.Themes;
namespace Pilz.Updating.Administration.GUI.My
{
// HINWEIS: Diese Datei wird automatisch generiert und darf nicht direkt bearbeitet werden. Wenn Sie Änderungen vornehmen möchten
// oder in dieser Datei Buildfehler auftreten, wechseln Sie zum Projekt-Designer.
// (Wechseln Sie dazu zu den Projekteigenschaften, oder doppelklicken Sie auf den Knoten "Mein Projekt" im
// Projektmappen-Explorer). Nehmen Sie auf der Registerkarte "Anwendung" entsprechende Änderungen vor.
//
internal partial class MyApplication
{
protected override bool OnStartup(StartupEventArgs eventArgs)
{
var success = ThemeResolutionService.LoadPackageResource("Pilz.Updating.Administration.GUI.CustomThemes.Office2019DarkPurple.tssp");
if (success)
ThemeResolutionService.ApplicationThemeName = "Office2019DarkPurple";
return base.OnStartup(eventArgs);
}
}
}

720
Pilz.Updating.Administration.GUI/PackageCreationDialog.Designer.cs generated
View File

@@ -1,720 +0,0 @@
using System;
using System.Diagnostics;
using System.Drawing;
using System.Runtime.CompilerServices;
using System.Windows.Forms;
using Microsoft.VisualBasic.CompilerServices;
namespace Pilz.Updating.Administration.GUI
{
[DesignerGenerated()]
public partial class PackageCreationDialog : DevComponents.DotNetBar.RibbonForm
{
// Das Formular überschreibt den Löschvorgang, um die Komponentenliste zu bereinigen.
[DebuggerNonUserCode()]
protected override void Dispose(bool disposing)
{
try
{
if (disposing && components is object)
{
components.Dispose();
}
}
finally
{
base.Dispose(disposing);
}
}
// Wird vom Windows Form-Designer benötigt.
private System.ComponentModel.IContainer components = new System.ComponentModel.Container();
// Hinweis: Die folgende Prozedur ist für den Windows Form-Designer erforderlich.
// Das Bearbeiten ist mit dem Windows Form-Designer möglich.
// Das Bearbeiten mit dem Code-Editor ist nicht möglich.
[DebuggerStepThrough()]
private void InitializeComponent()
{
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(PackageCreationDialog));
this.SuperTabControl1 = new DevComponents.DotNetBar.SuperTabControl();
this.SuperTabControlPanel2 = new DevComponents.DotNetBar.SuperTabControlPanel();
this.AdvTree1 = new DevComponents.AdvTree.AdvTree();
this.circularProgress1 = new DevComponents.DotNetBar.Controls.CircularProgress();
this.NodeConnector1 = new DevComponents.AdvTree.NodeConnector();
this.ElementStyle1 = new DevComponents.DotNetBar.ElementStyle();
this.SuperTabItem_Pkg_Files = new DevComponents.DotNetBar.SuperTabItem();
this.SuperTabControlPanel4 = new DevComponents.DotNetBar.SuperTabControlPanel();
this.Panel4 = new System.Windows.Forms.Panel();
this.SuperTabItem_Pkg_Extensions = new DevComponents.DotNetBar.SuperTabItem();
this.RibbonControl_Main = new DevComponents.DotNetBar.RibbonControl();
this.RibbonPanel1 = new DevComponents.DotNetBar.RibbonPanel();
this.RibbonBar_Pkg_Erweiterungen = new DevComponents.DotNetBar.RibbonBar();
this.ButtonItem_Pkg_AddExtension = new DevComponents.DotNetBar.ButtonItem();
this.ButtonItem_Pkg_RemoveExtension = new DevComponents.DotNetBar.ButtonItem();
this.RibbonBar_Pkg_Dateien = new DevComponents.DotNetBar.RibbonBar();
this.ButtonItem_Pkg_SelectFileFolder = new DevComponents.DotNetBar.ButtonItem();
this.ButtonItem_Pkg_RemoveFileFolder = new DevComponents.DotNetBar.ButtonItem();
this.RibbonBar1 = new DevComponents.DotNetBar.RibbonBar();
this.ButtonItem_Pkg_Export = new DevComponents.DotNetBar.ButtonItem();
this.ButtonItem_UploadPackage = new DevComponents.DotNetBar.ButtonItem();
this.RibbonBar3 = new DevComponents.DotNetBar.RibbonBar();
this.ButtonItem_Pkg_NewTemplate = new DevComponents.DotNetBar.ButtonItem();
this.ButtonItem_Pkg_OpenTemplate = new DevComponents.DotNetBar.ButtonItem();
this.ButtonItem_Pkg_SaveTemplate = new DevComponents.DotNetBar.ButtonItem();
this.ButtonItem_Pkg_SaveTemplateAs = new DevComponents.DotNetBar.ButtonItem();
this.RibbonTabItem_Packaging = new DevComponents.DotNetBar.RibbonTabItem();
this.advTree_Extensions = new DevComponents.AdvTree.AdvTree();
this.nodeConnector2 = new DevComponents.AdvTree.NodeConnector();
this.elementStyle2 = new DevComponents.DotNetBar.ElementStyle();
this.columnHeader3 = new DevComponents.AdvTree.ColumnHeader();
this.columnHeader4 = new DevComponents.AdvTree.ColumnHeader();
((System.ComponentModel.ISupportInitialize)(this.SuperTabControl1)).BeginInit();
this.SuperTabControl1.SuspendLayout();
this.SuperTabControlPanel2.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.AdvTree1)).BeginInit();
this.AdvTree1.SuspendLayout();
this.SuperTabControlPanel4.SuspendLayout();
this.Panel4.SuspendLayout();
this.RibbonControl_Main.SuspendLayout();
this.RibbonPanel1.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.advTree_Extensions)).BeginInit();
this.SuspendLayout();
//
// SuperTabControl1
//
this.SuperTabControl1.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.SuperTabControl1.BackColor = System.Drawing.Color.Transparent;
//
//
//
//
//
//
this.SuperTabControl1.ControlBox.CloseBox.Name = "";
//
//
//
this.SuperTabControl1.ControlBox.MenuBox.Name = "";
this.SuperTabControl1.ControlBox.Name = "";
this.SuperTabControl1.ControlBox.SubItems.AddRange(new DevComponents.DotNetBar.BaseItem[] {
this.SuperTabControl1.ControlBox.MenuBox,
this.SuperTabControl1.ControlBox.CloseBox});
this.SuperTabControl1.Controls.Add(this.SuperTabControlPanel4);
this.SuperTabControl1.Controls.Add(this.SuperTabControlPanel2);
this.SuperTabControl1.ForeColor = System.Drawing.Color.Black;
this.SuperTabControl1.Location = new System.Drawing.Point(1, 155);
this.SuperTabControl1.Name = "SuperTabControl1";
this.SuperTabControl1.ReorderTabsEnabled = true;
this.SuperTabControl1.SelectedTabFont = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold);
this.SuperTabControl1.SelectedTabIndex = 0;
this.SuperTabControl1.Size = new System.Drawing.Size(648, 394);
this.SuperTabControl1.TabAlignment = DevComponents.DotNetBar.eTabStripAlignment.Left;
this.SuperTabControl1.TabFont = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.SuperTabControl1.TabIndex = 1;
this.SuperTabControl1.TabLayoutType = DevComponents.DotNetBar.eSuperTabLayoutType.SingleLineFit;
this.SuperTabControl1.Tabs.AddRange(new DevComponents.DotNetBar.BaseItem[] {
this.SuperTabItem_Pkg_Files,
this.SuperTabItem_Pkg_Extensions});
this.SuperTabControl1.TabStyle = DevComponents.DotNetBar.eSuperTabStyle.Office2010BackstageBlue;
this.SuperTabControl1.Text = "SuperTabControl1";
this.SuperTabControl1.SelectedTabChanged += new System.EventHandler<DevComponents.DotNetBar.SuperTabStripSelectedTabChangedEventArgs>(this.SuperTabControl1_SelectedTabChanged);
//
// SuperTabControlPanel2
//
this.SuperTabControlPanel2.Controls.Add(this.AdvTree1);
this.SuperTabControlPanel2.Dock = System.Windows.Forms.DockStyle.Fill;
this.SuperTabControlPanel2.Location = new System.Drawing.Point(96, 0);
this.SuperTabControlPanel2.Name = "SuperTabControlPanel2";
this.SuperTabControlPanel2.Size = new System.Drawing.Size(552, 394);
this.SuperTabControlPanel2.TabIndex = 0;
this.SuperTabControlPanel2.TabItem = this.SuperTabItem_Pkg_Files;
//
// AdvTree1
//
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.Controls.Add(this.circularProgress1);
this.AdvTree1.Dock = System.Windows.Forms.DockStyle.Fill;
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(552, 394);
this.AdvTree1.Styles.Add(this.ElementStyle1);
this.AdvTree1.TabIndex = 0;
this.AdvTree1.Text = "AdvTree1";
//
// circularProgress1
//
this.circularProgress1.Anchor = System.Windows.Forms.AnchorStyles.None;
this.circularProgress1.BackColor = System.Drawing.Color.Transparent;
//
//
//
this.circularProgress1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
this.circularProgress1.Location = new System.Drawing.Point(239, 160);
this.circularProgress1.Name = "circularProgress1";
this.circularProgress1.ProgressBarType = DevComponents.DotNetBar.eCircularProgressType.Dot;
this.circularProgress1.SetVisibleStateOnStart = true;
this.circularProgress1.SetVisibleStateOnStop = true;
this.circularProgress1.Size = new System.Drawing.Size(75, 75);
this.circularProgress1.Style = DevComponents.DotNetBar.eDotNetBarStyle.OfficeXP;
this.circularProgress1.TabIndex = 6;
this.circularProgress1.Visible = false;
//
// 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;
//
// SuperTabItem_Pkg_Files
//
this.SuperTabItem_Pkg_Files.AttachedControl = this.SuperTabControlPanel2;
this.SuperTabItem_Pkg_Files.GlobalItem = false;
this.SuperTabItem_Pkg_Files.Name = "SuperTabItem_Pkg_Files";
this.SuperTabItem_Pkg_Files.Text = "Dateien";
//
// SuperTabControlPanel4
//
this.SuperTabControlPanel4.Controls.Add(this.Panel4);
this.SuperTabControlPanel4.Dock = System.Windows.Forms.DockStyle.Fill;
this.SuperTabControlPanel4.Location = new System.Drawing.Point(96, 0);
this.SuperTabControlPanel4.Name = "SuperTabControlPanel4";
this.SuperTabControlPanel4.Size = new System.Drawing.Size(552, 394);
this.SuperTabControlPanel4.TabIndex = 0;
this.SuperTabControlPanel4.TabItem = this.SuperTabItem_Pkg_Extensions;
//
// Panel4
//
this.Panel4.BackColor = System.Drawing.Color.Transparent;
this.Panel4.Controls.Add(this.advTree_Extensions);
this.Panel4.Dock = System.Windows.Forms.DockStyle.Fill;
this.Panel4.Location = new System.Drawing.Point(0, 0);
this.Panel4.Name = "Panel4";
this.Panel4.Size = new System.Drawing.Size(552, 394);
this.Panel4.TabIndex = 1;
//
// SuperTabItem_Pkg_Extensions
//
this.SuperTabItem_Pkg_Extensions.AttachedControl = this.SuperTabControlPanel4;
this.SuperTabItem_Pkg_Extensions.GlobalItem = false;
this.SuperTabItem_Pkg_Extensions.Name = "SuperTabItem_Pkg_Extensions";
this.SuperTabItem_Pkg_Extensions.Text = "Erweiterungen";
//
// RibbonControl_Main
//
this.RibbonControl_Main.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(255)))));
//
//
//
this.RibbonControl_Main.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
this.RibbonControl_Main.CanCustomize = false;
this.RibbonControl_Main.CaptionVisible = true;
this.RibbonControl_Main.Controls.Add(this.RibbonPanel1);
this.RibbonControl_Main.Dock = System.Windows.Forms.DockStyle.Top;
this.RibbonControl_Main.ForeColor = System.Drawing.Color.Black;
this.RibbonControl_Main.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] {
this.RibbonTabItem_Packaging});
this.RibbonControl_Main.KeyTipsFont = new System.Drawing.Font("Tahoma", 7F);
this.RibbonControl_Main.Location = new System.Drawing.Point(5, 1);
this.RibbonControl_Main.Name = "RibbonControl_Main";
this.RibbonControl_Main.Padding = new System.Windows.Forms.Padding(0, 0, 0, 3);
this.RibbonControl_Main.Size = new System.Drawing.Size(640, 154);
this.RibbonControl_Main.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
this.RibbonControl_Main.SystemText.MaximizeRibbonText = "&Maximize the Ribbon";
this.RibbonControl_Main.SystemText.MinimizeRibbonText = "Mi&nimize the Ribbon";
this.RibbonControl_Main.SystemText.QatAddItemText = "&Add to Quick Access Toolbar";
this.RibbonControl_Main.SystemText.QatCustomizeMenuLabel = "<b>Customize Quick Access Toolbar</b>";
this.RibbonControl_Main.SystemText.QatCustomizeText = "&Customize Quick Access Toolbar...";
this.RibbonControl_Main.SystemText.QatDialogAddButton = "&Add >>";
this.RibbonControl_Main.SystemText.QatDialogCancelButton = "Cancel";
this.RibbonControl_Main.SystemText.QatDialogCaption = "Customize Quick Access Toolbar";
this.RibbonControl_Main.SystemText.QatDialogCategoriesLabel = "&Choose commands from:";
this.RibbonControl_Main.SystemText.QatDialogOkButton = "OK";
this.RibbonControl_Main.SystemText.QatDialogPlacementCheckbox = "&Place Quick Access Toolbar below the Ribbon";
this.RibbonControl_Main.SystemText.QatDialogRemoveButton = "&Remove";
this.RibbonControl_Main.SystemText.QatPlaceAboveRibbonText = "&Place Quick Access Toolbar above the Ribbon";
this.RibbonControl_Main.SystemText.QatPlaceBelowRibbonText = "&Place Quick Access Toolbar below the Ribbon";
this.RibbonControl_Main.SystemText.QatRemoveItemText = "&Remove from Quick Access Toolbar";
this.RibbonControl_Main.TabGroupHeight = 14;
this.RibbonControl_Main.TabIndex = 2;
//
// RibbonPanel1
//
this.RibbonPanel1.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
this.RibbonPanel1.Controls.Add(this.RibbonBar_Pkg_Erweiterungen);
this.RibbonPanel1.Controls.Add(this.RibbonBar_Pkg_Dateien);
this.RibbonPanel1.Controls.Add(this.RibbonBar1);
this.RibbonPanel1.Controls.Add(this.RibbonBar3);
this.RibbonPanel1.Dock = System.Windows.Forms.DockStyle.Fill;
this.RibbonPanel1.Location = new System.Drawing.Point(0, 56);
this.RibbonPanel1.Name = "RibbonPanel1";
this.RibbonPanel1.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3);
this.RibbonPanel1.Size = new System.Drawing.Size(640, 95);
//
//
//
this.RibbonPanel1.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square;
//
//
//
this.RibbonPanel1.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square;
//
//
//
this.RibbonPanel1.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square;
this.RibbonPanel1.TabIndex = 1;
//
// RibbonBar_Pkg_Erweiterungen
//
this.RibbonBar_Pkg_Erweiterungen.AutoOverflowEnabled = true;
//
//
//
this.RibbonBar_Pkg_Erweiterungen.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
//
//
//
this.RibbonBar_Pkg_Erweiterungen.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
this.RibbonBar_Pkg_Erweiterungen.ContainerControlProcessDialogKey = true;
this.RibbonBar_Pkg_Erweiterungen.Dock = System.Windows.Forms.DockStyle.Left;
this.RibbonBar_Pkg_Erweiterungen.DragDropSupport = true;
this.RibbonBar_Pkg_Erweiterungen.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] {
this.ButtonItem_Pkg_AddExtension,
this.ButtonItem_Pkg_RemoveExtension});
this.RibbonBar_Pkg_Erweiterungen.LicenseKey = "F962CEC7-CD8F-4911-A9E9-CAB39962FC1F";
this.RibbonBar_Pkg_Erweiterungen.Location = new System.Drawing.Point(510, 0);
this.RibbonBar_Pkg_Erweiterungen.Name = "RibbonBar_Pkg_Erweiterungen";
this.RibbonBar_Pkg_Erweiterungen.Size = new System.Drawing.Size(144, 92);
this.RibbonBar_Pkg_Erweiterungen.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
this.RibbonBar_Pkg_Erweiterungen.TabIndex = 3;
this.RibbonBar_Pkg_Erweiterungen.Text = "Erweiterungen";
//
//
//
this.RibbonBar_Pkg_Erweiterungen.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
//
//
//
this.RibbonBar_Pkg_Erweiterungen.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square;
//
// ButtonItem_Pkg_AddExtension
//
this.ButtonItem_Pkg_AddExtension.ButtonStyle = DevComponents.DotNetBar.eButtonStyle.ImageAndText;
this.ButtonItem_Pkg_AddExtension.Image = global::Pilz.Updating.Administration.GUI.My.Resources.Resources.icons8_merge_files_32px;
this.ButtonItem_Pkg_AddExtension.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top;
this.ButtonItem_Pkg_AddExtension.Name = "ButtonItem_Pkg_AddExtension";
this.ButtonItem_Pkg_AddExtension.SubItemsExpandWidth = 14;
this.ButtonItem_Pkg_AddExtension.Text = "Erweiterung hinzufügen";
this.ButtonItem_Pkg_AddExtension.Click += new System.EventHandler(this.ButtonItem_Pkg_AddExtension_Click);
//
// ButtonItem_Pkg_RemoveExtension
//
this.ButtonItem_Pkg_RemoveExtension.ButtonStyle = DevComponents.DotNetBar.eButtonStyle.ImageAndText;
this.ButtonItem_Pkg_RemoveExtension.Image = global::Pilz.Updating.Administration.GUI.My.Resources.Resources.icons8_delete_sign_32px_1;
this.ButtonItem_Pkg_RemoveExtension.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top;
this.ButtonItem_Pkg_RemoveExtension.Name = "ButtonItem_Pkg_RemoveExtension";
this.ButtonItem_Pkg_RemoveExtension.SubItemsExpandWidth = 14;
this.ButtonItem_Pkg_RemoveExtension.Text = "Erweiterung entfernen";
this.ButtonItem_Pkg_RemoveExtension.Click += new System.EventHandler(this.ButtonItem_Pkg_RemoveExtension_Click);
//
// RibbonBar_Pkg_Dateien
//
this.RibbonBar_Pkg_Dateien.AutoOverflowEnabled = true;
//
//
//
this.RibbonBar_Pkg_Dateien.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
//
//
//
this.RibbonBar_Pkg_Dateien.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
this.RibbonBar_Pkg_Dateien.ContainerControlProcessDialogKey = true;
this.RibbonBar_Pkg_Dateien.Dock = System.Windows.Forms.DockStyle.Left;
this.RibbonBar_Pkg_Dateien.DragDropSupport = true;
this.RibbonBar_Pkg_Dateien.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] {
this.ButtonItem_Pkg_SelectFileFolder,
this.ButtonItem_Pkg_RemoveFileFolder});
this.RibbonBar_Pkg_Dateien.LicenseKey = "F962CEC7-CD8F-4911-A9E9-CAB39962FC1F";
this.RibbonBar_Pkg_Dateien.Location = new System.Drawing.Point(381, 0);
this.RibbonBar_Pkg_Dateien.Name = "RibbonBar_Pkg_Dateien";
this.RibbonBar_Pkg_Dateien.Size = new System.Drawing.Size(129, 92);
this.RibbonBar_Pkg_Dateien.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
this.RibbonBar_Pkg_Dateien.TabIndex = 2;
this.RibbonBar_Pkg_Dateien.Text = "Dateien";
//
//
//
this.RibbonBar_Pkg_Dateien.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
//
//
//
this.RibbonBar_Pkg_Dateien.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square;
//
// ButtonItem_Pkg_SelectFileFolder
//
this.ButtonItem_Pkg_SelectFileFolder.ButtonStyle = DevComponents.DotNetBar.eButtonStyle.ImageAndText;
this.ButtonItem_Pkg_SelectFileFolder.Image = global::Pilz.Updating.Administration.GUI.My.Resources.Resources.icons8_opened_folder_32px;
this.ButtonItem_Pkg_SelectFileFolder.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top;
this.ButtonItem_Pkg_SelectFileFolder.Name = "ButtonItem_Pkg_SelectFileFolder";
this.ButtonItem_Pkg_SelectFileFolder.SubItemsExpandWidth = 14;
this.ButtonItem_Pkg_SelectFileFolder.Text = "Ordner auswählen";
this.ButtonItem_Pkg_SelectFileFolder.Click += new System.EventHandler(this.ButtonItem_Pkg_SelectFileFolder_Click);
//
// ButtonItem_Pkg_RemoveFileFolder
//
this.ButtonItem_Pkg_RemoveFileFolder.ButtonStyle = DevComponents.DotNetBar.eButtonStyle.ImageAndText;
this.ButtonItem_Pkg_RemoveFileFolder.Image = global::Pilz.Updating.Administration.GUI.My.Resources.Resources.icons8_delete_sign_32px_1;
this.ButtonItem_Pkg_RemoveFileFolder.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top;
this.ButtonItem_Pkg_RemoveFileFolder.Name = "ButtonItem_Pkg_RemoveFileFolder";
this.ButtonItem_Pkg_RemoveFileFolder.SubItemsExpandWidth = 14;
this.ButtonItem_Pkg_RemoveFileFolder.Text = "Ordner entfernen";
this.ButtonItem_Pkg_RemoveFileFolder.Click += new System.EventHandler(this.ButtonItem_Pkg_RemoveFileFolder_Click);
//
// RibbonBar1
//
this.RibbonBar1.AutoOverflowEnabled = true;
//
//
//
this.RibbonBar1.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
//
//
//
this.RibbonBar1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
this.RibbonBar1.ContainerControlProcessDialogKey = true;
this.RibbonBar1.Dock = System.Windows.Forms.DockStyle.Left;
this.RibbonBar1.DragDropSupport = true;
this.RibbonBar1.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] {
this.ButtonItem_Pkg_Export,
this.ButtonItem_UploadPackage});
this.RibbonBar1.LicenseKey = "F962CEC7-CD8F-4911-A9E9-CAB39962FC1F";
this.RibbonBar1.Location = new System.Drawing.Point(233, 0);
this.RibbonBar1.Name = "RibbonBar1";
this.RibbonBar1.Size = new System.Drawing.Size(148, 92);
this.RibbonBar1.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
this.RibbonBar1.TabIndex = 0;
this.RibbonBar1.Text = "Paket";
//
//
//
this.RibbonBar1.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
//
//
//
this.RibbonBar1.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square;
//
// ButtonItem_Pkg_Export
//
this.ButtonItem_Pkg_Export.ButtonStyle = DevComponents.DotNetBar.eButtonStyle.ImageAndText;
this.ButtonItem_Pkg_Export.Image = global::Pilz.Updating.Administration.GUI.My.Resources.Resources.icons8_export_32px_3;
this.ButtonItem_Pkg_Export.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top;
this.ButtonItem_Pkg_Export.Name = "ButtonItem_Pkg_Export";
this.ButtonItem_Pkg_Export.SubItemsExpandWidth = 14;
this.ButtonItem_Pkg_Export.Text = "Paket exportieren";
this.ButtonItem_Pkg_Export.Click += new System.EventHandler(this.ButtonItem_Pkg_Export_Click);
//
// ButtonItem_UploadPackage
//
this.ButtonItem_UploadPackage.ButtonStyle = DevComponents.DotNetBar.eButtonStyle.ImageAndText;
this.ButtonItem_UploadPackage.Image = global::Pilz.Updating.Administration.GUI.My.Resources.Resources.icons8_checkmark_32px;
this.ButtonItem_UploadPackage.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top;
this.ButtonItem_UploadPackage.Name = "ButtonItem_UploadPackage";
this.ButtonItem_UploadPackage.SubItemsExpandWidth = 14;
this.ButtonItem_UploadPackage.Text = "Paket fertigstellen";
this.ButtonItem_UploadPackage.Click += new System.EventHandler(this.ButtonItem_UploadPackage_Click);
//
// RibbonBar3
//
this.RibbonBar3.AutoOverflowEnabled = true;
//
//
//
this.RibbonBar3.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
//
//
//
this.RibbonBar3.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
this.RibbonBar3.ContainerControlProcessDialogKey = true;
this.RibbonBar3.Dock = System.Windows.Forms.DockStyle.Left;
this.RibbonBar3.DragDropSupport = true;
this.RibbonBar3.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] {
this.ButtonItem_Pkg_NewTemplate,
this.ButtonItem_Pkg_OpenTemplate,
this.ButtonItem_Pkg_SaveTemplate,
this.ButtonItem_Pkg_SaveTemplateAs});
this.RibbonBar3.LicenseKey = "F962CEC7-CD8F-4911-A9E9-CAB39962FC1F";
this.RibbonBar3.Location = new System.Drawing.Point(3, 0);
this.RibbonBar3.Name = "RibbonBar3";
this.RibbonBar3.Size = new System.Drawing.Size(230, 92);
this.RibbonBar3.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
this.RibbonBar3.TabIndex = 1;
this.RibbonBar3.Text = "Vorlage";
//
//
//
this.RibbonBar3.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
//
//
//
this.RibbonBar3.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square;
//
// ButtonItem_Pkg_NewTemplate
//
this.ButtonItem_Pkg_NewTemplate.ButtonStyle = DevComponents.DotNetBar.eButtonStyle.ImageAndText;
this.ButtonItem_Pkg_NewTemplate.Image = global::Pilz.Updating.Administration.GUI.My.Resources.Resources.icons8_new_file_32px;
this.ButtonItem_Pkg_NewTemplate.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top;
this.ButtonItem_Pkg_NewTemplate.Name = "ButtonItem_Pkg_NewTemplate";
this.ButtonItem_Pkg_NewTemplate.SubItemsExpandWidth = 14;
this.ButtonItem_Pkg_NewTemplate.Text = "Neues Template";
this.ButtonItem_Pkg_NewTemplate.Click += new System.EventHandler(this.ButtonItem_Pkg_NewTemplate_Click);
//
// ButtonItem_Pkg_OpenTemplate
//
this.ButtonItem_Pkg_OpenTemplate.ButtonStyle = DevComponents.DotNetBar.eButtonStyle.ImageAndText;
this.ButtonItem_Pkg_OpenTemplate.Image = global::Pilz.Updating.Administration.GUI.My.Resources.Resources.icons8_template_32px;
this.ButtonItem_Pkg_OpenTemplate.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top;
this.ButtonItem_Pkg_OpenTemplate.Name = "ButtonItem_Pkg_OpenTemplate";
this.ButtonItem_Pkg_OpenTemplate.SubItemsExpandWidth = 14;
this.ButtonItem_Pkg_OpenTemplate.Text = "Vorlage Öffnen";
this.ButtonItem_Pkg_OpenTemplate.Click += new System.EventHandler(this.ButtonItem_Pkg_OpenTemplate_Click);
//
// ButtonItem_Pkg_SaveTemplate
//
this.ButtonItem_Pkg_SaveTemplate.ButtonStyle = DevComponents.DotNetBar.eButtonStyle.ImageAndText;
this.ButtonItem_Pkg_SaveTemplate.Image = global::Pilz.Updating.Administration.GUI.My.Resources.Resources.icons8_save_32px;
this.ButtonItem_Pkg_SaveTemplate.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top;
this.ButtonItem_Pkg_SaveTemplate.Name = "ButtonItem_Pkg_SaveTemplate";
this.ButtonItem_Pkg_SaveTemplate.SubItemsExpandWidth = 14;
this.ButtonItem_Pkg_SaveTemplate.Text = "Vorlage Speichern";
this.ButtonItem_Pkg_SaveTemplate.Click += new System.EventHandler(this.ButtonItem_Pkg_SaveTemplate_Click);
//
// ButtonItem_Pkg_SaveTemplateAs
//
this.ButtonItem_Pkg_SaveTemplateAs.ButtonStyle = DevComponents.DotNetBar.eButtonStyle.ImageAndText;
this.ButtonItem_Pkg_SaveTemplateAs.Image = global::Pilz.Updating.Administration.GUI.My.Resources.Resources.icons8_save_as_32px;
this.ButtonItem_Pkg_SaveTemplateAs.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top;
this.ButtonItem_Pkg_SaveTemplateAs.Name = "ButtonItem_Pkg_SaveTemplateAs";
this.ButtonItem_Pkg_SaveTemplateAs.SubItemsExpandWidth = 14;
this.ButtonItem_Pkg_SaveTemplateAs.Text = "Speichern unter";
this.ButtonItem_Pkg_SaveTemplateAs.Click += new System.EventHandler(this.ButtonItem_Pkg_SaveTemplateAs_Click);
//
// RibbonTabItem_Packaging
//
this.RibbonTabItem_Packaging.Checked = true;
this.RibbonTabItem_Packaging.Name = "RibbonTabItem_Packaging";
this.RibbonTabItem_Packaging.Panel = this.RibbonPanel1;
this.RibbonTabItem_Packaging.Text = "Paketierung";
//
// advTree_Extensions
//
this.advTree_Extensions.AccessibleRole = System.Windows.Forms.AccessibleRole.Outline;
this.advTree_Extensions.BackColor = System.Drawing.SystemColors.Window;
//
//
//
this.advTree_Extensions.BackgroundStyle.Class = "TreeBorderKey";
this.advTree_Extensions.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
this.advTree_Extensions.Columns.Add(this.columnHeader3);
this.advTree_Extensions.Columns.Add(this.columnHeader4);
this.advTree_Extensions.Dock = System.Windows.Forms.DockStyle.Fill;
this.advTree_Extensions.DragDropEnabled = false;
this.advTree_Extensions.ExpandWidth = 0;
this.advTree_Extensions.LicenseKey = "F962CEC7-CD8F-4911-A9E9-CAB39962FC1F";
this.advTree_Extensions.Location = new System.Drawing.Point(0, 0);
this.advTree_Extensions.Name = "advTree_Extensions";
this.advTree_Extensions.MultiSelect = true;
this.advTree_Extensions.NodesConnector = this.nodeConnector2;
this.advTree_Extensions.NodeStyle = this.elementStyle2;
this.advTree_Extensions.PathSeparator = ";";
this.advTree_Extensions.Size = new System.Drawing.Size(552, 394);
this.advTree_Extensions.Styles.Add(this.elementStyle2);
this.advTree_Extensions.TabIndex = 1;
this.advTree_Extensions.Text = "advTree2";
//
// nodeConnector2
//
this.nodeConnector2.LineColor = System.Drawing.SystemColors.ControlText;
//
// elementStyle2
//
this.elementStyle2.CornerType = DevComponents.DotNetBar.eCornerType.Square;
this.elementStyle2.Name = "elementStyle2";
this.elementStyle2.TextColor = System.Drawing.SystemColors.ControlText;
//
// columnHeader3
//
this.columnHeader3.Name = "columnHeader3";
this.columnHeader3.Text = "Datei";
this.columnHeader3.Width.Absolute = 150;
//
// columnHeader4
//
this.columnHeader4.Name = "columnHeader4";
this.columnHeader4.StretchToFill = true;
this.columnHeader4.Text = "Ort";
this.columnHeader4.Width.Absolute = 150;
//
// PackageCreationDialog
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.ClientSize = new System.Drawing.Size(650, 550);
this.Controls.Add(this.SuperTabControl1);
this.Controls.Add(this.RibbonControl_Main);
this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
this.Name = "PackageCreationDialog";
this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
this.Tag = "650; 550";
this.Text = "Paket erstellen";
((System.ComponentModel.ISupportInitialize)(this.SuperTabControl1)).EndInit();
this.SuperTabControl1.ResumeLayout(false);
this.SuperTabControlPanel2.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)(this.AdvTree1)).EndInit();
this.AdvTree1.ResumeLayout(false);
this.SuperTabControlPanel4.ResumeLayout(false);
this.Panel4.ResumeLayout(false);
this.RibbonControl_Main.ResumeLayout(false);
this.RibbonControl_Main.PerformLayout();
this.RibbonPanel1.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)(this.advTree_Extensions)).EndInit();
this.ResumeLayout(false);
}
private DevComponents.DotNetBar.SuperTabControl SuperTabControl1;
private DevComponents.DotNetBar.SuperTabControlPanel SuperTabControlPanel4;
private DevComponents.DotNetBar.SuperTabItem SuperTabItem_Pkg_Extensions;
private DevComponents.DotNetBar.RibbonControl RibbonControl_Main;
private DevComponents.DotNetBar.RibbonPanel RibbonPanel1;
private DevComponents.DotNetBar.RibbonBar RibbonBar1;
private DevComponents.DotNetBar.RibbonTabItem RibbonTabItem_Packaging;
private Panel Panel4;
private DevComponents.DotNetBar.ButtonItem ButtonItem_Pkg_Export;
private DevComponents.DotNetBar.RibbonBar RibbonBar3;
private DevComponents.DotNetBar.ButtonItem ButtonItem_Pkg_OpenTemplate;
private DevComponents.DotNetBar.ButtonItem ButtonItem_Pkg_SaveTemplate;
private DevComponents.DotNetBar.ButtonItem ButtonItem_Pkg_SaveTemplateAs;
private DevComponents.DotNetBar.SuperTabControlPanel SuperTabControlPanel2;
private DevComponents.DotNetBar.SuperTabItem SuperTabItem_Pkg_Files;
private DevComponents.AdvTree.AdvTree AdvTree1;
private DevComponents.AdvTree.NodeConnector NodeConnector1;
private DevComponents.DotNetBar.ElementStyle ElementStyle1;
private DevComponents.DotNetBar.RibbonBar RibbonBar_Pkg_Erweiterungen;
private DevComponents.DotNetBar.RibbonBar RibbonBar_Pkg_Dateien;
private DevComponents.DotNetBar.ButtonItem ButtonItem_Pkg_AddExtension;
private DevComponents.DotNetBar.ButtonItem ButtonItem_Pkg_RemoveExtension;
private DevComponents.DotNetBar.ButtonItem ButtonItem_Pkg_SelectFileFolder;
private DevComponents.DotNetBar.ButtonItem ButtonItem_Pkg_NewTemplate;
private DevComponents.DotNetBar.ButtonItem ButtonItem_Pkg_RemoveFileFolder;
private DevComponents.DotNetBar.ButtonItem ButtonItem_UploadPackage;
private DevComponents.DotNetBar.Controls.CircularProgress circularProgress1;
private DevComponents.AdvTree.AdvTree advTree_Extensions;
private DevComponents.AdvTree.ColumnHeader columnHeader3;
private DevComponents.AdvTree.ColumnHeader columnHeader4;
private DevComponents.AdvTree.NodeConnector nodeConnector2;
private DevComponents.DotNetBar.ElementStyle elementStyle2;
}
}

324
Pilz.Updating.Administration.GUI/PackageCreationDialog.cs
View File

@@ -1,324 +0,0 @@
using System;
using System.Collections.Generic;
using global::System.IO;
using System.Linq;
using System.Windows.Forms;
using global::DevComponents.AdvTree;
using global::DevComponents.DotNetBar;
using global::DevComponents.Editors;
using Microsoft.VisualBasic.CompilerServices;
using global::Microsoft.WindowsAPICodePack.Dialogs;
using Z.Collections.Extensions;
using Pilz.Updating.Administration.Packaging;
using System.Threading.Tasks;
namespace Pilz.Updating.Administration.GUI
{
public partial class PackageCreationDialog
{
// C o n s t a n t s
private const string FILTER_PACKAGE_TEMPLATE = "Update-Paket-Vorlagen (*.udpt)|*.udpt";
private const string FILTER_PACKAGE_ZIP_PACKAGE = "ZIP-Paket (*.zip)|*.zip";
private const string FILTER_PACKAGE_ADDON = "Anwendungserweiterung (*.dll)|*.dll";
// F i e l d s
private readonly bool isUploadingPackage;
// P r o p e r t i e s
public string TempPackageFilePath { get; private set; } = string.Empty;
// C o n s t r u c t o r s
public PackageCreationDialog() : this(false)
{
}
public PackageCreationDialog(bool isUploadingPackage = false)
{
this.isUploadingPackage = isUploadingPackage;
Shown += EditorWindow_Shown;
InitializeComponent();
UpdateAmbientColors();
ButtonItem_UploadPackage.Visible = isUploadingPackage;
}
// G e n e r a l F e a t u r e s
private void UpdateView()
{
var curTab = SuperTabControl1.SelectedTab;
if (curTab == SuperTabItem_Pkg_Files)
{
RibbonBar_Pkg_Dateien.Visible = true;
RibbonBar_Pkg_Erweiterungen.Visible = false;
}
else if (curTab == SuperTabItem_Pkg_Extensions)
{
RibbonBar_Pkg_Erweiterungen.Visible = true;
RibbonBar_Pkg_Dateien.Visible = false;
}
RibbonControl_Main.RecalcLayout();
}
private void ProgressControls(bool enabled)
{
if (enabled)
circularProgress1.Start();
else
circularProgress1.Stop();
Enabled = !enabled;
}
// G e n e r a l G u i
private void SuperTabControl1_SelectedTabChanged(object sender, SuperTabStripSelectedTabChangedEventArgs e)
{
UpdateView();
}
private void EditorWindow_Shown(object sender, EventArgs e)
{
UpdateView();
}
// F i e l d s
private readonly UpdatePackageManager packageManager = new UpdatePackageManager();
private string curPackageTemplatePath = string.Empty;
// F e a t u r e s
private void ShowAllPackageTemplateConfig()
{
ShowPackageFiles();
ShowPackageExtensions();
}
private void ShowPackageFiles()
{
AdvTree1.BeginUpdate();
AdvTree1.Nodes.Clear();
if (!string.IsNullOrEmpty(packageManager.FilesToCopyPath))
{
Action<NodeCollection, string> nodeCreation = null;
nodeCreation = (parentCollection, p) =>
{
bool isDir = (File.GetAttributes(p) & FileAttributes.Directory) == FileAttributes.Directory;
var n = new Node()
{
Tag = p,
Text = AdvTree1.Nodes == parentCollection ? p : Path.GetFileName(p),
ImageIndex = isDir ? 0 : 1
};
parentCollection.Add(n);
if (isDir)
{
var dirInfo = new DirectoryInfo(p);
dirInfo.EnumerateDirectories().ForEach(di => nodeCreation(n.Nodes, di.FullName));
dirInfo.EnumerateFiles().ForEach(fi => nodeCreation(n.Nodes, fi.FullName));
}
};
nodeCreation(AdvTree1.Nodes, packageManager.FilesToCopyPath);
}
AdvTree1.EndUpdate();
}
private void ShowPackageExtensions()
{
advTree_Extensions.BeginUpdate();
advTree_Extensions.Nodes.Clear();
foreach (string fAddOn in packageManager.GetAllUpdateInstallerÁddOn())
{
var item = new Node(Path.GetFileName(fAddOn)) { Tag = fAddOn };
item.Cells.Add(new Cell(Path.GetDirectoryName(fAddOn)));
advTree_Extensions.Nodes.Add(item);
}
advTree_Extensions.EndUpdate();
}
private IEnumerable<string> GetSelectedUpdateInstallAddOns()
{
var list = new List<string>();
foreach (Node item in advTree_Extensions.SelectedNodes)
list.Add(Conversions.ToString(item.Tag));
return list;
}
private void NewPackageTemplate()
{
packageManager.NewTemplate();
curPackageTemplatePath = string.Empty;
ShowAllPackageTemplateConfig();
}
private void OpenPackageTemplate()
{
var ofd_UpdateAdmin_LoadTemplate = new OpenFileDialog() { Filter = FILTER_PACKAGE_TEMPLATE };
if (ofd_UpdateAdmin_LoadTemplate.ShowDialog() == DialogResult.OK)
{
packageManager.LoadTemplate(ofd_UpdateAdmin_LoadTemplate.FileName);
curPackageTemplatePath = ofd_UpdateAdmin_LoadTemplate.FileName;
ShowAllPackageTemplateConfig();
}
}
private void SavePackageTemplate()
{
if (string.IsNullOrEmpty(curPackageTemplatePath))
{
SavePackageTemplateAs();
}
else
{
packageManager.SaveTemplate(curPackageTemplatePath);
}
}
private void SavePackageTemplateAs()
{
var sfd_UpdateAdmin_SaveTemplate = new SaveFileDialog() { Filter = FILTER_PACKAGE_TEMPLATE };
if (sfd_UpdateAdmin_SaveTemplate.ShowDialog() == DialogResult.OK)
{
packageManager.SaveTemplate(sfd_UpdateAdmin_SaveTemplate.FileName);
curPackageTemplatePath = sfd_UpdateAdmin_SaveTemplate.FileName;
}
}
private void SelectPackageFileFolder()
{
var ofd_UpdateAdmin_PkgFileFolder = new CommonOpenFileDialog() { IsFolderPicker = true };
if (ofd_UpdateAdmin_PkgFileFolder.ShowDialog() == CommonFileDialogResult.Ok)
{
packageManager.FilesToCopyPath = ofd_UpdateAdmin_PkgFileFolder.FileName;
ShowPackageFiles();
}
}
private void RemovePackageFileFolder()
{
packageManager.FilesToCopyPath = string.Empty;
ShowPackageFiles();
}
private async Task<bool> ExportUpdatePackage(string filePath)
{
bool success = false;
ProgressControls(true);
try
{
await Task.Run(() => packageManager.ExportPackage(filePath));
success = true;
}
catch (Exception)
{
success = false;
}
ProgressControls(false);
return success;
}
private async Task<bool> ExportTempUpdatePackage()
{
var filePath = Path.GetTempFileName();
bool res = await ExportUpdatePackage(filePath);
if (res) TempPackageFilePath = filePath;
return res;
}
private void AddUpdateInstallerExtension()
{
var ofd_UpdateAdmin_AddExtension = new OpenFileDialog()
{
Multiselect = true,
Filter = FILTER_PACKAGE_ADDON
};
if (ofd_UpdateAdmin_AddExtension.ShowDialog() == DialogResult.OK)
{
foreach (string f in ofd_UpdateAdmin_AddExtension.FileNames)
{
if (!packageManager.AddUpdateInstallerAddOn(f))
{
MessageBoxEx.Show(My.Resources.UpdatingAdministrationLangRes.MsgBox_ErrorAddingInstallerAddOn, My.Resources.UpdatingAdministrationLangRes.MsgBox_Error_Titel, MessageBoxButtons.OK, MessageBoxIcon.Error);
}
}
}
}
private void RemoveUpdateInstallerExtension()
{
foreach (string fAddOn in GetSelectedUpdateInstallAddOns())
packageManager.RemoveUpdateInstallerAddOn(fAddOn);
}
// G u i
private void ButtonItem_Pkg_NewTemplate_Click(object sender, EventArgs e)
{
NewPackageTemplate();
}
private void ButtonItem_Pkg_OpenTemplate_Click(object sender, EventArgs e)
{
OpenPackageTemplate();
}
private void ButtonItem_Pkg_SaveTemplate_Click(object sender, EventArgs e)
{
SavePackageTemplate();
}
private void ButtonItem_Pkg_SaveTemplateAs_Click(object sender, EventArgs e)
{
SavePackageTemplateAs();
}
private void ButtonItem_Pkg_SelectFileFolder_Click(object sender, EventArgs e)
{
SelectPackageFileFolder();
}
private void ButtonItem_Pkg_RemoveFileFolder_Click(object sender, EventArgs e)
{
RemovePackageFileFolder();
}
private async void ButtonItem_Pkg_Export_Click(object sender, EventArgs e)
{
var sfd_UpdateAdmin_ExportPkg = new SaveFileDialog() { Filter = FILTER_PACKAGE_ZIP_PACKAGE };
if (sfd_UpdateAdmin_ExportPkg.ShowDialog() == DialogResult.OK)
{
if (await ExportUpdatePackage(sfd_UpdateAdmin_ExportPkg.FileName))
MessageBoxEx.Show(this, My.Resources.UpdatingAdministrationLangRes.MsgBox_PkgExportSuccess, My.Resources.UpdatingAdministrationLangRes.MsgBox_PkgExportSuccess_Titel, MessageBoxButtons.OK, MessageBoxIcon.Information);
}
}
private void ButtonItem_Pkg_AddExtension_Click(object sender, EventArgs e)
{
AddUpdateInstallerExtension();
}
private void ButtonItem_Pkg_RemoveExtension_Click(object sender, EventArgs e)
{
RemoveUpdateInstallerExtension();
}
private async void ButtonItem_UploadPackage_Click(object sender, EventArgs e)
{
if (await ExportTempUpdatePackage())
DialogResult = DialogResult.OK;
else
MessageBoxEx.Show(this, My.Resources.UpdatingAdministrationLangRes.MsgBox_PkgExportSuccess, My.Resources.UpdatingAdministrationLangRes.MsgBox_PkgExportSuccess_Titel, MessageBoxButtons.OK, MessageBoxIcon.Information);
}
}
}

665
Pilz.Updating.Administration.GUI/PackageCreationDialog.resx
View File

@@ -1,665 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<root>
<!--
Microsoft ResX Schema
Version 2.0
The primary goals of this format is to allow a simple XML format
that is mostly human readable. The generation and parsing of the
various data types are done through the TypeConverter classes
associated with the data types.
Example:
... ado.net/XML headers & schema ...
<resheader name="resmimetype">text/microsoft-resx</resheader>
<resheader name="version">2.0</resheader>
<resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
<resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
<data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
<data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
<data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
<value>[base64 mime encoded serialized .NET Framework object]</value>
</data>
<data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
<comment>This is a comment</comment>
</data>
There are any number of "resheader" rows that contain simple
name/value pairs.
Each data row contains a name, and value. The row also contains a
type or mimetype. Type corresponds to a .NET class that support
text/value conversion through the TypeConverter architecture.
Classes that don't support this are serialized and stored with the
mimetype set.
The mimetype is used for serialized objects, and tells the
ResXResourceReader how to depersist the object. This is currently not
extensible. For a given mimetype the value must be set accordingly:
Note - application/x-microsoft.net.object.binary.base64 is the format
that the ResXResourceWriter will generate, however the reader can
read any of the formats listed below.
mimetype: application/x-microsoft.net.object.binary.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.soap.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Soap.SoapFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.bytearray.base64
value : The object must be serialized into a byte array
: using a System.ComponentModel.TypeConverter
: and then encoded with base64 encoding.
-->
<xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
<xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
<xsd:element name="root" msdata:IsDataSet="true">
<xsd:complexType>
<xsd:choice maxOccurs="unbounded">
<xsd:element name="metadata">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" />
</xsd:sequence>
<xsd:attribute name="name" use="required" type="xsd:string" />
<xsd:attribute name="type" type="xsd:string" />
<xsd:attribute name="mimetype" type="xsd:string" />
<xsd:attribute ref="xml:space" />
</xsd:complexType>
</xsd:element>
<xsd:element name="assembly">
<xsd:complexType>
<xsd:attribute name="alias" type="xsd:string" />
<xsd:attribute name="name" type="xsd:string" />
</xsd:complexType>
</xsd:element>
<xsd:element name="data">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
<xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
<xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
<xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
<xsd:attribute ref="xml:space" />
</xsd:complexType>
</xsd:element>
<xsd:element name="resheader">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required" />
</xsd:complexType>
</xsd:element>
</xsd:choice>
</xsd:complexType>
</xsd:element>
</xsd:schema>
<resheader name="resmimetype">
<value>text/microsoft-resx</value>
</resheader>
<resheader name="version">
<value>2.0</value>
</resheader>
<resheader name="reader">
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<metadata name="columnHeader3.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>17, 17</value>
</metadata>
<metadata name="columnHeader4.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>155, 17</value>
</metadata>
<assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
AAABAAQAEBAAAAEAIABoBAAARgAAACAgAAABACAAqBAAAK4EAAAwMAAAAQAgAKglAABWFQAAQEAAAAEA
IAAoQgAA/joAACgAAAAQAAAAIAAAAAEAIAAAAAAAMAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AACflXUYno94RJ6PeESej3hEno94RJ6PeESej3hEno94RJ6PeESej3hEno94RJuQehcAAAAAAAAAAAAA
AAAAAAAAnJF42ZyQeP+ckHj/nJB4/5yQeP+ckHj/nJB4/5yQeP+ckHj/gp90/5iSd/+dkHjXAAAAAAAA
AAAAAAAAAAAAAJyQeP+ckHj/nJB4/5yQeP+ckHj/nJB4/5yQeP+ckHj/nJB4/y/PZ/+BoHT/nJB4/wAA
AAAAAAAAAAAAAAAAAACckHj/nJB4/5yQeP+ckHj/nJB4/5yQeP+ckHj/nJB4/5yQeP+ckHj/nJB4/5yQ
eP8AAAAAAAAAAAAAAAAAAAAAeW9Z/2VbRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2Vb
Rf96b1n/AAAAAAAAAAAAAAAAAAAAAGRbRvdkWkX/ZFpF/2RaRf9kWkX/ZVtF/2VbRf9kWkX/ZFpF/2Ra
Rf9kWkX/ZlpF9gAAAAAAAAAAAAAAAAAAAABkWkXOZFpF/2RaRf9kWkX/ZVtF/7yoHv+3pCD/ZFpF/2Ra
Rf9kWkX/ZFpF/2RaRM0AAAAAAAAAAAAAAAAAAAAAZFtFo2RaRf9kWkX/ZVtF/7yoHv//5QD//+UA/7ek
IP9kWkX/ZFpF/2RaRf9lWkWiAAAAAAAAAAAAAAAAAAAAAGNbRnlkWkX/ZFpF/4p8NP/BrRz/69MJ/+vT
Cf/BrRz/iXs0/2RaRf9kWkX/ZFlEeAAAAAAAAAAAAAAAAAAAAABlXEVOZFpF/2RaRf9kWkX/ZFpF///l
AP//5QD/ZFpF/2RaRf9kWkX/ZFpF/2NZRk0AAAAAAAAAAAAAAAAAAAAAY1xHJGRaRf9kWkX/ZFpF/2Ra
Rf//5QD//+UA/2RaRf9kWkX/ZFpF/2RaRf9mV0IjAAAAAAAAAAAAAAAAAAAAAICAgAJkWkXuZFpF/2Ra
Rf9kWkX//+UA///lAP9kWkX/ZFpF/2RaRf9kWkXsgICAAgAAAAAAAAAAAAAAAAAAAAAAAAAAZFpFSmVb
RbRkWka7ZFpGu//lAP//5QD/ZFpGu2RaRrtlW0W0ZVtGTAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAD/5gCr/+YAqwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA//8AAP//
AADAAwAAwAMAAMADAADAAwAAwAMAAMADAADAAwAA4AcAAOAHAADgBwAA4AcAAPAPAAD+fwAA//8AACgA
AAAgAAAAQAAAAAEAIAAAAAAAgBAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAJuPeVSbkHihnJB4qpyQeKqckHiqnJB4qpyQeKqckHiqnJB4qpyQ
eKqckHiqnJB4qpyQeKqckHiqnJB4qpyQeKqckHiqnJB4qpyQeKqckHiqnI94oJ2QeFMAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACbj3h7nJB4/5yQeP+ckHj/nJB4/5yQeP+ckHj/nJB4/5yQ
eP+ckHj/nJB4/5yQeP+ckHj/nJB4/5yQeP+ckHj/nJB4/5yQeP+ckHj/nJB4/5yQeP+ckHj/nJB4/5uR
d3gAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAJyQeOeckHj/nJB4/5yQeP+ckHj/nJB4/5yQ
eP+ckHj/nJB4/5yQeP+ckHj/nJB4/5yQeP+ckHj/nJB4/5yQeP+ckHj/nJB4/3Cpcv9JwGz/ipp1/5yQ
eP+ckHj/nJB45QAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAnJB4/5yQeP+ckHj/nJB4/5yQ
eP+ckHj/nJB4/5yQeP+ckHj/nJB4/5yQeP+ckHj/nJB4/5yQeP+ckHj/nJB4/5yQeP+ckHj/H9hl/xfd
ZP9Mv2z/nJB4/5yQeP+ckHj/AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACckHj/nJB4/5yQ
eP+ckHj/nJB4/5yQeP+ckHj/nJB4/5yQeP+ckHj/nJB4/5yQeP+ckHj/nJB4/5yQeP+ckHj/nJB4/5yQ
eP9JwGz/Iddl/3Kocf+ckHj/nJB4/5yQeP8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAJyQ
eP+ckHj/nJB4/5yQeP+ckHj/nJB4/5yQeP+ckHj/nJB4/5yQeP+ckHj/nJB4/5yQeP+ckHj/nJB4/5yQ
eP+ckHj/nJB4/5yQeP+ckHj/nJB4/5yQeP+ckHj/nJB4/wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAnJB4/5yQeP+ckHj/nJB4/5yQeP+ckHj/nJB4/5yQeP+ckHj/nJB4/5yQeP+ckHj/nJB4/5yQ
eP+ckHj/nJB4/5yQeP+ckHj/nJB4/5yQeP+ckHj/nJB4/5yQeP+ckHj/AAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAACYjHT/d21W/2ZcR/9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2Ra
Rf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9mXEf/d2xW/5eLdP8AAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAHZsVv9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2Ra
Rf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/d2xW/wAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAZltG/GRaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2Ra
Rf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2Ra
Rf9nXEf7AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABjWkXfZFpF/2RaRf9kWkX/ZFpF/2Ra
Rf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2ZdRP9mXET/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2Ra
Rf9kWkX/ZFpF/2RaRd4AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAGVbRbRkWkX/ZFpF/2Ra
Rf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9lW0T/xbIa/8CsHP9lW0X/ZFpF/2RaRf9kWkX/ZFpF/2Ra
Rf9kWkX/ZFpF/2RaRf9kWkX/ZFpEswAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAZFtEimRa
Rf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZVtE/8WyGv//5QD//+UA/8CsHP9lW0X/ZFpF/2Ra
Rf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9lWUWJAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AABjW0ZfZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2VbRf/ArBz//+UA///lAP//5QD//+UA/8Cs
HP9lW0X/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRF4AAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAGVbQzVkWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9lW0X/wKwc///lAP//5QD//+UA///l
AP//5QD//+UA/8CtHP9lW0X/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/YlhFNAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAYmJODWRaRf5kWkX/ZFpF/2RaRf9kWkX/ZVtF/8CsHP//5QD//+UA///l
AP//5QD//+UA///lAP//5QD//+UA/8CtHP9lW0X/ZFpF/2RaRf9kWkX/ZFpF/2RaRf1dXUYLAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAY1pF32RaRf9kWkX/ZFpF/2RaRf9tYkH/g3Y3/4N2
N/+Ddjf//+UA///lAP//5QD//+UA/4N2N/+Ddjf/g3Y3/2xhQf9kWkX/ZFpF/2RaRf9kWkX/ZFpF3gAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABlW0W0ZFpF/2RaRf9kWkX/ZFpF/2Ra
Rf9kWkX/ZFpF/2RaRf//5QD//+UA///lAP//5QD/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2Ra
Rf9kWkSzAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAGRbRIpkWkX/ZFpF/2Ra
Rf9kWkX/ZFpF/2RaRf9kWkX/ZFpF///lAP//5QD//+UA///lAP9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2Ra
Rf9kWkX/ZFpF/2VZRYkAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAY1tGX2Ra
Rf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX//+UA///lAP//5QD//+UA/2RaRf9kWkX/ZFpF/2Ra
Rf9kWkX/ZFpF/2RaRf9kWkX/ZFpEXgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AABlW0M1ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf//5QD//+UA///lAP//5QD/ZFpF/2Ra
Rf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9iWEU0AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAF1dRgtkWkX8ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF///lAP//5QD//+UA///l
AP9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF+2ZmTQoAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAGRaRcRkWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX//+UA///l
AP//5QD//+UA/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkW9AAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAYlxHL2RbRudkWkX/ZFpF/2RaRf9kWkX/ZFpF/2Ra
Rf//5QD//+UA///lAP//5QD/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF6GVaRTAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAW1tJDmVaRERjWkVVY1pFVWNa
RVVjWkVVY1pFVf/lAP//5QD//+UA///lAP9jWkVVY1pFVWNaRVVjWkVVY1pFVWVaRERiYk4NAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAA/+UA///lAP//5QD//+UA/wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD/5ABV/+QAVf/kAFX/5ABVAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA////////
/////////AAAP/gAAB/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/gA
AB/4AAAf+AAAH/gAAB/4AAAf+AAAH/wAAD/8AAA//AAAP/wAAD/+AAB///w////8P///////////////
//8oAAAAMAAAAGAAAAABACAAAAAAAFAlAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAJmRdx6ckHetnJB48pyQeP+ckHj/nJB4/5yQeP+ckHj/nJB4/5yQeP+ckHj/nJB4/5yQ
eP+ckHj/nJB4/5yQeP+ckHj/nJB4/5yQeP+ckHj/nJB4/5yQeP+ckHj/nJB4/5yQeP+ckHj/nJB4/5yQ
eP+ckHj/nJB4/5yQeP+ckHjxnJB4rJ6Nex0AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAmZN5KJyQeO6ckHj/nJB4/5yQeP+ckHj/nJB4/5yQeP+ckHj/nJB4/5yQ
eP+ckHj/nJB4/5yQeP+ckHj/nJB4/5yQeP+ckHj/nJB4/5yQeP+ckHj/nJB4/5yQeP+ckHj/nJB4/5yQ
eP+ckHj/nJB4/5yQeP+ckHj/nJB4/5yQeP+ckHj/nJB4/5yQee2ejXsdAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAnI94sJyQeP+ckHj/nJB4/5yQeP+ckHj/nJB4/5yQ
eP+ckHj/nJB4/5yQeP+ckHj/nJB4/5yQeP+ckHj/nJB4/5yQeP+ckHj/nJB4/5yQeP+ckHj/nJB4/5yQ
eP+ckHj/nJB4/5yQeP+ckHj/nJB4/5yQeP+ckHj/nJB4/5yQeP+ckHj/nJB4/5yQeP+dkXerAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAnJB485yQeP+ckHj/nJB4/5yQ
eP+ckHj/nJB4/5yQeP+ckHj/nJB4/5yQeP+ckHj/nJB4/5yQeP+ckHj/nJB4/5yQeP+ckHj/nJB4/5yQ
eP+ckHj/nJB4/5yQeP+ckHj/nJB4/5yQeP+ckHj/dady/yXVZv8m1Wb/dqZy/5yQeP+ckHj/nJB4/5yQ
eP+ckHjxAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAnJB4/5yQ
eP+ckHj/nJB4/5yQeP+ckHj/nJB4/5yQeP+ckHj/nJB4/5yQeP+ckHj/nJB4/5yQeP+ckHj/nJB4/5yQ
eP+ckHj/nJB4/5yQeP+ckHj/nJB4/5yQeP+ckHj/nJB4/5yQeP+ckHj/JtVm/xfdZP8X3WT/JtRn/5yQ
eP+ckHj/nJB4/5yQeP+ckHj/AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAnJB4/5yQeP+ckHj/nJB4/5yQeP+ckHj/nJB4/5yQeP+ckHj/nJB4/5yQeP+ckHj/nJB4/5yQ
eP+ckHj/nJB4/5yQeP+ckHj/nJB4/5yQeP+ckHj/nJB4/5yQeP+ckHj/nJB4/5yQeP+ckHj/JtRn/xfd
ZP8X3WT/J9Rn/5yQeP+ckHj/nJB4/5yQeP+ckHj/AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAnJB4/5yQeP+ckHj/nJB4/5yQeP+ckHj/nJB4/5yQeP+ckHj/nJB4/5yQ
eP+ckHj/nJB4/5yQeP+ckHj/nJB4/5yQeP+ckHj/nJB4/5yQeP+ckHj/nJB4/5yQeP+ckHj/nJB4/5yQ
eP+ckHj/dady/yjTZ/8p02f/dqZy/5yQeP+ckHj/nJB4/5yQeP+ckHj/AAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAnJB4/5yQeP+ckHj/nJB4/5yQeP+ckHj/nJB4/5yQ
eP+ckHj/nJB4/5yQeP+ckHj/nJB4/5yQeP+ckHj/nJB4/5yQeP+ckHj/nJB4/5yQeP+ckHj/nJB4/5yQ
eP+ckHj/nJB4/5yQeP+ckHj/nJB4/5yQeP+ckHj/nJB4/5yQeP+ckHj/nJB4/5yQeP+ckHj/AAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAnJB4/5yQeP+ckHj/nJB4/5yQ
eP+ckHj/nJB4/5yQeP+ckHj/nJB4/5yQeP+ckHj/nJB4/5yQeP+ckHj/nJB4/5yQeP+ckHj/nJB4/5yQ
eP+ckHj/nJB4/5yQeP+ckHj/nJB4/5yQeP+ckHj/nJB4/5yQeP+ckHj/nJB4/5yQeP+ckHj/nJB4/5yQ
eP+ckHj/AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAnJB4/5yQ
eP+ckHj/nJB4/5yQeP+ckHj/nJB4/5yQeP+ckHj/nJB4/5yQeP+ckHj/nJB4/5yQeP+ckHj/nJB4/5yQ
eP+ckHj/nJB4/5yQeP+ckHj/nJB4/5yQeP+ckHj/nJB4/5yQeP+ckHj/nJB4/5yQeP+ckHj/nJB4/5yQ
eP+ckHj/nJB4/5yQeP+ckHj/AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAnJB4/5aKcv92a1b/Z1xH/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2Ra
Rf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2Ra
Rf9kWkX/ZFpF/2RaRf9oXUj/dmxW/5WKcv+ckHj/AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAlIdw/2deSP9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2Ra
Rf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2Ra
Rf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2heSP+VinL/AAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAdWtV/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2Ra
Rf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2Ra
Rf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf92a1b/AAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAZl1I/2RaRf9kWkX/ZFpF/2Ra
Rf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2Ra
Rf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2Ra
Rf9oXUj/AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAZFpF6mRa
Rf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2Ra
Rf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2Ra
Rf9kWkX/ZFpF/2RaRf9kWkXqAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAZFpFwGRaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2Ra
Rf9kWkX/ZFpF/2RaRf9oXkP/aF5D/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2Ra
Rf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWUW/AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAY1tElWRaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2Ra
Rf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2dcRP/OuRb/yrUY/2ZcRP9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2Ra
Rf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkWUAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAZFtFa2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2Ra
Rf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/Z1xE/865Fv//5QD//+UA/8q1GP9mXET/ZFpF/2Ra
Rf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9lWUZqAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAZFxEQGRaRf9kWkX/ZFpF/2Ra
Rf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9nXET/zrkW///lAP//5QD//+UA///l
AP/KtRj/ZlxE/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2Ra
Rf9lWUU/AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAYVVJFWRa
Rf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2dcRP/OuRb//+UA///l
AP//5QD//+UA///lAP//5QD/yrUY/2ZcRP9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2Ra
Rf9kWkX/ZFpF/2RaRf9hVUkVAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAGRaRepkWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/Z1xE/865
Fv//5QD//+UA///lAP//5QD//+UA///lAP//5QD//+UA/8q1GP9mXET/ZFpF/2RaRf9kWkX/ZFpF/2Ra
Rf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaReoAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAGRaRcBkWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2Ra
Rf9nXET/zrkW///lAP//5QD//+UA///lAP//5QD//+UA///lAP//5QD//+UA///lAP/KtRj/ZlxE/2Ra
Rf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RZRb8AAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAGNbRJVkWkX/ZFpF/2RaRf9kWkX/ZFpF/2Ra
Rf9kWkX/ZFpF/2dcRP/OuRb//+UA///lAP//5QD//+UA///lAP//5QD//+UA///lAP//5QD//+UA///l
AP//5QD/yrUY/2ZcRP9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRZQAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAGRbRWtkWkX/ZFpF/2Ra
Rf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/7KgIv/gyQ7/4MkO/+DJDv/gyQ7//+UA///lAP//5QD//+UA///l
AP//5QD/4MkO/+DJDv/gyQ7/4MkO/7KgIv9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2VZ
RmoAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAGRc
REBkWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX//+UA///l
AP//5QD//+UA///lAP//5QD/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2Ra
Rf9kWkX/ZFpF/2VZRT8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAGFVSRVkWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2Ra
Rf9kWkX//+UA///lAP//5QD//+UA///lAP//5QD/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2Ra
Rf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2FVSRUAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABkWkXqZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2Ra
Rf9kWkX/ZFpF/2RaRf9kWkX//+UA///lAP//5QD//+UA///lAP//5QD/ZFpF/2RaRf9kWkX/ZFpF/2Ra
Rf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF6gAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABkWkXAZFpF/2RaRf9kWkX/ZFpF/2Ra
Rf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX//+UA///lAP//5QD//+UA///lAP//5QD/ZFpF/2Ra
Rf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFlFvwAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABjW0SVZFpF/2Ra
Rf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX//+UA///lAP//5QD//+UA///l
AP//5QD/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpFlAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AABkW0VrZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX//+UA///l
AP//5QD//+UA///lAP//5QD/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2Ra
Rf9kWkX/ZVlGagAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAABkXERAZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2Ra
Rf9kWkX//+UA///lAP//5QD//+UA///lAP//5QD/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2Ra
Rf9kWkX/ZFpF/2RaRf9kWkX/ZVlFPwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABmWUAUZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2Ra
Rf9kWkX/ZFpF/2RaRf9kWkX//+UA///lAP//5QD//+UA///lAP//5QD/ZFpF/2RaRf9kWkX/ZFpF/2Ra
Rf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/Xl5DEwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAZFpF3mRaRf9kWkX/ZFpF/2Ra
Rf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX//+UA///lAP//5QD//+UA///lAP//5QD/ZFpF/2Ra
Rf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkXbAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAZFlFjGRa
Rf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX//+UA///lAP//5QD//+UA///l
AP//5QD/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9jWkWIAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAYmJODWRaRd1kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX//+UA///l
AP//5QD//+UA///lAP//5QD/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2Ra
Rd5iYk4NAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAGFYRh1kWUWrZFpF62RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2Ra
Rf9kWkX//+UA///lAP//5QD//+UA///lAP//5QD/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2Ra
Rf9kWkXqZFtFpmFVSRUAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAA/+UA///lAP//5QD//+UA///lAP//5QD/AAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA/+UA///lAP//5QD//+UA///lAP//5QD/AAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA/+UA///lAP//5QD//+UA///l
AP//5QD/AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAA////////AAD///////8AAP///////wAA////////AAD///////8AAP8A
AAAA/wAA/gAAAAB/AAD8AAAAAD8AAPwAAAAAPwAA/AAAAAA/AAD8AAAAAD8AAPwAAAAAPwAA/AAAAAA/
AAD8AAAAAD8AAPwAAAAAPwAA/AAAAAA/AAD8AAAAAD8AAPwAAAAAPwAA/AAAAAA/AAD8AAAAAD8AAPwA
AAAAPwAA/AAAAAA/AAD+AAAAAH8AAP4AAAAAfwAA/gAAAAB/AAD+AAAAAH8AAP4AAAAAfwAA/gAAAAB/
AAD/AAAAAP8AAP8AAAAA/wAA/wAAAAD/AAD/AAAAAP8AAP8AAAAA/wAA/wAAAAD/AAD/gAAAAf8AAP+A
AAAB/wAA/4AAAAH/AAD/gAAAAf8AAP+AAAAB/wAA/8AAAAP/AAD/4AAAB/8AAP//+B///wAA///4H///
AAD///gf//8AAP///////wAA////////AAD///////8AAP///////wAAKAAAAEAAAACAAAAAAQAgAAAA
AAAAQgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAqo5xCZ6SeT+ej3hEno94RJ6P
eESej3hEno94RJ6PeESej3hEno94RJ6PeESej3hEno94RJ6PeESej3hEno94RJ6PeESej3hEno94RJ6P
eESej3hEno94RJ6PeESej3hEno94RJ6PeESej3hEno94RJ6PeESej3hEno94RJ6PeESej3hEno94RJ6P
eESej3hEno94RJ6PeESej3hEno94RJyQdz6fn4AIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACqqlUDnZF4f5yQ
ePGckHj/nJB4/5yQeP+ckHj/nJB4/5yQeP+ckHj/nJB4/5yQeP+ckHj/nJB4/5yQeP+ckHj/nJB4/5yQ
eP+ckHj/nJB4/5yQeP+ckHj/nJB4/5yQeP+ckHj/nJB4/5yQeP+ckHj/nJB4/5yQeP+ckHj/nJB4/5yQ
eP+ckHj/nJB4/5yQeP+ckHj/nJB4/5yQeP+ckHj/nJB4/5yQeP+ckHj/nJF48JyQd3yqqlUDAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAD//wABnJB5pZyQeP+ckHj/nJB4/5yQeP+ckHj/nJB4/5yQeP+ckHj/nJB4/5yQeP+ckHj/nJB4/5yQ
eP+ckHj/nJB4/5yQeP+ckHj/nJB4/5yQeP+ckHj/nJB4/5yQeP+ckHj/nJB4/5yQeP+ckHj/nJB4/5yQ
eP+ckHj/nJB4/5yQeP+ckHj/nJB4/5yQeP+ckHj/nJB4/5yQeP+ckHj/nJB4/5yQeP+ckHj/nJB4/5yQ
eP+ckHj/nJB4o///AAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAm5B3XJyQeP+ckHj/nJB4/5yQeP+ckHj/nJB4/5yQeP+ckHj/nJB4/5yQ
eP+ckHj/nJB4/5yQeP+ckHj/nJB4/5yQeP+ckHj/nJB4/5yQeP+ckHj/nJB4/5yQeP+ckHj/nJB4/5yQ
eP+ckHj/nJB4/5yQeP+ckHj/nJB4/5yQeP+ckHj/nJB4/5yQeP+ckHj/nJB4/5yQeP+ckHj/nJB4/5yQ
eP+ckHj/nJB4/5yQeP+ckHj/nJB4/5yQeP+bj3hZAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAJyReMKckHj/nJB4/5yQeP+ckHj/nJB4/5yQ
eP+ckHj/nJB4/5yQeP+ckHj/nJB4/5yQeP+ckHj/nJB4/5yQeP+ckHj/nJB4/5yQeP+ckHj/nJB4/5yQ
eP+ckHj/nJB4/5yQeP+ckHj/nJB4/5yQeP+ckHj/nJB4/5yQeP+ckHj/nJB4/5yQeP+ckHj/nJB4/5yQ
eP+UlXf/e6Nz/4uadv+ckHj/nJB4/5yQeP+ckHj/nJB4/5yQeP+ckHj/nJB4vwAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACckHjznJB4/5yQ
eP+ckHj/nJB4/5yQeP+ckHj/nJB4/5yQeP+ckHj/nJB4/5yQeP+ckHj/nJB4/5yQeP+ckHj/nJB4/5yQ
eP+ckHj/nJB4/5yQeP+ckHj/nJB4/5yQeP+ckHj/nJB4/5yQeP+ckHj/nJB4/5yQeP+ckHj/nJB4/5yQ
eP+ckHj/nJB4/5yQeP97o3P/H9hl/xfdZP8Y3GT/Wbdu/5yQeP+ckHj/nJB4/5yQeP+ckHj/nJB4/5yQ
ePEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAnJB4/5yQeP+ckHj/nJB4/5yQeP+ckHj/nJB4/5yQeP+ckHj/nJB4/5yQeP+ckHj/nJB4/5yQ
eP+ckHj/nJB4/5yQeP+ckHj/nJB4/5yQeP+ckHj/nJB4/5yQeP+ckHj/nJB4/5yQeP+ckHj/nJB4/5yQ
eP+ckHj/nJB4/5yQeP+ckHj/nJB4/5yQeP+ckHj/MM9o/xfdZP8X3WT/F91k/xjdZP+Im3b/nJB4/5yQ
eP+ckHj/nJB4/5yQeP+ckHj/AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAJyQeP+ckHj/nJB4/5yQeP+ckHj/nJB4/5yQeP+ckHj/nJB4/5yQ
eP+ckHj/nJB4/5yQeP+ckHj/nJB4/5yQeP+ckHj/nJB4/5yQeP+ckHj/nJB4/5yQeP+ckHj/nJB4/5yQ
eP+ckHj/nJB4/5yQeP+ckHj/nJB4/5yQeP+ckHj/nJB4/5yQeP+ckHj/nJB4/x/ZZv8X3WT/F91k/xfd
ZP8X3WT/eKVz/5yQeP+ckHj/nJB4/5yQeP+ckHj/nJB4/wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACckHj/nJB4/5yQeP+ckHj/nJB4/5yQ
eP+ckHj/nJB4/5yQeP+ckHj/nJB4/5yQeP+ckHj/nJB4/5yQeP+ckHj/nJB4/5yQeP+ckHj/nJB4/5yQ
eP+ckHj/nJB4/5yQeP+ckHj/nJB4/5yQeP+ckHj/nJB4/5yQeP+ckHj/nJB4/5yQeP+ckHj/nJB4/5yQ
eP9DxGr/F91k/xfdZP8X3WT/INdl/5SVd/+ckHj/nJB4/5yQeP+ckHj/nJB4/5yQeP8AAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAnJB4/5yQ
eP+ckHj/nJB4/5yQeP+ckHj/nJB4/5yQeP+ckHj/nJB4/5yQeP+ckHj/nJB4/5yQeP+ckHj/nJB4/5yQ
eP+ckHj/nJB4/5yQeP+ckHj/nJB4/5yQeP+ckHj/nJB4/5yQeP+ckHj/nJB4/5yQeP+ckHj/nJB4/5yQ
eP+ckHj/nJB4/5yQeP+ckHj/kZd3/0TDa/8i1mX/NMxo/3yjc/+ckHj/nJB4/5yQeP+ckHj/nJB4/5yQ
eP+ckHj/AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAJyQeP+ckHj/nJB4/5yQeP+ckHj/nJB4/5yQeP+ckHj/nJB4/5yQeP+ckHj/nJB4/5yQ
eP+ckHj/nJB4/5yQeP+ckHj/nJB4/5yQeP+ckHj/nJB4/5yQeP+ckHj/nJB4/5yQeP+ckHj/nJB4/5yQ
eP+ckHj/nJB4/5yQeP+ckHj/nJB4/5yQeP+ckHj/nJB4/5yQeP+ckHj/nJB4/5yQeP+ckHj/nJB4/5yQ
eP+ckHj/nJB4/5yQeP+ckHj/nJB4/wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACckHj/nJB4/5yQeP+ckHj/nJB4/5yQeP+ckHj/nJB4/5yQ
eP+ckHj/nJB4/5yQeP+ckHj/nJB4/5yQeP+ckHj/nJB4/5yQeP+ckHj/nJB4/5yQeP+ckHj/nJB4/5yQ
eP+ckHj/nJB4/5yQeP+ckHj/nJB4/5yQeP+ckHj/nJB4/5yQeP+ckHj/nJB4/5yQeP+ckHj/nJB4/5yQ
eP+ckHj/nJB4/5yQeP+ckHj/nJB4/5yQeP+ckHj/nJB4/5yQeP8AAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAnJB4/5yQeP+ckHj/nJB4/5yQ
eP+ckHj/nJB4/5yQeP+ckHj/nJB4/5yQeP+ckHj/nJB4/5yQeP+ckHj/nJB4/5yQeP+ckHj/nJB4/5yQ
eP+ckHj/nJB4/5yQeP+ckHj/nJB4/5yQeP+ckHj/nJB4/5yQeP+ckHj/nJB4/5yQeP+ckHj/nJB4/5yQ
eP+ckHj/nJB4/5yQeP+ckHj/nJB4/5yQeP+ckHj/nJB4/5yQeP+ckHj/nJB4/5yQeP+ckHj/AAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAJyQ
eP+ckHj/nJB4/5yQeP+ckHj/nJB4/5yQeP+ckHj/nJB4/5yQeP+ckHj/nJB4/5yQeP+ckHj/nJB4/5yQ
eP+ckHj/nJB4/5yQeP+ckHj/nJB4/5yQeP+ckHj/nJB4/5yQeP+ckHj/nJB4/5yQeP+ckHj/nJB4/5yQ
eP+ckHj/nJB4/5yQeP+ckHj/nJB4/5yQeP+ckHj/nJB4/5yQeP+ckHj/nJB4/5yQeP+ckHj/nJB4/5yQ
eP+ckHj/nJB4/wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAACckHj/nJB4/5GGb/94bVf/aV5J/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2Ra
Rf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2Ra
Rf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2Ra
Rf9kWkX/aV5J/3huV/+Sh2//nJB4/5yQeP8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAnJB4/4h9Zv9lW0b/ZFpF/2RaRf9kWkX/ZFpF/2Ra
Rf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2Ra
Rf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2Ra
Rf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZltG/4l9Z/+ckHj/AAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAJKGbv9mW0b/ZFpF/2Ra
Rf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2Ra
Rf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2Ra
Rf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9lXEb/kodv/wAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAB3bVb/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2Ra
Rf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2Ra
Rf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2Ra
Rf9kWkX/ZFpF/3dtV/8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAaV9J/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2Ra
Rf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2Ra
Rf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2Ra
Rf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9qYEr/AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAGVaRvhkWkX/ZFpF/2RaRf9kWkX/ZFpF/2Ra
Rf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2Ra
Rf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2Ra
Rf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFtG9wAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABkWkXOZFpF/2Ra
Rf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2Ra
Rf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2Ra
Rf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2Ra
RM0AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAZFtFo2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2Ra
Rf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9rYUL/a2BC/2RaRf9kWkX/ZFpF/2Ra
Rf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2Ra
Rf9kWkX/ZFpF/2RaRf9lWkWiAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAGNbRnlkWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2Ra
Rf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9pX0P/1sAS/9G8
FP9oXkP/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2Ra
Rf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFlEeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABlXEVOZFpF/2RaRf9kWkX/ZFpF/2Ra
Rf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2Ra
Rf9pX0P/1sAS///lAP//5QD/0bwU/2heQ/9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2Ra
Rf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2NZRk0AAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAY1xHJGRa
Rf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2Ra
Rf9kWkX/ZFpF/2RaRf9pX0P/1sAS///lAP//5QD//+UA///lAP/RvBT/aF5D/2RaRf9kWkX/ZFpF/2Ra
Rf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2Ra
Rf9mV0IjAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAFVVVQNkWkX3ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2Ra
Rf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9pX0P/1sAS///lAP//5QD//+UA///lAP//5QD//+UA/9G8
FP9oXkP/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2Ra
Rf9kWkX/ZFpF/2RaRf9kWkX1gICAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAZFpFzmRaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2Ra
Rf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9pX0P/1sAS///lAP//5QD//+UA///l
AP//5QD//+UA///lAP//5QD/0bwU/2heQ/9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2Ra
Rf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpEzQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAGRbRaNkWkX/ZFpF/2Ra
Rf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9pX0P/1sAS///l
AP//5QD//+UA///lAP//5QD//+UA///lAP//5QD//+UA///lAP/RvBT/aF5D/2RaRf9kWkX/ZFpF/2Ra
Rf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2VaRaIAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AABjW0Z5ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2Ra
Rf9pX0P/1sAS///lAP//5QD//+UA///lAP//5QD//+UA///lAP//5QD//+UA///lAP//5QD//+UA/9G8
FP9oXkP/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2Ra
Rf9kWUR4AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAZVxFTmRaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2Ra
Rf9kWkX/ZFpF/2RaRf9pX0P/1sAS///lAP//5QD//+UA///lAP//5QD//+UA///lAP//5QD//+UA///l
AP//5QD//+UA///lAP//5QD/0bwU/2heQ/9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2Ra
Rf9kWkX/ZFpF/2RaRf9kWkX/Y1lGTQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAGNcRyRkWkX/ZFpF/2RaRf9kWkX/ZFpF/2Ra
Rf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9pX0P/1sAS///lAP//5QD//+UA///lAP//5QD//+UA///l
AP//5QD//+UA///lAP//5QD//+UA///lAP//5QD//+UA///lAP/RvBT/aF5D/2RaRf9kWkX/ZFpF/2Ra
Rf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2ZXQiMAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABVVVUDZFpF92Ra
Rf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9pX0P/1sAS///lAP//5QD//+UA///l
AP//5QD//+UA///lAP//5QD//+UA///lAP//5QD//+UA///lAP//5QD//+UA///lAP//5QD//+UA/9G8
FP9oXkP/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRfWAgIACAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAGRaRc5kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/g3Y3/6KS
Kf+ikin/opIp/6KSKf+ikin/opIp///lAP//5QD//+UA///lAP//5QD//+UA///lAP//5QD/opIp/6KS
Kf+ikin/opIp/6KSKf+ikin/g3Y3/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2Ra
Rf9kWkTNAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABkW0WjZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2Ra
Rf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf//5QD//+UA///lAP//5QD//+UA///l
AP//5QD//+UA/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2Ra
Rf9kWkX/ZFpF/2RaRf9kWkX/ZVpFogAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAY1tGeWRaRf9kWkX/ZFpF/2Ra
Rf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX//+UA///l
AP//5QD//+UA///lAP//5QD//+UA///lAP9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2Ra
Rf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RZRHgAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAGVc
RU5kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2Ra
Rf9kWkX/ZFpF///lAP//5QD//+UA///lAP//5QD//+UA///lAP//5QD/ZFpF/2RaRf9kWkX/ZFpF/2Ra
Rf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9jWUZNAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAABjXEckZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2Ra
Rf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf//5QD//+UA///lAP//5QD//+UA///lAP//5QD//+UA/2Ra
Rf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2Ra
Rf9kWkX/ZldCIwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAVVVVA2RaRfdkWkX/ZFpF/2RaRf9kWkX/ZFpF/2Ra
Rf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX//+UA///lAP//5QD//+UA///l
AP//5QD//+UA///lAP9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2Ra
Rf9kWkX/ZFpF/2RaRf9kWkX/ZFpF9YCAgAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABkWkXOZFpF/2Ra
Rf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF///l
AP//5QD//+UA///lAP//5QD//+UA///lAP//5QD/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2Ra
Rf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRM0AAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAZFtFo2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2Ra
Rf9kWkX/ZFpF/2RaRf//5QD//+UA///lAP//5QD//+UA///lAP//5QD//+UA/2RaRf9kWkX/ZFpF/2Ra
Rf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9lWkWiAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAGNbRnlkWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2Ra
Rf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX//+UA///lAP//5QD//+UA///lAP//5QD//+UA///l
AP9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2Ra
Rf9kWkX/ZFlEeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABlXEVOZFpF/2RaRf9kWkX/ZFpF/2Ra
Rf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF///lAP//5QD//+UA///l
AP//5QD//+UA///lAP//5QD/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2Ra
Rf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2NZRk0AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAY1xHJGRa
Rf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2Ra
Rf//5QD//+UA///lAP//5QD//+UA///lAP//5QD//+UA/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2Ra
Rf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9mV0IjAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAICAgAJkWkX0ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2Ra
Rf9kWkX/ZFpF/2RaRf9kWkX//+UA///lAP//5QD//+UA///lAP//5QD//+UA///lAP9kWkX/ZFpF/2Ra
Rf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkTygICAAgAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAZFpFwWRaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2Ra
Rf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF///lAP//5QD//+UA///lAP//5QD//+UA///l
AP//5QD/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2Ra
Rf9kWkX/ZVpFuQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAGVaRWBkWkX/ZFpF/2Ra
Rf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf//5QD//+UA///l
AP//5QD//+UA///lAP//5QD//+UA/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2Ra
Rf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RZRVkAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AACAgIACZFpFvWRaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2Ra
Rf9kWkX//+UA///lAP//5QD//+UA///lAP//5QD//+UA///lAP9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2Ra
Rf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRcGAgIACAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAGBgQBBkWkW4ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2Ra
Rf9kWkX/ZFpF/2RaRf9kWkX/ZFpF///lAP//5QD//+UA///lAP//5QD//+UA///lAP//5QD/ZFpF/2Ra
Rf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2VaRL5pWksRAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWNYREtkWkWXZFpFtWRa
RrtkWka7ZFpGu2RaRrtkWka7ZFpGu2RaRrtkWka7ZFpGu2RaRrv/5QD//+UA///lAP//5QD//+UA///l
AP//5QD//+UA/2RaRrtkWka7ZFpGu2RaRrtkWka7ZFpGu2RaRrtkWka7ZFpGu2RaRrtkWkW1ZFpGlmVb
RkkAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA/+UA///l
AP//5QD//+UA///lAP//5QD//+UA///lAP8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAP/lAP//5QD//+UA///lAP//5QD//+UA///lAP//5QD/AAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD/5QD//+UA///lAP//5QD//+UA///lAP//5QD//+UA/wAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA/+YAq//mAKv/5gCr/+YAq//m
AKv/5gCr/+YAq//mAKoAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD/////////////////////////////////////////////
///////////////////////////////gAAAAAAf//4AAAAAAAf//gAAAAAAB//8AAAAAAAD//wAAAAAA
AP//AAAAAAAA//8AAAAAAAD//wAAAAAAAP//AAAAAAAA//8AAAAAAAD//wAAAAAAAP//AAAAAAAA//8A
AAAAAAD//wAAAAAAAP//AAAAAAAA//8AAAAAAAD//wAAAAAAAP//AAAAAAAA//8AAAAAAAD//wAAAAAA
AP//AAAAAAAA//+AAAAAAAH//4AAAAAAAf//gAAAAAAB//+AAAAAAAH//4AAAAAAAf//gAAAAAAB///A
AAAAAAP//8AAAAAAA///wAAAAAAD///AAAAAAAP//8AAAAAAA///wAAAAAAD///gAAAAAAf//+AAAAAA
B///4AAAAAAH///gAAAAAAf//+AAAAAAB///4AAAAAAH///wAAAAAA////AAAAAAD///8AAAAAAP///w
AAAAAA////AAAAAAD///+AAAAAAf///4AAAAAB////wAAAAAP////wAAAAD///////AP////////8A//
///////wD/////////AP/////////////////////////////////////////////////////////w==
</value>
</data>
</root>

318
Pilz.Updating.Administration.GUI/PackageDescriptionEditor.Designer.cs generated
View File

@@ -7,7 +7,7 @@ using Microsoft.VisualBasic.CompilerServices;
namespace Pilz.Updating.Administration.GUI namespace Pilz.Updating.Administration.GUI
{ {
[DesignerGenerated()] [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. // Form overrides dispose to clean up the component list.
@@ -37,223 +37,171 @@ namespace Pilz.Updating.Administration.GUI
private void InitializeComponent() private void InitializeComponent()
{ {
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(PackageDescriptionEditor)); System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(PackageDescriptionEditor));
this.LayoutControl1 = new DevComponents.DotNetBar.Layout.LayoutControl(); this.radLabel1 = new Telerik.WinControls.UI.RadLabel();
this.ButtonX_Cancel = new DevComponents.DotNetBar.ButtonX(); this.radLabel2 = new Telerik.WinControls.UI.RadLabel();
this.ButtonX_Okay = new DevComponents.DotNetBar.ButtonX(); this.radLabel3 = new Telerik.WinControls.UI.RadLabel();
this.textBoxX1 = new DevComponents.DotNetBar.Controls.TextBoxX(); this.radTextBoxControl_Titel = new Telerik.WinControls.UI.RadTextBoxControl();
this.textBoxX2 = new DevComponents.DotNetBar.Controls.RichTextBoxEx(); this.radRichTextEditor_Description = new Telerik.WinControls.UI.RadRichTextEditor();
this.comboBoxEx_Format = new DevComponents.DotNetBar.Controls.ComboBoxEx(); this.panel1 = new System.Windows.Forms.Panel();
this.layoutControlItem1 = new DevComponents.DotNetBar.Layout.LayoutControlItem(); this.radButton_Okay = new Telerik.WinControls.UI.RadButton();
this.layoutControlItem2 = new DevComponents.DotNetBar.Layout.LayoutControlItem(); this.radButton_Cancel = new Telerik.WinControls.UI.RadButton();
this.layoutControlItem3 = new DevComponents.DotNetBar.Layout.LayoutControlItem(); this.radDropDownList_Formatting = new Telerik.WinControls.UI.RadDropDownList();
this.LayoutSpacerItem1 = new DevComponents.DotNetBar.Layout.LayoutSpacerItem(); ((System.ComponentModel.ISupportInitialize)(this.radLabel1)).BeginInit();
this.LayoutControlItem5 = new DevComponents.DotNetBar.Layout.LayoutControlItem(); ((System.ComponentModel.ISupportInitialize)(this.radLabel2)).BeginInit();
this.LayoutControlItem6 = new DevComponents.DotNetBar.Layout.LayoutControlItem(); ((System.ComponentModel.ISupportInitialize)(this.radLabel3)).BeginInit();
this.LayoutControl1.SuspendLayout(); ((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(); this.SuspendLayout();
// //
// LayoutControl1 // radLabel1
// //
this.LayoutControl1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(255))))); this.radLabel1.Location = new System.Drawing.Point(3, 5);
this.LayoutControl1.Controls.Add(this.ButtonX_Cancel); this.radLabel1.Name = "radLabel1";
this.LayoutControl1.Controls.Add(this.ButtonX_Okay); this.radLabel1.Size = new System.Drawing.Size(30, 18);
this.LayoutControl1.Controls.Add(this.textBoxX1); this.radLabel1.TabIndex = 0;
this.LayoutControl1.Controls.Add(this.textBoxX2); this.radLabel1.Text = "Titel:";
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";
// //
// 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[] { // radLabel3
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;
// //
// 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; // radTextBoxControl_Titel
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";
// //
// 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; // radRichTextEditor_Description
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";
// //
// 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.radButton_Okay.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
this.textBoxX1.Border.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.radButton_Okay.DialogResult = System.Windows.Forms.DialogResult.OK;
this.textBoxX1.DisabledBackColor = System.Drawing.Color.White; this.radButton_Okay.Image = global::Pilz.Updating.Administration.GUI.My.Resources.Resources.icons8_checkmark_16px;
this.textBoxX1.ForeColor = System.Drawing.Color.Black; this.radButton_Okay.ImageAlignment = System.Drawing.ContentAlignment.MiddleRight;
this.textBoxX1.Location = new System.Drawing.Point(84, 4); this.radButton_Okay.Location = new System.Drawing.Point(281, 267);
this.textBoxX1.Margin = new System.Windows.Forms.Padding(0); this.radButton_Okay.Name = "radButton_Okay";
this.textBoxX1.Name = "textBoxX1"; this.radButton_Okay.Size = new System.Drawing.Size(100, 24);
this.textBoxX1.PreventEnterBeep = true; this.radButton_Okay.TabIndex = 4;
this.textBoxX1.Size = new System.Drawing.Size(296, 20); this.radButton_Okay.Text = "Okay";
this.textBoxX1.TabIndex = 0; 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.radDropDownList_Formatting.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
this.textBoxX2.BackgroundStyle.Class = "TextBoxBorder"; this.radDropDownList_Formatting.DropDownAnimationEnabled = true;
this.textBoxX2.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.radDropDownList_Formatting.DropDownStyle = Telerik.WinControls.RadDropDownStyle.DropDownList;
this.textBoxX2.ForeColor = System.Drawing.Color.Black; this.radDropDownList_Formatting.Location = new System.Drawing.Point(89, 237);
this.textBoxX2.Location = new System.Drawing.Point(84, 32); this.radDropDownList_Formatting.Name = "radDropDownList_Formatting";
this.textBoxX2.Margin = new System.Windows.Forms.Padding(0); this.radDropDownList_Formatting.Size = new System.Drawing.Size(292, 24);
this.textBoxX2.Name = "textBoxX2"; this.radDropDownList_Formatting.TabIndex = 6;
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;
// //
// PackageDescriptionEditor // 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.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.CancelButton = this.ButtonX_Cancel; this.CancelButton = this.radButton_Cancel;
this.ClientSize = new System.Drawing.Size(384, 311); this.ClientSize = new System.Drawing.Size(384, 294);
this.Controls.Add(this.LayoutControl1); this.Controls.Add(this.panel1);
this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.SizableToolWindow; this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.SizableToolWindow;
this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
this.MaximizeBox = false; this.MaximizeBox = false;
this.MinimizeBox = false; this.MinimizeBox = false;
this.Name = "PackageDescriptionEditor"; this.Name = "PackageDescriptionEditor";
//
//
//
this.RootElement.ApplyShapeToControl = true;
this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
this.Text = "Beschreibung"; this.Text = "Beschreibung";
this.TopLeftCornerSize = 0; ((System.ComponentModel.ISupportInitialize)(this.radLabel1)).EndInit();
this.TopRightCornerSize = 0; ((System.ComponentModel.ISupportInitialize)(this.radLabel2)).EndInit();
this.LayoutControl1.ResumeLayout(false); ((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); this.ResumeLayout(false);
} }
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 DevComponents.DotNetBar.Layout.LayoutControl LayoutControl1; 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;
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;
} }
} }

25
Pilz.Updating.Administration.GUI/PackageDescriptionEditor.cs
View File

@@ -2,6 +2,7 @@
using DevComponents.DotNetBar; using DevComponents.DotNetBar;
using global::DevComponents.Editors; using global::DevComponents.Editors;
using Microsoft.VisualBasic.CompilerServices; using Microsoft.VisualBasic.CompilerServices;
using Telerik.WinControls.UI;
namespace Pilz.Updating.Administration.GUI namespace Pilz.Updating.Administration.GUI
{ {
@@ -14,14 +15,12 @@ namespace Pilz.Updating.Administration.GUI
{ {
InitializeComponent(); InitializeComponent();
comboBoxEx_Format.Items.AddRange(new ComboItem[] radDropDownList_Formatting.Items.AddRange(new RadListDataItem[]
{ {
new ComboItem { Text = "Nur Text", Tag = UpdateNotesContentType.PlainText }, new RadListDataItem { Text = "Nur Text", Tag = UpdateNotesContentType.PlainText },
new ComboItem { Text = "Markdown", Tag = UpdateNotesContentType.Markdown }, new RadListDataItem { Text = "Markdown", Tag = UpdateNotesContentType.Markdown },
new ComboItem { Text = "HTML", Tag = UpdateNotesContentType.HTML }, new RadListDataItem { Text = "HTML", Tag = UpdateNotesContentType.HTML },
}); });
UpdateAmbientColors();
} }
// P r o p e r t i e s // P r o p e r t i e s
@@ -30,11 +29,11 @@ namespace Pilz.Updating.Administration.GUI
{ {
get get
{ {
return textBoxX1.Text; return radTextBoxControl_Titel.Text;
} }
set set
{ {
textBoxX1.Text = value; radTextBoxControl_Titel.Text = value;
} }
} }
@@ -42,23 +41,23 @@ namespace Pilz.Updating.Administration.GUI
{ {
get get
{ {
return textBoxX2.Text; return radRichTextEditor_Description.Text;
} }
set set
{ {
textBoxX2.Text = value; radRichTextEditor_Description.Text = value;
} }
} }
public UpdateNotesContentType DescriptionType public UpdateNotesContentType DescriptionType
{ {
get => get =>
(UpdateNotesContentType)(comboBoxEx_Format.SelectedItem as ComboItem)?.Tag; (UpdateNotesContentType)radDropDownList_Formatting.SelectedItem?.Tag;
set set
{ {
foreach (ComboItem item in comboBoxEx_Format.Items) foreach (var item in radDropDownList_Formatting.Items)
if ((UpdateNotesContentType)item.Tag == value) if ((UpdateNotesContentType)item.Tag == value)
comboBoxEx_Format.SelectedItem = item; radDropDownList_Formatting.SelectedItem = item;
} }
} }
} }

62
Pilz.Updating.Administration.GUI/PackageDescriptionEditor.resx
View File

@@ -1,64 +1,4 @@
<?xml version="1.0" encoding="utf-8"?> <root>
<root>
<!--
Microsoft ResX Schema
Version 2.0
The primary goals of this format is to allow a simple XML format
that is mostly human readable. The generation and parsing of the
various data types are done through the TypeConverter classes
associated with the data types.
Example:
... ado.net/XML headers & schema ...
<resheader name="resmimetype">text/microsoft-resx</resheader>
<resheader name="version">2.0</resheader>
<resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
<resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
<data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
<data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
<data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
<value>[base64 mime encoded serialized .NET Framework object]</value>
</data>
<data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
<comment>This is a comment</comment>
</data>
There are any number of "resheader" rows that contain simple
name/value pairs.
Each data row contains a name, and value. The row also contains a
type or mimetype. Type corresponds to a .NET class that support
text/value conversion through the TypeConverter architecture.
Classes that don't support this are serialized and stored with the
mimetype set.
The mimetype is used for serialized objects, and tells the
ResXResourceReader how to depersist the object. This is currently not
extensible. For a given mimetype the value must be set accordingly:
Note - application/x-microsoft.net.object.binary.base64 is the format
that the ResXResourceWriter will generate, however the reader can
read any of the formats listed below.
mimetype: application/x-microsoft.net.object.binary.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.soap.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Soap.SoapFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.bytearray.base64
value : The object must be serialized into a byte array
: using a System.ComponentModel.TypeConverter
: and then encoded with base64 encoding.
-->
<xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata"> <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
<xsd:import namespace="http://www.w3.org/XML/1998/namespace" /> <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
<xsd:element name="root" msdata:IsDataSet="true"> <xsd:element name="root" msdata:IsDataSet="true">

275
Pilz.Updating.Administration.GUI/Pilz - Backup.Updating.Administration.GUI.csproj Normal file
View File

@@ -0,0 +1,275 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<OutputType>WinExe</OutputType>
<StartupObject>Pilz.Updating.Administration.GUI.My.MyApplication</StartupObject>
<RootNamespace>Pilz.Updating.Administration.GUI</RootNamespace>
<MyType>WindowsForms</MyType>
<TargetFramework>net6.0-windows</TargetFramework>
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
<DefaultItemExcludes>$(DefaultItemExcludes);$(ProjectDir)**\*.vb</DefaultItemExcludes>
<LangVersion>latest</LangVersion>
<AssemblyTitle>Pilz.Updating.Administration</AssemblyTitle>
<Company>Pilzinsel64</Company>
<Product>Pilz.Updating.Administration</Product>
<Copyright>Copyright © Pilzinsel64 2019 - 2020</Copyright>
<DocumentationFile>Pilz.Updating.Administration.GUI.xml</DocumentationFile>
<DefineTrace>true</DefineTrace>
<NoWarn>42016,41999,42017,42018,42019,42032,42036,42020,42021,42022,CS1591,CS0660,CS0661,CS0436</NoWarn>
<ExtrasEnableWinFormsProjectSetup>true</ExtrasEnableWinFormsProjectSetup>
<UseWindowsForms>true</UseWindowsForms>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DefineDebug>true</DefineDebug>
<PlatformTarget>AnyCPU</PlatformTarget>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DefineDebug>false</DefineDebug>
</PropertyGroup>
<PropertyGroup>
<OptionExplicit>On</OptionExplicit>
</PropertyGroup>
<PropertyGroup>
<OptionCompare>Binary</OptionCompare>
</PropertyGroup>
<PropertyGroup>
<OptionStrict>Off</OptionStrict>
</PropertyGroup>
<PropertyGroup>
<OptionInfer>On</OptionInfer>
</PropertyGroup>
<PropertyGroup>
<ApplicationIcon>icons8_software_installer.ico</ApplicationIcon>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'RelMono|AnyCPU'">
<Optimize>true</Optimize>
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
<DefineConstants>TRACE;RelMono</DefineConstants>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft-WindowsAPICodePack-Shell" Version="1.1.4" />
<PackageReference Include="Microsoft.VisualBasic" Version="10.3.0" />
<PackageReference Include="System.Data.DataSetExtensions" Version="4.5.0" />
<PackageReference Include="System.Net.Http" Version="4.3.4" />
<PackageReference Include="UI.for.WinForms.AllControls.Net60">
<Version>2022.2.510.0</Version>
</PackageReference>
</ItemGroup>
<ItemGroup>
<Reference Include="DevComponents.DotNetBar2">
<HintPath>..\Shared Libs\DotNetBarNew\DevComponents.DotNetBar2.dll</HintPath>
</Reference>
<Reference Include="DevComponents.DotNetBar.Design">
<HintPath>..\Shared Libs\DotNetBarNew\DevComponents.DotNetBar.Design.dll</HintPath>
<Private>False</Private>
</Reference>
<Reference Include="DevComponents.DotNetBar.Layout">
<HintPath>..\Shared Libs\DotNetBarNew\DevComponents.DotNetBar.Layout.dll</HintPath>
</Reference>
<Reference Include="DevComponents.DotNetBar.Layout.Design">
<HintPath>..\Shared Libs\DotNetBarNew\DevComponents.DotNetBar.Layout.Design.dll</HintPath>
<Private>False</Private>
</Reference>
<Reference Include="Pilz.Cryptography">
<HintPath>..\Shared Libs\Pilz.Cryptography.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>
<Import Include="Microsoft.VisualBasic" />
<Import Include="System" />
<Import Include="System.Collections" />
<Import Include="System.Collections.Generic" />
<Import Include="System.Data" />
<Import Include="System.Drawing" />
<Import Include="System.Diagnostics" />
<Import Include="System.Windows.Forms" />
<Import Include="System.Linq" />
<Import Include="System.Xml.Linq" />
<Import Include="System.Threading.Tasks" />
<Import Include="Z.Collections.Extensions" />
</ItemGroup>
<ItemGroup>
<Compile Update="DiscordBotSettingsWindow.cs">
<SubType>Form</SubType>
</Compile>
<Compile Update="DiscordBotSettingsWindow.Designer.cs">
<DependentUpon>DiscordBotSettingsWindow.cs</DependentUpon>
</Compile>
<Compile Update="DiscordPostDialog.cs">
<SubType>Form</SubType>
</Compile>
<Compile Update="DiscordPostDialog.Designer.cs">
<DependentUpon>DiscordPostDialog.cs</DependentUpon>
</Compile>
<Compile Update="PackageDescriptionEditor.cs">
<SubType>Form</SubType>
</Compile>
<Compile Update="PackageDescriptionEditor.Designer.cs">
<DependentUpon>PackageDescriptionEditor.cs</DependentUpon>
</Compile>
<Compile Update="ApplicationVersionInput.Designer.cs">
<DependentUpon>ApplicationVersionInput.cs</DependentUpon>
</Compile>
<Compile Update="ApplicationVersionInput.cs">
<SubType>Form</SubType>
</Compile>
<Compile Update="UpdateManagerWindow.cs">
<SubType>Form</SubType>
</Compile>
<Compile Update="UpdateManagerWindow.Designer.cs">
<DependentUpon>UpdateManagerWindow.cs</DependentUpon>
</Compile>
<Compile Update="PackageCreationDialog.cs">
<SubType>Form</SubType>
</Compile>
<Compile Update="PackageCreationDialog.Designer.cs">
<DependentUpon>PackageCreationDialog.cs</DependentUpon>
<SubType>Form</SubType>
</Compile>
<Compile Update="My Project\Application.Designer.cs">
<AutoGen>True</AutoGen>
<DependentUpon>Application.myapp</DependentUpon>
</Compile>
<Compile Update="Properties\Resources.Designer.cs">
<AutoGen>True</AutoGen>
<DesignTime>True</DesignTime>
<DependentUpon>Resources.resx</DependentUpon>
</Compile>
<Compile Update="Properties\Settings.Designer.cs">
<AutoGen>True</AutoGen>
<DependentUpon>Settings.settings</DependentUpon>
<DesignTimeSharedInput>True</DesignTimeSharedInput>
</Compile>
<Compile Update="ToolSelectionWindow.Designer.cs">
<DependentUpon>ToolSelectionWindow.cs</DependentUpon>
</Compile>
<Compile Update="ToolSelectionWindow.cs">
<SubType>Form</SubType>
</Compile>
<Compile Update="ProxyConfigEditor.cs">
<SubType>Form</SubType>
</Compile>
<Compile Update="ProxyConfigEditor.Designer.cs">
<DependentUpon>ProxyConfigEditor.cs</DependentUpon>
</Compile>
<Compile Update="UpdateServerInfoEditor.cs">
<SubType>Form</SubType>
</Compile>
<Compile Update="UpdateServerInfoEditor.Designer.cs">
<DependentUpon>UpdateServerInfoEditor.cs</DependentUpon>
</Compile>
<Compile Update="UpdatingAdministrationLangRes.Designer.cs">
<AutoGen>True</AutoGen>
<DesignTime>True</DesignTime>
<DependentUpon>UpdatingAdministrationLangRes.resx</DependentUpon>
</Compile>
</ItemGroup>
<ItemGroup>
<EmbeddedResource Update="DiscordBotSettingsWindow.resx">
<DependentUpon>DiscordBotSettingsWindow.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Update="DiscordPostDialog.resx">
<DependentUpon>DiscordPostDialog.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Update="PackageDescriptionEditor.resx">
<DependentUpon>PackageDescriptionEditor.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Update="ApplicationVersionInput.resx">
<DependentUpon>ApplicationVersionInput.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Update="UpdateManagerWindow.resx">
<DependentUpon>UpdateManagerWindow.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Update="PackageCreationDialog.resx">
<DependentUpon>PackageCreationDialog.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Update="Properties\Resources.resx">
<Generator>ResXFileCodeGenerator</Generator>
<CustomToolNamespace>Pilz.Updating.Administration.GUI.My.Resources</CustomToolNamespace>
<SubType>Designer</SubType>
<LastGenOutput>Resources.Designer.cs</LastGenOutput>
</EmbeddedResource>
<EmbeddedResource Update="ToolSelectionWindow.resx">
<DependentUpon>ToolSelectionWindow.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Update="ProxyConfigEditor.resx">
<DependentUpon>ProxyConfigEditor.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Update="UpdateServerInfoEditor.resx">
<DependentUpon>UpdateServerInfoEditor.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Update="UpdatingAdministrationLangRes.resx">
<CustomToolNamespace>Pilz.Updating.Administration.GUI.My.Resources</CustomToolNamespace>
<Generator>ResXFileCodeGenerator</Generator>
<LastGenOutput>UpdatingAdministrationLangRes.Designer.cs</LastGenOutput>
</EmbeddedResource>
</ItemGroup>
<ItemGroup>
<None Include="My Project\Application.myapp">
<Generator>MyApplicationCodeGenerator</Generator>
<LastGenOutput>Application.Designer.cs</LastGenOutput>
</None>
<None Include="Properties\Settings.settings">
<Generator>SettingsSingleFileGenerator</Generator>
<CustomToolNamespace>Pilz.Updating.Administration.GUI.My</CustomToolNamespace>
<LastGenOutput>Settings.Designer.cs</LastGenOutput>
</None>
</ItemGroup>
<ItemGroup>
<Content Include="icons8_software_installer.ico" />
<None Include="Resources\icons8_connected_no_data_32px.png" />
<None Include="Resources\icons8_firewall_32px.png" />
<None Include="Resources\icons8_firewall_480px.png" />
<None Include="Resources\icons8_email_send_16px.png" />
<None Include="Resources\icons8_checkmark_32px.png" />
<None Include="Resources\icons8_discord_new_logo_32px.png" />
<None Include="Resources\icons8_upload_to_cloud_32px.png" />
<None Include="Resources\icons8_upload_32px.png" />
<None Include="Resources\icons8_import_32px.png" />
<None Include="Resources\icons8_opened_folder_16px.png" />
<None Include="Resources\icons8_new_file_16px.png" />
<None Include="Resources\icons8_delete_16px.png" />
<None Include="Resources\icons8_checkmark_16px.png" />
<None Include="Resources\icons8_support_32px_1.png" />
<None Include="Resources\icons8_new_file_32px.png" />
<None Include="Resources\icons8_code_file_32px_1.png" />
<None Include="Resources\icons8_template_32px.png" />
<None Include="Resources\icons8_view_file_32px_1.png" />
<None Include="Resources\icons8_code_file_32px.png" />
<None Include="Resources\icons8_documents_folder_32px.png" />
<None Include="Resources\icons8_merge_files_32px.png" />
<None Include="Resources\icons8_merge_files_16px_1.png" />
<None Include="Resources\icons8_delete_sign_16px.png" />
<None Include="Resources\icons8_add_16px.png" />
<None Include="Resources\icons8_link_32px.png" />
<None Include="Resources\icons8_edit_property_32px.png" />
<None Include="Resources\icons8_edit_file_32px.png" />
<None Include="Resources\icons8_edit_32px.png" />
<None Include="Resources\icons8_delete_sign_32px_1.png" />
<None Include="Resources\icons8_add_32px.png" />
<None Include="Resources\icons8_versions_32px.png" />
<None Include="Resources\icons8_open_box_32px.png" />
<None Include="Resources\icons8_administrative_tools_32px.png" />
<None Include="Resources\icons8_export_32px_3.png" />
<None Include="Resources\icons8_save_as_32px.png" />
<None Include="Resources\icons8_opened_folder_32px.png" />
<None Include="Resources\icons8_save_32px.png" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\Pilz.Updating.Administration\Pilz.Updating.Administration.csproj" />
<ProjectReference Include="..\Pilz.Updating\Pilz.Updating.csproj" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Fody" Version="6.6.2">
<PrivateAssets>all</PrivateAssets>
</PackageReference>
<PackageReference Include="Markdig" Version="0.30.2" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
<PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="6.0.0" />
<PackageReference Include="Z.ExtensionMethods.WithNamespace" Version="2.1.1" />
</ItemGroup>
<ItemGroup>
<Compile Remove="obj\RelMono\TemporaryGeneratedFile_036C0B5B-1481-4323-8D20-8F5ADCB23D92.cs" />
<Compile Remove="obj\RelMono\TemporaryGeneratedFile_5937a670-0e60-4077-877b-f7221da3dda1.cs" />
<Compile Remove="obj\RelMono\TemporaryGeneratedFile_E7A71F73-0F8D-4B9B-B56E-8E70B10BC5D3.cs" />
</ItemGroup>
</Project>

71
Pilz.Updating.Administration.GUI/Pilz.Updating.Administration.GUI.csproj
View File

@@ -1,10 +1,10 @@
<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop"> <Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup> <PropertyGroup>
<OutputType>WinExe</OutputType> <OutputType>WinExe</OutputType>
<StartupObject>Pilz.Updating.Administration.GUI.My.MyApplication</StartupObject> <StartupObject>Pilz.Updating.Administration.GUI.My.MyApplication</StartupObject>
<RootNamespace>Pilz.Updating.Administration.GUI</RootNamespace> <RootNamespace>Pilz.Updating.Administration.GUI</RootNamespace>
<MyType>WindowsForms</MyType> <MyType>WindowsForms</MyType>
<TargetFramework>net48</TargetFramework> <TargetFramework>net6.0-windows</TargetFramework>
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects> <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
<DefaultItemExcludes>$(DefaultItemExcludes);$(ProjectDir)**\*.vb</DefaultItemExcludes> <DefaultItemExcludes>$(DefaultItemExcludes);$(ProjectDir)**\*.vb</DefaultItemExcludes>
<LangVersion>latest</LangVersion> <LangVersion>latest</LangVersion>
@@ -47,17 +47,17 @@
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Microsoft-WindowsAPICodePack-Shell" Version="1.1.4" /> <PackageReference Include="Microsoft-WindowsAPICodePack-Shell" Version="1.1.4" />
<PackageReference Include="Microsoft.VisualBasic" Version="10.3.0" />
<PackageReference Include="System.Data.DataSetExtensions" Version="4.5.0" /> <PackageReference Include="System.Data.DataSetExtensions" Version="4.5.0" />
<PackageReference Include="System.Net.Http" Version="4.3.4" /> <PackageReference Include="System.Net.Http" Version="4.3.4" />
<PackageReference Include="UI.for.WinForms.AllControls.Net60">
<Version>2022.2.510.0</Version>
</PackageReference>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<Reference Include="DevComponents.DotNetBar2"> <Reference Include="DevComponents.DotNetBar2">
<HintPath>..\Shared Libs\DotNetBarNew\DevComponents.DotNetBar2.dll</HintPath> <HintPath>..\Shared Libs\DotNetBarNew\DevComponents.DotNetBar2.dll</HintPath>
</Reference> </Reference>
<Reference Include="drsPwEnc">
<HintPath>..\Shared Libs\drsPwEnc.dll</HintPath>
</Reference>
<Reference Include="Microsoft.VisualBasic" />
<Reference Include="DevComponents.DotNetBar.Design"> <Reference Include="DevComponents.DotNetBar.Design">
<HintPath>..\Shared Libs\DotNetBarNew\DevComponents.DotNetBar.Design.dll</HintPath> <HintPath>..\Shared Libs\DotNetBarNew\DevComponents.DotNetBar.Design.dll</HintPath>
<Private>False</Private> <Private>False</Private>
@@ -72,9 +72,6 @@
<Reference Include="Pilz.Cryptography"> <Reference Include="Pilz.Cryptography">
<HintPath>..\Shared Libs\Pilz.Cryptography.dll</HintPath> <HintPath>..\Shared Libs\Pilz.Cryptography.dll</HintPath>
</Reference> </Reference>
<Reference Include="System.Deployment" />
<Reference Include="System.Windows.Forms" />
<Reference Include="mscorlib" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<Import Include="Microsoft.VisualBasic" /> <Import Include="Microsoft.VisualBasic" />
@@ -103,9 +100,7 @@
<Compile Update="DiscordPostDialog.Designer.cs"> <Compile Update="DiscordPostDialog.Designer.cs">
<DependentUpon>DiscordPostDialog.cs</DependentUpon> <DependentUpon>DiscordPostDialog.cs</DependentUpon>
</Compile> </Compile>
<Compile Update="PackageDescriptionEditor.cs"> <Compile Update="PackageDescriptionEditor.cs" />
<SubType>Form</SubType>
</Compile>
<Compile Update="PackageDescriptionEditor.Designer.cs"> <Compile Update="PackageDescriptionEditor.Designer.cs">
<DependentUpon>PackageDescriptionEditor.cs</DependentUpon> <DependentUpon>PackageDescriptionEditor.cs</DependentUpon>
</Compile> </Compile>
@@ -115,19 +110,10 @@
<Compile Update="ApplicationVersionInput.cs"> <Compile Update="ApplicationVersionInput.cs">
<SubType>Form</SubType> <SubType>Form</SubType>
</Compile> </Compile>
<Compile Update="UpdateManagerWindow.cs"> <Compile Update="UpdateManagerWindow.cs" />
<SubType>Form</SubType>
</Compile>
<Compile Update="UpdateManagerWindow.Designer.cs"> <Compile Update="UpdateManagerWindow.Designer.cs">
<DependentUpon>UpdateManagerWindow.cs</DependentUpon> <DependentUpon>UpdateManagerWindow.cs</DependentUpon>
</Compile> </Compile>
<Compile Update="PackageCreationDialog.cs">
<SubType>Form</SubType>
</Compile>
<Compile Update="PackageCreationDialog.Designer.cs">
<DependentUpon>PackageCreationDialog.cs</DependentUpon>
<SubType>Form</SubType>
</Compile>
<Compile Update="My Project\Application.Designer.cs"> <Compile Update="My Project\Application.Designer.cs">
<AutoGen>True</AutoGen> <AutoGen>True</AutoGen>
<DependentUpon>Application.myapp</DependentUpon> <DependentUpon>Application.myapp</DependentUpon>
@@ -142,21 +128,13 @@
<DependentUpon>Settings.settings</DependentUpon> <DependentUpon>Settings.settings</DependentUpon>
<DesignTimeSharedInput>True</DesignTimeSharedInput> <DesignTimeSharedInput>True</DesignTimeSharedInput>
</Compile> </Compile>
<Compile Update="ToolSelectionWindow.Designer.cs">
<DependentUpon>ToolSelectionWindow.cs</DependentUpon>
</Compile>
<Compile Update="ToolSelectionWindow.cs">
<SubType>Form</SubType>
</Compile>
<Compile Update="ProxyConfigEditor.cs"> <Compile Update="ProxyConfigEditor.cs">
<SubType>Form</SubType> <SubType>Form</SubType>
</Compile> </Compile>
<Compile Update="ProxyConfigEditor.Designer.cs"> <Compile Update="ProxyConfigEditor.Designer.cs">
<DependentUpon>ProxyConfigEditor.cs</DependentUpon> <DependentUpon>ProxyConfigEditor.cs</DependentUpon>
</Compile> </Compile>
<Compile Update="UpdateServerInfoEditor.cs"> <Compile Update="UpdateServerInfoEditor.cs" />
<SubType>Form</SubType>
</Compile>
<Compile Update="UpdateServerInfoEditor.Designer.cs"> <Compile Update="UpdateServerInfoEditor.Designer.cs">
<DependentUpon>UpdateServerInfoEditor.cs</DependentUpon> <DependentUpon>UpdateServerInfoEditor.cs</DependentUpon>
</Compile> </Compile>
@@ -182,18 +160,12 @@
<EmbeddedResource Update="UpdateManagerWindow.resx"> <EmbeddedResource Update="UpdateManagerWindow.resx">
<DependentUpon>UpdateManagerWindow.cs</DependentUpon> <DependentUpon>UpdateManagerWindow.cs</DependentUpon>
</EmbeddedResource> </EmbeddedResource>
<EmbeddedResource Update="PackageCreationDialog.resx">
<DependentUpon>PackageCreationDialog.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Update="Properties\Resources.resx"> <EmbeddedResource Update="Properties\Resources.resx">
<Generator>ResXFileCodeGenerator</Generator> <Generator>ResXFileCodeGenerator</Generator>
<CustomToolNamespace>Pilz.Updating.Administration.GUI.My.Resources</CustomToolNamespace> <CustomToolNamespace>Pilz.Updating.Administration.GUI.My.Resources</CustomToolNamespace>
<SubType>Designer</SubType> <SubType>Designer</SubType>
<LastGenOutput>Resources.Designer.cs</LastGenOutput> <LastGenOutput>Resources.Designer.cs</LastGenOutput>
</EmbeddedResource> </EmbeddedResource>
<EmbeddedResource Update="ToolSelectionWindow.resx">
<DependentUpon>ToolSelectionWindow.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Update="ProxyConfigEditor.resx"> <EmbeddedResource Update="ProxyConfigEditor.resx">
<DependentUpon>ProxyConfigEditor.cs</DependentUpon> <DependentUpon>ProxyConfigEditor.cs</DependentUpon>
</EmbeddedResource> </EmbeddedResource>
@@ -262,16 +234,9 @@
<ProjectReference Include="..\Pilz.Updating\Pilz.Updating.csproj" /> <ProjectReference Include="..\Pilz.Updating\Pilz.Updating.csproj" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Costura.Fody" Version="5.3.0"> <PackageReference Include="Markdig" Version="0.30.2" />
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="Fody" Version="6.5.1">
<PrivateAssets>all</PrivateAssets>
</PackageReference>
<PackageReference Include="Markdig" Version="0.25.0" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.1" /> <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
<PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="5.0.0" /> <PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="6.0.0" />
<PackageReference Include="Z.ExtensionMethods.WithNamespace" Version="2.1.1" /> <PackageReference Include="Z.ExtensionMethods.WithNamespace" Version="2.1.1" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
@@ -279,4 +244,18 @@
<Compile Remove="obj\RelMono\TemporaryGeneratedFile_5937a670-0e60-4077-877b-f7221da3dda1.cs" /> <Compile Remove="obj\RelMono\TemporaryGeneratedFile_5937a670-0e60-4077-877b-f7221da3dda1.cs" />
<Compile Remove="obj\RelMono\TemporaryGeneratedFile_E7A71F73-0F8D-4B9B-B56E-8E70B10BC5D3.cs" /> <Compile Remove="obj\RelMono\TemporaryGeneratedFile_E7A71F73-0F8D-4B9B-B56E-8E70B10BC5D3.cs" />
</ItemGroup> </ItemGroup>
<ItemGroup>
<None Remove="CustomThemes\FluentDarkPurple.tssp" />
<None Remove="CustomThemes\FluentPurple.tssp" />
<None Remove="CustomThemes\Office2019DarkPurple.tssp" />
<None Remove="CustomThemes\Office2019GrayPurple.tssp" />
<None Remove="CustomThemes\Office2019LightPurple.tssp" />
</ItemGroup>
<ItemGroup>
<EmbeddedResource Include="CustomThemes\FluentDarkPurple.tssp" />
<EmbeddedResource Include="CustomThemes\FluentPurple.tssp" />
<EmbeddedResource Include="CustomThemes\Office2019DarkPurple.tssp" />
<EmbeddedResource Include="CustomThemes\Office2019GrayPurple.tssp" />
<EmbeddedResource Include="CustomThemes\Office2019LightPurple.tssp" />
</ItemGroup>
</Project> </Project>

22
Pilz.Updating.Administration.GUI/Properties/Resources.Designer.cs generated
View File

@@ -19,7 +19,7 @@ namespace Pilz.Updating.Administration.GUI.My.Resources {
// -Klasse über ein Tool wie ResGen oder Visual Studio automatisch generiert. // -Klasse über ein Tool wie ResGen oder Visual Studio automatisch generiert.
// Um einen Member hinzuzufügen oder zu entfernen, bearbeiten Sie die .ResX-Datei und führen dann ResGen // Um einen Member hinzuzufügen oder zu entfernen, bearbeiten Sie die .ResX-Datei und führen dann ResGen
// mit der /str-Option erneut aus, oder Sie erstellen Ihr VS-Projekt neu. // mit der /str-Option erneut aus, oder Sie erstellen Ihr VS-Projekt neu.
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "16.0.0.0")] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "17.0.0.0")]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
internal class Resources { internal class Resources {
@@ -300,6 +300,16 @@ namespace Pilz.Updating.Administration.GUI.My.Resources {
} }
} }
/// <summary>
/// Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
/// </summary>
internal static System.Drawing.Bitmap icons8_open_box_16px {
get {
object obj = ResourceManager.GetObject("icons8_open_box_16px", resourceCulture);
return ((System.Drawing.Bitmap)(obj));
}
}
/// <summary> /// <summary>
/// Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. /// Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
/// </summary> /// </summary>
@@ -350,6 +360,16 @@ namespace Pilz.Updating.Administration.GUI.My.Resources {
} }
} }
/// <summary>
/// Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
/// </summary>
internal static System.Drawing.Bitmap icons8_software_installer_16px {
get {
object obj = ResourceManager.GetObject("icons8_software_installer_16px", resourceCulture);
return ((System.Drawing.Bitmap)(obj));
}
}
/// <summary> /// <summary>
/// Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. /// Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
/// </summary> /// </summary>

140
Pilz.Updating.Administration.GUI/Properties/Resources.resx
View File

@@ -121,95 +121,86 @@
<data name="icons8_administrative_tools_32px" type="System.Resources.ResXFileRef, System.Windows.Forms"> <data name="icons8_administrative_tools_32px" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\icons8_administrative_tools_32px.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> <value>..\Resources\icons8_administrative_tools_32px.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data> </data>
<data name="icons8_export_32px_3" type="System.Resources.ResXFileRef, System.Windows.Forms"> <data name="icons8_firewall_32px" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\icons8_export_32px_3.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> <value>..\Resources\icons8_firewall_32px.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="icons8_opened_folder_32px" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\icons8_opened_folder_32px.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="icons8_open_box_32px" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\icons8_open_box_32px.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="icons8_save_32px" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\icons8_save_32px.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="icons8_save_as_32px" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\icons8_save_as_32px.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="icons8_add_32px" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\icons8_add_32px.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="icons8_delete_sign_32px_1" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\icons8_delete_sign_32px_1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="icons8_edit_32px" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\icons8_edit_32px.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="icons8_edit_file_32px" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\icons8_edit_file_32px.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="icons8_edit_property_32px" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\icons8_edit_property_32px.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="icons8_versions_32px" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\icons8_versions_32px.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="icons8_add_16px" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\icons8_add_16px.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="icons8_delete_sign_16px" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\icons8_delete_sign_16px.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="icons8_link_32px" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\icons8_link_32px.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="icons8_merge_files_16px_1" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\icons8_merge_files_16px_1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="icons8_merge_files_32px" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\icons8_merge_files_32px.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="icons8_code_file_32px" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\icons8_code_file_32px.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="icons8_documents_folder_32px" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\icons8_documents_folder_32px.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data> </data>
<data name="icons8_view_file_32px_1" type="System.Resources.ResXFileRef, System.Windows.Forms"> <data name="icons8_view_file_32px_1" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\icons8_view_file_32px_1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> <value>..\Resources\icons8_view_file_32px_1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data> </data>
<data name="icons8_upload_32px" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\icons8_upload_32px.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="icons8_link_32px" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\icons8_link_32px.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="icons8_template_32px" type="System.Resources.ResXFileRef, System.Windows.Forms"> <data name="icons8_template_32px" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\icons8_template_32px.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> <value>..\Resources\icons8_template_32px.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data> </data>
<data name="icons8_code_file_32px_1" type="System.Resources.ResXFileRef, System.Windows.Forms"> <data name="icons8_code_file_32px_1" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\icons8_code_file_32px_1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> <value>..\Resources\icons8_code_file_32px_1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data> </data>
<data name="icons8_save_32px" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\icons8_save_32px.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="icons8_edit_file_32px" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\icons8_edit_file_32px.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="icons8_edit_property_32px" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\icons8_edit_property_32px.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="icons8_new_file_32px" type="System.Resources.ResXFileRef, System.Windows.Forms"> <data name="icons8_new_file_32px" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\icons8_new_file_32px.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> <value>..\Resources\icons8_new_file_32px.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data> </data>
<data name="icons8_checkmark_16px" type="System.Resources.ResXFileRef, System.Windows.Forms"> <data name="icons8_versions_32px" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\icons8_checkmark_16px.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> <value>..\Resources\icons8_versions_32px.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data> </data>
<data name="icons8_new_file_16px" type="System.Resources.ResXFileRef, System.Windows.Forms"> <data name="icons8_add_16px" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\icons8_new_file_16px.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> <value>..\Resources\icons8_add_16px.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data> </data>
<data name="icons8_opened_folder_16px" type="System.Resources.ResXFileRef, System.Windows.Forms"> <data name="icons8_export_32px_3" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\icons8_opened_folder_16px.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> <value>..\Resources\icons8_export_32px_3.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data> </data>
<data name="icons8_support_32px_1" type="System.Resources.ResXFileRef, System.Windows.Forms"> <data name="icons8_discord_new_logo_32px" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\icons8_support_32px_1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> <value>..\Resources\icons8_discord_new_logo_32px.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="icons8_documents_folder_32px" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\icons8_documents_folder_32px.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data> </data>
<data name="icons8_import_32px" type="System.Resources.ResXFileRef, System.Windows.Forms"> <data name="icons8_import_32px" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\icons8_import_32px.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> <value>..\Resources\icons8_import_32px.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data> </data>
<data name="icons8_upload_32px" type="System.Resources.ResXFileRef, System.Windows.Forms"> <data name="icons8_opened_folder_32px" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\icons8_upload_32px.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> <value>..\Resources\icons8_opened_folder_32px.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="icons8_save_as_32px" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\icons8_save_as_32px.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="icons8_support_32px_1" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\icons8_support_32px_1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="icons8_open_box_32px" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\icons8_open_box_32px.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="icons8_opened_folder_16px" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\icons8_opened_folder_16px.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="icons8_merge_files_16px_1" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\icons8_merge_files_16px_1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data> </data>
<data name="icons8_upload_to_cloud_32px" type="System.Resources.ResXFileRef, System.Windows.Forms"> <data name="icons8_upload_to_cloud_32px" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\icons8_upload_to_cloud_32px.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> <value>..\Resources\icons8_upload_to_cloud_32px.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data> </data>
<data name="icons8_discord_new_logo_32px" type="System.Resources.ResXFileRef, System.Windows.Forms"> <data name="icons8_merge_files_32px" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\icons8_discord_new_logo_32px.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> <value>..\Resources\icons8_merge_files_32px.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="icons8_delete_sign_16px" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\icons8_delete_sign_16px.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="icons8_new_file_16px" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\icons8_new_file_16px.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="icons8_add_32px" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\icons8_add_32px.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data> </data>
<data name="icons8_checkmark_32px" type="System.Resources.ResXFileRef, System.Windows.Forms"> <data name="icons8_checkmark_32px" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\icons8_checkmark_32px.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> <value>..\Resources\icons8_checkmark_32px.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -220,7 +211,22 @@
<data name="icons8_connected_no_data_32px" type="System.Resources.ResXFileRef, System.Windows.Forms"> <data name="icons8_connected_no_data_32px" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\icons8_connected_no_data_32px.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> <value>..\Resources\icons8_connected_no_data_32px.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data> </data>
<data name="icons8_firewall_32px" type="System.Resources.ResXFileRef, System.Windows.Forms"> <data name="icons8_delete_sign_32px_1" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\icons8_firewall_32px.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> <value>..\Resources\icons8_delete_sign_32px_1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="icons8_edit_32px" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\icons8_edit_32px.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="icons8_code_file_32px" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\icons8_code_file_32px.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="icons8_checkmark_16px" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\icons8_checkmark_16px.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="icons8_open_box_16px" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\icons8_open_box_16px.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="icons8_software_installer_16px" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\icons8_software_installer_16px.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data> </data>
</root> </root>

305
Pilz.Updating.Administration.GUI/ProxyConfigEditor.Designer.cs generated
View File

@@ -29,221 +29,164 @@
private void InitializeComponent() private void InitializeComponent()
{ {
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(ProxyConfigEditor)); System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(ProxyConfigEditor));
this.TextBoxX_ProxyUsr = new DevComponents.DotNetBar.Controls.TextBoxX(); this.radLabel1 = new Telerik.WinControls.UI.RadLabel();
this.layoutControl1 = new DevComponents.DotNetBar.Layout.LayoutControl(); this.radLabel2 = new Telerik.WinControls.UI.RadLabel();
this.TextBoxX_ProxyPW = new DevComponents.DotNetBar.Controls.TextBoxX(); this.radLabel3 = new Telerik.WinControls.UI.RadLabel();
this.ButtonX_OK = new DevComponents.DotNetBar.ButtonX(); this.radToggleSwitch_UserProxy = new Telerik.WinControls.UI.RadToggleSwitch();
this.ButtonX_Cancel = new DevComponents.DotNetBar.ButtonX(); this.radTextBoxControl_Username = new Telerik.WinControls.UI.RadTextBoxControl();
this.switchButton_UseProxyAuth = new DevComponents.DotNetBar.Controls.SwitchButton(); this.radTextBoxControl_Password = new Telerik.WinControls.UI.RadTextBoxControl();
this.layoutControlItem8 = new DevComponents.DotNetBar.Layout.LayoutControlItem(); this.radButton_Accept = new Telerik.WinControls.UI.RadButton();
this.layoutSpacerItem2 = new DevComponents.DotNetBar.Layout.LayoutSpacerItem(); this.radButton_Cancel = new Telerik.WinControls.UI.RadButton();
this.layoutControlItem1 = new DevComponents.DotNetBar.Layout.LayoutControlItem(); this.panel1 = new System.Windows.Forms.Panel();
this.layoutControlItem2 = new DevComponents.DotNetBar.Layout.LayoutControlItem(); ((System.ComponentModel.ISupportInitialize)(this.radLabel1)).BeginInit();
this.layoutSpacerItem1 = new DevComponents.DotNetBar.Layout.LayoutSpacerItem(); ((System.ComponentModel.ISupportInitialize)(this.radLabel2)).BeginInit();
this.layoutControlItem7 = new DevComponents.DotNetBar.Layout.LayoutControlItem(); ((System.ComponentModel.ISupportInitialize)(this.radLabel3)).BeginInit();
this.layoutControlItem6 = new DevComponents.DotNetBar.Layout.LayoutControlItem(); ((System.ComponentModel.ISupportInitialize)(this.radToggleSwitch_UserProxy)).BeginInit();
this.layoutControl1.SuspendLayout(); ((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(); 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"; // radLabel3
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;
// //
// 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; // radToggleSwitch_UserProxy
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";
// //
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.radTextBoxControl_Username.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
this.layoutControlItem8, | System.Windows.Forms.AnchorStyles.Right)));
this.layoutSpacerItem2, this.radTextBoxControl_Username.Location = new System.Drawing.Point(135, 31);
this.layoutControlItem1, this.radTextBoxControl_Username.Name = "radTextBoxControl_Username";
this.layoutControlItem2, this.radTextBoxControl_Username.Size = new System.Drawing.Size(361, 22);
this.layoutSpacerItem1, this.radTextBoxControl_Username.TabIndex = 0;
this.layoutControlItem7,
this.layoutControlItem6});
this.layoutControl1.Size = new System.Drawing.Size(499, 117);
this.layoutControl1.TabIndex = 1;
// //
// 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"; // radButton_Cancel
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;
// //
// 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; // panel1
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);
// //
// ButtonX_Cancel this.panel1.Controls.Add(this.radToggleSwitch_UserProxy);
// this.panel1.Controls.Add(this.radTextBoxControl_Username);
this.ButtonX_Cancel.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; this.panel1.Controls.Add(this.radButton_Accept);
this.ButtonX_Cancel.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; this.panel1.Controls.Add(this.radLabel1);
this.ButtonX_Cancel.DialogResult = System.Windows.Forms.DialogResult.Cancel; this.panel1.Controls.Add(this.radButton_Cancel);
this.ButtonX_Cancel.Image = global::Pilz.Updating.Administration.GUI.My.Resources.Resources.icons8_delete_sign_16px; this.panel1.Controls.Add(this.radLabel2);
this.ButtonX_Cancel.Location = new System.Drawing.Point(303, 90); this.panel1.Controls.Add(this.radTextBoxControl_Password);
this.ButtonX_Cancel.Margin = new System.Windows.Forms.Padding(0); this.panel1.Controls.Add(this.radLabel3);
this.ButtonX_Cancel.Name = "ButtonX_Cancel"; this.panel1.Dock = System.Windows.Forms.DockStyle.Fill;
this.ButtonX_Cancel.Size = new System.Drawing.Size(92, 23); this.panel1.Location = new System.Drawing.Point(0, 0);
this.ButtonX_Cancel.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.panel1.Name = "panel1";
this.ButtonX_Cancel.TabIndex = 5; this.panel1.Size = new System.Drawing.Size(499, 114);
this.ButtonX_Cancel.Text = "Abbrechen"; this.panel1.TabIndex = 5;
//
// 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;
// //
// ProxyConfigEditor // ProxyConfigEditor
// //
this.AcceptButton = this.ButtonX_OK; this.AcceptButton = this.radButton_Accept;
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.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.CancelButton = this.ButtonX_Cancel; this.CancelButton = this.radButton_Cancel;
this.ClientSize = new System.Drawing.Size(499, 117); this.ClientSize = new System.Drawing.Size(499, 114);
this.Controls.Add(this.layoutControl1); this.Controls.Add(this.panel1);
this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle; this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle;
this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
this.MaximizeBox = false; this.MaximizeBox = false;
this.Name = "ProxyConfigEditor"; this.Name = "ProxyConfigEditor";
//
//
//
this.RootElement.ApplyShapeToControl = true;
this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
this.Text = "UpdateServerInfoEditor"; this.Text = "Updateserverinfo";
this.Shown += new System.EventHandler(this.UpdateServerInfoEditor_Shown); 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); this.ResumeLayout(false);
} }
#endregion #endregion
private DevComponents.DotNetBar.Controls.TextBoxX TextBoxX_ProxyUsr; private Telerik.WinControls.UI.RadLabel radLabel1;
private DevComponents.DotNetBar.Layout.LayoutControl layoutControl1; private Telerik.WinControls.UI.RadLabel radLabel2;
private DevComponents.DotNetBar.Layout.LayoutControlItem layoutControlItem1; private Telerik.WinControls.UI.RadLabel radLabel3;
private DevComponents.DotNetBar.Controls.TextBoxX TextBoxX_ProxyPW; private Telerik.WinControls.UI.RadToggleSwitch radToggleSwitch_UserProxy;
private DevComponents.DotNetBar.Layout.LayoutControlItem layoutControlItem2; private Telerik.WinControls.UI.RadTextBoxControl radTextBoxControl_Username;
private DevComponents.DotNetBar.ButtonX ButtonX_OK; private Telerik.WinControls.UI.RadTextBoxControl radTextBoxControl_Password;
private DevComponents.DotNetBar.Layout.LayoutSpacerItem layoutSpacerItem1; private Telerik.WinControls.UI.RadButton radButton_Accept;
private DevComponents.DotNetBar.Layout.LayoutControlItem layoutControlItem6; private Telerik.WinControls.UI.RadButton radButton_Cancel;
private DevComponents.DotNetBar.ButtonX ButtonX_Cancel; private System.Windows.Forms.Panel panel1;
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;
} }
} }

16
Pilz.Updating.Administration.GUI/ProxyConfigEditor.cs
View File

@@ -8,10 +8,11 @@ using System.Linq;
using System.Text; using System.Text;
using System.Threading.Tasks; using System.Threading.Tasks;
using System.Windows.Forms; using System.Windows.Forms;
using Telerik.WinControls.UI;
namespace Pilz.Updating.Administration.GUI namespace Pilz.Updating.Administration.GUI
{ {
public partial class ProxyConfigEditor : OfficeForm public partial class ProxyConfigEditor : RadForm
{ {
private readonly ProxyConfiguration config = null; private readonly ProxyConfiguration config = null;
@@ -19,21 +20,20 @@ namespace Pilz.Updating.Administration.GUI
{ {
this.config = config; this.config = config;
InitializeComponent(); InitializeComponent();
UpdateAmbientColors();
} }
private void UpdateServerInfoEditor_Shown(object sender, EventArgs e) private void UpdateServerInfoEditor_Shown(object sender, EventArgs e)
{ {
switchButton_UseProxyAuth.Value = config.UseProxyAuth; radToggleSwitch_UserProxy.Value = config.UseProxyAuth;
TextBoxX_ProxyUsr.Text = config.Username; radTextBoxControl_Username.Text = config.Username;
TextBoxX_ProxyPW.Text = config.Password ?? string.Empty; radTextBoxControl_Password.Text = config.Password ?? string.Empty;
} }
private void ButtonX_OK_Click(object sender, EventArgs e) private void ButtonX_OK_Click(object sender, EventArgs e)
{ {
config.UseProxyAuth = switchButton_UseProxyAuth.Value; config.UseProxyAuth = radToggleSwitch_UserProxy.Value;
config.Username = TextBoxX_ProxyUsr.Text.Trim(); config.Username = radTextBoxControl_Username.Text.Trim();
config.Password = TextBoxX_ProxyPW.Text; config.Password = radTextBoxControl_Password.Text;
} }
} }
} }

62
Pilz.Updating.Administration.GUI/ProxyConfigEditor.resx
View File

@@ -1,64 +1,4 @@
<?xml version="1.0" encoding="utf-8"?> <root>
<root>
<!--
Microsoft ResX Schema
Version 2.0
The primary goals of this format is to allow a simple XML format
that is mostly human readable. The generation and parsing of the
various data types are done through the TypeConverter classes
associated with the data types.
Example:
... ado.net/XML headers & schema ...
<resheader name="resmimetype">text/microsoft-resx</resheader>
<resheader name="version">2.0</resheader>
<resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
<resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
<data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
<data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
<data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
<value>[base64 mime encoded serialized .NET Framework object]</value>
</data>
<data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
<comment>This is a comment</comment>
</data>
There are any number of "resheader" rows that contain simple
name/value pairs.
Each data row contains a name, and value. The row also contains a
type or mimetype. Type corresponds to a .NET class that support
text/value conversion through the TypeConverter architecture.
Classes that don't support this are serialized and stored with the
mimetype set.
The mimetype is used for serialized objects, and tells the
ResXResourceReader how to depersist the object. This is currently not
extensible. For a given mimetype the value must be set accordingly:
Note - application/x-microsoft.net.object.binary.base64 is the format
that the ResXResourceWriter will generate, however the reader can
read any of the formats listed below.
mimetype: application/x-microsoft.net.object.binary.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.soap.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Soap.SoapFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.bytearray.base64
value : The object must be serialized into a byte array
: using a System.ComponentModel.TypeConverter
: and then encoded with base64 encoding.
-->
<xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata"> <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
<xsd:import namespace="http://www.w3.org/XML/1998/namespace" /> <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
<xsd:element name="root" msdata:IsDataSet="true"> <xsd:element name="root" msdata:IsDataSet="true">

BIN
Pilz.Updating.Administration.GUI/Resources/icons8_open_box_16px.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 406 B

BIN
Pilz.Updating.Administration.GUI/Resources/icons8_software_installer_16px.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 430 B

242
Pilz.Updating.Administration.GUI/ToolSelectionWindow.Designer.cs generated
View File

@@ -1,242 +0,0 @@
using System;
using System.Diagnostics;
using System.Drawing;
using System.Runtime.CompilerServices;
using System.Windows.Forms;
using Microsoft.VisualBasic.CompilerServices;
namespace Pilz.Updating.Administration.GUI
{
[DesignerGenerated()]
public partial class ToolSelectionWindow : DevComponents.DotNetBar.OfficeForm
{
// Das Formular überschreibt den Löschvorgang, um die Komponentenliste zu bereinigen.
[DebuggerNonUserCode()]
protected override void Dispose(bool disposing)
{
try
{
if (disposing && components is object)
{
components.Dispose();
}
}
finally
{
base.Dispose(disposing);
}
}
// Wird vom Windows Form-Designer benötigt.
private System.ComponentModel.IContainer components;
// Hinweis: Die folgende Prozedur ist für den Windows Form-Designer erforderlich.
// Das Bearbeiten ist mit dem Windows Form-Designer möglich.
// Das Bearbeiten mit dem Code-Editor ist nicht möglich.
[DebuggerStepThrough()]
private void InitializeComponent()
{
this.components = new System.ComponentModel.Container();
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(ToolSelectionWindow));
this.StyleManager1 = new DevComponents.DotNetBar.StyleManager(this.components);
this.TableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel();
this.panel1 = new System.Windows.Forms.Panel();
this.ButtonX_LoadProject = new DevComponents.DotNetBar.ButtonX();
this.ButtonX_NewProject = new DevComponents.DotNetBar.ButtonX();
this.labelX1 = new DevComponents.DotNetBar.LabelX();
this.LabelX_CurProject = new DevComponents.DotNetBar.LabelX();
this.ButtonX_Einstellungen = new DevComponents.DotNetBar.ButtonX();
this.ButtonX_OpenUpdatePackageEditor = new DevComponents.DotNetBar.ButtonX();
this.ButtonX_OpenUpdateInfoManager = new DevComponents.DotNetBar.ButtonX();
this.TableLayoutPanel1.SuspendLayout();
this.panel1.SuspendLayout();
this.SuspendLayout();
//
// StyleManager1
//
this.StyleManager1.ManagerStyle = DevComponents.DotNetBar.eStyle.Office2016;
this.StyleManager1.MetroColorParameters = new DevComponents.DotNetBar.Metro.ColorTables.MetroColorGeneratorParameters(System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(255))))), System.Drawing.Color.FromArgb(((int)(((byte)(183)))), ((int)(((byte)(71)))), ((int)(((byte)(42))))));
//
// TableLayoutPanel1
//
this.TableLayoutPanel1.ColumnCount = 1;
this.TableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 100F));
this.TableLayoutPanel1.Controls.Add(this.ButtonX_Einstellungen, 0, 2);
this.TableLayoutPanel1.Controls.Add(this.ButtonX_OpenUpdatePackageEditor, 0, 1);
this.TableLayoutPanel1.Controls.Add(this.ButtonX_OpenUpdateInfoManager, 0, 0);
this.TableLayoutPanel1.Dock = System.Windows.Forms.DockStyle.Right;
this.TableLayoutPanel1.Enabled = false;
this.TableLayoutPanel1.Location = new System.Drawing.Point(174, 0);
this.TableLayoutPanel1.Name = "TableLayoutPanel1";
this.TableLayoutPanel1.RowCount = 3;
this.TableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 33.33333F));
this.TableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 33.33333F));
this.TableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 33.33333F));
this.TableLayoutPanel1.Size = new System.Drawing.Size(208, 206);
this.TableLayoutPanel1.TabIndex = 0;
//
// panel1
//
this.panel1.BackColor = System.Drawing.Color.Transparent;
this.panel1.Controls.Add(this.LabelX_CurProject);
this.panel1.Controls.Add(this.labelX1);
this.panel1.Controls.Add(this.ButtonX_NewProject);
this.panel1.Controls.Add(this.ButtonX_LoadProject);
this.panel1.Controls.Add(this.TableLayoutPanel1);
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(382, 206);
this.panel1.TabIndex = 1;
//
// ButtonX_LoadProject
//
this.ButtonX_LoadProject.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton;
this.ButtonX_LoadProject.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
| System.Windows.Forms.AnchorStyles.Right)));
this.ButtonX_LoadProject.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground;
this.ButtonX_LoadProject.Image = global::Pilz.Updating.Administration.GUI.My.Resources.Resources.icons8_opened_folder_16px;
this.ButtonX_LoadProject.Location = new System.Drawing.Point(3, 32);
this.ButtonX_LoadProject.Name = "ButtonX_LoadProject";
this.ButtonX_LoadProject.Size = new System.Drawing.Size(169, 23);
this.ButtonX_LoadProject.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
this.ButtonX_LoadProject.TabIndex = 1;
this.ButtonX_LoadProject.Text = "Projekt laden ...";
this.ButtonX_LoadProject.Click += new System.EventHandler(this.ButtonX_LoadProject_Click);
//
// ButtonX_NewProject
//
this.ButtonX_NewProject.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton;
this.ButtonX_NewProject.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
| System.Windows.Forms.AnchorStyles.Right)));
this.ButtonX_NewProject.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground;
this.ButtonX_NewProject.Image = global::Pilz.Updating.Administration.GUI.My.Resources.Resources.icons8_new_file_16px;
this.ButtonX_NewProject.Location = new System.Drawing.Point(3, 3);
this.ButtonX_NewProject.Name = "ButtonX_NewProject";
this.ButtonX_NewProject.Size = new System.Drawing.Size(169, 23);
this.ButtonX_NewProject.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
this.ButtonX_NewProject.TabIndex = 1;
this.ButtonX_NewProject.Text = "Neues Projekt erstellen ...";
this.ButtonX_NewProject.Click += new System.EventHandler(this.ButtonX_NewProject_Click);
//
// labelX1
//
this.labelX1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
| System.Windows.Forms.AnchorStyles.Right)));
//
//
//
this.labelX1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
this.labelX1.Location = new System.Drawing.Point(3, 61);
this.labelX1.Name = "labelX1";
this.labelX1.Size = new System.Drawing.Size(169, 23);
this.labelX1.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
this.labelX1.TabIndex = 2;
this.labelX1.Text = "Aktuelles Projekt:";
this.labelX1.TextAlignment = System.Drawing.StringAlignment.Center;
//
// LabelX_CurProject
//
this.LabelX_CurProject.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.LabelX_CurProject.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
this.LabelX_CurProject.Location = new System.Drawing.Point(3, 90);
this.LabelX_CurProject.Name = "LabelX_CurProject";
this.LabelX_CurProject.Size = new System.Drawing.Size(169, 113);
this.LabelX_CurProject.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
this.LabelX_CurProject.TabIndex = 2;
this.LabelX_CurProject.Text = "-";
this.LabelX_CurProject.TextAlignment = System.Drawing.StringAlignment.Center;
this.LabelX_CurProject.TextLineAlignment = System.Drawing.StringAlignment.Near;
this.LabelX_CurProject.WordWrap = true;
//
// ButtonX_Einstellungen
//
this.ButtonX_Einstellungen.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton;
this.ButtonX_Einstellungen.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground;
this.ButtonX_Einstellungen.Dock = System.Windows.Forms.DockStyle.Fill;
this.ButtonX_Einstellungen.Image = global::Pilz.Updating.Administration.GUI.My.Resources.Resources.icons8_support_32px_1;
this.ButtonX_Einstellungen.Location = new System.Drawing.Point(3, 139);
this.ButtonX_Einstellungen.Name = "ButtonX_Einstellungen";
this.ButtonX_Einstellungen.Size = new System.Drawing.Size(202, 64);
this.ButtonX_Einstellungen.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
this.ButtonX_Einstellungen.TabIndex = 2;
this.ButtonX_Einstellungen.Text = "Einstellungen";
this.ButtonX_Einstellungen.TextAlignment = DevComponents.DotNetBar.eButtonTextAlignment.Left;
this.ButtonX_Einstellungen.Click += new System.EventHandler(this.ButtonX_Einstellungen_Click);
//
// ButtonX_OpenUpdatePackageEditor
//
this.ButtonX_OpenUpdatePackageEditor.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton;
this.ButtonX_OpenUpdatePackageEditor.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground;
this.ButtonX_OpenUpdatePackageEditor.Dock = System.Windows.Forms.DockStyle.Fill;
this.ButtonX_OpenUpdatePackageEditor.Image = global::Pilz.Updating.Administration.GUI.My.Resources.Resources.icons8_open_box_32px;
this.ButtonX_OpenUpdatePackageEditor.Location = new System.Drawing.Point(3, 71);
this.ButtonX_OpenUpdatePackageEditor.Name = "ButtonX_OpenUpdatePackageEditor";
this.ButtonX_OpenUpdatePackageEditor.Size = new System.Drawing.Size(202, 62);
this.ButtonX_OpenUpdatePackageEditor.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
this.ButtonX_OpenUpdatePackageEditor.TabIndex = 1;
this.ButtonX_OpenUpdatePackageEditor.Text = "Paket erstellen";
this.ButtonX_OpenUpdatePackageEditor.TextAlignment = DevComponents.DotNetBar.eButtonTextAlignment.Left;
this.ButtonX_OpenUpdatePackageEditor.Click += new System.EventHandler(this.ButtonX_OpenUpdatePackageEditor_Click);
//
// ButtonX_OpenUpdateInfoManager
//
this.ButtonX_OpenUpdateInfoManager.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton;
this.ButtonX_OpenUpdateInfoManager.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground;
this.ButtonX_OpenUpdateInfoManager.Dock = System.Windows.Forms.DockStyle.Fill;
this.ButtonX_OpenUpdateInfoManager.Image = global::Pilz.Updating.Administration.GUI.My.Resources.Resources.icons8_administrative_tools_32px;
this.ButtonX_OpenUpdateInfoManager.Location = new System.Drawing.Point(3, 3);
this.ButtonX_OpenUpdateInfoManager.Name = "ButtonX_OpenUpdateInfoManager";
this.ButtonX_OpenUpdateInfoManager.Size = new System.Drawing.Size(202, 62);
this.ButtonX_OpenUpdateInfoManager.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
this.ButtonX_OpenUpdateInfoManager.TabIndex = 0;
this.ButtonX_OpenUpdateInfoManager.Text = "Aktuallisierungsinfo erstellen";
this.ButtonX_OpenUpdateInfoManager.TextAlignment = DevComponents.DotNetBar.eButtonTextAlignment.Left;
this.ButtonX_OpenUpdateInfoManager.Click += new System.EventHandler(this.ButtonX_OpenUpdateInfoManager_Click);
//
// ToolSelectionWindow
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.ClientSize = new System.Drawing.Size(382, 206);
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.MinimizeBox = false;
this.Name = "ToolSelectionWindow";
this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
this.Text = " Administration";
this.TopLeftCornerSize = 0;
this.TopRightCornerSize = 0;
this.Load += new System.EventHandler(this.ToolSelectionWindow_Load);
this.TableLayoutPanel1.ResumeLayout(false);
this.panel1.ResumeLayout(false);
this.ResumeLayout(false);
}
private DevComponents.DotNetBar.StyleManager StyleManager1;
private TableLayoutPanel TableLayoutPanel1;
private DevComponents.DotNetBar.ButtonX ButtonX_OpenUpdatePackageEditor;
private DevComponents.DotNetBar.ButtonX ButtonX_OpenUpdateInfoManager;
private DevComponents.DotNetBar.ButtonX ButtonX_Einstellungen;
private Panel panel1;
private DevComponents.DotNetBar.ButtonX ButtonX_NewProject;
private DevComponents.DotNetBar.ButtonX ButtonX_LoadProject;
private DevComponents.DotNetBar.LabelX labelX1;
private DevComponents.DotNetBar.LabelX LabelX_CurProject;
}
}

79
Pilz.Updating.Administration.GUI/ToolSelectionWindow.cs
View File

@@ -1,79 +0,0 @@
using System;
using System.IO;
using System.Windows.Forms;
namespace Pilz.Updating.Administration.GUI
{
public partial class ToolSelectionWindow
{
private string curProjectFilePath;
public ToolSelectionWindow()
{
InitializeComponent();
}
private void ButtonX_OpenUpdateInfoManager_Click(object sender, EventArgs e)
{
My.MyProject.Forms.UpdateServerInfoEditor.Show();
}
private void ButtonX_OpenUpdatePackageEditor_Click(object sender, EventArgs e)
{
My.MyProject.Forms.PackageCreationDialog.Show();
}
private void ButtonX_Einstellungen_Click(object sender, EventArgs e)
{
My.MyProject.Forms.UpdateServerInfoEditor.ShowDialog();
General.CurProject.Save(curProjectFilePath);
}
private void ButtonX_NewProject_Click(object sender, EventArgs e)
{
var sfd_updateadministration_upa = new SaveFileDialog()
{
Filter = "Update Project Files (*.upa)|*.upa"
};
if (sfd_updateadministration_upa.ShowDialog() == DialogResult.OK)
{
curProjectFilePath = sfd_updateadministration_upa.FileName;
General.CurProject = new UpdateProject();
General.CurProject.Save(curProjectFilePath);
LabelX_CurProject.Text = curProjectFilePath;
TableLayoutPanel1.Enabled = true;
}
}
private void ButtonX_LoadProject_Click(object sender, EventArgs e)
{
var ofd_updateadministration_upa = new OpenFileDialog()
{
Filter = "Update Project Files (*.upa)|*.upa"
};
if (ofd_updateadministration_upa.ShowDialog() == DialogResult.OK)
LoadProject(ofd_updateadministration_upa.FileName);
}
private void LoadProject(string filePath)
{
curProjectFilePath = filePath;
General.CurProject = UpdateProject.Load(filePath);
LabelX_CurProject.Text = filePath;
TableLayoutPanel1.Enabled = true;
}
private void ToolSelectionWindow_Load(object sender, EventArgs e)
{
string[] args = Environment.GetCommandLineArgs();
if (args.Length > 1)
{
try
{
LoadProject(args[1]);
}
catch (Exception) { }
}
}
}
}

662
Pilz.Updating.Administration.GUI/ToolSelectionWindow.resx
View File

@@ -1,662 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<root>
<!--
Microsoft ResX Schema
Version 2.0
The primary goals of this format is to allow a simple XML format
that is mostly human readable. The generation and parsing of the
various data types are done through the TypeConverter classes
associated with the data types.
Example:
... ado.net/XML headers & schema ...
<resheader name="resmimetype">text/microsoft-resx</resheader>
<resheader name="version">2.0</resheader>
<resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
<resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
<data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
<data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
<data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
<value>[base64 mime encoded serialized .NET Framework object]</value>
</data>
<data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
<comment>This is a comment</comment>
</data>
There are any number of "resheader" rows that contain simple
name/value pairs.
Each data row contains a name, and value. The row also contains a
type or mimetype. Type corresponds to a .NET class that support
text/value conversion through the TypeConverter architecture.
Classes that don't support this are serialized and stored with the
mimetype set.
The mimetype is used for serialized objects, and tells the
ResXResourceReader how to depersist the object. This is currently not
extensible. For a given mimetype the value must be set accordingly:
Note - application/x-microsoft.net.object.binary.base64 is the format
that the ResXResourceWriter will generate, however the reader can
read any of the formats listed below.
mimetype: application/x-microsoft.net.object.binary.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.soap.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Soap.SoapFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.bytearray.base64
value : The object must be serialized into a byte array
: using a System.ComponentModel.TypeConverter
: and then encoded with base64 encoding.
-->
<xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
<xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
<xsd:element name="root" msdata:IsDataSet="true">
<xsd:complexType>
<xsd:choice maxOccurs="unbounded">
<xsd:element name="metadata">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" />
</xsd:sequence>
<xsd:attribute name="name" use="required" type="xsd:string" />
<xsd:attribute name="type" type="xsd:string" />
<xsd:attribute name="mimetype" type="xsd:string" />
<xsd:attribute ref="xml:space" />
</xsd:complexType>
</xsd:element>
<xsd:element name="assembly">
<xsd:complexType>
<xsd:attribute name="alias" type="xsd:string" />
<xsd:attribute name="name" type="xsd:string" />
</xsd:complexType>
</xsd:element>
<xsd:element name="data">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
<xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
<xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
<xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
<xsd:attribute ref="xml:space" />
</xsd:complexType>
</xsd:element>
<xsd:element name="resheader">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required" />
</xsd:complexType>
</xsd:element>
</xsd:choice>
</xsd:complexType>
</xsd:element>
</xsd:schema>
<resheader name="resmimetype">
<value>text/microsoft-resx</value>
</resheader>
<resheader name="version">
<value>2.0</value>
</resheader>
<resheader name="reader">
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<metadata name="StyleManager1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>17, 17</value>
</metadata>
<assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
AAABAAQAEBAAAAEAIABoBAAARgAAACAgAAABACAAqBAAAK4EAAAwMAAAAQAgAKglAABWFQAAQEAAAAEA
IAAoQgAA/joAACgAAAAQAAAAIAAAAAEAIAAAAAAAMAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AACflXUYno94RJ6PeESej3hEno94RJ6PeESej3hEno94RJ6PeESej3hEno94RJuQehcAAAAAAAAAAAAA
AAAAAAAAnJF42ZyQeP+ckHj/nJB4/5yQeP+ckHj/nJB4/5yQeP+ckHj/gp90/5iSd/+dkHjXAAAAAAAA
AAAAAAAAAAAAAJyQeP+ckHj/nJB4/5yQeP+ckHj/nJB4/5yQeP+ckHj/nJB4/y/PZ/+BoHT/nJB4/wAA
AAAAAAAAAAAAAAAAAACckHj/nJB4/5yQeP+ckHj/nJB4/5yQeP+ckHj/nJB4/5yQeP+ckHj/nJB4/5yQ
eP8AAAAAAAAAAAAAAAAAAAAAeW9Z/2VbRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2Vb
Rf96b1n/AAAAAAAAAAAAAAAAAAAAAGRbRvdkWkX/ZFpF/2RaRf9kWkX/ZVtF/2VbRf9kWkX/ZFpF/2Ra
Rf9kWkX/ZlpF9gAAAAAAAAAAAAAAAAAAAABkWkXOZFpF/2RaRf9kWkX/ZVtF/7yoHv+3pCD/ZFpF/2Ra
Rf9kWkX/ZFpF/2RaRM0AAAAAAAAAAAAAAAAAAAAAZFtFo2RaRf9kWkX/ZVtF/7yoHv//5QD//+UA/7ek
IP9kWkX/ZFpF/2RaRf9lWkWiAAAAAAAAAAAAAAAAAAAAAGNbRnlkWkX/ZFpF/4p8NP/BrRz/69MJ/+vT
Cf/BrRz/iXs0/2RaRf9kWkX/ZFlEeAAAAAAAAAAAAAAAAAAAAABlXEVOZFpF/2RaRf9kWkX/ZFpF///l
AP//5QD/ZFpF/2RaRf9kWkX/ZFpF/2NZRk0AAAAAAAAAAAAAAAAAAAAAY1xHJGRaRf9kWkX/ZFpF/2Ra
Rf//5QD//+UA/2RaRf9kWkX/ZFpF/2RaRf9mV0IjAAAAAAAAAAAAAAAAAAAAAICAgAJkWkXuZFpF/2Ra
Rf9kWkX//+UA///lAP9kWkX/ZFpF/2RaRf9kWkXsgICAAgAAAAAAAAAAAAAAAAAAAAAAAAAAZFpFSmVb
RbRkWka7ZFpGu//lAP//5QD/ZFpGu2RaRrtlW0W0ZVtGTAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAD/5gCr/+YAqwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA//8AAP//
AADAAwAAwAMAAMADAADAAwAAwAMAAMADAADAAwAA4AcAAOAHAADgBwAA4AcAAPAPAAD+fwAA//8AACgA
AAAgAAAAQAAAAAEAIAAAAAAAgBAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAJuPeVSbkHihnJB4qpyQeKqckHiqnJB4qpyQeKqckHiqnJB4qpyQ
eKqckHiqnJB4qpyQeKqckHiqnJB4qpyQeKqckHiqnJB4qpyQeKqckHiqnI94oJ2QeFMAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACbj3h7nJB4/5yQeP+ckHj/nJB4/5yQeP+ckHj/nJB4/5yQ
eP+ckHj/nJB4/5yQeP+ckHj/nJB4/5yQeP+ckHj/nJB4/5yQeP+ckHj/nJB4/5yQeP+ckHj/nJB4/5uR
d3gAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAJyQeOeckHj/nJB4/5yQeP+ckHj/nJB4/5yQ
eP+ckHj/nJB4/5yQeP+ckHj/nJB4/5yQeP+ckHj/nJB4/5yQeP+ckHj/nJB4/3Cpcv9JwGz/ipp1/5yQ
eP+ckHj/nJB45QAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAnJB4/5yQeP+ckHj/nJB4/5yQ
eP+ckHj/nJB4/5yQeP+ckHj/nJB4/5yQeP+ckHj/nJB4/5yQeP+ckHj/nJB4/5yQeP+ckHj/H9hl/xfd
ZP9Mv2z/nJB4/5yQeP+ckHj/AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACckHj/nJB4/5yQ
eP+ckHj/nJB4/5yQeP+ckHj/nJB4/5yQeP+ckHj/nJB4/5yQeP+ckHj/nJB4/5yQeP+ckHj/nJB4/5yQ
eP9JwGz/Iddl/3Kocf+ckHj/nJB4/5yQeP8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAJyQ
eP+ckHj/nJB4/5yQeP+ckHj/nJB4/5yQeP+ckHj/nJB4/5yQeP+ckHj/nJB4/5yQeP+ckHj/nJB4/5yQ
eP+ckHj/nJB4/5yQeP+ckHj/nJB4/5yQeP+ckHj/nJB4/wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAnJB4/5yQeP+ckHj/nJB4/5yQeP+ckHj/nJB4/5yQeP+ckHj/nJB4/5yQeP+ckHj/nJB4/5yQ
eP+ckHj/nJB4/5yQeP+ckHj/nJB4/5yQeP+ckHj/nJB4/5yQeP+ckHj/AAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAACYjHT/d21W/2ZcR/9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2Ra
Rf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9mXEf/d2xW/5eLdP8AAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAHZsVv9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2Ra
Rf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/d2xW/wAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAZltG/GRaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2Ra
Rf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2Ra
Rf9nXEf7AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABjWkXfZFpF/2RaRf9kWkX/ZFpF/2Ra
Rf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2ZdRP9mXET/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2Ra
Rf9kWkX/ZFpF/2RaRd4AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAGVbRbRkWkX/ZFpF/2Ra
Rf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9lW0T/xbIa/8CsHP9lW0X/ZFpF/2RaRf9kWkX/ZFpF/2Ra
Rf9kWkX/ZFpF/2RaRf9kWkX/ZFpEswAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAZFtEimRa
Rf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZVtE/8WyGv//5QD//+UA/8CsHP9lW0X/ZFpF/2Ra
Rf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9lWUWJAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AABjW0ZfZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2VbRf/ArBz//+UA///lAP//5QD//+UA/8Cs
HP9lW0X/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRF4AAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAGVbQzVkWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9lW0X/wKwc///lAP//5QD//+UA///l
AP//5QD//+UA/8CtHP9lW0X/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/YlhFNAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAYmJODWRaRf5kWkX/ZFpF/2RaRf9kWkX/ZVtF/8CsHP//5QD//+UA///l
AP//5QD//+UA///lAP//5QD//+UA/8CtHP9lW0X/ZFpF/2RaRf9kWkX/ZFpF/2RaRf1dXUYLAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAY1pF32RaRf9kWkX/ZFpF/2RaRf9tYkH/g3Y3/4N2
N/+Ddjf//+UA///lAP//5QD//+UA/4N2N/+Ddjf/g3Y3/2xhQf9kWkX/ZFpF/2RaRf9kWkX/ZFpF3gAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABlW0W0ZFpF/2RaRf9kWkX/ZFpF/2Ra
Rf9kWkX/ZFpF/2RaRf//5QD//+UA///lAP//5QD/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2Ra
Rf9kWkSzAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAGRbRIpkWkX/ZFpF/2Ra
Rf9kWkX/ZFpF/2RaRf9kWkX/ZFpF///lAP//5QD//+UA///lAP9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2Ra
Rf9kWkX/ZFpF/2VZRYkAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAY1tGX2Ra
Rf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX//+UA///lAP//5QD//+UA/2RaRf9kWkX/ZFpF/2Ra
Rf9kWkX/ZFpF/2RaRf9kWkX/ZFpEXgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AABlW0M1ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf//5QD//+UA///lAP//5QD/ZFpF/2Ra
Rf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9iWEU0AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAF1dRgtkWkX8ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF///lAP//5QD//+UA///l
AP9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF+2ZmTQoAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAGRaRcRkWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX//+UA///l
AP//5QD//+UA/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkW9AAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAYlxHL2RbRudkWkX/ZFpF/2RaRf9kWkX/ZFpF/2Ra
Rf//5QD//+UA///lAP//5QD/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF6GVaRTAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAW1tJDmVaRERjWkVVY1pFVWNa
RVVjWkVVY1pFVf/lAP//5QD//+UA///lAP9jWkVVY1pFVWNaRVVjWkVVY1pFVWVaRERiYk4NAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAA/+UA///lAP//5QD//+UA/wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD/5ABV/+QAVf/kAFX/5ABVAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA////////
/////////AAAP/gAAB/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/gA
AB/4AAAf+AAAH/gAAB/4AAAf+AAAH/wAAD/8AAA//AAAP/wAAD/+AAB///w////8P///////////////
//8oAAAAMAAAAGAAAAABACAAAAAAAFAlAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAJmRdx6ckHetnJB48pyQeP+ckHj/nJB4/5yQeP+ckHj/nJB4/5yQeP+ckHj/nJB4/5yQ
eP+ckHj/nJB4/5yQeP+ckHj/nJB4/5yQeP+ckHj/nJB4/5yQeP+ckHj/nJB4/5yQeP+ckHj/nJB4/5yQ
eP+ckHj/nJB4/5yQeP+ckHjxnJB4rJ6Nex0AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAmZN5KJyQeO6ckHj/nJB4/5yQeP+ckHj/nJB4/5yQeP+ckHj/nJB4/5yQ
eP+ckHj/nJB4/5yQeP+ckHj/nJB4/5yQeP+ckHj/nJB4/5yQeP+ckHj/nJB4/5yQeP+ckHj/nJB4/5yQ
eP+ckHj/nJB4/5yQeP+ckHj/nJB4/5yQeP+ckHj/nJB4/5yQee2ejXsdAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAnI94sJyQeP+ckHj/nJB4/5yQeP+ckHj/nJB4/5yQ
eP+ckHj/nJB4/5yQeP+ckHj/nJB4/5yQeP+ckHj/nJB4/5yQeP+ckHj/nJB4/5yQeP+ckHj/nJB4/5yQ
eP+ckHj/nJB4/5yQeP+ckHj/nJB4/5yQeP+ckHj/nJB4/5yQeP+ckHj/nJB4/5yQeP+dkXerAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAnJB485yQeP+ckHj/nJB4/5yQ
eP+ckHj/nJB4/5yQeP+ckHj/nJB4/5yQeP+ckHj/nJB4/5yQeP+ckHj/nJB4/5yQeP+ckHj/nJB4/5yQ
eP+ckHj/nJB4/5yQeP+ckHj/nJB4/5yQeP+ckHj/dady/yXVZv8m1Wb/dqZy/5yQeP+ckHj/nJB4/5yQ
eP+ckHjxAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAnJB4/5yQ
eP+ckHj/nJB4/5yQeP+ckHj/nJB4/5yQeP+ckHj/nJB4/5yQeP+ckHj/nJB4/5yQeP+ckHj/nJB4/5yQ
eP+ckHj/nJB4/5yQeP+ckHj/nJB4/5yQeP+ckHj/nJB4/5yQeP+ckHj/JtVm/xfdZP8X3WT/JtRn/5yQ
eP+ckHj/nJB4/5yQeP+ckHj/AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAnJB4/5yQeP+ckHj/nJB4/5yQeP+ckHj/nJB4/5yQeP+ckHj/nJB4/5yQeP+ckHj/nJB4/5yQ
eP+ckHj/nJB4/5yQeP+ckHj/nJB4/5yQeP+ckHj/nJB4/5yQeP+ckHj/nJB4/5yQeP+ckHj/JtRn/xfd
ZP8X3WT/J9Rn/5yQeP+ckHj/nJB4/5yQeP+ckHj/AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAnJB4/5yQeP+ckHj/nJB4/5yQeP+ckHj/nJB4/5yQeP+ckHj/nJB4/5yQ
eP+ckHj/nJB4/5yQeP+ckHj/nJB4/5yQeP+ckHj/nJB4/5yQeP+ckHj/nJB4/5yQeP+ckHj/nJB4/5yQ
eP+ckHj/dady/yjTZ/8p02f/dqZy/5yQeP+ckHj/nJB4/5yQeP+ckHj/AAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAnJB4/5yQeP+ckHj/nJB4/5yQeP+ckHj/nJB4/5yQ
eP+ckHj/nJB4/5yQeP+ckHj/nJB4/5yQeP+ckHj/nJB4/5yQeP+ckHj/nJB4/5yQeP+ckHj/nJB4/5yQ
eP+ckHj/nJB4/5yQeP+ckHj/nJB4/5yQeP+ckHj/nJB4/5yQeP+ckHj/nJB4/5yQeP+ckHj/AAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAnJB4/5yQeP+ckHj/nJB4/5yQ
eP+ckHj/nJB4/5yQeP+ckHj/nJB4/5yQeP+ckHj/nJB4/5yQeP+ckHj/nJB4/5yQeP+ckHj/nJB4/5yQ
eP+ckHj/nJB4/5yQeP+ckHj/nJB4/5yQeP+ckHj/nJB4/5yQeP+ckHj/nJB4/5yQeP+ckHj/nJB4/5yQ
eP+ckHj/AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAnJB4/5yQ
eP+ckHj/nJB4/5yQeP+ckHj/nJB4/5yQeP+ckHj/nJB4/5yQeP+ckHj/nJB4/5yQeP+ckHj/nJB4/5yQ
eP+ckHj/nJB4/5yQeP+ckHj/nJB4/5yQeP+ckHj/nJB4/5yQeP+ckHj/nJB4/5yQeP+ckHj/nJB4/5yQ
eP+ckHj/nJB4/5yQeP+ckHj/AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAnJB4/5aKcv92a1b/Z1xH/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2Ra
Rf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2Ra
Rf9kWkX/ZFpF/2RaRf9oXUj/dmxW/5WKcv+ckHj/AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAlIdw/2deSP9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2Ra
Rf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2Ra
Rf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2heSP+VinL/AAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAdWtV/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2Ra
Rf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2Ra
Rf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf92a1b/AAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAZl1I/2RaRf9kWkX/ZFpF/2Ra
Rf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2Ra
Rf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2Ra
Rf9oXUj/AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAZFpF6mRa
Rf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2Ra
Rf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2Ra
Rf9kWkX/ZFpF/2RaRf9kWkXqAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAZFpFwGRaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2Ra
Rf9kWkX/ZFpF/2RaRf9oXkP/aF5D/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2Ra
Rf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWUW/AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAY1tElWRaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2Ra
Rf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2dcRP/OuRb/yrUY/2ZcRP9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2Ra
Rf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkWUAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAZFtFa2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2Ra
Rf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/Z1xE/865Fv//5QD//+UA/8q1GP9mXET/ZFpF/2Ra
Rf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9lWUZqAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAZFxEQGRaRf9kWkX/ZFpF/2Ra
Rf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9nXET/zrkW///lAP//5QD//+UA///l
AP/KtRj/ZlxE/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2Ra
Rf9lWUU/AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAYVVJFWRa
Rf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2dcRP/OuRb//+UA///l
AP//5QD//+UA///lAP//5QD/yrUY/2ZcRP9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2Ra
Rf9kWkX/ZFpF/2RaRf9hVUkVAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAGRaRepkWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/Z1xE/865
Fv//5QD//+UA///lAP//5QD//+UA///lAP//5QD//+UA/8q1GP9mXET/ZFpF/2RaRf9kWkX/ZFpF/2Ra
Rf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaReoAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAGRaRcBkWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2Ra
Rf9nXET/zrkW///lAP//5QD//+UA///lAP//5QD//+UA///lAP//5QD//+UA///lAP/KtRj/ZlxE/2Ra
Rf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RZRb8AAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAGNbRJVkWkX/ZFpF/2RaRf9kWkX/ZFpF/2Ra
Rf9kWkX/ZFpF/2dcRP/OuRb//+UA///lAP//5QD//+UA///lAP//5QD//+UA///lAP//5QD//+UA///l
AP//5QD/yrUY/2ZcRP9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRZQAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAGRbRWtkWkX/ZFpF/2Ra
Rf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/7KgIv/gyQ7/4MkO/+DJDv/gyQ7//+UA///lAP//5QD//+UA///l
AP//5QD/4MkO/+DJDv/gyQ7/4MkO/7KgIv9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2VZ
RmoAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAGRc
REBkWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX//+UA///l
AP//5QD//+UA///lAP//5QD/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2Ra
Rf9kWkX/ZFpF/2VZRT8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAGFVSRVkWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2Ra
Rf9kWkX//+UA///lAP//5QD//+UA///lAP//5QD/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2Ra
Rf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2FVSRUAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABkWkXqZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2Ra
Rf9kWkX/ZFpF/2RaRf9kWkX//+UA///lAP//5QD//+UA///lAP//5QD/ZFpF/2RaRf9kWkX/ZFpF/2Ra
Rf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF6gAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABkWkXAZFpF/2RaRf9kWkX/ZFpF/2Ra
Rf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX//+UA///lAP//5QD//+UA///lAP//5QD/ZFpF/2Ra
Rf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFlFvwAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABjW0SVZFpF/2Ra
Rf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX//+UA///lAP//5QD//+UA///l
AP//5QD/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpFlAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AABkW0VrZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX//+UA///l
AP//5QD//+UA///lAP//5QD/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2Ra
Rf9kWkX/ZVlGagAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAABkXERAZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2Ra
Rf9kWkX//+UA///lAP//5QD//+UA///lAP//5QD/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2Ra
Rf9kWkX/ZFpF/2RaRf9kWkX/ZVlFPwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABmWUAUZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2Ra
Rf9kWkX/ZFpF/2RaRf9kWkX//+UA///lAP//5QD//+UA///lAP//5QD/ZFpF/2RaRf9kWkX/ZFpF/2Ra
Rf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/Xl5DEwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAZFpF3mRaRf9kWkX/ZFpF/2Ra
Rf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX//+UA///lAP//5QD//+UA///lAP//5QD/ZFpF/2Ra
Rf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkXbAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAZFlFjGRa
Rf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX//+UA///lAP//5QD//+UA///l
AP//5QD/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9jWkWIAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAYmJODWRaRd1kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX//+UA///l
AP//5QD//+UA///lAP//5QD/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2Ra
Rd5iYk4NAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAGFYRh1kWUWrZFpF62RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2Ra
Rf9kWkX//+UA///lAP//5QD//+UA///lAP//5QD/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2Ra
Rf9kWkXqZFtFpmFVSRUAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAA/+UA///lAP//5QD//+UA///lAP//5QD/AAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA/+UA///lAP//5QD//+UA///lAP//5QD/AAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA/+UA///lAP//5QD//+UA///l
AP//5QD/AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAA////////AAD///////8AAP///////wAA////////AAD///////8AAP8A
AAAA/wAA/gAAAAB/AAD8AAAAAD8AAPwAAAAAPwAA/AAAAAA/AAD8AAAAAD8AAPwAAAAAPwAA/AAAAAA/
AAD8AAAAAD8AAPwAAAAAPwAA/AAAAAA/AAD8AAAAAD8AAPwAAAAAPwAA/AAAAAA/AAD8AAAAAD8AAPwA
AAAAPwAA/AAAAAA/AAD+AAAAAH8AAP4AAAAAfwAA/gAAAAB/AAD+AAAAAH8AAP4AAAAAfwAA/gAAAAB/
AAD/AAAAAP8AAP8AAAAA/wAA/wAAAAD/AAD/AAAAAP8AAP8AAAAA/wAA/wAAAAD/AAD/gAAAAf8AAP+A
AAAB/wAA/4AAAAH/AAD/gAAAAf8AAP+AAAAB/wAA/8AAAAP/AAD/4AAAB/8AAP//+B///wAA///4H///
AAD///gf//8AAP///////wAA////////AAD///////8AAP///////wAAKAAAAEAAAACAAAAAAQAgAAAA
AAAAQgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAqo5xCZ6SeT+ej3hEno94RJ6P
eESej3hEno94RJ6PeESej3hEno94RJ6PeESej3hEno94RJ6PeESej3hEno94RJ6PeESej3hEno94RJ6P
eESej3hEno94RJ6PeESej3hEno94RJ6PeESej3hEno94RJ6PeESej3hEno94RJ6PeESej3hEno94RJ6P
eESej3hEno94RJ6PeESej3hEno94RJyQdz6fn4AIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACqqlUDnZF4f5yQ
ePGckHj/nJB4/5yQeP+ckHj/nJB4/5yQeP+ckHj/nJB4/5yQeP+ckHj/nJB4/5yQeP+ckHj/nJB4/5yQ
eP+ckHj/nJB4/5yQeP+ckHj/nJB4/5yQeP+ckHj/nJB4/5yQeP+ckHj/nJB4/5yQeP+ckHj/nJB4/5yQ
eP+ckHj/nJB4/5yQeP+ckHj/nJB4/5yQeP+ckHj/nJB4/5yQeP+ckHj/nJF48JyQd3yqqlUDAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAD//wABnJB5pZyQeP+ckHj/nJB4/5yQeP+ckHj/nJB4/5yQeP+ckHj/nJB4/5yQeP+ckHj/nJB4/5yQ
eP+ckHj/nJB4/5yQeP+ckHj/nJB4/5yQeP+ckHj/nJB4/5yQeP+ckHj/nJB4/5yQeP+ckHj/nJB4/5yQ
eP+ckHj/nJB4/5yQeP+ckHj/nJB4/5yQeP+ckHj/nJB4/5yQeP+ckHj/nJB4/5yQeP+ckHj/nJB4/5yQ
eP+ckHj/nJB4o///AAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAm5B3XJyQeP+ckHj/nJB4/5yQeP+ckHj/nJB4/5yQeP+ckHj/nJB4/5yQ
eP+ckHj/nJB4/5yQeP+ckHj/nJB4/5yQeP+ckHj/nJB4/5yQeP+ckHj/nJB4/5yQeP+ckHj/nJB4/5yQ
eP+ckHj/nJB4/5yQeP+ckHj/nJB4/5yQeP+ckHj/nJB4/5yQeP+ckHj/nJB4/5yQeP+ckHj/nJB4/5yQ
eP+ckHj/nJB4/5yQeP+ckHj/nJB4/5yQeP+bj3hZAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAJyReMKckHj/nJB4/5yQeP+ckHj/nJB4/5yQ
eP+ckHj/nJB4/5yQeP+ckHj/nJB4/5yQeP+ckHj/nJB4/5yQeP+ckHj/nJB4/5yQeP+ckHj/nJB4/5yQ
eP+ckHj/nJB4/5yQeP+ckHj/nJB4/5yQeP+ckHj/nJB4/5yQeP+ckHj/nJB4/5yQeP+ckHj/nJB4/5yQ
eP+UlXf/e6Nz/4uadv+ckHj/nJB4/5yQeP+ckHj/nJB4/5yQeP+ckHj/nJB4vwAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACckHjznJB4/5yQ
eP+ckHj/nJB4/5yQeP+ckHj/nJB4/5yQeP+ckHj/nJB4/5yQeP+ckHj/nJB4/5yQeP+ckHj/nJB4/5yQ
eP+ckHj/nJB4/5yQeP+ckHj/nJB4/5yQeP+ckHj/nJB4/5yQeP+ckHj/nJB4/5yQeP+ckHj/nJB4/5yQ
eP+ckHj/nJB4/5yQeP97o3P/H9hl/xfdZP8Y3GT/Wbdu/5yQeP+ckHj/nJB4/5yQeP+ckHj/nJB4/5yQ
ePEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAnJB4/5yQeP+ckHj/nJB4/5yQeP+ckHj/nJB4/5yQeP+ckHj/nJB4/5yQeP+ckHj/nJB4/5yQ
eP+ckHj/nJB4/5yQeP+ckHj/nJB4/5yQeP+ckHj/nJB4/5yQeP+ckHj/nJB4/5yQeP+ckHj/nJB4/5yQ
eP+ckHj/nJB4/5yQeP+ckHj/nJB4/5yQeP+ckHj/MM9o/xfdZP8X3WT/F91k/xjdZP+Im3b/nJB4/5yQ
eP+ckHj/nJB4/5yQeP+ckHj/AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAJyQeP+ckHj/nJB4/5yQeP+ckHj/nJB4/5yQeP+ckHj/nJB4/5yQ
eP+ckHj/nJB4/5yQeP+ckHj/nJB4/5yQeP+ckHj/nJB4/5yQeP+ckHj/nJB4/5yQeP+ckHj/nJB4/5yQ
eP+ckHj/nJB4/5yQeP+ckHj/nJB4/5yQeP+ckHj/nJB4/5yQeP+ckHj/nJB4/x/ZZv8X3WT/F91k/xfd
ZP8X3WT/eKVz/5yQeP+ckHj/nJB4/5yQeP+ckHj/nJB4/wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACckHj/nJB4/5yQeP+ckHj/nJB4/5yQ
eP+ckHj/nJB4/5yQeP+ckHj/nJB4/5yQeP+ckHj/nJB4/5yQeP+ckHj/nJB4/5yQeP+ckHj/nJB4/5yQ
eP+ckHj/nJB4/5yQeP+ckHj/nJB4/5yQeP+ckHj/nJB4/5yQeP+ckHj/nJB4/5yQeP+ckHj/nJB4/5yQ
eP9DxGr/F91k/xfdZP8X3WT/INdl/5SVd/+ckHj/nJB4/5yQeP+ckHj/nJB4/5yQeP8AAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAnJB4/5yQ
eP+ckHj/nJB4/5yQeP+ckHj/nJB4/5yQeP+ckHj/nJB4/5yQeP+ckHj/nJB4/5yQeP+ckHj/nJB4/5yQ
eP+ckHj/nJB4/5yQeP+ckHj/nJB4/5yQeP+ckHj/nJB4/5yQeP+ckHj/nJB4/5yQeP+ckHj/nJB4/5yQ
eP+ckHj/nJB4/5yQeP+ckHj/kZd3/0TDa/8i1mX/NMxo/3yjc/+ckHj/nJB4/5yQeP+ckHj/nJB4/5yQ
eP+ckHj/AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAJyQeP+ckHj/nJB4/5yQeP+ckHj/nJB4/5yQeP+ckHj/nJB4/5yQeP+ckHj/nJB4/5yQ
eP+ckHj/nJB4/5yQeP+ckHj/nJB4/5yQeP+ckHj/nJB4/5yQeP+ckHj/nJB4/5yQeP+ckHj/nJB4/5yQ
eP+ckHj/nJB4/5yQeP+ckHj/nJB4/5yQeP+ckHj/nJB4/5yQeP+ckHj/nJB4/5yQeP+ckHj/nJB4/5yQ
eP+ckHj/nJB4/5yQeP+ckHj/nJB4/wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACckHj/nJB4/5yQeP+ckHj/nJB4/5yQeP+ckHj/nJB4/5yQ
eP+ckHj/nJB4/5yQeP+ckHj/nJB4/5yQeP+ckHj/nJB4/5yQeP+ckHj/nJB4/5yQeP+ckHj/nJB4/5yQ
eP+ckHj/nJB4/5yQeP+ckHj/nJB4/5yQeP+ckHj/nJB4/5yQeP+ckHj/nJB4/5yQeP+ckHj/nJB4/5yQ
eP+ckHj/nJB4/5yQeP+ckHj/nJB4/5yQeP+ckHj/nJB4/5yQeP8AAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAnJB4/5yQeP+ckHj/nJB4/5yQ
eP+ckHj/nJB4/5yQeP+ckHj/nJB4/5yQeP+ckHj/nJB4/5yQeP+ckHj/nJB4/5yQeP+ckHj/nJB4/5yQ
eP+ckHj/nJB4/5yQeP+ckHj/nJB4/5yQeP+ckHj/nJB4/5yQeP+ckHj/nJB4/5yQeP+ckHj/nJB4/5yQ
eP+ckHj/nJB4/5yQeP+ckHj/nJB4/5yQeP+ckHj/nJB4/5yQeP+ckHj/nJB4/5yQeP+ckHj/AAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAJyQ
eP+ckHj/nJB4/5yQeP+ckHj/nJB4/5yQeP+ckHj/nJB4/5yQeP+ckHj/nJB4/5yQeP+ckHj/nJB4/5yQ
eP+ckHj/nJB4/5yQeP+ckHj/nJB4/5yQeP+ckHj/nJB4/5yQeP+ckHj/nJB4/5yQeP+ckHj/nJB4/5yQ
eP+ckHj/nJB4/5yQeP+ckHj/nJB4/5yQeP+ckHj/nJB4/5yQeP+ckHj/nJB4/5yQeP+ckHj/nJB4/5yQ
eP+ckHj/nJB4/wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAACckHj/nJB4/5GGb/94bVf/aV5J/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2Ra
Rf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2Ra
Rf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2Ra
Rf9kWkX/aV5J/3huV/+Sh2//nJB4/5yQeP8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAnJB4/4h9Zv9lW0b/ZFpF/2RaRf9kWkX/ZFpF/2Ra
Rf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2Ra
Rf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2Ra
Rf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZltG/4l9Z/+ckHj/AAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAJKGbv9mW0b/ZFpF/2Ra
Rf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2Ra
Rf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2Ra
Rf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9lXEb/kodv/wAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAB3bVb/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2Ra
Rf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2Ra
Rf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2Ra
Rf9kWkX/ZFpF/3dtV/8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAaV9J/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2Ra
Rf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2Ra
Rf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2Ra
Rf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9qYEr/AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAGVaRvhkWkX/ZFpF/2RaRf9kWkX/ZFpF/2Ra
Rf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2Ra
Rf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2Ra
Rf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFtG9wAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABkWkXOZFpF/2Ra
Rf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2Ra
Rf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2Ra
Rf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2Ra
RM0AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAZFtFo2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2Ra
Rf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9rYUL/a2BC/2RaRf9kWkX/ZFpF/2Ra
Rf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2Ra
Rf9kWkX/ZFpF/2RaRf9lWkWiAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAGNbRnlkWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2Ra
Rf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9pX0P/1sAS/9G8
FP9oXkP/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2Ra
Rf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFlEeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABlXEVOZFpF/2RaRf9kWkX/ZFpF/2Ra
Rf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2Ra
Rf9pX0P/1sAS///lAP//5QD/0bwU/2heQ/9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2Ra
Rf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2NZRk0AAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAY1xHJGRa
Rf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2Ra
Rf9kWkX/ZFpF/2RaRf9pX0P/1sAS///lAP//5QD//+UA///lAP/RvBT/aF5D/2RaRf9kWkX/ZFpF/2Ra
Rf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2Ra
Rf9mV0IjAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAFVVVQNkWkX3ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2Ra
Rf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9pX0P/1sAS///lAP//5QD//+UA///lAP//5QD//+UA/9G8
FP9oXkP/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2Ra
Rf9kWkX/ZFpF/2RaRf9kWkX1gICAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAZFpFzmRaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2Ra
Rf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9pX0P/1sAS///lAP//5QD//+UA///l
AP//5QD//+UA///lAP//5QD/0bwU/2heQ/9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2Ra
Rf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpEzQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAGRbRaNkWkX/ZFpF/2Ra
Rf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9pX0P/1sAS///l
AP//5QD//+UA///lAP//5QD//+UA///lAP//5QD//+UA///lAP/RvBT/aF5D/2RaRf9kWkX/ZFpF/2Ra
Rf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2VaRaIAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AABjW0Z5ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2Ra
Rf9pX0P/1sAS///lAP//5QD//+UA///lAP//5QD//+UA///lAP//5QD//+UA///lAP//5QD//+UA/9G8
FP9oXkP/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2Ra
Rf9kWUR4AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAZVxFTmRaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2Ra
Rf9kWkX/ZFpF/2RaRf9pX0P/1sAS///lAP//5QD//+UA///lAP//5QD//+UA///lAP//5QD//+UA///l
AP//5QD//+UA///lAP//5QD/0bwU/2heQ/9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2Ra
Rf9kWkX/ZFpF/2RaRf9kWkX/Y1lGTQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAGNcRyRkWkX/ZFpF/2RaRf9kWkX/ZFpF/2Ra
Rf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9pX0P/1sAS///lAP//5QD//+UA///lAP//5QD//+UA///l
AP//5QD//+UA///lAP//5QD//+UA///lAP//5QD//+UA///lAP/RvBT/aF5D/2RaRf9kWkX/ZFpF/2Ra
Rf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2ZXQiMAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABVVVUDZFpF92Ra
Rf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9pX0P/1sAS///lAP//5QD//+UA///l
AP//5QD//+UA///lAP//5QD//+UA///lAP//5QD//+UA///lAP//5QD//+UA///lAP//5QD//+UA/9G8
FP9oXkP/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRfWAgIACAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAGRaRc5kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/g3Y3/6KS
Kf+ikin/opIp/6KSKf+ikin/opIp///lAP//5QD//+UA///lAP//5QD//+UA///lAP//5QD/opIp/6KS
Kf+ikin/opIp/6KSKf+ikin/g3Y3/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2Ra
Rf9kWkTNAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABkW0WjZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2Ra
Rf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf//5QD//+UA///lAP//5QD//+UA///l
AP//5QD//+UA/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2Ra
Rf9kWkX/ZFpF/2RaRf9kWkX/ZVpFogAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAY1tGeWRaRf9kWkX/ZFpF/2Ra
Rf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX//+UA///l
AP//5QD//+UA///lAP//5QD//+UA///lAP9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2Ra
Rf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RZRHgAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAGVc
RU5kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2Ra
Rf9kWkX/ZFpF///lAP//5QD//+UA///lAP//5QD//+UA///lAP//5QD/ZFpF/2RaRf9kWkX/ZFpF/2Ra
Rf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9jWUZNAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAABjXEckZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2Ra
Rf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf//5QD//+UA///lAP//5QD//+UA///lAP//5QD//+UA/2Ra
Rf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2Ra
Rf9kWkX/ZldCIwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAVVVVA2RaRfdkWkX/ZFpF/2RaRf9kWkX/ZFpF/2Ra
Rf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX//+UA///lAP//5QD//+UA///l
AP//5QD//+UA///lAP9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2Ra
Rf9kWkX/ZFpF/2RaRf9kWkX/ZFpF9YCAgAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABkWkXOZFpF/2Ra
Rf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF///l
AP//5QD//+UA///lAP//5QD//+UA///lAP//5QD/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2Ra
Rf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRM0AAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAZFtFo2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2Ra
Rf9kWkX/ZFpF/2RaRf//5QD//+UA///lAP//5QD//+UA///lAP//5QD//+UA/2RaRf9kWkX/ZFpF/2Ra
Rf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9lWkWiAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAGNbRnlkWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2Ra
Rf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX//+UA///lAP//5QD//+UA///lAP//5QD//+UA///l
AP9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2Ra
Rf9kWkX/ZFlEeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABlXEVOZFpF/2RaRf9kWkX/ZFpF/2Ra
Rf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF///lAP//5QD//+UA///l
AP//5QD//+UA///lAP//5QD/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2Ra
Rf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2NZRk0AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAY1xHJGRa
Rf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2Ra
Rf//5QD//+UA///lAP//5QD//+UA///lAP//5QD//+UA/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2Ra
Rf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9mV0IjAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAICAgAJkWkX0ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2Ra
Rf9kWkX/ZFpF/2RaRf9kWkX//+UA///lAP//5QD//+UA///lAP//5QD//+UA///lAP9kWkX/ZFpF/2Ra
Rf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkTygICAAgAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAZFpFwWRaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2Ra
Rf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF///lAP//5QD//+UA///lAP//5QD//+UA///l
AP//5QD/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2Ra
Rf9kWkX/ZVpFuQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAGVaRWBkWkX/ZFpF/2Ra
Rf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf//5QD//+UA///l
AP//5QD//+UA///lAP//5QD//+UA/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2Ra
Rf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RZRVkAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AACAgIACZFpFvWRaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2Ra
Rf9kWkX//+UA///lAP//5QD//+UA///lAP//5QD//+UA///lAP9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2Ra
Rf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRcGAgIACAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAGBgQBBkWkW4ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2Ra
Rf9kWkX/ZFpF/2RaRf9kWkX/ZFpF///lAP//5QD//+UA///lAP//5QD//+UA///lAP//5QD/ZFpF/2Ra
Rf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2RaRf9kWkX/ZFpF/2VaRL5pWksRAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWNYREtkWkWXZFpFtWRa
RrtkWka7ZFpGu2RaRrtkWka7ZFpGu2RaRrtkWka7ZFpGu2RaRrv/5QD//+UA///lAP//5QD//+UA///l
AP//5QD//+UA/2RaRrtkWka7ZFpGu2RaRrtkWka7ZFpGu2RaRrtkWka7ZFpGu2RaRrtkWkW1ZFpGlmVb
RkkAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA/+UA///l
AP//5QD//+UA///lAP//5QD//+UA///lAP8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAP/lAP//5QD//+UA///lAP//5QD//+UA///lAP//5QD/AAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD/5QD//+UA///lAP//5QD//+UA///lAP//5QD//+UA/wAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA/+YAq//mAKv/5gCr/+YAq//m
AKv/5gCr/+YAq//mAKoAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD/////////////////////////////////////////////
///////////////////////////////gAAAAAAf//4AAAAAAAf//gAAAAAAB//8AAAAAAAD//wAAAAAA
AP//AAAAAAAA//8AAAAAAAD//wAAAAAAAP//AAAAAAAA//8AAAAAAAD//wAAAAAAAP//AAAAAAAA//8A
AAAAAAD//wAAAAAAAP//AAAAAAAA//8AAAAAAAD//wAAAAAAAP//AAAAAAAA//8AAAAAAAD//wAAAAAA
AP//AAAAAAAA//+AAAAAAAH//4AAAAAAAf//gAAAAAAB//+AAAAAAAH//4AAAAAAAf//gAAAAAAB///A
AAAAAAP//8AAAAAAA///wAAAAAAD///AAAAAAAP//8AAAAAAA///wAAAAAAD///gAAAAAAf//+AAAAAA
B///4AAAAAAH///gAAAAAAf//+AAAAAAB///4AAAAAAH///wAAAAAA////AAAAAAD///8AAAAAAP///w
AAAAAA////AAAAAAD///+AAAAAAf///4AAAAAB////wAAAAAP////wAAAAD///////AP////////8A//
///////wD/////////AP/////////////////////////////////////////////////////////w==
</value>
</data>
</root>

1593
Pilz.Updating.Administration.GUI/UpdateManagerWindow.Designer.cs generated
View File

File diff suppressed because it is too large Load Diff

378
Pilz.Updating.Administration.GUI/UpdateManagerWindow.cs
View File

@@ -3,14 +3,13 @@ using System.Collections.Generic;
using global::System.IO; using global::System.IO;
using System.Linq; using System.Linq;
using System.Windows.Forms; using System.Windows.Forms;
using global::DevComponents.AdvTree;
using global::DevComponents.DotNetBar;
using global::DevComponents.Editors;
using Microsoft.VisualBasic.CompilerServices; using Microsoft.VisualBasic.CompilerServices;
using global::Microsoft.WindowsAPICodePack.Dialogs;
using Z.Collections.Extensions; using Z.Collections.Extensions;
using System.Threading.Tasks; using System.Threading.Tasks;
using Pilz.Updating.Administration.Discord; using Pilz.Updating.Administration.Discord;
using Telerik.WinControls.UI;
using Telerik.WinControls;
using Pilz.Updating.Administration.Packaging;
namespace Pilz.Updating.Administration.GUI namespace Pilz.Updating.Administration.GUI
{ {
@@ -22,12 +21,21 @@ namespace Pilz.Updating.Administration.GUI
private const string FILTER_UPDATEINFO_CONFIGURATION = "JSON (*.json)|*.json"; private const string FILTER_UPDATEINFO_CONFIGURATION = "JSON (*.json)|*.json";
private const string FILTER_UPDATEPROJECT = "Update-Info-Konfiguration (*.udic)|*.udic"; private const string FILTER_UPDATEPROJECT = "Update-Info-Konfiguration (*.udic)|*.udic";
private const string FILTER_UPDATEPACKAGE = "ZIP-Archiv (*.zip)|*.zip"; private const string FILTER_UPDATEPACKAGE = "ZIP-Archiv (*.zip)|*.zip";
private const string FILTER_PACKAGE_TEMPLATE = "Update-Paket-Vorlagen (*.udpt)|*.udpt";
private const string FILTER_PACKAGE_ZIP_PACKAGE = "ZIP-Paket (*.zip)|*.zip";
private const string FILTER_PACKAGE_ADDON = "Anwendungserweiterung (*.dll)|*.dll";
// F i e l d s // F i e l d s
private string curProjectFilePath; private string curProjectFilePath;
private UpdateServerManager manager = null; private UpdateServerManager manager = null;
private DiscordBot discordBot = null; private DiscordBot discordBot = null;
private readonly UpdatePackageManager packageManager = new UpdatePackageManager();
private string curPackageTemplatePath = string.Empty;
// P r o p e r t i e s
public string TempPackageFilePath { get; private set; } = string.Empty;
// C o n s t r u c t o r s // C o n s t r u c t o r s
@@ -37,7 +45,7 @@ namespace Pilz.Updating.Administration.GUI
this.Load += UpdateManagerWindow_Load; this.Load += UpdateManagerWindow_Load;
this.FormClosing += UpdateManagerWindow_FormClosing; this.FormClosing += UpdateManagerWindow_FormClosing;
InitializeComponent(); InitializeComponent();
UpdateAmbientColors(); this.AllowAero = false;
SetEnabledUiControls(false); SetEnabledUiControls(false);
} }
@@ -46,19 +54,25 @@ namespace Pilz.Updating.Administration.GUI
private void ProgressControls(bool enabled) private void ProgressControls(bool enabled)
{ {
if (enabled) if (enabled)
circularProgress1.Start(); radWaitingBar_PackageLoading.StartWaiting();
else else
circularProgress1.Stop(); radWaitingBar_PackageLoading.StopWaiting();
Enabled = !enabled; }
private void ProgressPackagingControls(bool enabled)
{
if (enabled)
radWaitingBar_PackageCreation.StartWaiting();
else
radWaitingBar_PackageCreation.StopWaiting();
} }
private void SetEnabledUiControls(bool enabled, bool setProjectOptionsAlwayToTrue = false) private void SetEnabledUiControls(bool enabled, bool setProjectOptionsAlwayToTrue = false)
{ {
ribbonBar_Options.Enabled = enabled || setProjectOptionsAlwayToTrue; radRibbonBarGroup_Options.Enabled = enabled || setProjectOptionsAlwayToTrue;
ButtonItem_SaveProject.Enabled = enabled || setProjectOptionsAlwayToTrue; radButtonElement_SaveProject.Enabled = enabled || setProjectOptionsAlwayToTrue;
ribbonBar_UpdateConfiguration.Enabled = enabled; radRibbonBarGroup_Configuration.Enabled = enabled;
ribbonPanel_Package.Enabled = enabled; radRibbonBarGroup_NewPackage.Enabled = enabled;
SuperTabControl1.Enabled = enabled;
} }
private async Task CreateNewProject(string filePath) private async Task CreateNewProject(string filePath)
@@ -114,7 +128,7 @@ namespace Pilz.Updating.Administration.GUI
if (hasError) if (hasError)
{ {
MessageBoxEx.Show(this, "Ein Fehler ist aufgetreten beim laden des Servers.", string.Empty, MessageBoxButtons.OK, MessageBoxIcon.Error); RadMessageBox.Show(this, "Ein Fehler ist aufgetreten beim laden des Servers.", string.Empty, MessageBoxButtons.OK, RadMessageIcon.Error);
SetEnabledUiControls(false, true); SetEnabledUiControls(false, true);
} }
else else
@@ -126,41 +140,43 @@ namespace Pilz.Updating.Administration.GUI
private async Task LoadPackageList() private async Task LoadPackageList()
{ {
ProgressControls(true); ProgressControls(true);
advTree_Packages.BeginUpdate(); radListView_Packages.BeginUpdate();
advTree_Packages.Nodes.Clear(); radListView_Packages.Items.Clear();
foreach (var pkgVersion in await manager.GetUpdatePackagesList()) foreach (var pkgVersion in await manager.GetUpdatePackagesList())
{ {
var name = manager.GetPackageDescription(pkgVersion).name; var name = manager.GetPackageDescription(pkgVersion).name;
var item = new Node var cells = new List<string>();
cells.Add(string.IsNullOrEmpty(name) ? "<Kein Titel>" : name);
cells.Add(pkgVersion.Version.ToString());
cells.Add(pkgVersion.Channel.ToString());
cells.Add(pkgVersion.Build.ToString());
cells.Add("Ja");
var item = new ListViewDataItem(String.Empty, cells.ToArray())
{ {
Tag = pkgVersion Tag = pkgVersion
}; };
item.Text = string.IsNullOrEmpty(name) ? "<Kein Titel>" : name; radListView_Packages.Items.Add(item);
item.Cells.Add(new Cell(pkgVersion.Version.ToString()));
item.Cells.Add(new Cell(pkgVersion.Channel.ToString()));
item.Cells.Add(new Cell(pkgVersion.Build.ToString()));
item.Cells.Add(new Cell("Ja"));
advTree_Packages.Nodes.Add(item);
} }
advTree_Packages.EndUpdate(); radListView_Packages.EndUpdate();
ProgressControls(false); ProgressControls(false);
if (advTree_Packages.HasChildren) if (radListView_Packages.HasChildren)
advTree_Packages.SelectedNode = advTree_Packages.Nodes[0]; radListView_Packages.SelectedItem = radListView_Packages.Items[0];
} }
private void LoadUpdateInstallerInfos() private void LoadUpdateInstallerInfos()
{ {
TextBoxX_UpdateInstallerDownloadUrl.Text = manager.UpdateInfo.UpdateInstallerLink; radTextBoxControl_DownloadURL.Text = manager.UpdateInfo.UpdateInstallerLink;
} }
private ApplicationVersion GetSelectedPackageVersion() private ApplicationVersion GetSelectedPackageVersion()
{ {
return advTree_Packages.SelectedNode?.Tag as ApplicationVersion; return radListView_Packages.SelectedItem?.Tag as ApplicationVersion;
} }
private async Task<bool> UploadPackage(string filePath) private async Task<bool> UploadPackage(string filePath)
@@ -232,10 +248,6 @@ namespace Pilz.Updating.Administration.GUI
// G u i // G u i
private void SuperTabControl1_SelectedTabChanged(object sender, SuperTabStripSelectedTabChangedEventArgs e)
{
}
private void UpdateManagerWindow_Shown(object sender, EventArgs e) private void UpdateManagerWindow_Shown(object sender, EventArgs e)
{ {
} }
@@ -262,7 +274,7 @@ namespace Pilz.Updating.Administration.GUI
private async void ButtonItem_NewProject_Click(object sender, EventArgs e) private async void ButtonItem_NewProject_Click(object sender, EventArgs e)
{ {
var sfd_updateadministration_upa = new SaveFileDialog() var sfd_updateadministration_upa = new RadSaveFileDialog()
{ {
Filter = "Update Project Files (*.upa)|*.upa" Filter = "Update Project Files (*.upa)|*.upa"
}; };
@@ -274,7 +286,7 @@ namespace Pilz.Updating.Administration.GUI
private async void ButtonItem_OpenProject_Click(object sender, EventArgs e) private async void ButtonItem_OpenProject_Click(object sender, EventArgs e)
{ {
var ofd_updateadministration_upa = new OpenFileDialog() var ofd_updateadministration_upa = new RadOpenFileDialog()
{ {
Filter = "Update Project Files (*.upa)|*.upa" Filter = "Update Project Files (*.upa)|*.upa"
}; };
@@ -302,7 +314,7 @@ namespace Pilz.Updating.Administration.GUI
private async void ButtonItem_ExportUpdateConfiguration_Click(object sender, EventArgs e) private async void ButtonItem_ExportUpdateConfiguration_Click(object sender, EventArgs e)
{ {
var sfd_UpdateAdministration_UpdateConfiguration = new SaveFileDialog() var sfd_UpdateAdministration_UpdateConfiguration = new RadSaveFileDialog()
{ {
Filter = FILTER_UPDATEINFO_CONFIGURATION Filter = FILTER_UPDATEINFO_CONFIGURATION
}; };
@@ -310,25 +322,26 @@ namespace Pilz.Updating.Administration.GUI
await manager.SaveInfoToFile(sfd_UpdateAdministration_UpdateConfiguration.FileName); await manager.SaveInfoToFile(sfd_UpdateAdministration_UpdateConfiguration.FileName);
} }
private void ButtonItem_OpenPackageCreationDialog_Click(object sender, EventArgs e)
{
var frm = new PackageCreationDialog();
frm.Show();
}
private async void ButtonItem_CreateAndUploadPackage_Click(object sender, EventArgs e) private async void ButtonItem_CreateAndUploadPackage_Click(object sender, EventArgs e)
{ {
var frm = new PackageCreationDialog(true); var success = false;
if (frm.ShowDialog(this) == DialogResult.OK)
if (await ExportTempUpdatePackage())
{ {
if (await UploadPackage(frm.TempPackageFilePath)) if (await UploadPackage(TempPackageFilePath))
{
await LoadPackageList(); await LoadPackageList();
success = true;
}
} }
if (!success)
RadMessageBox.Show(this, My.Resources.UpdatingAdministrationLangRes.MsgBox_PkgExportSuccess, My.Resources.UpdatingAdministrationLangRes.MsgBox_PkgExportSuccess_Titel, MessageBoxButtons.OK, RadMessageIcon.Info);
} }
private async void ButtonItem_UploadExistingPackage_Click(object sender, EventArgs e) private async void ButtonItem_UploadExistingPackage_Click(object sender, EventArgs e)
{ {
var ofd_UpdateAdministration_UpdatePackage = new OpenFileDialog() var ofd_UpdateAdministration_UpdatePackage = new RadOpenFileDialog()
{ {
Filter = FILTER_UPDATEPACKAGE Filter = FILTER_UPDATEPACKAGE
}; };
@@ -349,7 +362,7 @@ namespace Pilz.Updating.Administration.GUI
private void TextBoxX_UpdateInstallerDownloadUrl_TextChanged(object sender, EventArgs e) private void TextBoxX_UpdateInstallerDownloadUrl_TextChanged(object sender, EventArgs e)
{ {
manager.UpdateInfo.UpdateInstallerLink = TextBoxX_UpdateInstallerDownloadUrl.Text.Trim(); manager.UpdateInfo.UpdateInstallerLink = radTextBoxControl_DownloadURL.Text.Trim();
} }
private void ButtonItem_PostMsgInDiscord_Click(object sender, EventArgs e) private void ButtonItem_PostMsgInDiscord_Click(object sender, EventArgs e)
@@ -365,7 +378,7 @@ namespace Pilz.Updating.Administration.GUI
frm.ShowDialog(this); frm.ShowDialog(this);
} }
else else
MessageBoxEx.Show(this, "Offenbar ist ein Fehler ist aufgetreten beim Laden des Discord-Bots.", string.Empty, MessageBoxButtons.OK, MessageBoxIcon.Error); RadMessageBox.Show(this, "Offenbar ist ein Fehler ist aufgetreten beim Laden des Discord-Bots.", string.Empty, MessageBoxButtons.OK, RadMessageIcon.Error);
} }
private void LoadDiscordBot() private void LoadDiscordBot()
@@ -424,7 +437,7 @@ namespace Pilz.Updating.Administration.GUI
var frm = new DiscordBotSettingsWindow(General.CurProject.DiscordBotConfig); var frm = new DiscordBotSettingsWindow(General.CurProject.DiscordBotConfig);
if (frm.ShowDialog(this) == DialogResult.OK) if (frm.ShowDialog(this) == DialogResult.OK)
{ {
if (discordBot is object) if (discordBot is not null)
LoadDiscordBot(); LoadDiscordBot();
} }
} }
@@ -436,11 +449,270 @@ namespace Pilz.Updating.Administration.GUI
General.SetProxyConfig(); General.SetProxyConfig();
} }
private void advTree_Packages_AfterNodeSelect(object sender, AdvTreeNodeEventArgs e) private void RadListView_Packages_SelectedItemChanged(object sender, EventArgs e)
{ {
var anySelected = advTree_Packages.SelectedNode is object; var anySelected = radListView_Packages.SelectedItem is not null;
ribbonBar_Discord.Enabled = anySelected; radRibbonBarGroup_Discord.Enabled = anySelected;
ribbonBar_PackageManagement.Enabled = anySelected; radRibbonBarGroup_PackageManagement.Enabled = anySelected;
}
private void RadListView1_CellFormatting(object sender, ListViewCellFormattingEventArgs e)
{
e.CellElement.TextAlignment = System.Drawing.ContentAlignment.MiddleLeft;
}
private void RadListView1_CellFormatting_1(object sender, ListViewCellFormattingEventArgs e)
{
e.CellElement.TextAlignment = System.Drawing.ContentAlignment.MiddleLeft;
}
private void RadPageView1_SelectedPageChanged(object sender, EventArgs e)
{
var selPage = radPageView1.SelectedPage;
if (selPage == radPageViewPage_Extensions)
{
radRibbonBarGroup_PackageFiles.Visibility = ElementVisibility.Collapsed;
radRibbonBarGroup_PackageExtensions.Visibility = ElementVisibility.Visible;
}
else if (selPage == radPageViewPage_Packaging)
{
radRibbonBarGroup_PackageFiles.Visibility = ElementVisibility.Visible;
radRibbonBarGroup_PackageExtensions.Visibility = ElementVisibility.Collapsed;
}
}
// F e a t u r e s - P a c k a g i n g
private void ShowAllPackageTemplateConfig()
{
ShowPackageFiles();
ShowPackageExtensions();
}
private void ShowPackageFiles()
{
radTreeView_PackagingFiles.BeginUpdate();
radTreeView_PackagingFiles.Nodes.Clear();
if (!string.IsNullOrEmpty(packageManager.FilesToCopyPath))
{
Action<RadTreeNodeCollection, string> nodeCreation = null;
nodeCreation = (parentCollection, p) =>
{
bool isDir = (File.GetAttributes(p) & FileAttributes.Directory) == FileAttributes.Directory;
var n = new RadTreeNode()
{
Tag = p,
Text = radTreeView_PackagingFiles.Nodes == parentCollection ? p : Path.GetFileName(p),
ImageIndex = isDir ? 0 : 1
};
parentCollection.Add(n);
if (isDir)
{
var dirInfo = new DirectoryInfo(p);
dirInfo.EnumerateDirectories().ForEach(di => nodeCreation(n.Nodes, di.FullName));
dirInfo.EnumerateFiles().ForEach(fi => nodeCreation(n.Nodes, fi.FullName));
}
};
nodeCreation(radTreeView_PackagingFiles.Nodes, packageManager.FilesToCopyPath);
}
radTreeView_PackagingFiles.EndUpdate();
}
private void ShowPackageExtensions()
{
radListView_Extensions.BeginUpdate();
radListView_Extensions.Items.Clear();
foreach (string fAddOn in packageManager.GetAllUpdateInstallerÁddOn())
{
var cells = new List<string>();
cells.Add(Path.GetFileName(fAddOn));
cells.Add(Path.GetDirectoryName(fAddOn));
var item = new ListViewDataItem(string.Empty, cells.ToArray())
{
Tag = fAddOn
};
radListView_Extensions.Items.Add(item);
}
radListView_Extensions.EndUpdate();
}
private IEnumerable<string> GetSelectedUpdateInstallAddOns()
{
var list = new List<string>();
foreach (var item in radListView_Extensions.SelectedItems)
list.Add(Conversions.ToString(item.Tag));
return list;
}
private void NewPackageTemplate()
{
packageManager.NewTemplate();
curPackageTemplatePath = string.Empty;
ShowAllPackageTemplateConfig();
}
private void OpenPackageTemplate()
{
var ofd_UpdateAdmin_LoadTemplate = new RadOpenFileDialog() { Filter = FILTER_PACKAGE_TEMPLATE };
if (ofd_UpdateAdmin_LoadTemplate.ShowDialog() == DialogResult.OK)
{
packageManager.LoadTemplate(ofd_UpdateAdmin_LoadTemplate.FileName);
curPackageTemplatePath = ofd_UpdateAdmin_LoadTemplate.FileName;
ShowAllPackageTemplateConfig();
}
}
private void SavePackageTemplate()
{
if (string.IsNullOrEmpty(curPackageTemplatePath))
{
SavePackageTemplateAs();
}
else
{
packageManager.SaveTemplate(curPackageTemplatePath);
}
}
private void SavePackageTemplateAs()
{
var sfd_UpdateAdmin_SaveTemplate = new RadSaveFileDialog() { Filter = FILTER_PACKAGE_TEMPLATE };
if (sfd_UpdateAdmin_SaveTemplate.ShowDialog() == DialogResult.OK)
{
packageManager.SaveTemplate(sfd_UpdateAdmin_SaveTemplate.FileName);
curPackageTemplatePath = sfd_UpdateAdmin_SaveTemplate.FileName;
}
}
private void SelectPackageFileFolder()
{
var ofd_UpdateAdmin_PkgFileFolder = new RadOpenFolderDialog();
if (ofd_UpdateAdmin_PkgFileFolder.ShowDialog() == DialogResult.OK)
{
packageManager.FilesToCopyPath = ofd_UpdateAdmin_PkgFileFolder.FileName;
ShowPackageFiles();
}
}
private void RemovePackageFileFolder()
{
packageManager.FilesToCopyPath = string.Empty;
ShowPackageFiles();
}
private async Task<bool> ExportUpdatePackage(string filePath)
{
bool success = false;
ProgressPackagingControls(true);
try
{
await Task.Run(() => packageManager.ExportPackage(filePath));
success = true;
}
catch (Exception)
{
success = false;
}
ProgressPackagingControls(false);
return success;
}
private async Task<bool> ExportTempUpdatePackage()
{
var filePath = Path.GetTempFileName();
bool res = await ExportUpdatePackage(filePath);
if (res) TempPackageFilePath = filePath;
return res;
}
private void AddUpdateInstallerExtension()
{
var ofd_UpdateAdmin_AddExtension = new RadOpenFileDialog()
{
MultiSelect = true,
Filter = FILTER_PACKAGE_ADDON
};
if (ofd_UpdateAdmin_AddExtension.ShowDialog() == DialogResult.OK)
{
foreach (string f in ofd_UpdateAdmin_AddExtension.FileNames)
{
if (!packageManager.AddUpdateInstallerAddOn(f))
{
RadMessageBox.Show(My.Resources.UpdatingAdministrationLangRes.MsgBox_ErrorAddingInstallerAddOn, My.Resources.UpdatingAdministrationLangRes.MsgBox_Error_Titel, MessageBoxButtons.OK, RadMessageIcon.Error);
}
}
}
}
private void RemoveUpdateInstallerExtension()
{
foreach (string fAddOn in GetSelectedUpdateInstallAddOns())
packageManager.RemoveUpdateInstallerAddOn(fAddOn);
}
// G u i - P a c k a g i n g
private void ButtonItem_Pkg_NewTemplate_Click(object sender, EventArgs e)
{
NewPackageTemplate();
}
private void ButtonItem_Pkg_OpenTemplate_Click(object sender, EventArgs e)
{
OpenPackageTemplate();
}
private void ButtonItem_Pkg_SaveTemplate_Click(object sender, EventArgs e)
{
SavePackageTemplate();
}
private void ButtonItem_Pkg_SaveTemplateAs_Click(object sender, EventArgs e)
{
SavePackageTemplateAs();
}
private void ButtonItem_Pkg_SelectFileFolder_Click(object sender, EventArgs e)
{
SelectPackageFileFolder();
}
private void ButtonItem_Pkg_RemoveFileFolder_Click(object sender, EventArgs e)
{
RemovePackageFileFolder();
}
private async void ButtonItem_Pkg_Export_Click(object sender, EventArgs e)
{
var sfd_UpdateAdmin_ExportPkg = new RadSaveFileDialog()
{
Filter = FILTER_PACKAGE_ZIP_PACKAGE
};
if (sfd_UpdateAdmin_ExportPkg.ShowDialog() == DialogResult.OK)
{
if (await ExportUpdatePackage(sfd_UpdateAdmin_ExportPkg.FileName))
RadMessageBox.Show(this, My.Resources.UpdatingAdministrationLangRes.MsgBox_PkgExportSuccess, My.Resources.UpdatingAdministrationLangRes.MsgBox_PkgExportSuccess_Titel, MessageBoxButtons.OK, RadMessageIcon.Info);
}
}
private void ButtonItem_Pkg_AddExtension_Click(object sender, EventArgs e)
{
AddUpdateInstallerExtension();
}
private void ButtonItem_Pkg_RemoveExtension_Click(object sender, EventArgs e)
{
RemoveUpdateInstallerExtension();
} }
} }
} }

80
Pilz.Updating.Administration.GUI/UpdateManagerWindow.resx
View File

@@ -1,64 +1,4 @@
<?xml version="1.0" encoding="utf-8"?> <root>
<root>
<!--
Microsoft ResX Schema
Version 2.0
The primary goals of this format is to allow a simple XML format
that is mostly human readable. The generation and parsing of the
various data types are done through the TypeConverter classes
associated with the data types.
Example:
... ado.net/XML headers & schema ...
<resheader name="resmimetype">text/microsoft-resx</resheader>
<resheader name="version">2.0</resheader>
<resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
<resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
<data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
<data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
<data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
<value>[base64 mime encoded serialized .NET Framework object]</value>
</data>
<data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
<comment>This is a comment</comment>
</data>
There are any number of "resheader" rows that contain simple
name/value pairs.
Each data row contains a name, and value. The row also contains a
type or mimetype. Type corresponds to a .NET class that support
text/value conversion through the TypeConverter architecture.
Classes that don't support this are serialized and stored with the
mimetype set.
The mimetype is used for serialized objects, and tells the
ResXResourceReader how to depersist the object. This is currently not
extensible. For a given mimetype the value must be set accordingly:
Note - application/x-microsoft.net.object.binary.base64 is the format
that the ResXResourceWriter will generate, however the reader can
read any of the formats listed below.
mimetype: application/x-microsoft.net.object.binary.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.soap.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Soap.SoapFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.bytearray.base64
value : The object must be serialized into a byte array
: using a System.ComponentModel.TypeConverter
: and then encoded with base64 encoding.
-->
<xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata"> <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
<xsd:import namespace="http://www.w3.org/XML/1998/namespace" /> <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
<xsd:element name="root" msdata:IsDataSet="true"> <xsd:element name="root" msdata:IsDataSet="true">
@@ -117,24 +57,6 @@
<resheader name="writer"> <resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader> </resheader>
<metadata name="columnHeader1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>150, 17</value>
</metadata>
<metadata name="columnHeader2.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>288, 17</value>
</metadata>
<metadata name="columnHeader3.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>426, 17</value>
</metadata>
<metadata name="columnHeader4.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>564, 17</value>
</metadata>
<metadata name="columnHeader5.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>702, 17</value>
</metadata>
<metadata name="StyleManager1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>17, 17</value>
</metadata>
<assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" /> <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64"> <data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value> <value>

460
Pilz.Updating.Administration.GUI/UpdateServerInfoEditor.Designer.cs generated
View File

@@ -29,320 +29,246 @@
private void InitializeComponent() private void InitializeComponent()
{ {
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(UpdateServerInfoEditor)); System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(UpdateServerInfoEditor));
this.TextBoxX_ServerAddress = new DevComponents.DotNetBar.Controls.TextBoxX(); this.radLabel1 = new Telerik.WinControls.UI.RadLabel();
this.layoutControl1 = new DevComponents.DotNetBar.Layout.LayoutControl(); this.radLabel2 = new Telerik.WinControls.UI.RadLabel();
this.TextBoxX_PublicBaseURL = new DevComponents.DotNetBar.Controls.TextBoxX(); this.radLabel3 = new Telerik.WinControls.UI.RadLabel();
this.TextBoxX_PackageInfoFilename = new DevComponents.DotNetBar.Controls.TextBoxX(); this.radLabel4 = new Telerik.WinControls.UI.RadLabel();
this.TextBoxX_Username = new DevComponents.DotNetBar.Controls.TextBoxX(); this.radLabel5 = new Telerik.WinControls.UI.RadLabel();
this.TextBoxX_Password = new DevComponents.DotNetBar.Controls.TextBoxX(); this.radLabel6 = new Telerik.WinControls.UI.RadLabel();
this.ButtonX_OK = new DevComponents.DotNetBar.ButtonX(); this.radTextBoxControl_ServerAddress = new Telerik.WinControls.UI.RadTextBoxControl();
this.ButtonX_Cancel = new DevComponents.DotNetBar.ButtonX(); this.radTextBoxControl_PublicBasisURL = new Telerik.WinControls.UI.RadTextBoxControl();
this.switchButton_UseProxyForWebDAV = new DevComponents.DotNetBar.Controls.SwitchButton(); this.radTextBoxControl_PackageConfigurationFileName = new Telerik.WinControls.UI.RadTextBoxControl();
this.layoutControlItem1 = new DevComponents.DotNetBar.Layout.LayoutControlItem(); this.radTextBoxControl_Username = new Telerik.WinControls.UI.RadTextBoxControl();
this.layoutControlItem2 = new DevComponents.DotNetBar.Layout.LayoutControlItem(); this.radTextBoxControl_Password = new Telerik.WinControls.UI.RadTextBoxControl();
this.layoutControlItem3 = new DevComponents.DotNetBar.Layout.LayoutControlItem(); this.radToggleSwitch_UseProxyForWebDAV = new Telerik.WinControls.UI.RadToggleSwitch();
this.layoutControlItem4 = new DevComponents.DotNetBar.Layout.LayoutControlItem(); this.panel1 = new System.Windows.Forms.Panel();
this.layoutControlItem5 = new DevComponents.DotNetBar.Layout.LayoutControlItem(); this.radButton_Cancel = new Telerik.WinControls.UI.RadButton();
this.layoutControlItem8 = new DevComponents.DotNetBar.Layout.LayoutControlItem(); this.radButton_Save = new Telerik.WinControls.UI.RadButton();
this.layoutSpacerItem2 = new DevComponents.DotNetBar.Layout.LayoutSpacerItem(); ((System.ComponentModel.ISupportInitialize)(this.radLabel1)).BeginInit();
this.layoutSpacerItem1 = new DevComponents.DotNetBar.Layout.LayoutSpacerItem(); ((System.ComponentModel.ISupportInitialize)(this.radLabel2)).BeginInit();
this.layoutControlItem7 = new DevComponents.DotNetBar.Layout.LayoutControlItem(); ((System.ComponentModel.ISupportInitialize)(this.radLabel3)).BeginInit();
this.layoutControlItem6 = new DevComponents.DotNetBar.Layout.LayoutControlItem(); ((System.ComponentModel.ISupportInitialize)(this.radLabel4)).BeginInit();
this.layoutControl1.SuspendLayout(); ((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(); 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"; // radLabel3
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;
// //
// 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; // radLabel4
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";
// //
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.radLabel5.Location = new System.Drawing.Point(3, 117);
this.layoutControlItem1, this.radLabel5.Name = "radLabel5";
this.layoutControlItem2, this.radLabel5.Size = new System.Drawing.Size(53, 18);
this.layoutControlItem3, this.radLabel5.TabIndex = 4;
this.layoutControlItem4, this.radLabel5.Text = "Passwort:";
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;
// //
// 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"; // radTextBoxControl_PublicBasisURL
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;
// //
// 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.radTextBoxControl_Username.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
this.TextBoxX_PackageInfoFilename.Border.CornerType = DevComponents.DotNetBar.eCornerType.Square; | System.Windows.Forms.AnchorStyles.Right)));
this.TextBoxX_PackageInfoFilename.DisabledBackColor = System.Drawing.Color.White; this.radTextBoxControl_Username.Location = new System.Drawing.Point(171, 87);
this.TextBoxX_PackageInfoFilename.ForeColor = System.Drawing.Color.Black; this.radTextBoxControl_Username.Name = "radTextBoxControl_Username";
this.TextBoxX_PackageInfoFilename.Location = new System.Drawing.Point(167, 60); this.radTextBoxControl_Username.Size = new System.Drawing.Size(325, 22);
this.TextBoxX_PackageInfoFilename.Margin = new System.Windows.Forms.Padding(0); this.radTextBoxControl_Username.TabIndex = 9;
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;
// //
// 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"; // panel1
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;
// //
// 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.radButton_Save.Image = global::Pilz.Updating.Administration.GUI.My.Resources.Resources.icons8_checkmark_16px;
this.TextBoxX_Password.Border.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.radButton_Save.ImageAlignment = System.Drawing.ContentAlignment.MiddleRight;
this.TextBoxX_Password.DisabledBackColor = System.Drawing.Color.White; this.radButton_Save.Location = new System.Drawing.Point(396, 170);
this.TextBoxX_Password.ForeColor = System.Drawing.Color.Black; this.radButton_Save.Name = "radButton_Save";
this.TextBoxX_Password.Location = new System.Drawing.Point(167, 116); this.radButton_Save.Size = new System.Drawing.Size(100, 24);
this.TextBoxX_Password.Margin = new System.Windows.Forms.Padding(0); this.radButton_Save.TabIndex = 13;
this.TextBoxX_Password.Name = "TextBoxX_Password"; this.radButton_Save.Text = "Speichern";
this.TextBoxX_Password.PreventEnterBeep = true; this.radButton_Save.TextAlignment = System.Drawing.ContentAlignment.MiddleLeft;
this.TextBoxX_Password.Size = new System.Drawing.Size(328, 20); this.radButton_Save.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageBeforeText;
this.TextBoxX_Password.TabIndex = 4; this.radButton_Save.Click += new System.EventHandler(this.ButtonX_OK_Click);
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;
// //
// UpdateServerInfoEditor // UpdateServerInfoEditor
// //
this.AcceptButton = this.ButtonX_OK; this.AcceptButton = this.radButton_Save;
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.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.CancelButton = this.ButtonX_Cancel; this.CancelButton = this.radButton_Cancel;
this.ClientSize = new System.Drawing.Size(499, 201); this.ClientSize = new System.Drawing.Size(499, 197);
this.Controls.Add(this.layoutControl1); this.Controls.Add(this.panel1);
this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle; this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle;
this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
this.MaximizeBox = false; this.MaximizeBox = false;
this.Name = "UpdateServerInfoEditor"; this.Name = "UpdateServerInfoEditor";
//
//
//
this.RootElement.ApplyShapeToControl = true;
this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
this.Text = "UpdateServerInfoEditor"; this.Text = "UpdateServerInfoEditor";
this.Shown += new System.EventHandler(this.UpdateServerInfoEditor_Shown); 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); this.ResumeLayout(false);
} }
#endregion #endregion
private DevComponents.DotNetBar.Controls.TextBoxX TextBoxX_ServerAddress; private Telerik.WinControls.UI.RadLabel radLabel1;
private DevComponents.DotNetBar.Layout.LayoutControl layoutControl1; private Telerik.WinControls.UI.RadLabel radLabel2;
private DevComponents.DotNetBar.Layout.LayoutControlItem layoutControlItem1; private Telerik.WinControls.UI.RadLabel radLabel3;
private DevComponents.DotNetBar.Controls.TextBoxX TextBoxX_PublicBaseURL; private Telerik.WinControls.UI.RadLabel radLabel4;
private DevComponents.DotNetBar.Controls.TextBoxX TextBoxX_PackageInfoFilename; private Telerik.WinControls.UI.RadLabel radLabel5;
private DevComponents.DotNetBar.Controls.TextBoxX TextBoxX_Username; private Telerik.WinControls.UI.RadLabel radLabel6;
private DevComponents.DotNetBar.Controls.TextBoxX TextBoxX_Password; private Telerik.WinControls.UI.RadTextBoxControl radTextBoxControl_ServerAddress;
private DevComponents.DotNetBar.Layout.LayoutControlItem layoutControlItem2; private Telerik.WinControls.UI.RadTextBoxControl radTextBoxControl_PublicBasisURL;
private DevComponents.DotNetBar.Layout.LayoutControlItem layoutControlItem3; private Telerik.WinControls.UI.RadTextBoxControl radTextBoxControl_PackageConfigurationFileName;
private DevComponents.DotNetBar.Layout.LayoutControlItem layoutControlItem4; private Telerik.WinControls.UI.RadTextBoxControl radTextBoxControl_Username;
private DevComponents.DotNetBar.Layout.LayoutControlItem layoutControlItem5; private Telerik.WinControls.UI.RadTextBoxControl radTextBoxControl_Password;
private DevComponents.DotNetBar.ButtonX ButtonX_OK; private Telerik.WinControls.UI.RadToggleSwitch radToggleSwitch_UseProxyForWebDAV;
private DevComponents.DotNetBar.Layout.LayoutSpacerItem layoutSpacerItem1; private System.Windows.Forms.Panel panel1;
private DevComponents.DotNetBar.Layout.LayoutControlItem layoutControlItem6; private Telerik.WinControls.UI.RadButton radButton_Save;
private DevComponents.DotNetBar.ButtonX ButtonX_Cancel; private Telerik.WinControls.UI.RadButton radButton_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;
} }
} }

28
Pilz.Updating.Administration.GUI/UpdateServerInfoEditor.cs
View File

@@ -8,35 +8,35 @@ using System.Linq;
using System.Text; using System.Text;
using System.Threading.Tasks; using System.Threading.Tasks;
using System.Windows.Forms; using System.Windows.Forms;
using Telerik.WinControls.UI;
namespace Pilz.Updating.Administration.GUI namespace Pilz.Updating.Administration.GUI
{ {
public partial class UpdateServerInfoEditor : OfficeForm public partial class UpdateServerInfoEditor : RadForm
{ {
public UpdateServerInfoEditor() public UpdateServerInfoEditor()
{ {
InitializeComponent(); InitializeComponent();
UpdateAmbientColors();
} }
private void UpdateServerInfoEditor_Shown(object sender, EventArgs e) private void UpdateServerInfoEditor_Shown(object sender, EventArgs e)
{ {
TextBoxX_ServerAddress.Text = General.CurProject.UpdateServerConfig.ServerAdress; radTextBoxControl_ServerAddress.Text = General.CurProject.UpdateServerConfig.ServerAdress;
TextBoxX_PublicBaseURL.Text = General.CurProject.UpdateServerConfig.PublicPackageBaseURL; radTextBoxControl_PublicBasisURL.Text = General.CurProject.UpdateServerConfig.PublicPackageBaseURL;
TextBoxX_PackageInfoFilename.Text = General.CurProject.UpdateServerConfig.UpdateInfoFilename; radTextBoxControl_PackageConfigurationFileName.Text = General.CurProject.UpdateServerConfig.UpdateInfoFilename;
TextBoxX_Username.Text = General.CurProject.UpdateServerConfig.Username; radTextBoxControl_Username.Text = General.CurProject.UpdateServerConfig.Username;
TextBoxX_Password.Text = General.CurProject.UpdateServerConfig.Password; radTextBoxControl_Password.Text = General.CurProject.UpdateServerConfig.Password;
switchButton_UseProxyForWebDAV.Value = General.CurProject.UpdateServerConfig.UseProxyForWebDAV; radToggleSwitch_UseProxyForWebDAV.Value = General.CurProject.UpdateServerConfig.UseProxyForWebDAV;
} }
private void ButtonX_OK_Click(object sender, EventArgs e) private void ButtonX_OK_Click(object sender, EventArgs e)
{ {
General.CurProject.UpdateServerConfig.ServerAdress = TextBoxX_ServerAddress.Text.Trim(); General.CurProject.UpdateServerConfig.ServerAdress = radTextBoxControl_ServerAddress.Text.Trim();
General.CurProject.UpdateServerConfig.PublicPackageBaseURL = TextBoxX_PublicBaseURL.Text.Trim(); General.CurProject.UpdateServerConfig.PublicPackageBaseURL = radTextBoxControl_PublicBasisURL.Text.Trim();
General.CurProject.UpdateServerConfig.UpdateInfoFilename = TextBoxX_PackageInfoFilename.Text.Trim(); General.CurProject.UpdateServerConfig.UpdateInfoFilename = radTextBoxControl_PackageConfigurationFileName.Text.Trim();
General.CurProject.UpdateServerConfig.Username = TextBoxX_Username.Text.Trim(); General.CurProject.UpdateServerConfig.Username = radTextBoxControl_Username.Text.Trim();
General.CurProject.UpdateServerConfig.Password = TextBoxX_Password.Text; General.CurProject.UpdateServerConfig.Password = radTextBoxControl_Password.Text;
General.CurProject.UpdateServerConfig.UseProxyForWebDAV = switchButton_UseProxyForWebDAV.Value; General.CurProject.UpdateServerConfig.UseProxyForWebDAV = radToggleSwitch_UseProxyForWebDAV.Value;
} }
} }
} }

62
Pilz.Updating.Administration.GUI/UpdateServerInfoEditor.resx
View File

@@ -1,64 +1,4 @@
<?xml version="1.0" encoding="utf-8"?> <root>
<root>
<!--
Microsoft ResX Schema
Version 2.0
The primary goals of this format is to allow a simple XML format
that is mostly human readable. The generation and parsing of the
various data types are done through the TypeConverter classes
associated with the data types.
Example:
... ado.net/XML headers & schema ...
<resheader name="resmimetype">text/microsoft-resx</resheader>
<resheader name="version">2.0</resheader>
<resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
<resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
<data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
<data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
<data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
<value>[base64 mime encoded serialized .NET Framework object]</value>
</data>
<data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
<comment>This is a comment</comment>
</data>
There are any number of "resheader" rows that contain simple
name/value pairs.
Each data row contains a name, and value. The row also contains a
type or mimetype. Type corresponds to a .NET class that support
text/value conversion through the TypeConverter architecture.
Classes that don't support this are serialized and stored with the
mimetype set.
The mimetype is used for serialized objects, and tells the
ResXResourceReader how to depersist the object. This is currently not
extensible. For a given mimetype the value must be set accordingly:
Note - application/x-microsoft.net.object.binary.base64 is the format
that the ResXResourceWriter will generate, however the reader can
read any of the formats listed below.
mimetype: application/x-microsoft.net.object.binary.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.soap.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Soap.SoapFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.bytearray.base64
value : The object must be serialized into a byte array
: using a System.ComponentModel.TypeConverter
: and then encoded with base64 encoding.
-->
<xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata"> <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
<xsd:import namespace="http://www.w3.org/XML/1998/namespace" /> <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
<xsd:element name="root" msdata:IsDataSet="true"> <xsd:element name="root" msdata:IsDataSet="true">

21
Pilz.Updating.Administration/Pilz.Updating.Administration.csproj
View File

@@ -2,7 +2,7 @@
<PropertyGroup> <PropertyGroup>
<RootNamespace>Pilz.Updating.Administration</RootNamespace> <RootNamespace>Pilz.Updating.Administration</RootNamespace>
<MyType>Windows</MyType> <MyType>Windows</MyType>
<TargetFramework>net48</TargetFramework> <TargetFramework>net6.0-windows</TargetFramework>
<DefaultItemExcludes>$(DefaultItemExcludes);$(ProjectDir)**\*.vb</DefaultItemExcludes> <DefaultItemExcludes>$(DefaultItemExcludes);$(ProjectDir)**\*.vb</DefaultItemExcludes>
<LangVersion>latest</LangVersion> <LangVersion>latest</LangVersion>
<AssemblyTitle>Pilz.Updating.Server</AssemblyTitle> <AssemblyTitle>Pilz.Updating.Server</AssemblyTitle>
@@ -39,14 +39,11 @@
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Microsoft.CSharp" Version="4.7.0" /> <PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
<PackageReference Include="Microsoft.VisualBasic" Version="10.3.0" />
<PackageReference Include="System.Data.DataSetExtensions" Version="4.5.0" /> <PackageReference Include="System.Data.DataSetExtensions" Version="4.5.0" />
<PackageReference Include="System.Net.Http" Version="4.3.4" /> <PackageReference Include="System.Net.Http" Version="4.3.4" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<Reference Include="drsPwEnc">
<HintPath>..\Shared Libs\drsPwEnc.dll</HintPath>
</Reference>
<Reference Include="Microsoft.VisualBasic" />
<Reference Include="Pilz.Cryptography"> <Reference Include="Pilz.Cryptography">
<HintPath>..\Shared Libs\Pilz.Cryptography.dll</HintPath> <HintPath>..\Shared Libs\Pilz.Cryptography.dll</HintPath>
</Reference> </Reference>
@@ -104,14 +101,14 @@
<ProjectReference Include="..\Pilz.Updating\Pilz.Updating.csproj" /> <ProjectReference Include="..\Pilz.Updating\Pilz.Updating.csproj" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Discord.Net" Version="2.4.0" /> <PackageReference Include="Discord.Net" Version="3.7.2" />
<PackageReference Include="Markdig" Version="0.25.0" /> <PackageReference Include="Markdig" Version="0.30.2" />
<PackageReference Include="Microsoft.Bcl.AsyncInterfaces" Version="5.0.0" /> <PackageReference Include="Microsoft.Bcl.AsyncInterfaces" Version="6.0.0" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.1" /> <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
<PackageReference Include="System.Collections.Immutable" Version="5.0.0" /> <PackageReference Include="System.Collections.Immutable" Version="6.0.0" />
<PackageReference Include="System.Interactive.Async" Version="5.0.0" /> <PackageReference Include="System.Interactive.Async" Version="6.0.1" />
<PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="5.0.0" /> <PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="6.0.0" />
<PackageReference Include="WebDav.Client" Version="2.7.0" /> <PackageReference Include="WebDav.Client" Version="2.8.0" />
<PackageReference Include="Z.ExtensionMethods.WithNamespace" Version="2.1.1" /> <PackageReference Include="Z.ExtensionMethods.WithNamespace" Version="2.1.1" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>

15
Pilz.Updating.Administration/UpdateServerConfig.cs
View File

@@ -1,5 +1,4 @@
using drsPwEnc; using Newtonsoft.Json;
using Newtonsoft.Json;
using Pilz.Cryptography; using Pilz.Cryptography;
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
@@ -17,18 +16,6 @@ namespace Pilz.Updating.Administration
public string UpdateInfoFilename { get; set; } public string UpdateInfoFilename { get; set; }
public string Username { get; set; } public string Username { get; set; }
[JsonProperty("Password")]
private string PasswordOld
{
set
{
if (string.IsNullOrEmpty(value))
Password = string.Empty;
else
Password = new drsPwEnc.drsPwEnc().DecryptData(value);
}
}
[JsonProperty("PasswordV3")] [JsonProperty("PasswordV3")]
public SecureString Password { get; set; } public SecureString Password { get; set; }
} }

3
Pilz.Updating.Client.GUI/App.config
View File

@@ -11,4 +11,7 @@
</dependentAssembly> </dependentAssembly>
</assemblyBinding> </assemblyBinding>
</runtime> </runtime>
<appSettings>
<add key="TelerikWinFormsThemeName" value="Fluent" />
</appSettings>
</configuration> </configuration>

30
Pilz.Updating.Client.GUI/Pilz.Updating.Client.GUI.csproj
View File

@@ -1,9 +1,9 @@
<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop"> <Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup> <PropertyGroup>
<StartupObject /> <StartupObject />
<RootNamespace>SM64_ROM_Manager.Updating.Client.GUI</RootNamespace> <RootNamespace>SM64_ROM_Manager.Updating.Client.GUI</RootNamespace>
<MyType>Windows</MyType> <MyType>Windows</MyType>
<TargetFramework>net48</TargetFramework> <TargetFramework>net6.0-windows</TargetFramework>
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects> <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
<DefaultItemExcludes>$(DefaultItemExcludes);$(ProjectDir)**\*.vb</DefaultItemExcludes> <DefaultItemExcludes>$(DefaultItemExcludes);$(ProjectDir)**\*.vb</DefaultItemExcludes>
<LangVersion>latest</LangVersion> <LangVersion>latest</LangVersion>
@@ -39,28 +39,10 @@
<DefineConstants>TRACE</DefineConstants> <DefineConstants>TRACE</DefineConstants>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Microsoft.VisualBasic" Version="10.3.0" />
<PackageReference Include="System.Data.DataSetExtensions" Version="4.5.0" /> <PackageReference Include="System.Data.DataSetExtensions" Version="4.5.0" />
<PackageReference Include="System.Net.Http" Version="4.3.4" /> <PackageReference Include="System.Net.Http" Version="4.3.4" />
</ItemGroup> <PackageReference Include="ui.for.winforms.allcontrols.net60" Version="2022.2.510" />
<ItemGroup>
<Reference Include="Microsoft.VisualBasic" />
<Reference Include="DevComponents.DotNetBar.Design">
<HintPath>..\Shared Libs\DotNetBarNew\DevComponents.DotNetBar.Design.dll</HintPath>
<Private>False</Private>
</Reference>
<Reference Include="DevComponents.DotNetBar.Layout">
<HintPath>..\Shared Libs\DotNetBarNew\DevComponents.DotNetBar.Layout.dll</HintPath>
</Reference>
<Reference Include="DevComponents.DotNetBar.Layout.Design">
<HintPath>..\Shared Libs\DotNetBarNew\DevComponents.DotNetBar.Layout.Design.dll</HintPath>
<Private>False</Private>
</Reference>
<Reference Include="DevComponents.DotNetBar2">
<HintPath>..\Shared Libs\DotNetBarNew\DevComponents.DotNetBar2.dll</HintPath>
</Reference>
<Reference Include="System.Deployment" />
<Reference Include="System.Windows.Forms" />
<Reference Include="WindowsBase" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<Import Include="Microsoft.VisualBasic" /> <Import Include="Microsoft.VisualBasic" />
@@ -174,8 +156,8 @@
<ItemGroup> <ItemGroup>
<PackageReference Include="HtmlRenderer.Core" Version="1.5.0.6" /> <PackageReference Include="HtmlRenderer.Core" Version="1.5.0.6" />
<PackageReference Include="HtmlRenderer.WinForms" Version="1.5.0.6" /> <PackageReference Include="HtmlRenderer.WinForms" Version="1.5.0.6" />
<PackageReference Include="Markdig" Version="0.25.0" /> <PackageReference Include="Markdig" Version="0.30.2" />
<PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="5.0.0" /> <PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="6.0.0" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<Compile Remove="obj\RelMono\TemporaryGeneratedFile_036C0B5B-1481-4323-8D20-8F5ADCB23D92.cs" /> <Compile Remove="obj\RelMono\TemporaryGeneratedFile_036C0B5B-1481-4323-8D20-8F5ADCB23D92.cs" />

124
Pilz.Updating.Client.GUI/SimpleActionDialog.Designer.cs generated
View File

@@ -6,7 +6,7 @@ using System.Windows.Forms;
namespace Pilz.Updating.Client.GUI namespace Pilz.Updating.Client.GUI
{ {
[Microsoft.VisualBasic.CompilerServices.DesignerGenerated()] [Microsoft.VisualBasic.CompilerServices.DesignerGenerated()]
public partial class SimpleActionDialog : DevComponents.DotNetBar.OfficeForm public partial class SimpleActionDialog : Telerik.WinControls.UI.RadForm
{ {
// Das Formular überschreibt den Löschvorgang, um die Komponentenliste zu bereinigen. // Das Formular überschreibt den Löschvorgang, um die Komponentenliste zu bereinigen.
@@ -35,55 +35,79 @@ namespace Pilz.Updating.Client.GUI
[DebuggerStepThrough()] [DebuggerStepThrough()]
private void InitializeComponent() private void InitializeComponent()
{ {
components = new System.ComponentModel.Container(); System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(SimpleActionDialog));
var resources = new System.ComponentModel.ComponentResourceManager(typeof(SimpleActionDialog)); this._Panel1 = new System.Windows.Forms.Panel();
_Panel1 = new Panel(); this.radWaitingBar1 = new Telerik.WinControls.UI.RadWaitingBar();
_LabelX_Progress = new DevComponents.DotNetBar.LabelX(); this.waitingBarIndicatorElement2 = new Telerik.WinControls.UI.WaitingBarIndicatorElement();
_ProgressBarX_Progress = new DevComponents.DotNetBar.Controls.ProgressBarX(); this.waitingBarIndicatorElement1 = new Telerik.WinControls.UI.WaitingBarIndicatorElement();
_Panel1.SuspendLayout(); this.radProgressBar1 = new Telerik.WinControls.UI.RadProgressBar();
SuspendLayout(); this._Panel1.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.radWaitingBar1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.radProgressBar1)).BeginInit();
this.radProgressBar1.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this)).BeginInit();
this.SuspendLayout();
// //
// Panel1 // _Panel1
// //
_Panel1.BackColor = Color.Transparent; this._Panel1.BackColor = System.Drawing.Color.Transparent;
_Panel1.Controls.Add(_LabelX_Progress); this._Panel1.Controls.Add(this.radProgressBar1);
_Panel1.Controls.Add(_ProgressBarX_Progress); resources.ApplyResources(this._Panel1, "_Panel1");
resources.ApplyResources(_Panel1, "Panel1"); this._Panel1.Name = "_Panel1";
_Panel1.Name = "Panel1";
// //
// LabelX_Progress // radWaitingBar1
// //
resources.ApplyResources(_LabelX_Progress, "LabelX_Progress"); resources.ApplyResources(this.radWaitingBar1, "radWaitingBar1");
this.radWaitingBar1.Name = "radWaitingBar1";
this.radWaitingBar1.ShowText = true;
this.radWaitingBar1.WaitingIndicators.Add(this.waitingBarIndicatorElement2);
this.radWaitingBar1.WaitingIndicators.Add(this.waitingBarIndicatorElement1);
this.radWaitingBar1.WaitingIndicatorSize = new System.Drawing.Size(100, 14);
this.radWaitingBar1.WaitingSpeed = 100;
this.radWaitingBar1.WaitingStep = 2;
// //
// waitingBarIndicatorElement2
// //
this.waitingBarIndicatorElement2.Name = "waitingBarIndicatorElement2";
this.waitingBarIndicatorElement2.StretchHorizontally = false;
// //
_LabelX_Progress.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; // waitingBarIndicatorElement1
_LabelX_Progress.Name = "LabelX_Progress";
// //
// ProgressBarX_Progress this.waitingBarIndicatorElement1.Name = "waitingBarIndicatorElement1";
this.waitingBarIndicatorElement1.StretchHorizontally = false;
// //
resources.ApplyResources(_ProgressBarX_Progress, "ProgressBarX_Progress"); // radProgressBar1
// //
// resources.ApplyResources(this.radProgressBar1, "radProgressBar1");
// this.radProgressBar1.Controls.Add(this.radWaitingBar1);
_ProgressBarX_Progress.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.radProgressBar1.Name = "radProgressBar1";
_ProgressBarX_Progress.Name = "ProgressBarX_Progress";
// //
// SimpleActionDialog // SimpleActionDialog
// //
resources.ApplyResources(this, "$this"); resources.ApplyResources(this, "$this");
AutoScaleMode = AutoScaleMode.Font; this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
ControlBox = false; this.ControlBox = false;
Controls.Add(_Panel1); this.Controls.Add(this._Panel1);
FormBorderStyle = FormBorderStyle.FixedSingle; this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle;
Name = "SimpleActionDialog"; this.Name = "SimpleActionDialog";
TopLeftCornerSize = 0; //
TopRightCornerSize = 0; //
_Panel1.ResumeLayout(false); //
ResumeLayout(false); this.RootElement.ApplyShapeToControl = true;
this._Panel1.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)(this.radWaitingBar1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.radProgressBar1)).EndInit();
this.radProgressBar1.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)(this)).EndInit();
this.ResumeLayout(false);
} }
private Panel _Panel1; private Panel _Panel1;
private Telerik.WinControls.UI.RadWaitingBar radWaitingBar1;
private Telerik.WinControls.UI.RadProgressBar radProgressBar1;
private Telerik.WinControls.UI.WaitingBarIndicatorElement waitingBarIndicatorElement2;
private Telerik.WinControls.UI.WaitingBarIndicatorElement waitingBarIndicatorElement1;
internal Panel Panel1 internal Panel Panel1
{ {
@@ -99,39 +123,5 @@ namespace Pilz.Updating.Client.GUI
_Panel1 = value; _Panel1 = value;
} }
} }
private DevComponents.DotNetBar.LabelX _LabelX_Progress;
internal DevComponents.DotNetBar.LabelX LabelX_Progress
{
[MethodImpl(MethodImplOptions.Synchronized)]
get
{
return _LabelX_Progress;
}
[MethodImpl(MethodImplOptions.Synchronized)]
set
{
_LabelX_Progress = value;
}
}
private DevComponents.DotNetBar.Controls.ProgressBarX _ProgressBarX_Progress;
internal DevComponents.DotNetBar.Controls.ProgressBarX ProgressBarX_Progress
{
[MethodImpl(MethodImplOptions.Synchronized)]
get
{
return _ProgressBarX_Progress;
}
[MethodImpl(MethodImplOptions.Synchronized)]
set
{
_ProgressBarX_Progress = value;
}
}
} }
} }

28
Pilz.Updating.Client.GUI/SimpleActionDialog.cs
View File

@@ -1,5 +1,4 @@
using global::DevComponents.DotNetBar; using global::Pilz.Updating.Client.GUI.My.Resources;
using global::Pilz.Updating.Client.GUI.My.Resources;
namespace Pilz.Updating.Client.GUI namespace Pilz.Updating.Client.GUI
{ {
@@ -8,7 +7,6 @@ namespace Pilz.Updating.Client.GUI
public SimpleActionDialog() public SimpleActionDialog()
{ {
InitializeComponent(); InitializeComponent();
StyleManager.UpdateAmbientColors(this);
SetCurrentState(UpdateStatus.Waiting); SetCurrentState(UpdateStatus.Waiting);
} }
@@ -24,47 +22,55 @@ namespace Pilz.Updating.Client.GUI
private void SetCurrentStateInternal(UpdateStatus curAction, int progress) private void SetCurrentStateInternal(UpdateStatus curAction, int progress)
{ {
var progressText = string.Empty;
switch (curAction) switch (curAction)
{ {
case UpdateStatus.Waiting: case UpdateStatus.Waiting:
{ {
LabelX_Progress.Text = UpdatingClientGuiLangRes.SimpleActions_Waiting; progressText = UpdatingClientGuiLangRes.SimpleActions_Waiting;
break; break;
} }
case UpdateStatus.Searching: case UpdateStatus.Searching:
{ {
LabelX_Progress.Text = UpdatingClientGuiLangRes.SimpleActions_Searching; progressText = UpdatingClientGuiLangRes.SimpleActions_Searching;
break; break;
} }
case UpdateStatus.DownloadingInstaller: case UpdateStatus.DownloadingInstaller:
{ {
LabelX_Progress.Text = UpdatingClientGuiLangRes.SimpleActions_DownloadingInstaller; progressText = UpdatingClientGuiLangRes.SimpleActions_DownloadingInstaller;
break; break;
} }
case UpdateStatus.DownloadingPackage: case UpdateStatus.DownloadingPackage:
{ {
LabelX_Progress.Text = UpdatingClientGuiLangRes.SimpleActions_DownloadingPackage; progressText = UpdatingClientGuiLangRes.SimpleActions_DownloadingPackage;
break; break;
} }
case UpdateStatus.StartingInstaller: case UpdateStatus.StartingInstaller:
{ {
LabelX_Progress.Text = UpdatingClientGuiLangRes.SimpleActions_DownloadingInstaller; progressText = UpdatingClientGuiLangRes.SimpleActions_DownloadingInstaller;
break; break;
} }
} }
if (progress == -1) if (progress == -1)
{ {
ProgressBarX_Progress.ProgressType = eProgressItemType.Marquee; radProgressBar1.Visible = false;
radWaitingBar1.Text = progressText;
radWaitingBar1.BringToFront();
radWaitingBar1.StartWaiting();
} }
else else
{ {
ProgressBarX_Progress.ProgressType = eProgressItemType.Standard; radWaitingBar1.StopWaiting();
ProgressBarX_Progress.Value = progress; radProgressBar1.Text = progressText + $" ({progress}%)";
radProgressBar1.Value1 = progress;
radProgressBar1.BringToFront();
radProgressBar1.Visible = true;
} }
} }
} }

218
Pilz.Updating.Client.GUI/SimpleActionDialog.resx
View File

@@ -1,64 +1,4 @@
<?xml version="1.0" encoding="utf-8"?> <root>
<root>
<!--
Microsoft ResX Schema
Version 2.0
The primary goals of this format is to allow a simple XML format
that is mostly human readable. The generation and parsing of the
various data types are done through the TypeConverter classes
associated with the data types.
Example:
... ado.net/XML headers & schema ...
<resheader name="resmimetype">text/microsoft-resx</resheader>
<resheader name="version">2.0</resheader>
<resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
<resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
<data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
<data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
<data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
<value>[base64 mime encoded serialized .NET Framework object]</value>
</data>
<data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
<comment>This is a comment</comment>
</data>
There are any number of "resheader" rows that contain simple
name/value pairs.
Each data row contains a name, and value. The row also contains a
type or mimetype. Type corresponds to a .NET class that support
text/value conversion through the TypeConverter architecture.
Classes that don't support this are serialized and stored with the
mimetype set.
The mimetype is used for serialized objects, and tells the
ResXResourceReader how to depersist the object. This is currently not
extensible. For a given mimetype the value must be set accordingly:
Note - application/x-microsoft.net.object.binary.base64 is the format
that the ResXResourceWriter will generate, however the reader can
read any of the formats listed below.
mimetype: application/x-microsoft.net.object.binary.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.soap.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Soap.SoapFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.bytearray.base64
value : The object must be serialized into a byte array
: using a System.ComponentModel.TypeConverter
: and then encoded with base64 encoding.
-->
<xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata"> <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
<xsd:import namespace="http://www.w3.org/XML/1998/namespace" /> <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
<xsd:element name="root" msdata:IsDataSet="true"> <xsd:element name="root" msdata:IsDataSet="true">
@@ -117,92 +57,99 @@
<resheader name="writer"> <resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader> </resheader>
<assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" /> <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<data name="LabelX_Progress.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms"> <data name="radProgressBar1.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
<value>Top, Left, Right</value>
</data>
<data name="radWaitingBar1.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
<value>Top, Left, Right</value> <value>Top, Left, Right</value>
</data> </data>
<assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" /> <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<data name="LabelX_Progress.Location" type="System.Drawing.Point, System.Drawing"> <data name="radWaitingBar1.Location" type="System.Drawing.Point, System.Drawing">
<value>3, 5</value>
</data>
<data name="LabelX_Progress.Size" type="System.Drawing.Size, System.Drawing">
<value>380, 23</value>
</data>
<assembly alias="mscorlib" name="mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<data name="LabelX_Progress.TabIndex" type="System.Int32, mscorlib">
<value>1</value>
</data>
<data name="&gt;&gt;LabelX_Progress.Name" xml:space="preserve">
<value>LabelX_Progress</value>
</data>
<data name="&gt;&gt;LabelX_Progress.Type" xml:space="preserve">
<value>DevComponents.DotNetBar.LabelX, DevComponents.DotNetBar2, Version=14.1.0.35, Culture=neutral, PublicKeyToken=null</value>
</data>
<data name="&gt;&gt;LabelX_Progress.Parent" xml:space="preserve">
<value>Panel1</value>
</data>
<data name="&gt;&gt;LabelX_Progress.ZOrder" xml:space="preserve">
<value>0</value>
</data>
<data name="ProgressBarX_Progress.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
<value>Top, Left, Right</value>
</data>
<data name="ProgressBarX_Progress.Location" type="System.Drawing.Point, System.Drawing">
<value>3, 34</value>
</data>
<data name="ProgressBarX_Progress.Size" type="System.Drawing.Size, System.Drawing">
<value>380, 16</value>
</data>
<data name="ProgressBarX_Progress.TabIndex" type="System.Int32, mscorlib">
<value>0</value>
</data>
<data name="ProgressBarX_Progress.Text" xml:space="preserve">
<value>ProgressBarX1</value>
</data>
<data name="&gt;&gt;ProgressBarX_Progress.Name" xml:space="preserve">
<value>ProgressBarX_Progress</value>
</data>
<data name="&gt;&gt;ProgressBarX_Progress.Type" xml:space="preserve">
<value>DevComponents.DotNetBar.Controls.ProgressBarX, DevComponents.DotNetBar2, Version=14.1.0.35, Culture=neutral, PublicKeyToken=null</value>
</data>
<data name="&gt;&gt;ProgressBarX_Progress.Parent" xml:space="preserve">
<value>Panel1</value>
</data>
<data name="&gt;&gt;ProgressBarX_Progress.ZOrder" xml:space="preserve">
<value>1</value>
</data>
<data name="Panel1.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
<value>Fill</value>
</data>
<data name="Panel1.Location" type="System.Drawing.Point, System.Drawing">
<value>0, 0</value> <value>0, 0</value>
</data> </data>
<data name="Panel1.Size" type="System.Drawing.Size, System.Drawing"> <data name="radWaitingBar1.Size" type="System.Drawing.Size, System.Drawing">
<value>386, 53</value> <value>444, 24</value>
</data> </data>
<data name="Panel1.TabIndex" type="System.Int32, mscorlib"> <assembly alias="mscorlib" name="mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<data name="radWaitingBar1.TabIndex" type="System.Int32, mscorlib">
<value>1</value>
</data>
<data name="&gt;&gt;radWaitingBar1.Name" xml:space="preserve">
<value>radWaitingBar1</value>
</data>
<data name="&gt;&gt;radWaitingBar1.Type" xml:space="preserve">
<value>Telerik.WinControls.UI.RadWaitingBar, Telerik.WinControls.UI, Culture=neutral, PublicKeyToken=5bb2a467cbec794e</value>
</data>
<data name="&gt;&gt;radWaitingBar1.Parent" xml:space="preserve">
<value>radProgressBar1</value>
</data>
<data name="&gt;&gt;radWaitingBar1.ZOrder" xml:space="preserve">
<value>0</value> <value>0</value>
</data> </data>
<data name="&gt;&gt;Panel1.Name" xml:space="preserve"> <data name="radProgressBar1.Location" type="System.Drawing.Point, System.Drawing">
<value>Panel1</value> <value>3, 3</value>
</data> </data>
<data name="&gt;&gt;Panel1.Type" xml:space="preserve"> <data name="radProgressBar1.Size" type="System.Drawing.Size, System.Drawing">
<value>System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> <value>444, 24</value>
</data> </data>
<data name="&gt;&gt;Panel1.Parent" xml:space="preserve"> <data name="radProgressBar1.TabIndex" type="System.Int32, mscorlib">
<value>2</value>
</data>
<data name="radProgressBar1.Visible" type="System.Boolean, mscorlib">
<value>False</value>
</data>
<data name="&gt;&gt;radProgressBar1.Name" xml:space="preserve">
<value>radProgressBar1</value>
</data>
<data name="&gt;&gt;radProgressBar1.Type" xml:space="preserve">
<value>Telerik.WinControls.UI.RadProgressBar, Telerik.WinControls.UI, Culture=neutral, PublicKeyToken=5bb2a467cbec794e</value>
</data>
<data name="&gt;&gt;radProgressBar1.Parent" xml:space="preserve">
<value>_Panel1</value>
</data>
<data name="&gt;&gt;radProgressBar1.ZOrder" xml:space="preserve">
<value>0</value>
</data>
<data name="_Panel1.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
<value>Fill</value>
</data>
<data name="_Panel1.Location" type="System.Drawing.Point, System.Drawing">
<value>0, 0</value>
</data>
<assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<data name="_Panel1.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
<value>4, 3, 4, 3</value>
</data>
<data name="_Panel1.Size" type="System.Drawing.Size, System.Drawing">
<value>450, 30</value>
</data>
<data name="_Panel1.TabIndex" type="System.Int32, mscorlib">
<value>0</value>
</data>
<data name="&gt;&gt;_Panel1.Name" xml:space="preserve">
<value>_Panel1</value>
</data>
<data name="&gt;&gt;_Panel1.Type" xml:space="preserve">
<value>System.Windows.Forms.Panel, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;_Panel1.Parent" xml:space="preserve">
<value>$this</value> <value>$this</value>
</data> </data>
<data name="&gt;&gt;Panel1.ZOrder" xml:space="preserve"> <data name="&gt;&gt;_Panel1.ZOrder" xml:space="preserve">
<value>0</value> <value>0</value>
</data> </data>
<metadata name="$this.Localizable" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <metadata name="$this.Localizable" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value> <value>True</value>
</metadata> </metadata>
<data name="$this.AutoScaleBaseSize" type="System.Drawing.Size, System.Drawing">
<value>7, 15</value>
</data>
<data name="$this.AutoScaleDimensions" type="System.Drawing.SizeF, System.Drawing"> <data name="$this.AutoScaleDimensions" type="System.Drawing.SizeF, System.Drawing">
<value>6, 13</value> <value>7, 15</value>
</data> </data>
<data name="$this.ClientSize" type="System.Drawing.Size, System.Drawing"> <data name="$this.ClientSize" type="System.Drawing.Size, System.Drawing">
<value>386, 53</value> <value>450, 30</value>
</data> </data>
<data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64"> <data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value> <value>
@@ -742,16 +689,31 @@
///////wD/////////AP/////////////////////////////////////////////////////////w== ///////wD/////////AP/////////////////////////////////////////////////////////w==
</value> </value>
</data> </data>
<data name="$this.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
<value>4, 3, 4, 3</value>
</data>
<data name="$this.StartPosition" type="System.Windows.Forms.FormStartPosition, System.Windows.Forms"> <data name="$this.StartPosition" type="System.Windows.Forms.FormStartPosition, System.Windows.Forms">
<value>CenterScreen</value> <value>CenterScreen</value>
</data> </data>
<data name="$this.Text" xml:space="preserve"> <data name="$this.Text" xml:space="preserve">
<value>Updates</value> <value>Updates</value>
</data> </data>
<data name="&gt;&gt;waitingBarIndicatorElement2.Name" xml:space="preserve">
<value>waitingBarIndicatorElement2</value>
</data>
<data name="&gt;&gt;waitingBarIndicatorElement2.Type" xml:space="preserve">
<value>Telerik.WinControls.UI.WaitingBarIndicatorElement, Telerik.WinControls.UI, Culture=neutral, PublicKeyToken=5bb2a467cbec794e</value>
</data>
<data name="&gt;&gt;waitingBarIndicatorElement1.Name" xml:space="preserve">
<value>waitingBarIndicatorElement1</value>
</data>
<data name="&gt;&gt;waitingBarIndicatorElement1.Type" xml:space="preserve">
<value>Telerik.WinControls.UI.WaitingBarIndicatorElement, Telerik.WinControls.UI, Culture=neutral, PublicKeyToken=5bb2a467cbec794e</value>
</data>
<data name="&gt;&gt;$this.Name" xml:space="preserve"> <data name="&gt;&gt;$this.Name" xml:space="preserve">
<value>SimpleActionDialog</value> <value>SimpleActionDialog</value>
</data> </data>
<data name="&gt;&gt;$this.Type" xml:space="preserve"> <data name="&gt;&gt;$this.Type" xml:space="preserve">
<value>DevComponents.DotNetBar.OfficeForm, DevComponents.DotNetBar2, Version=14.1.0.35, Culture=neutral, PublicKeyToken=null</value> <value>Telerik.WinControls.UI.RadForm, Telerik.WinControls.UI, Culture=neutral, PublicKeyToken=5bb2a467cbec794e</value>
</data> </data>
</root> </root>

4
Pilz.Updating.Client.GUI/UpdateClientGUI.cs
View File

@@ -3,10 +3,10 @@ using System.Drawing;
using global::System.Reflection; using global::System.Reflection;
using System.Runtime.CompilerServices; using System.Runtime.CompilerServices;
using System.Windows.Forms; using System.Windows.Forms;
using global::DevComponents.DotNetBar;
using Microsoft.VisualBasic.CompilerServices; using Microsoft.VisualBasic.CompilerServices;
using global::Pilz.Updating.Client.GUI.My.Resources; using global::Pilz.Updating.Client.GUI.My.Resources;
using System; using System;
using Telerik.WinControls;
namespace Pilz.Updating.Client.GUI namespace Pilz.Updating.Client.GUI
{ {
@@ -145,7 +145,7 @@ namespace Pilz.Updating.Client.GUI
EndUpdating(); EndUpdating();
if (!UseHiddenSearch) if (!UseHiddenSearch)
{ {
MessageBoxEx.Show(UpdatingClientGuiLangRes.MsgBox_NoUpdatesFound, UpdatingClientGuiLangRes.MsgBox_NoUpdatesFound_Titel, MessageBoxButtons.OK, MessageBoxIcon.Information); RadMessageBox.Show(UpdatingClientGuiLangRes.MsgBox_NoUpdatesFound, UpdatingClientGuiLangRes.MsgBox_NoUpdatesFound_Titel, MessageBoxButtons.OK, RadMessageIcon.Info);
} }
} }
} }

481
Pilz.Updating.Client.GUI/UpdatesAvailableDialog.Designer.cs generated
View File

@@ -2,13 +2,12 @@
using System.Drawing; using System.Drawing;
using System.Runtime.CompilerServices; using System.Runtime.CompilerServices;
using System.Windows.Forms; using System.Windows.Forms;
using global::DevComponents.DotNetBar;
using Microsoft.VisualBasic.CompilerServices; using Microsoft.VisualBasic.CompilerServices;
namespace Pilz.Updating.Client.GUI namespace Pilz.Updating.Client.GUI
{ {
[DesignerGenerated()] [DesignerGenerated()]
internal partial class UpdatesAvailableDialog : OfficeForm internal partial class UpdatesAvailableDialog : Telerik.WinControls.UI.RadForm
{ {
// Das Formular überschreibt den Löschvorgang, um die Komponentenliste zu bereinigen. // Das Formular überschreibt den Löschvorgang, um die Komponentenliste zu bereinigen.
@@ -38,364 +37,232 @@ namespace Pilz.Updating.Client.GUI
private void InitializeComponent() private void InitializeComponent()
{ {
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(UpdatesAvailableDialog)); System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(UpdatesAvailableDialog));
this.LayoutControl1 = new DevComponents.DotNetBar.Layout.LayoutControl(); this.panel1 = new System.Windows.Forms.Panel();
this.PictureBox_AppIcon = new System.Windows.Forms.PictureBox(); this.radButton_Cancel = new Telerik.WinControls.UI.RadButton();
this.LabelX1 = new DevComponents.DotNetBar.LabelX(); this.radButton_Install = new Telerik.WinControls.UI.RadButton();
this.LabelX_NewVersion = new DevComponents.DotNetBar.LabelX(); this.panel_ChangelogPanel = new System.Windows.Forms.Panel();
this.LabelX_NewChannel = new DevComponents.DotNetBar.LabelX(); this.radLabel10 = new Telerik.WinControls.UI.RadLabel();
this.LabelX_NewBuild = new DevComponents.DotNetBar.LabelX(); this.radLabel_CurrentVersionBuild = new Telerik.WinControls.UI.RadLabel();
this.LabelX_CurrentVersion = new DevComponents.DotNetBar.LabelX(); this.radLabel7 = new Telerik.WinControls.UI.RadLabel();
this.LabelX_CurrentChannel = new DevComponents.DotNetBar.LabelX(); this.radLabel_AvailableVersionBuild = new Telerik.WinControls.UI.RadLabel();
this.LabelX_CurrentBuild = new DevComponents.DotNetBar.LabelX(); this.radLabel9 = new Telerik.WinControls.UI.RadLabel();
this.Panel_Changelog = new System.Windows.Forms.Panel(); this.radLabel4 = new Telerik.WinControls.UI.RadLabel();
this.ButtonX_Install = new DevComponents.DotNetBar.ButtonX(); this.radLabel_CurrentVersionChannel = new Telerik.WinControls.UI.RadLabel();
this.ButtonX_Cancel = new DevComponents.DotNetBar.ButtonX(); this.radLabel6 = new Telerik.WinControls.UI.RadLabel();
this.LayoutControlItem1 = new DevComponents.DotNetBar.Layout.LayoutControlItem(); this.radLabel_AvailableVersionChannel = new Telerik.WinControls.UI.RadLabel();
this.LayoutControlItem2 = new DevComponents.DotNetBar.Layout.LayoutControlItem(); this.radLabel3 = new Telerik.WinControls.UI.RadLabel();
this.LayoutControlItem3 = new DevComponents.DotNetBar.Layout.LayoutControlItem(); this.radLabel_CurrentVersion = new Telerik.WinControls.UI.RadLabel();
this.LayoutControlItem4 = new DevComponents.DotNetBar.Layout.LayoutControlItem(); this.radLabel_AvailableVersion = new Telerik.WinControls.UI.RadLabel();
this.LayoutControlItem5 = new DevComponents.DotNetBar.Layout.LayoutControlItem(); this.radLabel2 = new Telerik.WinControls.UI.RadLabel();
this.LayoutControlItem6 = new DevComponents.DotNetBar.Layout.LayoutControlItem(); this.radLabel1 = new Telerik.WinControls.UI.RadLabel();
this.LayoutControlItem7 = new DevComponents.DotNetBar.Layout.LayoutControlItem(); this.radPictureBox1 = new Telerik.WinControls.UI.RadPictureBox();
this.LayoutControlItem8 = new DevComponents.DotNetBar.Layout.LayoutControlItem(); this.layoutControlLabelItem1 = new Telerik.WinControls.UI.LayoutControlLabelItem();
this.LayoutControlItem9 = new DevComponents.DotNetBar.Layout.LayoutControlItem(); this.panel1.SuspendLayout();
this.LayoutSpacerItem1 = new DevComponents.DotNetBar.Layout.LayoutSpacerItem(); ((System.ComponentModel.ISupportInitialize)(this.radButton_Cancel)).BeginInit();
this.LayoutControlItem10 = new DevComponents.DotNetBar.Layout.LayoutControlItem(); ((System.ComponentModel.ISupportInitialize)(this.radButton_Install)).BeginInit();
this.LayoutControlItem11 = new DevComponents.DotNetBar.Layout.LayoutControlItem(); ((System.ComponentModel.ISupportInitialize)(this.radLabel10)).BeginInit();
this.LayoutControl1.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.radLabel_CurrentVersionBuild)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.PictureBox_AppIcon)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.radLabel7)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.radLabel_AvailableVersionBuild)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.radLabel9)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.radLabel4)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.radLabel_CurrentVersionChannel)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.radLabel6)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.radLabel_AvailableVersionChannel)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.radLabel3)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.radLabel_CurrentVersion)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.radLabel_AvailableVersion)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.radLabel2)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.radLabel1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.radPictureBox1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this)).BeginInit();
this.SuspendLayout(); this.SuspendLayout();
// //
// LayoutControl1 // panel1
// //
this.LayoutControl1.BackColor = System.Drawing.Color.Transparent; resources.ApplyResources(this.panel1, "panel1");
this.LayoutControl1.Controls.Add(this.PictureBox_AppIcon); this.panel1.BackColor = System.Drawing.Color.Transparent;
this.LayoutControl1.Controls.Add(this.LabelX1); this.panel1.Controls.Add(this.radButton_Cancel);
this.LayoutControl1.Controls.Add(this.LabelX_NewVersion); this.panel1.Controls.Add(this.radButton_Install);
this.LayoutControl1.Controls.Add(this.LabelX_NewChannel); this.panel1.Controls.Add(this.panel_ChangelogPanel);
this.LayoutControl1.Controls.Add(this.LabelX_NewBuild); this.panel1.Controls.Add(this.radLabel10);
this.LayoutControl1.Controls.Add(this.LabelX_CurrentVersion); this.panel1.Controls.Add(this.radLabel_CurrentVersionBuild);
this.LayoutControl1.Controls.Add(this.LabelX_CurrentChannel); this.panel1.Controls.Add(this.radLabel7);
this.LayoutControl1.Controls.Add(this.LabelX_CurrentBuild); this.panel1.Controls.Add(this.radLabel_AvailableVersionBuild);
this.LayoutControl1.Controls.Add(this.Panel_Changelog); this.panel1.Controls.Add(this.radLabel9);
this.LayoutControl1.Controls.Add(this.ButtonX_Install); this.panel1.Controls.Add(this.radLabel4);
this.LayoutControl1.Controls.Add(this.ButtonX_Cancel); this.panel1.Controls.Add(this.radLabel_CurrentVersionChannel);
resources.ApplyResources(this.LayoutControl1, "LayoutControl1"); this.panel1.Controls.Add(this.radLabel6);
this.LayoutControl1.ForeColor = System.Drawing.Color.Black; this.panel1.Controls.Add(this.radLabel_AvailableVersionChannel);
this.LayoutControl1.Name = "LayoutControl1"; this.panel1.Controls.Add(this.radLabel3);
this.panel1.Controls.Add(this.radLabel_CurrentVersion);
this.panel1.Controls.Add(this.radLabel_AvailableVersion);
this.panel1.Controls.Add(this.radLabel2);
this.panel1.Controls.Add(this.radLabel1);
this.panel1.Controls.Add(this.radPictureBox1);
this.panel1.Name = "panel1";
// //
// radButton_Cancel
// //
resources.ApplyResources(this.radButton_Cancel, "radButton_Cancel");
this.radButton_Cancel.DialogResult = System.Windows.Forms.DialogResult.Cancel;
this.radButton_Cancel.Image = global::Pilz.Updating.Client.GUI.MyIcons.icons8_delete_16px;
this.radButton_Cancel.Name = "radButton_Cancel";
// //
this.LayoutControl1.RootGroup.Items.AddRange(new DevComponents.DotNetBar.Layout.LayoutItemBase[] { // radButton_Install
this.LayoutControlItem1,
this.LayoutControlItem2,
this.LayoutControlItem3,
this.LayoutControlItem4,
this.LayoutControlItem5,
this.LayoutControlItem6,
this.LayoutControlItem7,
this.LayoutControlItem8,
this.LayoutControlItem9,
this.LayoutSpacerItem1,
this.LayoutControlItem10,
this.LayoutControlItem11});
// //
// PictureBox_AppIcon resources.ApplyResources(this.radButton_Install, "radButton_Install");
this.radButton_Install.Image = global::Pilz.Updating.Client.GUI.MyIcons.icons8_software_installer_16px;
this.radButton_Install.Name = "radButton_Install";
// //
resources.ApplyResources(this.PictureBox_AppIcon, "PictureBox_AppIcon"); // panel_ChangelogPanel
this.PictureBox_AppIcon.Name = "PictureBox_AppIcon";
this.PictureBox_AppIcon.TabStop = false;
// //
// LabelX1 resources.ApplyResources(this.panel_ChangelogPanel, "panel_ChangelogPanel");
this.panel_ChangelogPanel.Name = "panel_ChangelogPanel";
// //
// radLabel10
// //
resources.ApplyResources(this.radLabel10, "radLabel10");
this.radLabel10.Name = "radLabel10";
// //
// radLabel_CurrentVersionBuild
// //
this.LabelX1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; resources.ApplyResources(this.radLabel_CurrentVersionBuild, "radLabel_CurrentVersionBuild");
resources.ApplyResources(this.LabelX1, "LabelX1"); this.radLabel_CurrentVersionBuild.Name = "radLabel_CurrentVersionBuild";
this.LabelX1.Name = "LabelX1";
this.LabelX1.TextAlignment = System.Drawing.StringAlignment.Center;
// //
// LabelX_NewVersion // radLabel7
// //
resources.ApplyResources(this.radLabel7, "radLabel7");
this.radLabel7.Name = "radLabel7";
// //
// radLabel_AvailableVersionBuild
// //
resources.ApplyResources(this.radLabel_AvailableVersionBuild, "radLabel_AvailableVersionBuild");
this.radLabel_AvailableVersionBuild.Name = "radLabel_AvailableVersionBuild";
// //
this.LabelX_NewVersion.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; // radLabel9
resources.ApplyResources(this.LabelX_NewVersion, "LabelX_NewVersion");
this.LabelX_NewVersion.Name = "LabelX_NewVersion";
// //
// LabelX_NewChannel resources.ApplyResources(this.radLabel9, "radLabel9");
this.radLabel9.Name = "radLabel9";
// //
// radLabel4
// //
resources.ApplyResources(this.radLabel4, "radLabel4");
this.radLabel4.Name = "radLabel4";
// //
// radLabel_CurrentVersionChannel
// //
this.LabelX_NewChannel.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; resources.ApplyResources(this.radLabel_CurrentVersionChannel, "radLabel_CurrentVersionChannel");
resources.ApplyResources(this.LabelX_NewChannel, "LabelX_NewChannel"); this.radLabel_CurrentVersionChannel.Name = "radLabel_CurrentVersionChannel";
this.LabelX_NewChannel.Name = "LabelX_NewChannel";
// //
// LabelX_NewBuild // radLabel6
// //
resources.ApplyResources(this.radLabel6, "radLabel6");
this.radLabel6.Name = "radLabel6";
// //
// radLabel_AvailableVersionChannel
// //
resources.ApplyResources(this.radLabel_AvailableVersionChannel, "radLabel_AvailableVersionChannel");
this.radLabel_AvailableVersionChannel.Name = "radLabel_AvailableVersionChannel";
// //
this.LabelX_NewBuild.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; // radLabel3
resources.ApplyResources(this.LabelX_NewBuild, "LabelX_NewBuild");
this.LabelX_NewBuild.Name = "LabelX_NewBuild";
// //
// LabelX_CurrentVersion resources.ApplyResources(this.radLabel3, "radLabel3");
this.radLabel3.Name = "radLabel3";
// //
// radLabel_CurrentVersion
// //
resources.ApplyResources(this.radLabel_CurrentVersion, "radLabel_CurrentVersion");
this.radLabel_CurrentVersion.Name = "radLabel_CurrentVersion";
// //
// radLabel_AvailableVersion
// //
this.LabelX_CurrentVersion.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; resources.ApplyResources(this.radLabel_AvailableVersion, "radLabel_AvailableVersion");
resources.ApplyResources(this.LabelX_CurrentVersion, "LabelX_CurrentVersion"); this.radLabel_AvailableVersion.Name = "radLabel_AvailableVersion";
this.LabelX_CurrentVersion.Name = "LabelX_CurrentVersion";
// //
// LabelX_CurrentChannel // radLabel2
// //
resources.ApplyResources(this.radLabel2, "radLabel2");
this.radLabel2.Name = "radLabel2";
// //
// radLabel1
// //
resources.ApplyResources(this.radLabel1, "radLabel1");
this.radLabel1.Name = "radLabel1";
// //
this.LabelX_CurrentChannel.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; // radPictureBox1
resources.ApplyResources(this.LabelX_CurrentChannel, "LabelX_CurrentChannel");
this.LabelX_CurrentChannel.Name = "LabelX_CurrentChannel";
// //
// LabelX_CurrentBuild resources.ApplyResources(this.radPictureBox1, "radPictureBox1");
this.radPictureBox1.Name = "radPictureBox1";
// //
// layoutControlLabelItem1
// //
// resources.ApplyResources(this.layoutControlLabelItem1, "layoutControlLabelItem1");
// this.layoutControlLabelItem1.Bounds = new System.Drawing.Rectangle(0, 52, 428, 39);
this.LabelX_CurrentBuild.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.layoutControlLabelItem1.DisabledTextRenderingHint = System.Drawing.Text.TextRenderingHint.SystemDefault;
resources.ApplyResources(this.LabelX_CurrentBuild, "LabelX_CurrentBuild"); this.layoutControlLabelItem1.DrawText = false;
this.LabelX_CurrentBuild.Name = "LabelX_CurrentBuild"; this.layoutControlLabelItem1.Name = "layoutControlLabelItem1";
// this.layoutControlLabelItem1.TextRenderingHint = System.Drawing.Text.TextRenderingHint.SystemDefault;
// Panel_Changelog this.layoutControlLabelItem1.UseCompatibleTextRendering = false;
//
this.Panel_Changelog.BackColor = System.Drawing.Color.Transparent;
resources.ApplyResources(this.Panel_Changelog, "Panel_Changelog");
this.Panel_Changelog.Name = "Panel_Changelog";
//
// ButtonX_Install
//
this.ButtonX_Install.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton;
this.ButtonX_Install.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground;
this.ButtonX_Install.DialogResult = System.Windows.Forms.DialogResult.OK;
this.ButtonX_Install.Image = global::Pilz.Updating.Client.GUI.MyIcons.icons8_software_installer_16px;
resources.ApplyResources(this.ButtonX_Install, "ButtonX_Install");
this.ButtonX_Install.Name = "ButtonX_Install";
this.ButtonX_Install.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
//
// 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.Client.GUI.MyIcons.icons8_delete_16px;
resources.ApplyResources(this.ButtonX_Cancel, "ButtonX_Cancel");
this.ButtonX_Cancel.Name = "ButtonX_Cancel";
this.ButtonX_Cancel.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
//
// LayoutControlItem1
//
this.LayoutControlItem1.Control = this.PictureBox_AppIcon;
this.LayoutControlItem1.Height = 58;
this.LayoutControlItem1.MinSize = new System.Drawing.Size(50, 50);
this.LayoutControlItem1.Name = "LayoutControlItem1";
resources.ApplyResources(this.LayoutControlItem1, "LayoutControlItem1");
this.LayoutControlItem1.TextVisible = false;
this.LayoutControlItem1.Width = 58;
//
// LayoutControlItem2
//
this.LayoutControlItem2.Control = this.LabelX1;
this.LayoutControlItem2.Height = 31;
this.LayoutControlItem2.MinSize = new System.Drawing.Size(64, 18);
this.LayoutControlItem2.Name = "LayoutControlItem2";
resources.ApplyResources(this.LayoutControlItem2, "LayoutControlItem2");
this.LayoutControlItem2.TextVisible = false;
this.LayoutControlItem2.Width = 99;
this.LayoutControlItem2.WidthType = DevComponents.DotNetBar.Layout.eLayoutSizeType.Percent;
//
// LayoutControlItem3
//
this.LayoutControlItem3.Control = this.LabelX_NewVersion;
this.LayoutControlItem3.Height = 31;
this.LayoutControlItem3.MinSize = new System.Drawing.Size(64, 18);
this.LayoutControlItem3.Name = "LayoutControlItem3";
resources.ApplyResources(this.LayoutControlItem3, "LayoutControlItem3");
this.LayoutControlItem3.TextLineAlignment = DevComponents.DotNetBar.Layout.eTextLineAlignment.Middle;
this.LayoutControlItem3.TextPadding = new System.Windows.Forms.Padding(0, 1, 0, 0);
this.LayoutControlItem3.Width = 50;
this.LayoutControlItem3.WidthType = DevComponents.DotNetBar.Layout.eLayoutSizeType.Percent;
//
// LayoutControlItem4
//
this.LayoutControlItem4.Control = this.LabelX_NewChannel;
this.LayoutControlItem4.Height = 31;
this.LayoutControlItem4.MinSize = new System.Drawing.Size(64, 18);
this.LayoutControlItem4.Name = "LayoutControlItem4";
this.LayoutControlItem4.SharedTextSizeEnabled = false;
resources.ApplyResources(this.LayoutControlItem4, "LayoutControlItem4");
this.LayoutControlItem4.TextLineAlignment = DevComponents.DotNetBar.Layout.eTextLineAlignment.Middle;
this.LayoutControlItem4.TextPadding = new System.Windows.Forms.Padding(0, 1, 0, 0);
this.LayoutControlItem4.Width = 30;
this.LayoutControlItem4.WidthType = DevComponents.DotNetBar.Layout.eLayoutSizeType.Percent;
//
// LayoutControlItem5
//
this.LayoutControlItem5.Control = this.LabelX_NewBuild;
this.LayoutControlItem5.Height = 31;
this.LayoutControlItem5.MinSize = new System.Drawing.Size(64, 18);
this.LayoutControlItem5.Name = "LayoutControlItem5";
this.LayoutControlItem5.SharedTextSizeEnabled = false;
resources.ApplyResources(this.LayoutControlItem5, "LayoutControlItem5");
this.LayoutControlItem5.TextLineAlignment = DevComponents.DotNetBar.Layout.eTextLineAlignment.Middle;
this.LayoutControlItem5.TextPadding = new System.Windows.Forms.Padding(0, 1, 0, 0);
this.LayoutControlItem5.Width = 20;
this.LayoutControlItem5.WidthType = DevComponents.DotNetBar.Layout.eLayoutSizeType.Percent;
//
// LayoutControlItem6
//
this.LayoutControlItem6.Control = this.LabelX_CurrentVersion;
this.LayoutControlItem6.Height = 31;
this.LayoutControlItem6.MinSize = new System.Drawing.Size(64, 18);
this.LayoutControlItem6.Name = "LayoutControlItem6";
resources.ApplyResources(this.LayoutControlItem6, "LayoutControlItem6");
this.LayoutControlItem6.TextLineAlignment = DevComponents.DotNetBar.Layout.eTextLineAlignment.Middle;
this.LayoutControlItem6.TextPadding = new System.Windows.Forms.Padding(0, 1, 0, 0);
this.LayoutControlItem6.Width = 50;
this.LayoutControlItem6.WidthType = DevComponents.DotNetBar.Layout.eLayoutSizeType.Percent;
//
// LayoutControlItem7
//
this.LayoutControlItem7.Control = this.LabelX_CurrentChannel;
this.LayoutControlItem7.Height = 31;
this.LayoutControlItem7.MinSize = new System.Drawing.Size(64, 18);
this.LayoutControlItem7.Name = "LayoutControlItem7";
this.LayoutControlItem7.SharedTextSizeEnabled = false;
resources.ApplyResources(this.LayoutControlItem7, "LayoutControlItem7");
this.LayoutControlItem7.TextLineAlignment = DevComponents.DotNetBar.Layout.eTextLineAlignment.Middle;
this.LayoutControlItem7.TextPadding = new System.Windows.Forms.Padding(0, 1, 0, 0);
this.LayoutControlItem7.Width = 30;
this.LayoutControlItem7.WidthType = DevComponents.DotNetBar.Layout.eLayoutSizeType.Percent;
//
// LayoutControlItem8
//
this.LayoutControlItem8.Control = this.LabelX_CurrentBuild;
this.LayoutControlItem8.Height = 31;
this.LayoutControlItem8.MinSize = new System.Drawing.Size(64, 18);
this.LayoutControlItem8.Name = "LayoutControlItem8";
this.LayoutControlItem8.SharedTextSizeEnabled = false;
resources.ApplyResources(this.LayoutControlItem8, "LayoutControlItem8");
this.LayoutControlItem8.TextLineAlignment = DevComponents.DotNetBar.Layout.eTextLineAlignment.Middle;
this.LayoutControlItem8.TextPadding = new System.Windows.Forms.Padding(0, 1, 0, 0);
this.LayoutControlItem8.Width = 20;
this.LayoutControlItem8.WidthType = DevComponents.DotNetBar.Layout.eLayoutSizeType.Percent;
//
// LayoutControlItem9
//
this.LayoutControlItem9.Control = this.Panel_Changelog;
this.LayoutControlItem9.Height = 99;
this.LayoutControlItem9.HeightType = DevComponents.DotNetBar.Layout.eLayoutSizeType.Percent;
this.LayoutControlItem9.MinSize = new System.Drawing.Size(64, 18);
this.LayoutControlItem9.Name = "LayoutControlItem9";
resources.ApplyResources(this.LayoutControlItem9, "LayoutControlItem9");
this.LayoutControlItem9.TextLineAlignment = DevComponents.DotNetBar.Layout.eTextLineAlignment.Middle;
this.LayoutControlItem9.TextPadding = new System.Windows.Forms.Padding(0, 1, 0, 0);
this.LayoutControlItem9.TextPosition = DevComponents.DotNetBar.Layout.eLayoutPosition.Top;
this.LayoutControlItem9.Width = 100;
this.LayoutControlItem9.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;
//
// LayoutControlItem10
//
this.LayoutControlItem10.Control = this.ButtonX_Install;
this.LayoutControlItem10.Height = 31;
this.LayoutControlItem10.MinSize = new System.Drawing.Size(32, 20);
this.LayoutControlItem10.Name = "LayoutControlItem10";
this.LayoutControlItem10.Width = 100;
//
// LayoutControlItem11
//
this.LayoutControlItem11.Control = this.ButtonX_Cancel;
this.LayoutControlItem11.Height = 31;
this.LayoutControlItem11.MinSize = new System.Drawing.Size(32, 20);
this.LayoutControlItem11.Name = "LayoutControlItem11";
this.LayoutControlItem11.Width = 100;
// //
// UpdatesAvailableDialog // UpdatesAvailableDialog
// //
this.AcceptButton = this.ButtonX_Install; this.AcceptButton = this.radButton_Install;
resources.ApplyResources(this, "$this"); resources.ApplyResources(this, "$this");
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.CancelButton = this.ButtonX_Cancel; this.CancelButton = this.radButton_Cancel;
this.Controls.Add(this.LayoutControl1); this.Controls.Add(this.panel1);
this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle; this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle;
this.MaximizeBox = false; this.MaximizeBox = false;
this.MinimizeBox = false; this.MinimizeBox = false;
this.Name = "UpdatesAvailableDialog"; this.Name = "UpdatesAvailableDialog";
this.TopLeftCornerSize = 0; //
this.TopRightCornerSize = 0; //
this.LayoutControl1.ResumeLayout(false); //
((System.ComponentModel.ISupportInitialize)(this.PictureBox_AppIcon)).EndInit(); this.RootElement.ApplyShapeToControl = true;
this.panel1.ResumeLayout(false);
this.panel1.PerformLayout();
((System.ComponentModel.ISupportInitialize)(this.radButton_Cancel)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.radButton_Install)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.radLabel10)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.radLabel_CurrentVersionBuild)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.radLabel7)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.radLabel_AvailableVersionBuild)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.radLabel9)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.radLabel4)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.radLabel_CurrentVersionChannel)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.radLabel6)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.radLabel_AvailableVersionChannel)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.radLabel3)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.radLabel_CurrentVersion)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.radLabel_AvailableVersion)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.radLabel2)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.radLabel1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.radPictureBox1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this)).EndInit();
this.ResumeLayout(false); this.ResumeLayout(false);
} }
private DevComponents.DotNetBar.Layout.LayoutControl LayoutControl1; private Panel panel1;
private Telerik.WinControls.UI.RadPictureBox radPictureBox1;
private PictureBox PictureBox_AppIcon; private Telerik.WinControls.UI.RadLabel radLabel1;
private Telerik.WinControls.UI.RadLabel radLabel3;
private DevComponents.DotNetBar.Layout.LayoutControlItem LayoutControlItem1; private Telerik.WinControls.UI.RadLabel radLabel_CurrentVersion;
private Telerik.WinControls.UI.RadLabel radLabel_AvailableVersion;
private LabelX LabelX1; private Telerik.WinControls.UI.RadLabel radLabel2;
private Telerik.WinControls.UI.LayoutControlLabelItem layoutControlLabelItem1;
private DevComponents.DotNetBar.Layout.LayoutControlItem LayoutControlItem2; private Telerik.WinControls.UI.RadLabel radLabel_CurrentVersionBuild;
private Telerik.WinControls.UI.RadLabel radLabel7;
private LabelX LabelX_NewVersion; private Telerik.WinControls.UI.RadLabel radLabel_AvailableVersionBuild;
private Telerik.WinControls.UI.RadLabel radLabel9;
private DevComponents.DotNetBar.Layout.LayoutControlItem LayoutControlItem3; private Telerik.WinControls.UI.RadLabel radLabel4;
private Telerik.WinControls.UI.RadLabel radLabel_CurrentVersionChannel;
private System.Windows.Forms.Panel Panel_Changelog; private Telerik.WinControls.UI.RadLabel radLabel6;
private Telerik.WinControls.UI.RadLabel radLabel_AvailableVersionChannel;
private LabelX LabelX_NewChannel; private Panel panel_ChangelogPanel;
private Telerik.WinControls.UI.RadLabel radLabel10;
private LabelX LabelX_NewBuild; private Telerik.WinControls.UI.RadButton radButton_Cancel;
private Telerik.WinControls.UI.RadButton radButton_Install;
private LabelX LabelX_CurrentVersion;
private LabelX LabelX_CurrentChannel;
private LabelX LabelX_CurrentBuild;
private DevComponents.DotNetBar.Layout.LayoutControlItem LayoutControlItem4;
private DevComponents.DotNetBar.Layout.LayoutControlItem LayoutControlItem5;
private DevComponents.DotNetBar.Layout.LayoutControlItem LayoutControlItem6;
private DevComponents.DotNetBar.Layout.LayoutControlItem LayoutControlItem7;
private DevComponents.DotNetBar.Layout.LayoutControlItem LayoutControlItem8;
private DevComponents.DotNetBar.Layout.LayoutControlItem LayoutControlItem9;
private ButtonX ButtonX_Install;
private ButtonX ButtonX_Cancel;
private DevComponents.DotNetBar.Layout.LayoutSpacerItem LayoutSpacerItem1;
private DevComponents.DotNetBar.Layout.LayoutControlItem LayoutControlItem10;
private DevComponents.DotNetBar.Layout.LayoutControlItem LayoutControlItem11;
} }
} }

26
Pilz.Updating.Client.GUI/UpdatesAvailableDialog.cs
View File

@@ -1,7 +1,8 @@
using System.Drawing; using System.Drawing;
using System.Windows.Forms; using System.Windows.Forms;
using global::DevComponents.DotNetBar;
using Pilz.Updating.GUIBase; using Pilz.Updating.GUIBase;
using Telerik.WinControls;
using Telerik.WinControls.UI;
namespace Pilz.Updating.Client.GUI namespace Pilz.Updating.Client.GUI
{ {
@@ -12,26 +13,25 @@ namespace Pilz.Updating.Client.GUI
InitializeComponent(); InitializeComponent();
if (installAsAdmin) if (installAsAdmin)
ButtonX_Install.Image = BaseFeatures.GetUacShieldImage(); radButton_Install.Image = BaseFeatures.GetUacShieldImage();
PictureBox_AppIcon.Image = appIcon ?? Icon.ToBitmap(); radPictureBox1.Image = appIcon ?? Icon.ToBitmap();
LabelX_CurrentVersion.Text = curVersion; radLabel_CurrentVersion.Text = curVersion;
LabelX_CurrentChannel.Text = curChannel; radLabel_CurrentVersionChannel.Text = curChannel;
LabelX_CurrentBuild.Text = curBuild; radLabel_CurrentVersionBuild.Text = curBuild;
LabelX_NewVersion.Text = newVersion; radLabel_AvailableVersion.Text = newVersion;
LabelX_NewChannel.Text = newChannel; radLabel_AvailableVersionChannel.Text = newChannel;
LabelX_NewBuild.Text = newBuild; radLabel_AvailableVersionBuild.Text = newBuild;
// Update Notes // Update Notes
Control updateNotesControl = null; Control updateNotesControl = null;
switch (updateNotes.ContentType) switch (updateNotes.ContentType)
{ {
case UpdateNotesContentType.PlainText: case UpdateNotesContentType.PlainText:
var newUpdateNotesControl = new DevComponents.DotNetBar.Controls.RichTextBoxEx var newUpdateNotesControl = new RadRichTextEditor
{ {
Text = updateNotes.Content Text = updateNotes.Content
}; };
newUpdateNotesControl.BackgroundStyle.Class = DevComponents.DotNetBar.Rendering.ElementStyleClassKeys.RichTextBoxBorderKey;
updateNotesControl = newUpdateNotesControl; updateNotesControl = newUpdateNotesControl;
break; break;
case UpdateNotesContentType.Markdown: case UpdateNotesContentType.Markdown:
@@ -50,10 +50,8 @@ namespace Pilz.Updating.Client.GUI
if (updateNotesControl is object) if (updateNotesControl is object)
{ {
updateNotesControl.Dock = DockStyle.Fill; updateNotesControl.Dock = DockStyle.Fill;
Panel_Changelog.Controls.Add(updateNotesControl); panel_ChangelogPanel.Controls.Add(updateNotesControl);
} }
UpdateAmbientColors();
} }
} }
} }

149
Pilz.Updating.Client.GUI/UpdatesAvailableDialog.de.resx
View File

@@ -1,64 +1,4 @@
<?xml version="1.0" encoding="utf-8"?> <root>
<root>
<!--
Microsoft ResX Schema
Version 2.0
The primary goals of this format is to allow a simple XML format
that is mostly human readable. The generation and parsing of the
various data types are done through the TypeConverter classes
associated with the data types.
Example:
... ado.net/XML headers & schema ...
<resheader name="resmimetype">text/microsoft-resx</resheader>
<resheader name="version">2.0</resheader>
<resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
<resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
<data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
<data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
<data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
<value>[base64 mime encoded serialized .NET Framework object]</value>
</data>
<data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
<comment>This is a comment</comment>
</data>
There are any number of "resheader" rows that contain simple
name/value pairs.
Each data row contains a name, and value. The row also contains a
type or mimetype. Type corresponds to a .NET class that support
text/value conversion through the TypeConverter architecture.
Classes that don't support this are serialized and stored with the
mimetype set.
The mimetype is used for serialized objects, and tells the
ResXResourceReader how to depersist the object. This is currently not
extensible. For a given mimetype the value must be set accordingly:
Note - application/x-microsoft.net.object.binary.base64 is the format
that the ResXResourceWriter will generate, however the reader can
read any of the formats listed below.
mimetype: application/x-microsoft.net.object.binary.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.soap.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Soap.SoapFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.bytearray.base64
value : The object must be serialized into a byte array
: using a System.ComponentModel.TypeConverter
: and then encoded with base64 encoding.
-->
<xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata"> <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
<xsd:import namespace="http://www.w3.org/XML/1998/namespace" /> <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
<xsd:element name="root" msdata:IsDataSet="true"> <xsd:element name="root" msdata:IsDataSet="true">
@@ -117,60 +57,45 @@
<resheader name="writer"> <resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader> </resheader>
<data name="LabelX1.Text" xml:space="preserve"> <data name="radButton_Cancel.Text" xml:space="preserve">
<value>Aktuallisierung verfügbar</value>
</data>
<assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<data name="LabelX_NewVersion.Location" type="System.Drawing.Point, System.Drawing">
<value>112, 62</value>
</data>
<data name="LabelX_NewVersion.Size" type="System.Drawing.Size, System.Drawing">
<value>101, 23</value>
</data>
<data name="LabelX_NewChannel.Location" type="System.Drawing.Point, System.Drawing">
<value>260, 62</value>
</data>
<data name="LabelX_NewChannel.Size" type="System.Drawing.Size, System.Drawing">
<value>83, 23</value>
</data>
<data name="LabelX_CurrentVersion.Location" type="System.Drawing.Point, System.Drawing">
<value>112, 93</value>
</data>
<data name="LabelX_CurrentVersion.Size" type="System.Drawing.Size, System.Drawing">
<value>101, 23</value>
</data>
<data name="LabelX_CurrentChannel.Location" type="System.Drawing.Point, System.Drawing">
<value>260, 93</value>
</data>
<data name="LabelX_CurrentChannel.Size" type="System.Drawing.Size, System.Drawing">
<value>83, 23</value>
</data>
<data name="ButtonX_Install.Text" xml:space="preserve">
<value>Installieren</value>
</data>
<data name="ButtonX_Cancel.Text" xml:space="preserve">
<value>Abbrechen</value> <value>Abbrechen</value>
</data> </data>
<data name="LayoutControlItem3.Text" xml:space="preserve"> <data name="radButton_Install.Text" xml:space="preserve">
<value>Installieren</value>
</data>
<assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<data name="radLabel10.Size" type="System.Drawing.Size, System.Drawing">
<value>106, 18</value>
</data>
<data name="radLabel10.Text" xml:space="preserve">
<value>Änderungshinweise:</value>
</data>
<data name="radLabel_CurrentVersionChannel.Size" type="System.Drawing.Size, System.Drawing">
<value>36, 18</value>
</data>
<data name="radLabel_CurrentVersionChannel.Text" xml:space="preserve">
<value>Kanal:</value>
</data>
<data name="radLabel_AvailableVersionChannel.Size" type="System.Drawing.Size, System.Drawing">
<value>36, 18</value>
</data>
<data name="radLabel_AvailableVersionChannel.Text" xml:space="preserve">
<value>Kanal:</value>
</data>
<data name="radLabel_CurrentVersion.Size" type="System.Drawing.Size, System.Drawing">
<value>101, 18</value>
</data>
<data name="radLabel_CurrentVersion.Text" xml:space="preserve">
<value>Installierte Version:</value>
</data>
<data name="radLabel2.Size" type="System.Drawing.Size, System.Drawing">
<value>105, 18</value>
</data>
<data name="radLabel2.Text" xml:space="preserve">
<value>Verfügbare Version:</value> <value>Verfügbare Version:</value>
</data> </data>
<data name="LayoutControlItem4.Text" xml:space="preserve"> <data name="radLabel1.Text" xml:space="preserve">
<value>Kanal:</value> <value>&lt;html&gt;&lt;span style="font-size: 18pt"&gt;Aktualisierung verfügbar&lt;/span&gt;&lt;/html&gt;</value>
</data>
<data name="LayoutControlItem6.Text" xml:space="preserve">
<value>Aktuelle Version:</value>
</data>
<data name="LayoutControlItem7.Text" xml:space="preserve">
<value>Kanal:</value>
</data>
<data name="LayoutControlItem9.Text" xml:space="preserve">
<value>Änderungen:</value>
</data>
<data name="resource.Text" xml:space="preserve">
<value />
</data>
<data name="resource.Tooltip" xml:space="preserve">
<value />
</data> </data>
<data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64"> <data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value> <value>
@@ -711,6 +636,6 @@
</value> </value>
</data> </data>
<data name="$this.Text" xml:space="preserve"> <data name="$this.Text" xml:space="preserve">
<value>Aktuallisierung</value> <value>Aktualisierung</value>
</data> </data>
</root> </root>

1009
Pilz.Updating.Client.GUI/UpdatesAvailableDialog.resx
View File

File diff suppressed because it is too large Load Diff

8
Pilz.Updating.Client/Pilz.Updating.Client.csproj
View File

@@ -1,8 +1,8 @@
<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop"> <Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup> <PropertyGroup>
<RootNamespace>Pilz.Updating</RootNamespace> <RootNamespace>Pilz.Updating</RootNamespace>
<MyType>Windows</MyType> <MyType>Windows</MyType>
<TargetFramework>net48</TargetFramework> <TargetFramework>net6.0-windows</TargetFramework>
<DefaultItemExcludes>$(DefaultItemExcludes);$(ProjectDir)**\*.vb</DefaultItemExcludes> <DefaultItemExcludes>$(DefaultItemExcludes);$(ProjectDir)**\*.vb</DefaultItemExcludes>
<LangVersion>latest</LangVersion> <LangVersion>latest</LangVersion>
<AssemblyTitle>Pilz.Updating.Client</AssemblyTitle> <AssemblyTitle>Pilz.Updating.Client</AssemblyTitle>
@@ -38,12 +38,10 @@
<DefineConstants>TRACE;RelMono</DefineConstants> <DefineConstants>TRACE;RelMono</DefineConstants>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Microsoft.VisualBasic" Version="10.3.0" />
<PackageReference Include="System.Data.DataSetExtensions" Version="4.5.0" /> <PackageReference Include="System.Data.DataSetExtensions" Version="4.5.0" />
<PackageReference Include="System.Net.Http" Version="4.3.4" /> <PackageReference Include="System.Net.Http" Version="4.3.4" />
</ItemGroup> </ItemGroup>
<ItemGroup>
<Reference Include="Microsoft.VisualBasic" />
</ItemGroup>
<ItemGroup> <ItemGroup>
<Import Include="Microsoft.VisualBasic" /> <Import Include="Microsoft.VisualBasic" />
<Import Include="System" /> <Import Include="System" />

6
Pilz.Updating.Client/UpdateClient.cs
View File

@@ -60,8 +60,7 @@ namespace Pilz.Updating
public bool InstallAsAdmin { get; set; } = false; public bool InstallAsAdmin { get; set; } = false;
public uint MillisecondsToWaitForHostApplicationToClose { get; set; } = 10000; public uint MillisecondsToWaitForHostApplicationToClose { get; set; } = 10000;
public bool ForceClosingHostApplication { get; set; } = true; public bool ForceClosingHostApplication { get; set; } = true;
public Color UpdateWindowBaseColor { get; set; } = Color.FromArgb(unchecked((int)0xFFB7472A)); public bool UIDarkMode { get; set; } = false;
public Color UpdateWindowCanvasColor { get; set; } = Color.FromArgb(unchecked((int)0xFFFFFFFF));
// C o n s t r u c t o r s // C o n s t r u c t o r s
@@ -248,8 +247,7 @@ namespace Pilz.Updating
HostApplicationProcessPath = Assembly.GetEntryAssembly().Location, HostApplicationProcessPath = Assembly.GetEntryAssembly().Location,
MillisecondsToWaitForHostApplicationToClose = MillisecondsToWaitForHostApplicationToClose, MillisecondsToWaitForHostApplicationToClose = MillisecondsToWaitForHostApplicationToClose,
ForceClosingHostApplication = ForceClosingHostApplication, ForceClosingHostApplication = ForceClosingHostApplication,
UpdateWindowBaseColor = UpdateWindowBaseColor, UIDarkMode = UIDarkMode
UpdateWindowCanvasColor = UpdateWindowCanvasColor
}; };
// Start UpdateInstaller // Start UpdateInstaller

7
Pilz.Updating.GUIBase/Pilz.Updating.GUIBase.csproj
View File

@@ -1,8 +1,8 @@
<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop"> <Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup> <PropertyGroup>
<RootNamespace>Pilz.Updating.GUIBase</RootNamespace> <RootNamespace>Pilz.Updating.GUIBase</RootNamespace>
<MyType>Windows</MyType> <MyType>Windows</MyType>
<TargetFramework>net48</TargetFramework> <TargetFramework>net6.0-windows</TargetFramework>
<DefaultItemExcludes>$(DefaultItemExcludes);$(ProjectDir)**\*.vb</DefaultItemExcludes> <DefaultItemExcludes>$(DefaultItemExcludes);$(ProjectDir)**\*.vb</DefaultItemExcludes>
<LangVersion>latest</LangVersion> <LangVersion>latest</LangVersion>
<AssemblyTitle>Pilz.Updating.GUIBase</AssemblyTitle> <AssemblyTitle>Pilz.Updating.GUIBase</AssemblyTitle>
@@ -37,15 +37,14 @@
<DefineConstants>TRACE;RelMono</DefineConstants> <DefineConstants>TRACE;RelMono</DefineConstants>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Microsoft.VisualBasic" Version="10.3.0" />
<PackageReference Include="System.Data.DataSetExtensions" Version="4.5.0" /> <PackageReference Include="System.Data.DataSetExtensions" Version="4.5.0" />
<PackageReference Include="System.Net.Http" Version="4.3.4" /> <PackageReference Include="System.Net.Http" Version="4.3.4" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<Reference Include="Microsoft.VisualBasic" />
<Reference Include="DevComponents.DotNetBar2"> <Reference Include="DevComponents.DotNetBar2">
<HintPath>..\Shared Libs\DotNetBarNew\DevComponents.DotNetBar2.dll</HintPath> <HintPath>..\Shared Libs\DotNetBarNew\DevComponents.DotNetBar2.dll</HintPath>
</Reference> </Reference>
<Reference Include="System.Windows.Forms" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<Import Include="Microsoft.VisualBasic" /> <Import Include="Microsoft.VisualBasic" />

3
Pilz.Updating.UpdateInstaller/App.config
View File

@@ -3,4 +3,7 @@
<startup> <startup>
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7.2" /> <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7.2" />
</startup> </startup>
<appSettings>
<add key="TelerikWinFormsThemeName" value="Fluent" />
</appSettings>
</configuration> </configuration>

190
Pilz.Updating.UpdateInstaller/Main.Designer.cs generated
View File

@@ -7,7 +7,7 @@ using Microsoft.VisualBasic.CompilerServices;
namespace Pilz.Updating.UpdateInstaller namespace Pilz.Updating.UpdateInstaller
{ {
[DesignerGenerated()] [DesignerGenerated()]
public partial class Main : DevComponents.DotNetBar.OfficeForm public partial class Main : Telerik.WinControls.UI.RadForm
{ {
// Das Formular überschreibt den Löschvorgang, um die Komponentenliste zu bereinigen. // Das Formular überschreibt den Löschvorgang, um die Komponentenliste zu bereinigen.
@@ -37,114 +37,108 @@ namespace Pilz.Updating.UpdateInstaller
private void InitializeComponent() private void InitializeComponent()
{ {
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Main)); System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Main));
this._ProgressBarX1 = new DevComponents.DotNetBar.Controls.ProgressBarX();
this._Panel1 = new System.Windows.Forms.Panel(); this._Panel1 = new System.Windows.Forms.Panel();
this._LabelX_Header = new DevComponents.DotNetBar.LabelX(); this.radWaitingBar1 = new Telerik.WinControls.UI.RadWaitingBar();
this._LabelX_Status = new DevComponents.DotNetBar.LabelX(); this.dotsLineWaitingBarIndicatorElement1 = new Telerik.WinControls.UI.DotsLineWaitingBarIndicatorElement();
this.radLabel_Status = new Telerik.WinControls.UI.RadLabel();
this.radLabel_Header = new Telerik.WinControls.UI.RadLabel();
this._Panel1.SuspendLayout(); this._Panel1.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.radWaitingBar1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.radLabel_Status)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.radLabel_Header)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this)).BeginInit();
this.SuspendLayout(); this.SuspendLayout();
// //
// _ProgressBarX1
//
this._ProgressBarX1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
| System.Windows.Forms.AnchorStyles.Right)));
//
//
//
this._ProgressBarX1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
this._ProgressBarX1.Location = new System.Drawing.Point(3, 94);
this._ProgressBarX1.Name = "_ProgressBarX1";
this._ProgressBarX1.ProgressType = DevComponents.DotNetBar.eProgressItemType.Marquee;
this._ProgressBarX1.Size = new System.Drawing.Size(628, 16);
this._ProgressBarX1.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
this._ProgressBarX1.TabIndex = 0;
//
// _Panel1 // _Panel1
// //
this._Panel1.BackColor = System.Drawing.Color.Transparent; this._Panel1.BackColor = System.Drawing.Color.Transparent;
this._Panel1.Controls.Add(this._LabelX_Header); this._Panel1.Controls.Add(this.radWaitingBar1);
this._Panel1.Controls.Add(this._LabelX_Status); this._Panel1.Controls.Add(this.radLabel_Status);
this._Panel1.Controls.Add(this._ProgressBarX1); this._Panel1.Controls.Add(this.radLabel_Header);
this._Panel1.Dock = System.Windows.Forms.DockStyle.Fill; this._Panel1.Dock = System.Windows.Forms.DockStyle.Fill;
this._Panel1.Location = new System.Drawing.Point(0, 0); this._Panel1.Location = new System.Drawing.Point(0, 0);
this._Panel1.Name = "_Panel1"; this._Panel1.Name = "_Panel1";
this._Panel1.Size = new System.Drawing.Size(634, 111); this._Panel1.Size = new System.Drawing.Size(692, 106);
this._Panel1.TabIndex = 1; this._Panel1.TabIndex = 1;
// //
// _LabelX_Header // radWaitingBar1
// //
this._LabelX_Header.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) this.radWaitingBar1.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
this.radWaitingBar1.Location = new System.Drawing.Point(3, 85);
this.radWaitingBar1.Name = "radWaitingBar1";
this.radWaitingBar1.Size = new System.Drawing.Size(130, 18);
this.radWaitingBar1.TabIndex = 3;
this.radWaitingBar1.Text = "radWaitingBar1";
this.radWaitingBar1.WaitingIndicators.Add(this.dotsLineWaitingBarIndicatorElement1);
this.radWaitingBar1.WaitingSpeed = 80;
this.radWaitingBar1.WaitingStyle = Telerik.WinControls.Enumerations.WaitingBarStyles.DotsLine;
((Telerik.WinControls.UI.RadWaitingBarElement)(radWaitingBar1.GetChildAt(0))).WaitingSpeed = 80;
((Telerik.WinControls.UI.WaitingBarContentElement)(radWaitingBar1.GetChildAt(0).GetChildAt(0))).WaitingStyle = Telerik.WinControls.Enumerations.WaitingBarStyles.DotsLine;
((Telerik.WinControls.UI.WaitingBarSeparatorElement)(radWaitingBar1.GetChildAt(0).GetChildAt(0).GetChildAt(0))).Dash = false;
//
// dotsLineWaitingBarIndicatorElement1
//
this.dotsLineWaitingBarIndicatorElement1.Name = "dotsLineWaitingBarIndicatorElement1";
//
// radLabel_Status
//
this.radLabel_Status.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)
| System.Windows.Forms.AnchorStyles.Right))); | System.Windows.Forms.AnchorStyles.Right)));
this.radLabel_Status.AutoSize = false;
this.radLabel_Status.Location = new System.Drawing.Point(139, 85);
this.radLabel_Status.Name = "radLabel_Status";
this.radLabel_Status.Size = new System.Drawing.Size(550, 18);
this.radLabel_Status.TabIndex = 2;
this.radLabel_Status.Text = "Idle ...";
// //
// radLabel_Header
// //
// this.radLabel_Header.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
this._LabelX_Header.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; | System.Windows.Forms.AnchorStyles.Left)
this._LabelX_Header.Font = new System.Drawing.Font("Calibri", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this._LabelX_Header.Image = global::Pilz.Updating.UpdateInstaller.MyIcons.icons8_installing_updates_48px;
this._LabelX_Header.Location = new System.Drawing.Point(3, 3);
this._LabelX_Header.Name = "_LabelX_Header";
this._LabelX_Header.Size = new System.Drawing.Size(628, 56);
this._LabelX_Header.TabIndex = 3;
this._LabelX_Header.Text = "<div align=\"center\" valign=\"center\"><font color=\"#B7472A\" size=\"20\"><b>SM64 ROM M" +
"anager wird aktuallisierung ...</b></font></div>";
//
// _LabelX_Status
//
this._LabelX_Status.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
| System.Windows.Forms.AnchorStyles.Right))); | System.Windows.Forms.AnchorStyles.Right)));
// this.radLabel_Header.AutoSize = false;
// this.radLabel_Header.Image = global::Pilz.Updating.UpdateInstaller.MyIcons.icons8_installing_updates_48px;
// this.radLabel_Header.Location = new System.Drawing.Point(3, 3);
this._LabelX_Status.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.radLabel_Header.Name = "radLabel_Header";
this._LabelX_Status.Location = new System.Drawing.Point(3, 65); this.radLabel_Header.Size = new System.Drawing.Size(686, 76);
this._LabelX_Status.Name = "_LabelX_Status"; this.radLabel_Header.TabIndex = 1;
this._LabelX_Status.Size = new System.Drawing.Size(628, 23); this.radLabel_Header.Text = "<html><span style=\"font-size: 18pt; color: #b7472a\"><b>SM64 ROM Manager wird aktu" +
this._LabelX_Status.TabIndex = 2; "allisierung ...</b></span></html>";
this._LabelX_Status.Text = "Idle ..."; this.radLabel_Header.TextAlignment = System.Drawing.ContentAlignment.MiddleCenter;
this.radLabel_Header.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageBeforeText;
// //
// Main // Main
// //
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.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.ClientSize = new System.Drawing.Size(634, 111); this.ClientSize = new System.Drawing.Size(692, 106);
this.Controls.Add(this._Panel1); this.Controls.Add(this._Panel1);
this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle; this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle;
this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
this.MaximizeBox = false; this.MaximizeBox = false;
this.MinimizeBox = false; this.MinimizeBox = false;
this.Name = "Main"; this.Name = "Main";
//
//
//
this.RootElement.ApplyShapeToControl = true;
this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
this.Text = "Installing"; this.Text = "Installing";
this._Panel1.ResumeLayout(false); this._Panel1.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)(this.radWaitingBar1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.radLabel_Status)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.radLabel_Header)).EndInit();
((System.ComponentModel.ISupportInitialize)(this)).EndInit();
this.ResumeLayout(false); this.ResumeLayout(false);
} }
private DevComponents.DotNetBar.Controls.ProgressBarX _ProgressBarX1;
internal DevComponents.DotNetBar.Controls.ProgressBarX ProgressBarX1
{
[MethodImpl(MethodImplOptions.Synchronized)]
get
{
return _ProgressBarX1;
}
[MethodImpl(MethodImplOptions.Synchronized)]
set
{
if (_ProgressBarX1 != null)
{
}
_ProgressBarX1 = value;
if (_ProgressBarX1 != null)
{
}
}
}
private Panel _Panel1; private Panel _Panel1;
private Telerik.WinControls.UI.RadLabel radLabel_Status;
private Telerik.WinControls.UI.RadLabel radLabel_Header;
private Telerik.WinControls.UI.RadWaitingBar radWaitingBar1;
private Telerik.WinControls.UI.DotsLineWaitingBarIndicatorElement dotsLineWaitingBarIndicatorElement1;
internal Panel Panel1 internal Panel Panel1
{ {
@@ -167,53 +161,5 @@ namespace Pilz.Updating.UpdateInstaller
} }
} }
} }
private DevComponents.DotNetBar.LabelX _LabelX_Status;
internal DevComponents.DotNetBar.LabelX LabelX_Status
{
[MethodImpl(MethodImplOptions.Synchronized)]
get
{
return _LabelX_Status;
}
[MethodImpl(MethodImplOptions.Synchronized)]
set
{
if (_LabelX_Status != null)
{
}
_LabelX_Status = value;
if (_LabelX_Status != null)
{
}
}
}
private DevComponents.DotNetBar.LabelX _LabelX_Header;
internal DevComponents.DotNetBar.LabelX LabelX_Header
{
[MethodImpl(MethodImplOptions.Synchronized)]
get
{
return _LabelX_Header;
}
[MethodImpl(MethodImplOptions.Synchronized)]
set
{
if (_LabelX_Header != null)
{
}
_LabelX_Header = value;
if (_LabelX_Header != null)
{
}
}
}
} }
} }

17
Pilz.Updating.UpdateInstaller/Main.cs
View File

@@ -4,7 +4,8 @@ using System.Linq;
using System.Runtime.CompilerServices; using System.Runtime.CompilerServices;
using System.Threading.Tasks; using System.Threading.Tasks;
using System.Windows.Forms; using System.Windows.Forms;
using global::DevComponents.DotNetBar; using Telerik.WinControls;
using Telerik.WinControls.Themes;
namespace Pilz.Updating.UpdateInstaller namespace Pilz.Updating.UpdateInstaller
{ {
@@ -15,7 +16,6 @@ namespace Pilz.Updating.UpdateInstaller
public Main() public Main()
{ {
// G u i // G u i
this.Shown += Main_Shown; this.Shown += Main_Shown;
this.FormClosed += Main_FormClosed; this.FormClosed += Main_FormClosed;
@@ -32,9 +32,8 @@ namespace Pilz.Updating.UpdateInstaller
InitializeComponent(); InitializeComponent();
// Init Style // Init Style
StyleManager.Style = eStyle.Office2016; RadThemeComponentBase themeToUse = Installer.Configuration.UIDarkMode ? new FluentDarkTheme() : new FluentTheme();
StyleManager.MetroColorGeneratorParameters = new DevComponents.DotNetBar.Metro.ColorTables.MetroColorGeneratorParameters(Installer.Configuration.UpdateWindowCanvasColor, Installer.Configuration.UpdateWindowBaseColor); ThemeResolutionService.ApplicationThemeName = themeToUse.ThemeName;
StyleManager.UpdateAmbientColors(this);
// Init Application Header Text // Init Application Header Text
string header; string header;
@@ -47,7 +46,7 @@ namespace Pilz.Updating.UpdateInstaller
header = My.Resources.UpdateInstallerGuiLangRes.String_UpdateIsRunning; header = My.Resources.UpdateInstallerGuiLangRes.String_UpdateIsRunning;
} }
LabelX_Header.Text = $"<div align=\"center\" valign=\"center\"><font color=\"#B7472A\" size=\"20\"><b>{header}</b></font></div>"; radLabel_Header.Text = $"<html><span style=\"font-size: 18pt; color: #b7472a\"><b>{header}</b></span></html>";
} }
if (Installer is null) if (Installer is null)
@@ -131,8 +130,8 @@ namespace Pilz.Updating.UpdateInstaller
break; break;
} }
LabelX_Status.Text = newStatusText; radLabel_Status.Text = newStatusText;
LabelX_Status.Image = newStatusImage; radLabel_Status.Image = newStatusImage;
//if (newStatus == UpdateInstallerStatus.Done) //if (newStatus == UpdateInstallerStatus.Done)
//{ //{
@@ -156,6 +155,7 @@ namespace Pilz.Updating.UpdateInstaller
private async void Main_Shown(object sender, EventArgs e) private async void Main_Shown(object sender, EventArgs e)
{ {
radWaitingBar1.StartWaiting();
await WaitforHostApp(); await WaitforHostApp();
ExecuteUpdate(); ExecuteUpdate();
} }
@@ -167,6 +167,7 @@ namespace Pilz.Updating.UpdateInstaller
private void Main_FormClosing(object sender, FormClosingEventArgs e) private void Main_FormClosing(object sender, FormClosingEventArgs e)
{ {
radWaitingBar1.StopWaiting();
e.Cancel = !allowClose; e.Cancel = !allowClose;
} }

62
Pilz.Updating.UpdateInstaller/Main.resx
View File

@@ -1,64 +1,4 @@
<?xml version="1.0" encoding="utf-8"?> <root>
<root>
<!--
Microsoft ResX Schema
Version 2.0
The primary goals of this format is to allow a simple XML format
that is mostly human readable. The generation and parsing of the
various data types are done through the TypeConverter classes
associated with the data types.
Example:
... ado.net/XML headers & schema ...
<resheader name="resmimetype">text/microsoft-resx</resheader>
<resheader name="version">2.0</resheader>
<resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
<resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
<data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
<data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
<data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
<value>[base64 mime encoded serialized .NET Framework object]</value>
</data>
<data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
<comment>This is a comment</comment>
</data>
There are any number of "resheader" rows that contain simple
name/value pairs.
Each data row contains a name, and value. The row also contains a
type or mimetype. Type corresponds to a .NET class that support
text/value conversion through the TypeConverter architecture.
Classes that don't support this are serialized and stored with the
mimetype set.
The mimetype is used for serialized objects, and tells the
ResXResourceReader how to depersist the object. This is currently not
extensible. For a given mimetype the value must be set accordingly:
Note - application/x-microsoft.net.object.binary.base64 is the format
that the ResXResourceWriter will generate, however the reader can
read any of the formats listed below.
mimetype: application/x-microsoft.net.object.binary.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.soap.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Soap.SoapFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.bytearray.base64
value : The object must be serialized into a byte array
: using a System.ComponentModel.TypeConverter
: and then encoded with base64 encoding.
-->
<xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata"> <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
<xsd:import namespace="http://www.w3.org/XML/1998/namespace" /> <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
<xsd:element name="root" msdata:IsDataSet="true"> <xsd:element name="root" msdata:IsDataSet="true">

23
Pilz.Updating.UpdateInstaller/Pilz.Updating.UpdateInstaller.csproj
View File

@@ -4,7 +4,7 @@
<StartupObject>Pilz.Updating.UpdateInstaller.My.MyApplication</StartupObject> <StartupObject>Pilz.Updating.UpdateInstaller.My.MyApplication</StartupObject>
<RootNamespace>Pilz.Updating.UpdateInstaller</RootNamespace> <RootNamespace>Pilz.Updating.UpdateInstaller</RootNamespace>
<MyType>WindowsForms</MyType> <MyType>WindowsForms</MyType>
<TargetFramework>net48</TargetFramework> <TargetFramework>net6.0-windows</TargetFramework>
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects> <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
<DefaultItemExcludes>$(DefaultItemExcludes);$(ProjectDir)**\*.vb</DefaultItemExcludes> <DefaultItemExcludes>$(DefaultItemExcludes);$(ProjectDir)**\*.vb</DefaultItemExcludes>
<LangVersion>latest</LangVersion> <LangVersion>latest</LangVersion>
@@ -46,22 +46,13 @@
<DefineConstants>TRACE;RelMono</DefineConstants> <DefineConstants>TRACE;RelMono</DefineConstants>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Microsoft.VisualBasic" Version="10.3.0" />
<PackageReference Include="System.IO.Compression" Version="4.3.0" /> <PackageReference Include="System.IO.Compression" Version="4.3.0" />
<PackageReference Include="System.Data.DataSetExtensions" Version="4.5.0" /> <PackageReference Include="System.Data.DataSetExtensions" Version="4.5.0" />
<PackageReference Include="System.Net.Http" Version="4.3.4" /> <PackageReference Include="System.Net.Http" Version="4.3.4" />
</ItemGroup> <PackageReference Include="UI.for.WinForms.AllControls.Net60">
<ItemGroup> <Version>2022.2.510.0</Version>
<Reference Include="Microsoft.VisualBasic" /> </PackageReference>
<Reference Include="DevComponents.DotNetBar.Design">
<HintPath>..\Shared Libs\DotNetBarNew\DevComponents.DotNetBar.Design.dll</HintPath>
<Private>False</Private>
</Reference>
<Reference Include="DevComponents.DotNetBar2">
<HintPath>..\Shared Libs\DotNetBarNew\DevComponents.DotNetBar2.dll</HintPath>
</Reference>
<Reference Include="System.Deployment" />
<Reference Include="System.Windows.Forms" />
<Reference Include="mscorlib" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<Import Include="Microsoft.VisualBasic" /> <Import Include="Microsoft.VisualBasic" />
@@ -78,9 +69,7 @@
<Import Include="Z.IO.Extensions" /> <Import Include="Z.IO.Extensions" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<Compile Update="Main.cs"> <Compile Update="Main.cs" />
<SubType>Form</SubType>
</Compile>
<Compile Update="Main.Designer.cs"> <Compile Update="Main.Designer.cs">
<DependentUpon>Main.cs</DependentUpon> <DependentUpon>Main.cs</DependentUpon>
<SubType>Form</SubType> <SubType>Form</SubType>

6
Pilz.Updating/Pilz.Updating.csproj
View File

@@ -2,7 +2,7 @@
<PropertyGroup> <PropertyGroup>
<RootNamespace>Pilz.Updating</RootNamespace> <RootNamespace>Pilz.Updating</RootNamespace>
<MyType>Windows</MyType> <MyType>Windows</MyType>
<TargetFramework>net48</TargetFramework> <TargetFramework>net6.0-windows</TargetFramework>
<DefaultItemExcludes>$(DefaultItemExcludes);$(ProjectDir)**\*.vb</DefaultItemExcludes> <DefaultItemExcludes>$(DefaultItemExcludes);$(ProjectDir)**\*.vb</DefaultItemExcludes>
<LangVersion>latest</LangVersion> <LangVersion>latest</LangVersion>
<AssemblyTitle>Pilz.Updating</AssemblyTitle> <AssemblyTitle>Pilz.Updating</AssemblyTitle>
@@ -38,12 +38,10 @@
<DefineConstants>TRACE;RelMono</DefineConstants> <DefineConstants>TRACE;RelMono</DefineConstants>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Microsoft.VisualBasic" Version="10.3.0" />
<PackageReference Include="System.Data.DataSetExtensions" Version="4.5.0" /> <PackageReference Include="System.Data.DataSetExtensions" Version="4.5.0" />
<PackageReference Include="System.Net.Http" Version="4.3.4" /> <PackageReference Include="System.Net.Http" Version="4.3.4" />
</ItemGroup> </ItemGroup>
<ItemGroup>
<Reference Include="Microsoft.VisualBasic" />
</ItemGroup>
<ItemGroup> <ItemGroup>
<Import Include="Microsoft.VisualBasic" /> <Import Include="Microsoft.VisualBasic" />
<Import Include="System" /> <Import Include="System" />

3
Pilz.Updating/UpdateInstaller/UpdateInstallerConfig.cs
View File

@@ -14,8 +14,7 @@ namespace Pilz.Updating.UpdateInstaller
public string HostApplicationProcessPath { get; set; } public string HostApplicationProcessPath { get; set; }
public bool ForceClosingHostApplication { get; set; } public bool ForceClosingHostApplication { get; set; }
public uint MillisecondsToWaitForHostApplicationToClose { get; set; } public uint MillisecondsToWaitForHostApplicationToClose { get; set; }
public Color UpdateWindowBaseColor { get; set; } public bool UIDarkMode { get; set; }
public Color UpdateWindowCanvasColor { get; set; }
public ApplicationVersion CurrentApplicationVersion { get; set; } public ApplicationVersion CurrentApplicationVersion { get; set; }
public ApplicationVersion NewApplicationVersion { get; set; } public ApplicationVersion NewApplicationVersion { get; set; }

BIN
Shared Libs/Pilz.Cryptography.dll
View File

Binary file not shown.

BIN
Shared Libs/drsPwEnc.dll
View File

Binary file not shown.