mirror of
https://github.com/xcp-ng/xenadmin.git
synced 2024-11-25 06:16:37 +01:00
Merge pull request #710 from GaborApatiNagy/master_windows_update
CP-14573: UI: Improvements on Upgrade VM UI
This commit is contained in:
Stephen Turner
commit
f36c30362f
@ -4,15 +4,6 @@ namespace XenAdmin.Dialogs
|
||||
{
|
||||
partial class UpgradeVmDialog
|
||||
{
|
||||
/// <summary>
|
||||
/// Required designer variable.
|
||||
/// </summary>
|
||||
private System.ComponentModel.IContainer components = null;
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
#region Windows Form Designer generated code
|
||||
|
||||
/// <summary>
|
||||
@ -23,7 +14,7 @@ namespace XenAdmin.Dialogs
|
||||
{
|
||||
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(UpgradeVmDialog));
|
||||
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle();
|
||||
this.CancelButton = new System.Windows.Forms.Button();
|
||||
this.buttonCancel = new System.Windows.Forms.Button();
|
||||
this.tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel();
|
||||
this.searchTextBox1 = new XenAdmin.Controls.SearchTextBox();
|
||||
this.tableLayoutPanelWarning = new System.Windows.Forms.TableLayoutPanel();
|
||||
@ -44,13 +35,13 @@ namespace XenAdmin.Dialogs
|
||||
((System.ComponentModel.ISupportInitialize)(this.vmsDataGridView)).BeginInit();
|
||||
this.SuspendLayout();
|
||||
//
|
||||
// CancelButton
|
||||
// buttonCancel
|
||||
//
|
||||
resources.ApplyResources(this.CancelButton, "CancelButton");
|
||||
this.CancelButton.DialogResult = System.Windows.Forms.DialogResult.Cancel;
|
||||
this.CancelButton.Name = "CancelButton";
|
||||
this.CancelButton.UseVisualStyleBackColor = true;
|
||||
this.CancelButton.Click += new System.EventHandler(this.buttonCancel_Click);
|
||||
resources.ApplyResources(this.buttonCancel, "buttonCancel");
|
||||
this.buttonCancel.DialogResult = System.Windows.Forms.DialogResult.Cancel;
|
||||
this.buttonCancel.Name = "buttonCancel";
|
||||
this.buttonCancel.UseVisualStyleBackColor = true;
|
||||
this.buttonCancel.Click += new System.EventHandler(this.buttonCancel_Click);
|
||||
//
|
||||
// tableLayoutPanel1
|
||||
//
|
||||
@ -58,7 +49,7 @@ namespace XenAdmin.Dialogs
|
||||
this.tableLayoutPanel1.Controls.Add(this.searchTextBox1, 1, 1);
|
||||
this.tableLayoutPanel1.Controls.Add(this.tableLayoutPanelWarning, 0, 6);
|
||||
this.tableLayoutPanel1.Controls.Add(this.SelectAllButton, 0, 5);
|
||||
this.tableLayoutPanel1.Controls.Add(this.CancelButton, 4, 7);
|
||||
this.tableLayoutPanel1.Controls.Add(this.buttonCancel, 4, 7);
|
||||
this.tableLayoutPanel1.Controls.Add(this.vmsDataGridView, 0, 3);
|
||||
this.tableLayoutPanel1.Controls.Add(this.rubricLabel, 0, 0);
|
||||
this.tableLayoutPanel1.Controls.Add(this.ClearAllButton, 1, 5);
|
||||
@ -195,7 +186,7 @@ namespace XenAdmin.Dialogs
|
||||
|
||||
#endregion
|
||||
|
||||
private System.Windows.Forms.Button CancelButton;
|
||||
private System.Windows.Forms.Button buttonCancel;
|
||||
private System.Windows.Forms.TableLayoutPanel tableLayoutPanel1;
|
||||
private System.Windows.Forms.Label rubricLabel;
|
||||
private System.Windows.Forms.Button SelectAllButton;
|
||||
|
||||
@ -52,8 +52,8 @@ namespace XenAdmin.Dialogs
|
||||
private static readonly log4net.ILog log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType);
|
||||
private readonly SelectedItemCollection selection = null;
|
||||
|
||||
private const bool SELECT_ALL_EFFECTS_NON_VISIBLE = true;
|
||||
private const bool CLEAR_ALL_EFFECTS_NON_VISIBLE = true;
|
||||
//private const bool SELECT_ALL_EFFECTS_NON_VISIBLE = true;
|
||||
//private const bool CLEAR_ALL_EFFECTS_NON_VISIBLE = true;
|
||||
|
||||
private readonly IMainWindow mainWindow = null;
|
||||
private readonly IXenConnection xenConnection = null;
|
||||
@ -440,7 +440,7 @@ namespace XenAdmin.Dialogs
|
||||
var vmRow = row as VmRow;
|
||||
|
||||
if (vmRow != null && !vmRow.ReadOnly)
|
||||
vmRow.Checked = SELECT_ALL_EFFECTS_NON_VISIBLE ? true : vmRow.Visible || vmRow.Checked;
|
||||
vmRow.Checked = true; //SELECT_ALL_EFFECTS_NON_VISIBLE ? true : vmRow.Visible || vmRow.Checked;
|
||||
}
|
||||
}
|
||||
|
||||
@ -451,7 +451,7 @@ namespace XenAdmin.Dialogs
|
||||
var vmRow = row as VmRow;
|
||||
|
||||
if (vmRow != null && !vmRow.ReadOnly)
|
||||
vmRow.Checked = CLEAR_ALL_EFFECTS_NON_VISIBLE ? false : !vmRow.Visible && vmRow.Checked;
|
||||
vmRow.Checked = false; //CLEAR_ALL_EFFECTS_NON_VISIBLE ? false : !vmRow.Visible && vmRow.Checked;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@ -118,39 +118,39 @@
|
||||
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
|
||||
</resheader>
|
||||
<assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
|
||||
<data name="CancelButton.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
|
||||
<data name="buttonCancel.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
|
||||
<value>Bottom, Right</value>
|
||||
</data>
|
||||
<assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
|
||||
<data name="CancelButton.Font" type="System.Drawing.Font, System.Drawing">
|
||||
<data name="buttonCancel.Font" type="System.Drawing.Font, System.Drawing">
|
||||
<value>Segoe UI, 9pt</value>
|
||||
</data>
|
||||
<data name="CancelButton.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
|
||||
<data name="buttonCancel.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
|
||||
<value>NoControl</value>
|
||||
</data>
|
||||
<data name="CancelButton.Location" type="System.Drawing.Point, System.Drawing">
|
||||
<data name="buttonCancel.Location" type="System.Drawing.Point, System.Drawing">
|
||||
<value>496, 500</value>
|
||||
</data>
|
||||
<data name="CancelButton.Size" type="System.Drawing.Size, System.Drawing">
|
||||
<data name="buttonCancel.Size" type="System.Drawing.Size, System.Drawing">
|
||||
<value>75, 23</value>
|
||||
</data>
|
||||
<assembly alias="mscorlib" name="mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
|
||||
<data name="CancelButton.TabIndex" type="System.Int32, mscorlib">
|
||||
<data name="buttonCancel.TabIndex" type="System.Int32, mscorlib">
|
||||
<value>2</value>
|
||||
</data>
|
||||
<data name="CancelButton.Text" xml:space="preserve">
|
||||
<data name="buttonCancel.Text" xml:space="preserve">
|
||||
<value>&Close</value>
|
||||
</data>
|
||||
<data name=">>CancelButton.Name" xml:space="preserve">
|
||||
<value>CancelButton</value>
|
||||
<data name=">>buttonCancel.Name" xml:space="preserve">
|
||||
<value>buttonCancel</value>
|
||||
</data>
|
||||
<data name=">>CancelButton.Type" xml:space="preserve">
|
||||
<data name=">>buttonCancel.Type" xml:space="preserve">
|
||||
<value>System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
|
||||
</data>
|
||||
<data name=">>CancelButton.Parent" xml:space="preserve">
|
||||
<data name=">>buttonCancel.Parent" xml:space="preserve">
|
||||
<value>tableLayoutPanel1</value>
|
||||
</data>
|
||||
<data name=">>CancelButton.ZOrder" xml:space="preserve">
|
||||
<data name=">>buttonCancel.ZOrder" xml:space="preserve">
|
||||
<value>3</value>
|
||||
</data>
|
||||
<data name="tableLayoutPanel1.ColumnCount" type="System.Int32, mscorlib">
|
||||
@ -537,7 +537,7 @@
|
||||
<value>0</value>
|
||||
</data>
|
||||
<data name="tableLayoutPanel1.LayoutSettings" type="System.Windows.Forms.TableLayoutSettings, System.Windows.Forms">
|
||||
<value><?xml version="1.0" encoding="utf-16"?><TableLayoutSettings><Controls><Control Name="searchTextBox1" Row="1" RowSpan="1" Column="1" ColumnSpan="4" /><Control Name="tableLayoutPanelWarning" Row="6" RowSpan="1" Column="0" ColumnSpan="5" /><Control Name="SelectAllButton" Row="5" RowSpan="1" Column="0" ColumnSpan="1" /><Control Name="CancelButton" Row="7" RowSpan="1" Column="4" ColumnSpan="1" /><Control Name="vmsDataGridView" Row="3" RowSpan="1" Column="0" ColumnSpan="5" /><Control Name="rubricLabel" Row="0" RowSpan="1" Column="0" ColumnSpan="4" /><Control Name="ClearAllButton" Row="5" RowSpan="1" Column="1" ColumnSpan="1" /><Control Name="UpgradeButton" Row="7" RowSpan="1" Column="3" ColumnSpan="1" /></Controls><Columns Styles="AutoSize,0,AutoSize,0,Percent,100,AutoSize,0,AutoSize,0" /><Rows Styles="AutoSize,0,AutoSize,0,AutoSize,0,Percent,100,AutoSize,0,AutoSize,0,AutoSize,0,AutoSize,0,AutoSize,0" /></TableLayoutSettings></value>
|
||||
<value><?xml version="1.0" encoding="utf-16"?><TableLayoutSettings><Controls><Control Name="searchTextBox1" Row="1" RowSpan="1" Column="1" ColumnSpan="4" /><Control Name="tableLayoutPanelWarning" Row="6" RowSpan="1" Column="0" ColumnSpan="5" /><Control Name="SelectAllButton" Row="5" RowSpan="1" Column="0" ColumnSpan="1" /><Control Name="buttonCancel" Row="7" RowSpan="1" Column="4" ColumnSpan="1" /><Control Name="vmsDataGridView" Row="3" RowSpan="1" Column="0" ColumnSpan="5" /><Control Name="rubricLabel" Row="0" RowSpan="1" Column="0" ColumnSpan="4" /><Control Name="ClearAllButton" Row="5" RowSpan="1" Column="1" ColumnSpan="1" /><Control Name="UpgradeButton" Row="7" RowSpan="1" Column="3" ColumnSpan="1" /></Controls><Columns Styles="AutoSize,0,AutoSize,0,Percent,100,AutoSize,0,AutoSize,0" /><Rows Styles="AutoSize,0,AutoSize,0,AutoSize,0,Percent,100,AutoSize,0,AutoSize,0,AutoSize,0,AutoSize,0,AutoSize,0" /></TableLayoutSettings></value>
|
||||
</data>
|
||||
<metadata name="$this.Localizable" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
|
||||
<value>True</value>
|
||||
|
||||
Loading…
Reference in New Issue
Block a user