From b7a010b5f09b92df617ae67ad17870626c55b90b Mon Sep 17 00:00:00 2001 From: Carmen Agimof Date: Thu, 30 Jul 2015 14:58:23 +0100 Subject: [PATCH] CA-178243: The Refresh button was not working correctly because of the restore button. Automatic check for updates works now when certain boxes are checked, showing the updates when the user opens XenCenter, but, the list has duplicates. Improves the centering of the warning messages in the Updates Tab, making the picture align with the text. Corrects bug related to the visibility of the warning about automatic checks for updates. --- XenAdmin/Core/Updates.cs | 4 +- .../TabPages/ManageUpdatesPage.Designer.cs | 51 ++-- XenAdmin/TabPages/ManageUpdatesPage.cs | 4 + XenAdmin/TabPages/ManageUpdatesPage.resx | 243 +++++++++--------- 4 files changed, 156 insertions(+), 146 deletions(-) diff --git a/XenAdmin/Core/Updates.cs b/XenAdmin/Core/Updates.cs index 3fd80847f..f76cc6b6e 100644 --- a/XenAdmin/Core/Updates.cs +++ b/XenAdmin/Core/Updates.cs @@ -468,8 +468,10 @@ namespace XenAdmin.Core } if (other_config.ContainsKey(IgnoreServerAction.LAST_SEEN_SERVER_VERSION_KEY)) { - other_config.Remove(IgnorePatchAction.IgnorePatchKey); + other_config.Remove(IgnoreServerAction.LAST_SEEN_SERVER_VERSION_KEY); } + + XenAPI.Pool.set_other_config(_connection.Session, pool.opaque_ref, other_config); } Properties.Settings.Default.LatestXenCenterSeen = ""; diff --git a/XenAdmin/TabPages/ManageUpdatesPage.Designer.cs b/XenAdmin/TabPages/ManageUpdatesPage.Designer.cs index fb5161105..5049be1a7 100644 --- a/XenAdmin/TabPages/ManageUpdatesPage.Designer.cs +++ b/XenAdmin/TabPages/ManageUpdatesPage.Designer.cs @@ -60,10 +60,10 @@ this.button2 = new System.Windows.Forms.Button(); this.button1 = new System.Windows.Forms.Button(); this.tableLayoutPanel3 = new System.Windows.Forms.TableLayoutPanel(); - this.pictureBoxProgress = new System.Windows.Forms.PictureBox(); - this.labelProgress = new System.Windows.Forms.Label(); this.checkForUpdatesNowButton = new System.Windows.Forms.Button(); - this.flickerFreePanel1 = new XenAdmin.Controls.FlickerFreePanel(); + this.tableLayoutPanel4 = new System.Windows.Forms.TableLayoutPanel(); + this.labelProgress = new System.Windows.Forms.Label(); + this.pictureBoxProgress = new System.Windows.Forms.PictureBox(); this.dataGridViewUpdates = new XenAdmin.Controls.DataGridViewEx.DataGridViewEx(); this.ColumnExpand = new System.Windows.Forms.DataGridViewImageColumn(); this.ColumnMessage = new System.Windows.Forms.DataGridViewTextBoxColumn(); @@ -76,6 +76,7 @@ this.toolStrip1.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit(); this.tableLayoutPanel3.SuspendLayout(); + this.tableLayoutPanel4.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.pictureBoxProgress)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.dataGridViewUpdates)).BeginInit(); this.SuspendLayout(); @@ -241,22 +242,10 @@ // tableLayoutPanel3 // resources.ApplyResources(this.tableLayoutPanel3, "tableLayoutPanel3"); - this.tableLayoutPanel3.Controls.Add(this.pictureBoxProgress, 0, 0); - this.tableLayoutPanel3.Controls.Add(this.labelProgress, 0, 1); - this.tableLayoutPanel3.Controls.Add(this.checkForUpdatesNowButton, 0, 2); + this.tableLayoutPanel3.Controls.Add(this.checkForUpdatesNowButton, 0, 1); + this.tableLayoutPanel3.Controls.Add(this.tableLayoutPanel4, 0, 0); this.tableLayoutPanel3.Name = "tableLayoutPanel3"; // - // pictureBoxProgress - // - resources.ApplyResources(this.pictureBoxProgress, "pictureBoxProgress"); - this.pictureBoxProgress.Name = "pictureBoxProgress"; - this.pictureBoxProgress.TabStop = false; - // - // labelProgress - // - resources.ApplyResources(this.labelProgress, "labelProgress"); - this.labelProgress.Name = "labelProgress"; - // // checkForUpdatesNowButton // resources.ApplyResources(this.checkForUpdatesNowButton, "checkForUpdatesNowButton"); @@ -264,13 +253,24 @@ this.checkForUpdatesNowButton.UseVisualStyleBackColor = true; this.checkForUpdatesNowButton.Click += new System.EventHandler(this.checkForUpdatesNowButton_Click); // - // flickerFreePanel1 + // tableLayoutPanel4 // - resources.ApplyResources(this.flickerFreePanel1, "flickerFreePanel1"); - this.flickerFreePanel1.BackColor = System.Drawing.Color.WhiteSmoke; - this.flickerFreePanel1.BorderColor = System.Drawing.Color.Black; - this.flickerFreePanel1.BorderWidth = 1; - this.flickerFreePanel1.Name = "flickerFreePanel1"; + resources.ApplyResources(this.tableLayoutPanel4, "tableLayoutPanel4"); + this.tableLayoutPanel4.Controls.Add(this.labelProgress, 1, 0); + this.tableLayoutPanel4.Controls.Add(this.pictureBoxProgress, 0, 0); + this.tableLayoutPanel4.Cursor = System.Windows.Forms.Cursors.Arrow; + this.tableLayoutPanel4.Name = "tableLayoutPanel4"; + // + // labelProgress + // + resources.ApplyResources(this.labelProgress, "labelProgress"); + this.labelProgress.Name = "labelProgress"; + // + // pictureBoxProgress + // + resources.ApplyResources(this.pictureBoxProgress, "pictureBoxProgress"); + this.pictureBoxProgress.Name = "pictureBoxProgress"; + this.pictureBoxProgress.TabStop = false; // // dataGridViewUpdates // @@ -352,7 +352,6 @@ this.BackColor = System.Drawing.SystemColors.Control; this.Controls.Add(this.tableLayoutPanel3); this.Controls.Add(this.tableLayoutPanel2); - this.Controls.Add(this.flickerFreePanel1); this.Controls.Add(this.tableLayoutPanel1); this.Controls.Add(this.dataGridViewUpdates); this.Name = "ManageUpdatesPage"; @@ -366,6 +365,8 @@ ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).EndInit(); this.tableLayoutPanel3.ResumeLayout(false); this.tableLayoutPanel3.PerformLayout(); + this.tableLayoutPanel4.ResumeLayout(false); + this.tableLayoutPanel4.PerformLayout(); ((System.ComponentModel.ISupportInitialize)(this.pictureBoxProgress)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.dataGridViewUpdates)).EndInit(); this.ResumeLayout(false); @@ -396,7 +397,6 @@ private System.Windows.Forms.ToolStripMenuItem dismissAllToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem dismissSelectedToolStripMenuItem; private System.Windows.Forms.ToolStripButton toolStripButtonRestoreDismissed; - private Controls.FlickerFreePanel flickerFreePanel1; private System.Windows.Forms.Label AutoCheckForUpdatesDisabledLabel; private System.Windows.Forms.PictureBox pictureBox1; private System.Windows.Forms.DataGridViewImageColumn ColumnExpand; @@ -407,5 +407,6 @@ private System.Windows.Forms.LinkLabel checkForUpdatesNowButton2; private System.Windows.Forms.TableLayoutPanel tableLayoutPanel3; private System.Windows.Forms.Button checkForUpdatesNowButton; + private System.Windows.Forms.TableLayoutPanel tableLayoutPanel4; } } \ No newline at end of file diff --git a/XenAdmin/TabPages/ManageUpdatesPage.cs b/XenAdmin/TabPages/ManageUpdatesPage.cs index e48171e7f..6c5f0c876 100644 --- a/XenAdmin/TabPages/ManageUpdatesPage.cs +++ b/XenAdmin/TabPages/ManageUpdatesPage.cs @@ -101,8 +101,10 @@ namespace XenAdmin.TabPages return; toolStripButtonRefresh.Enabled = false; + toolStripButtonRestoreDismissed.Enabled = false; StoreSelectedUpdates(); dataGridViewUpdates.Rows.Clear(); + dataGridViewUpdates.Refresh(); spinningTimer.Start(); tableLayoutPanel3.Visible = true; labelProgress.Text = Messages.AVAILABLE_UPDATES_SEARCHING; @@ -115,6 +117,7 @@ namespace XenAdmin.TabPages { checksQueue--; toolStripButtonRefresh.Enabled = true; + toolStripButtonRestoreDismissed.Enabled = true; spinningTimer.Stop(); if (succeeded) @@ -220,6 +223,7 @@ namespace XenAdmin.TabPages { labelProgress.Text = Messages.DISABLED_UPDATE_AUTOMATIC_CHECK_WARNING; checkForUpdatesNowButton.Visible = true; + MakeWarningInvisible(); } else { diff --git a/XenAdmin/TabPages/ManageUpdatesPage.resx b/XenAdmin/TabPages/ManageUpdatesPage.resx index a588847f1..bbaa5d4e3 100644 --- a/XenAdmin/TabPages/ManageUpdatesPage.resx +++ b/XenAdmin/TabPages/ManageUpdatesPage.resx @@ -214,7 +214,7 @@ $this - 3 + 2 <?xml version="1.0" encoding="utf-16"?><TableLayoutSettings><Controls><Control Name="informationLabelIcon" Row="0" RowSpan="1" Column="0" ColumnSpan="1" /><Control Name="informationLabel" Row="0" RowSpan="1" Column="1" ColumnSpan="1" /></Controls><Columns Styles="AutoSize,0,Percent,100" /><Rows Styles="Percent,100,Absolute,37" /></TableLayoutSettings> @@ -600,84 +600,6 @@ 1 - - None - - - Segoe UI, 9pt - - - NoControl - - - 211, 3 - - - 43, 30 - - - AutoSize - - - 2 - - - pictureBoxProgress - - - System.Windows.Forms.PictureBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tableLayoutPanel3 - - - 0 - - - Left, Right - - - True - - - Segoe UI, 9.5pt, style=Bold - - - MiddleLeft - - - NoControl - - - 3, 36 - - - 170, 0 - - - 459, 17 - - - 3 - - - Searching for updates... - - - MiddleCenter - - - labelProgress - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tableLayoutPanel3 - - - 1 - Top @@ -691,10 +613,10 @@ NoControl - 161, 56 + 219, 45 - 142, 25 + 142, 24 3 @@ -715,16 +637,130 @@ tableLayoutPanel3 + 0 + + + None + + + True + + 2 - - 157, 147 + + Left, Right - + + True + + + Segoe UI, 9.5pt, style=Bold + + + MiddleLeft + + + NoControl + + + 49, 9 + + + 170, 0 + + + 170, 17 + + 3 + + Searching for updates... + + + MiddleLeft + + + labelProgress + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tableLayoutPanel4 + + + 0 + + + Right + + + Segoe UI, 9pt + + + NoControl + + + 3, 3 + + + 40, 30 + + + AutoSize + + + 2 + + + pictureBoxProgress + + + System.Windows.Forms.PictureBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tableLayoutPanel4 + + + 1 + + + 179, 3 + + + 1 + + + 222, 36 + + + 15 + + + tableLayoutPanel4 + + + System.Windows.Forms.TableLayoutPanel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tableLayoutPanel3 + + + 1 + + + <?xml version="1.0" encoding="utf-16"?><TableLayoutSettings><Controls><Control Name="labelProgress" Row="0" RowSpan="1" Column="1" ColumnSpan="1" /><Control Name="pictureBoxProgress" Row="0" RowSpan="1" Column="0" ColumnSpan="1" /></Controls><Columns Styles="Percent,100,AutoSize,0" /><Rows Styles="AutoSize,0" /></TableLayoutSettings> + + + 102, 156 + + + 2 + - 465, 90 + 580, 72 14 @@ -742,40 +778,7 @@ 0 - <?xml version="1.0" encoding="utf-16"?><TableLayoutSettings><Controls><Control Name="pictureBoxProgress" Row="0" RowSpan="1" Column="0" ColumnSpan="1" /><Control Name="labelProgress" Row="1" RowSpan="1" Column="0" ColumnSpan="1" /><Control Name="checkForUpdatesNowButton" Row="2" RowSpan="1" Column="0" ColumnSpan="1" /></Controls><Columns Styles="Percent,100" /><Rows Styles="AutoSize,0,AutoSize,0,Absolute,20" /></TableLayoutSettings> - - - True - - - GrowAndShrink - - - Segoe UI, 9pt - - - NoControl - - - 775, 272 - - - 0, 0 - - - 13 - - - flickerFreePanel1 - - - XenAdmin.Controls.FlickerFreePanel, XenCenterMain, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null - - - $this - - - 2 + <?xml version="1.0" encoding="utf-16"?><TableLayoutSettings><Controls><Control Name="checkForUpdatesNowButton" Row="1" RowSpan="1" Column="0" ColumnSpan="1" /><Control Name="tableLayoutPanel4" Row="0" RowSpan="1" Column="0" ColumnSpan="1" /></Controls><Columns Styles="Percent,100" /><Rows Styles="AutoSize,0,Absolute,17" /></TableLayoutSettings> Top, Bottom, Left, Right @@ -873,7 +876,7 @@ $this - 4 + 3 True