CP-6317: Importing from branch clearwater-ln.

# HG changeset patch
# User Konstantina Chremmou <Konstantina.Chremmou@citrix.com>
# Date 1376915592 -3600
# Node ID 4ccecd98746c40c5b1850f28c3e557e803102939
# Parent  cc14bc84973e1dd7e07ee6d90a2bac2cdd7baf79
[CA-112396], [CA-112304], [CA-112241]: Increased the width of the middle column
of the ActionProgressDialog TableLayoutPanel by 40px to reduce occurrance of text
wrapping. Ellipsized pool name in the GetHeartbeatSRsAction.

Signed-off-by: Konstantina Chremmou <konstantina.chremmou@citrix.com>
This commit is contained in:
Konstantina Chremmou 2013-09-26 14:23:49 +01:00
parent 1abb402310
commit b3d2cecf89
4 changed files with 20 additions and 784 deletions

View File

@ -117,418 +117,35 @@
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<assembly alias="mscorlib" name="mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<data name="labelStatus.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" />
<data name="labelStatus.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
<value>Fill</value>
</data>
<assembly alias="System.Drawing" name="System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<data name="labelStatus.Font" type="System.Drawing.Font, System.Drawing">
<value>Segoe UI, 9pt</value>
</data>
<data name="labelStatus.Location" type="System.Drawing.Point, System.Drawing">
<value>51, 8</value>
</data>
<data name="labelStatus.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
<value>3, 8, 3, 3</value>
</data>
<data name="labelStatus.Size" type="System.Drawing.Size, System.Drawing">
<value>254, 15</value>
</data>
<data name="labelStatus.TabIndex" type="System.Int32, mscorlib">
<value>0</value>
</data>
<data name="labelStatus.Text" xml:space="preserve">
<value>処理の進行状況</value>
</data>
<data name="labelStatus.TextAlign" type="System.Drawing.ContentAlignment, System.Drawing">
<value>MiddleLeft</value>
</data>
<data name="&gt;&gt;labelStatus.Name" xml:space="preserve">
<value>labelStatus</value>
</data>
<data name="&gt;&gt;labelStatus.Type" xml:space="preserve">
<value>System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;labelStatus.Parent" xml:space="preserve">
<value>tableLayoutPanel1</value>
</data>
<data name="&gt;&gt;labelStatus.ZOrder" xml:space="preserve">
<value>0</value>
</data>
<data name="progressBar1.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
<value>Top</value>
</data>
<data name="progressBar1.Font" type="System.Drawing.Font, System.Drawing">
<value>Segoe UI, 9pt</value>
</data>
<data name="progressBar1.Location" type="System.Drawing.Point, System.Drawing">
<value>54, 120</value>
</data>
<data name="progressBar1.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
<value>6, 10, 6, 12</value>
</data>
<data name="progressBar1.Size" type="System.Drawing.Size, System.Drawing">
<value>248, 20</value>
</data>
<data name="progressBar1.TabIndex" type="System.Int32, mscorlib">
<value>1</value>
</data>
<data name="&gt;&gt;progressBar1.Name" xml:space="preserve">
<value>progressBar1</value>
</data>
<data name="&gt;&gt;progressBar1.Type" xml:space="preserve">
<value>System.Windows.Forms.ProgressBar, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;progressBar1.Parent" xml:space="preserve">
<value>tableLayoutPanel1</value>
</data>
<data name="&gt;&gt;progressBar1.ZOrder" xml:space="preserve">
<value>4</value>
</data>
<data name="tableLayoutPanel1.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
</data>
<data name="tableLayoutPanel1.AutoSizeMode" type="System.Windows.Forms.AutoSizeMode, System.Windows.Forms">
<value>GrowAndShrink</value>
</data>
<data name="tableLayoutPanel1.ColumnCount" type="System.Int32, mscorlib">
<value>3</value>
</data>
<data name="icon.Font" type="System.Drawing.Font, System.Drawing">
<value>Segoe UI, 9pt</value>
</data>
<data name="icon.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
<value>NoControl</value>
</data>
<data name="icon.Location" type="System.Drawing.Point, System.Drawing">
<value>8, 8</value>
</data>
<data name="icon.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
<value>8, 8, 8, 8</value>
</data>
<data name="icon.Size" type="System.Drawing.Size, System.Drawing">
<value>32, 32</value>
</data>
<data name="icon.SizeMode" type="System.Windows.Forms.PictureBoxSizeMode, System.Windows.Forms">
<value>AutoSize</value>
</data>
<data name="icon.TabIndex" type="System.Int32, mscorlib">
<value>8</value>
</data>
<data name="icon.Visible" type="System.Boolean, mscorlib">
<value>False</value>
</data>
<data name="&gt;&gt;icon.Name" xml:space="preserve">
<value>icon</value>
</data>
<data name="&gt;&gt;icon.Type" xml:space="preserve">
<value>System.Windows.Forms.PictureBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;icon.Parent" xml:space="preserve">
<value>tableLayoutPanel1</value>
</data>
<data name="&gt;&gt;icon.ZOrder" xml:space="preserve">
<value>1</value>
</data>
<data name="buttonClose.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
<value>Top, Right</value>
</data>
<data name="buttonClose.Font" type="System.Drawing.Font, System.Drawing">
<value>Segoe UI, 9pt</value>
</data>
<data name="buttonClose.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
<value>NoControl</value>
</data>
<data name="buttonClose.Location" type="System.Drawing.Point, System.Drawing">
<value>230, 164</value>
</data>
<data name="buttonClose.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
<value>3, 12, 3, 3</value>
</data>
<data name="buttonClose.Size" type="System.Drawing.Size, System.Drawing">
<value>75, 23</value>
</data>
<data name="buttonClose.TabIndex" type="System.Int32, mscorlib">
<value>10</value>
</data>
<data name="buttonClose.Text" xml:space="preserve">
<value>閉じる</value>
</data>
<data name="buttonClose.Visible" type="System.Boolean, mscorlib">
<value>False</value>
</data>
<data name="&gt;&gt;buttonClose.Name" xml:space="preserve">
<value>buttonClose</value>
</data>
<data name="&gt;&gt;buttonClose.Type" xml:space="preserve">
<value>System.Windows.Forms.Button, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;buttonClose.Parent" xml:space="preserve">
<value>tableLayoutPanel1</value>
</data>
<data name="&gt;&gt;buttonClose.ZOrder" xml:space="preserve">
<value>2</value>
</data>
<data name="buttonCancel.Font" type="System.Drawing.Font, System.Drawing">
<value>Segoe UI, 9pt</value>
</data>
<data name="buttonCancel.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
<value>NoControl</value>
</data>
<data name="buttonCancel.Location" type="System.Drawing.Point, System.Drawing">
<value>311, 119</value>
</data>
<data name="buttonCancel.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
<value>3, 9, 3, 3</value>
</data>
<data name="buttonCancel.Size" type="System.Drawing.Size, System.Drawing">
<value>75, 23</value>
</data>
<data name="buttonCancel.TabIndex" type="System.Int32, mscorlib">
<value>9</value>
</data>
<data name="buttonCancel.Text" xml:space="preserve">
<value>キャンセル</value>
</data>
<data name="buttonCancel.Visible" type="System.Boolean, mscorlib">
<value>False</value>
</data>
<data name="&gt;&gt;buttonCancel.Name" xml:space="preserve">
<value>buttonCancel</value>
</data>
<data name="&gt;&gt;buttonCancel.Type" xml:space="preserve">
<value>System.Windows.Forms.Button, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;buttonCancel.Parent" xml:space="preserve">
<value>tableLayoutPanel1</value>
</data>
<data name="&gt;&gt;buttonCancel.ZOrder" xml:space="preserve">
<value>3</value>
</data>
<data name="labelBottom.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
</data>
<data name="labelBottom.Font" type="System.Drawing.Font, System.Drawing">
<value>Segoe UI, 9pt</value>
</data>
<data name="labelBottom.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
<value>NoControl</value>
</data>
<data name="labelBottom.Location" type="System.Drawing.Point, System.Drawing">
<value>51, 95</value>
</data>
<assembly alias="System.Drawing" name="System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<data name="labelBottom.Size" type="System.Drawing.Size, System.Drawing">
<value>186, 15</value>
</data>
<data name="labelBottom.TabIndex" type="System.Int32, mscorlib">
<value>6</value>
<value>247, 15</value>
</data>
<data name="labelBottom.Text" xml:space="preserve">
<value>設定を確認し、もう一度実行してください。</value>
</data>
<data name="labelBottom.TextAlign" type="System.Drawing.ContentAlignment, System.Drawing">
<value>TopCenter</value>
</data>
<data name="labelBottom.Visible" type="System.Boolean, mscorlib">
<value>False</value>
</data>
<data name="&gt;&gt;labelBottom.Name" xml:space="preserve">
<value>labelBottom</value>
</data>
<data name="&gt;&gt;labelBottom.Type" xml:space="preserve">
<value>System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;labelBottom.Parent" xml:space="preserve">
<value>tableLayoutPanel1</value>
</data>
<data name="&gt;&gt;labelBottom.ZOrder" xml:space="preserve">
<value>5</value>
</data>
<data name="labelException.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
</data>
<data name="labelException.Font" type="System.Drawing.Font, System.Drawing">
<value>Segoe UI, 9pt</value>
</data>
<data name="labelException.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
<value>NoControl</value>
</data>
<data name="labelException.Location" type="System.Drawing.Point, System.Drawing">
<value>51, 72</value>
</data>
<data name="labelException.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
<value>3, 8, 3, 8</value>
</data>
<data name="labelException.Size" type="System.Drawing.Size, System.Drawing">
<value>56, 15</value>
</data>
<data name="labelException.TabIndex" type="System.Int32, mscorlib">
<value>5</value>
<value>67, 15</value>
</data>
<data name="labelException.Text" xml:space="preserve">
<value>エラー情報</value>
</data>
<data name="labelException.Visible" type="System.Boolean, mscorlib">
<value>False</value>
</data>
<data name="&gt;&gt;labelException.Name" xml:space="preserve">
<value>labelException</value>
</data>
<data name="&gt;&gt;labelException.Type" xml:space="preserve">
<value>System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;labelException.Parent" xml:space="preserve">
<value>tableLayoutPanel1</value>
</data>
<data name="&gt;&gt;labelException.ZOrder" xml:space="preserve">
<value>6</value>
</data>
<data name="labelSubActionStatus.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
</data>
<data name="labelSubActionStatus.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
<value>Fill</value>
</data>
<data name="labelSubActionStatus.Font" type="System.Drawing.Font, System.Drawing">
<value>Segoe UI, 9pt</value>
</data>
<data name="labelSubActionStatus.Location" type="System.Drawing.Point, System.Drawing">
<value>51, 30</value>
</data>
<data name="labelSubActionStatus.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
<value>3, 4, 3, 0</value>
</data>
<data name="labelSubActionStatus.Size" type="System.Drawing.Size, System.Drawing">
<value>254, 15</value>
</data>
<data name="labelSubActionStatus.TabIndex" type="System.Int32, mscorlib">
<value>11</value>
</data>
<data name="labelSubActionStatus.Text" xml:space="preserve">
<value>サブアクションの進行状況</value>
</data>
<data name="&gt;&gt;labelSubActionStatus.Name" xml:space="preserve">
<value>labelSubActionStatus</value>
</data>
<data name="&gt;&gt;labelSubActionStatus.Type" xml:space="preserve">
<value>System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;labelSubActionStatus.Parent" xml:space="preserve">
<value>tableLayoutPanel1</value>
</data>
<data name="&gt;&gt;labelSubActionStatus.ZOrder" xml:space="preserve">
<value>7</value>
</data>
<data name="labelTop.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
</data>
<data name="labelTop.Font" type="System.Drawing.Font, System.Drawing">
<value>Segoe UI, 9pt</value>
</data>
<data name="labelTop.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
<value>NoControl</value>
</data>
<data name="labelTop.Location" type="System.Drawing.Point, System.Drawing">
<value>51, 49</value>
</data>
<data name="labelTop.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
<value>3, 4, 3, 0</value>
</data>
<data name="labelTop.Size" type="System.Drawing.Size, System.Drawing">
<value>189, 15</value>
</data>
<data name="labelTop.TabIndex" type="System.Int32, mscorlib">
<value>7</value>
<value>187, 15</value>
</data>
<data name="labelTop.Text" xml:space="preserve">
<value>処理中にエラーが発生しました。</value>
</data>
<data name="labelTop.TextAlign" type="System.Drawing.ContentAlignment, System.Drawing">
<value>TopCenter</value>
</data>
<data name="labelTop.Visible" type="System.Boolean, mscorlib">
<value>False</value>
</data>
<data name="&gt;&gt;labelTop.Name" xml:space="preserve">
<value>labelTop</value>
</data>
<data name="&gt;&gt;labelTop.Type" xml:space="preserve">
<value>System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;labelTop.Parent" xml:space="preserve">
<value>tableLayoutPanel1</value>
</data>
<data name="&gt;&gt;labelTop.ZOrder" xml:space="preserve">
<value>8</value>
</data>
<data name="tableLayoutPanel1.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
<value>Fill</value>
</data>
<data name="tableLayoutPanel1.Font" type="System.Drawing.Font, System.Drawing">
<value>Segoe UI, 9pt</value>
</data>
<data name="tableLayoutPanel1.Location" type="System.Drawing.Point, System.Drawing">
<value>8, 5</value>
</data>
<data name="tableLayoutPanel1.RowCount" type="System.Int32, mscorlib">
<value>7</value>
</data>
<data name="tableLayoutPanel1.Size" type="System.Drawing.Size, System.Drawing">
<value>390, 239</value>
</data>
<data name="tableLayoutPanel1.TabIndex" type="System.Int32, mscorlib">
<value>2</value>
</data>
<data name="&gt;&gt;tableLayoutPanel1.Name" xml:space="preserve">
<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>
</data>
<data name="&gt;&gt;tableLayoutPanel1.Parent" xml:space="preserve">
<value>$this</value>
</data>
<data name="&gt;&gt;tableLayoutPanel1.ZOrder" xml:space="preserve">
<value>0</value>
</data>
<data name="tableLayoutPanel1.LayoutSettings" type="System.Windows.Forms.TableLayoutSettings, System.Windows.Forms">
<value>&lt;?xml version="1.0" encoding="utf-16"?&gt;&lt;TableLayoutSettings&gt;&lt;Controls&gt;&lt;Control Name="labelStatus" Row="0" RowSpan="1" Column="1" ColumnSpan="1" /&gt;&lt;Control Name="icon" Row="0" RowSpan="6" Column="0" ColumnSpan="1" /&gt;&lt;Control Name="buttonClose" Row="6" RowSpan="1" Column="1" ColumnSpan="1" /&gt;&lt;Control Name="buttonCancel" Row="5" RowSpan="1" Column="2" ColumnSpan="1" /&gt;&lt;Control Name="progressBar1" Row="5" RowSpan="1" Column="1" ColumnSpan="1" /&gt;&lt;Control Name="labelBottom" Row="4" RowSpan="1" Column="1" ColumnSpan="1" /&gt;&lt;Control Name="labelException" Row="3" RowSpan="1" Column="1" ColumnSpan="1" /&gt;&lt;Control Name="labelSubActionStatus" Row="1" RowSpan="1" Column="1" ColumnSpan="1" /&gt;&lt;Control Name="labelTop" Row="2" RowSpan="1" Column="1" ColumnSpan="1" /&gt;&lt;/Controls&gt;&lt;Columns Styles="AutoSize,0,Absolute,260,AutoSize,0" /&gt;&lt;Rows Styles="AutoSize,0,AutoSize,0,AutoSize,0,AutoSize,0,AutoSize,0,AutoSize,0,AutoSize,0" /&gt;&lt;/TableLayoutSettings&gt;</value>
</data>
<metadata name="$this.Localizable" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<data name="$this.AutoScaleDimensions" type="System.Drawing.SizeF, System.Drawing">
<value>96, 96</value>
</data>
<data name="$this.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
</data>
<data name="$this.AutoSizeMode" type="System.Windows.Forms.AutoSizeMode, System.Windows.Forms">
<value>GrowAndShrink</value>
</data>
<data name="$this.ClientSize" type="System.Drawing.Size, System.Drawing">
<value>406, 249</value>
</data>
<data name="$this.Font" type="System.Drawing.Font, System.Drawing">
<value>Tahoma, 8pt</value>
</data>
<data name="$this.Padding" type="System.Windows.Forms.Padding, System.Windows.Forms">
<value>8, 5, 8, 5</value>
</data>
<data name="$this.StartPosition" type="System.Windows.Forms.FormStartPosition, System.Windows.Forms">
<value>CenterParent</value>
</data>
<data name="$this.Text" xml:space="preserve">
<value>XenCenter</value>
</data>
<data name="&gt;&gt;$this.Name" xml:space="preserve">
<value>ActionProgressDialog</value>
</data>
<data name="&gt;&gt;$this.Type" xml:space="preserve">
<value>XenAdmin.Dialogs.XenDialogBase, XenCenterMain, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</value>
</data>
</root>

