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

Merge pull request #1752 from kc284/master

Browse Source 
CA-265044: Text corrections on the New VMSS Schedule wizard; image co…
This commit is contained in:
Gabor Apati-Nagy 2017-09-08 18:00:03 +01:00 committed by GitHub
commit e92d3df839
6 changed files with 25 additions and 82 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
XenAdmin/TabPages/SnapshotsPage.cs
View File

@ -153,7 +153,7 @@ namespace XenAdmin.TabPages
if (vmss == null || Helpers.FeatureForbidden(VM.Connection, Host.RestrictVMSnapshotSchedule))
{
labelVMPPInfo.Text = Messages.THIS_VM_IS_NOT_IN_VMSS;
pictureBoxVMPPInfo.Image = Resources._000_BackupMetadata_h32bit_16;
pictureBoxVMPPInfo.Image = Resources._000_Info3_h32bit_16;
linkLabelVMPPInfo.Text = Helpers.FeatureForbidden(VM.Connection, Host.RestrictVMSnapshotSchedule) ? Messages.TELL_ME_MORE : Messages.VIEW_VMSS_POLICIES;
@ -479,6 +479,9 @@ namespace XenAdmin.TabPages
BuildList();
RefreshDetailsGroupBox(true);
break;
case "snapshot_schedule":
RefreshVMSSPanel();
break;
case "name_description":
case "tags":
case "other_config":

31
XenAdmin/Wizards/NewPolicyWizard/NewPolicyPolicyNamePage.cs
View File

@ -37,42 +37,19 @@ namespace XenAdmin.Wizards.NewPolicyWizard
{
public partial class NewPolicyPolicyNamePage : XenTabPage
{
private readonly string _tabName;
private readonly string _tabTitle;
public NewPolicyPolicyNamePage(string pageText, string pageTextMore, string tabName, string tabTitle, string nameFieldText)
public NewPolicyPolicyNamePage()
{
InitializeComponent();
this.labelwizard.Text = pageText;
this.autoHeightLabel1.Text = pageTextMore;
this.label2.Text = nameFieldText;
_tabName = tabName;
_tabTitle = tabTitle;
}
public override string Text
{
get
{
return _tabName;
}
}
public string SubText
{
get { return string.Empty; }
}
public Image Image
{
get { return Resources.edit_16; }
get { return Messages.VMSS_NAME; }
}
public override string PageTitle
{
get
{
return _tabTitle;
}
get { return Messages.VMSS_NAME_TITLE; }
}
public override string HelpID

24
XenAdmin/Wizards/NewPolicyWizard/NewPolicyPolicyNamePage.resx
View File

@ -126,7 +126,7 @@
</data>
<assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<data name="label2.Location" type="System.Drawing.Point, System.Drawing">
<value>3, 82</value>
<value>3, 69</value>
</data>
<assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<data name="label2.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
@ -136,13 +136,13 @@
<value>0, 3, 0, 0</value>
</data>
<data name="label2.Size" type="System.Drawing.Size, System.Drawing">
<value>67, 16</value>
<value>84, 16</value>
</data>
<data name="label2.TabIndex" type="System.Int32, mscorlib">
<value>1</value>
</data>
<data name="label2.Text" xml:space="preserve">
<value>Policy na&amp;me:</value>
<value>Schedule na&amp;me:</value>
</data>
<data name="&gt;&gt;label2.Name" xml:space="preserve">
<value>label2</value>
@ -160,13 +160,13 @@
<value>Top, Left, Right</value>
</data>
<data name="textBoxName.Location" type="System.Drawing.Point, System.Drawing">
<value>93, 82</value>
<value>110, 69</value>
</data>
<data name="textBoxName.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
<value>3, 3, 3, 20</value>
</data>
<data name="textBoxName.Size" type="System.Drawing.Size, System.Drawing">
<value>449, 20</value>
<value>432, 20</value>
</data>
<data name="textBoxName.TabIndex" type="System.Int32, mscorlib">
<value>2</value>
@ -187,7 +187,7 @@
<value>True</value>
</data>
<data name="label3.Location" type="System.Drawing.Point, System.Drawing">
<value>3, 125</value>
<value>3, 112</value>
</data>
<data name="label3.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
<value>3, 3, 20, 3</value>
@ -220,13 +220,13 @@
<value>Top, Left, Right</value>
</data>
<data name="textBoxDescription.Location" type="System.Drawing.Point, System.Drawing">
<value>93, 125</value>
<value>110, 112</value>
</data>
<data name="textBoxDescription.Multiline" type="System.Boolean, mscorlib">
<value>True</value>
</data>
<data name="textBoxDescription.Size" type="System.Drawing.Size, System.Drawing">
<value>449, 84</value>
<value>432, 84</value>
</data>
<data name="textBoxDescription.TabIndex" type="System.Int32, mscorlib">
<value>4</value>
@ -250,7 +250,7 @@
<value>Fill</value>
</data>
<data name="autoHeightLabel1.Location" type="System.Drawing.Point, System.Drawing">
<value>3, 46</value>
<value>3, 33</value>
</data>
<data name="autoHeightLabel1.Padding" type="System.Windows.Forms.Padding, System.Windows.Forms">
<value>0, 0, 0, 20</value>
@ -262,7 +262,7 @@
<value>0</value>
</data>
<data name="autoHeightLabel1.Text" xml:space="preserve">
<value>To begin, enter a name for the policy and a description (optional), then click Next.</value>
<value>To begin, enter a name for the schedule and, optionally, a description, then click Next.</value>
</data>
<data name="&gt;&gt;autoHeightLabel1.Name" xml:space="preserve">
<value>autoHeightLabel1</value>
@ -289,13 +289,13 @@
<value>0, 0, 0, 20</value>
</data>
<data name="labelwizard.Size" type="System.Drawing.Size, System.Drawing">
<value>539, 46</value>
<value>539, 33</value>
</data>
<data name="labelwizard.TabIndex" type="System.Int32, mscorlib">
<value>5</value>
</data>
<data name="labelwizard.Text" xml:space="preserve">
<value>Use this wizard to define a VM protection policy that will ensure your critical VMs are protected by automatic scheduled snapshot jobs.</value>
<value>Use this wizard to define a schedule that will run automatic snapshot jobs for your VMs.</value>
</data>
<data name="&gt;&gt;labelwizard.Name" xml:space="preserve">
<value>labelwizard</value>

3
XenAdmin/Wizards/NewPolicyWizard/NewPolicyWizard.cs
View File

@ -59,8 +59,7 @@ namespace XenAdmin.Wizards.NewPolicyWizard
this.Text = Messages.VMSS_WIZARD_TITLE;
xenTabPagePolicy = new NewPolicyPolicyNamePage(Messages.NEW_VMSS_PAGE_TEXT, Messages.NEW_VMSS_PAGE_TEXT_MORE,
Messages.VMSS_NAME, Messages.VMSS_NAME_TITLE, Messages.VMSS_NAME_FIELD_TEXT);
xenTabPagePolicy = new NewPolicyPolicyNamePage();
xenTabPageSnapshotType = new NewPolicySnapshotTypePage();
xenTabPageVMsPage = new NewVMGroupVMsPage<VMSS>();
xenTabPageFinish = new NewPolicyFinishPage(Messages.VMSS_FINISH_PAGE_TEXT, Messages.VMSS_FINISH_PAGE_CHECKBOX_TEXT, Messages.VMSS_FINISH_TITLE);

31
XenModel/Messages.Designer.cs generated
View File

@ -23312,24 +23312,6 @@ namespace XenAdmin {
}
}
/// <summary>
/// Looks up a localized string similar to Use this wizard to define a snapshot schedule that will create automatic scheduled snapshot jobs for your VMs..
/// </summary>
public static string NEW_VMSS_PAGE_TEXT {
get {
return ResourceManager.GetString("NEW_VMSS_PAGE_TEXT", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to To begin, enter a name for the schedule and a description (optional), then click Next..
/// </summary>
public static string NEW_VMSS_PAGE_TEXT_MORE {
get {
return ResourceManager.GetString("NEW_VMSS_PAGE_TEXT_MORE", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to You need to shutdown and then restart the VM before it can access the new disk..
/// </summary>
@ -30723,7 +30705,7 @@ namespace XenAdmin {
}
/// <summary>
/// Looks up a localized string similar to Snapshot schedule.
/// Looks up a localized string similar to Snapshot Schedule.
/// </summary>
public static string SNAPSHOT_FREQUENCY {
get {
@ -36168,15 +36150,6 @@ namespace XenAdmin {
}
}
/// <summary>
/// Looks up a localized string similar to Schedule na&amp;me:.
/// </summary>
public static string VMSS_NAME_FIELD_TEXT {
get {
return ResourceManager.GetString("VMSS_NAME_FIELD_TEXT", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to What do you want to call this schedule?.
/// </summary>
@ -36232,7 +36205,7 @@ namespace XenAdmin {
}
/// <summary>
/// Looks up a localized string similar to VMs in the snapshot schedule.
/// Looks up a localized string similar to Virtual Machines.
/// </summary>
public static string VMSS_VMS {
get {

13
XenModel/Messages.resx
View File

@ -8706,12 +8706,6 @@ It is strongly recommended that you Cancel and apply the latest version of the p
<data name="NEW_UPDATE_AVAILABLE" xml:space="preserve">
<value>New Update Available - {0}</value>
</data>
<data name="NEW_VMSS_PAGE_TEXT" xml:space="preserve">
<value>Use this wizard to define a snapshot schedule that will create automatic scheduled snapshot jobs for your VMs.</value>
</data>
<data name="NEW_VMSS_PAGE_TEXT_MORE" xml:space="preserve">
<value>To begin, enter a name for the schedule and a description (optional), then click Next.</value>
</data>
<data name="NEW_VM_APPLIANCE" xml:space="preserve">
<value>&amp;New vApp...</value>
</data>
@ -10698,7 +10692,7 @@ Do you want to connect to the pool master '{1}'?</value>
<value>Deleting snapshots ...</value>
</data>
<data name="SNAPSHOT_FREQUENCY" xml:space="preserve">
<value>Snapshot schedule</value>
<value>Snapshot Schedule</value>
</data>
<data name="SNAPSHOT_FREQUENCY_TITLE" xml:space="preserve">
<value>When do you want snapshots to be taken?</value>
@ -12300,9 +12294,6 @@ To learn more about the [XenServer] Dynamic Workload Balancing feature or to sta
<data name="VMSS_NAME" xml:space="preserve">
<value>Schedule Name</value>
</data>
<data name="VMSS_NAME_FIELD_TEXT" xml:space="preserve">
<value>Schedule na&amp;me:</value>
</data>
<data name="VMSS_NAME_TITLE" xml:space="preserve">
<value>What do you want to call this schedule?</value>
</data>
@ -12322,7 +12313,7 @@ To learn more about the [XenServer] Dynamic Workload Balancing feature or to sta
<value>schedule</value>
</data>
<data name="VMSS_VMS" xml:space="preserve">
<value>VMs in the snapshot schedule</value>
<value>Virtual Machines</value>
</data>
<data name="VMSS_VMS_TITLE" xml:space="preserve">
<value>Select the VMs that you want to schedule snapshots for</value>