Kiu/xenadmin
1
0
Fork 0
mirror of https://github.com/xcp-ng/xenadmin.git synced 2024-11-27 02:56:01 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

CA-152163: Duplicate hotkey "S" on "Location Mirrored SRs" wizard.

Browse Source 
Moved the hotkey for "Find Storage Repositories" from S to R.

Signed-off-by: Callum McIntyre <callumiandavid.mcintyre@citrix.com>
This commit is contained in:
Callum McIntyre 2016-08-22 17:44:56 +01:00
parent 1994695fa6
commit d928a406bc
2 changed files with 46 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
XenAdmin/Wizards/DRWizards/DRFailoverWizardStoragePage.Designer.cs generated
View File

@ -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});

85
XenAdmin/Wizards/DRWizards/DRFailoverWizardStoragePage.resx
View File

@ -112,16 +112,16 @@
<value>2.0</value>
</resheader>
<resheader name="reader">
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<assembly alias="mscorlib" name="mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<assembly alias="mscorlib" name="mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<data name="labelText.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
</data>
<assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<data name="tableLayoutPanel1.AutoSizeMode" type="System.Windows.Forms.AutoSizeMode, System.Windows.Forms">
<value>GrowAndShrink</value>
</data>
@ -131,9 +131,9 @@
<data name="buttonClearAll.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
<value>NoControl</value>
</data>
<assembly alias="System.Drawing" name="System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<data name="buttonClearAll.Location" type="System.Drawing.Point, System.Drawing">
<value>479, 89</value>
<value>1314, 159</value>
</data>
<data name="buttonClearAll.Size" type="System.Drawing.Size, System.Drawing">
<value>75, 23</value>
@ -148,7 +148,7 @@
<value>buttonClearAll</value>
</data>
<data name="&gt;&gt;buttonClearAll.Type" xml:space="preserve">
<value>System.Windows.Forms.Button, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
<value>System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;buttonClearAll.Parent" xml:space="preserve">
<value>tableLayoutPanel1</value>
@ -156,7 +156,7 @@
<data name="&gt;&gt;buttonClearAll.ZOrder" xml:space="preserve">
<value>0</value>
</data>
<metadata name="columnTick.UserAddedColumn" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<metadata name="columnTick.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<data name="columnTick.HeaderText" xml:space="preserve">
@ -165,7 +165,7 @@
<data name="columnTick.Width" type="System.Int32, mscorlib">
<value>5</value>
</data>
<metadata name="columnName.UserAddedColumn" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<metadata name="columnName.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<data name="columnName.HeaderText" xml:space="preserve">
@ -177,7 +177,7 @@
<data name="columnName.Width" type="System.Int32, mscorlib">
<value>115</value>
</data>
<metadata name="columnDesc.UserAddedColumn" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<metadata name="columnDesc.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<data name="columnDesc.HeaderText" xml:space="preserve">
@ -189,7 +189,7 @@
<data name="columnDesc.Width" type="System.Int32, mscorlib">
<value>115</value>
</data>
<metadata name="columnType.UserAddedColumn" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<metadata name="columnType.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<data name="columnType.HeaderText" xml:space="preserve">
@ -201,7 +201,7 @@
<data name="columnType.Width" type="System.Int32, mscorlib">
<value>90</value>
</data>
<metadata name="columnMetadata.UserAddedColumn" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<metadata name="columnMetadata.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<data name="columnMetadata.HeaderText" xml:space="preserve">
@ -220,10 +220,10 @@
<value>Segoe UI, 9pt</value>
</data>
<data name="dataGridViewSRs.Location" type="System.Drawing.Point, System.Drawing">
<value>3, 60</value>
<value>3, 130</value>
</data>
<data name="dataGridViewSRs.Size" type="System.Drawing.Size, System.Drawing">
<value>470, 303</value>
<value>1305, 782</value>
</data>
<data name="dataGridViewSRs.TabIndex" type="System.Int32, mscorlib">
<value>6</value>
@ -253,7 +253,7 @@
<value>NoControl</value>
</data>
<data name="FindSrsButton.Location" type="System.Drawing.Point, System.Drawing">
<value>3, 28</value>
<value>3, 79</value>
</data>
<data name="FindSrsButton.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
<value>3, 6, 6, 6</value>
@ -262,13 +262,13 @@
<value>0, 0, 5, 0</value>
</data>
<data name="FindSrsButton.Size" type="System.Drawing.Size, System.Drawing">
<value>150, 23</value>
<value>366, 42</value>
</data>
<data name="FindSrsButton.TabIndex" type="System.Int32, mscorlib">
<value>5</value>
</data>
<data name="FindSrsButton.Text" xml:space="preserve">
<value>Find &amp;Storage Repositories</value>
<value>Find Storage &amp;Repositories</value>
</data>
<data name="FindSrsButton.TextAlign" type="System.Drawing.ContentAlignment, System.Drawing">
<value>MiddleLeft</value>
@ -280,7 +280,7 @@
<value>FindSrsButton</value>
</data>
<data name="&gt;&gt;FindSrsButton.Type" xml:space="preserve">
<value>System.Windows.Forms.Button, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
<value>System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;FindSrsButton.Parent" xml:space="preserve">
<value>tableLayoutPanel1</value>
@ -292,7 +292,7 @@
<value>NoControl</value>
</data>
<data name="buttonSelectAll.Location" type="System.Drawing.Point, System.Drawing">
<value>479, 60</value>
<value>1314, 130</value>
</data>
<data name="buttonSelectAll.Size" type="System.Drawing.Size, System.Drawing">
<value>75, 23</value>
@ -307,7 +307,7 @@
<value>buttonSelectAll</value>
</data>
<data name="&gt;&gt;buttonSelectAll.Type" xml:space="preserve">
<value>System.Windows.Forms.Button, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
<value>System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;buttonSelectAll.Parent" xml:space="preserve">
<value>tableLayoutPanel1</value>
@ -325,7 +325,7 @@
<value>4</value>
</data>
<data name="tableLayoutPanel1.Size" type="System.Drawing.Size, System.Drawing">
<value>557, 366</value>
<value>1392, 915</value>
</data>
<data name="tableLayoutPanel1.TabIndex" type="System.Int32, mscorlib">
<value>66</value>
@ -334,7 +334,7 @@
<value>tableLayoutPanel1</value>
</data>
<data name="&gt;&gt;tableLayoutPanel1.Type" xml:space="preserve">
<value>System.Windows.Forms.TableLayoutPanel, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
<value>System.Windows.Forms.TableLayoutPanel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;tableLayoutPanel1.Parent" xml:space="preserve">
<value>$this</value>
@ -358,7 +358,7 @@
<value>0, 3, 0, 6</value>
</data>
<data name="labelText.Size" type="System.Drawing.Size, System.Drawing">
<value>554, 22</value>
<value>1361, 73</value>
</data>
<data name="labelText.TabIndex" type="System.Int32, mscorlib">
<value>1</value>
@ -370,7 +370,7 @@
<value>labelText</value>
</data>
<data name="&gt;&gt;labelText.Type" xml:space="preserve">
<value>System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
<value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;labelText.Parent" xml:space="preserve">
<value>tableLayoutPanel1</value>
@ -378,23 +378,23 @@
<data name="&gt;&gt;labelText.ZOrder" xml:space="preserve">
<value>3</value>
</data>
<metadata name="FindSrsOptionsMenuStrip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<metadata name="FindSrsOptionsMenuStrip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>17, 11</value>
</metadata>
<data name="iscsiToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
<value>199, 22</value>
<value>445, 46</value>
</data>
<data name="iscsiToolStripMenuItem.Text" xml:space="preserve">
<value>Find Software iSCSI SRs</value>
</data>
<data name="fcToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
<value>199, 22</value>
<value>445, 46</value>
</data>
<data name="fcToolStripMenuItem.Text" xml:space="preserve">
<value>Find Hardware HBA SRs</value>
</data>
<data name="FindSrsOptionsMenuStrip.Size" type="System.Drawing.Size, System.Drawing">
<value>200, 48</value>
<value>446, 96</value>
</data>
<data name="&gt;&gt;FindSrsOptionsMenuStrip.Name" xml:space="preserve">
<value>FindSrsOptionsMenuStrip</value>
@ -402,59 +402,62 @@
<data name="&gt;&gt;FindSrsOptionsMenuStrip.Type" xml:space="preserve">
<value>XenAdmin.Controls.NonReopeningContextMenuStrip, XenCenterMain, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</value>
</data>
<metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>92</value>
</metadata>
<metadata name="$this.Localizable" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<metadata name="$this.Localizable" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>92</value>
</metadata>
<data name="$this.AutoScaleDimensions" type="System.Drawing.SizeF, System.Drawing">
<value>96, 96</value>
<value>240, 240</value>
</data>
<data name="$this.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
<value>8, 8, 8, 8</value>
</data>
<data name="$this.Size" type="System.Drawing.Size, System.Drawing">
<value>557, 366</value>
<value>1392, 915</value>
</data>
<data name="&gt;&gt;columnTick.Name" xml:space="preserve">
<value>columnTick</value>
</data>
<data name="&gt;&gt;columnTick.Type" xml:space="preserve">
<value>System.Windows.Forms.DataGridViewCheckBoxColumn, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
<value>System.Windows.Forms.DataGridViewCheckBoxColumn, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;columnName.Name" xml:space="preserve">
<value>columnName</value>
</data>
<data name="&gt;&gt;columnName.Type" xml:space="preserve">
<value>System.Windows.Forms.DataGridViewTextBoxColumn, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
<value>System.Windows.Forms.DataGridViewTextBoxColumn, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;columnDesc.Name" xml:space="preserve">
<value>columnDesc</value>
</data>
<data name="&gt;&gt;columnDesc.Type" xml:space="preserve">
<value>System.Windows.Forms.DataGridViewTextBoxColumn, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
<value>System.Windows.Forms.DataGridViewTextBoxColumn, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;columnType.Name" xml:space="preserve">
<value>columnType</value>
</data>
<data name="&gt;&gt;columnType.Type" xml:space="preserve">
<value>System.Windows.Forms.DataGridViewTextBoxColumn, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
<value>System.Windows.Forms.DataGridViewTextBoxColumn, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;columnMetadata.Name" xml:space="preserve">
<value>columnMetadata</value>
</data>
<data name="&gt;&gt;columnMetadata.Type" xml:space="preserve">
<value>System.Windows.Forms.DataGridViewTextBoxColumn, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
<value>System.Windows.Forms.DataGridViewTextBoxColumn, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;iscsiToolStripMenuItem.Name" xml:space="preserve">
<value>iscsiToolStripMenuItem</value>
</data>
<data name="&gt;&gt;iscsiToolStripMenuItem.Type" xml:space="preserve">
<value>System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
<value>System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;fcToolStripMenuItem.Name" xml:space="preserve">
<value>fcToolStripMenuItem</value>
</data>
<data name="&gt;&gt;fcToolStripMenuItem.Type" xml:space="preserve">
<value>System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
<value>System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;$this.Name" xml:space="preserve">
<value>DRFailoverWizardStoragePage</value>