From 9b2204d3dff6bf128eb2ebf197c6a56b18a1a7a3 Mon Sep 17 00:00:00 2001 From: Konstantina Chremmou Date: Fri, 8 Sep 2023 15:09:05 +0100 Subject: [PATCH] Removed snapshot page from the designer. Add it to the main window like the other pages. Signed-off-by: Konstantina Chremmou --- XenAdmin/MainWindow.Designer.cs | 11 ----------- XenAdmin/MainWindow.cs | 3 +++ XenAdmin/MainWindow.ja.resx | 30 ------------------------------ XenAdmin/MainWindow.resx | 32 +------------------------------- XenAdmin/MainWindow.zh-CN.resx | 30 ------------------------------ 5 files changed, 4 insertions(+), 102 deletions(-) diff --git a/XenAdmin/MainWindow.Designer.cs b/XenAdmin/MainWindow.Designer.cs index 249b3ea496..f18bcc15e8 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(); @@ -300,7 +299,6 @@ private void InitializeComponent() 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"); @@ -2098,7 +2089,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(); @@ -2244,7 +2234,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; diff --git a/XenAdmin/MainWindow.cs b/XenAdmin/MainWindow.cs index 49cbb80583..7ffa2c9856 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 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 2b456e6385..e915993871 100644 --- a/XenAdmin/MainWindow.resx +++ b/XenAdmin/MainWindow.resx @@ -555,36 +555,6 @@ 12 - - True - - - Fill - - - 0, 0 - - - 0, 0, 0, 0 - - - 753, 591 - - - 0 - - - snapshotPage - - - XenAdmin.TabPages.SnapshotsPage, [XenCenter], Version=0.0.0.0, Culture=neutral, PublicKeyToken=null - - - TabPageSnapshots - - - 0 - 4, 22 @@ -2917,7 +2887,7 @@ None - 483, 22 + 514, 22 MiddleLeft 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