From efbc55c9b6016dc5bd3c9ebd1616c30f89fcb5e7 Mon Sep 17 00:00:00 2001 From: Konstantina Chremmou Date: Wed, 4 Oct 2023 12:18:06 +0100 Subject: [PATCH] CA-383376: Fixed layout issue on the Installation media page of the New VM wizard. Also, disabled unit test for localized resources. Signed-off-by: Konstantina Chremmou --- XenAdmin/Wizards/BootModesControl.ja.resx | 297 ------------- XenAdmin/Wizards/BootModesControl.zh-CN.resx | 297 ------------- .../Page_InstallationMedia.ja.resx | 390 ------------------ .../Page_InstallationMedia.zh-CN.resx | 390 ------------------ XenAdmin/XenAdmin.csproj | 8 - XenAdminTests/CodeTests/AssemblyTests.cs | 1 + 6 files changed, 1 insertion(+), 1382 deletions(-) delete mode 100644 XenAdmin/Wizards/BootModesControl.ja.resx delete mode 100644 XenAdmin/Wizards/BootModesControl.zh-CN.resx diff --git a/XenAdmin/Wizards/BootModesControl.ja.resx b/XenAdmin/Wizards/BootModesControl.ja.resx deleted file mode 100644 index 6e4aa4468..000000000 --- a/XenAdmin/Wizards/BootModesControl.ja.resx +++ /dev/null @@ -1,297 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - text/microsoft-resx - - - 2.0 - - - System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - - True - - - - NoControl - - - - 6, 52 - - - 111, 17 - - - 2 - - - UEFI &Secure Boot - - - radioButtonUEFISecureBoot - - - System.Windows.Forms.RadioButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tableLayoutPanelBootMode - - - 0 - - - True - - - NoControl - - - 6, 6 - - - 75, 17 - - - 0 - - - B&IOS Boot - - - radioButtonBIOSBoot - - - System.Windows.Forms.RadioButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tableLayoutPanelBootMode - - - 1 - - - True - - - NoControl - - - 6, 29 - - - 74, 17 - - - 1 - - - &UEFI Boot - - - radioButtonUEFIBoot - - - System.Windows.Forms.RadioButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tableLayoutPanelBootMode - - - 2 - - - Fill - - - 3, 16 - - - 3, 3, 3, 3 - - - 3 - - - 138, 80 - - - 0 - - - tableLayoutPanelBootMode - - - System.Windows.Forms.TableLayoutPanel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - groupBoxBootMode - - - 0 - - - <?xml version="1.0" encoding="utf-16"?><TableLayoutSettings><Controls><Control Name="radioButtonUEFISecureBoot" Row="2" RowSpan="1" Column="0" ColumnSpan="1" /><Control Name="radioButtonBIOSBoot" Row="0" RowSpan="1" Column="0" ColumnSpan="1" /><Control Name="radioButtonUEFIBoot" Row="1" RowSpan="1" Column="0" ColumnSpan="1" /></Controls><Columns Styles="AutoSize,0" /><Rows Styles="AutoSize,0,AutoSize,0,AutoSize,0" /></TableLayoutSettings> - - - Fill - - - 3, 3 - - - 144, 99 - - - 0 - - - Boot Mode - - - groupBoxBootMode - - - System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - $this - - - 0 - - - True - - - 96, 96 - - - 0, 0, 0, 0 - - - 150, 105 - - - 3, 3, 3, 3 - - - 150, 105 - - - BootModesControl - - - System.Windows.Forms.UserControl, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - \ No newline at end of file diff --git a/XenAdmin/Wizards/BootModesControl.zh-CN.resx b/XenAdmin/Wizards/BootModesControl.zh-CN.resx deleted file mode 100644 index 6e4aa4468..000000000 --- a/XenAdmin/Wizards/BootModesControl.zh-CN.resx +++ /dev/null @@ -1,297 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - text/microsoft-resx - - - 2.0 - - - System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - - True - - - - NoControl - - - - 6, 52 - - - 111, 17 - - - 2 - - - UEFI &Secure Boot - - - radioButtonUEFISecureBoot - - - System.Windows.Forms.RadioButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tableLayoutPanelBootMode - - - 0 - - - True - - - NoControl - - - 6, 6 - - - 75, 17 - - - 0 - - - B&IOS Boot - - - radioButtonBIOSBoot - - - System.Windows.Forms.RadioButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tableLayoutPanelBootMode - - - 1 - - - True - - - NoControl - - - 6, 29 - - - 74, 17 - - - 1 - - - &UEFI Boot - - - radioButtonUEFIBoot - - - System.Windows.Forms.RadioButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tableLayoutPanelBootMode - - - 2 - - - Fill - - - 3, 16 - - - 3, 3, 3, 3 - - - 3 - - - 138, 80 - - - 0 - - - tableLayoutPanelBootMode - - - System.Windows.Forms.TableLayoutPanel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - groupBoxBootMode - - - 0 - - - <?xml version="1.0" encoding="utf-16"?><TableLayoutSettings><Controls><Control Name="radioButtonUEFISecureBoot" Row="2" RowSpan="1" Column="0" ColumnSpan="1" /><Control Name="radioButtonBIOSBoot" Row="0" RowSpan="1" Column="0" ColumnSpan="1" /><Control Name="radioButtonUEFIBoot" Row="1" RowSpan="1" Column="0" ColumnSpan="1" /></Controls><Columns Styles="AutoSize,0" /><Rows Styles="AutoSize,0,AutoSize,0,AutoSize,0" /></TableLayoutSettings> - - - Fill - - - 3, 3 - - - 144, 99 - - - 0 - - - Boot Mode - - - groupBoxBootMode - - - System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - $this - - - 0 - - - True - - - 96, 96 - - - 0, 0, 0, 0 - - - 150, 105 - - - 3, 3, 3, 3 - - - 150, 105 - - - BootModesControl - - - System.Windows.Forms.UserControl, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - \ No newline at end of file diff --git a/XenAdmin/Wizards/NewVMWizard/Page_InstallationMedia.ja.resx b/XenAdmin/Wizards/NewVMWizard/Page_InstallationMedia.ja.resx index 61a132c04..137c95428 100644 --- a/XenAdmin/Wizards/NewVMWizard/Page_InstallationMedia.ja.resx +++ b/XenAdmin/Wizards/NewVMWizard/Page_InstallationMedia.ja.resx @@ -118,414 +118,24 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - Top, Left, Right - - - 2 - - - Top, Bottom, Left, Right - - - 3, 269 - - - 0, 0, 0, 0 - - - 200, 104 - - - 3, 3, 3, 3 - - - 542, 149 - - - 7 - - - False - - - bootModesControl1 - - - XenAdmin.Wizards.BootModesControl, XenCenterMain, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null - - - panelInstallationMethod - - - 0 - - - Top, Left, Right - - - GrowAndShrink - - - True - - - GrowAndShrink - - - 1 - - - Top - - - 3, 19 - - - 518, 20 - - - 1 - - - PvBootTextBox - - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tableLayoutPanel2 - - - 0 - - - True - - - Fill - - - 0, 0 - - - 0, 0, 0, 0 - - - 0, 0, 0, 3 - - - 524, 16 - - - 0 - 高度な起動パラメーターを追加する場合はここで指定します。起動パラメーターが不要な場合は空白のままにしておきます。 - - label2 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tableLayoutPanel2 - - - 1 - - - Fill - - - 6, 19 - - - 2 - - - 532, 70 - - - 2 - - - tableLayoutPanel2 - - - System.Windows.Forms.TableLayoutPanel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - PvBootBox - - - 0 - - - <?xml version="1.0" encoding="utf-16"?><TableLayoutSettings><Controls><Control Name="PvBootTextBox" Row="1" RowSpan="1" Column="0" ColumnSpan="1" /><Control Name="label2" Row="0" RowSpan="1" Column="0" ColumnSpan="1" /></Controls><Columns Styles="Percent,100" /><Rows Styles="AutoSize,0,AutoSize,0" /></TableLayoutSettings> - - - 1, 182 - - - 6, 6, 6, 3 - - - 544, 92 - - - 2 - 高度な OS 起動パラメーター(&B) - - PvBootBox - - - System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - panelInstallationMethod - - - 1 - - - True - - - NoControl - - - 6, 46 - - - 149, 17 - - - 0 - インストール元 DVD ドライブ(&D): - - CdRadioButton - - - System.Windows.Forms.RadioButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - panelInstallationMethod - - - 2 - - - True - - - NoControl - - - 6, 105 - - - 3, 12, 3, 3 - - - 122, 17 - - - 3 - インストール元 URL(&U): - - UrlRadioButton - - - System.Windows.Forms.RadioButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - panelInstallationMethod - - - 3 - - - Left, Right - - - 23, 30 - - - 20, 3, 3, 3 - - - 381, 21 - - - 1 - - - CdDropDownBox - - - XenAdmin.Controls.ISODropDownBox, XenCenterMain, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null - - - panelInstallationMethod - - - 5 - - - Left, Right - - - 23, 90 - - - 20, 3, 3, 3 - - - 381, 19 - - - 3 - - - UrlTextBox - - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - panelInstallationMethod - - - 6 - - - Left - - - True - - - NoControl - - - 410, 73 - - - 123, 27 - - - 4 - 新規 ISO ライブラリ... - - linkLabelAttachNewIsoStore - - - System.Windows.Forms.LinkLabel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - panelInstallationMethod - - - 7 - - - Fill - - - 0, 0 - - - 3, 3, 3, 3 - - - 8 - - - 548, 418 - - - 1 - - - panelInstallationMethod - - - System.Windows.Forms.TableLayoutPanel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - $this - - - 0 - - - <?xml version="1.0" encoding="utf-16"?><TableLayoutSettings><Controls><Control Name="bootModesControl1" Row="7" RowSpan="1" Column="0" ColumnSpan="2" /><Control Name="PvBootBox" Row="6" RowSpan="1" Column="0" ColumnSpan="2" /><Control Name="CdRadioButton" Row="1" RowSpan="1" Column="0" ColumnSpan="1" /><Control Name="UrlRadioButton" Row="3" RowSpan="1" Column="0" ColumnSpan="1" /><Control Name="label1" Row="0" RowSpan="1" Column="0" ColumnSpan="2" /><Control Name="CdDropDownBox" Row="2" RowSpan="1" Column="0" ColumnSpan="1" /><Control Name="UrlTextBox" Row="4" RowSpan="1" Column="0" ColumnSpan="1" /><Control Name="linkLabelAttachNewIsoStore" Row="2" RowSpan="1" Column="1" ColumnSpan="1" /></Controls><Columns Styles="AutoSize,0,Percent,100" /><Rows Styles="AutoSize,0,AutoSize,0,AutoSize,0,AutoSize,0,AutoSize,0,Absolute,20,AutoSize,0,AutoSize,0" /></TableLayoutSettings> - - - 3, 3 - - - 0, 0, 0, 0 - - - 542, 40 - - - 0 - オペレーティング システムの新規 VM へのインストール方法を選択します。 - - label1 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - panelInstallationMethod - - - 4 - - - 17, 17 - - - True - - - 96, 96 - - - 548, 297 - - - comboBoxToolTip - - - System.Windows.Forms.ToolTip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - Page_InstallationMedia - - - XenAdmin.Controls.XenTabPage, XenCenterMain, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null - \ No newline at end of file diff --git a/XenAdmin/Wizards/NewVMWizard/Page_InstallationMedia.zh-CN.resx b/XenAdmin/Wizards/NewVMWizard/Page_InstallationMedia.zh-CN.resx index da94484fa..5ceda616b 100644 --- a/XenAdmin/Wizards/NewVMWizard/Page_InstallationMedia.zh-CN.resx +++ b/XenAdmin/Wizards/NewVMWizard/Page_InstallationMedia.zh-CN.resx @@ -118,414 +118,24 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - Top, Left, Right - - - 2 - - - Top, Bottom, Left, Right - - - 3, 269 - - - 0, 0, 0, 0 - - - 200, 104 - - - 3, 3, 3, 3 - - - 542, 149 - - - 7 - - - False - - - bootModesControl1 - - - XenAdmin.Wizards.BootModesControl, XenCenterMain, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null - - - panelInstallationMethod - - - 0 - - - Top, Left, Right - - - GrowAndShrink - - - True - - - GrowAndShrink - - - 1 - - - Top - - - 3, 19 - - - 518, 20 - - - 1 - - - PvBootTextBox - - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tableLayoutPanel2 - - - 0 - - - True - - - Fill - - - 0, 0 - - - 0, 0, 0, 0 - - - 0, 0, 0, 3 - - - 524, 16 - - - 0 - 请在此处输入任何高级启动参数。如果不想提供任何参数，请将此框留空。 - - label2 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tableLayoutPanel2 - - - 1 - - - Fill - - - 6, 19 - - - 2 - - - 532, 70 - - - 2 - - - tableLayoutPanel2 - - - System.Windows.Forms.TableLayoutPanel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - PvBootBox - - - 0 - - - <?xml version="1.0" encoding="utf-16"?><TableLayoutSettings><Controls><Control Name="PvBootTextBox" Row="1" RowSpan="1" Column="0" ColumnSpan="1" /><Control Name="label2" Row="0" RowSpan="1" Column="0" ColumnSpan="1" /></Controls><Columns Styles="Percent,100" /><Rows Styles="AutoSize,0,AutoSize,0" /></TableLayoutSettings> - - - 3, 202 - - - 6, 6, 6, 3 - - - 544, 92 - - - 2 - 高级操作系统启动参数(&B) - - PvBootBox - - - System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - panelInstallationMethod - - - 1 - - - True - - - NoControl - - - 6, 46 - - - 149, 17 - - - 0 - 从此 DVD 驱动器安装(&D): - - CdRadioButton - - - System.Windows.Forms.RadioButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - panelInstallationMethod - - - 2 - - - True - - - NoControl - - - 6, 105 - - - 3, 12, 3, 3 - - - 122, 17 - - - 3 - 从此 URL 安装(&U): - - UrlRadioButton - - - System.Windows.Forms.RadioButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - panelInstallationMethod - - - 3 - - - Left, Right - - - 23, 29 - - - 20, 3, 3, 3 - - - 381, 21 - - - 1 - - - CdDropDownBox - - - XenAdmin.Controls.ISODropDownBox, XenCenterMain, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null - - - panelInstallationMethod - - - 5 - - - Left, Right - - - 23, 88 - - - 20, 3, 3, 3 - - - 381, 20 - - - 3 - - - UrlTextBox - - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - panelInstallationMethod - - - 6 - - - Left - - - True - - - NoControl - - - 410, 73 - - - 123, 27 - - - 4 - 新建 ISO 库... - - linkLabelAttachNewIsoStore - - - System.Windows.Forms.LinkLabel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - panelInstallationMethod - - - 7 - - - Fill - - - 0, 0 - - - 3, 3, 3, 3 - - - 8 - - - 548, 418 - - - 1 - - - panelInstallationMethod - - - System.Windows.Forms.TableLayoutPanel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - $this - - - 0 - - - <?xml version="1.0" encoding="utf-16"?><TableLayoutSettings><Controls><Control Name="bootModesControl1" Row="7" RowSpan="1" Column="0" ColumnSpan="2" /><Control Name="PvBootBox" Row="6" RowSpan="1" Column="0" ColumnSpan="2" /><Control Name="CdRadioButton" Row="1" RowSpan="1" Column="0" ColumnSpan="1" /><Control Name="UrlRadioButton" Row="3" RowSpan="1" Column="0" ColumnSpan="1" /><Control Name="label1" Row="0" RowSpan="1" Column="0" ColumnSpan="2" /><Control Name="CdDropDownBox" Row="2" RowSpan="1" Column="0" ColumnSpan="1" /><Control Name="UrlTextBox" Row="4" RowSpan="1" Column="0" ColumnSpan="1" /><Control Name="linkLabelAttachNewIsoStore" Row="2" RowSpan="1" Column="1" ColumnSpan="1" /></Controls><Columns Styles="AutoSize,0,Percent,100" /><Rows Styles="AutoSize,0,AutoSize,0,AutoSize,0,AutoSize,0,AutoSize,0,Absolute,20,AutoSize,0,AutoSize,0" /></TableLayoutSettings> - - - 3, 3 - - - 0, 0, 0, 0 - - - 542, 40 - - - 0 - 请为要在新 VM 上安装的操作系统软件选择安装方法。 - - label1 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - panelInstallationMethod - - - 4 - - - 17, 17 - - - True - - - 96, 96 - - - 548, 297 - - - comboBoxToolTip - - - System.Windows.Forms.ToolTip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - Page_InstallationMedia - - - XenAdmin.Controls.XenTabPage, XenCenterMain, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null - \ No newline at end of file diff --git a/XenAdmin/XenAdmin.csproj b/XenAdmin/XenAdmin.csproj index 6f449aa5c..f991310df 100755 --- a/XenAdmin/XenAdmin.csproj +++ b/XenAdmin/XenAdmin.csproj @@ -2875,18 +2875,10 @@ Designer ConsolePanel.cs - - BootModesControl.cs - Designer - BootModesControl.cs Designer - - BootModesControl.cs - Designer - WizardProgress.cs Designer diff --git a/XenAdminTests/CodeTests/AssemblyTests.cs b/XenAdminTests/CodeTests/AssemblyTests.cs index 3b104b882..4f2c74935 100644 --- a/XenAdminTests/CodeTests/AssemblyTests.cs +++ b/XenAdminTests/CodeTests/AssemblyTests.cs @@ -103,6 +103,7 @@ namespace XenAdminTests.CodeTests $"Resources without a static counterpart: {string.Join(", ", extraImages)}"); } + [Ignore("Currently not shipping localized resources")] [Test, TestCaseSource(typeof(AssemblyTests), nameof(TestCasesForI18NFiles))] [Description("Checks all resx files in the project have their i18n counterparts in place")] public void TestEnsureI18NFilesInPlace(TestDataClass tc)