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

UpdatesAvailableDialog: fix label naming & add OK response for install button

Browse Source
This commit is contained in:
Pascal
2023-11-13 15:14:42 +01:00
parent bbee3e8162
commit 75f49e9d40
5 changed files with 724 additions and 668 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -37,218 +37,214 @@ 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.panel1 = new System.Windows.Forms.Panel(); panel1 = new Panel();
this.radButton_Cancel = new Telerik.WinControls.UI.RadButton(); radButton_Cancel = new Telerik.WinControls.UI.RadButton();
this.radButton_Install = new Telerik.WinControls.UI.RadButton(); radButton_Install = new Telerik.WinControls.UI.RadButton();
this.panel_ChangelogPanel = new System.Windows.Forms.Panel(); panel_ChangelogPanel = new Panel();
this.radLabel10 = new Telerik.WinControls.UI.RadLabel(); radLabel10 = new Telerik.WinControls.UI.RadLabel();
this.radLabel_CurrentVersionBuild = new Telerik.WinControls.UI.RadLabel(); radLabel_CurrentVersionBuild = new Telerik.WinControls.UI.RadLabel();
this.radLabel7 = new Telerik.WinControls.UI.RadLabel(); radLabel7 = new Telerik.WinControls.UI.RadLabel();
this.radLabel_AvailableVersionBuild = new Telerik.WinControls.UI.RadLabel(); radLabel_AvailableVersionBuild = new Telerik.WinControls.UI.RadLabel();
this.radLabel9 = new Telerik.WinControls.UI.RadLabel(); radLabel9 = new Telerik.WinControls.UI.RadLabel();
this.radLabel4 = new Telerik.WinControls.UI.RadLabel(); radLabel_CurrentVersionChannel = new Telerik.WinControls.UI.RadLabel();
this.radLabel_CurrentVersionChannel = new Telerik.WinControls.UI.RadLabel(); radLabel3 = new Telerik.WinControls.UI.RadLabel();
this.radLabel6 = new Telerik.WinControls.UI.RadLabel(); radLabel_AvailableVersionChannel = new Telerik.WinControls.UI.RadLabel();
this.radLabel_AvailableVersionChannel = new Telerik.WinControls.UI.RadLabel(); radLabel4 = new Telerik.WinControls.UI.RadLabel();
this.radLabel3 = new Telerik.WinControls.UI.RadLabel(); radLabel_CurrentVersion = new Telerik.WinControls.UI.RadLabel();
this.radLabel_CurrentVersion = new Telerik.WinControls.UI.RadLabel(); radLabel5 = new Telerik.WinControls.UI.RadLabel();
this.radLabel_AvailableVersion = new Telerik.WinControls.UI.RadLabel(); radLabel_AvailableVersion = new Telerik.WinControls.UI.RadLabel();
this.radLabel2 = new Telerik.WinControls.UI.RadLabel(); radLabel2 = new Telerik.WinControls.UI.RadLabel();
this.radLabel1 = new Telerik.WinControls.UI.RadLabel(); radLabel1 = new Telerik.WinControls.UI.RadLabel();
this.radPictureBox1 = new Telerik.WinControls.UI.RadPictureBox(); radPictureBox1 = new Telerik.WinControls.UI.RadPictureBox();
this.layoutControlLabelItem1 = new Telerik.WinControls.UI.LayoutControlLabelItem(); layoutControlLabelItem1 = new Telerik.WinControls.UI.LayoutControlLabelItem();
this.panel1.SuspendLayout(); panel1.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.radButton_Cancel)).BeginInit(); ((System.ComponentModel.ISupportInitialize)radButton_Cancel).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.radButton_Install)).BeginInit(); ((System.ComponentModel.ISupportInitialize)radButton_Install).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.radLabel10)).BeginInit(); ((System.ComponentModel.ISupportInitialize)radLabel10).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.radLabel_CurrentVersionBuild)).BeginInit(); ((System.ComponentModel.ISupportInitialize)radLabel_CurrentVersionBuild).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.radLabel7)).BeginInit(); ((System.ComponentModel.ISupportInitialize)radLabel7).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.radLabel_AvailableVersionBuild)).BeginInit(); ((System.ComponentModel.ISupportInitialize)radLabel_AvailableVersionBuild).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.radLabel9)).BeginInit(); ((System.ComponentModel.ISupportInitialize)radLabel9).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.radLabel4)).BeginInit(); ((System.ComponentModel.ISupportInitialize)radLabel_CurrentVersionChannel).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.radLabel_CurrentVersionChannel)).BeginInit(); ((System.ComponentModel.ISupportInitialize)radLabel3).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.radLabel6)).BeginInit(); ((System.ComponentModel.ISupportInitialize)radLabel_AvailableVersionChannel).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.radLabel_AvailableVersionChannel)).BeginInit(); ((System.ComponentModel.ISupportInitialize)radLabel4).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.radLabel3)).BeginInit(); ((System.ComponentModel.ISupportInitialize)radLabel_CurrentVersion).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.radLabel_CurrentVersion)).BeginInit(); ((System.ComponentModel.ISupportInitialize)radLabel5).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.radLabel_AvailableVersion)).BeginInit(); ((System.ComponentModel.ISupportInitialize)radLabel_AvailableVersion).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.radLabel2)).BeginInit(); ((System.ComponentModel.ISupportInitialize)radLabel2).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.radLabel1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)radLabel1).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.radPictureBox1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)radPictureBox1).BeginInit();
((System.ComponentModel.ISupportInitialize)(this)).BeginInit(); ((System.ComponentModel.ISupportInitialize)this).BeginInit();
this.SuspendLayout(); SuspendLayout();
// //
// panel1 // panel1
// //
resources.ApplyResources(this.panel1, "panel1"); panel1.BackColor = Color.Transparent;
this.panel1.BackColor = System.Drawing.Color.Transparent; panel1.Controls.Add(radButton_Cancel);
this.panel1.Controls.Add(this.radButton_Cancel); panel1.Controls.Add(radButton_Install);
this.panel1.Controls.Add(this.radButton_Install); panel1.Controls.Add(panel_ChangelogPanel);
this.panel1.Controls.Add(this.panel_ChangelogPanel); panel1.Controls.Add(radLabel10);
this.panel1.Controls.Add(this.radLabel10); panel1.Controls.Add(radLabel_CurrentVersionBuild);
this.panel1.Controls.Add(this.radLabel_CurrentVersionBuild); panel1.Controls.Add(radLabel7);
this.panel1.Controls.Add(this.radLabel7); panel1.Controls.Add(radLabel_AvailableVersionBuild);
this.panel1.Controls.Add(this.radLabel_AvailableVersionBuild); panel1.Controls.Add(radLabel9);
this.panel1.Controls.Add(this.radLabel9); panel1.Controls.Add(radLabel_CurrentVersionChannel);
this.panel1.Controls.Add(this.radLabel4); panel1.Controls.Add(radLabel3);
this.panel1.Controls.Add(this.radLabel_CurrentVersionChannel); panel1.Controls.Add(radLabel_AvailableVersionChannel);
this.panel1.Controls.Add(this.radLabel6); panel1.Controls.Add(radLabel4);
this.panel1.Controls.Add(this.radLabel_AvailableVersionChannel); panel1.Controls.Add(radLabel_CurrentVersion);
this.panel1.Controls.Add(this.radLabel3); panel1.Controls.Add(radLabel5);
this.panel1.Controls.Add(this.radLabel_CurrentVersion); panel1.Controls.Add(radLabel_AvailableVersion);
this.panel1.Controls.Add(this.radLabel_AvailableVersion); panel1.Controls.Add(radLabel2);
this.panel1.Controls.Add(this.radLabel2); panel1.Controls.Add(radLabel1);
this.panel1.Controls.Add(this.radLabel1); panel1.Controls.Add(radPictureBox1);
this.panel1.Controls.Add(this.radPictureBox1); resources.ApplyResources(panel1, "panel1");
this.panel1.Name = "panel1"; panel1.Name = "panel1";
// //
// radButton_Cancel // radButton_Cancel
// //
resources.ApplyResources(this.radButton_Cancel, "radButton_Cancel"); resources.ApplyResources(radButton_Cancel, "radButton_Cancel");
this.radButton_Cancel.DialogResult = System.Windows.Forms.DialogResult.Cancel; radButton_Cancel.DialogResult = DialogResult.Cancel;
this.radButton_Cancel.Image = global::Pilz.Updating.Client.GUI.MyIcons.icons8_delete_16px; radButton_Cancel.Image = MyIcons.icons8_delete_16px;
this.radButton_Cancel.Name = "radButton_Cancel"; radButton_Cancel.Name = "radButton_Cancel";
// //
// radButton_Install // radButton_Install
// //
resources.ApplyResources(this.radButton_Install, "radButton_Install"); resources.ApplyResources(radButton_Install, "radButton_Install");
this.radButton_Install.Image = global::Pilz.Updating.Client.GUI.MyIcons.icons8_software_installer_16px; radButton_Install.DialogResult = DialogResult.OK;
this.radButton_Install.Name = "radButton_Install"; radButton_Install.Image = MyIcons.icons8_software_installer_16px;
radButton_Install.Name = "radButton_Install";
// //
// panel_ChangelogPanel // panel_ChangelogPanel
// //
resources.ApplyResources(this.panel_ChangelogPanel, "panel_ChangelogPanel"); resources.ApplyResources(panel_ChangelogPanel, "panel_ChangelogPanel");
this.panel_ChangelogPanel.Name = "panel_ChangelogPanel"; panel_ChangelogPanel.Name = "panel_ChangelogPanel";
// //
// radLabel10 // radLabel10
// //
resources.ApplyResources(this.radLabel10, "radLabel10"); resources.ApplyResources(radLabel10, "radLabel10");
this.radLabel10.Name = "radLabel10"; radLabel10.Name = "radLabel10";
// //
// radLabel_CurrentVersionBuild // radLabel_CurrentVersionBuild
// //
resources.ApplyResources(this.radLabel_CurrentVersionBuild, "radLabel_CurrentVersionBuild"); resources.ApplyResources(radLabel_CurrentVersionBuild, "radLabel_CurrentVersionBuild");
this.radLabel_CurrentVersionBuild.Name = "radLabel_CurrentVersionBuild"; radLabel_CurrentVersionBuild.Name = "radLabel_CurrentVersionBuild";
// //
// radLabel7 // radLabel7
// //
resources.ApplyResources(this.radLabel7, "radLabel7"); resources.ApplyResources(radLabel7, "radLabel7");
this.radLabel7.Name = "radLabel7"; radLabel7.Name = "radLabel7";
// //
// radLabel_AvailableVersionBuild // radLabel_AvailableVersionBuild
// //
resources.ApplyResources(this.radLabel_AvailableVersionBuild, "radLabel_AvailableVersionBuild"); resources.ApplyResources(radLabel_AvailableVersionBuild, "radLabel_AvailableVersionBuild");
this.radLabel_AvailableVersionBuild.Name = "radLabel_AvailableVersionBuild"; radLabel_AvailableVersionBuild.Name = "radLabel_AvailableVersionBuild";
// //
// radLabel9 // radLabel9
// //
resources.ApplyResources(this.radLabel9, "radLabel9"); resources.ApplyResources(radLabel9, "radLabel9");
this.radLabel9.Name = "radLabel9"; radLabel9.Name = "radLabel9";
//
// radLabel4
//
resources.ApplyResources(this.radLabel4, "radLabel4");
this.radLabel4.Name = "radLabel4";
// //
// radLabel_CurrentVersionChannel // radLabel_CurrentVersionChannel
// //
resources.ApplyResources(this.radLabel_CurrentVersionChannel, "radLabel_CurrentVersionChannel"); resources.ApplyResources(radLabel_CurrentVersionChannel, "radLabel_CurrentVersionChannel");
this.radLabel_CurrentVersionChannel.Name = "radLabel_CurrentVersionChannel"; 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";
// //
// radLabel3 // radLabel3
// //
resources.ApplyResources(this.radLabel3, "radLabel3"); resources.ApplyResources(radLabel3, "radLabel3");
this.radLabel3.Name = "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 // radLabel_CurrentVersion
// //
resources.ApplyResources(this.radLabel_CurrentVersion, "radLabel_CurrentVersion"); resources.ApplyResources(radLabel_CurrentVersion, "radLabel_CurrentVersion");
this.radLabel_CurrentVersion.Name = "radLabel_CurrentVersion"; radLabel_CurrentVersion.Name = "radLabel_CurrentVersion";
//
// radLabel5
//
resources.ApplyResources(radLabel5, "radLabel5");
radLabel5.Name = "radLabel5";
// //
// radLabel_AvailableVersion // radLabel_AvailableVersion
// //
resources.ApplyResources(this.radLabel_AvailableVersion, "radLabel_AvailableVersion"); resources.ApplyResources(radLabel_AvailableVersion, "radLabel_AvailableVersion");
this.radLabel_AvailableVersion.Name = "radLabel_AvailableVersion"; radLabel_AvailableVersion.Name = "radLabel_AvailableVersion";
// //
// radLabel2 // radLabel2
// //
resources.ApplyResources(this.radLabel2, "radLabel2"); resources.ApplyResources(radLabel2, "radLabel2");
this.radLabel2.Name = "radLabel2"; radLabel2.Name = "radLabel2";
// //
// radLabel1 // radLabel1
// //
resources.ApplyResources(this.radLabel1, "radLabel1"); resources.ApplyResources(radLabel1, "radLabel1");
this.radLabel1.Name = "radLabel1"; radLabel1.Name = "radLabel1";
// //
// radPictureBox1 // radPictureBox1
// //
resources.ApplyResources(this.radPictureBox1, "radPictureBox1"); resources.ApplyResources(radPictureBox1, "radPictureBox1");
this.radPictureBox1.Name = "radPictureBox1"; radPictureBox1.Name = "radPictureBox1";
// //
// layoutControlLabelItem1 // layoutControlLabelItem1
// //
resources.ApplyResources(this.layoutControlLabelItem1, "layoutControlLabelItem1"); resources.ApplyResources(layoutControlLabelItem1, "layoutControlLabelItem1");
this.layoutControlLabelItem1.Bounds = new System.Drawing.Rectangle(0, 52, 428, 39); layoutControlLabelItem1.Bounds = new Rectangle(0, 52, 428, 39);
this.layoutControlLabelItem1.DisabledTextRenderingHint = System.Drawing.Text.TextRenderingHint.SystemDefault; layoutControlLabelItem1.DisabledTextRenderingHint = System.Drawing.Text.TextRenderingHint.SystemDefault;
this.layoutControlLabelItem1.DrawText = false; layoutControlLabelItem1.DrawText = false;
this.layoutControlLabelItem1.Name = "layoutControlLabelItem1"; layoutControlLabelItem1.Name = "layoutControlLabelItem1";
this.layoutControlLabelItem1.TextRenderingHint = System.Drawing.Text.TextRenderingHint.SystemDefault; layoutControlLabelItem1.TextRenderingHint = System.Drawing.Text.TextRenderingHint.SystemDefault;
this.layoutControlLabelItem1.UseCompatibleTextRendering = false; layoutControlLabelItem1.UseCompatibleTextRendering = false;
// //
// UpdatesAvailableDialog // UpdatesAvailableDialog
// //
this.AcceptButton = this.radButton_Install; AcceptButton = radButton_Install;
resources.ApplyResources(this, "$this"); resources.ApplyResources(this, "$this");
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; AutoScaleMode = AutoScaleMode.Font;
this.CancelButton = this.radButton_Cancel; CancelButton = radButton_Cancel;
this.Controls.Add(this.panel1); Controls.Add(panel1);
this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle; FormBorderStyle = FormBorderStyle.FixedSingle;
this.MaximizeBox = false; MaximizeBox = false;
this.MinimizeBox = false; MinimizeBox = false;
this.Name = "UpdatesAvailableDialog"; Name = "UpdatesAvailableDialog";
// panel1.ResumeLayout(false);
// panel1.PerformLayout();
// ((System.ComponentModel.ISupportInitialize)radButton_Cancel).EndInit();
this.RootElement.ApplyShapeToControl = true; ((System.ComponentModel.ISupportInitialize)radButton_Install).EndInit();
this.panel1.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)radLabel10).EndInit();
this.panel1.PerformLayout(); ((System.ComponentModel.ISupportInitialize)radLabel_CurrentVersionBuild).EndInit();
((System.ComponentModel.ISupportInitialize)(this.radButton_Cancel)).EndInit(); ((System.ComponentModel.ISupportInitialize)radLabel7).EndInit();
((System.ComponentModel.ISupportInitialize)(this.radButton_Install)).EndInit(); ((System.ComponentModel.ISupportInitialize)radLabel_AvailableVersionBuild).EndInit();
((System.ComponentModel.ISupportInitialize)(this.radLabel10)).EndInit(); ((System.ComponentModel.ISupportInitialize)radLabel9).EndInit();
((System.ComponentModel.ISupportInitialize)(this.radLabel_CurrentVersionBuild)).EndInit(); ((System.ComponentModel.ISupportInitialize)radLabel_CurrentVersionChannel).EndInit();
((System.ComponentModel.ISupportInitialize)(this.radLabel7)).EndInit(); ((System.ComponentModel.ISupportInitialize)radLabel3).EndInit();
((System.ComponentModel.ISupportInitialize)(this.radLabel_AvailableVersionBuild)).EndInit(); ((System.ComponentModel.ISupportInitialize)radLabel_AvailableVersionChannel).EndInit();
((System.ComponentModel.ISupportInitialize)(this.radLabel9)).EndInit(); ((System.ComponentModel.ISupportInitialize)radLabel4).EndInit();
((System.ComponentModel.ISupportInitialize)(this.radLabel4)).EndInit(); ((System.ComponentModel.ISupportInitialize)radLabel_CurrentVersion).EndInit();
((System.ComponentModel.ISupportInitialize)(this.radLabel_CurrentVersionChannel)).EndInit(); ((System.ComponentModel.ISupportInitialize)radLabel5).EndInit();
((System.ComponentModel.ISupportInitialize)(this.radLabel6)).EndInit(); ((System.ComponentModel.ISupportInitialize)radLabel_AvailableVersion).EndInit();
((System.ComponentModel.ISupportInitialize)(this.radLabel_AvailableVersionChannel)).EndInit(); ((System.ComponentModel.ISupportInitialize)radLabel2).EndInit();
((System.ComponentModel.ISupportInitialize)(this.radLabel3)).EndInit(); ((System.ComponentModel.ISupportInitialize)radLabel1).EndInit();
((System.ComponentModel.ISupportInitialize)(this.radLabel_CurrentVersion)).EndInit(); ((System.ComponentModel.ISupportInitialize)radPictureBox1).EndInit();
((System.ComponentModel.ISupportInitialize)(this.radLabel_AvailableVersion)).EndInit(); ((System.ComponentModel.ISupportInitialize)this).EndInit();
((System.ComponentModel.ISupportInitialize)(this.radLabel2)).EndInit(); ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)(this.radLabel1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.radPictureBox1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this)).EndInit();
this.ResumeLayout(false);
} }
private Panel panel1; private Panel panel1;
private Telerik.WinControls.UI.RadPictureBox radPictureBox1; private Telerik.WinControls.UI.RadPictureBox radPictureBox1;
private Telerik.WinControls.UI.RadLabel radLabel1; 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_CurrentVersion;
private Telerik.WinControls.UI.RadLabel radLabel5;
private Telerik.WinControls.UI.RadLabel radLabel_AvailableVersion; private Telerik.WinControls.UI.RadLabel radLabel_AvailableVersion;
private Telerik.WinControls.UI.RadLabel radLabel2; private Telerik.WinControls.UI.RadLabel radLabel2;
private Telerik.WinControls.UI.LayoutControlLabelItem layoutControlLabelItem1; 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 radLabel7;
private Telerik.WinControls.UI.RadLabel radLabel_AvailableVersionBuild; private Telerik.WinControls.UI.RadLabel radLabel_AvailableVersionBuild;
private Telerik.WinControls.UI.RadLabel radLabel9; private Telerik.WinControls.UI.RadLabel radLabel9;
private Telerik.WinControls.UI.RadLabel radLabel4;
private Telerik.WinControls.UI.RadLabel radLabel_CurrentVersionChannel; 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 radLabel_AvailableVersionChannel;
private Telerik.WinControls.UI.RadLabel radLabel4;
private Panel panel_ChangelogPanel; private Panel panel_ChangelogPanel;
private Telerik.WinControls.UI.RadLabel radLabel10; private Telerik.WinControls.UI.RadLabel radLabel10;
private Telerik.WinControls.UI.RadButton radButton_Cancel; private Telerik.WinControls.UI.RadButton radButton_Cancel;

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