View File

@ -136,7 +136,7 @@
<value>3, 8, 3, 3</value>
</data>
<data name="labelStatus.Size" type="System.Drawing.Size, System.Drawing">
<value>254, 15</value>
<value>294, 15</value>
</data>
<data name="labelStatus.TabIndex" type="System.Int32, mscorlib">
<value>0</value>
@ -159,7 +159,7 @@
<data name="&gt;&gt;labelStatus.ZOrder" xml:space="preserve">
<value>0</value>
</data>
<data name="progressBar1.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
<data name="progressBar1.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
<value>Top</value>
</data>
<data name="progressBar1.Font" type="System.Drawing.Font, System.Drawing">
@ -172,7 +172,7 @@
<value>6, 10, 6, 12</value>
</data>
<data name="progressBar1.Size" type="System.Drawing.Size, System.Drawing">
<value>248, 20</value>
<value>288, 20</value>
</data>
<data name="progressBar1.TabIndex" type="System.Int32, mscorlib">
<value>1</value>
@ -244,7 +244,7 @@
<value>NoControl</value>
</data>
<data name="buttonClose.Location" type="System.Drawing.Point, System.Drawing">
<value>230, 164</value>
<value>270, 164</value>
</data>
<data name="buttonClose.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
<value>3, 12, 3, 3</value>
@ -280,7 +280,7 @@
<value>NoControl</value>
</data>
<data name="buttonCancel.Location" type="System.Drawing.Point, System.Drawing">
<value>311, 119</value>
<value>351, 119</value>
</data>
<data name="buttonCancel.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
<value>3, 9, 3, 3</value>
@ -403,7 +403,7 @@
<value>3, 4, 3, 0</value>
</data>
<data name="labelSubActionStatus.Size" type="System.Drawing.Size, System.Drawing">
<value>254, 15</value>
<value>294, 15</value>
</data>
<data name="labelSubActionStatus.TabIndex" type="System.Int32, mscorlib">
<value>11</value>
@ -478,7 +478,7 @@
<value>7</value>
</data>
<data name="tableLayoutPanel1.Size" type="System.Drawing.Size, System.Drawing">
<value>390, 239</value>
<value>430, 239</value>
</data>
<data name="tableLayoutPanel1.TabIndex" type="System.Int32, mscorlib">
<value>2</value>
@ -496,7 +496,7 @@
<value>0</value>
</data>
<data name="tableLayoutPanel1.LayoutSettings" type="System.Windows.Forms.TableLayoutSettings, System.Windows.Forms">
<value>&lt;?xml version="1.0" encoding="utf-16"?&gt;&lt;TableLayoutSettings&gt;&lt;Controls&gt;&lt;Control Name="labelStatus" Row="0" RowSpan="1" Column="1" ColumnSpan="1" /&gt;&lt;Control Name="icon" Row="0" RowSpan="6" Column="0" ColumnSpan="1" /&gt;&lt;Control Name="buttonClose" Row="6" RowSpan="1" Column="1" ColumnSpan="1" /&gt;&lt;Control Name="buttonCancel" Row="5" RowSpan="1" Column="2" ColumnSpan="1" /&gt;&lt;Control Name="progressBar1" Row="5" RowSpan="1" Column="1" ColumnSpan="1" /&gt;&lt;Control Name="labelBottom" Row="4" RowSpan="1" Column="1" ColumnSpan="1" /&gt;&lt;Control Name="labelException" Row="3" RowSpan="1" Column="1" ColumnSpan="1" /&gt;&lt;Control Name="labelSubActionStatus" Row="1" RowSpan="1" Column="1" ColumnSpan="1" /&gt;&lt;Control Name="labelTop" Row="2" RowSpan="1" Column="1" ColumnSpan="1" /&gt;&lt;/Controls&gt;&lt;Columns Styles="AutoSize,0,Absolute,260,AutoSize,0" /&gt;&lt;Rows Styles="AutoSize,0,AutoSize,0,AutoSize,0,AutoSize,0,AutoSize,0,AutoSize,0,AutoSize,0" /&gt;&lt;/TableLayoutSettings&gt;</value>
<value>&lt;?xml version="1.0" encoding="utf-16"?&gt;&lt;TableLayoutSettings&gt;&lt;Controls&gt;&lt;Control Name="labelStatus" Row="0" RowSpan="1" Column="1" ColumnSpan="1" /&gt;&lt;Control Name="icon" Row="0" RowSpan="6" Column="0" ColumnSpan="1" /&gt;&lt;Control Name="buttonClose" Row="6" RowSpan="1" Column="1" ColumnSpan="1" /&gt;&lt;Control Name="buttonCancel" Row="5" RowSpan="1" Column="2" ColumnSpan="1" /&gt;&lt;Control Name="progressBar1" Row="5" RowSpan="1" Column="1" ColumnSpan="1" /&gt;&lt;Control Name="labelBottom" Row="4" RowSpan="1" Column="1" ColumnSpan="1" /&gt;&lt;Control Name="labelException" Row="3" RowSpan="1" Column="1" ColumnSpan="1" /&gt;&lt;Control Name="labelSubActionStatus" Row="1" RowSpan="1" Column="1" ColumnSpan="1" /&gt;&lt;Control Name="labelTop" Row="2" RowSpan="1" Column="1" ColumnSpan="1" /&gt;&lt;/Controls&gt;&lt;Columns Styles="AutoSize,0,Absolute,300,AutoSize,0" /&gt;&lt;Rows Styles="AutoSize,0,AutoSize,0,AutoSize,0,AutoSize,0,AutoSize,0,AutoSize,0,AutoSize,0" /&gt;&lt;/TableLayoutSettings&gt;</value>
</data>
<metadata name="$this.Localizable" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
@ -511,7 +511,7 @@
<value>GrowAndShrink</value>
</data>
<data name="$this.ClientSize" type="System.Drawing.Size, System.Drawing">
<value>406, 249</value>
<value>446, 249</value>
</data>
<data name="$this.Font" type="System.Drawing.Font, System.Drawing">
<value>Tahoma, 8pt</value>

