From d928a406bcfc22699161cea75f831c0d2f89e072 Mon Sep 17 00:00:00 2001 From: Callum McIntyre Date: Mon, 22 Aug 2016 17:44:56 +0100 Subject: [PATCH 1/3] CA-152163: Duplicate hotkey "S" on "Location Mirrored SRs" wizard. Moved the hotkey for "Find Storage Repositories" from S to R. Signed-off-by: Callum McIntyre --- .../DRFailoverWizardStoragePage.Designer.cs | 3 +- .../DRFailoverWizardStoragePage.resx | 85 ++++++++++--------- 2 files changed, 46 insertions(+), 42 deletions(-) diff --git a/XenAdmin/Wizards/DRWizards/DRFailoverWizardStoragePage.Designer.cs b/XenAdmin/Wizards/DRWizards/DRFailoverWizardStoragePage.Designer.cs index fa106dc9c..fcbde15e2 100644 --- a/XenAdmin/Wizards/DRWizards/DRFailoverWizardStoragePage.Designer.cs +++ b/XenAdmin/Wizards/DRWizards/DRFailoverWizardStoragePage.Designer.cs @@ -99,8 +99,8 @@ dataGridViewCellStyle2.SelectionForeColor = System.Drawing.SystemColors.HighlightText; this.dataGridViewSRs.RowsDefaultCellStyle = dataGridViewCellStyle2; this.tableLayoutPanel1.SetRowSpan(this.dataGridViewSRs, 2); - this.dataGridViewSRs.CellValueChanged += new System.Windows.Forms.DataGridViewCellEventHandler(this.dataGridViewSRs_CellValueChanged); this.dataGridViewSRs.CellClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dataGridViewSRs_CellClick); + this.dataGridViewSRs.CellValueChanged += new System.Windows.Forms.DataGridViewCellEventHandler(this.dataGridViewSRs_CellValueChanged); // // columnTick // @@ -152,6 +152,7 @@ // // FindSrsOptionsMenuStrip // + this.FindSrsOptionsMenuStrip.ImageScalingSize = new System.Drawing.Size(40, 40); this.FindSrsOptionsMenuStrip.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { this.iscsiToolStripMenuItem, this.fcToolStripMenuItem}); diff --git a/XenAdmin/Wizards/DRWizards/DRFailoverWizardStoragePage.resx b/XenAdmin/Wizards/DRWizards/DRFailoverWizardStoragePage.resx index 47769ceef..ed6778baa 100644 --- a/XenAdmin/Wizards/DRWizards/DRFailoverWizardStoragePage.resx +++ b/XenAdmin/Wizards/DRWizards/DRFailoverWizardStoragePage.resx @@ -112,16 +112,16 @@ 2.0 - System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + True - + GrowAndShrink @@ -131,9 +131,9 @@ NoControl - + - 479, 89 + 1314, 159 75, 23 @@ -148,7 +148,7 @@ buttonClearAll - System.Windows.Forms.Button, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 tableLayoutPanel1 @@ -156,7 +156,7 @@ 0 - + True @@ -165,7 +165,7 @@ 5 - + True @@ -177,7 +177,7 @@ 115 - + True @@ -189,7 +189,7 @@ 115 - + True @@ -201,7 +201,7 @@ 90 - + True @@ -220,10 +220,10 @@ Segoe UI, 9pt - 3, 60 + 3, 130 - 470, 303 + 1305, 782 6 @@ -253,7 +253,7 @@ NoControl - 3, 28 + 3, 79 3, 6, 6, 6 @@ -262,13 +262,13 @@ 0, 0, 5, 0 - 150, 23 + 366, 42 5 - Find &Storage Repositories + Find Storage &Repositories MiddleLeft @@ -280,7 +280,7 @@ FindSrsButton - System.Windows.Forms.Button, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 tableLayoutPanel1 @@ -292,7 +292,7 @@ NoControl - 479, 60 + 1314, 130 75, 23 @@ -307,7 +307,7 @@ buttonSelectAll - System.Windows.Forms.Button, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 tableLayoutPanel1 @@ -325,7 +325,7 @@ 4 - 557, 366 + 1392, 915 66 @@ -334,7 +334,7 @@ tableLayoutPanel1 - System.Windows.Forms.TableLayoutPanel, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Windows.Forms.TableLayoutPanel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 $this @@ -358,7 +358,7 @@ 0, 3, 0, 6 - 554, 22 + 1361, 73 1 @@ -370,7 +370,7 @@ labelText - System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 tableLayoutPanel1 @@ -378,23 +378,23 @@ 3 - + 17, 11 - 199, 22 + 445, 46 Find Software iSCSI SRs - 199, 22 + 445, 46 Find Hardware HBA SRs - 200, 48 + 446, 96 FindSrsOptionsMenuStrip @@ -402,59 +402,62 @@ XenAdmin.Controls.NonReopeningContextMenuStrip, XenCenterMain, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null - - 92 - - + True + + 92 + - 96, 96 + 240, 240 + + + 8, 8, 8, 8 - 557, 366 + 1392, 915 columnTick - System.Windows.Forms.DataGridViewCheckBoxColumn, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Windows.Forms.DataGridViewCheckBoxColumn, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 columnName - System.Windows.Forms.DataGridViewTextBoxColumn, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Windows.Forms.DataGridViewTextBoxColumn, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 columnDesc - System.Windows.Forms.DataGridViewTextBoxColumn, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Windows.Forms.DataGridViewTextBoxColumn, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 columnType - System.Windows.Forms.DataGridViewTextBoxColumn, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Windows.Forms.DataGridViewTextBoxColumn, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 columnMetadata - System.Windows.Forms.DataGridViewTextBoxColumn, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Windows.Forms.DataGridViewTextBoxColumn, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 iscsiToolStripMenuItem - System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 fcToolStripMenuItem - System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 DRFailoverWizardStoragePage From 493b86a5c3ae25d8305d08ff6aa50bf5b5fe0666 Mon Sep 17 00:00:00 2001 From: Callum McIntyre Date: Tue, 23 Aug 2016 10:37:29 +0100 Subject: [PATCH 2/3] Revert "CA-152163: Duplicate hotkey "S" on "Location Mirrored SRs" wizard." This reverts commit d928a406bcfc22699161cea75f831c0d2f89e072. --- .../DRFailoverWizardStoragePage.Designer.cs | 3 +- .../DRFailoverWizardStoragePage.resx | 85 +++++++++---------- 2 files changed, 42 insertions(+), 46 deletions(-) diff --git a/XenAdmin/Wizards/DRWizards/DRFailoverWizardStoragePage.Designer.cs b/XenAdmin/Wizards/DRWizards/DRFailoverWizardStoragePage.Designer.cs index fcbde15e2..fa106dc9c 100644 --- a/XenAdmin/Wizards/DRWizards/DRFailoverWizardStoragePage.Designer.cs +++ b/XenAdmin/Wizards/DRWizards/DRFailoverWizardStoragePage.Designer.cs @@ -99,8 +99,8 @@ dataGridViewCellStyle2.SelectionForeColor = System.Drawing.SystemColors.HighlightText; this.dataGridViewSRs.RowsDefaultCellStyle = dataGridViewCellStyle2; this.tableLayoutPanel1.SetRowSpan(this.dataGridViewSRs, 2); - this.dataGridViewSRs.CellClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dataGridViewSRs_CellClick); this.dataGridViewSRs.CellValueChanged += new System.Windows.Forms.DataGridViewCellEventHandler(this.dataGridViewSRs_CellValueChanged); + this.dataGridViewSRs.CellClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dataGridViewSRs_CellClick); // // columnTick // @@ -152,7 +152,6 @@ // // FindSrsOptionsMenuStrip // - this.FindSrsOptionsMenuStrip.ImageScalingSize = new System.Drawing.Size(40, 40); this.FindSrsOptionsMenuStrip.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { this.iscsiToolStripMenuItem, this.fcToolStripMenuItem}); diff --git a/XenAdmin/Wizards/DRWizards/DRFailoverWizardStoragePage.resx b/XenAdmin/Wizards/DRWizards/DRFailoverWizardStoragePage.resx index ed6778baa..47769ceef 100644 --- a/XenAdmin/Wizards/DRWizards/DRFailoverWizardStoragePage.resx +++ b/XenAdmin/Wizards/DRWizards/DRFailoverWizardStoragePage.resx @@ -112,16 +112,16 @@ 2.0 - System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + True - + GrowAndShrink @@ -131,9 +131,9 @@ NoControl - + - 1314, 159 + 479, 89 75, 23 @@ -148,7 +148,7 @@ buttonClearAll - System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Windows.Forms.Button, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 tableLayoutPanel1 @@ -156,7 +156,7 @@ 0 - + True @@ -165,7 +165,7 @@ 5 - + True @@ -177,7 +177,7 @@ 115 - + True @@ -189,7 +189,7 @@ 115 - + True @@ -201,7 +201,7 @@ 90 - + True @@ -220,10 +220,10 @@ Segoe UI, 9pt - 3, 130 + 3, 60 - 1305, 782 + 470, 303 6 @@ -253,7 +253,7 @@ NoControl - 3, 79 + 3, 28 3, 6, 6, 6 @@ -262,13 +262,13 @@ 0, 0, 5, 0 - 366, 42 + 150, 23 5 - Find Storage &Repositories + Find &Storage Repositories MiddleLeft @@ -280,7 +280,7 @@ FindSrsButton - System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Windows.Forms.Button, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 tableLayoutPanel1 @@ -292,7 +292,7 @@ NoControl - 1314, 130 + 479, 60 75, 23 @@ -307,7 +307,7 @@ buttonSelectAll - System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Windows.Forms.Button, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 tableLayoutPanel1 @@ -325,7 +325,7 @@ 4 - 1392, 915 + 557, 366 66 @@ -334,7 +334,7 @@ tableLayoutPanel1 - System.Windows.Forms.TableLayoutPanel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Windows.Forms.TableLayoutPanel, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 $this @@ -358,7 +358,7 @@ 0, 3, 0, 6 - 1361, 73 + 554, 22 1 @@ -370,7 +370,7 @@ labelText - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 tableLayoutPanel1 @@ -378,23 +378,23 @@ 3 - + 17, 11 - 445, 46 + 199, 22 Find Software iSCSI SRs - 445, 46 + 199, 22 Find Hardware HBA SRs - 446, 96 + 200, 48 FindSrsOptionsMenuStrip @@ -402,62 +402,59 @@ XenAdmin.Controls.NonReopeningContextMenuStrip, XenCenterMain, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null - - True - - + 92 + + True + - 240, 240 - - - 8, 8, 8, 8 + 96, 96 - 1392, 915 + 557, 366 columnTick - System.Windows.Forms.DataGridViewCheckBoxColumn, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Windows.Forms.DataGridViewCheckBoxColumn, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 columnName - System.Windows.Forms.DataGridViewTextBoxColumn, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Windows.Forms.DataGridViewTextBoxColumn, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 columnDesc - System.Windows.Forms.DataGridViewTextBoxColumn, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Windows.Forms.DataGridViewTextBoxColumn, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 columnType - System.Windows.Forms.DataGridViewTextBoxColumn, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Windows.Forms.DataGridViewTextBoxColumn, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 columnMetadata - System.Windows.Forms.DataGridViewTextBoxColumn, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Windows.Forms.DataGridViewTextBoxColumn, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 iscsiToolStripMenuItem - System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 fcToolStripMenuItem - System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 DRFailoverWizardStoragePage From af9327d30a8ba474f0c43b8bfedf8ecb8ec03640 Mon Sep 17 00:00:00 2001 From: Callum McIntyre Date: Tue, 23 Aug 2016 10:52:00 +0100 Subject: [PATCH 3/3] CA-152163: Duplicate hotkey "S" on "Location Mirrored SRs" wizard. Redone the commit without any size changes. Signed-off-by: Callum McIntyre --- .../DRFailoverWizardStoragePage.resx | 30 +++++++++---------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/XenAdmin/Wizards/DRWizards/DRFailoverWizardStoragePage.resx b/XenAdmin/Wizards/DRWizards/DRFailoverWizardStoragePage.resx index 47769ceef..30f15bd57 100644 --- a/XenAdmin/Wizards/DRWizards/DRFailoverWizardStoragePage.resx +++ b/XenAdmin/Wizards/DRWizards/DRFailoverWizardStoragePage.resx @@ -112,16 +112,16 @@ 2.0 - System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + True - + GrowAndShrink @@ -148,7 +148,7 @@ buttonClearAll - System.Windows.Forms.Button, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 tableLayoutPanel1 @@ -156,7 +156,7 @@ 0 - + True @@ -165,7 +165,7 @@ 5 - + True @@ -177,7 +177,7 @@ 115 - + True @@ -189,7 +189,7 @@ 115 - + True @@ -201,7 +201,7 @@ 90 - + True @@ -268,7 +268,7 @@ 5 - Find &Storage Repositories + Find Storage &Repositories MiddleLeft @@ -280,7 +280,7 @@ FindSrsButton - System.Windows.Forms.Button, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 tableLayoutPanel1 @@ -307,7 +307,7 @@ buttonSelectAll - System.Windows.Forms.Button, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 tableLayoutPanel1 @@ -334,7 +334,7 @@ tableLayoutPanel1 - System.Windows.Forms.TableLayoutPanel, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Windows.Forms.TableLayoutPanel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 $this @@ -370,7 +370,7 @@ labelText - System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 tableLayoutPanel1