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 commit 'e5ab6fe06d581e5f00c0b94e3f3023cc049e7c6f' into CP-18013

Browse Source
This commit is contained in:
Callum McIntyre 2016-08-12 17:12:39 +01:00
commit 177ae6acee
4 changed files with 65 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
XenAdmin/Wizards/NewVMWizard/Page_Networking.resx
View File

@ -184,7 +184,7 @@
<value>75, 23</value> <value>75, 23</value>
</data> </data>
<data name="PropertiesButton.TabIndex" type="System.Int32, mscorlib"> <data name="PropertiesButton.TabIndex" type="System.Int32, mscorlib">
<value>5</value> <value>4</value>
</data> </data>
<data name="PropertiesButton.Text" xml:space="preserve"> <data name="PropertiesButton.Text" xml:space="preserve">
<value>&amp;Edit...</value> <value>&amp;Edit...</value>
@ -211,7 +211,7 @@
<value>75, 23</value> <value>75, 23</value>
</data> </data>
<data name="DeleteButton.TabIndex" type="System.Int32, mscorlib"> <data name="DeleteButton.TabIndex" type="System.Int32, mscorlib">
<value>4</value> <value>5</value>
</data> </data>
<data name="DeleteButton.Text" xml:space="preserve"> <data name="DeleteButton.Text" xml:space="preserve">
<value>&amp;Delete</value> <value>&amp;Delete</value>

84
XenAdmin/Wizards/NewVMWizard/Page_Storage.Designer.cs generated
View File

@ -32,17 +32,17 @@ namespace XenAdmin.Wizards.NewVMWizard
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle(); System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle();
this.CloneCheckBox = new System.Windows.Forms.CheckBox(); this.CloneCheckBox = new System.Windows.Forms.CheckBox();
this.DisksGridView = new XenAdmin.Controls.DataGridViewEx.DataGridViewEx(); this.DisksGridView = new XenAdmin.Controls.DataGridViewEx.DataGridViewEx();
this.ImageColumn = new System.Windows.Forms.DataGridViewImageColumn();
this.NameColumn = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.SrColumn = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.SizeColumn = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.SharedColumn = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.DeleteButton = new System.Windows.Forms.Button(); this.DeleteButton = new System.Windows.Forms.Button();
this.PropertiesButton = new System.Windows.Forms.Button(); this.PropertiesButton = new System.Windows.Forms.Button();
this.AddButton = new System.Windows.Forms.Button(); this.AddButton = new System.Windows.Forms.Button();
this.DisklessVMRadioButton = new System.Windows.Forms.RadioButton(); this.DisklessVMRadioButton = new System.Windows.Forms.RadioButton();
this.DisksRadioButton = new System.Windows.Forms.RadioButton(); this.DisksRadioButton = new System.Windows.Forms.RadioButton();
this.label1 = new System.Windows.Forms.Label(); this.label1 = new System.Windows.Forms.Label();
this.ImageColumn = new System.Windows.Forms.DataGridViewImageColumn();
this.NameColumn = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.SrColumn = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.SizeColumn = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.SharedColumn = new System.Windows.Forms.DataGridViewTextBoxColumn();
((System.ComponentModel.ISupportInitialize)(this.DisksGridView)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.DisksGridView)).BeginInit();
this.SuspendLayout(); this.SuspendLayout();
// //
@ -75,6 +75,43 @@ namespace XenAdmin.Wizards.NewVMWizard
this.DisksGridView.Name = "DisksGridView"; this.DisksGridView.Name = "DisksGridView";
this.DisksGridView.SelectionChanged += new System.EventHandler(this.DisksGridView_SelectionChanged); this.DisksGridView.SelectionChanged += new System.EventHandler(this.DisksGridView_SelectionChanged);
// //
// ImageColumn
//
this.ImageColumn.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.AllCells;
resources.ApplyResources(this.ImageColumn, "ImageColumn");
this.ImageColumn.Name = "ImageColumn";
this.ImageColumn.ReadOnly = true;
//
// NameColumn
//
this.NameColumn.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill;
this.NameColumn.FillWeight = 40F;
resources.ApplyResources(this.NameColumn, "NameColumn");
this.NameColumn.Name = "NameColumn";
this.NameColumn.ReadOnly = true;
//
// SrColumn
//
this.SrColumn.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill;
this.SrColumn.FillWeight = 60F;
resources.ApplyResources(this.SrColumn, "SrColumn");
this.SrColumn.Name = "SrColumn";
this.SrColumn.ReadOnly = true;
//
// SizeColumn
//
this.SizeColumn.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.AllCells;
resources.ApplyResources(this.SizeColumn, "SizeColumn");
this.SizeColumn.Name = "SizeColumn";
this.SizeColumn.ReadOnly = true;
//
// SharedColumn
//
this.SharedColumn.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.AllCells;
resources.ApplyResources(this.SharedColumn, "SharedColumn");
this.SharedColumn.Name = "SharedColumn";
this.SharedColumn.ReadOnly = true;
//
// DeleteButton // DeleteButton
// //
resources.ApplyResources(this.DeleteButton, "DeleteButton"); resources.ApplyResources(this.DeleteButton, "DeleteButton");
@ -117,43 +154,6 @@ namespace XenAdmin.Wizards.NewVMWizard
resources.ApplyResources(this.label1, "label1"); resources.ApplyResources(this.label1, "label1");
this.label1.Name = "label1"; this.label1.Name = "label1";
// //
// ImageColumn
//
this.ImageColumn.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.AllCells;
resources.ApplyResources(this.ImageColumn, "ImageColumn");
this.ImageColumn.Name = "ImageColumn";
this.ImageColumn.ReadOnly = true;
//
// NameColumn
//
this.NameColumn.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill;
this.NameColumn.FillWeight = 40F;
resources.ApplyResources(this.NameColumn, "NameColumn");
this.NameColumn.Name = "NameColumn";
this.NameColumn.ReadOnly = true;
//
// SrColumn
//
this.SrColumn.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill;
this.SrColumn.FillWeight = 60F;
resources.ApplyResources(this.SrColumn, "SrColumn");
this.SrColumn.Name = "SrColumn";
this.SrColumn.ReadOnly = true;
//
// SizeColumn
//
this.SizeColumn.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.AllCells;
resources.ApplyResources(this.SizeColumn, "SizeColumn");
this.SizeColumn.Name = "SizeColumn";
this.SizeColumn.ReadOnly = true;
//
// SharedColumn
//
this.SharedColumn.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.AllCells;
resources.ApplyResources(this.SharedColumn, "SharedColumn");
this.SharedColumn.Name = "SharedColumn";
this.SharedColumn.ReadOnly = true;
//
// Page_Storage // Page_Storage
// //
resources.ApplyResources(this, "$this"); resources.ApplyResources(this, "$this");

