General TabPage layout modifications (includes CA-164372). (#2439)

- CA-164372: Added line breaks in the pool updates list for readability and to match the corresponding host list.
- Moved the updates, version and licence sections closer together.
- Removed unnecessary panels and placed top buttons on a TableLayoutPanel.
- Moved size hardcoded values from the code to the resource files.

Signed-off-by: Konstantina Chremmou <konstantina.chremmou@citrix.com>
This commit is contained in:
Konstantina Chremmou 2019-05-21 11:58:26 +01:00 committed by Mihaela Stoica
parent aaa573dd21
commit 8b1e799c7b
6 changed files with 540 additions and 556 deletions

View File

@ -78,9 +78,9 @@ namespace XenAdmin.Controls
this.chevron.Image = global::XenAdmin.Properties.Resources.PDChevronUp;
this.chevron.Name = "chevron";
this.chevron.TabStop = false;
this.chevron.MouseLeave += new System.EventHandler(this.chevron_MouseLeave);
this.chevron.Click += new System.EventHandler(this.chevron_Click);
this.chevron.MouseEnter += new System.EventHandler(this.chevron_MouseEnter);
this.chevron.MouseLeave += new System.EventHandler(this.chevron_MouseLeave);
//
// contextMenuStrip1
//
@ -97,7 +97,6 @@ namespace XenAdmin.Controls
//
// dataGridViewEx1
//
resources.ApplyResources(this.dataGridViewEx1, "dataGridViewEx1");
this.dataGridViewEx1.AutoSizeRowsMode = System.Windows.Forms.DataGridViewAutoSizeRowsMode.AllCells;
this.dataGridViewEx1.BackgroundColor = System.Drawing.SystemColors.Window;
this.dataGridViewEx1.BorderStyle = System.Windows.Forms.BorderStyle.None;
@ -115,6 +114,7 @@ namespace XenAdmin.Controls
dataGridViewCellStyle3.SelectionForeColor = System.Drawing.SystemColors.ControlText;
dataGridViewCellStyle3.WrapMode = System.Windows.Forms.DataGridViewTriState.False;
this.dataGridViewEx1.DefaultCellStyle = dataGridViewCellStyle3;
resources.ApplyResources(this.dataGridViewEx1, "dataGridViewEx1");
this.dataGridViewEx1.GridColor = System.Drawing.SystemColors.Control;
this.dataGridViewEx1.HideSelection = true;
this.dataGridViewEx1.Name = "dataGridViewEx1";
@ -122,14 +122,14 @@ namespace XenAdmin.Controls
dataGridViewCellStyle4.Padding = new System.Windows.Forms.Padding(5);
this.dataGridViewEx1.RowsDefaultCellStyle = dataGridViewCellStyle4;
this.dataGridViewEx1.ShowCellToolTips = false;
this.dataGridViewEx1.MouseClick += new System.Windows.Forms.MouseEventHandler(this.dataGridViewEx1_MouseClick);
this.dataGridViewEx1.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.dataGridViewEx1_KeyPress);
this.dataGridViewEx1.SelectionChanged += new System.EventHandler(this.dataGridViewEx1_SelectionChanged);
this.dataGridViewEx1.CellContentClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dataGridViewEx1_CellContentClick);
this.dataGridViewEx1.SelectionChanged += new System.EventHandler(this.dataGridViewEx1_SelectionChanged);
this.dataGridViewEx1.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.dataGridViewEx1_KeyPress);
this.dataGridViewEx1.MouseClick += new System.Windows.Forms.MouseEventHandler(this.dataGridViewEx1_MouseClick);
//
// KeyColumn
//
this.KeyColumn.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.AllCells;
this.KeyColumn.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.None;
dataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.TopLeft;
dataGridViewCellStyle1.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
this.KeyColumn.DefaultCellStyle = dataGridViewCellStyle1;
@ -157,8 +157,8 @@ namespace XenAdmin.Controls
this.Controls.Add(this.dataGridViewEx1);
this.Controls.Add(this.panel1);
this.DoubleBuffered = true;
this.Name = "PDSection";
resources.ApplyResources(this, "$this");
this.Name = "PDSection";
this.panel1.ResumeLayout(false);
this.panel1.PerformLayout();
((System.ComponentModel.ISupportInitialize)(this.chevron)).EndInit();
@ -176,8 +176,8 @@ namespace XenAdmin.Controls
private System.Windows.Forms.PictureBox chevron;
private System.Windows.Forms.ContextMenuStrip contextMenuStrip1;
private System.Windows.Forms.GroupBox groupBox1;
private System.Windows.Forms.ToolStripMenuItem copyToolStripMenuItem;
private System.Windows.Forms.DataGridViewTextBoxColumn KeyColumn;
private System.Windows.Forms.DataGridViewTextBoxColumn ValueColumn;
private System.Windows.Forms.ToolStripMenuItem copyToolStripMenuItem;
}
}

