diff --git a/XenAdmin/Controls/AD/LoggedInLabel.cs b/XenAdmin/Controls/AD/LoggedInLabel.cs index 6df542beb3..d87a970806 100644 --- a/XenAdmin/Controls/AD/LoggedInLabel.cs +++ b/XenAdmin/Controls/AD/LoggedInLabel.cs @@ -28,6 +28,7 @@ * SUCH DAMAGE. */ +using System.ComponentModel; using System.Drawing; using System.Windows.Forms; using XenAPI; @@ -39,6 +40,9 @@ namespace XenAdmin.Controls public partial class LoggedInLabel : UserControl { private IXenConnection connection; + + [Browsable(false)] + [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)] public IXenConnection Connection { get diff --git a/XenAdmin/Controls/StatusStripEx.cs b/XenAdmin/Controls/StatusStripEx.cs new file mode 100644 index 0000000000..4ca58ebfc6 --- /dev/null +++ b/XenAdmin/Controls/StatusStripEx.cs @@ -0,0 +1,63 @@ +/* Copyright (c) Cloud Software Group, Inc. + * + * Redistribution and use in source and binary forms, + * with or without modification, are permitted provided + * that the following conditions are met: + * + * * Redistributions of source code must retain the above + * copyright notice, this list of conditions and the + * following disclaimer. + * * Redistributions in binary form must reproduce the above + * copyright notice, this list of conditions and the + * following disclaimer in the documentation and/or other + * materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND + * CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, + * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF + * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE + * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR + * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR + * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, + * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING + * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE + * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + */ + +using System; +using System.Windows.Forms; + +namespace XenAdmin.Controls +{ + /// + /// A System.Windows.Forms.StatusStrip with the option of click-through + /// (see https://learn.microsoft.com/en-us/archive/blogs/rickbrew/how-to-enable-click-through-for-net-2-0-toolstrip-and-menustrip) + /// + public class StatusStripEx : StatusStrip + { + /// + /// Gets or sets whether the StatusStripEx honors item clicks when its containing form does + /// not have input focus. + /// + /// + /// Default value is false, which is the same behavior provided by the base StatusStrip class. + /// + public bool ClickThrough { get; set; } + + protected override void WndProc(ref Message m) + { + base.WndProc(ref m); + + if (ClickThrough && + m.Msg == NativeConstants.WM_MOUSEACTIVATE && + m.Result == (IntPtr)NativeConstants.MA_ACTIVATEANDEAT) + { + m.Result = (IntPtr)NativeConstants.MA_ACTIVATE; + } + } + } +} diff --git a/XenAdmin/Controls/ToolStripEx.cs b/XenAdmin/Controls/ToolStripEx.cs index 4009a5bd43..6ff145deee 100644 --- a/XenAdmin/Controls/ToolStripEx.cs +++ b/XenAdmin/Controls/ToolStripEx.cs @@ -35,12 +35,10 @@ namespace XenAdmin.Controls { /// /// A System.Windows.Forms.ToolStrip with the option of click-through - /// (see http://blogs.msdn.com/rickbrew/archive/2006/01/09/511003.aspx) + /// (see https://learn.microsoft.com/en-us/archive/blogs/rickbrew/how-to-enable-click-through-for-net-2-0-toolstrip-and-menustrip) /// public class ToolStripEx : ToolStrip { - private bool clickThrough = false; - /// /// Gets or sets whether the ToolStripEx honors item clicks when its containing form does /// not have input focus. @@ -48,22 +46,13 @@ public class ToolStripEx : ToolStrip /// /// Default value is false, which is the same behavior provided by the base ToolStrip class. /// - public bool ClickThrough - { - get - { - return this.clickThrough; - } - set - { - this.clickThrough = value; - } - } + public bool ClickThrough { get; set; } protected override void WndProc(ref Message m) { base.WndProc(ref m); - if (this.clickThrough && + + if (ClickThrough && m.Msg == NativeConstants.WM_MOUSEACTIVATE && m.Result == (IntPtr)NativeConstants.MA_ACTIVATEANDEAT) { diff --git a/XenAdmin/Controls/UpsellPage.cs b/XenAdmin/Controls/UpsellPage.cs index f2a82bdaa1..f1343a572c 100644 --- a/XenAdmin/Controls/UpsellPage.cs +++ b/XenAdmin/Controls/UpsellPage.cs @@ -45,10 +45,10 @@ public partial class UpsellPage : UserControl, IEditPage public UpsellPage() { InitializeComponent(); - this.LearnMoreButton.Visible = !HiddenFeatures.LearnMoreButtonHidden; + LearnMoreButton.Visible = !HiddenFeatures.LearnMoreButtonHidden; } - public void enableOkButton() + public void EnableOkButton() { OKButton.Visible = true; } @@ -60,11 +60,9 @@ public string BlurbText : value + string.Format(Messages.UPSELL_BLURB_TRIAL, BrandManager.ProductBrand); } - public string LearnMoreUrl { private get; set; } = InvisibleMessages.UPSELL_LEARNMOREURL_TRIAL; - private void LearnMoreButton_Clicked(object sender, EventArgs e) { - NavigateTo(LearnMoreUrl); + NavigateTo(InvisibleMessages.UPSELL_LEARNMOREURL_TRIAL); } private void NavigateTo(string url) diff --git a/XenAdmin/Dialogs/UpsellDialog.cs b/XenAdmin/Dialogs/UpsellDialog.cs index b92a439142..99a14ea669 100644 --- a/XenAdmin/Dialogs/UpsellDialog.cs +++ b/XenAdmin/Dialogs/UpsellDialog.cs @@ -41,7 +41,7 @@ public UpsellDialog(string blurb) { InitializeComponent(); upsellPage1.BlurbText = blurb; - upsellPage1.enableOkButton(); + upsellPage1.EnableOkButton(); CancelButton = upsellPage1.OKButton; Height = upsellPage1.Height; } @@ -54,9 +54,7 @@ protected override void OnLoad(EventArgs e) public static void ShowUpsellDialog(string message, IWin32Window parent) { - using (var upsellDialog = new UpsellDialog(HiddenFeatures.LinkLabelHidden - ? message - : message + string.Format(Messages.UPSELL_BLURB_TRIAL, BrandManager.ProductBrand))) + using (var upsellDialog = new UpsellDialog(message)) upsellDialog.ShowDialog(parent); } } diff --git a/XenAdmin/MainWindow.Designer.cs b/XenAdmin/MainWindow.Designer.cs index 7d1c39bdd8..2d22626118 100644 --- a/XenAdmin/MainWindow.Designer.cs +++ b/XenAdmin/MainWindow.Designer.cs @@ -65,7 +65,6 @@ private void InitializeComponent() this.TabPageHA = new System.Windows.Forms.TabPage(); this.TabPageHAUpsell = new System.Windows.Forms.TabPage(); this.TabPageSnapshots = new System.Windows.Forms.TabPage(); - this.snapshotPage = new XenAdmin.TabPages.SnapshotsPage(); this.TabPageWLB = new System.Windows.Forms.TabPage(); this.TabPageWLBUpsell = new System.Windows.Forms.TabPage(); this.TabPageAD = new System.Windows.Forms.TabPage(); @@ -287,20 +286,19 @@ private void InitializeComponent() this.relNotesToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.securityGroupsToolStripMenuItem = new XenAdmin.Commands.CommandToolStripMenuItem(); this.MenuPanel = new System.Windows.Forms.Panel(); - this.StatusStrip = new System.Windows.Forms.StatusStrip(); + this.StatusStrip = new XenAdmin.Controls.StatusStripEx(); this.statusProgressBar = new System.Windows.Forms.ToolStripProgressBar(); this.statusLabel = new System.Windows.Forms.ToolStripStatusLabel(); this.statusButtonProgress = new System.Windows.Forms.ToolStripSplitButton(); this.statusButtonErrors = new System.Windows.Forms.ToolStripSplitButton(); - this.statusButtonCdnUpdates = new System.Windows.Forms.ToolStripSplitButton(); this.statusButtonUpdates = new System.Windows.Forms.ToolStripSplitButton(); + this.statusButtonCdnUpdates = new System.Windows.Forms.ToolStripSplitButton(); this.statusButtonAlerts = new System.Windows.Forms.ToolStripSplitButton(); ((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).BeginInit(); this.splitContainer1.Panel1.SuspendLayout(); this.splitContainer1.Panel2.SuspendLayout(); this.splitContainer1.SuspendLayout(); this.TheTabControl.SuspendLayout(); - this.TabPageSnapshots.SuspendLayout(); this.TitleBackPanel.SuspendLayout(); this.tableLayoutPanel1.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.TitleIcon)).BeginInit(); @@ -460,17 +458,10 @@ private void InitializeComponent() // // TabPageSnapshots // - this.TabPageSnapshots.Controls.Add(this.snapshotPage); resources.ApplyResources(this.TabPageSnapshots, "TabPageSnapshots"); this.TabPageSnapshots.Name = "TabPageSnapshots"; this.TabPageSnapshots.UseVisualStyleBackColor = true; // - // snapshotPage - // - resources.ApplyResources(this.snapshotPage, "snapshotPage"); - this.snapshotPage.Name = "snapshotPage"; - this.snapshotPage.VM = null; - // // TabPageWLB // resources.ApplyResources(this.TabPageWLB, "TabPageWLB"); @@ -597,7 +588,6 @@ private void InitializeComponent() // resources.ApplyResources(this.loggedInLabel1, "loggedInLabel1"); this.loggedInLabel1.BackColor = System.Drawing.Color.Transparent; - this.loggedInLabel1.Connection = null; this.loggedInLabel1.Name = "loggedInLabel1"; // // labelFiltersOnOff @@ -2002,6 +1992,7 @@ private void InitializeComponent() // StatusStrip // resources.ApplyResources(this.StatusStrip, "StatusStrip"); + this.StatusStrip.ClickThrough = true; this.StatusStrip.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { this.statusProgressBar, this.statusLabel, @@ -2046,15 +2037,6 @@ private void InitializeComponent() this.statusButtonErrors.Name = "statusButtonErrors"; this.statusButtonErrors.Click += new System.EventHandler(this.statusButtonErrors_Click); // - // statusButtonCdnUpdates - // - this.statusButtonCdnUpdates.DropDownButtonWidth = 0; - this.statusButtonCdnUpdates.ForeColor = System.Drawing.SystemColors.ControlDarkDark; - this.statusButtonCdnUpdates.Image = global::XenAdmin.Properties.Resources.notif_updates_16; - resources.ApplyResources(this.statusButtonCdnUpdates, "statusButtonCdnUpdates"); - this.statusButtonCdnUpdates.Name = "statusButtonCdnUpdates"; - this.statusButtonCdnUpdates.Click += new System.EventHandler(this.statusButtonCdnUpdates_Click); - // // statusButtonUpdates // this.statusButtonUpdates.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right; @@ -2065,6 +2047,15 @@ private void InitializeComponent() this.statusButtonUpdates.Name = "statusButtonUpdates"; this.statusButtonUpdates.Click += new System.EventHandler(this.statusButtonUpdates_Click); // + // statusButtonCdnUpdates + // + this.statusButtonCdnUpdates.DropDownButtonWidth = 0; + this.statusButtonCdnUpdates.ForeColor = System.Drawing.SystemColors.ControlDarkDark; + this.statusButtonCdnUpdates.Image = global::XenAdmin.Properties.Resources.notif_updates_16; + resources.ApplyResources(this.statusButtonCdnUpdates, "statusButtonCdnUpdates"); + this.statusButtonCdnUpdates.Name = "statusButtonCdnUpdates"; + this.statusButtonCdnUpdates.Click += new System.EventHandler(this.statusButtonCdnUpdates_Click); + // // statusButtonAlerts // this.statusButtonAlerts.DropDownButtonWidth = 0; @@ -2097,7 +2088,6 @@ private void InitializeComponent() ((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).EndInit(); this.splitContainer1.ResumeLayout(false); this.TheTabControl.ResumeLayout(false); - this.TabPageSnapshots.ResumeLayout(false); this.TitleBackPanel.ResumeLayout(false); this.tableLayoutPanel1.ResumeLayout(false); this.tableLayoutPanel1.PerformLayout(); @@ -2243,7 +2233,6 @@ private void InitializeComponent() private System.Windows.Forms.TabPage TabPageSnapshots; private System.Windows.Forms.TabPage TabPageDockerProcess; internal System.Windows.Forms.TabPage TabPageDockerDetails; - private XenAdmin.TabPages.SnapshotsPage snapshotPage; private System.Windows.Forms.ToolStripMenuItem connectDisconnectToolStripMenuItem; private XenAdmin.Commands.CommandToolStripMenuItem connectAllToolStripMenuItem; private XenAdmin.Commands.CommandToolStripMenuItem DisconnectToolStripMenuItem; @@ -2318,7 +2307,7 @@ private void InitializeComponent() private System.Windows.Forms.ToolStripMenuItem customTemplatesToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem templatesToolStripMenuItem1; private System.Windows.Forms.ToolStripMenuItem localStorageToolStripMenuItem; - private System.Windows.Forms.StatusStrip StatusStrip; + private XenAdmin.Controls.StatusStripEx StatusStrip; private System.Windows.Forms.ToolStripStatusLabel statusLabel; private System.Windows.Forms.ToolStripProgressBar statusProgressBar; private XenAdmin.Commands.CommandToolStripMenuItem reclaimFreedSpacetripMenuItem; diff --git a/XenAdmin/MainWindow.cs b/XenAdmin/MainWindow.cs index 49cbb80583..14e3f6c180 100755 --- a/XenAdmin/MainWindow.cs +++ b/XenAdmin/MainWindow.cs @@ -104,6 +104,7 @@ public partial class MainWindow : Form, ISynchronizeInvoke, IMainWindow, IFormWi internal readonly DockerProcessPage DockerProcessPage = new DockerProcessPage(); internal readonly DockerDetailsPage DockerDetailsPage = new DockerDetailsPage(); internal readonly UsbPage UsbPage = new UsbPage(); + private readonly SnapshotsPage snapshotPage = new SnapshotsPage(); private readonly NotificationsBasePage[] _notificationPages; @@ -188,6 +189,7 @@ public MainWindow(string[] args) components.Add(DockerProcessPage); components.Add(DockerDetailsPage); components.Add(UsbPage); + components.Add(snapshotPage); AddTabContents(VMStoragePage, TabPageStorage); AddTabContents(SrStoragePage, TabPageSR); @@ -212,6 +214,7 @@ public MainWindow(string[] args) AddTabContents(DockerProcessPage, TabPageDockerProcess); AddTabContents(DockerDetailsPage, TabPageDockerDetails); AddTabContents(UsbPage, TabPageUSB); + AddTabContents(snapshotPage, TabPageSnapshots); #endregion @@ -1570,9 +1573,8 @@ private List GetNewTabPages() if(!multi && !SearchMode && isRealVMSelected) newTabs.Add(TabPageSnapshots); - //Any Clearwater XenServer, or WLB is not licensed on XenServer, the WLB tab and any WLB menu items disappear completely. - if (!wlb_upsell && !multi && !SearchMode && isPoolSelected) - newTabs.Add(TabPageWLB); + if (!multi && !SearchMode && isPoolSelected) + newTabs.Add(wlb_upsell ? TabPageWLBUpsell : TabPageWLB); if (!multi && !SearchMode && (isPoolSelected || isPoolOrLiveStandaloneHost)) newTabs.Add(ad_upsell ? TabPageADUpsell : TabPageAD); diff --git a/XenAdmin/MainWindow.ja.resx b/XenAdmin/MainWindow.ja.resx index 8abd155cd8..ffc33c1f07 100755 --- a/XenAdmin/MainWindow.ja.resx +++ b/XenAdmin/MainWindow.ja.resx @@ -555,36 +555,6 @@ 12 - - True - - - Fill - - - 0, 0 - - - 0, 0, 0, 0 - - - 753, 592 - - - 0 - - - snapshotPage - - - XenAdmin.TabPages.SnapshotsPage, XenCenterMain, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null - - - TabPageSnapshots - - - 0 - 4, 22 diff --git a/XenAdmin/MainWindow.resx b/XenAdmin/MainWindow.resx index 6e7f7011fe..e915993871 100644 --- a/XenAdmin/MainWindow.resx +++ b/XenAdmin/MainWindow.resx @@ -145,7 +145,7 @@ navigationPane - XenAdmin.Controls.MainWindowControls.NavigationPane, [XenCenter_No_Space], Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + XenAdmin.Controls.MainWindowControls.NavigationPane, [XenCenter], Version=0.0.0.0, Culture=neutral, PublicKeyToken=null splitContainer1.Panel1 @@ -174,519 +174,6 @@ Top, Bottom, Left, Right - - TabPageHome - - - System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - TheTabControl - - - 0 - - - TabPageGeneral - - - System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - TheTabControl - - - 1 - - - TabPageBallooning - - - System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - TheTabControl - - - 2 - - - TabPageConsole - - - System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - TheTabControl - - - 3 - - - TabPageCvmConsole - - - System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - TheTabControl - - - 4 - - - TabPageStorage - - - System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - TheTabControl - - - 5 - - - TabPagePhysicalStorage - - - System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - TheTabControl - - - 6 - - - TabPageSR - - - System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - TheTabControl - - - 7 - - - TabPageNetwork - - - System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - TheTabControl - - - 8 - - - TabPageNICs - - - System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - TheTabControl - - - 9 - - - TabPagePeformance - - - System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - TheTabControl - - - 10 - - - TabPageHA - - - System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - TheTabControl - - - 11 - - - TabPageHAUpsell - - - System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - TheTabControl - - - 12 - - - TabPageSnapshots - - - System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - TheTabControl - - - 13 - - - TabPageWLB - - - System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - TheTabControl - - - 14 - - - TabPageWLBUpsell - - - System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - TheTabControl - - - 15 - - - TabPageAD - - - System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - TheTabControl - - - 16 - - - TabPageADUpsell - - - System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - TheTabControl - - - 17 - - - TabPageGPU - - - System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - TheTabControl - - - 18 - - - TabPagePvs - - - System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - TheTabControl - - - 19 - - - TabPageSearch - - - System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - TheTabControl - - - 20 - - - TabPageDockerProcess - - - System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - TheTabControl - - - 21 - - - TabPageDockerDetails - - - System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - TheTabControl - - - 22 - - - TabPageUSB - - - System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - TheTabControl - - - 23 - - - Verdana, 8.25pt - - - 0, 30 - - - 0, 0 - - - 761, 617 - - - 0 - - - TheTabControl - - - System.Windows.Forms.TabControl, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - splitContainer1.Panel2 - - - 0 - - - Top, Bottom, Left, Right - - - Tahoma, 8pt - - - 0, 30 - - - 12, 12, 12, 12 - - - 761, 617 - - - 0 - - - alertPage - - - XenAdmin.TabPages.AlertSummaryPage, [XenCenter_No_Space], Version=0.0.0.0, Culture=neutral, PublicKeyToken=null - - - splitContainer1.Panel2 - - - 1 - - - Top, Bottom, Left, Right - - - Segoe UI, 9pt - - - 0, 30 - - - 12, 12, 12, 12 - - - 761, 617 - - - 0 - - - updatesPage - - - XenAdmin.TabPages.ManageUpdatesPage, [XenCenter_No_Space], Version=0.0.0.0, Culture=neutral, PublicKeyToken=null - - - splitContainer1.Panel2 - - - 2 - - - Top, Bottom, Left, Right - - - Segoe UI, 9pt - - - 0, 30 - - - 12, 12, 12, 12 - - - 761, 617 - - - 6 - - - cdnUpdatesPage - - - XenAdmin.TabPages.ManageCdnUpdatesPage, [XenCenter_No_Space], Version=0.0.0.0, Culture=neutral, PublicKeyToken=null - - - splitContainer1.Panel2 - - - 3 - - - Top, Bottom, Left, Right - - - Segoe UI, 8.25pt - - - 0, 30 - - - 12, 12, 12, 12 - - - 761, 617 - - - 5 - - - eventsPage - - - XenAdmin.TabPages.HistoryPage, [XenCenter_No_Space], Version=0.0.0.0, Culture=neutral, PublicKeyToken=null - - - splitContainer1.Panel2 - - - 4 - - - Top, Left, Right - - - tableLayoutPanel1 - - - System.Windows.Forms.TableLayoutPanel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - TitleBackPanel - - - 0 - - - <?xml version="1.0" encoding="utf-16"?><TableLayoutSettings><Controls><Control Name="TitleIcon" Row="0" RowSpan="1" Column="0" ColumnSpan="1" /><Control Name="TitleLabel" Row="0" RowSpan="1" Column="1" ColumnSpan="1" /><Control Name="LicenseStatusTitleLabel" Row="0" RowSpan="1" Column="2" ColumnSpan="1" /><Control Name="loggedInLabel1" Row="0" RowSpan="1" Column="4" ColumnSpan="1" /><Control Name="labelFiltersOnOff" Row="0" RowSpan="1" Column="3" ColumnSpan="1" /></Controls><Columns Styles="AutoSize,0,AutoSize,0,Percent,100,AutoSize,0,AutoSize,0" /><Rows Styles="Percent,100" /></TableLayoutSettings> - - - 0, 0 - - - 759, 24 - - - 0 - - - TitleBackPanel - - - XenAdmin.Controls.GradientPanel.VerticalGradientPanel, [XenCenter_No_Space], Version=0.0.0.0, Culture=neutral, PublicKeyToken=null - - - splitContainer1.Panel2 - - - 5 - - - No - - - splitContainer1.Panel2 - - - System.Windows.Forms.SplitterPanel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - splitContainer1 - - - 1 - - - 100 - - - 1008, 647 - - - 243 - - - 0 - - - splitContainer1 - - - System.Windows.Forms.SplitContainer, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - $this - - - 1 - Fill @@ -1068,18 +555,6 @@ 12 - - snapshotPage - - - XenAdmin.TabPages.SnapshotsPage, [XenCenter_No_Space], Version=0.0.0.0, Culture=neutral, PublicKeyToken=null - - - TabPageSnapshots - - - 0 - 4, 22 @@ -1107,36 +582,6 @@ 13 - - True - - - Fill - - - 0, 0 - - - 0, 0, 0, 0 - - - 753, 591 - - - 0 - - - snapshotPage - - - XenAdmin.TabPages.SnapshotsPage, [XenCenter_No_Space], Version=0.0.0.0, Culture=neutral, PublicKeyToken=null - - - TabPageSnapshots - - - 0 - 4, 22 @@ -1404,98 +849,158 @@ 23 - - 5 + + Verdana, 8.25pt - - TitleIcon + + 0, 30 - - System.Windows.Forms.PictureBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 0, 0 + + + 761, 617 + + + 0 + + + TheTabControl + + + System.Windows.Forms.TabControl, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + splitContainer1.Panel2 + + + 0 + + + Top, Bottom, Left, Right + + + Tahoma, 8pt + + + 0, 30 + + + 12, 12, 12, 12 + + + 761, 617 + + + 0 + + + alertPage + + + XenAdmin.TabPages.AlertSummaryPage, [XenCenter], Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + + + splitContainer1.Panel2 + + + 1 + + + Top, Bottom, Left, Right + + + Segoe UI, 9pt + + + 0, 30 + + + 12, 12, 12, 12 - - tableLayoutPanel1 + + 761, 617 - + 0 - - TitleLabel + + updatesPage - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + XenAdmin.TabPages.ManageUpdatesPage, [XenCenter], Version=0.0.0.0, Culture=neutral, PublicKeyToken=null - - tableLayoutPanel1 + + splitContainer1.Panel2 - - 1 + + 2 - - LicenseStatusTitleLabel + + Top, Bottom, Left, Right - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + Segoe UI, 9pt - - tableLayoutPanel1 + + 0, 30 - - 2 + + 12, 12, 12, 12 - - loggedInLabel1 + + 761, 617 - - XenAdmin.Controls.LoggedInLabel, [XenCenter_No_Space], Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + + 6 - - tableLayoutPanel1 + + cdnUpdatesPage - - 3 + + XenAdmin.TabPages.ManageCdnUpdatesPage, [XenCenter], Version=0.0.0.0, Culture=neutral, PublicKeyToken=null - - labelFiltersOnOff + + splitContainer1.Panel2 - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 3 - - tableLayoutPanel1 + + Top, Bottom, Left, Right - - 4 + + Segoe UI, 8.25pt - - Fill + + 0, 30 - - 0, 0 + + 12, 12, 12, 12 - - 1 + + 761, 617 - - 759, 24 + + 5 - - 2 + + eventsPage - - tableLayoutPanel1 + + XenAdmin.TabPages.HistoryPage, [XenCenter], Version=0.0.0.0, Culture=neutral, PublicKeyToken=null - - System.Windows.Forms.TableLayoutPanel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + splitContainer1.Panel2 - - TitleBackPanel + + 4 - - 0 + + Top, Left, Right - - <?xml version="1.0" encoding="utf-16"?><TableLayoutSettings><Controls><Control Name="TitleIcon" Row="0" RowSpan="1" Column="0" ColumnSpan="1" /><Control Name="TitleLabel" Row="0" RowSpan="1" Column="1" ColumnSpan="1" /><Control Name="LicenseStatusTitleLabel" Row="0" RowSpan="1" Column="2" ColumnSpan="1" /><Control Name="loggedInLabel1" Row="0" RowSpan="1" Column="4" ColumnSpan="1" /><Control Name="labelFiltersOnOff" Row="0" RowSpan="1" Column="3" ColumnSpan="1" /></Controls><Columns Styles="AutoSize,0,AutoSize,0,Percent,100,AutoSize,0,AutoSize,0" /><Rows Styles="Percent,100" /></TableLayoutSettings> + + 5 Left @@ -1618,7 +1123,7 @@ loggedInLabel1 - XenAdmin.Controls.LoggedInLabel, [XenCenter_No_Space], Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + XenAdmin.Controls.LoggedInLabel, [XenCenter], Version=0.0.0.0, Culture=neutral, PublicKeyToken=null tableLayoutPanel1 @@ -1656,38 +1161,104 @@ 4 - - 0, 24 - - - False - - - Microsoft Sans Serif, 8.25pt + + Fill - - 0, 24 + + 0, 0 - - 5, 0, 5, 0 + + 1 - - 1008, 31 + + 759, 24 - + 2 - - ToolStrip + + tableLayoutPanel1 - - XenAdmin.Controls.ToolStripEx, [XenCenter_No_Space], Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + + System.Windows.Forms.TableLayoutPanel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + + TitleBackPanel + + + 0 + + + <?xml version="1.0" encoding="utf-16"?><TableLayoutSettings><Controls><Control Name="TitleIcon" Row="0" RowSpan="1" Column="0" ColumnSpan="1" /><Control Name="TitleLabel" Row="0" RowSpan="1" Column="1" ColumnSpan="1" /><Control Name="LicenseStatusTitleLabel" Row="0" RowSpan="1" Column="2" ColumnSpan="1" /><Control Name="loggedInLabel1" Row="0" RowSpan="1" Column="4" ColumnSpan="1" /><Control Name="labelFiltersOnOff" Row="0" RowSpan="1" Column="3" ColumnSpan="1" /></Controls><Columns Styles="AutoSize,0,AutoSize,0,Percent,100,AutoSize,0,AutoSize,0" /><Rows Styles="Percent,100" /></TableLayoutSettings> + + + 0, 0 + + + 759, 24 + + + 0 + + + TitleBackPanel + + + XenAdmin.Controls.GradientPanel.VerticalGradientPanel, [XenCenter], Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + + + splitContainer1.Panel2 + + + 5 + + + No + + + splitContainer1.Panel2 + + + System.Windows.Forms.SplitterPanel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + splitContainer1 + + + 1 + + + 100 + + + 1008, 647 + + + 243 + + + 0 + + + splitContainer1 + + + System.Windows.Forms.SplitContainer, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + $this - - 2 + + 1 + + + 0, 24 + + + False + + + Microsoft Sans Serif, 8.25pt MiddleLeft @@ -2217,12 +1788,42 @@ Pause Docker Container + + 0, 24 + + + 5, 0, 5, 0 + + + 1008, 31 + + + 2 + + + ToolStrip + + + XenAdmin.Controls.ToolStripEx, [XenCenter], Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + + + $this + + + 2 + 475, 8 163, 5 + + 145, 22 + + + Show &Toolbar + 146, 26 @@ -2232,18 +1833,6 @@ System.Windows.Forms.ContextMenuStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 145, 22 - - - Show &Toolbar - - - 35, 20 - - - &File - 186, 22 @@ -2292,11 +1881,11 @@ E&xit - - 42, 20 + + 35, 20 - - &View + + &File 186, 22 @@ -2337,11 +1926,11 @@ &Toolbar - - 40, 20 + + 42, 20 - - &Pool + + &View 247, 22 @@ -2388,12 +1977,6 @@ 244, 6 - - 247, 22 - - - &High Availability - 156, 22 @@ -2406,11 +1989,11 @@ &Disable HA - + 247, 22 - - Di&saster Recovery + + &High Availability 214, 22 @@ -2424,6 +2007,12 @@ &Disaster Recovery Wizard... + + 247, 22 + + + Di&saster Recovery + 247, 22 @@ -2433,12 +2022,6 @@ 247, 22 - - 247, 22 - - - Workload &Balancing - 277, 22 @@ -2451,6 +2034,12 @@ Disconnect Workload &Balancing Server + + 247, 22 + + + Workload &Balancing + 247, 22 @@ -2502,11 +2091,11 @@ P&roperties - - 50, 20 + + 40, 20 - - &Server + + &Pool 216, 22 @@ -2586,12 +2175,6 @@ 213, 6 - - 216, 22 - - - &Connect/Disconnect - 155, 22 @@ -2625,6 +2208,12 @@ Di&sconnect All + + 216, 22 + + + &Connect/Disconnect + 216, 22 @@ -2655,12 +2244,6 @@ 213, 6 - - 216, 22 - - - Cert&ificate - 171, 22 @@ -2673,6 +2256,12 @@ &Reset Certificate + + 216, 22 + + + Cert&ificate + 216, 22 @@ -2694,12 +2283,6 @@ Remove Crash Dump &Files - - 216, 22 - - - Pass&word - 161, 22 @@ -2712,6 +2295,12 @@ &Forget Password + + 216, 22 + + + Pass&word + 213, 6 @@ -2742,11 +2331,11 @@ P&roperties - - 35, 20 + + 50, 20 - - V&M + + &Server 264, 22 @@ -2886,14 +2475,14 @@ P&roperties - - 186, 6 + + 35, 20 - - 56, 20 + + V&M - - St&orage + + 186, 6 186, 22 @@ -2919,12 +2508,6 @@ 183, 6 - - 186, 22 - - - &Virtual Disks - 180, 22 @@ -2937,6 +2520,12 @@ &Attach Virtual Disk... + + 186, 22 + + + &Virtual Disks + 186, 22 @@ -2985,20 +2574,11 @@ P&roperties - - 68, 20 - - - &Templates - - - 211, 22 - - - Create &VM From Selection + + 56, 20 - - MiddleRight + + St&orage 165, 22 @@ -3012,6 +2592,15 @@ &Quick Create + + 211, 22 + + + Create &VM From Selection + + + MiddleRight + 208, 6 @@ -3051,11 +2640,11 @@ P&roperties - - 45, 20 + + 68, 20 - - Too&ls + + &Templates 195, 22 @@ -3108,14 +2697,11 @@ &Options... - - 58, 20 - - - &Window + + 45, 20 - - False + + Too&ls 186, 22 @@ -3123,11 +2709,14 @@ PluginItemsPlaceHolder - - 41, 20 + + 58, 20 - - &Help + + &Window + + + False 186, 22 @@ -3189,6 +2778,12 @@ &About {0} + + 41, 20 + + + &Help + 0, 0 @@ -3201,6 +2796,24 @@ Microsoft Sans Serif, 8.25pt + + 173, 22 + + + Download and &Install + + + 173, 22 + + + v{0} &Release Notes + + + 87, 20 + + + {0} &Update + 0, 0 @@ -3217,7 +2830,7 @@ MainMenuBar - XenAdmin.Controls.MenuStripEx, [XenCenter_No_Space], Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + XenAdmin.Controls.MenuStripEx, [XenCenter], Version=0.0.0.0, Culture=neutral, PublicKeyToken=null MenuPanel @@ -3225,24 +2838,6 @@ 0 - - 87, 20 - - - {0} &Update - - - 173, 22 - - - Download and &Install - - - 173, 22 - - - v{0} &Release Notes - 32, 19 @@ -3292,7 +2887,7 @@ None - 483, 22 + 514, 22 MiddleLeft @@ -3321,18 +2916,6 @@ Errors - - Magenta - - - 91, 25 - - - cdnUpdates - - - Updates for {0} {1} - Magenta @@ -3345,6 +2928,18 @@ Updates for {0} or earlier + + Magenta + + + 91, 25 + + + cdnUpdates + + + Updates for {0} {1} + Magenta @@ -3373,7 +2968,7 @@ StatusStrip - System.Windows.Forms.StatusStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + XenAdmin.Controls.StatusStripEx, [XenCenter], Version=0.0.0.0, Culture=neutral, PublicKeyToken=null $this @@ -3424,7 +3019,7 @@ AddServerToolbarButton - XenAdmin.Commands.CommandToolStripButton, [XenCenter_No_Space], Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + XenAdmin.Commands.CommandToolStripButton, [XenCenter], Version=0.0.0.0, Culture=neutral, PublicKeyToken=null toolStripSeparator11 @@ -3436,19 +3031,19 @@ AddPoolToolbarButton - XenAdmin.Commands.CommandToolStripButton, [XenCenter_No_Space], Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + XenAdmin.Commands.CommandToolStripButton, [XenCenter], Version=0.0.0.0, Culture=neutral, PublicKeyToken=null newStorageToolbarButton - XenAdmin.Commands.CommandToolStripButton, [XenCenter_No_Space], Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + XenAdmin.Commands.CommandToolStripButton, [XenCenter], Version=0.0.0.0, Culture=neutral, PublicKeyToken=null NewVmToolbarButton - XenAdmin.Commands.CommandToolStripButton, [XenCenter_No_Space], Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + XenAdmin.Commands.CommandToolStripButton, [XenCenter], Version=0.0.0.0, Culture=neutral, PublicKeyToken=null toolStripSeparator12 @@ -3460,79 +3055,79 @@ shutDownToolStripButton - XenAdmin.Commands.CommandToolStripButton, [XenCenter_No_Space], Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + XenAdmin.Commands.CommandToolStripButton, [XenCenter], Version=0.0.0.0, Culture=neutral, PublicKeyToken=null powerOnHostToolStripButton - XenAdmin.Commands.CommandToolStripButton, [XenCenter_No_Space], Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + XenAdmin.Commands.CommandToolStripButton, [XenCenter], Version=0.0.0.0, Culture=neutral, PublicKeyToken=null startVMToolStripButton - XenAdmin.Commands.CommandToolStripButton, [XenCenter_No_Space], Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + XenAdmin.Commands.CommandToolStripButton, [XenCenter], Version=0.0.0.0, Culture=neutral, PublicKeyToken=null RebootToolbarButton - XenAdmin.Commands.CommandToolStripButton, [XenCenter_No_Space], Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + XenAdmin.Commands.CommandToolStripButton, [XenCenter], Version=0.0.0.0, Culture=neutral, PublicKeyToken=null resumeToolStripButton - XenAdmin.Commands.CommandToolStripButton, [XenCenter_No_Space], Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + XenAdmin.Commands.CommandToolStripButton, [XenCenter], Version=0.0.0.0, Culture=neutral, PublicKeyToken=null SuspendToolbarButton - XenAdmin.Commands.CommandToolStripButton, [XenCenter_No_Space], Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + XenAdmin.Commands.CommandToolStripButton, [XenCenter], Version=0.0.0.0, Culture=neutral, PublicKeyToken=null ForceShutdownToolbarButton - XenAdmin.Commands.CommandToolStripButton, [XenCenter_No_Space], Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + XenAdmin.Commands.CommandToolStripButton, [XenCenter], Version=0.0.0.0, Culture=neutral, PublicKeyToken=null ForceRebootToolbarButton - XenAdmin.Commands.CommandToolStripButton, [XenCenter_No_Space], Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + XenAdmin.Commands.CommandToolStripButton, [XenCenter], Version=0.0.0.0, Culture=neutral, PublicKeyToken=null stopContainerToolStripButton - XenAdmin.Commands.CommandToolStripButton, [XenCenter_No_Space], Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + XenAdmin.Commands.CommandToolStripButton, [XenCenter], Version=0.0.0.0, Culture=neutral, PublicKeyToken=null startContainerToolStripButton - XenAdmin.Commands.CommandToolStripButton, [XenCenter_No_Space], Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + XenAdmin.Commands.CommandToolStripButton, [XenCenter], Version=0.0.0.0, Culture=neutral, PublicKeyToken=null restartContainerToolStripButton - XenAdmin.Commands.CommandToolStripButton, [XenCenter_No_Space], Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + XenAdmin.Commands.CommandToolStripButton, [XenCenter], Version=0.0.0.0, Culture=neutral, PublicKeyToken=null resumeContainerToolStripButton - XenAdmin.Commands.CommandToolStripButton, [XenCenter_No_Space], Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + XenAdmin.Commands.CommandToolStripButton, [XenCenter], Version=0.0.0.0, Culture=neutral, PublicKeyToken=null pauseContainerToolStripButton - XenAdmin.Commands.CommandToolStripButton, [XenCenter_No_Space], Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + XenAdmin.Commands.CommandToolStripButton, [XenCenter], Version=0.0.0.0, Culture=neutral, PublicKeyToken=null statusToolTip @@ -3556,13 +3151,13 @@ FileImportVMToolStripMenuItem - XenAdmin.Commands.CommandToolStripMenuItem, [XenCenter_No_Space], Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + XenAdmin.Commands.CommandToolStripMenuItem, [XenCenter], Version=0.0.0.0, Culture=neutral, PublicKeyToken=null importSearchToolStripMenuItem - XenAdmin.Commands.CommandToolStripMenuItem, [XenCenter_No_Space], Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + XenAdmin.Commands.CommandToolStripMenuItem, [XenCenter], Version=0.0.0.0, Culture=neutral, PublicKeyToken=null toolStripSeparator21 @@ -3658,7 +3253,7 @@ AddPoolToolStripMenuItem - XenAdmin.Commands.CommandToolStripMenuItem, [XenCenter_No_Space], Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + XenAdmin.Commands.CommandToolStripMenuItem, [XenCenter], Version=0.0.0.0, Culture=neutral, PublicKeyToken=null toolStripSeparator8 @@ -3670,25 +3265,25 @@ addServerToolStripMenuItem - XenAdmin.Commands.AddHostToSelectedPoolToolStripMenuItem, [XenCenter_No_Space], Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + XenAdmin.Commands.AddHostToSelectedPoolToolStripMenuItem, [XenCenter], Version=0.0.0.0, Culture=neutral, PublicKeyToken=null removeServerToolStripMenuItem - XenAdmin.Commands.PoolRemoveServerToolStripMenuItem, [XenCenter_No_Space], Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + XenAdmin.Commands.PoolRemoveServerToolStripMenuItem, [XenCenter], Version=0.0.0.0, Culture=neutral, PublicKeyToken=null poolReconnectAsToolStripMenuItem - XenAdmin.Commands.CommandToolStripMenuItem, [XenCenter_No_Space], Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + XenAdmin.Commands.CommandToolStripMenuItem, [XenCenter], Version=0.0.0.0, Culture=neutral, PublicKeyToken=null disconnectPoolToolStripMenuItem - XenAdmin.Commands.CommandToolStripMenuItem, [XenCenter_No_Space], Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + XenAdmin.Commands.CommandToolStripMenuItem, [XenCenter], Version=0.0.0.0, Culture=neutral, PublicKeyToken=null toolStripSeparator27 @@ -3700,7 +3295,7 @@ virtualAppliancesToolStripMenuItem - XenAdmin.Commands.CommandToolStripMenuItem, [XenCenter_No_Space], Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + XenAdmin.Commands.CommandToolStripMenuItem, [XenCenter], Version=0.0.0.0, Culture=neutral, PublicKeyToken=null toolStripSeparator30 @@ -3712,73 +3307,73 @@ highAvailabilityToolStripMenuItem - XenAdmin.Commands.CommandToolStripMenuItem, [XenCenter_No_Space], Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + XenAdmin.Commands.CommandToolStripMenuItem, [XenCenter], Version=0.0.0.0, Culture=neutral, PublicKeyToken=null toolStripMenuItemHaConfigure - XenAdmin.Commands.CommandToolStripMenuItem, [XenCenter_No_Space], Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + XenAdmin.Commands.CommandToolStripMenuItem, [XenCenter], Version=0.0.0.0, Culture=neutral, PublicKeyToken=null toolStripMenuItemHaDisable - XenAdmin.Commands.CommandToolStripMenuItem, [XenCenter_No_Space], Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + XenAdmin.Commands.CommandToolStripMenuItem, [XenCenter], Version=0.0.0.0, Culture=neutral, PublicKeyToken=null disasterRecoveryToolStripMenuItem - XenAdmin.Commands.CommandToolStripMenuItem, [XenCenter_No_Space], Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + XenAdmin.Commands.CommandToolStripMenuItem, [XenCenter], Version=0.0.0.0, Culture=neutral, PublicKeyToken=null drConfigureToolStripMenuItem - XenAdmin.Commands.CommandToolStripMenuItem, [XenCenter_No_Space], Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + XenAdmin.Commands.CommandToolStripMenuItem, [XenCenter], Version=0.0.0.0, Culture=neutral, PublicKeyToken=null DrWizardToolStripMenuItem - XenAdmin.Commands.CommandToolStripMenuItem, [XenCenter_No_Space], Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + XenAdmin.Commands.CommandToolStripMenuItem, [XenCenter], Version=0.0.0.0, Culture=neutral, PublicKeyToken=null VMSnapshotScheduleToolStripMenuItem - XenAdmin.Commands.CommandToolStripMenuItem, [XenCenter_No_Space], Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + XenAdmin.Commands.CommandToolStripMenuItem, [XenCenter], Version=0.0.0.0, Culture=neutral, PublicKeyToken=null exportResourceReportPoolToolStripMenuItem - XenAdmin.Commands.CommandToolStripMenuItem, [XenCenter_No_Space], Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + XenAdmin.Commands.CommandToolStripMenuItem, [XenCenter], Version=0.0.0.0, Culture=neutral, PublicKeyToken=null toolStripMenuItemWlb - XenAdmin.Commands.CommandToolStripMenuItem, [XenCenter_No_Space], Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + XenAdmin.Commands.CommandToolStripMenuItem, [XenCenter], Version=0.0.0.0, Culture=neutral, PublicKeyToken=null wlbReportsToolStripMenuItem - XenAdmin.Commands.CommandToolStripMenuItem, [XenCenter_No_Space], Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + XenAdmin.Commands.CommandToolStripMenuItem, [XenCenter], Version=0.0.0.0, Culture=neutral, PublicKeyToken=null wlbDisconnectToolStripMenuItem - XenAdmin.Commands.CommandToolStripMenuItem, [XenCenter_No_Space], Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + XenAdmin.Commands.CommandToolStripMenuItem, [XenCenter], Version=0.0.0.0, Culture=neutral, PublicKeyToken=null conversionToolStripMenuItem - XenAdmin.Commands.CommandToolStripMenuItem, [XenCenter_No_Space], Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + XenAdmin.Commands.CommandToolStripMenuItem, [XenCenter], Version=0.0.0.0, Culture=neutral, PublicKeyToken=null toolStripSeparator9 @@ -3790,19 +3385,19 @@ changePoolPasswordToolStripMenuItem - XenAdmin.Commands.CommandToolStripMenuItem, [XenCenter_No_Space], Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + XenAdmin.Commands.CommandToolStripMenuItem, [XenCenter], Version=0.0.0.0, Culture=neutral, PublicKeyToken=null toolStripMenuItemRotateSecret - XenAdmin.Commands.CommandToolStripMenuItem, [XenCenter_No_Space], Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + XenAdmin.Commands.CommandToolStripMenuItem, [XenCenter], Version=0.0.0.0, Culture=neutral, PublicKeyToken=null toolStripMenuItemEnableTls - XenAdmin.Commands.CommandToolStripMenuItem, [XenCenter_No_Space], Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + XenAdmin.Commands.CommandToolStripMenuItem, [XenCenter], Version=0.0.0.0, Culture=neutral, PublicKeyToken=null toolStripMenuItem1 @@ -3814,7 +3409,7 @@ deleteToolStripMenuItem - XenAdmin.Commands.CommandToolStripMenuItem, [XenCenter_No_Space], Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + XenAdmin.Commands.CommandToolStripMenuItem, [XenCenter], Version=0.0.0.0, Culture=neutral, PublicKeyToken=null toolStripSeparator26 @@ -3832,7 +3427,7 @@ PoolPropertiesToolStripMenuItem - XenAdmin.Commands.CommandToolStripMenuItem, [XenCenter_No_Space], Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + XenAdmin.Commands.CommandToolStripMenuItem, [XenCenter], Version=0.0.0.0, Culture=neutral, PublicKeyToken=null HostMenuItem @@ -3844,7 +3439,7 @@ AddHostToolStripMenuItem - XenAdmin.Commands.CommandToolStripMenuItem, [XenCenter_No_Space], Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + XenAdmin.Commands.CommandToolStripMenuItem, [XenCenter], Version=0.0.0.0, Culture=neutral, PublicKeyToken=null toolStripMenuItem11 @@ -3856,25 +3451,25 @@ RebootHostToolStripMenuItem - XenAdmin.Commands.CommandToolStripMenuItem, [XenCenter_No_Space], Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + XenAdmin.Commands.CommandToolStripMenuItem, [XenCenter], Version=0.0.0.0, Culture=neutral, PublicKeyToken=null powerOnToolStripMenuItem - XenAdmin.Commands.CommandToolStripMenuItem, [XenCenter_No_Space], Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + XenAdmin.Commands.CommandToolStripMenuItem, [XenCenter], Version=0.0.0.0, Culture=neutral, PublicKeyToken=null ShutdownHostToolStripMenuItem - XenAdmin.Commands.CommandToolStripMenuItem, [XenCenter_No_Space], Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + XenAdmin.Commands.CommandToolStripMenuItem, [XenCenter], Version=0.0.0.0, Culture=neutral, PublicKeyToken=null restartToolstackToolStripMenuItem - XenAdmin.Commands.CommandToolStripMenuItem, [XenCenter_No_Space], Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + XenAdmin.Commands.CommandToolStripMenuItem, [XenCenter], Version=0.0.0.0, Culture=neutral, PublicKeyToken=null toolStripSeparator1 @@ -3892,19 +3487,19 @@ ReconnectToolStripMenuItem1 - XenAdmin.Commands.CommandToolStripMenuItem, [XenCenter_No_Space], Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + XenAdmin.Commands.CommandToolStripMenuItem, [XenCenter], Version=0.0.0.0, Culture=neutral, PublicKeyToken=null DisconnectToolStripMenuItem - XenAdmin.Commands.CommandToolStripMenuItem, [XenCenter_No_Space], Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + XenAdmin.Commands.CommandToolStripMenuItem, [XenCenter], Version=0.0.0.0, Culture=neutral, PublicKeyToken=null reconnectAsToolStripMenuItem - XenAdmin.Commands.CommandToolStripMenuItem, [XenCenter_No_Space], Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + XenAdmin.Commands.CommandToolStripMenuItem, [XenCenter], Version=0.0.0.0, Culture=neutral, PublicKeyToken=null toolStripSeparator4 @@ -3916,25 +3511,25 @@ connectAllToolStripMenuItem - XenAdmin.Commands.CommandToolStripMenuItem, [XenCenter_No_Space], Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + XenAdmin.Commands.CommandToolStripMenuItem, [XenCenter], Version=0.0.0.0, Culture=neutral, PublicKeyToken=null disconnectAllToolStripMenuItem - XenAdmin.Commands.CommandToolStripMenuItem, [XenCenter_No_Space], Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + XenAdmin.Commands.CommandToolStripMenuItem, [XenCenter], Version=0.0.0.0, Culture=neutral, PublicKeyToken=null addServerToPoolMenuItem - XenAdmin.Commands.AddSelectedHostToPoolToolStripMenuItem, [XenCenter_No_Space], Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + XenAdmin.Commands.AddSelectedHostToPoolToolStripMenuItem, [XenCenter], Version=0.0.0.0, Culture=neutral, PublicKeyToken=null menuItemRemoveFromPool - XenAdmin.Commands.CommandToolStripMenuItem, [XenCenter_No_Space], Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + XenAdmin.Commands.CommandToolStripMenuItem, [XenCenter], Version=0.0.0.0, Culture=neutral, PublicKeyToken=null toolStripSeparator3 @@ -3946,13 +3541,13 @@ backupToolStripMenuItem - XenAdmin.Commands.CommandToolStripMenuItem, [XenCenter_No_Space], Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + XenAdmin.Commands.CommandToolStripMenuItem, [XenCenter], Version=0.0.0.0, Culture=neutral, PublicKeyToken=null restoreFromBackupToolStripMenuItem - XenAdmin.Commands.CommandToolStripMenuItem, [XenCenter_No_Space], Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + XenAdmin.Commands.CommandToolStripMenuItem, [XenCenter], Version=0.0.0.0, Culture=neutral, PublicKeyToken=null toolStripSeparator23 @@ -3964,55 +3559,55 @@ toolStripMenuItemCertificate - XenAdmin.Commands.CommandToolStripMenuItem, [XenCenter_No_Space], Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + XenAdmin.Commands.CommandToolStripMenuItem, [XenCenter], Version=0.0.0.0, Culture=neutral, PublicKeyToken=null toolStripMenuItemInstallCertificate - XenAdmin.Commands.CommandToolStripMenuItem, [XenCenter_No_Space], Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + XenAdmin.Commands.CommandToolStripMenuItem, [XenCenter], Version=0.0.0.0, Culture=neutral, PublicKeyToken=null toolStripMenuItemResetCertificate - XenAdmin.Commands.CommandToolStripMenuItem, [XenCenter_No_Space], Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + XenAdmin.Commands.CommandToolStripMenuItem, [XenCenter], Version=0.0.0.0, Culture=neutral, PublicKeyToken=null maintenanceModeToolStripMenuItem1 - XenAdmin.Commands.CommandToolStripMenuItem, [XenCenter_No_Space], Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + XenAdmin.Commands.CommandToolStripMenuItem, [XenCenter], Version=0.0.0.0, Culture=neutral, PublicKeyToken=null controlDomainMemoryToolStripMenuItem - XenAdmin.Commands.CommandToolStripMenuItem, [XenCenter_No_Space], Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + XenAdmin.Commands.CommandToolStripMenuItem, [XenCenter], Version=0.0.0.0, Culture=neutral, PublicKeyToken=null RemoveCrashdumpsToolStripMenuItem - XenAdmin.Commands.CommandToolStripMenuItem, [XenCenter_No_Space], Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + XenAdmin.Commands.CommandToolStripMenuItem, [XenCenter], Version=0.0.0.0, Culture=neutral, PublicKeyToken=null HostPasswordToolStripMenuItem - XenAdmin.Commands.CommandToolStripMenuItem, [XenCenter_No_Space], Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + XenAdmin.Commands.CommandToolStripMenuItem, [XenCenter], Version=0.0.0.0, Culture=neutral, PublicKeyToken=null ChangeRootPasswordToolStripMenuItem - XenAdmin.Commands.CommandToolStripMenuItem, [XenCenter_No_Space], Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + XenAdmin.Commands.CommandToolStripMenuItem, [XenCenter], Version=0.0.0.0, Culture=neutral, PublicKeyToken=null forgetSavedPasswordToolStripMenuItem - XenAdmin.Commands.CommandToolStripMenuItem, [XenCenter_No_Space], Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + XenAdmin.Commands.CommandToolStripMenuItem, [XenCenter], Version=0.0.0.0, Culture=neutral, PublicKeyToken=null toolStripSeparator25 @@ -4024,13 +3619,13 @@ destroyServerToolStripMenuItem - XenAdmin.Commands.CommandToolStripMenuItem, [XenCenter_No_Space], Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + XenAdmin.Commands.CommandToolStripMenuItem, [XenCenter], Version=0.0.0.0, Culture=neutral, PublicKeyToken=null removeHostToolStripMenuItem - XenAdmin.Commands.CommandToolStripMenuItem, [XenCenter_No_Space], Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + XenAdmin.Commands.CommandToolStripMenuItem, [XenCenter], Version=0.0.0.0, Culture=neutral, PublicKeyToken=null toolStripSeparator15 @@ -4048,7 +3643,7 @@ ServerPropertiesToolStripMenuItem - XenAdmin.Commands.CommandToolStripMenuItem, [XenCenter_No_Space], Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + XenAdmin.Commands.CommandToolStripMenuItem, [XenCenter], Version=0.0.0.0, Culture=neutral, PublicKeyToken=null VMToolStripMenuItem @@ -4060,31 +3655,31 @@ NewVmToolStripMenuItem - XenAdmin.Commands.CommandToolStripMenuItem, [XenCenter_No_Space], Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + XenAdmin.Commands.CommandToolStripMenuItem, [XenCenter], Version=0.0.0.0, Culture=neutral, PublicKeyToken=null startShutdownToolStripMenuItem - XenAdmin.Commands.VMLifeCycleToolStripMenuItem, [XenCenter_No_Space], Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + XenAdmin.Commands.VMLifeCycleToolStripMenuItem, [XenCenter], Version=0.0.0.0, Culture=neutral, PublicKeyToken=null resumeOnToolStripMenuItem - XenAdmin.Commands.ResumeVMOnHostToolStripMenuItem, [XenCenter_No_Space], Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + XenAdmin.Commands.ResumeVMOnHostToolStripMenuItem, [XenCenter], Version=0.0.0.0, Culture=neutral, PublicKeyToken=null relocateToolStripMenuItem - XenAdmin.Commands.MigrateVMToolStripMenuItem, [XenCenter_No_Space], Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + XenAdmin.Commands.MigrateVMToolStripMenuItem, [XenCenter], Version=0.0.0.0, Culture=neutral, PublicKeyToken=null startOnHostToolStripMenuItem - XenAdmin.Commands.StartVMOnHostToolStripMenuItem, [XenCenter_No_Space], Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + XenAdmin.Commands.StartVMOnHostToolStripMenuItem, [XenCenter], Version=0.0.0.0, Culture=neutral, PublicKeyToken=null toolStripSeparator20 @@ -4096,13 +3691,13 @@ assignSnapshotScheduleToolStripMenuItem - XenAdmin.Commands.AssignGroupToolStripMenuItemVMSS, [XenCenter_No_Space], Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + XenAdmin.Commands.AssignGroupToolStripMenuItemVMSS, [XenCenter], Version=0.0.0.0, Culture=neutral, PublicKeyToken=null assignToVirtualApplianceToolStripMenuItem - XenAdmin.Commands.AssignGroupToolStripMenuItemVM_appliance, [XenCenter_No_Space], Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + XenAdmin.Commands.AssignGroupToolStripMenuItemVM_appliance, [XenCenter], Version=0.0.0.0, Culture=neutral, PublicKeyToken=null toolStripMenuItem9 @@ -4114,31 +3709,31 @@ copyVMtoSharedStorageMenuItem - XenAdmin.Commands.CommandToolStripMenuItem, [XenCenter_No_Space], Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + XenAdmin.Commands.CommandToolStripMenuItem, [XenCenter], Version=0.0.0.0, Culture=neutral, PublicKeyToken=null MoveVMToolStripMenuItem - XenAdmin.Commands.CommandToolStripMenuItem, [XenCenter_No_Space], Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + XenAdmin.Commands.CommandToolStripMenuItem, [XenCenter], Version=0.0.0.0, Culture=neutral, PublicKeyToken=null snapshotToolStripMenuItem - XenAdmin.Commands.CommandToolStripMenuItem, [XenCenter_No_Space], Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + XenAdmin.Commands.CommandToolStripMenuItem, [XenCenter], Version=0.0.0.0, Culture=neutral, PublicKeyToken=null convertToTemplateToolStripMenuItem - XenAdmin.Commands.CommandToolStripMenuItem, [XenCenter_No_Space], Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + XenAdmin.Commands.CommandToolStripMenuItem, [XenCenter], Version=0.0.0.0, Culture=neutral, PublicKeyToken=null exportToolStripMenuItem - XenAdmin.Commands.CommandToolStripMenuItem, [XenCenter_No_Space], Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + XenAdmin.Commands.CommandToolStripMenuItem, [XenCenter], Version=0.0.0.0, Culture=neutral, PublicKeyToken=null toolStripSeparator32 @@ -4150,25 +3745,25 @@ toolStripMenuItemVtpm - XenAdmin.Commands.CommandToolStripMenuItem, [XenCenter_No_Space], Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + XenAdmin.Commands.CommandToolStripMenuItem, [XenCenter], Version=0.0.0.0, Culture=neutral, PublicKeyToken=null disableCbtToolStripMenuItem - XenAdmin.Commands.CommandToolStripMenuItem, [XenCenter_No_Space], Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + XenAdmin.Commands.CommandToolStripMenuItem, [XenCenter], Version=0.0.0.0, Culture=neutral, PublicKeyToken=null enablePVSReadcachingToolStripMenuItem - XenAdmin.Commands.CommandToolStripMenuItem, [XenCenter_No_Space], Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + XenAdmin.Commands.CommandToolStripMenuItem, [XenCenter], Version=0.0.0.0, Culture=neutral, PublicKeyToken=null disablePVSReadcachingToolStripMenuItem - XenAdmin.Commands.CommandToolStripMenuItem, [XenCenter_No_Space], Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + XenAdmin.Commands.CommandToolStripMenuItem, [XenCenter], Version=0.0.0.0, Culture=neutral, PublicKeyToken=null toolStripMenuItem12 @@ -4180,7 +3775,7 @@ installToolsToolStripMenuItem - XenAdmin.Commands.CommandToolStripMenuItem, [XenCenter_No_Space], Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + XenAdmin.Commands.CommandToolStripMenuItem, [XenCenter], Version=0.0.0.0, Culture=neutral, PublicKeyToken=null sendCtrlAltDelToolStripMenuItem @@ -4198,7 +3793,7 @@ uninstallToolStripMenuItem - XenAdmin.Commands.CommandToolStripMenuItem, [XenCenter_No_Space], Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + XenAdmin.Commands.CommandToolStripMenuItem, [XenCenter], Version=0.0.0.0, Culture=neutral, PublicKeyToken=null toolStripSeparator10 @@ -4216,7 +3811,7 @@ VMPropertiesToolStripMenuItem - XenAdmin.Commands.CommandToolStripMenuItem, [XenCenter_No_Space], Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + XenAdmin.Commands.CommandToolStripMenuItem, [XenCenter], Version=0.0.0.0, Culture=neutral, PublicKeyToken=null toolStripMenuItem8 @@ -4234,7 +3829,7 @@ AddStorageToolStripMenuItem - XenAdmin.Commands.CommandToolStripMenuItem, [XenCenter_No_Space], Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + XenAdmin.Commands.CommandToolStripMenuItem, [XenCenter], Version=0.0.0.0, Culture=neutral, PublicKeyToken=null toolStripSeparator22 @@ -4246,13 +3841,13 @@ RepairStorageToolStripMenuItem - XenAdmin.Commands.CommandToolStripMenuItem, [XenCenter_No_Space], Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + XenAdmin.Commands.CommandToolStripMenuItem, [XenCenter], Version=0.0.0.0, Culture=neutral, PublicKeyToken=null DefaultSRToolStripMenuItem - XenAdmin.Commands.CommandToolStripMenuItem, [XenCenter_No_Space], Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + XenAdmin.Commands.CommandToolStripMenuItem, [XenCenter], Version=0.0.0.0, Culture=neutral, PublicKeyToken=null toolStripSeparator2 @@ -4264,25 +3859,25 @@ virtualDisksToolStripMenuItem - XenAdmin.Commands.CommandToolStripMenuItem, [XenCenter_No_Space], Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + XenAdmin.Commands.CommandToolStripMenuItem, [XenCenter], Version=0.0.0.0, Culture=neutral, PublicKeyToken=null addVirtualDiskToolStripMenuItem - XenAdmin.Commands.CommandToolStripMenuItem, [XenCenter_No_Space], Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + XenAdmin.Commands.CommandToolStripMenuItem, [XenCenter], Version=0.0.0.0, Culture=neutral, PublicKeyToken=null attachVirtualDiskToolStripMenuItem - XenAdmin.Commands.CommandToolStripMenuItem, [XenCenter_No_Space], Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + XenAdmin.Commands.CommandToolStripMenuItem, [XenCenter], Version=0.0.0.0, Culture=neutral, PublicKeyToken=null reclaimFreedSpacetripMenuItem - XenAdmin.Commands.CommandToolStripMenuItem, [XenCenter_No_Space], Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + XenAdmin.Commands.CommandToolStripMenuItem, [XenCenter], Version=0.0.0.0, Culture=neutral, PublicKeyToken=null toolStripSeparator19 @@ -4294,25 +3889,25 @@ DetachStorageToolStripMenuItem - XenAdmin.Commands.CommandToolStripMenuItem, [XenCenter_No_Space], Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + XenAdmin.Commands.CommandToolStripMenuItem, [XenCenter], Version=0.0.0.0, Culture=neutral, PublicKeyToken=null ReattachStorageRepositoryToolStripMenuItem - XenAdmin.Commands.CommandToolStripMenuItem, [XenCenter_No_Space], Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + XenAdmin.Commands.CommandToolStripMenuItem, [XenCenter], Version=0.0.0.0, Culture=neutral, PublicKeyToken=null ForgetStorageRepositoryToolStripMenuItem - XenAdmin.Commands.CommandToolStripMenuItem, [XenCenter_No_Space], Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + XenAdmin.Commands.CommandToolStripMenuItem, [XenCenter], Version=0.0.0.0, Culture=neutral, PublicKeyToken=null DestroyStorageRepositoryToolStripMenuItem - XenAdmin.Commands.CommandToolStripMenuItem, [XenCenter_No_Space], Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + XenAdmin.Commands.CommandToolStripMenuItem, [XenCenter], Version=0.0.0.0, Culture=neutral, PublicKeyToken=null toolStripSeparator18 @@ -4330,7 +3925,7 @@ SRPropertiesToolStripMenuItem - XenAdmin.Commands.CommandToolStripMenuItem, [XenCenter_No_Space], Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + XenAdmin.Commands.CommandToolStripMenuItem, [XenCenter], Version=0.0.0.0, Culture=neutral, PublicKeyToken=null templatesToolStripMenuItem @@ -4342,19 +3937,19 @@ CreateVmFromTemplateToolStripMenuItem - XenAdmin.Commands.CommandToolStripMenuItem, [XenCenter_No_Space], Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + XenAdmin.Commands.CommandToolStripMenuItem, [XenCenter], Version=0.0.0.0, Culture=neutral, PublicKeyToken=null newVMFromTemplateToolStripMenuItem - XenAdmin.Commands.CommandToolStripMenuItem, [XenCenter_No_Space], Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + XenAdmin.Commands.CommandToolStripMenuItem, [XenCenter], Version=0.0.0.0, Culture=neutral, PublicKeyToken=null InstantVmToolStripMenuItem - XenAdmin.Commands.CommandToolStripMenuItem, [XenCenter_No_Space], Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + XenAdmin.Commands.CommandToolStripMenuItem, [XenCenter], Version=0.0.0.0, Culture=neutral, PublicKeyToken=null toolStripSeparator29 @@ -4366,13 +3961,13 @@ exportTemplateToolStripMenuItem - XenAdmin.Commands.CommandToolStripMenuItem, [XenCenter_No_Space], Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + XenAdmin.Commands.CommandToolStripMenuItem, [XenCenter], Version=0.0.0.0, Culture=neutral, PublicKeyToken=null duplicateTemplateToolStripMenuItem - XenAdmin.Commands.CommandToolStripMenuItem, [XenCenter_No_Space], Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + XenAdmin.Commands.CommandToolStripMenuItem, [XenCenter], Version=0.0.0.0, Culture=neutral, PublicKeyToken=null toolStripSeparator16 @@ -4384,7 +3979,7 @@ uninstallTemplateToolStripMenuItem - XenAdmin.Commands.CommandToolStripMenuItem, [XenCenter_No_Space], Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + XenAdmin.Commands.CommandToolStripMenuItem, [XenCenter], Version=0.0.0.0, Culture=neutral, PublicKeyToken=null toolStripSeparator28 @@ -4402,7 +3997,7 @@ templatePropertiesToolStripMenuItem - XenAdmin.Commands.CommandToolStripMenuItem, [XenCenter_No_Space], Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + XenAdmin.Commands.CommandToolStripMenuItem, [XenCenter], Version=0.0.0.0, Culture=neutral, PublicKeyToken=null toolsToolStripMenuItem @@ -4414,7 +4009,7 @@ bugToolToolStripMenuItem - XenAdmin.Commands.CommandToolStripMenuItem, [XenCenter_No_Space], Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + XenAdmin.Commands.CommandToolStripMenuItem, [XenCenter], Version=0.0.0.0, Culture=neutral, PublicKeyToken=null toolStripSeparator14 @@ -4444,13 +4039,13 @@ installNewUpdateToolStripMenuItem - XenAdmin.Commands.CommandToolStripMenuItem, [XenCenter_No_Space], Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + XenAdmin.Commands.CommandToolStripMenuItem, [XenCenter], Version=0.0.0.0, Culture=neutral, PublicKeyToken=null rollingUpgradeToolStripMenuItem - XenAdmin.Commands.CommandToolStripMenuItem, [XenCenter_No_Space], Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + XenAdmin.Commands.CommandToolStripMenuItem, [XenCenter], Version=0.0.0.0, Culture=neutral, PublicKeyToken=null toolStripSeparator6 @@ -4576,7 +4171,7 @@ securityGroupsToolStripMenuItem - XenAdmin.Commands.CommandToolStripMenuItem, [XenCenter_No_Space], Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + XenAdmin.Commands.CommandToolStripMenuItem, [XenCenter], Version=0.0.0.0, Culture=neutral, PublicKeyToken=null statusProgressBar @@ -4602,18 +4197,18 @@ System.Windows.Forms.ToolStripSplitButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - statusButtonCdnUpdates - - - System.Windows.Forms.ToolStripSplitButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - statusButtonUpdates System.Windows.Forms.ToolStripSplitButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + statusButtonCdnUpdates + + + System.Windows.Forms.ToolStripSplitButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + statusButtonAlerts diff --git a/XenAdmin/MainWindow.zh-CN.resx b/XenAdmin/MainWindow.zh-CN.resx index 3860254848..5a85be59cf 100755 --- a/XenAdmin/MainWindow.zh-CN.resx +++ b/XenAdmin/MainWindow.zh-CN.resx @@ -555,36 +555,6 @@ 12 - - True - - - Fill - - - 0, 0 - - - 0, 0, 0, 0 - - - 753, 592 - - - 0 - - - snapshotPage - - - XenAdmin.TabPages.SnapshotsPage, XenCenterMain, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null - - - TabPageSnapshots - - - 0 - 4, 22 diff --git a/XenAdmin/Program.cs b/XenAdmin/Program.cs index ce5b95b63b..302d1c9b85 100644 --- a/XenAdmin/Program.cs +++ b/XenAdmin/Program.cs @@ -144,8 +144,11 @@ static Program() [STAThread] public static void Main(string[] args) { - string appGuid = ((GuidAttribute)Assembly.GetExecutingAssembly().GetCustomAttributes(typeof(GuidAttribute), false).GetValue(0)).Value; - _pipePath = string.Format(PIPE_PATH_PATTERN, BrandManager.BrandConsole, Process.GetCurrentProcess().SessionId, Environment.UserName, appGuid); + _pipePath = string.Format(PIPE_PATH_PATTERN, + BrandManager.BrandConsole, + Process.GetCurrentProcess().SessionId, + Environment.UserName, + Assembly.GetExecutingAssembly().Location.Replace('\\', '-')); if (NamedPipes.Pipe.ExistsPipe(_pipePath)) { diff --git a/XenAdmin/TabPages/DockerDetailsPage.cs b/XenAdmin/TabPages/DockerDetailsPage.cs index 67be1c6eda..e0d3e9f789 100755 --- a/XenAdmin/TabPages/DockerDetailsPage.cs +++ b/XenAdmin/TabPages/DockerDetailsPage.cs @@ -37,6 +37,7 @@ using XenAdmin.Model; using System.Xml; using System.Collections; +using System.ComponentModel; namespace XenAdmin.TabPages { @@ -49,6 +50,8 @@ public partial class DockerDetailsPage : BaseTabPage private Host host; private string cachedResult; + [Browsable(false)] + [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)] public DockerContainer DockerContainer { get diff --git a/XenAdmin/TabPages/DockerProcessPage.cs b/XenAdmin/TabPages/DockerProcessPage.cs index 54157934cc..c309bd7e37 100644 --- a/XenAdmin/TabPages/DockerProcessPage.cs +++ b/XenAdmin/TabPages/DockerProcessPage.cs @@ -30,6 +30,7 @@ using System; using System.Collections.Generic; +using System.ComponentModel; using System.Xml; using System.Windows.Forms; using XenAdmin.Actions; @@ -61,6 +62,8 @@ public DockerProcessPage() public override string HelpID => "TabPageDockerProcess"; + [Browsable(false)] + [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)] public DockerContainer DockerContainer { get diff --git a/XenAdmin/TabPages/NICPage.cs b/XenAdmin/TabPages/NICPage.cs index ffe4d90136..2bcf3ef59c 100644 --- a/XenAdmin/TabPages/NICPage.cs +++ b/XenAdmin/TabPages/NICPage.cs @@ -57,6 +57,8 @@ public NICPage() private readonly CollectionChangeEventHandler PIF_CollectionChangedWithInvoke; + [Browsable(false)] + [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)] public Host Host { get diff --git a/XenAdmin/TabPages/NetworkPage.cs b/XenAdmin/TabPages/NetworkPage.cs index 737d7a5a3a..b2c16c95aa 100644 --- a/XenAdmin/TabPages/NetworkPage.cs +++ b/XenAdmin/TabPages/NetworkPage.cs @@ -30,6 +30,7 @@ using System; using System.Collections.Generic; +using System.ComponentModel; using System.Windows.Forms; using XenAPI; @@ -44,9 +45,12 @@ public partial class NetworkPage : BaseTabPage private static readonly log4net.ILog log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); // We don't rebuild the controls while the tab is not visible, but instead queue it up later for when the page is displayed. - private bool refreshNeeded = false; + private bool refreshNeeded; private IXenObject _xenObject; + + [Browsable(false)] + [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)] public IXenObject XenObject { get diff --git a/XenAdmin/TabPages/PvsPage.cs b/XenAdmin/TabPages/PvsPage.cs index 2e952551e9..63333af3e3 100644 --- a/XenAdmin/TabPages/PvsPage.cs +++ b/XenAdmin/TabPages/PvsPage.cs @@ -71,6 +71,8 @@ public PvsPage() public override string HelpID => "TabPagePvs"; + [Browsable(false)] + [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)] public IXenConnection Connection { get diff --git a/XenAdmin/TabPages/SnapshotsPage.cs b/XenAdmin/TabPages/SnapshotsPage.cs index b26b5ce2f7..f4ed27a995 100644 --- a/XenAdmin/TabPages/SnapshotsPage.cs +++ b/XenAdmin/TabPages/SnapshotsPage.cs @@ -115,6 +115,8 @@ void DataGridView_Sorted(object sender, EventArgs e) } } + [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)] + [Browsable(false)] public VM VM { set diff --git a/XenAdmin/TabPages/UpsellTabPage.cs b/XenAdmin/TabPages/UpsellTabPage.cs index dbd981e954..ba0580cf48 100644 --- a/XenAdmin/TabPages/UpsellTabPage.cs +++ b/XenAdmin/TabPages/UpsellTabPage.cs @@ -28,6 +28,7 @@ * SUCH DAMAGE. */ +using System.ComponentModel; using XenAdmin.Core; @@ -35,31 +36,28 @@ namespace XenAdmin.TabPages { public partial class UpsellTabPage : BaseTabPage { - protected UpsellTabPage(string title, string blurb) + protected UpsellTabPage() { InitializeComponent(); - base.Text = title; - - BlurbText = blurb; - LearnMoreUrl = InvisibleMessages.UPSELL_LEARNMOREURL_TRIAL; } - public string BlurbText + protected string BlurbText { set => upsellPage1.BlurbText = value; } - public string LearnMoreUrl + protected string Title { - set => upsellPage1.LearnMoreUrl = value; + set => Text = value; } } public class ADUpsellPage : UpsellTabPage { public ADUpsellPage() - : base(Messages.ACTIVE_DIRECTORY_TAB_TITLE, string.Format(Messages.UPSELL_BLURB_AD, BrandManager.ProductBrand)) { + Title = Messages.ACTIVE_DIRECTORY_TAB_TITLE; + BlurbText = string.Format(Messages.UPSELL_BLURB_AD, BrandManager.ProductBrand); } public override string HelpID => "TabPageADUpsell"; @@ -68,8 +66,10 @@ public ADUpsellPage() public class HAUpsellPage : UpsellTabPage { public HAUpsellPage() - : base(Messages.HIGH_AVAILABILITY, Messages.UPSELL_BLURB_HA) - { } + { + Title = Messages.HIGH_AVAILABILITY; + BlurbText = Messages.UPSELL_BLURB_HA; + } public override string HelpID => "TabPageHAUpsell"; } @@ -77,8 +77,10 @@ public HAUpsellPage() public class WLBUpsellPage : UpsellTabPage { public WLBUpsellPage() - : base(Messages.WORKLOAD_BALANCING, Messages.UPSELL_BLURB_WLB) - { } + { + Title = Messages.WORKLOAD_BALANCING; + BlurbText = Messages.UPSELL_BLURB_WLB; + } public override string HelpID => "TabPageWLBUpsell"; } diff --git a/XenAdmin/TabPages/UsbPage.cs b/XenAdmin/TabPages/UsbPage.cs index de8e19e436..26cb95bbda 100755 --- a/XenAdmin/TabPages/UsbPage.cs +++ b/XenAdmin/TabPages/UsbPage.cs @@ -43,6 +43,8 @@ namespace XenAdmin.TabPages public partial class UsbPage : BaseTabPage { private Host _host; + private HostUsbRow selectedRow; + private bool InBuildList; public UsbPage() { @@ -56,6 +58,8 @@ public UsbPage() public override string HelpID => "TabPageUSB"; + [Browsable(false)] + [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)] public IXenObject XenObject { get @@ -80,7 +84,6 @@ public IXenObject XenObject } } - public bool InBuildList = false; private void BuildList() { Program.AssertOnEventThread(); @@ -121,11 +124,6 @@ private void BuildList() } } - protected override void OnVisibleChanged(EventArgs e) - { - base.OnVisibleChanged(e); - } - public override void PageHidden() { UnregisterHandlers(); @@ -133,12 +131,12 @@ public override void PageHidden() base.PageHidden(); } - void Host_PropertyChanged(object sender, PropertyChangedEventArgs e) + private void Host_PropertyChanged(object sender, PropertyChangedEventArgs e) { RefreshAllItems(); } - void UsbCollectionChanged(object sender, EventArgs e) + private void UsbCollectionChanged(object sender, EventArgs e) { BuildList(); } @@ -153,7 +151,7 @@ private void RefreshAllItems() } } - internal void UnregisterHandlers() + private void UnregisterHandlers() { if (_host != null) { @@ -169,7 +167,6 @@ internal void UnregisterHandlers() } } - private HostUsbRow selectedRow = null; private void dataGridViewUsbList_SelectionChanged(object sender, EventArgs e) { selectedRow = null; diff --git a/XenAdmin/XenAdmin.csproj b/XenAdmin/XenAdmin.csproj index f991310df6..ce61eca484 100755 --- a/XenAdmin/XenAdmin.csproj +++ b/XenAdmin/XenAdmin.csproj @@ -199,6 +199,9 @@ DiskSpinner.cs + + Component + Component