View File

@ -117,418 +117,35 @@
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<assembly alias="mscorlib" name="mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<data name="labelStatus.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" />
<data name="labelStatus.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
<value>Fill</value>
</data>
<assembly alias="System.Drawing" name="System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<data name="labelStatus.Font" type="System.Drawing.Font, System.Drawing">
<value>Segoe UI, 9pt</value>
</data>
<data name="labelStatus.Location" type="System.Drawing.Point, System.Drawing">
<value>51, 8</value>
</data>
<data name="labelStatus.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
<value>3, 8, 3, 3</value>
</data>
<data name="labelStatus.Size" type="System.Drawing.Size, System.Drawing">
<value>254, 15</value>
</data>
<data name="labelStatus.TabIndex" type="System.Int32, mscorlib">
<value>0</value>
</data>
<data name="labelStatus.Text" xml:space="preserve">
<value>操作进度</value>
</data>
<data name="labelStatus.TextAlign" type="System.Drawing.ContentAlignment, System.Drawing">
<value>MiddleLeft</value>
</data>
<data name="&gt;&gt;labelStatus.Name" xml:space="preserve">
<value>labelStatus</value>
</data>
<data name="&gt;&gt;labelStatus.Type" xml:space="preserve">
<value>System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;labelStatus.Parent" xml:space="preserve">
<value>tableLayoutPanel1</value>
</data>
<data name="&gt;&gt;labelStatus.ZOrder" xml:space="preserve">
<value>0</value>
</data>
<data name="progressBar1.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
<value>Top</value>
</data>
<data name="progressBar1.Font" type="System.Drawing.Font, System.Drawing">
<value>Segoe UI, 9pt</value>
</data>
<data name="progressBar1.Location" type="System.Drawing.Point, System.Drawing">
<value>54, 120</value>
</data>
<data name="progressBar1.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
<value>6, 10, 6, 12</value>
</data>
<data name="progressBar1.Size" type="System.Drawing.Size, System.Drawing">
<value>248, 20</value>
</data>
<data name="progressBar1.TabIndex" type="System.Int32, mscorlib">
<value>1</value>
</data>
<data name="&gt;&gt;progressBar1.Name" xml:space="preserve">
<value>progressBar1</value>
</data>
<data name="&gt;&gt;progressBar1.Type" xml:space="preserve">
<value>System.Windows.Forms.ProgressBar, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;progressBar1.Parent" xml:space="preserve">
<value>tableLayoutPanel1</value>
</data>
<data name="&gt;&gt;progressBar1.ZOrder" xml:space="preserve">
<value>4</value>
</data>
<data name="tableLayoutPanel1.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
</data>
<data name="tableLayoutPanel1.AutoSizeMode" type="System.Windows.Forms.AutoSizeMode, System.Windows.Forms">
<value>GrowAndShrink</value>
</data>
<data name="tableLayoutPanel1.ColumnCount" type="System.Int32, mscorlib">
<value>3</value>
</data>
<data name="icon.Font" type="System.Drawing.Font, System.Drawing">
<value>Segoe UI, 9pt</value>
</data>
<data name="icon.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
<value>NoControl</value>
</data>
<data name="icon.Location" type="System.Drawing.Point, System.Drawing">
<value>8, 8</value>
</data>
<data name="icon.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
<value>8, 8, 8, 8</value>
</data>
<data name="icon.Size" type="System.Drawing.Size, System.Drawing">
<value>32, 32</value>
</data>
<data name="icon.SizeMode" type="System.Windows.Forms.PictureBoxSizeMode, System.Windows.Forms">
<value>AutoSize</value>
</data>
<data name="icon.TabIndex" type="System.Int32, mscorlib">
<value>8</value>
</data>
<data name="icon.Visible" type="System.Boolean, mscorlib">
<value>False</value>
</data>
<data name="&gt;&gt;icon.Name" xml:space="preserve">
<value>icon</value>
</data>
<data name="&gt;&gt;icon.Type" xml:space="preserve">
<value>System.Windows.Forms.PictureBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;icon.Parent" xml:space="preserve">
<value>tableLayoutPanel1</value>
</data>
<data name="&gt;&gt;icon.ZOrder" xml:space="preserve">
<value>1</value>
</data>
<data name="buttonClose.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
<value>Top, Right</value>
</data>
<data name="buttonClose.Font" type="System.Drawing.Font, System.Drawing">
<value>Segoe UI, 9pt</value>
</data>
<data name="buttonClose.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
<value>NoControl</value>
</data>
<data name="buttonClose.Location" type="System.Drawing.Point, System.Drawing">
<value>230, 164</value>
</data>
<data name="buttonClose.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
<value>3, 12, 3, 3</value>
</data>
<data name="buttonClose.Size" type="System.Drawing.Size, System.Drawing">
<value>75, 23</value>
</data>
<data name="buttonClose.TabIndex" type="System.Int32, mscorlib">
<value>10</value>
</data>
<data name="buttonClose.Text" xml:space="preserve">
<value>关闭</value>
</data>
<data name="buttonClose.Visible" type="System.Boolean, mscorlib">
<value>False</value>
</data>
<data name="&gt;&gt;buttonClose.Name" xml:space="preserve">
<value>buttonClose</value>
</data>
<data name="&gt;&gt;buttonClose.Type" xml:space="preserve">
<value>System.Windows.Forms.Button, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;buttonClose.Parent" xml:space="preserve">
<value>tableLayoutPanel1</value>
</data>
<data name="&gt;&gt;buttonClose.ZOrder" xml:space="preserve">
<value>2</value>
</data>
<data name="buttonCancel.Font" type="System.Drawing.Font, System.Drawing">
<value>Segoe UI, 9pt</value>
</data>
<data name="buttonCancel.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
<value>NoControl</value>
</data>
<data name="buttonCancel.Location" type="System.Drawing.Point, System.Drawing">
<value>311, 119</value>
</data>
<data name="buttonCancel.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
<value>3, 9, 3, 3</value>
</data>
<data name="buttonCancel.Size" type="System.Drawing.Size, System.Drawing">
<value>75, 23</value>
</data>
<data name="buttonCancel.TabIndex" type="System.Int32, mscorlib">
<value>9</value>
</data>
<data name="buttonCancel.Text" xml:space="preserve">
<value>取消</value>
</data>
<data name="buttonCancel.Visible" type="System.Boolean, mscorlib">
<value>False</value>
</data>
<data name="&gt;&gt;buttonCancel.Name" xml:space="preserve">
<value>buttonCancel</value>
</data>
<data name="&gt;&gt;buttonCancel.Type" xml:space="preserve">
<value>System.Windows.Forms.Button, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;buttonCancel.Parent" xml:space="preserve">
<value>tableLayoutPanel1</value>
</data>
<data name="&gt;&gt;buttonCancel.ZOrder" xml:space="preserve">
<value>3</value>
</data>
<data name="labelBottom.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
</data>
<data name="labelBottom.Font" type="System.Drawing.Font, System.Drawing">
<value>Segoe UI, 9pt</value>
</data>
<data name="labelBottom.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
<value>NoControl</value>
</data>
<data name="labelBottom.Location" type="System.Drawing.Point, System.Drawing">
<value>51, 95</value>
</data>
<assembly alias="System.Drawing" name="System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<data name="labelBottom.Size" type="System.Drawing.Size, System.Drawing">
<value>186, 15</value>
</data>
<data name="labelBottom.TabIndex" type="System.Int32, mscorlib">
<value>6</value>
<value>139, 15</value>
</data>
<data name="labelBottom.Text" xml:space="preserve">
<value>请检查您的设置并重试。</value>
</data>
<data name="labelBottom.TextAlign" type="System.Drawing.ContentAlignment, System.Drawing">
<value>TopCenter</value>
</data>
<data name="labelBottom.Visible" type="System.Boolean, mscorlib">
<value>False</value>
</data>
<data name="&gt;&gt;labelBottom.Name" xml:space="preserve">
<value>labelBottom</value>
</data>
<data name="&gt;&gt;labelBottom.Type" xml:space="preserve">
<value>System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;labelBottom.Parent" xml:space="preserve">
<value>tableLayoutPanel1</value>
</data>
<data name="&gt;&gt;labelBottom.ZOrder" xml:space="preserve">
<value>5</value>
</data>
<data name="labelException.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
</data>
<data name="labelException.Font" type="System.Drawing.Font, System.Drawing">
<value>Segoe UI, 9pt</value>
</data>
<data name="labelException.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
<value>NoControl</value>
</data>
<data name="labelException.Location" type="System.Drawing.Point, System.Drawing">
<value>51, 72</value>
</data>
<data name="labelException.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
<value>3, 8, 3, 8</value>
</data>
<data name="labelException.Size" type="System.Drawing.Size, System.Drawing">
<value>56, 15</value>
</data>
<data name="labelException.TabIndex" type="System.Int32, mscorlib">
<value>5</value>
<value>55, 15</value>
</data>
<data name="labelException.Text" xml:space="preserve">
<value>错误信息</value>
</data>
<data name="labelException.Visible" type="System.Boolean, mscorlib">
<value>False</value>
</data>
<data name="&gt;&gt;labelException.Name" xml:space="preserve">
<value>labelException</value>
</data>
<data name="&gt;&gt;labelException.Type" xml:space="preserve">
<value>System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;labelException.Parent" xml:space="preserve">
<value>tableLayoutPanel1</value>
</data>
<data name="&gt;&gt;labelException.ZOrder" xml:space="preserve">
<value>6</value>
</data>
<data name="labelSubActionStatus.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
</data>
<data name="labelSubActionStatus.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
<value>Fill</value>
</data>
<data name="labelSubActionStatus.Font" type="System.Drawing.Font, System.Drawing">
<value>Segoe UI, 9pt</value>
</data>
<data name="labelSubActionStatus.Location" type="System.Drawing.Point, System.Drawing">
<value>51, 30</value>
</data>
<data name="labelSubActionStatus.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
<value>3, 4, 3, 0</value>
</data>
<data name="labelSubActionStatus.Size" type="System.Drawing.Size, System.Drawing">
<value>254, 15</value>
</data>
<data name="labelSubActionStatus.TabIndex" type="System.Int32, mscorlib">
<value>11</value>
</data>
<data name="labelSubActionStatus.Text" xml:space="preserve">
<value>子操作进度</value>
</data>
<data name="&gt;&gt;labelSubActionStatus.Name" xml:space="preserve">
<value>labelSubActionStatus</value>
</data>
<data name="&gt;&gt;labelSubActionStatus.Type" xml:space="preserve">
<value>System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;labelSubActionStatus.Parent" xml:space="preserve">
<value>tableLayoutPanel1</value>
</data>
<data name="&gt;&gt;labelSubActionStatus.ZOrder" xml:space="preserve">
<value>7</value>
</data>
<data name="labelTop.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
</data>
<data name="labelTop.Font" type="System.Drawing.Font, System.Drawing">
<value>Segoe UI, 9pt</value>
</data>
<data name="labelTop.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
<value>NoControl</value>
</data>
<data name="labelTop.Location" type="System.Drawing.Point, System.Drawing">
<value>51, 49</value>
</data>
<data name="labelTop.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
<value>3, 4, 3, 0</value>
</data>
<data name="labelTop.Size" type="System.Drawing.Size, System.Drawing">
<value>189, 15</value>
</data>
<data name="labelTop.TabIndex" type="System.Int32, mscorlib">
<value>7</value>
<value>82, 15</value>
</data>
<data name="labelTop.Text" xml:space="preserve">
<value>操作出现错误:</value>
</data>
<data name="labelTop.TextAlign" type="System.Drawing.ContentAlignment, System.Drawing">
<value>TopCenter</value>
</data>
<data name="labelTop.Visible" type="System.Boolean, mscorlib">
<value>False</value>
</data>
<data name="&gt;&gt;labelTop.Name" xml:space="preserve">
<value>labelTop</value>
</data>
<data name="&gt;&gt;labelTop.Type" xml:space="preserve">
<value>System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;labelTop.Parent" xml:space="preserve">
<value>tableLayoutPanel1</value>
</data>
<data name="&gt;&gt;labelTop.ZOrder" xml:space="preserve">
<value>8</value>
</data>
<data name="tableLayoutPanel1.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
<value>Fill</value>
</data>
<data name="tableLayoutPanel1.Font" type="System.Drawing.Font, System.Drawing">
<value>Segoe UI, 9pt</value>
</data>
<data name="tableLayoutPanel1.Location" type="System.Drawing.Point, System.Drawing">
<value>8, 5</value>
</data>
<data name="tableLayoutPanel1.RowCount" type="System.Int32, mscorlib">
<value>7</value>
</data>
<data name="tableLayoutPanel1.Size" type="System.Drawing.Size, System.Drawing">
<value>390, 239</value>
</data>
<data name="tableLayoutPanel1.TabIndex" type="System.Int32, mscorlib">
<value>2</value>
</data>
<data name="&gt;&gt;tableLayoutPanel1.Name" xml:space="preserve">
<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>
</data>
<data name="&gt;&gt;tableLayoutPanel1.Parent" xml:space="preserve">
<value>$this</value>
</data>
<data name="&gt;&gt;tableLayoutPanel1.ZOrder" xml:space="preserve">
<value>0</value>
</data>
<data name="tableLayoutPanel1.LayoutSettings" type="System.Windows.Forms.TableLayoutSettings, System.Windows.Forms">
<value>&lt;?xml version="1.0" encoding="utf-16"?&gt;&lt;TableLayoutSettings&gt;&lt;Controls&gt;&lt;Control Name="labelStatus" Row="0" RowSpan="1" Column="1" ColumnSpan="1" /&gt;&lt;Control Name="icon" Row="0" RowSpan="6" Column="0" ColumnSpan="1" /&gt;&lt;Control Name="buttonClose" Row="6" RowSpan="1" Column="1" ColumnSpan="1" /&gt;&lt;Control Name="buttonCancel" Row="5" RowSpan="1" Column="2" ColumnSpan="1" /&gt;&lt;Control Name="progressBar1" Row="5" RowSpan="1" Column="1" ColumnSpan="1" /&gt;&lt;Control Name="labelBottom" Row="4" RowSpan="1" Column="1" ColumnSpan="1" /&gt;&lt;Control Name="labelException" Row="3" RowSpan="1" Column="1" ColumnSpan="1" /&gt;&lt;Control Name="labelSubActionStatus" Row="1" RowSpan="1" Column="1" ColumnSpan="1" /&gt;&lt;Control Name="labelTop" Row="2" RowSpan="1" Column="1" ColumnSpan="1" /&gt;&lt;/Controls&gt;&lt;Columns Styles="AutoSize,0,Absolute,260,AutoSize,0" /&gt;&lt;Rows Styles="AutoSize,0,AutoSize,0,AutoSize,0,AutoSize,0,AutoSize,0,AutoSize,0,AutoSize,0" /&gt;&lt;/TableLayoutSettings&gt;</value>
</data>
<metadata name="$this.Localizable" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<data name="$this.AutoScaleDimensions" type="System.Drawing.SizeF, System.Drawing">
<value>96, 96</value>
</data>
<data name="$this.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
</data>
<data name="$this.AutoSizeMode" type="System.Windows.Forms.AutoSizeMode, System.Windows.Forms">
<value>GrowAndShrink</value>
</data>
<data name="$this.ClientSize" type="System.Drawing.Size, System.Drawing">
<value>406, 249</value>
</data>
<data name="$this.Font" type="System.Drawing.Font, System.Drawing">
<value>Tahoma, 8pt</value>
</data>
<data name="$this.Padding" type="System.Windows.Forms.Padding, System.Windows.Forms">
<value>8, 5, 8, 5</value>
</data>
<data name="$this.StartPosition" type="System.Windows.Forms.FormStartPosition, System.Windows.Forms">
<value>CenterParent</value>
</data>
<data name="$this.Text" xml:space="preserve">
<value>XenCenter</value>
</data>
<data name="&gt;&gt;$this.Name" xml:space="preserve">
<value>ActionProgressDialog</value>
</data>
<data name="&gt;&gt;$this.Type" xml:space="preserve">
<value>XenAdmin.Dialogs.XenDialogBase, XenCenterMain, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</value>
</data>
</root>

View File

@ -43,8 +43,10 @@ namespace XenAdmin.Actions
private readonly List<SRWrapper> _srs = new List<SRWrapper>();
public GetHeartbeatSRsAction(Pool pool)
: base(pool.Connection, string.Format(Messages.HA_SCANNING_SRS, Helpers.GetName(pool.Connection)), null, true)
: base(pool.Connection, string.Format(Messages.HA_SCANNING_SRS,
Helpers.GetName(pool.Connection).Ellipsise(50)), null, true)
{
}
public List<SRWrapper> SRs