View File

@ -492,7 +492,6 @@ namespace XenAdmin.Controls
internal void fixFirstColumnWidth(int width)
{
dataGridViewEx1.Columns[0].AutoSizeMode = DataGridViewAutoSizeColumnMode.None;
dataGridViewEx1.Columns[0].Width = width;
}

View File

@ -112,20 +112,20 @@
<value>2.0</value>
</resheader>
<resheader name="reader">
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<assembly alias="mscorlib" name="mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<assembly alias="mscorlib" name="mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<data name="label1.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
</data>
<assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<data name="label1.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
<value>Left</value>
</data>
<assembly alias="System.Drawing" name="System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<data name="label1.Font" type="System.Drawing.Font, System.Drawing">
<value>Microsoft Sans Serif, 12pt</value>
</data>
@ -148,7 +148,7 @@
<value>label1</value>
</data>
<data name="&gt;&gt;label1.Type" xml:space="preserve">
<value>System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
<value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;label1.Parent" xml:space="preserve">
<value>panel1</value>
@ -166,13 +166,13 @@
<value>2, 24</value>
</data>
<data name="groupBox1.TabIndex" type="System.Int32, mscorlib">
<value>2</value>
<value>1</value>
</data>
<data name="&gt;&gt;groupBox1.Name" xml:space="preserve">
<value>groupBox1</value>
</data>
<data name="&gt;&gt;groupBox1.Type" xml:space="preserve">
<value>System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
<value>System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;groupBox1.Parent" xml:space="preserve">
<value>panel1</value>
@ -202,7 +202,7 @@
<value>chevron</value>
</data>
<data name="&gt;&gt;chevron.Type" xml:space="preserve">
<value>System.Windows.Forms.PictureBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
<value>System.Windows.Forms.PictureBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;chevron.Parent" xml:space="preserve">
<value>panel1</value>
@ -223,13 +223,13 @@
<value>798, 32</value>
</data>
<data name="panel1.TabIndex" type="System.Int32, mscorlib">
<value>1</value>
<value>0</value>
</data>
<data name="&gt;&gt;panel1.Name" xml:space="preserve">
<value>panel1</value>
</data>
<data name="&gt;&gt;panel1.Type" xml:space="preserve">
<value>System.Windows.Forms.Panel, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
<value>System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;panel1.Parent" xml:space="preserve">
<value>$this</value>
@ -237,7 +237,7 @@
<data name="&gt;&gt;panel1.ZOrder" xml:space="preserve">
<value>2</value>
</data>
<metadata name="contextMenuStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<metadata name="contextMenuStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>17, 17</value>
</metadata>
<data name="copyToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
@ -253,25 +253,28 @@
<value>contextMenuStrip1</value>
</data>
<data name="&gt;&gt;contextMenuStrip1.Type" xml:space="preserve">
<value>System.Windows.Forms.ContextMenuStrip, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
<value>System.Windows.Forms.ContextMenuStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="dataGridViewEx1.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
<value>Top, Bottom, Left, Right</value>
</data>
<metadata name="KeyColumn.UserAddedColumn" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<metadata name="KeyColumn.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<data name="KeyColumn.HeaderText" xml:space="preserve">
<value>Column1</value>
<value>Key</value>
</data>
<data name="KeyColumn.MinimumWidth" type="System.Int32, mscorlib">
<value>150</value>
</data>
<data name="KeyColumn.Width" type="System.Int32, mscorlib">
<value>5</value>
<value>150</value>
</data>
<metadata name="ValueColumn.UserAddedColumn" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<metadata name="ValueColumn.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<data name="ValueColumn.HeaderText" xml:space="preserve">
<value>Column1</value>
<value>Value</value>
</data>
<data name="dataGridViewEx1.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
<value>Fill</value>
</data>
<data name="dataGridViewEx1.Location" type="System.Drawing.Point, System.Drawing">
<value>1, 33</value>
@ -283,7 +286,7 @@
<value>798, 116</value>
</data>
<data name="dataGridViewEx1.TabIndex" type="System.Int32, mscorlib">
<value>2</value>
<value>1</value>
</data>
<data name="&gt;&gt;dataGridViewEx1.Name" xml:space="preserve">
<value>dataGridViewEx1</value>
@ -297,9 +300,12 @@
<data name="&gt;&gt;dataGridViewEx1.ZOrder" xml:space="preserve">
<value>1</value>
</data>
<metadata name="$this.Localizable" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<metadata name="$this.Localizable" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<data name="$this.MaximumSize" type="System.Drawing.Size, System.Drawing">
<value>900, 9999999</value>
</data>
<data name="$this.Padding" type="System.Windows.Forms.Padding, System.Windows.Forms">
<value>1, 1, 1, 1</value>
</data>
@ -310,24 +316,24 @@
<value>copyToolStripMenuItem</value>
</data>
<data name="&gt;&gt;copyToolStripMenuItem.Type" xml:space="preserve">
<value>System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
<value>System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;KeyColumn.Name" xml:space="preserve">
<value>KeyColumn</value>
</data>
<data name="&gt;&gt;KeyColumn.Type" xml:space="preserve">
<value>System.Windows.Forms.DataGridViewTextBoxColumn, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
<value>System.Windows.Forms.DataGridViewTextBoxColumn, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;ValueColumn.Name" xml:space="preserve">
<value>ValueColumn</value>
</data>
<data name="&gt;&gt;ValueColumn.Type" xml:space="preserve">
<value>System.Windows.Forms.DataGridViewTextBoxColumn, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
<value>System.Windows.Forms.DataGridViewTextBoxColumn, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;$this.Name" xml:space="preserve">
<value>PDSection</value>
</data>
<data name="&gt;&gt;$this.Type" xml:space="preserve">
<value>System.Windows.Forms.UserControl, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
<value>System.Windows.Forms.UserControl, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
</root>

