From b3d2cecf890b19cbc1c72bb19854e0f8df839393 Mon Sep 17 00:00:00 2001 From: Konstantina Chremmou Date: Thu, 26 Sep 2013 14:23:49 +0100 Subject: [PATCH] CP-6317: Importing from branch clearwater-ln. # HG changeset patch # User Konstantina Chremmou # 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 --- XenAdmin/Dialogs/ActionProgressDialog.ja.resx | 391 +----------------- XenAdmin/Dialogs/ActionProgressDialog.resx | 18 +- .../Dialogs/ActionProgressDialog.zh-CN.resx | 391 +----------------- .../Actions/Pool/GetHeartbeatSRsAction.cs | 4 +- 4 files changed, 20 insertions(+), 784 deletions(-) diff --git a/XenAdmin/Dialogs/ActionProgressDialog.ja.resx b/XenAdmin/Dialogs/ActionProgressDialog.ja.resx index 0a1411cb8..f5a0fca61 100644 --- a/XenAdmin/Dialogs/ActionProgressDialog.ja.resx +++ b/XenAdmin/Dialogs/ActionProgressDialog.ja.resx @@ -117,418 +117,35 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - True - - - - Fill - - - - Segoe UI, 9pt - - - 51, 8 - - - 3, 8, 3, 3 - - - 254, 15 - - - 0 - 処理の進行状況 - - MiddleLeft - - - labelStatus - - - System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tableLayoutPanel1 - - - 0 - - - Top - - - Segoe UI, 9pt - - - 54, 120 - - - 6, 10, 6, 12 - - - 248, 20 - - - 1 - - - progressBar1 - - - System.Windows.Forms.ProgressBar, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tableLayoutPanel1 - - - 4 - - - True - - - GrowAndShrink - - - 3 - - - Segoe UI, 9pt - - - NoControl - - - 8, 8 - - - 8, 8, 8, 8 - - - 32, 32 - - - AutoSize - - - 8 - - - False - - - icon - - - System.Windows.Forms.PictureBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tableLayoutPanel1 - - - 1 - - - Top, Right - - - Segoe UI, 9pt - - - NoControl - - - 230, 164 - - - 3, 12, 3, 3 - - - 75, 23 - - - 10 - 閉じる - - False - - - buttonClose - - - System.Windows.Forms.Button, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tableLayoutPanel1 - - - 2 - - - Segoe UI, 9pt - - - NoControl - - - 311, 119 - - - 3, 9, 3, 3 - - - 75, 23 - - - 9 - キャンセル - - False - - - buttonCancel - - - System.Windows.Forms.Button, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tableLayoutPanel1 - - - 3 - - - True - - - Segoe UI, 9pt - - - NoControl - - - 51, 95 - + - 186, 15 - - - 6 + 247, 15 設定を確認し、もう一度実行してください。 - - TopCenter - - - False - - - labelBottom - - - System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tableLayoutPanel1 - - - 5 - - - True - - - Segoe UI, 9pt - - - NoControl - - - 51, 72 - - - 3, 8, 3, 8 - - 56, 15 - - - 5 + 67, 15 エラー情報 - - False - - - labelException - - - System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tableLayoutPanel1 - - - 6 - - - True - - - Fill - - - Segoe UI, 9pt - - - 51, 30 - - - 3, 4, 3, 0 - - - 254, 15 - - - 11 - サブアクションの進行状況 - - labelSubActionStatus - - - System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tableLayoutPanel1 - - - 7 - - - True - - - Segoe UI, 9pt - - - NoControl - - - 51, 49 - - - 3, 4, 3, 0 - - 189, 15 - - - 7 + 187, 15 処理中にエラーが発生しました。 - - TopCenter - - - False - - - labelTop - - - System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tableLayoutPanel1 - - - 8 - - - Fill - - - Segoe UI, 9pt - - - 8, 5 - - - 7 - - - 390, 239 - - - 2 - - - tableLayoutPanel1 - - - System.Windows.Forms.TableLayoutPanel, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - $this - - - 0 - - - <?xml version="1.0" encoding="utf-16"?><TableLayoutSettings><Controls><Control Name="labelStatus" Row="0" RowSpan="1" Column="1" ColumnSpan="1" /><Control Name="icon" Row="0" RowSpan="6" Column="0" ColumnSpan="1" /><Control Name="buttonClose" Row="6" RowSpan="1" Column="1" ColumnSpan="1" /><Control Name="buttonCancel" Row="5" RowSpan="1" Column="2" ColumnSpan="1" /><Control Name="progressBar1" Row="5" RowSpan="1" Column="1" ColumnSpan="1" /><Control Name="labelBottom" Row="4" RowSpan="1" Column="1" ColumnSpan="1" /><Control Name="labelException" Row="3" RowSpan="1" Column="1" ColumnSpan="1" /><Control Name="labelSubActionStatus" Row="1" RowSpan="1" Column="1" ColumnSpan="1" /><Control Name="labelTop" Row="2" RowSpan="1" Column="1" ColumnSpan="1" /></Controls><Columns Styles="AutoSize,0,Absolute,260,AutoSize,0" /><Rows Styles="AutoSize,0,AutoSize,0,AutoSize,0,AutoSize,0,AutoSize,0,AutoSize,0,AutoSize,0" /></TableLayoutSettings> - - - True - - - 96, 96 - - - True - - - GrowAndShrink - - - 406, 249 - - - Tahoma, 8pt - - - 8, 5, 8, 5 - - - CenterParent - - - XenCenter - - - ActionProgressDialog - - - XenAdmin.Dialogs.XenDialogBase, XenCenterMain, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null - \ No newline at end of file diff --git a/XenAdmin/Dialogs/ActionProgressDialog.resx b/XenAdmin/Dialogs/ActionProgressDialog.resx index 388496b08..6de1e5163 100644 --- a/XenAdmin/Dialogs/ActionProgressDialog.resx +++ b/XenAdmin/Dialogs/ActionProgressDialog.resx @@ -136,7 +136,7 @@ 3, 8, 3, 3 - 254, 15 + 294, 15 0 @@ -159,7 +159,7 @@ 0 - + Top @@ -172,7 +172,7 @@ 6, 10, 6, 12 - 248, 20 + 288, 20 1 @@ -244,7 +244,7 @@ NoControl - 230, 164 + 270, 164 3, 12, 3, 3 @@ -280,7 +280,7 @@ NoControl - 311, 119 + 351, 119 3, 9, 3, 3 @@ -403,7 +403,7 @@ 3, 4, 3, 0 - 254, 15 + 294, 15 11 @@ -478,7 +478,7 @@ 7 - 390, 239 + 430, 239 2 @@ -496,7 +496,7 @@ 0 - <?xml version="1.0" encoding="utf-16"?><TableLayoutSettings><Controls><Control Name="labelStatus" Row="0" RowSpan="1" Column="1" ColumnSpan="1" /><Control Name="icon" Row="0" RowSpan="6" Column="0" ColumnSpan="1" /><Control Name="buttonClose" Row="6" RowSpan="1" Column="1" ColumnSpan="1" /><Control Name="buttonCancel" Row="5" RowSpan="1" Column="2" ColumnSpan="1" /><Control Name="progressBar1" Row="5" RowSpan="1" Column="1" ColumnSpan="1" /><Control Name="labelBottom" Row="4" RowSpan="1" Column="1" ColumnSpan="1" /><Control Name="labelException" Row="3" RowSpan="1" Column="1" ColumnSpan="1" /><Control Name="labelSubActionStatus" Row="1" RowSpan="1" Column="1" ColumnSpan="1" /><Control Name="labelTop" Row="2" RowSpan="1" Column="1" ColumnSpan="1" /></Controls><Columns Styles="AutoSize,0,Absolute,260,AutoSize,0" /><Rows Styles="AutoSize,0,AutoSize,0,AutoSize,0,AutoSize,0,AutoSize,0,AutoSize,0,AutoSize,0" /></TableLayoutSettings> + <?xml version="1.0" encoding="utf-16"?><TableLayoutSettings><Controls><Control Name="labelStatus" Row="0" RowSpan="1" Column="1" ColumnSpan="1" /><Control Name="icon" Row="0" RowSpan="6" Column="0" ColumnSpan="1" /><Control Name="buttonClose" Row="6" RowSpan="1" Column="1" ColumnSpan="1" /><Control Name="buttonCancel" Row="5" RowSpan="1" Column="2" ColumnSpan="1" /><Control Name="progressBar1" Row="5" RowSpan="1" Column="1" ColumnSpan="1" /><Control Name="labelBottom" Row="4" RowSpan="1" Column="1" ColumnSpan="1" /><Control Name="labelException" Row="3" RowSpan="1" Column="1" ColumnSpan="1" /><Control Name="labelSubActionStatus" Row="1" RowSpan="1" Column="1" ColumnSpan="1" /><Control Name="labelTop" Row="2" RowSpan="1" Column="1" ColumnSpan="1" /></Controls><Columns Styles="AutoSize,0,Absolute,300,AutoSize,0" /><Rows Styles="AutoSize,0,AutoSize,0,AutoSize,0,AutoSize,0,AutoSize,0,AutoSize,0,AutoSize,0" /></TableLayoutSettings> True @@ -511,7 +511,7 @@ GrowAndShrink - 406, 249 + 446, 249 Tahoma, 8pt diff --git a/XenAdmin/Dialogs/ActionProgressDialog.zh-CN.resx b/XenAdmin/Dialogs/ActionProgressDialog.zh-CN.resx index cd51e8062..7b4cf4164 100644 --- a/XenAdmin/Dialogs/ActionProgressDialog.zh-CN.resx +++ b/XenAdmin/Dialogs/ActionProgressDialog.zh-CN.resx @@ -117,418 +117,35 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - True - - - - Fill - - - - Segoe UI, 9pt - - - 51, 8 - - - 3, 8, 3, 3 - - - 254, 15 - - - 0 - 操作进度 - - MiddleLeft - - - labelStatus - - - System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tableLayoutPanel1 - - - 0 - - - Top - - - Segoe UI, 9pt - - - 54, 120 - - - 6, 10, 6, 12 - - - 248, 20 - - - 1 - - - progressBar1 - - - System.Windows.Forms.ProgressBar, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tableLayoutPanel1 - - - 4 - - - True - - - GrowAndShrink - - - 3 - - - Segoe UI, 9pt - - - NoControl - - - 8, 8 - - - 8, 8, 8, 8 - - - 32, 32 - - - AutoSize - - - 8 - - - False - - - icon - - - System.Windows.Forms.PictureBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tableLayoutPanel1 - - - 1 - - - Top, Right - - - Segoe UI, 9pt - - - NoControl - - - 230, 164 - - - 3, 12, 3, 3 - - - 75, 23 - - - 10 - 关闭 - - False - - - buttonClose - - - System.Windows.Forms.Button, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tableLayoutPanel1 - - - 2 - - - Segoe UI, 9pt - - - NoControl - - - 311, 119 - - - 3, 9, 3, 3 - - - 75, 23 - - - 9 - 取消 - - False - - - buttonCancel - - - System.Windows.Forms.Button, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tableLayoutPanel1 - - - 3 - - - True - - - Segoe UI, 9pt - - - NoControl - - - 51, 95 - + - 186, 15 - - - 6 + 139, 15 请检查您的设置并重试。 - - TopCenter - - - False - - - labelBottom - - - System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tableLayoutPanel1 - - - 5 - - - True - - - Segoe UI, 9pt - - - NoControl - - - 51, 72 - - - 3, 8, 3, 8 - - 56, 15 - - - 5 + 55, 15 错误信息 - - False - - - labelException - - - System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tableLayoutPanel1 - - - 6 - - - True - - - Fill - - - Segoe UI, 9pt - - - 51, 30 - - - 3, 4, 3, 0 - - - 254, 15 - - - 11 - 子操作进度 - - labelSubActionStatus - - - System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tableLayoutPanel1 - - - 7 - - - True - - - Segoe UI, 9pt - - - NoControl - - - 51, 49 - - - 3, 4, 3, 0 - - 189, 15 - - - 7 + 82, 15 操作出现错误: - - TopCenter - - - False - - - labelTop - - - System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tableLayoutPanel1 - - - 8 - - - Fill - - - Segoe UI, 9pt - - - 8, 5 - - - 7 - - - 390, 239 - - - 2 - - - tableLayoutPanel1 - - - System.Windows.Forms.TableLayoutPanel, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - $this - - - 0 - - - <?xml version="1.0" encoding="utf-16"?><TableLayoutSettings><Controls><Control Name="labelStatus" Row="0" RowSpan="1" Column="1" ColumnSpan="1" /><Control Name="icon" Row="0" RowSpan="6" Column="0" ColumnSpan="1" /><Control Name="buttonClose" Row="6" RowSpan="1" Column="1" ColumnSpan="1" /><Control Name="buttonCancel" Row="5" RowSpan="1" Column="2" ColumnSpan="1" /><Control Name="progressBar1" Row="5" RowSpan="1" Column="1" ColumnSpan="1" /><Control Name="labelBottom" Row="4" RowSpan="1" Column="1" ColumnSpan="1" /><Control Name="labelException" Row="3" RowSpan="1" Column="1" ColumnSpan="1" /><Control Name="labelSubActionStatus" Row="1" RowSpan="1" Column="1" ColumnSpan="1" /><Control Name="labelTop" Row="2" RowSpan="1" Column="1" ColumnSpan="1" /></Controls><Columns Styles="AutoSize,0,Absolute,260,AutoSize,0" /><Rows Styles="AutoSize,0,AutoSize,0,AutoSize,0,AutoSize,0,AutoSize,0,AutoSize,0,AutoSize,0" /></TableLayoutSettings> - - - True - - - 96, 96 - - - True - - - GrowAndShrink - - - 406, 249 - - - Tahoma, 8pt - - - 8, 5, 8, 5 - - - CenterParent - - - XenCenter - - - ActionProgressDialog - - - XenAdmin.Dialogs.XenDialogBase, XenCenterMain, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null - \ No newline at end of file diff --git a/XenModel/Actions/Pool/GetHeartbeatSRsAction.cs b/XenModel/Actions/Pool/GetHeartbeatSRsAction.cs index 20e385a71..873d5ca98 100644 --- a/XenModel/Actions/Pool/GetHeartbeatSRsAction.cs +++ b/XenModel/Actions/Pool/GetHeartbeatSRsAction.cs @@ -43,8 +43,10 @@ namespace XenAdmin.Actions private readonly List _srs = new List(); 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 SRs