diff --git a/Pilz.Updating.Client.GUI/Pilz.Updating.Client.GUI.csproj b/Pilz.Updating.Client.GUI/Pilz.Updating.Client.GUI.csproj index 475c69e..9127c03 100644 --- a/Pilz.Updating.Client.GUI/Pilz.Updating.Client.GUI.csproj +++ b/Pilz.Updating.Client.GUI/Pilz.Updating.Client.GUI.csproj @@ -42,6 +42,7 @@ + diff --git a/Pilz.Updating.Client.GUI/SimpleActionDialog.Designer.cs b/Pilz.Updating.Client.GUI/SimpleActionDialog.Designer.cs index 1847fe3..c860a97 100644 --- a/Pilz.Updating.Client.GUI/SimpleActionDialog.Designer.cs +++ b/Pilz.Updating.Client.GUI/SimpleActionDialog.Designer.cs @@ -6,7 +6,7 @@ using System.Windows.Forms; namespace Pilz.Updating.Client.GUI { [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. @@ -35,55 +35,76 @@ namespace Pilz.Updating.Client.GUI [DebuggerStepThrough()] private void InitializeComponent() { - components = new System.ComponentModel.Container(); - var resources = new System.ComponentModel.ComponentResourceManager(typeof(SimpleActionDialog)); - _Panel1 = new Panel(); - _LabelX_Progress = new DevComponents.DotNetBar.LabelX(); - _ProgressBarX_Progress = new DevComponents.DotNetBar.Controls.ProgressBarX(); - _Panel1.SuspendLayout(); - SuspendLayout(); + System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(SimpleActionDialog)); + this._Panel1 = new System.Windows.Forms.Panel(); + this.radWaitingBar1 = new Telerik.WinControls.UI.RadWaitingBar(); + this.radProgressBar1 = new Telerik.WinControls.UI.RadProgressBar(); + this.waitingBarIndicatorElement1 = new Telerik.WinControls.UI.WaitingBarIndicatorElement(); + this.waitingBarIndicatorElement2 = new Telerik.WinControls.UI.WaitingBarIndicatorElement(); + this._Panel1.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.radWaitingBar1)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.radProgressBar1)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this)).BeginInit(); + this.SuspendLayout(); // - // Panel1 + // _Panel1 // - _Panel1.BackColor = Color.Transparent; - _Panel1.Controls.Add(_LabelX_Progress); - _Panel1.Controls.Add(_ProgressBarX_Progress); - resources.ApplyResources(_Panel1, "Panel1"); - _Panel1.Name = "Panel1"; + this._Panel1.BackColor = System.Drawing.Color.Transparent; + this._Panel1.Controls.Add(this.radWaitingBar1); + this._Panel1.Controls.Add(this.radProgressBar1); + resources.ApplyResources(this._Panel1, "_Panel1"); + this._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.WaitingSpeed = 100; + this.radWaitingBar1.WaitingStep = 2; // + // radProgressBar1 // + resources.ApplyResources(this.radProgressBar1, "radProgressBar1"); + this.radProgressBar1.Name = "radProgressBar1"; // - _LabelX_Progress.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - _LabelX_Progress.Name = "LabelX_Progress"; + // waitingBarIndicatorElement1 // - // ProgressBarX_Progress + this.waitingBarIndicatorElement1.Name = "waitingBarIndicatorElement1"; + this.waitingBarIndicatorElement1.StretchHorizontally = false; // - resources.ApplyResources(_ProgressBarX_Progress, "ProgressBarX_Progress"); + // waitingBarIndicatorElement2 // - // - // - _ProgressBarX_Progress.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - _ProgressBarX_Progress.Name = "ProgressBarX_Progress"; + this.waitingBarIndicatorElement2.Name = "waitingBarIndicatorElement2"; + this.waitingBarIndicatorElement2.StretchHorizontally = false; // // SimpleActionDialog // resources.ApplyResources(this, "$this"); - AutoScaleMode = AutoScaleMode.Font; - ControlBox = false; - Controls.Add(_Panel1); - FormBorderStyle = FormBorderStyle.FixedSingle; - Name = "SimpleActionDialog"; - TopLeftCornerSize = 0; - TopRightCornerSize = 0; - _Panel1.ResumeLayout(false); - ResumeLayout(false); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.ControlBox = false; + this.Controls.Add(this._Panel1); + this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle; + this.Name = "SimpleActionDialog"; + // + // + // + this.RootElement.ApplyShapeToControl = true; + this._Panel1.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)(this.radWaitingBar1)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.radProgressBar1)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this)).EndInit(); + this.ResumeLayout(false); + } 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 { @@ -99,39 +120,5 @@ namespace Pilz.Updating.Client.GUI _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; - } - } } } \ No newline at end of file diff --git a/Pilz.Updating.Client.GUI/SimpleActionDialog.cs b/Pilz.Updating.Client.GUI/SimpleActionDialog.cs index 94aefca..182d572 100644 --- a/Pilz.Updating.Client.GUI/SimpleActionDialog.cs +++ b/Pilz.Updating.Client.GUI/SimpleActionDialog.cs @@ -24,47 +24,55 @@ namespace Pilz.Updating.Client.GUI private void SetCurrentStateInternal(UpdateStatus curAction, int progress) { + var progressText = string.Empty; + switch (curAction) { case UpdateStatus.Waiting: { - LabelX_Progress.Text = UpdatingClientGuiLangRes.SimpleActions_Waiting; + progressText = UpdatingClientGuiLangRes.SimpleActions_Waiting; break; } case UpdateStatus.Searching: { - LabelX_Progress.Text = UpdatingClientGuiLangRes.SimpleActions_Searching; + progressText = UpdatingClientGuiLangRes.SimpleActions_Searching; break; } case UpdateStatus.DownloadingInstaller: { - LabelX_Progress.Text = UpdatingClientGuiLangRes.SimpleActions_DownloadingInstaller; + progressText = UpdatingClientGuiLangRes.SimpleActions_DownloadingInstaller; break; } case UpdateStatus.DownloadingPackage: { - LabelX_Progress.Text = UpdatingClientGuiLangRes.SimpleActions_DownloadingPackage; + progressText = UpdatingClientGuiLangRes.SimpleActions_DownloadingPackage; break; } case UpdateStatus.StartingInstaller: { - LabelX_Progress.Text = UpdatingClientGuiLangRes.SimpleActions_DownloadingInstaller; + progressText = UpdatingClientGuiLangRes.SimpleActions_DownloadingInstaller; break; } } if (progress == -1) { - ProgressBarX_Progress.ProgressType = eProgressItemType.Marquee; + radProgressBar1.Visible = false; + radWaitingBar1.Text = progressText; + radWaitingBar1.BringToFront(); + radWaitingBar1.StartWaiting(); } else { - ProgressBarX_Progress.ProgressType = eProgressItemType.Standard; - ProgressBarX_Progress.Value = progress; + radWaitingBar1.StopWaiting(); + radProgressBar1.Text = progressText + $" ({progress}%)"; + radProgressBar1.Value1 = progress; + radProgressBar1.BringToFront(); + radProgressBar1.Visible = true; } } } diff --git a/Pilz.Updating.Client.GUI/SimpleActionDialog.resx b/Pilz.Updating.Client.GUI/SimpleActionDialog.resx index 3678515..00f8213 100644 --- a/Pilz.Updating.Client.GUI/SimpleActionDialog.resx +++ b/Pilz.Updating.Client.GUI/SimpleActionDialog.resx @@ -1,64 +1,4 @@ - - - + @@ -117,92 +57,99 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - + + Top, Left, Right - - 3, 5 + + 3, 3 - - 380, 23 + + 444, 24 - + 1 - - LabelX_Progress + + radWaitingBar1 - - DevComponents.DotNetBar.LabelX, DevComponents.DotNetBar2, Version=14.1.0.35, Culture=neutral, PublicKeyToken=null + + Telerik.WinControls.UI.RadWaitingBar, Telerik.WinControls.UI, Culture=neutral, PublicKeyToken=5bb2a467cbec794e - - Panel1 + + _Panel1 - + 0 - + Top, Left, Right - - 3, 34 + + 3, 3 - - 380, 16 + + 444, 24 - - 0 + + 2 - - ProgressBarX1 + + False - - ProgressBarX_Progress + + radProgressBar1 - - DevComponents.DotNetBar.Controls.ProgressBarX, DevComponents.DotNetBar2, Version=14.1.0.35, Culture=neutral, PublicKeyToken=null + + Telerik.WinControls.UI.RadProgressBar, Telerik.WinControls.UI, Culture=neutral, PublicKeyToken=5bb2a467cbec794e - - Panel1 + + _Panel1 - + 1 - + Fill - + 0, 0 - - 386, 53 + + + 4, 3, 4, 3 - + + 450, 30 + + 0 - - Panel1 + + _Panel1 - - System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + System.Windows.Forms.Panel, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + $this - + 0 True + + 7, 15 + - 6, 13 + 7, 15 - 386, 53 + 450, 30 @@ -742,16 +689,31 @@ ///////wD/////////AP/////////////////////////////////////////////////////////w== + + 4, 3, 4, 3 + CenterScreen Updates + + waitingBarIndicatorElement1 + + + Telerik.WinControls.UI.WaitingBarIndicatorElement, Telerik.WinControls.UI, Culture=neutral, PublicKeyToken=5bb2a467cbec794e + + + waitingBarIndicatorElement2 + + + Telerik.WinControls.UI.WaitingBarIndicatorElement, Telerik.WinControls.UI, Culture=neutral, PublicKeyToken=5bb2a467cbec794e + SimpleActionDialog - DevComponents.DotNetBar.OfficeForm, DevComponents.DotNetBar2, Version=14.1.0.35, Culture=neutral, PublicKeyToken=null + Telerik.WinControls.UI.RadForm, Telerik.WinControls.UI, Culture=neutral, PublicKeyToken=5bb2a467cbec794e \ No newline at end of file diff --git a/Pilz.Updating.Client.GUI/UpdatesAvailableDialog.Designer.cs b/Pilz.Updating.Client.GUI/UpdatesAvailableDialog.Designer.cs index 6280b3d..9a702c1 100644 --- a/Pilz.Updating.Client.GUI/UpdatesAvailableDialog.Designer.cs +++ b/Pilz.Updating.Client.GUI/UpdatesAvailableDialog.Designer.cs @@ -8,7 +8,7 @@ using Microsoft.VisualBasic.CompilerServices; namespace Pilz.Updating.Client.GUI { [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. @@ -38,364 +38,232 @@ namespace Pilz.Updating.Client.GUI private void InitializeComponent() { System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(UpdatesAvailableDialog)); - this.LayoutControl1 = new DevComponents.DotNetBar.Layout.LayoutControl(); - this.PictureBox_AppIcon = new System.Windows.Forms.PictureBox(); - this.LabelX1 = new DevComponents.DotNetBar.LabelX(); - this.LabelX_NewVersion = new DevComponents.DotNetBar.LabelX(); - this.LabelX_NewChannel = new DevComponents.DotNetBar.LabelX(); - this.LabelX_NewBuild = new DevComponents.DotNetBar.LabelX(); - this.LabelX_CurrentVersion = new DevComponents.DotNetBar.LabelX(); - this.LabelX_CurrentChannel = new DevComponents.DotNetBar.LabelX(); - this.LabelX_CurrentBuild = new DevComponents.DotNetBar.LabelX(); - this.Panel_Changelog = new System.Windows.Forms.Panel(); - this.ButtonX_Install = new DevComponents.DotNetBar.ButtonX(); - this.ButtonX_Cancel = new DevComponents.DotNetBar.ButtonX(); - this.LayoutControlItem1 = new DevComponents.DotNetBar.Layout.LayoutControlItem(); - this.LayoutControlItem2 = new DevComponents.DotNetBar.Layout.LayoutControlItem(); - this.LayoutControlItem3 = new DevComponents.DotNetBar.Layout.LayoutControlItem(); - this.LayoutControlItem4 = new DevComponents.DotNetBar.Layout.LayoutControlItem(); - this.LayoutControlItem5 = new DevComponents.DotNetBar.Layout.LayoutControlItem(); - this.LayoutControlItem6 = new DevComponents.DotNetBar.Layout.LayoutControlItem(); - this.LayoutControlItem7 = new DevComponents.DotNetBar.Layout.LayoutControlItem(); - this.LayoutControlItem8 = new DevComponents.DotNetBar.Layout.LayoutControlItem(); - this.LayoutControlItem9 = new DevComponents.DotNetBar.Layout.LayoutControlItem(); - this.LayoutSpacerItem1 = new DevComponents.DotNetBar.Layout.LayoutSpacerItem(); - this.LayoutControlItem10 = new DevComponents.DotNetBar.Layout.LayoutControlItem(); - this.LayoutControlItem11 = new DevComponents.DotNetBar.Layout.LayoutControlItem(); - this.LayoutControl1.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)(this.PictureBox_AppIcon)).BeginInit(); + this.panel1 = new System.Windows.Forms.Panel(); + this.radButton_Cancel = new Telerik.WinControls.UI.RadButton(); + this.radButton_Install = new Telerik.WinControls.UI.RadButton(); + this.panel_ChangelogPanel = new System.Windows.Forms.Panel(); + this.radLabel10 = new Telerik.WinControls.UI.RadLabel(); + this.radLabel_CurrentVersionBuild = new Telerik.WinControls.UI.RadLabel(); + this.radLabel7 = new Telerik.WinControls.UI.RadLabel(); + this.radLabel_AvailableVersionBuild = new Telerik.WinControls.UI.RadLabel(); + this.radLabel9 = new Telerik.WinControls.UI.RadLabel(); + this.radLabel4 = new Telerik.WinControls.UI.RadLabel(); + this.radLabel_CurrentVersionChannel = new Telerik.WinControls.UI.RadLabel(); + this.radLabel6 = new Telerik.WinControls.UI.RadLabel(); + this.radLabel_AvailableVersionChannel = new Telerik.WinControls.UI.RadLabel(); + this.radLabel3 = new Telerik.WinControls.UI.RadLabel(); + this.radLabel_CurrentVersion = new Telerik.WinControls.UI.RadLabel(); + this.radLabel_AvailableVersion = new Telerik.WinControls.UI.RadLabel(); + this.radLabel2 = new Telerik.WinControls.UI.RadLabel(); + this.radLabel1 = new Telerik.WinControls.UI.RadLabel(); + this.radPictureBox1 = new Telerik.WinControls.UI.RadPictureBox(); + this.layoutControlLabelItem1 = new Telerik.WinControls.UI.LayoutControlLabelItem(); + this.panel1.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.radButton_Cancel)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.radButton_Install)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.radLabel10)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.radLabel_CurrentVersionBuild)).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(); // - // LayoutControl1 + // panel1 // - this.LayoutControl1.BackColor = System.Drawing.Color.Transparent; - this.LayoutControl1.Controls.Add(this.PictureBox_AppIcon); - this.LayoutControl1.Controls.Add(this.LabelX1); - this.LayoutControl1.Controls.Add(this.LabelX_NewVersion); - this.LayoutControl1.Controls.Add(this.LabelX_NewChannel); - this.LayoutControl1.Controls.Add(this.LabelX_NewBuild); - this.LayoutControl1.Controls.Add(this.LabelX_CurrentVersion); - this.LayoutControl1.Controls.Add(this.LabelX_CurrentChannel); - this.LayoutControl1.Controls.Add(this.LabelX_CurrentBuild); - this.LayoutControl1.Controls.Add(this.Panel_Changelog); - this.LayoutControl1.Controls.Add(this.ButtonX_Install); - this.LayoutControl1.Controls.Add(this.ButtonX_Cancel); - resources.ApplyResources(this.LayoutControl1, "LayoutControl1"); - this.LayoutControl1.ForeColor = System.Drawing.Color.Black; - this.LayoutControl1.Name = "LayoutControl1"; + resources.ApplyResources(this.panel1, "panel1"); + this.panel1.BackColor = System.Drawing.Color.Transparent; + this.panel1.Controls.Add(this.radButton_Cancel); + this.panel1.Controls.Add(this.radButton_Install); + this.panel1.Controls.Add(this.panel_ChangelogPanel); + this.panel1.Controls.Add(this.radLabel10); + this.panel1.Controls.Add(this.radLabel_CurrentVersionBuild); + this.panel1.Controls.Add(this.radLabel7); + this.panel1.Controls.Add(this.radLabel_AvailableVersionBuild); + this.panel1.Controls.Add(this.radLabel9); + this.panel1.Controls.Add(this.radLabel4); + this.panel1.Controls.Add(this.radLabel_CurrentVersionChannel); + this.panel1.Controls.Add(this.radLabel6); + this.panel1.Controls.Add(this.radLabel_AvailableVersionChannel); + 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[] { - this.LayoutControlItem1, - this.LayoutControlItem2, - this.LayoutControlItem3, - this.LayoutControlItem4, - this.LayoutControlItem5, - this.LayoutControlItem6, - this.LayoutControlItem7, - this.LayoutControlItem8, - this.LayoutControlItem9, - this.LayoutSpacerItem1, - this.LayoutControlItem10, - this.LayoutControlItem11}); + // radButton_Install // - // 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"); - this.PictureBox_AppIcon.Name = "PictureBox_AppIcon"; - this.PictureBox_AppIcon.TabStop = false; + // panel_ChangelogPanel // - // 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.LabelX1, "LabelX1"); - this.LabelX1.Name = "LabelX1"; - this.LabelX1.TextAlignment = System.Drawing.StringAlignment.Center; + resources.ApplyResources(this.radLabel_CurrentVersionBuild, "radLabel_CurrentVersionBuild"); + this.radLabel_CurrentVersionBuild.Name = "radLabel_CurrentVersionBuild"; // - // 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; - resources.ApplyResources(this.LabelX_NewVersion, "LabelX_NewVersion"); - this.LabelX_NewVersion.Name = "LabelX_NewVersion"; + // radLabel9 // - // 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.LabelX_NewChannel, "LabelX_NewChannel"); - this.LabelX_NewChannel.Name = "LabelX_NewChannel"; + resources.ApplyResources(this.radLabel_CurrentVersionChannel, "radLabel_CurrentVersionChannel"); + this.radLabel_CurrentVersionChannel.Name = "radLabel_CurrentVersionChannel"; // - // 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; - resources.ApplyResources(this.LabelX_NewBuild, "LabelX_NewBuild"); - this.LabelX_NewBuild.Name = "LabelX_NewBuild"; + // radLabel3 // - // 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.LabelX_CurrentVersion, "LabelX_CurrentVersion"); - this.LabelX_CurrentVersion.Name = "LabelX_CurrentVersion"; + resources.ApplyResources(this.radLabel_AvailableVersion, "radLabel_AvailableVersion"); + this.radLabel_AvailableVersion.Name = "radLabel_AvailableVersion"; // - // 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; - resources.ApplyResources(this.LabelX_CurrentChannel, "LabelX_CurrentChannel"); - this.LabelX_CurrentChannel.Name = "LabelX_CurrentChannel"; + // radPictureBox1 // - // LabelX_CurrentBuild + resources.ApplyResources(this.radPictureBox1, "radPictureBox1"); + this.radPictureBox1.Name = "radPictureBox1"; // + // layoutControlLabelItem1 // - // - // - this.LabelX_CurrentBuild.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - resources.ApplyResources(this.LabelX_CurrentBuild, "LabelX_CurrentBuild"); - this.LabelX_CurrentBuild.Name = "LabelX_CurrentBuild"; - // - // Panel_Changelog - // - 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; + resources.ApplyResources(this.layoutControlLabelItem1, "layoutControlLabelItem1"); + this.layoutControlLabelItem1.Bounds = new System.Drawing.Rectangle(0, 52, 428, 39); + this.layoutControlLabelItem1.DisabledTextRenderingHint = System.Drawing.Text.TextRenderingHint.SystemDefault; + this.layoutControlLabelItem1.DrawText = false; + this.layoutControlLabelItem1.Name = "layoutControlLabelItem1"; + this.layoutControlLabelItem1.TextRenderingHint = System.Drawing.Text.TextRenderingHint.SystemDefault; + this.layoutControlLabelItem1.UseCompatibleTextRendering = false; // // UpdatesAvailableDialog // - this.AcceptButton = this.ButtonX_Install; + this.AcceptButton = this.radButton_Install; resources.ApplyResources(this, "$this"); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.CancelButton = this.ButtonX_Cancel; - this.Controls.Add(this.LayoutControl1); + this.CancelButton = this.radButton_Cancel; + this.Controls.Add(this.panel1); this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle; this.MaximizeBox = false; this.MinimizeBox = false; 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); } - private DevComponents.DotNetBar.Layout.LayoutControl LayoutControl1; - - private PictureBox PictureBox_AppIcon; - - private DevComponents.DotNetBar.Layout.LayoutControlItem LayoutControlItem1; - - private LabelX LabelX1; - - private DevComponents.DotNetBar.Layout.LayoutControlItem LayoutControlItem2; - - private LabelX LabelX_NewVersion; - - private DevComponents.DotNetBar.Layout.LayoutControlItem LayoutControlItem3; - - private System.Windows.Forms.Panel Panel_Changelog; - - private LabelX LabelX_NewChannel; - - private LabelX LabelX_NewBuild; - - 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; - + private Panel panel1; + private Telerik.WinControls.UI.RadPictureBox radPictureBox1; + private Telerik.WinControls.UI.RadLabel radLabel1; + private Telerik.WinControls.UI.RadLabel radLabel3; + private Telerik.WinControls.UI.RadLabel radLabel_CurrentVersion; + private Telerik.WinControls.UI.RadLabel radLabel_AvailableVersion; + private Telerik.WinControls.UI.RadLabel radLabel2; + private Telerik.WinControls.UI.LayoutControlLabelItem layoutControlLabelItem1; + private Telerik.WinControls.UI.RadLabel radLabel_CurrentVersionBuild; + private Telerik.WinControls.UI.RadLabel radLabel7; + private Telerik.WinControls.UI.RadLabel radLabel_AvailableVersionBuild; + private Telerik.WinControls.UI.RadLabel radLabel9; + private Telerik.WinControls.UI.RadLabel radLabel4; + private Telerik.WinControls.UI.RadLabel radLabel_CurrentVersionChannel; + private Telerik.WinControls.UI.RadLabel radLabel6; + private Telerik.WinControls.UI.RadLabel radLabel_AvailableVersionChannel; + private Panel panel_ChangelogPanel; + private Telerik.WinControls.UI.RadLabel radLabel10; + private Telerik.WinControls.UI.RadButton radButton_Cancel; + private Telerik.WinControls.UI.RadButton radButton_Install; } } \ No newline at end of file diff --git a/Pilz.Updating.Client.GUI/UpdatesAvailableDialog.cs b/Pilz.Updating.Client.GUI/UpdatesAvailableDialog.cs index 969859d..9712694 100644 --- a/Pilz.Updating.Client.GUI/UpdatesAvailableDialog.cs +++ b/Pilz.Updating.Client.GUI/UpdatesAvailableDialog.cs @@ -2,6 +2,8 @@ using System.Windows.Forms; using global::DevComponents.DotNetBar; using Pilz.Updating.GUIBase; +using Telerik.WinControls; +using Telerik.WinControls.UI; namespace Pilz.Updating.Client.GUI { @@ -12,26 +14,25 @@ namespace Pilz.Updating.Client.GUI InitializeComponent(); if (installAsAdmin) - ButtonX_Install.Image = BaseFeatures.GetUacShieldImage(); + radButton_Install.Image = BaseFeatures.GetUacShieldImage(); - PictureBox_AppIcon.Image = appIcon ?? Icon.ToBitmap(); - LabelX_CurrentVersion.Text = curVersion; - LabelX_CurrentChannel.Text = curChannel; - LabelX_CurrentBuild.Text = curBuild; - LabelX_NewVersion.Text = newVersion; - LabelX_NewChannel.Text = newChannel; - LabelX_NewBuild.Text = newBuild; + radPictureBox1.Image = appIcon ?? Icon.ToBitmap(); + radLabel_CurrentVersion.Text = curVersion; + radLabel_CurrentVersionChannel.Text = curChannel; + radLabel_CurrentVersionBuild.Text = curBuild; + radLabel_AvailableVersion.Text = newVersion; + radLabel_AvailableVersionChannel.Text = newChannel; + radLabel_AvailableVersionBuild.Text = newBuild; // Update Notes Control updateNotesControl = null; switch (updateNotes.ContentType) { case UpdateNotesContentType.PlainText: - var newUpdateNotesControl = new DevComponents.DotNetBar.Controls.RichTextBoxEx + var newUpdateNotesControl = new RadRichTextEditor { Text = updateNotes.Content }; - newUpdateNotesControl.BackgroundStyle.Class = DevComponents.DotNetBar.Rendering.ElementStyleClassKeys.RichTextBoxBorderKey; updateNotesControl = newUpdateNotesControl; break; case UpdateNotesContentType.Markdown: @@ -50,10 +51,8 @@ namespace Pilz.Updating.Client.GUI if (updateNotesControl is object) { updateNotesControl.Dock = DockStyle.Fill; - Panel_Changelog.Controls.Add(updateNotesControl); + panel_ChangelogPanel.Controls.Add(updateNotesControl); } - - UpdateAmbientColors(); } } } \ No newline at end of file diff --git a/Pilz.Updating.Client.GUI/UpdatesAvailableDialog.de.resx b/Pilz.Updating.Client.GUI/UpdatesAvailableDialog.de.resx index 2cc66cf..92d28d1 100644 --- a/Pilz.Updating.Client.GUI/UpdatesAvailableDialog.de.resx +++ b/Pilz.Updating.Client.GUI/UpdatesAvailableDialog.de.resx @@ -1,64 +1,4 @@ - - - + @@ -117,60 +57,45 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - Aktuallisierung verfügbar - - - - 112, 62 - - - 101, 23 - - - 260, 62 - - - 83, 23 - - - 112, 93 - - - 101, 23 - - - 260, 93 - - - 83, 23 - - - Installieren - - + Abbrechen - + + Installieren + + + + 106, 18 + + + Änderungshinweise: + + + 36, 18 + + + Kanal: + + + 36, 18 + + + Kanal: + + + 101, 18 + + + Installierte Version: + + + 105, 18 + + Verfügbare Version: - - Kanal: - - - Aktuelle Version: - - - Kanal: - - - Änderungen: - - - - - - + + <html><span style="font-size: 18pt">Aktualisierung verfügbar</span></html> @@ -711,6 +636,6 @@ - Aktuallisierung + Aktualisierung \ No newline at end of file diff --git a/Pilz.Updating.Client.GUI/UpdatesAvailableDialog.resx b/Pilz.Updating.Client.GUI/UpdatesAvailableDialog.resx index f8d9631..041035e 100644 --- a/Pilz.Updating.Client.GUI/UpdatesAvailableDialog.resx +++ b/Pilz.Updating.Client.GUI/UpdatesAvailableDialog.resx @@ -1,64 +1,4 @@ - - - + @@ -117,366 +57,574 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 4, 4 + + radLabel1 - - - 0, 0, 0, 0 + + 16 - - 50, 50 + + + ImageBeforeText - - Zoom + + System.Windows.Forms.Panel, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 0 + + radLabel_AvailableVersionBuild - - PictureBox_AppIcon + + <html><span style="font-size: 18pt">Update available</span></html> - - System.Windows.Forms.PictureBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - LayoutControl1 - - - 4 - - - Microsoft Sans Serif, 15.75pt - - - 62, 4 - - - 0, 0, 0, 0 - - - 368, 50 - - - 1 - - - Update available - - - LabelX1 - - - DevComponents.DotNetBar.LabelX, DevComponents.DotNetBar2, Version=14.1.0.37, Culture=neutral, PublicKeyToken=null - - - LayoutControl1 - - - 5 - - - 102, 62 - - - 0, 0, 0, 0 - - - 111, 23 - - - 2 - - - LabelX2 - - - LabelX_NewVersion - - - DevComponents.DotNetBar.LabelX, DevComponents.DotNetBar2, Version=14.1.0.37, Culture=neutral, PublicKeyToken=null - - - LayoutControl1 - - - 6 - - - 274, 62 - - - 0, 0, 0, 0 - - - 69, 23 - - - 3 - - - LabelX3 - - - LabelX_NewChannel - - - DevComponents.DotNetBar.LabelX, DevComponents.DotNetBar2, Version=14.1.0.37, Culture=neutral, PublicKeyToken=null - - - LayoutControl1 - - - 7 - - - 387, 62 - - - 0, 0, 0, 0 - - - 43, 23 - - - 4 - - - LabelX4 - - - LabelX_NewBuild - - - DevComponents.DotNetBar.LabelX, DevComponents.DotNetBar2, Version=14.1.0.37, Culture=neutral, PublicKeyToken=null - - - LayoutControl1 - - - 8 - - - 102, 93 - - - 0, 0, 0, 0 - - - 111, 23 - - - 5 - - - LabelX5 - - - LabelX_CurrentVersion - - - DevComponents.DotNetBar.LabelX, DevComponents.DotNetBar2, Version=14.1.0.37, Culture=neutral, PublicKeyToken=null - - - LayoutControl1 - - - 9 - - - 274, 93 - - - 0, 0, 0, 0 - - - 69, 23 - - - 6 - - - LabelX6 - - - LabelX_CurrentChannel - - - DevComponents.DotNetBar.LabelX, DevComponents.DotNetBar2, Version=14.1.0.37, Culture=neutral, PublicKeyToken=null - - - LayoutControl1 - - - 10 - - - 387, 93 - - - 0, 0, 0, 0 - - - 43, 23 - - - 7 - - - LabelX7 - - - LabelX_CurrentBuild - - - DevComponents.DotNetBar.LabelX, DevComponents.DotNetBar2, Version=14.1.0.37, Culture=neutral, PublicKeyToken=null - - - LayoutControl1 - - - 11 - - - 4, 143 - - - 0, 0, 0, 0 - - - 426, 230 - - - 8 - - - Panel_Changelog - - - System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - LayoutControl1 - - - 12 - - - 238, 381 - - - 0, 0, 0, 0 - - - 92, 23 - - - 10 - - - Install - - - ButtonX_Install - - - DevComponents.DotNetBar.ButtonX, DevComponents.DotNetBar2, Version=14.1.0.37, Culture=neutral, PublicKeyToken=null - - - LayoutControl1 - - - 13 - - - 338, 381 - - - 0, 0, 0, 0 - - - 92, 23 - - - 11 - - - Cancel - - - ButtonX_Cancel - - - DevComponents.DotNetBar.ButtonX, DevComponents.DotNetBar2, Version=14.1.0.37, Culture=neutral, PublicKeyToken=null - - - LayoutControl1 - - - 14 - - + Fill - - 0, 0 + + radLabel9 - - Label: + + + 3, 97 - - Label: + + ... - + + panel1 + + + Telerik.WinControls.UI.RadLabel, Telerik.WinControls.UI, Culture=neutral, PublicKeyToken=5bb2a467cbec794e + + + 15 + + + 64, 64 + + + + False + + + 73, 3 + + + Top, Right + + + 100, 24 + + + 14, 18 + + Available Version: - + + ... + + + 13 + + + ... + + + panel1 + + + 100, 24 + + + 6 + + + 331, 384 + + + Telerik.WinControls.UI.RadLabel, Telerik.WinControls.UI, Culture=neutral, PublicKeyToken=5bb2a467cbec794e + + + Telerik.WinControls.UI.LayoutControlLabelItem, Telerik.WinControls.UI, Culture=neutral, PublicKeyToken=5bb2a467cbec794e + + + 8 + + + MiddleLeft + + Channel: - - Build: + + 9 - - Current Version: + + 10 - - Channel: + + panel1 - - Build: + + 14, 18 - + + radLabel_CurrentVersion + + + radLabel_CurrentVersionChannel + + + 354, 73 + + Changelog: - - 434, 411 + + 7 - + + Current Version: + + + Cancel + + 0 - - LayoutControl1 + + MiddleCenter - - DevComponents.DotNetBar.Layout.LayoutControl, DevComponents.DotNetBar.Layout, Version=14.1.0.37, Culture=neutral, PublicKeyToken=null + + radLabel10 - - $this + + + 0, 0, 0, 0 - + + radLabel7 + + + 225, 384 + + + panel1 + + + Telerik.WinControls.UI.RadPictureBox, Telerik.WinControls.UI, Culture=neutral, PublicKeyToken=5bb2a467cbec794e + + 0 - - True - + + TopLeft + + + Telerik.WinControls.UI.RadLabel, Telerik.WinControls.UI, Culture=neutral, PublicKeyToken=5bb2a467cbec794e + + + Updates + + + 358, 64 + + + 3 + + + panel1 + + + panel1 + + + Telerik.WinControls.UI.RadLabel, Telerik.WinControls.UI, Culture=neutral, PublicKeyToken=5bb2a467cbec794e + + + 11 + + + 2 + + + Top, Right + + + panel_ChangelogPanel + + + Telerik.WinControls.UI.RadLabel, Telerik.WinControls.UI, Culture=neutral, PublicKeyToken=5bb2a467cbec794e + + + 354, 97 + + + 63, 18 + + + Top, Bottom, Left, Right + + + Top, Left, Right + + + panel1 + + + 0, 0, 0, 0 + + + panel1 + + + 13 + + + ... + + + 0, 0 + + + 17 + + + Top, Right + + + 10 + + + 6 + + + radButton_Cancel + + + 14 + + + Install + + + 224, 97 + + + MiddleCenter + + + 94, 18 + + + Telerik.WinControls.UI.RadLabel, Telerik.WinControls.UI, Culture=neutral, PublicKeyToken=5bb2a467cbec794e + + + 34, 18 + + + 3, 145 + + + 113, 73 + + + 4 + + + panel1 + + + 0 + + + Telerik.WinControls.UI.RadButton, Telerik.WinControls.UI, Culture=neutral, PublicKeyToken=5bb2a467cbec794e + + + Telerik.WinControls.UI.RadLabel, Telerik.WinControls.UI, Culture=neutral, PublicKeyToken=5bb2a467cbec794e + + + Telerik.WinControls.UI.RadLabel, Telerik.WinControls.UI, Culture=neutral, PublicKeyToken=5bb2a467cbec794e + + + System.Windows.Forms.Panel, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + Horizontal + + + 3, 3 + + + False + + + 398, 73 + + + radLabel6 + + + 34, 18 + + + 17 + + + panel1 + + + 113, 97 + + + False + + + 14, 18 + + + panel1 + + + 4 + + + 12 + + + 398, 97 + + + False + + + 428, 233 + + + MiddleCenter + + + ... + + + 1 + + + CenterScreen + + + Top, Right + + + layoutControlLabelItem1 + + + Bottom, Right + + + radButton_Install + + + 14, 18 + + + Telerik.WinControls.UI.RadLabel, Telerik.WinControls.UI, Culture=neutral, PublicKeyToken=5bb2a467cbec794e + + + 5 + + + Telerik.WinControls.UI.RadLabel, Telerik.WinControls.UI, Culture=neutral, PublicKeyToken=5bb2a467cbec794e + + + Telerik.WinControls.UI.RadLabel, Telerik.WinControls.UI, Culture=neutral, PublicKeyToken=5bb2a467cbec794e + + + 5 + + + 1 + + + Top, Right + + + 0 + + + UpdatesAvailableDialog + + + Build: + + + 12 + + + Top, Right + + + radLabel2 + + + radLabel_AvailableVersion + + + 9 + + + ... + + + panel1 + + + Top, Right + + + Build: + + + panel1 + + + Telerik.WinControls.UI.RadForm, Telerik.WinControls.UI, Culture=neutral, PublicKeyToken=5bb2a467cbec794e + - 6, 13 + 7, 15 + + + panel1 + + + radLabel_AvailableVersionChannel + + + MiddleLeft + + + 286, 97 + + + 14 434, 411 + + panel1 + + + 0 + + + $this + + + 7, 15 + + + Telerik.WinControls.UI.RadLabel, Telerik.WinControls.UI, Culture=neutral, PublicKeyToken=5bb2a467cbec794e + + + 286, 73 + + + 8 + + + panel1 + + + 434, 411 + + + 224, 73 + + + panel1 + + + ImageBeforeText + + + Channel: + + + Telerik.WinControls.UI.RadButton, Telerik.WinControls.UI, Culture=neutral, PublicKeyToken=5bb2a467cbec794e + + + 15 + + + 49, 18 + + + 3 + + + Telerik.WinControls.UI.RadLabel, Telerik.WinControls.UI, Culture=neutral, PublicKeyToken=5bb2a467cbec794e + + + 3, 121 + + + 14, 18 + + + panel1 + + + 17 + + + 87, 18 + + + radLabel_CurrentVersionBuild + + + Telerik.WinControls.UI.RadLabel, Telerik.WinControls.UI, Culture=neutral, PublicKeyToken=5bb2a467cbec794e + + + 16 + + + 7 + + + Bottom, Right + + + 3, 73 + + + radLabel3 + + + + + + 11 + + + 14, 18 + + + panel1 + + + radPictureBox1 + + + Top, Right + + + radLabel4 + + + 49, 18 + AAABAAQAEBAAAAEAIABoBAAARgAAACAgAAABACAAqBAAAK4EAAAwMAAAAQAgAKglAABWFQAAQEAAAAEA @@ -1015,88 +1163,7 @@ ///////wD/////////AP/////////////////////////////////////////////////////////w== - - CenterScreen - - - Updates - - - LayoutControlItem1 - - - DevComponents.DotNetBar.Layout.LayoutControlItem, DevComponents.DotNetBar.Layout, Version=14.1.0.37, Culture=neutral, PublicKeyToken=null - - - LayoutControlItem2 - - - DevComponents.DotNetBar.Layout.LayoutControlItem, DevComponents.DotNetBar.Layout, Version=14.1.0.37, Culture=neutral, PublicKeyToken=null - - - LayoutControlItem3 - - - DevComponents.DotNetBar.Layout.LayoutControlItem, DevComponents.DotNetBar.Layout, Version=14.1.0.37, Culture=neutral, PublicKeyToken=null - - - LayoutControlItem4 - - - DevComponents.DotNetBar.Layout.LayoutControlItem, DevComponents.DotNetBar.Layout, Version=14.1.0.37, Culture=neutral, PublicKeyToken=null - - - LayoutControlItem5 - - - DevComponents.DotNetBar.Layout.LayoutControlItem, DevComponents.DotNetBar.Layout, Version=14.1.0.37, Culture=neutral, PublicKeyToken=null - - - LayoutControlItem6 - - - DevComponents.DotNetBar.Layout.LayoutControlItem, DevComponents.DotNetBar.Layout, Version=14.1.0.37, Culture=neutral, PublicKeyToken=null - - - LayoutControlItem7 - - - DevComponents.DotNetBar.Layout.LayoutControlItem, DevComponents.DotNetBar.Layout, Version=14.1.0.37, Culture=neutral, PublicKeyToken=null - - - LayoutControlItem8 - - - DevComponents.DotNetBar.Layout.LayoutControlItem, DevComponents.DotNetBar.Layout, Version=14.1.0.37, Culture=neutral, PublicKeyToken=null - - - LayoutControlItem9 - - - DevComponents.DotNetBar.Layout.LayoutControlItem, DevComponents.DotNetBar.Layout, Version=14.1.0.37, Culture=neutral, PublicKeyToken=null - - - LayoutSpacerItem1 - - - DevComponents.DotNetBar.Layout.LayoutSpacerItem, DevComponents.DotNetBar.Layout, Version=14.1.0.37, Culture=neutral, PublicKeyToken=null - - - LayoutControlItem10 - - - DevComponents.DotNetBar.Layout.LayoutControlItem, DevComponents.DotNetBar.Layout, Version=14.1.0.37, Culture=neutral, PublicKeyToken=null - - - LayoutControlItem11 - - - DevComponents.DotNetBar.Layout.LayoutControlItem, DevComponents.DotNetBar.Layout, Version=14.1.0.37, Culture=neutral, PublicKeyToken=null - - - UpdatesAvailableDialog - - - DevComponents.DotNetBar.OfficeForm, DevComponents.DotNetBar2, Version=14.1.0.37, Culture=neutral, PublicKeyToken=null - + + True + \ No newline at end of file