View File

@ -33,9 +33,6 @@ namespace XenAdmin.TabPages
{
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(GeneralTabPage));
this.buttonProperties = new System.Windows.Forms.Button();
this.panel1 = new System.Windows.Forms.Panel();
this.panel3 = new System.Windows.Forms.Panel();
this.buttonPanel = new System.Windows.Forms.FlowLayoutPanel();
this.buttonViewConsole = new System.Windows.Forms.Button();
this.buttonViewLog = new System.Windows.Forms.Button();
this.linkLabelExpand = new System.Windows.Forms.LinkLabel();
@ -53,8 +50,6 @@ namespace XenAdmin.TabPages
this.pdSectionMultipathBoot = new XenAdmin.Controls.PDSection();
this.panelStorageLink = new System.Windows.Forms.Panel();
this.pdStorageLink = new XenAdmin.Controls.PDSection();
this.panelUpdates = new System.Windows.Forms.Panel();
this.pdSectionUpdates = new XenAdmin.Controls.PDSection();
this.panelMemoryAndVCPUs = new System.Windows.Forms.Panel();
this.pdSectionVCPUs = new XenAdmin.Controls.PDSection();
this.panelMultipathing = new System.Windows.Forms.Panel();
@ -67,22 +62,22 @@ namespace XenAdmin.TabPages
this.pdSectionBootOptions = new XenAdmin.Controls.PDSection();
this.panelCPU = new System.Windows.Forms.Panel();
this.pdSectionCPU = new XenAdmin.Controls.PDSection();
this.panelLicense = new System.Windows.Forms.Panel();
this.pdSectionLicense = new XenAdmin.Controls.PDSection();
this.panelVersion = new System.Windows.Forms.Panel();
this.pdSectionVersion = new XenAdmin.Controls.PDSection();
this.panelMemory = new System.Windows.Forms.Panel();
this.pdSectionMemory = new XenAdmin.Controls.PDSection();
this.panelManagementInterfaces = new System.Windows.Forms.Panel();
this.pdSectionManagementInterfaces = new XenAdmin.Controls.PDSection();
this.panelUpdates = new System.Windows.Forms.Panel();
this.pdSectionUpdates = new XenAdmin.Controls.PDSection();
this.panelVersion = new System.Windows.Forms.Panel();
this.pdSectionVersion = new XenAdmin.Controls.PDSection();
this.panelLicense = new System.Windows.Forms.Panel();
this.pdSectionLicense = new XenAdmin.Controls.PDSection();
this.panelCustomFields = new System.Windows.Forms.Panel();
this.pdSectionCustomFields = new XenAdmin.Controls.PDSection();
this.panelGeneral = new System.Windows.Forms.Panel();
this.pdSectionGeneral = new XenAdmin.Controls.PDSection();
this.tableLayoutPanelButtons = new System.Windows.Forms.TableLayoutPanel();
this.pageContainerPanel.SuspendLayout();
this.panel1.SuspendLayout();
this.panel3.SuspendLayout();
this.buttonPanel.SuspendLayout();
this.panel2.SuspendLayout();
this.panelReadCaching.SuspendLayout();
this.panelDockerInfo.SuspendLayout();
@ -90,25 +85,26 @@ namespace XenAdmin.TabPages
this.panelStorageLinkSystemCapabilities.SuspendLayout();
this.panelMultipathBoot.SuspendLayout();
this.panelStorageLink.SuspendLayout();
this.panelUpdates.SuspendLayout();
this.panelMemoryAndVCPUs.SuspendLayout();
this.panelMultipathing.SuspendLayout();
this.panelStatus.SuspendLayout();
this.panelHighAvailability.SuspendLayout();
this.panelBootOptions.SuspendLayout();
this.panelCPU.SuspendLayout();
this.panelLicense.SuspendLayout();
this.panelVersion.SuspendLayout();
this.panelMemory.SuspendLayout();
this.panelManagementInterfaces.SuspendLayout();
this.panelUpdates.SuspendLayout();
this.panelVersion.SuspendLayout();
this.panelLicense.SuspendLayout();
this.panelCustomFields.SuspendLayout();
this.panelGeneral.SuspendLayout();
this.tableLayoutPanelButtons.SuspendLayout();
this.SuspendLayout();
//
// pageContainerPanel
//
this.pageContainerPanel.Controls.Add(this.panel2);
this.pageContainerPanel.Controls.Add(this.panel1);
this.pageContainerPanel.Controls.Add(this.tableLayoutPanelButtons);
resources.ApplyResources(this.pageContainerPanel, "pageContainerPanel");
//
// buttonProperties
@ -118,28 +114,6 @@ namespace XenAdmin.TabPages
this.buttonProperties.UseVisualStyleBackColor = true;
this.buttonProperties.Click += new System.EventHandler(this.EditButton_Click);
//
// panel1
//
this.panel1.Controls.Add(this.panel3);
resources.ApplyResources(this.panel1, "panel1");
this.panel1.Name = "panel1";
//
// panel3
//
this.panel3.Controls.Add(this.buttonPanel);
this.panel3.Controls.Add(this.linkLabelExpand);
this.panel3.Controls.Add(this.linkLabelCollapse);
resources.ApplyResources(this.panel3, "panel3");
this.panel3.Name = "panel3";
//
// buttonPanel
//
this.buttonPanel.Controls.Add(this.buttonProperties);
this.buttonPanel.Controls.Add(this.buttonViewConsole);
this.buttonPanel.Controls.Add(this.buttonViewLog);
resources.ApplyResources(this.buttonPanel, "buttonPanel");
this.buttonPanel.Name = "buttonPanel";
//
// buttonViewConsole
//
resources.ApplyResources(this.buttonViewConsole, "buttonViewConsole");
@ -177,17 +151,17 @@ namespace XenAdmin.TabPages
this.panel2.Controls.Add(this.panelStorageLinkSystemCapabilities);
this.panel2.Controls.Add(this.panelMultipathBoot);
this.panel2.Controls.Add(this.panelStorageLink);
this.panel2.Controls.Add(this.panelUpdates);
this.panel2.Controls.Add(this.panelMemoryAndVCPUs);
this.panel2.Controls.Add(this.panelMultipathing);
this.panel2.Controls.Add(this.panelStatus);
this.panel2.Controls.Add(this.panelHighAvailability);
this.panel2.Controls.Add(this.panelBootOptions);
this.panel2.Controls.Add(this.panelCPU);
this.panel2.Controls.Add(this.panelLicense);
this.panel2.Controls.Add(this.panelVersion);
this.panel2.Controls.Add(this.panelMemory);
this.panel2.Controls.Add(this.panelManagementInterfaces);
this.panel2.Controls.Add(this.panelUpdates);
this.panel2.Controls.Add(this.panelVersion);
this.panel2.Controls.Add(this.panelLicense);
this.panel2.Controls.Add(this.panelCustomFields);
this.panel2.Controls.Add(this.panelGeneral);
this.panel2.Name = "panel2";
@ -272,20 +246,6 @@ namespace XenAdmin.TabPages
this.pdStorageLink.ShowCellToolTips = false;
this.pdStorageLink.ExpandedChanged += new System.Action<XenAdmin.Controls.PDSection>(this.pdSection_ExpandedChanged);
//
// panelUpdates
//
resources.ApplyResources(this.panelUpdates, "panelUpdates");
this.panelUpdates.Controls.Add(this.pdSectionUpdates);
this.panelUpdates.Name = "panelUpdates";
//
// pdSectionUpdates
//
this.pdSectionUpdates.BackColor = System.Drawing.Color.Gainsboro;
resources.ApplyResources(this.pdSectionUpdates, "pdSectionUpdates");
this.pdSectionUpdates.Name = "pdSectionUpdates";
this.pdSectionUpdates.ShowCellToolTips = false;
this.pdSectionUpdates.ExpandedChanged += new System.Action<XenAdmin.Controls.PDSection>(this.pdSection_ExpandedChanged);
//
// panelMemoryAndVCPUs
//
resources.ApplyResources(this.panelMemoryAndVCPUs, "panelMemoryAndVCPUs");
@ -370,34 +330,6 @@ namespace XenAdmin.TabPages
this.pdSectionCPU.ShowCellToolTips = false;
this.pdSectionCPU.ExpandedChanged += new System.Action<XenAdmin.Controls.PDSection>(this.pdSection_ExpandedChanged);
//
// panelLicense
//
resources.ApplyResources(this.panelLicense, "panelLicense");
this.panelLicense.Controls.Add(this.pdSectionLicense);
this.panelLicense.Name = "panelLicense";
//
// pdSectionLicense
//
this.pdSectionLicense.BackColor = System.Drawing.Color.Gainsboro;
resources.ApplyResources(this.pdSectionLicense, "pdSectionLicense");
this.pdSectionLicense.Name = "pdSectionLicense";
this.pdSectionLicense.ShowCellToolTips = false;
this.pdSectionLicense.ExpandedChanged += new System.Action<XenAdmin.Controls.PDSection>(this.pdSection_ExpandedChanged);
//
// panelVersion
//
resources.ApplyResources(this.panelVersion, "panelVersion");
this.panelVersion.Controls.Add(this.pdSectionVersion);
this.panelVersion.Name = "panelVersion";
//
// pdSectionVersion
//
this.pdSectionVersion.BackColor = System.Drawing.Color.Gainsboro;
resources.ApplyResources(this.pdSectionVersion, "pdSectionVersion");
this.pdSectionVersion.Name = "pdSectionVersion";
this.pdSectionVersion.ShowCellToolTips = false;
this.pdSectionVersion.ExpandedChanged += new System.Action<XenAdmin.Controls.PDSection>(this.pdSection_ExpandedChanged);
//
// panelMemory
//
resources.ApplyResources(this.panelMemory, "panelMemory");
@ -426,6 +358,48 @@ namespace XenAdmin.TabPages
this.pdSectionManagementInterfaces.ShowCellToolTips = false;
this.pdSectionManagementInterfaces.ExpandedChanged += new System.Action<XenAdmin.Controls.PDSection>(this.pdSection_ExpandedChanged);
//
// panelUpdates
//
resources.ApplyResources(this.panelUpdates, "panelUpdates");
this.panelUpdates.Controls.Add(this.pdSectionUpdates);
this.panelUpdates.Name = "panelUpdates";
//
// pdSectionUpdates
//
this.pdSectionUpdates.BackColor = System.Drawing.Color.Gainsboro;
resources.ApplyResources(this.pdSectionUpdates, "pdSectionUpdates");
this.pdSectionUpdates.Name = "pdSectionUpdates";
this.pdSectionUpdates.ShowCellToolTips = false;
this.pdSectionUpdates.ExpandedChanged += new System.Action<XenAdmin.Controls.PDSection>(this.pdSection_ExpandedChanged);
//
// panelVersion
//
resources.ApplyResources(this.panelVersion, "panelVersion");
this.panelVersion.Controls.Add(this.pdSectionVersion);
this.panelVersion.Name = "panelVersion";
//
// pdSectionVersion
//
this.pdSectionVersion.BackColor = System.Drawing.Color.Gainsboro;
resources.ApplyResources(this.pdSectionVersion, "pdSectionVersion");
this.pdSectionVersion.Name = "pdSectionVersion";
this.pdSectionVersion.ShowCellToolTips = false;
this.pdSectionVersion.ExpandedChanged += new System.Action<XenAdmin.Controls.PDSection>(this.pdSection_ExpandedChanged);
//
// panelLicense
//
resources.ApplyResources(this.panelLicense, "panelLicense");
this.panelLicense.Controls.Add(this.pdSectionLicense);
this.panelLicense.Name = "panelLicense";
//
// pdSectionLicense
//
this.pdSectionLicense.BackColor = System.Drawing.Color.Gainsboro;
resources.ApplyResources(this.pdSectionLicense, "pdSectionLicense");
this.pdSectionLicense.Name = "pdSectionLicense";
this.pdSectionLicense.ShowCellToolTips = false;
this.pdSectionLicense.ExpandedChanged += new System.Action<XenAdmin.Controls.PDSection>(this.pdSection_ExpandedChanged);
//
// panelCustomFields
//
resources.ApplyResources(this.panelCustomFields, "panelCustomFields");
@ -454,6 +428,16 @@ namespace XenAdmin.TabPages
this.pdSectionGeneral.ShowCellToolTips = false;
this.pdSectionGeneral.ExpandedChanged += new System.Action<XenAdmin.Controls.PDSection>(this.pdSection_ExpandedChanged);
//
// tableLayoutPanelButtons
//
resources.ApplyResources(this.tableLayoutPanelButtons, "tableLayoutPanelButtons");
this.tableLayoutPanelButtons.Controls.Add(this.buttonViewLog, 2, 0);
this.tableLayoutPanelButtons.Controls.Add(this.buttonViewConsole, 1, 0);
this.tableLayoutPanelButtons.Controls.Add(this.buttonProperties, 0, 0);
this.tableLayoutPanelButtons.Controls.Add(this.linkLabelCollapse, 5, 0);
this.tableLayoutPanelButtons.Controls.Add(this.linkLabelExpand, 4, 0);
this.tableLayoutPanelButtons.Name = "tableLayoutPanelButtons";
//
// GeneralTabPage
//
resources.ApplyResources(this, "$this");
@ -461,10 +445,7 @@ namespace XenAdmin.TabPages
this.DoubleBuffered = true;
this.Name = "GeneralTabPage";
this.pageContainerPanel.ResumeLayout(false);
this.panel1.ResumeLayout(false);
this.panel3.ResumeLayout(false);
this.panel3.PerformLayout();
this.buttonPanel.ResumeLayout(false);
this.pageContainerPanel.PerformLayout();
this.panel2.ResumeLayout(false);
this.panel2.PerformLayout();
this.panelReadCaching.ResumeLayout(false);
@ -473,19 +454,21 @@ namespace XenAdmin.TabPages
this.panelStorageLinkSystemCapabilities.ResumeLayout(false);
this.panelMultipathBoot.ResumeLayout(false);
this.panelStorageLink.ResumeLayout(false);
this.panelUpdates.ResumeLayout(false);
this.panelMemoryAndVCPUs.ResumeLayout(false);
this.panelMultipathing.ResumeLayout(false);
this.panelStatus.ResumeLayout(false);
this.panelHighAvailability.ResumeLayout(false);
this.panelBootOptions.ResumeLayout(false);
this.panelCPU.ResumeLayout(false);
this.panelLicense.ResumeLayout(false);
this.panelVersion.ResumeLayout(false);
this.panelMemory.ResumeLayout(false);
this.panelManagementInterfaces.ResumeLayout(false);
this.panelUpdates.ResumeLayout(false);
this.panelVersion.ResumeLayout(false);
this.panelLicense.ResumeLayout(false);
this.panelCustomFields.ResumeLayout(false);
this.panelGeneral.ResumeLayout(false);
this.tableLayoutPanelButtons.ResumeLayout(false);
this.tableLayoutPanelButtons.PerformLayout();
this.ResumeLayout(false);
this.PerformLayout();
@ -494,7 +477,6 @@ namespace XenAdmin.TabPages
#endregion
private System.Windows.Forms.Button buttonProperties;
private System.Windows.Forms.Panel panel1;
private XenAdmin.Controls.PanelNoFocusScroll panel2;
private System.Windows.Forms.Panel panelGeneral;
private XenAdmin.Controls.PDSection pdSectionGeneral;
@ -524,7 +506,6 @@ namespace XenAdmin.TabPages
private XenAdmin.Controls.PDSection pdSectionUpdates;
private System.Windows.Forms.LinkLabel linkLabelExpand;
private System.Windows.Forms.LinkLabel linkLabelCollapse;
private System.Windows.Forms.Panel panel3;
private System.Windows.Forms.Panel panelStorageLink;
private XenAdmin.Controls.PDSection pdStorageLink;
private System.Windows.Forms.Panel panelMultipathBoot;
@ -539,6 +520,6 @@ namespace XenAdmin.TabPages
private Controls.PDSection pdSectionReadCaching;
private System.Windows.Forms.Button buttonViewConsole;
private System.Windows.Forms.Button buttonViewLog;
private System.Windows.Forms.FlowLayoutPanel buttonPanel;
private System.Windows.Forms.TableLayoutPanel tableLayoutPanelButtons;
}
}

View File

@ -87,8 +87,6 @@ namespace XenAdmin.TabPages
if (s == null)
continue;
sections.Add(s);
s.MaximumSize = new Size(900, 9999999);
s.fixFirstColumnWidth(150);
s.contentChangedSelection += s_contentChangedSelection;
s.contentReceivedFocus += s_contentReceivedFocus;
}
@ -1747,7 +1745,7 @@ namespace XenAdmin.TabPages
output.Sort(StringUtility.NaturalCompare);
return String.Join(", ", output.ToArray());
return string.Join(Environment.NewLine, output);
}
private string poolUpdateString(Predicate<Pool_update> predicate)
@ -1762,7 +1760,7 @@ namespace XenAdmin.TabPages
output.Sort(StringUtility.NaturalCompare);
return String.Join(", ", output.ToArray());
return string.Join(Environment.NewLine, output);
}
#endregion

File diff suppressed because it is too large Load Diff