Kiu/xenadmin
1
0
Fork 0
mirror of https://github.com/xcp-ng/xenadmin.git synced 2025-01-20 07:19:18 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #610 from agimofcarmen/master

Browse Source 
Changes Tab Indexing and disables refresh and restore button while ch…
This commit is contained in:
Gabor Apati-Nagy 2015-08-10 11:31:23 +01:00
commit 0595281a55
3 changed files with 23 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
XenAdmin/TabPages/ManageUpdatesPage.Designer.cs generated
View File

@ -195,6 +195,7 @@
this.toolStripSplitButtonDismiss,
this.toolStripButtonRestoreDismissed});
this.toolStrip1.Name = "toolStrip1";
this.toolStrip1.TabStop = true;
//
// toolStripDropDownButtonServerFilter
//
@ -306,7 +307,7 @@
resources.ApplyResources(this.ColumnExpand, "ColumnExpand");
this.ColumnExpand.Name = "ColumnExpand";
this.ColumnExpand.ReadOnly = true;
this.ColumnExpand.Resizable = System.Windows.Forms.DataGridViewTriState.False;
this.ColumnExpand.Resizable = System.Windows.Forms.DataGridViewTriState.True;
//
// ColumnMessage
//
@ -343,7 +344,7 @@
resources.ApplyResources(this.ColumnWebPage, "ColumnWebPage");
this.ColumnWebPage.Name = "ColumnWebPage";
this.ColumnWebPage.ReadOnly = true;
this.ColumnWebPage.Resizable = System.Windows.Forms.DataGridViewTriState.False;
this.ColumnWebPage.Resizable = System.Windows.Forms.DataGridViewTriState.True;
this.ColumnWebPage.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
//
// ManageUpdatesPage
@ -400,14 +401,14 @@
private System.Windows.Forms.ToolStripButton toolStripButtonRestoreDismissed;
private System.Windows.Forms.Label AutoCheckForUpdatesDisabledLabel;
private System.Windows.Forms.PictureBox pictureBox1;
private System.Windows.Forms.LinkLabel checkForUpdatesNowButton2;
private System.Windows.Forms.TableLayoutPanel tableLayoutPanel3;
private System.Windows.Forms.Button checkForUpdatesNowButton;
private System.Windows.Forms.TableLayoutPanel tableLayoutPanel4;
private System.Windows.Forms.DataGridViewImageColumn ColumnExpand;
private System.Windows.Forms.DataGridViewTextBoxColumn ColumnMessage;
private System.Windows.Forms.DataGridViewTextBoxColumn ColumnLocation;
private System.Windows.Forms.DataGridViewTextBoxColumn ColumnDate;
private System.Windows.Forms.DataGridViewTextBoxColumn ColumnWebPage;
private System.Windows.Forms.LinkLabel checkForUpdatesNowButton2;
private System.Windows.Forms.TableLayoutPanel tableLayoutPanel3;
private System.Windows.Forms.Button checkForUpdatesNowButton;
private System.Windows.Forms.TableLayoutPanel tableLayoutPanel4;
}
}

6
XenAdmin/TabPages/ManageUpdatesPage.resx
View File

@ -175,7 +175,7 @@
<value>98, 15</value>
</data>
<data name="informationLabel.TabIndex" type="System.Int32, mscorlib">
<value>4</value>
<value>5</value>
</data>
<data name="informationLabel.Text" xml:space="preserve">
<value>informationLabel</value>
@ -493,7 +493,7 @@
<value>132, 15</value>
</data>
<data name="checkForUpdatesNowButton2.TabIndex" type="System.Int32, mscorlib">
<value>4</value>
<value>1</value>
</data>
<data name="checkForUpdatesNowButton2.Text" xml:space="preserve">
<value>&amp;Check for Updates Now</value>
@ -870,7 +870,7 @@
<value>773, 357</value>
</data>
<data name="dataGridViewUpdates.TabIndex" type="System.Int32, mscorlib">
<value>2</value>
<value>4</value>
</data>
<data name="&gt;&gt;dataGridViewUpdates.Name" xml:space="preserve">
<value>dataGridViewUpdates</value>

14
XenAdmin/Wizards/PatchingWizard/PatchingWizard_SelectPatchPage.cs
View File

@ -61,6 +61,17 @@ namespace XenAdmin.Wizards.PatchingWizard
dataGridViewPatches.Sort(ColumnDate, ListSortDirection.Descending);
}
private void CheckForUpdates_CheckForUpdatesStarted()
{
Program.Invoke(Program.MainWindow, () =>
{
RestoreDismUpdatesButton.Enabled = false;
RefreshListButton.Enabled = false;
});
}
private void CheckForUpdates_CheckForUpdatesCompleted(bool succeeded, string errorMessage)
{
Program.Invoke(Program.MainWindow, delegate
@ -69,6 +80,7 @@ namespace XenAdmin.Wizards.PatchingWizard
RefreshListButton.Enabled = true;
CheckForUpdatesInProgress = false;
OnPageUpdated();
RestoreDismUpdatesButton.Enabled = true;
});
}
@ -109,6 +121,7 @@ namespace XenAdmin.Wizards.PatchingWizard
{
base.PageLoaded(direction);
RefreshListButton.Enabled = true;
Updates.CheckForUpdatesStarted += CheckForUpdates_CheckForUpdatesStarted;
Updates.CheckForUpdatesCompleted += CheckForUpdates_CheckForUpdatesCompleted;
if (direction == PageLoadedDirection.Forward)
@ -362,7 +375,6 @@ namespace XenAdmin.Wizards.PatchingWizard
private void RefreshListButton_Click(object sender, EventArgs e)
{
CheckForUpdatesInProgress = true;
RefreshListButton.Enabled = false;
Updates.CheckForUpdates(true);
PopulatePatchesBox();
}