@@ -47,7 +47,7 @@ namespace Pilz.Updating.Client.GUI
}; };
break; break;
} }
if (updateNotesControl is object) if (updateNotesControl is not null)
{ {
updateNotesControl.Dock = DockStyle.Fill; updateNotesControl.Dock = DockStyle.Fill;
panel_ChangelogPanel.Controls.Add(updateNotesControl); panel_ChangelogPanel.Controls.Add(updateNotesControl);

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

File diff suppressed because it is too large Load Diff

6
Pilz.Updating/ApplicationVersion.cs
View File

@@ -42,17 +42,17 @@ namespace Pilz.Updating
public static bool operator >(ApplicationVersion a, ApplicationVersion b) 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) 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) 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) public static bool operator !=(ApplicationVersion a, ApplicationVersion b)

2
Pilz.Updating/Pilz.Updating.csproj
View File

@@ -40,7 +40,7 @@
<PropertyGroup> <PropertyGroup>
<GeneratePackageOnBuild>True</GeneratePackageOnBuild> <GeneratePackageOnBuild>True</GeneratePackageOnBuild>
<IncrementVersionOnBuild>1.yyyy.Mdd.Hmm</IncrementVersionOnBuild> <IncrementVersionOnBuild>1.yyyy.Mdd.Hmm</IncrementVersionOnBuild>
<Version>1.2023.914.1123</Version> <Version>1.2023.1113.1335</Version>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Microsoft.VisualBasic" Version="10.3.0" /> <PackageReference Include="Microsoft.VisualBasic" Version="10.3.0" />