From 75f49e9d40ea75286e6b41dffe04b65c5331a05f Mon Sep 17 00:00:00 2001 From: Pilzinsel64 Date: Mon, 13 Nov 2023 15:14:42 +0100 Subject: [PATCH] UpdatesAvailableDialog: fix label naming & add OK response for install button --- .../UpdatesAvailableDialog.Designer.cs | 302 +++-- .../UpdatesAvailableDialog.cs | 2 +- .../UpdatesAvailableDialog.resx | 1080 +++++++++-------- Pilz.Updating/ApplicationVersion.cs | 6 +- Pilz.Updating/Pilz.Updating.csproj | 2 +- 5 files changed, 724 insertions(+), 668 deletions(-) diff --git a/Pilz.Updating.Client.GUI/UpdatesAvailableDialog.Designer.cs b/Pilz.Updating.Client.GUI/UpdatesAvailableDialog.Designer.cs index 1d5f20b..597540b 100644 --- a/Pilz.Updating.Client.GUI/UpdatesAvailableDialog.Designer.cs +++ b/Pilz.Updating.Client.GUI/UpdatesAvailableDialog.Designer.cs @@ -37,218 +37,214 @@ namespace Pilz.Updating.Client.GUI private void InitializeComponent() { System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(UpdatesAvailableDialog)); - 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(); + panel1 = new Panel(); + radButton_Cancel = new Telerik.WinControls.UI.RadButton(); + radButton_Install = new Telerik.WinControls.UI.RadButton(); + panel_ChangelogPanel = new Panel(); + radLabel10 = new Telerik.WinControls.UI.RadLabel(); + radLabel_CurrentVersionBuild = new Telerik.WinControls.UI.RadLabel(); + radLabel7 = new Telerik.WinControls.UI.RadLabel(); + radLabel_AvailableVersionBuild = new Telerik.WinControls.UI.RadLabel(); + radLabel9 = new Telerik.WinControls.UI.RadLabel(); + radLabel_CurrentVersionChannel = new Telerik.WinControls.UI.RadLabel(); + radLabel3 = new Telerik.WinControls.UI.RadLabel(); + radLabel_AvailableVersionChannel = new Telerik.WinControls.UI.RadLabel(); + radLabel4 = new Telerik.WinControls.UI.RadLabel(); + radLabel_CurrentVersion = new Telerik.WinControls.UI.RadLabel(); + radLabel5 = new Telerik.WinControls.UI.RadLabel(); + radLabel_AvailableVersion = new Telerik.WinControls.UI.RadLabel(); + radLabel2 = new Telerik.WinControls.UI.RadLabel(); + radLabel1 = new Telerik.WinControls.UI.RadLabel(); + radPictureBox1 = new Telerik.WinControls.UI.RadPictureBox(); + layoutControlLabelItem1 = new Telerik.WinControls.UI.LayoutControlLabelItem(); + panel1.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)radButton_Cancel).BeginInit(); + ((System.ComponentModel.ISupportInitialize)radButton_Install).BeginInit(); + ((System.ComponentModel.ISupportInitialize)radLabel10).BeginInit(); + ((System.ComponentModel.ISupportInitialize)radLabel_CurrentVersionBuild).BeginInit(); + ((System.ComponentModel.ISupportInitialize)radLabel7).BeginInit(); + ((System.ComponentModel.ISupportInitialize)radLabel_AvailableVersionBuild).BeginInit(); + ((System.ComponentModel.ISupportInitialize)radLabel9).BeginInit(); + ((System.ComponentModel.ISupportInitialize)radLabel_CurrentVersionChannel).BeginInit(); + ((System.ComponentModel.ISupportInitialize)radLabel3).BeginInit(); + ((System.ComponentModel.ISupportInitialize)radLabel_AvailableVersionChannel).BeginInit(); + ((System.ComponentModel.ISupportInitialize)radLabel4).BeginInit(); + ((System.ComponentModel.ISupportInitialize)radLabel_CurrentVersion).BeginInit(); + ((System.ComponentModel.ISupportInitialize)radLabel5).BeginInit(); + ((System.ComponentModel.ISupportInitialize)radLabel_AvailableVersion).BeginInit(); + ((System.ComponentModel.ISupportInitialize)radLabel2).BeginInit(); + ((System.ComponentModel.ISupportInitialize)radLabel1).BeginInit(); + ((System.ComponentModel.ISupportInitialize)radPictureBox1).BeginInit(); + ((System.ComponentModel.ISupportInitialize)this).BeginInit(); + SuspendLayout(); // // panel1 // - 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"; + panel1.BackColor = Color.Transparent; + panel1.Controls.Add(radButton_Cancel); + panel1.Controls.Add(radButton_Install); + panel1.Controls.Add(panel_ChangelogPanel); + panel1.Controls.Add(radLabel10); + panel1.Controls.Add(radLabel_CurrentVersionBuild); + panel1.Controls.Add(radLabel7); + panel1.Controls.Add(radLabel_AvailableVersionBuild); + panel1.Controls.Add(radLabel9); + panel1.Controls.Add(radLabel_CurrentVersionChannel); + panel1.Controls.Add(radLabel3); + panel1.Controls.Add(radLabel_AvailableVersionChannel); + panel1.Controls.Add(radLabel4); + panel1.Controls.Add(radLabel_CurrentVersion); + panel1.Controls.Add(radLabel5); + panel1.Controls.Add(radLabel_AvailableVersion); + panel1.Controls.Add(radLabel2); + panel1.Controls.Add(radLabel1); + panel1.Controls.Add(radPictureBox1); + resources.ApplyResources(panel1, "panel1"); + 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"; + resources.ApplyResources(radButton_Cancel, "radButton_Cancel"); + radButton_Cancel.DialogResult = DialogResult.Cancel; + radButton_Cancel.Image = MyIcons.icons8_delete_16px; + radButton_Cancel.Name = "radButton_Cancel"; // // radButton_Install // - 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(radButton_Install, "radButton_Install"); + radButton_Install.DialogResult = DialogResult.OK; + radButton_Install.Image = MyIcons.icons8_software_installer_16px; + radButton_Install.Name = "radButton_Install"; // // panel_ChangelogPanel // - resources.ApplyResources(this.panel_ChangelogPanel, "panel_ChangelogPanel"); - this.panel_ChangelogPanel.Name = "panel_ChangelogPanel"; + resources.ApplyResources(panel_ChangelogPanel, "panel_ChangelogPanel"); + panel_ChangelogPanel.Name = "panel_ChangelogPanel"; // // radLabel10 // - resources.ApplyResources(this.radLabel10, "radLabel10"); - this.radLabel10.Name = "radLabel10"; + resources.ApplyResources(radLabel10, "radLabel10"); + radLabel10.Name = "radLabel10"; // // radLabel_CurrentVersionBuild // - resources.ApplyResources(this.radLabel_CurrentVersionBuild, "radLabel_CurrentVersionBuild"); - this.radLabel_CurrentVersionBuild.Name = "radLabel_CurrentVersionBuild"; + resources.ApplyResources(radLabel_CurrentVersionBuild, "radLabel_CurrentVersionBuild"); + radLabel_CurrentVersionBuild.Name = "radLabel_CurrentVersionBuild"; // // radLabel7 // - resources.ApplyResources(this.radLabel7, "radLabel7"); - this.radLabel7.Name = "radLabel7"; + resources.ApplyResources(radLabel7, "radLabel7"); + radLabel7.Name = "radLabel7"; // // radLabel_AvailableVersionBuild // - resources.ApplyResources(this.radLabel_AvailableVersionBuild, "radLabel_AvailableVersionBuild"); - this.radLabel_AvailableVersionBuild.Name = "radLabel_AvailableVersionBuild"; + resources.ApplyResources(radLabel_AvailableVersionBuild, "radLabel_AvailableVersionBuild"); + radLabel_AvailableVersionBuild.Name = "radLabel_AvailableVersionBuild"; // // radLabel9 // - resources.ApplyResources(this.radLabel9, "radLabel9"); - this.radLabel9.Name = "radLabel9"; - // - // radLabel4 - // - resources.ApplyResources(this.radLabel4, "radLabel4"); - this.radLabel4.Name = "radLabel4"; + resources.ApplyResources(radLabel9, "radLabel9"); + radLabel9.Name = "radLabel9"; // // radLabel_CurrentVersionChannel // - resources.ApplyResources(this.radLabel_CurrentVersionChannel, "radLabel_CurrentVersionChannel"); - this.radLabel_CurrentVersionChannel.Name = "radLabel_CurrentVersionChannel"; - // - // 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"; + resources.ApplyResources(radLabel_CurrentVersionChannel, "radLabel_CurrentVersionChannel"); + radLabel_CurrentVersionChannel.Name = "radLabel_CurrentVersionChannel"; // // radLabel3 // - resources.ApplyResources(this.radLabel3, "radLabel3"); - this.radLabel3.Name = "radLabel3"; + resources.ApplyResources(radLabel3, "radLabel3"); + radLabel3.Name = "radLabel3"; + // + // radLabel_AvailableVersionChannel + // + resources.ApplyResources(radLabel_AvailableVersionChannel, "radLabel_AvailableVersionChannel"); + radLabel_AvailableVersionChannel.Name = "radLabel_AvailableVersionChannel"; + // + // radLabel4 + // + resources.ApplyResources(radLabel4, "radLabel4"); + radLabel4.Name = "radLabel4"; // // radLabel_CurrentVersion // - resources.ApplyResources(this.radLabel_CurrentVersion, "radLabel_CurrentVersion"); - this.radLabel_CurrentVersion.Name = "radLabel_CurrentVersion"; + resources.ApplyResources(radLabel_CurrentVersion, "radLabel_CurrentVersion"); + radLabel_CurrentVersion.Name = "radLabel_CurrentVersion"; + // + // radLabel5 + // + resources.ApplyResources(radLabel5, "radLabel5"); + radLabel5.Name = "radLabel5"; // // radLabel_AvailableVersion // - resources.ApplyResources(this.radLabel_AvailableVersion, "radLabel_AvailableVersion"); - this.radLabel_AvailableVersion.Name = "radLabel_AvailableVersion"; + resources.ApplyResources(radLabel_AvailableVersion, "radLabel_AvailableVersion"); + radLabel_AvailableVersion.Name = "radLabel_AvailableVersion"; // // radLabel2 // - resources.ApplyResources(this.radLabel2, "radLabel2"); - this.radLabel2.Name = "radLabel2"; + resources.ApplyResources(radLabel2, "radLabel2"); + radLabel2.Name = "radLabel2"; // // radLabel1 // - resources.ApplyResources(this.radLabel1, "radLabel1"); - this.radLabel1.Name = "radLabel1"; + resources.ApplyResources(radLabel1, "radLabel1"); + radLabel1.Name = "radLabel1"; // // radPictureBox1 // - resources.ApplyResources(this.radPictureBox1, "radPictureBox1"); - this.radPictureBox1.Name = "radPictureBox1"; + resources.ApplyResources(radPictureBox1, "radPictureBox1"); + radPictureBox1.Name = "radPictureBox1"; // // layoutControlLabelItem1 // - 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; + resources.ApplyResources(layoutControlLabelItem1, "layoutControlLabelItem1"); + layoutControlLabelItem1.Bounds = new Rectangle(0, 52, 428, 39); + layoutControlLabelItem1.DisabledTextRenderingHint = System.Drawing.Text.TextRenderingHint.SystemDefault; + layoutControlLabelItem1.DrawText = false; + layoutControlLabelItem1.Name = "layoutControlLabelItem1"; + layoutControlLabelItem1.TextRenderingHint = System.Drawing.Text.TextRenderingHint.SystemDefault; + layoutControlLabelItem1.UseCompatibleTextRendering = false; // // UpdatesAvailableDialog // - this.AcceptButton = this.radButton_Install; + AcceptButton = radButton_Install; resources.ApplyResources(this, "$this"); - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - 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.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); - + AutoScaleMode = AutoScaleMode.Font; + CancelButton = radButton_Cancel; + Controls.Add(panel1); + FormBorderStyle = FormBorderStyle.FixedSingle; + MaximizeBox = false; + MinimizeBox = false; + Name = "UpdatesAvailableDialog"; + panel1.ResumeLayout(false); + panel1.PerformLayout(); + ((System.ComponentModel.ISupportInitialize)radButton_Cancel).EndInit(); + ((System.ComponentModel.ISupportInitialize)radButton_Install).EndInit(); + ((System.ComponentModel.ISupportInitialize)radLabel10).EndInit(); + ((System.ComponentModel.ISupportInitialize)radLabel_CurrentVersionBuild).EndInit(); + ((System.ComponentModel.ISupportInitialize)radLabel7).EndInit(); + ((System.ComponentModel.ISupportInitialize)radLabel_AvailableVersionBuild).EndInit(); + ((System.ComponentModel.ISupportInitialize)radLabel9).EndInit(); + ((System.ComponentModel.ISupportInitialize)radLabel_CurrentVersionChannel).EndInit(); + ((System.ComponentModel.ISupportInitialize)radLabel3).EndInit(); + ((System.ComponentModel.ISupportInitialize)radLabel_AvailableVersionChannel).EndInit(); + ((System.ComponentModel.ISupportInitialize)radLabel4).EndInit(); + ((System.ComponentModel.ISupportInitialize)radLabel_CurrentVersion).EndInit(); + ((System.ComponentModel.ISupportInitialize)radLabel5).EndInit(); + ((System.ComponentModel.ISupportInitialize)radLabel_AvailableVersion).EndInit(); + ((System.ComponentModel.ISupportInitialize)radLabel2).EndInit(); + ((System.ComponentModel.ISupportInitialize)radLabel1).EndInit(); + ((System.ComponentModel.ISupportInitialize)radPictureBox1).EndInit(); + ((System.ComponentModel.ISupportInitialize)this).EndInit(); + ResumeLayout(false); } 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 radLabel5; private Telerik.WinControls.UI.RadLabel radLabel_AvailableVersion; private Telerik.WinControls.UI.RadLabel radLabel2; private Telerik.WinControls.UI.LayoutControlLabelItem layoutControlLabelItem1; @@ -256,10 +252,10 @@ namespace Pilz.Updating.Client.GUI 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 radLabel3; private Telerik.WinControls.UI.RadLabel radLabel_AvailableVersionChannel; + private Telerik.WinControls.UI.RadLabel radLabel4; private Panel panel_ChangelogPanel; private Telerik.WinControls.UI.RadLabel radLabel10; private Telerik.WinControls.UI.RadButton radButton_Cancel; diff --git a/Pilz.Updating.Client.GUI/UpdatesAvailableDialog.cs b/Pilz.Updating.Client.GUI/UpdatesAvailableDialog.cs index 49686cf..754f1e2 100644 --- a/Pilz.Updating.Client.GUI/UpdatesAvailableDialog.cs +++ b/Pilz.Updating.Client.GUI/UpdatesAvailableDialog.cs @@ -47,7 +47,7 @@ namespace Pilz.Updating.Client.GUI }; break; } - if (updateNotesControl is object) + if (updateNotesControl is not null) { updateNotesControl.Dock = DockStyle.Fill; panel_ChangelogPanel.Controls.Add(updateNotesControl); diff --git a/Pilz.Updating.Client.GUI/UpdatesAvailableDialog.resx b/Pilz.Updating.Client.GUI/UpdatesAvailableDialog.resx index 041035e..5b778ae 100644 --- a/Pilz.Updating.Client.GUI/UpdatesAvailableDialog.resx +++ b/Pilz.Updating.Client.GUI/UpdatesAvailableDialog.resx @@ -1,4 +1,64 @@ - + + + @@ -57,573 +117,558 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - radLabel1 - - - 16 - - - ImageBeforeText - - - System.Windows.Forms.Panel, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - radLabel_AvailableVersionBuild - - - <html><span style="font-size: 18pt">Update available</span></html> - - - Fill - - - radLabel9 + + Bottom, Right - - 3, 97 - - - ... - - - 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 + + MiddleCenter 331, 384 - - Telerik.WinControls.UI.RadLabel, Telerik.WinControls.UI, Culture=neutral, PublicKeyToken=5bb2a467cbec794e + + 100, 24 - - Telerik.WinControls.UI.LayoutControlLabelItem, Telerik.WinControls.UI, Culture=neutral, PublicKeyToken=5bb2a467cbec794e - - - 8 - - - MiddleLeft - - - Channel: - - - 9 - - - 10 - - - panel1 - - - 14, 18 - - - radLabel_CurrentVersion - - - radLabel_CurrentVersionChannel - - - 354, 73 - - - Changelog: - - - 7 - - - Current Version: + + + 17 Cancel - - 0 + + MiddleLeft - - MiddleCenter - - - radLabel10 - - - - 0, 0, 0, 0 - - - radLabel7 - - - 225, 384 - - - panel1 - - - Telerik.WinControls.UI.RadPictureBox, Telerik.WinControls.UI, Culture=neutral, PublicKeyToken=5bb2a467cbec794e - - - 0 - - - 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 + + ImageBeforeText radButton_Cancel - - 14 + + Telerik.WinControls.UI.RadButton, Telerik.WinControls.UI, Culture=neutral, PublicKeyToken=5bb2a467cbec794e - - 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 + + Bottom, Right MiddleCenter - - ... + + 225, 384 - - 1 + + 100, 24 - - CenterScreen + + 17 - - 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 - - - 7, 15 - - - panel1 - - - radLabel_AvailableVersionChannel + + Install 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: + + radButton_Install 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 + + 1 - - 87, 18 + + Top, Bottom, Left, Right - - radLabel_CurrentVersionBuild + + 3, 145 - - Telerik.WinControls.UI.RadLabel, Telerik.WinControls.UI, Culture=neutral, PublicKeyToken=5bb2a467cbec794e + + 428, 233 16 - - 7 + + panel_ChangelogPanel - - Bottom, Right + + System.Windows.Forms.Panel, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 3, 73 - - - radLabel3 - - - - - - 11 - - - 14, 18 - - + panel1 - - radPictureBox1 + + 2 + + + 3, 121 + + + 63, 18 + + + 15 + + + Changelog: + + + radLabel10 + + + Telerik.WinControls.UI.RadLabel, Telerik.WinControls.UI, Culture=neutral, PublicKeyToken=5bb2a467cbec794e + + + panel1 + + + 3 Top, Right + + 398, 73 + + + 14, 18 + + + 14 + + + ... + + + radLabel_CurrentVersionBuild + + + Telerik.WinControls.UI.RadLabel, Telerik.WinControls.UI, Culture=neutral, PublicKeyToken=5bb2a467cbec794e + + + panel1 + + + 4 + + + Top, Right + + + 354, 73 + + + 34, 18 + + + 13 + + + Build: + + + radLabel7 + + + Telerik.WinControls.UI.RadLabel, Telerik.WinControls.UI, Culture=neutral, PublicKeyToken=5bb2a467cbec794e + + + panel1 + + + 5 + + + Top, Right + + + 398, 97 + + + 14, 18 + + + 12 + + + ... + + + radLabel_AvailableVersionBuild + + + Telerik.WinControls.UI.RadLabel, Telerik.WinControls.UI, Culture=neutral, PublicKeyToken=5bb2a467cbec794e + + + panel1 + + + 6 + + + Top, Right + + + 354, 97 + + + 34, 18 + + + 11 + + + Build: + + + radLabel9 + + + Telerik.WinControls.UI.RadLabel, Telerik.WinControls.UI, Culture=neutral, PublicKeyToken=5bb2a467cbec794e + + + panel1 + + + 7 + + + Top, Right + + + 286, 73 + + + 14, 18 + + + 10 + + + ... + + + radLabel_CurrentVersionChannel + + + Telerik.WinControls.UI.RadLabel, Telerik.WinControls.UI, Culture=neutral, PublicKeyToken=5bb2a467cbec794e + + + panel1 + + + 8 + + + Top, Right + + + 224, 73 + + + 49, 18 + + + 9 + + + Channel: + + + radLabel3 + + + Telerik.WinControls.UI.RadLabel, Telerik.WinControls.UI, Culture=neutral, PublicKeyToken=5bb2a467cbec794e + + + panel1 + + + 9 + + + Top, Right + + + 286, 97 + + + 14, 18 + + + 8 + + + ... + + + radLabel_AvailableVersionChannel + + + Telerik.WinControls.UI.RadLabel, Telerik.WinControls.UI, Culture=neutral, PublicKeyToken=5bb2a467cbec794e + + + panel1 + + + 10 + + + Top, Right + + + 224, 97 + + + 49, 18 + + + 7 + + + Channel: + radLabel4 - - 49, 18 + + Telerik.WinControls.UI.RadLabel, Telerik.WinControls.UI, Culture=neutral, PublicKeyToken=5bb2a467cbec794e + + + panel1 + + + 11 + + + 113, 73 + + + 14, 18 + + + 6 + + + ... + + + radLabel_CurrentVersion + + + Telerik.WinControls.UI.RadLabel, Telerik.WinControls.UI, Culture=neutral, PublicKeyToken=5bb2a467cbec794e + + + panel1 + + + 12 + + + 3, 73 + + + 87, 18 + + + 5 + + + Current Version: + + + radLabel5 + + + Telerik.WinControls.UI.RadLabel, Telerik.WinControls.UI, Culture=neutral, PublicKeyToken=5bb2a467cbec794e + + + panel1 + + + 13 + + + 113, 97 + + + 14, 18 + + + 4 + + + ... + + + radLabel_AvailableVersion + + + Telerik.WinControls.UI.RadLabel, Telerik.WinControls.UI, Culture=neutral, PublicKeyToken=5bb2a467cbec794e + + + panel1 + + + 14 + + + 3, 97 + + + 94, 18 + + + 3 + + + Available Version: + + + radLabel2 + + + Telerik.WinControls.UI.RadLabel, Telerik.WinControls.UI, Culture=neutral, PublicKeyToken=5bb2a467cbec794e + + + panel1 + + + 15 + + + Top, Left, Right + + + False + + + 73, 3 + + + 358, 64 + + + 1 + + + <html><span style="font-size: 18pt">Update available</span></html> + + + MiddleCenter + + + radLabel1 + + + Telerik.WinControls.UI.RadLabel, Telerik.WinControls.UI, Culture=neutral, PublicKeyToken=5bb2a467cbec794e + + + panel1 + + + 16 + + + 3, 3 + + + 64, 64 + + + 0 + + + radPictureBox1 + + + Telerik.WinControls.UI.RadPictureBox, Telerik.WinControls.UI, Culture=neutral, PublicKeyToken=5bb2a467cbec794e + + + panel1 + + + 17 + + + Fill + + + 0, 0 + + + 434, 411 + + + 0 + + + panel1 + + + System.Windows.Forms.Panel, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 0 + + + TopLeft + + + 0 + + + False + + + + 0, 0, 0, 0 + + + 0, 0, 0, 0 + + + False + + + + + + Horizontal + + + False + + + True + + + 7, 15 + + + 7, 15 + + + 434, 411 @@ -1163,7 +1208,22 @@ ///////wD/////////AP/////////////////////////////////////////////////////////w== - - True - + + CenterScreen + + + Updates + + + layoutControlLabelItem1 + + + Telerik.WinControls.UI.LayoutControlLabelItem, Telerik.WinControls.UI, Culture=neutral, PublicKeyToken=5bb2a467cbec794e + + + UpdatesAvailableDialog + + + Telerik.WinControls.UI.RadForm, Telerik.WinControls.UI, Culture=neutral, PublicKeyToken=5bb2a467cbec794e + \ No newline at end of file diff --git a/Pilz.Updating/ApplicationVersion.cs b/Pilz.Updating/ApplicationVersion.cs index 2b73542..b92be32 100644 --- a/Pilz.Updating/ApplicationVersion.cs +++ b/Pilz.Updating/ApplicationVersion.cs @@ -42,17 +42,17 @@ namespace Pilz.Updating public static bool operator >(ApplicationVersion a, ApplicationVersion b) { - return a.Version > b.Version || a.Version == b.Version && (a.Channel < b.Channel || a.Channel == b.Channel && a.Build > b.Build); + return a.Version > b.Version || a.Version == b.Version && (a.Channel < b.Channel || (a.Channel == b.Channel && a.Build > b.Build)); } public static bool operator <(ApplicationVersion a, ApplicationVersion b) { - return a.Version < b.Version || a.Version == b.Version && (a.Channel > b.Channel || a.Channel == b.Channel && a.Build < b.Build); + return a.Version < b.Version || a.Version == b.Version && (a.Channel > b.Channel || (a.Channel == b.Channel && a.Build < b.Build)); } public static bool operator ==(ApplicationVersion a, ApplicationVersion b) { - return !(a != b); + return a.Version == b.Version && a.Channel == b.Channel && a.Build == b.Build; } public static bool operator !=(ApplicationVersion a, ApplicationVersion b) diff --git a/Pilz.Updating/Pilz.Updating.csproj b/Pilz.Updating/Pilz.Updating.csproj index 845e51a..7ec6ddd 100644 --- a/Pilz.Updating/Pilz.Updating.csproj +++ b/Pilz.Updating/Pilz.Updating.csproj @@ -40,7 +40,7 @@ True 1.yyyy.Mdd.Hmm - 1.2023.914.1123 + 1.2023.1113.1335