diff --git a/XenAdmin/Wizards/PatchingWizard/PatchingWizard_AutomatedUpdatesPage.cs b/XenAdmin/Wizards/PatchingWizard/PatchingWizard_AutomatedUpdatesPage.cs index 3999b2a99..ce91e6d57 100644 --- a/XenAdmin/Wizards/PatchingWizard/PatchingWizard_AutomatedUpdatesPage.cs +++ b/XenAdmin/Wizards/PatchingWizard/PatchingWizard_AutomatedUpdatesPage.cs @@ -139,7 +139,16 @@ namespace XenAdmin.Wizards.PatchingWizard return; } - Debug.Assert(WizardMode != WizardMode.NewVersion || (WizardMode == WizardMode.NewVersion && UpdateAlert != null), "For version updates the UpdateAlert shouldn't be null"); + Debug.Assert(WizardMode == WizardMode.AutomatedUpdates || WizardMode == WizardMode.NewVersion && UpdateAlert != null); + + if (WizardMode == WizardMode.AutomatedUpdates) + { + labelTitle.Text = Messages.PATCHINGWIZARD_UPLOAD_AND_INSTALL_TITLE_AUTOMATED_MODE; + } + else if (WizardMode == WizardMode.NewVersion) + { + labelTitle.Text = Messages.PATCHINGWIZARD_UPLOAD_AND_INSTALL_TITLE_NEW_VERSION_AUTOMATED_MODE; + } foreach (var pool in SelectedPools) { @@ -614,7 +623,15 @@ namespace XenAdmin.Wizards.PatchingWizard private void AllWorkersFinished() { - labelTitle.Text = Messages.PATCHINGWIZARD_UPDATES_DONE_AUTOMATED_UPDATES_MODE; + if (WizardMode == WizardMode.AutomatedUpdates) + { + labelTitle.Text = Messages.PATCHINGWIZARD_UPDATES_DONE_AUTOMATED_UPDATES_MODE; + } + else if (WizardMode == WizardMode.NewVersion) + { + labelTitle.Text = Messages.PATCHINGWIZARD_UPDATES_DONE_AUTOMATED_NEW_VERSION_MODE; + } + progressBar.Value = 100; pictureBox1.Image = null; labelError.Text = Messages.CLOSE_WIZARD_CLICK_FINISH; diff --git a/XenAdmin/Wizards/PatchingWizard/PatchingWizard_AutomatedUpdatesPage.designer.cs b/XenAdmin/Wizards/PatchingWizard/PatchingWizard_AutomatedUpdatesPage.designer.cs index ff3e62b60..5e050846b 100644 --- a/XenAdmin/Wizards/PatchingWizard/PatchingWizard_AutomatedUpdatesPage.designer.cs +++ b/XenAdmin/Wizards/PatchingWizard/PatchingWizard_AutomatedUpdatesPage.designer.cs @@ -86,7 +86,7 @@ namespace XenAdmin.Wizards.PatchingWizard this.errorLinkLabel.Name = "errorLinkLabel"; this.errorLinkLabel.TabStop = true; // - // PatchingWizard_AutoUpdatingPage + // PatchingWizard_AutomatedUpdatesPage // resources.ApplyResources(this, "$this"); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi; @@ -94,7 +94,7 @@ namespace XenAdmin.Wizards.PatchingWizard this.Controls.Add(this.progressBar); this.Controls.Add(this.textBoxLog); this.Controls.Add(this.labelTitle); - this.Name = "PatchingWizard_AutoUpdatingPage"; + this.Name = "PatchingWizard_AutomatedUpdatesPage"; ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).EndInit(); this.panel1.ResumeLayout(false); this.panel1.PerformLayout(); diff --git a/XenAdmin/Wizards/PatchingWizard/PatchingWizard_AutomatedUpdatesPage.resx b/XenAdmin/Wizards/PatchingWizard/PatchingWizard_AutomatedUpdatesPage.resx index 4d228a90d..0a85152a6 100644 --- a/XenAdmin/Wizards/PatchingWizard/PatchingWizard_AutomatedUpdatesPage.resx +++ b/XenAdmin/Wizards/PatchingWizard/PatchingWizard_AutomatedUpdatesPage.resx @@ -126,14 +126,11 @@ 3, 13 - 92, 13 + 0, 13 0 - - Installing updates: - labelTitle @@ -355,7 +352,7 @@ 511, 335 - PatchingWizard_AutoUpdatingPage + PatchingWizard_AutomatedUpdatesPage XenAdmin.Controls.XenTabPage, XenCenterMain, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null diff --git a/XenAdmin/Wizards/PatchingWizard/PatchingWizard_SelectPatchPage.resx b/XenAdmin/Wizards/PatchingWizard/PatchingWizard_SelectPatchPage.resx index c0a4ebbf3..d4e913091 100644 --- a/XenAdmin/Wizards/PatchingWizard/PatchingWizard_SelectPatchPage.resx +++ b/XenAdmin/Wizards/PatchingWizard/PatchingWizard_SelectPatchPage.resx @@ -241,13 +241,14 @@ 23, 83 - 575, 13 + 575, 26 3 - [XenCenter] will download and install all current updates from [Citrix], usually with only a single reboot at the end. + [XenCenter] will download and install all released updates on the current version from [Citrix], usually with only a single reboot at the end. + automatedUpdatesOptionLabel @@ -268,19 +269,19 @@ NoControl - 3, 108 + 3, 121 3, 12, 3, 3 - 163, 17 + 235, 17 4 - &Download update from [Citrix] + &Download update or new version from [Citrix] downloadUpdateRadioButton @@ -583,7 +584,7 @@ 1 - 178, 81 + 178, 75 1 @@ -664,7 +665,7 @@ Vertical - 575, 189 + 575, 176 0 @@ -685,10 +686,10 @@ Fill - 23, 131 + 23, 144 - 575, 189 + 575, 176 5 diff --git a/XenAdmin/Wizards/PatchingWizard/PatchingWizard_SelectServers.cs b/XenAdmin/Wizards/PatchingWizard/PatchingWizard_SelectServers.cs index 29380f646..f2217e197 100644 --- a/XenAdmin/Wizards/PatchingWizard/PatchingWizard_SelectServers.cs +++ b/XenAdmin/Wizards/PatchingWizard/PatchingWizard_SelectServers.cs @@ -42,6 +42,7 @@ using XenAdmin.Properties; using XenAPI; using XenAdmin.Alerts; using System.Linq; +using System.Diagnostics; namespace XenAdmin.Wizards.PatchingWizard { @@ -96,9 +97,19 @@ namespace XenAdmin.Wizards.PatchingWizard try { poolSelectionOnly = WizardMode == WizardMode.AutomatedUpdates || SelectedUpdateAlert != null || FileFromDiskAlert != null; - label1.Text = WizardMode == WizardMode.AutomatedUpdates - ? Messages.PATCHINGWIZARD_SELECTSERVERPAGE_RUBRIC_AUTOMATED_MODE - : poolSelectionOnly ? Messages.PATCHINGWIZARD_SELECTSERVERPAGE_RUBRIC_POOL_SELECTION : Messages.PATCHINGWIZARD_SELECTSERVERPAGE_RUBRIC_DEFAULT; + + switch (WizardMode) + { + case WizardMode.AutomatedUpdates : + label1.Text = Messages.PATCHINGWIZARD_SELECTSERVERPAGE_RUBRIC_AUTOMATED_MODE; + break; + case WizardMode.NewVersion : + label1.Text = Messages.PATCHINGWIZARD_SELECTSERVERPAGE_RUBRIC_NEW_VERSION_MODE; + break; + case WizardMode.SingleUpdate : + label1.Text = poolSelectionOnly ? Messages.PATCHINGWIZARD_SELECTSERVERPAGE_RUBRIC_POOL_SELECTION : Messages.PATCHINGWIZARD_SELECTSERVERPAGE_RUBRIC_DEFAULT; + break; + } // catch selected servers, in order to restore selection after the dataGrid is reloaded List selectedServers = SelectedServers; diff --git a/XenAdmin/Wizards/PatchingWizard/PatchingWizard_SelectServers.resx b/XenAdmin/Wizards/PatchingWizard/PatchingWizard_SelectServers.resx index ac4a4e422..b03d629bd 100644 --- a/XenAdmin/Wizards/PatchingWizard/PatchingWizard_SelectServers.resx +++ b/XenAdmin/Wizards/PatchingWizard/PatchingWizard_SelectServers.resx @@ -132,9 +132,6 @@ 1 - - rubric - label1 diff --git a/XenModel/Messages.Designer.cs b/XenModel/Messages.Designer.cs index 0db184482..36aff9177 100755 --- a/XenModel/Messages.Designer.cs +++ b/XenModel/Messages.Designer.cs @@ -27210,6 +27210,15 @@ namespace XenAdmin { } } + /// + /// Looks up a localized string similar to Select one or more pools or standalone servers that you want to update to the new version.. + /// + public static string PATCHINGWIZARD_SELECTSERVERPAGE_RUBRIC_NEW_VERSION_MODE { + get { + return ResourceManager.GetString("PATCHINGWIZARD_SELECTSERVERPAGE_RUBRIC_NEW_VERSION_MODE", resourceCulture); + } + } + /// /// Looks up a localized string similar to Select one or more pools or standalone servers where you want to apply the selected update. ///Servers where this update cannot be applied appear disabled in this list.. @@ -27256,6 +27265,15 @@ namespace XenAdmin { } } + /// + /// Looks up a localized string similar to The new version has been installed.. + /// + public static string PATCHINGWIZARD_UPDATES_DONE_AUTOMATED_NEW_VERSION_MODE { + get { + return ResourceManager.GetString("PATCHINGWIZARD_UPDATES_DONE_AUTOMATED_NEW_VERSION_MODE", resourceCulture); + } + } + /// /// Looks up a localized string similar to Automated updates have finished.. /// @@ -27265,6 +27283,24 @@ namespace XenAdmin { } } + /// + /// Looks up a localized string similar to Installing updates:. + /// + public static string PATCHINGWIZARD_UPLOAD_AND_INSTALL_TITLE_AUTOMATED_MODE { + get { + return ResourceManager.GetString("PATCHINGWIZARD_UPLOAD_AND_INSTALL_TITLE_AUTOMATED_MODE", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Installing new version:. + /// + public static string PATCHINGWIZARD_UPLOAD_AND_INSTALL_TITLE_NEW_VERSION_AUTOMATED_MODE { + get { + return ResourceManager.GetString("PATCHINGWIZARD_UPLOAD_AND_INSTALL_TITLE_NEW_VERSION_AUTOMATED_MODE", resourceCulture); + } + } + /// /// Looks up a localized string similar to [XenCenter] is now downloading your update and uploading it to the servers specified in the previous step. ///Please wait for these operations to complete, then click Next to continue with the installation.. diff --git a/XenModel/Messages.resx b/XenModel/Messages.resx index e82c5f100..3d31e8872 100755 --- a/XenModel/Messages.resx +++ b/XenModel/Messages.resx @@ -9388,6 +9388,9 @@ Greyed out servers cannot be updated with automated updates. Select one or more servers where you want to apply the selected update. Servers where this update cannot be applied appear disabled in this list. + + Select one or more pools or standalone servers that you want to update to the new version. + Select one or more pools or standalone servers where you want to apply the selected update. Servers where this update cannot be applied appear disabled in this list. @@ -9404,6 +9407,9 @@ Servers where this update cannot be applied appear disabled in this list. Select the servers you wish to update + + The new version has been installed. + Automated updates have finished. @@ -9424,6 +9430,12 @@ Please wait for this operation to complete, then click Next to continue with the Uploading the selected file to your servers + + Installing updates: + + + Installing new version: + Eject any virtual CDs from your VMs