4
XenAdmin/Wizards/NewVMWizard/Page_Storage.resx
View File

@ -232,7 +232,7 @@
<value>75, 23</value> <value>75, 23</value>
</data> </data>
<data name="DeleteButton.TabIndex" type="System.Int32, mscorlib"> <data name="DeleteButton.TabIndex" type="System.Int32, mscorlib">
<value>4</value> <value>5</value>
</data> </data>
<data name="DeleteButton.Text" xml:space="preserve"> <data name="DeleteButton.Text" xml:space="preserve">
<value>&amp;Delete</value> <value>&amp;Delete</value>
@ -262,7 +262,7 @@
<value>75, 23</value> <value>75, 23</value>
</data> </data>
<data name="PropertiesButton.TabIndex" type="System.Int32, mscorlib"> <data name="PropertiesButton.TabIndex" type="System.Int32, mscorlib">
<value>5</value> <value>4</value>
</data> </data>
<data name="PropertiesButton.Text" xml:space="preserve"> <data name="PropertiesButton.Text" xml:space="preserve">
<value>&amp;Edit...</value> <value>&amp;Edit...</value>

19
XenModel/Utils/Helpers.cs
View File

@ -402,6 +402,25 @@ namespace XenAdmin.Core
HostBuildNumber(host) == CUSTOM_BUILD_NUMBER; HostBuildNumber(host) == CUSTOM_BUILD_NUMBER;
} }
/// <param name="conn">May be null, in which case true is returned.</param>
public static bool ElyOrGreater(IXenConnection conn)
{
return conn == null ? true : ElyOrGreater(Helpers.GetMaster(conn));
}
/// Ely is ver. 2.1.1
/// <param name="host">May be null, in which case true is returned.</param>
public static bool ElyOrGreater(Host host)
{
if (host == null)
return true;
string platform_version = HostPlatformVersion(host);
return
platform_version != null && productVersionCompare(platform_version, "2.1.1") >= 0 ||
HostBuildNumber(host) == CUSTOM_BUILD_NUMBER;
}
/// <summary> /// <summary>
/// Cream (Creedence SP1) has API version 2.4 /// Cream (Creedence SP1) has API version 2.4
/// </summary> /// </summary>