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

Merge pull request #3021 from kc284/remove-updates-tab

Browse Source 
CP-39817: Removed updates tab page.
This commit is contained in:
Konstantina Chremmou 2022-06-21 10:48:46 +01:00 committed by GitHub
commit 6898148466
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
31 changed files with 160 additions and 6692 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CFUValidator/Updates/AlternativeUrlDownloadUpdatesXmlSourceAction.cs
View File

@ -43,7 +43,7 @@ namespace CFUValidator.Updates
private readonly string _url;
public AlternativeUrlDownloadUpdatesXmlSourceAction(string url)
: base(true, true, true, "CFU")
: base(true, true, true, "CFU", true)
{
_url = url ?? throw new ArgumentNullException(nameof(url));
}

2
CFUValidator/Updates/ReadFromFileUpdatesXmlSource.cs
View File

@ -41,7 +41,7 @@ namespace CFUValidator.Updates
private readonly string _location;
public ReadFromFileUpdatesXmlSource(string location)
: base(true, true, true, "CFU")
: base(true, true, true, "CFU", true)
{
_location = location ?? throw new ArgumentNullException(nameof(location));
}

1
XenAdmin/Alerts/Types/ClientUpdateAlert.cs
View File

@ -30,7 +30,6 @@
*/
using System;
using System.Collections.Generic;
using System.Diagnostics;
using System.IO;
using System.Windows.Forms;

63
XenAdmin/Controls/MainWindowControls/NotificationsView.cs
View File

@ -40,14 +40,15 @@ namespace XenAdmin.Controls.MainWindowControls
{
class NotificationsView : FlickerFreeListBox
{
private const int IMG_LEFT_MARGIN = 16;
private const int IMG_RIGHT_MARGIN = 8;
[Browsable(true)]
public event Action<NotificationsSubModeItem> NotificationsSubModeChanged;
public NotificationsView()
{
Items.Add(new NotificationsSubModeItem(NotificationsSubMode.Alerts));
if (!Helpers.CommonCriteriaCertificationRelease)
Items.Add(new NotificationsSubModeItem(NotificationsSubMode.Updates));
Items.Add(new NotificationsSubModeItem(NotificationsSubMode.Events));
}
@ -56,9 +57,7 @@ namespace XenAdmin.Controls.MainWindowControls
int total = 0;
foreach (var item in Items)
{
var subModeItem = item as NotificationsSubModeItem;
if (subModeItem != null)
if (item is NotificationsSubModeItem subModeItem)
total += subModeItem.UnreadEntries;
}
return total;
@ -68,9 +67,7 @@ namespace XenAdmin.Controls.MainWindowControls
{
foreach (var item in Items)
{
var subModeItem = item as NotificationsSubModeItem;
if (subModeItem != null && subModeItem.SubMode == subMode)
if (item is NotificationsSubModeItem subModeItem && subModeItem.SubMode == subMode)
{
subModeItem.UnreadEntries = entries;
break;
@ -84,9 +81,7 @@ namespace XenAdmin.Controls.MainWindowControls
{
foreach (var item in Items)
{
var subModeItem = item as NotificationsSubModeItem;
if (subModeItem != null && subModeItem.SubMode == subMode)
if (item is NotificationsSubModeItem subModeItem && subModeItem.SubMode == subMode)
{
var lastSelected = SelectedItem;
SelectedItem = item;
@ -103,12 +98,9 @@ namespace XenAdmin.Controls.MainWindowControls
{
base.OnDrawItem(e);
var item = Items[e.Index] as NotificationsSubModeItem;
if (item == null)
if (!(Items[e.Index] is NotificationsSubModeItem item))
return;
const int IMG_LEFT_MARGIN = 16;
const int IMG_RIGHT_MARGIN = 8;
int itemHeight = e.Bounds.Height;
int imgWidth = item.Image.Width;
int imgHeight = item.Image.Height;
@ -138,22 +130,20 @@ namespace XenAdmin.Controls.MainWindowControls
{
base.OnSelectedIndexChanged(e);
var item = Items[SelectedIndex] as NotificationsSubModeItem;
if (item != null && NotificationsSubModeChanged != null)
if (Items[SelectedIndex] is NotificationsSubModeItem item && NotificationsSubModeChanged != null)
NotificationsSubModeChanged(item);
}
}
public enum NotificationsSubMode { Alerts, Updates, Events }
public enum NotificationsSubMode { Alerts, Events }
public class NotificationsSubModeItem
{
public readonly NotificationsSubMode SubMode;
public NotificationsSubModeItem(NotificationsSubMode submode)
public NotificationsSubModeItem(NotificationsSubMode subMode)
{
SubMode = submode;
SubMode = subMode;
}
/// <summary>
@ -162,24 +152,16 @@ namespace XenAdmin.Controls.MainWindowControls
/// </summary>
public int UnreadEntries { get; set; }
public Image Image
{
get { return GetImage(SubMode, UnreadEntries); }
}
public Image Image => GetImage(SubMode, UnreadEntries);
public string Text
{
get { return GetText(SubMode, UnreadEntries); }
}
public string Text => GetText(SubMode, UnreadEntries);
public static Image GetImage(NotificationsSubMode submode, int unreadEntries)
public static Image GetImage(NotificationsSubMode subMode, int unreadEntries)
{
switch (submode)
switch (subMode)
{
case NotificationsSubMode.Alerts:
return Images.StaticImages._000_Alert2_h32bit_16;
case NotificationsSubMode.Updates:
return Images.StaticImages.notif_updates_16;
case NotificationsSubMode.Events:
return unreadEntries == 0
? Images.StaticImages.notif_events_16
@ -189,27 +171,22 @@ namespace XenAdmin.Controls.MainWindowControls
}
}
public static string GetText(NotificationsSubMode submode, int unreadEntries)
public static string GetText(NotificationsSubMode subMode, int unreadEntries)
{
switch (submode)
switch (subMode)
{
case NotificationsSubMode.Alerts:
return unreadEntries == 0
? Messages.NOTIFICATIONS_SUBMODE_ALERTS_READ
: string.Format(Messages.NOTIFICATIONS_SUBMODE_ALERTS_UNREAD, unreadEntries);
case NotificationsSubMode.Updates:
return unreadEntries == 0
? Messages.NOTIFICATIONS_SUBMODE_UPDATES_READ
: string.Format(Messages.NOTIFICATIONS_SUBMODE_UPDATES_UNREAD, unreadEntries);
case NotificationsSubMode.Events:
if (unreadEntries == 0)
return Messages.NOTIFICATIONS_SUBMODE_EVENTS_READ;
else if (unreadEntries == 1)
if (unreadEntries == 1)
return Messages.NOTIFICATIONS_SUBMODE_EVENTS_UNREAD_ONE;
else
return string.Format(Messages.NOTIFICATIONS_SUBMODE_EVENTS_UNREAD_MANY, unreadEntries);
return string.Format(Messages.NOTIFICATIONS_SUBMODE_EVENTS_UNREAD_MANY, unreadEntries);
default:
return "";
return string.Empty;
}
}
}

7
XenAdmin/Core/Metadata.cs
View File

@ -75,7 +75,6 @@ namespace XenAdmin.Core
internal struct CFU
{
public bool AllowXenCenterUpdates;
public bool AllowXenServerUpdates;
}
internal struct Proxy
@ -130,11 +129,7 @@ namespace XenAdmin.Core
},
Settings = new XenCenterSettings
{
CFU = new CFU
{
AllowXenCenterUpdates = Properties.Settings.Default.AllowXenCenterUpdates,
AllowXenServerUpdates = Properties.Settings.Default.AllowXenServerUpdates
},
CFU = new CFU {AllowXenCenterUpdates = Properties.Settings.Default.AllowXenCenterUpdates},
Proxy = new Proxy
{
UseProxy = (HTTPHelper.ProxyStyle) Properties.Settings.Default.ProxySetting == HTTPHelper.ProxyStyle.SpecifiedProxy,

83
XenAdmin/Core/Updates.cs
View File

@ -34,11 +34,9 @@ using System.Collections.Generic;
using System.ComponentModel;
using System.Diagnostics;
using System.Linq;
using System.Windows.Forms;
using XenAdmin.Actions;
using XenAdmin.Alerts;
using XenAdmin.Alerts.Types;
using XenAdmin.Dialogs;
using XenAdmin.Network;
using XenAPI;
@ -49,9 +47,8 @@ namespace XenAdmin.Core
{
private static readonly log4net.ILog log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType);
public static event Action<bool, string> CheckForUpdatesCompleted;
public static event Action CheckForUpdatesCompleted;
public static event Action CheckForUpdatesStarted;
public static event Action RestoreDismissedUpdatesStarted;
public static event Action<CollectionChangeEventArgs> UpdateAlertCollectionChanged;
private static readonly object downloadedUpdatesLock = new object();
@ -85,41 +82,28 @@ namespace XenAdmin.Core
/// <summary>
/// If AutomaticCheck is enabled it checks for updates regardless the
/// value of the parameter force. If AutomaticCheck is disabled it
/// checks for all update types if force is true; forceRefresh causes
/// the check for update action to run and refresh the Updates page
/// value of the parameter userRequested. If AutomaticCheck is disabled it checks
/// for all update types if userRequested is true.
/// </summary>
public static void CheckForUpdates(bool force, bool forceRefresh = false)
public static void CheckForUpdates(bool userRequested = false)
{
if (Helpers.CommonCriteriaCertificationRelease)
return;
if (Properties.Settings.Default.AllowXenCenterUpdates ||
Properties.Settings.Default.AllowXenServerUpdates ||
force || forceRefresh)
if (Properties.Settings.Default.AllowXenCenterUpdates || userRequested)
{
var action = CreateDownloadUpdatesXmlAction(
Properties.Settings.Default.AllowXenCenterUpdates || force,
Properties.Settings.Default.AllowXenServerUpdates || force);
string userAgent = $"{BrandManager.BrandConsole}/{BrandManager.XenCenterVersion}.{Program.Version.Revision} ({IntPtr.Size * 8}-bit)";
var action = new DownloadUpdatesXmlAction(Properties.Settings.Default.AllowXenCenterUpdates || userRequested,
false, false, userAgent, !userRequested);
action.Completed += actionCompleted;
if (CheckForUpdatesStarted != null)
CheckForUpdatesStarted();
CheckForUpdatesStarted?.Invoke();
action.RunAsync();
}
}
public static DownloadUpdatesXmlAction CreateDownloadUpdatesXmlAction(bool checkForXenCenter = false,
bool checkForServerVersion = false, bool checkForPatches = false)
{
string userAgent = string.Format("{0}/{1}.{2} ({3}-bit)", BrandManager.BrandConsole, BrandManager.XenCenterVersion, Program.Version.Revision.ToString(), IntPtr.Size * 8);
return new DownloadUpdatesXmlAction(checkForXenCenter, checkForServerVersion, checkForPatches,
userAgent);
}
private static void actionCompleted(ActionBase sender)
{
Program.AssertOffEventThread();
@ -128,7 +112,6 @@ namespace XenAdmin.Core
return;
bool succeeded = action.Succeeded;
string errorMessage = string.Empty;
if (succeeded)
{
@ -140,26 +123,6 @@ namespace XenAdmin.Core
XenServerPatches = action.XenServerPatches;
}
}
else
{
if (action.Exception != null)
{
if (action.Exception is System.Net.Sockets.SocketException)
{
errorMessage = Messages.AVAILABLE_UPDATES_NETWORK_ERROR;
}
else
{
// Clean up and remove excess newlines, carriage returns, trailing nonsense
string errorText = action.Exception.Message.Trim();
errorText = System.Text.RegularExpressions.Regex.Replace(errorText, @"\r\n+", "");
errorMessage = string.Format(Messages.AVAILABLE_UPDATES_ERROR, errorText);
}
}
if (string.IsNullOrEmpty(errorMessage))
errorMessage = Messages.AVAILABLE_UPDATES_INTERNAL_ERROR;
}
lock (updateAlertsLock)
{
@ -180,7 +143,7 @@ namespace XenAdmin.Core
UpdateAlertCollectionChanged?.Invoke(new CollectionChangeEventArgs(CollectionChangeAction.Refresh, UpdateAlerts));
CheckForUpdatesCompleted?.Invoke(succeeded, errorMessage);
CheckForUpdatesCompleted?.Invoke();
}
public static List<ClientUpdateAlert> NewClientUpdateAlerts(List<ClientVersion> clientVersions,
@ -730,32 +693,6 @@ namespace XenAdmin.Core
}
}
public static void RestoreDismissedUpdates()
{
var actions = new List<AsyncAction>();
foreach (IXenConnection connection in ConnectionsManager.XenConnectionsCopy)
actions.Add(new RestoreDismissedUpdatesAction(connection));
var action = new ParallelAction(Messages.RESTORE_DISMISSED_UPDATES, Messages.RESTORING, Messages.COMPLETED,
actions, suppressHistory: true, showSubActionsDetails: false);
action.Completed += action_Completed;
RestoreDismissedUpdatesStarted?.Invoke();
action.RunAsync();
}
private static void action_Completed(ActionBase action)
{
Program.Invoke(Program.MainWindow, () =>
{
Properties.Settings.Default.LatestXenCenterSeen = "";
Settings.TrySaveSettings();
CheckForUpdates(true);
});
}
private static XenServerPatchAlert FindPatchAlert(Predicate<XenServerPatch> predicate)
{
var existingAlert = UpdateAlerts.FirstOrDefault(a => a is XenServerPatchAlert patchAlert && predicate(patchAlert.Patch));

72
XenAdmin/Diagnostics/Checks/CfuAvailabilityCheck.cs
View File

@ -1,72 +0,0 @@
/* Copyright (c) Citrix Systems, Inc.
* All rights reserved.
*
* Redistribution and use in source and binary forms,
* with or without modification, are permitted provided
* that the following conditions are met:
*
* * Redistributions of source code must retain the above
* copyright notice, this list of conditions and the
* following disclaimer.
* * Redistributions in binary form must reproduce the above
* copyright notice, this list of conditions and the
* following disclaimer in the documentation and/or other
* materials provided with the distribution.
*
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND
* CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,
* INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
* MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
* DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
* CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
* BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
* SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
* INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
* WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
* NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*/
using XenAdmin.Core;
using XenAdmin.Diagnostics.Problems;
using XenAdmin.Diagnostics.Problems.UtilityProblem;
using XenAPI;
namespace XenAdmin.Diagnostics.Checks
{
class CfuAvailabilityCheck : Check
{
private static readonly log4net.ILog log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType);
protected override Problem RunCheck()
{
var action = Updates.CreateDownloadUpdatesXmlAction();
try
{
action.RunSync(action.Session);
}
catch
{
log.WarnFormat("Could not download check for update file.");
}
return action.Succeeded ? null : new CfuNotAvailableProblem(this);
}
public override string Description
{
get
{
return Messages.CFU_STATUS_CHECK_DESCRIPTION;
}
}
public override IXenObject XenObject
{
get { return null; }
}
}
}

17
XenAdmin/Dialogs/OptionsPages/UpdatesOptionsPage.Designer.cs generated
View File

@ -30,9 +30,8 @@ namespace XenAdmin.Dialogs.OptionsPages
{
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(UpdatesOptionsPage));
this.UpdatesTableLayoutPanel = new System.Windows.Forms.TableLayoutPanel();
this.AllowXenServerUpdatesCheckBox = new System.Windows.Forms.CheckBox();
this.AllowXenCenterUpdatesCheckBox = new System.Windows.Forms.CheckBox();
this.UpdatesBlurb = new System.Windows.Forms.Label();
this.AllowXenCenterUpdatesCheckBox = new System.Windows.Forms.CheckBox();
this.UpdatesTableLayoutPanel.SuspendLayout();
this.SuspendLayout();
//
@ -42,14 +41,12 @@ namespace XenAdmin.Dialogs.OptionsPages
this.UpdatesTableLayoutPanel.BackColor = System.Drawing.Color.Transparent;
this.UpdatesTableLayoutPanel.Controls.Add(this.UpdatesBlurb, 0, 0);
this.UpdatesTableLayoutPanel.Controls.Add(this.AllowXenCenterUpdatesCheckBox, 0, 1);
this.UpdatesTableLayoutPanel.Controls.Add(this.AllowXenServerUpdatesCheckBox, 0, 2);
this.UpdatesTableLayoutPanel.Name = "UpdatesTableLayoutPanel";
//
// AllowXenServerUpdatesCheckBox
// UpdatesBlurb
//
resources.ApplyResources(this.AllowXenServerUpdatesCheckBox, "AllowXenServerUpdatesCheckBox");
this.AllowXenServerUpdatesCheckBox.Name = "AllowXenServerUpdatesCheckBox";
this.AllowXenServerUpdatesCheckBox.UseVisualStyleBackColor = true;
resources.ApplyResources(this.UpdatesBlurb, "UpdatesBlurb");
this.UpdatesBlurb.Name = "UpdatesBlurb";
//
// AllowXenCenterUpdatesCheckBox
//
@ -57,11 +54,6 @@ namespace XenAdmin.Dialogs.OptionsPages
this.AllowXenCenterUpdatesCheckBox.Name = "AllowXenCenterUpdatesCheckBox";
this.AllowXenCenterUpdatesCheckBox.UseVisualStyleBackColor = true;
//
// UpdatesBlurb
//
resources.ApplyResources(this.UpdatesBlurb, "UpdatesBlurb");
this.UpdatesBlurb.Name = "UpdatesBlurb";
//
// UpdatesOptionsPage
//
resources.ApplyResources(this, "$this");
@ -79,7 +71,6 @@ namespace XenAdmin.Dialogs.OptionsPages
private System.Windows.Forms.TableLayoutPanel UpdatesTableLayoutPanel;
private System.Windows.Forms.Label UpdatesBlurb;
private System.Windows.Forms.CheckBox AllowXenServerUpdatesCheckBox;
private System.Windows.Forms.CheckBox AllowXenCenterUpdatesCheckBox;
}
}

20
XenAdmin/Dialogs/OptionsPages/UpdatesOptionsPage.cs
View File

@ -41,8 +41,7 @@ namespace XenAdmin.Dialogs.OptionsPages
public UpdatesOptionsPage()
{
InitializeComponent();
UpdatesBlurb.Text = string.Format(UpdatesBlurb.Text, BrandManager.BrandConsole, BrandManager.ProductBrand);
AllowXenServerUpdatesCheckBox.Text = string.Format(AllowXenServerUpdatesCheckBox.Text, BrandManager.ProductBrand);
UpdatesBlurb.Text = string.Format(UpdatesBlurb.Text, BrandManager.BrandConsole);
AllowXenCenterUpdatesCheckBox.Text = string.Format(AllowXenCenterUpdatesCheckBox.Text, BrandManager.BrandConsole);
}
@ -52,9 +51,6 @@ namespace XenAdmin.Dialogs.OptionsPages
{
// XenCenter updates
AllowXenCenterUpdatesCheckBox.Checked = Properties.Settings.Default.AllowXenCenterUpdates;
// XenServer updates
AllowXenServerUpdatesCheckBox.Checked = Properties.Settings.Default.AllowXenServerUpdates;
}
public bool IsValidToSave()
@ -71,17 +67,15 @@ namespace XenAdmin.Dialogs.OptionsPages
public void Save()
{
bool checkXenCenterUpdates = AllowXenCenterUpdatesCheckBox.Checked != Properties.Settings.Default.AllowXenCenterUpdates;
bool checkVersionUpdates = AllowXenServerUpdatesCheckBox.Checked != Properties.Settings.Default.AllowXenServerUpdates;
bool checkXenCenterUpdatesChanged = AllowXenCenterUpdatesCheckBox.Checked != Properties.Settings.Default.AllowXenCenterUpdates;
if (checkXenCenterUpdates)
if (checkXenCenterUpdatesChanged)
{
Properties.Settings.Default.AllowXenCenterUpdates = AllowXenCenterUpdatesCheckBox.Checked;
if (checkVersionUpdates)
Properties.Settings.Default.AllowXenServerUpdates = AllowXenServerUpdatesCheckBox.Checked;
if(checkXenCenterUpdates || checkVersionUpdates)
Updates.CheckForUpdates(false, true);
if (Properties.Settings.Default.AllowXenCenterUpdates)
Updates.CheckForUpdates(true);
}
}
#endregion

42
XenAdmin/Dialogs/OptionsPages/UpdatesOptionsPage.resx
View File

@ -154,7 +154,7 @@
<value>0</value>
</data>
<data name="UpdatesBlurb.Text" xml:space="preserve">
<value>You can configure {0} to periodically check for available updates and prompt you when a new version of {0} or {1} is available for download.</value>
<value>You can configure {0} to periodically check for available updates and prompt you when a new version of the application is available for download.</value>
</data>
<data name="&gt;&gt;UpdatesBlurb.Name" xml:space="preserve">
<value>UpdatesBlurb</value>
@ -204,42 +204,6 @@
<data name="&gt;&gt;AllowXenCenterUpdatesCheckBox.ZOrder" xml:space="preserve">
<value>1</value>
</data>
<data name="AllowXenServerUpdatesCheckBox.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
</data>
<data name="AllowXenServerUpdatesCheckBox.Font" type="System.Drawing.Font, System.Drawing">
<value>Tahoma, 8pt</value>
</data>
<data name="AllowXenServerUpdatesCheckBox.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
<value>NoControl</value>
</data>
<data name="AllowXenServerUpdatesCheckBox.Location" type="System.Drawing.Point, System.Drawing">
<value>3, 64</value>
</data>
<data name="AllowXenServerUpdatesCheckBox.Padding" type="System.Windows.Forms.Padding, System.Windows.Forms">
<value>3, 0, 0, 0</value>
</data>
<data name="AllowXenServerUpdatesCheckBox.Size" type="System.Drawing.Size, System.Drawing">
<value>173, 17</value>
</data>
<data name="AllowXenServerUpdatesCheckBox.TabIndex" type="System.Int32, mscorlib">
<value>2</value>
</data>
<data name="AllowXenServerUpdatesCheckBox.Text" xml:space="preserve">
<value>Check for new &amp;versions of {0}</value>
</data>
<data name="&gt;&gt;AllowXenServerUpdatesCheckBox.Name" xml:space="preserve">
<value>AllowXenServerUpdatesCheckBox</value>
</data>
<data name="&gt;&gt;AllowXenServerUpdatesCheckBox.Type" xml:space="preserve">
<value>System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;AllowXenServerUpdatesCheckBox.Parent" xml:space="preserve">
<value>UpdatesTableLayoutPanel</value>
</data>
<data name="&gt;&gt;AllowXenServerUpdatesCheckBox.ZOrder" xml:space="preserve">
<value>2</value>
</data>
<data name="UpdatesTableLayoutPanel.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
<value>Fill</value>
</data>
@ -250,7 +214,7 @@
<value>0, 0</value>
</data>
<data name="UpdatesTableLayoutPanel.RowCount" type="System.Int32, mscorlib">
<value>4</value>
<value>3</value>
</data>
<data name="UpdatesTableLayoutPanel.Size" type="System.Drawing.Size, System.Drawing">
<value>447, 225</value>
@ -271,7 +235,7 @@
<value>0</value>
</data>
<data name="UpdatesTableLayoutPanel.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="UpdatesBlurb" Row="0" RowSpan="1" Column="0" ColumnSpan="1" /&gt;&lt;Control Name="AllowXenCenterUpdatesCheckBox" Row="1" RowSpan="1" Column="0" ColumnSpan="1" /&gt;&lt;Control Name="AllowXenServerUpdatesCheckBox" Row="2" RowSpan="1" Column="0" ColumnSpan="1" /&gt;&lt;/Controls&gt;&lt;Columns Styles="Percent,100" /&gt;&lt;Rows Styles="AutoSize,0,AutoSize,0,AutoSize,0,Percent,100" /&gt;&lt;/TableLayoutSettings&gt;</value>
<value>&lt;?xml version="1.0" encoding="utf-16"?&gt;&lt;TableLayoutSettings&gt;&lt;Controls&gt;&lt;Control Name="UpdatesBlurb" Row="0" RowSpan="1" Column="0" ColumnSpan="1" /&gt;&lt;Control Name="AllowXenCenterUpdatesCheckBox" Row="1" RowSpan="1" Column="0" ColumnSpan="1" /&gt;&lt;/Controls&gt;&lt;Columns Styles="Percent,100" /&gt;&lt;Rows Styles="AutoSize,0,AutoSize,0,Percent,100,Absolute,20" /&gt;&lt;/TableLayoutSettings&gt;</value>
</data>
<metadata name="$this.Localizable" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>

33
XenAdmin/MainWindow.Designer.cs generated
View File

@ -74,7 +74,6 @@ namespace XenAdmin
this.TabPageDockerDetails = new System.Windows.Forms.TabPage();
this.TabPageUSB = new System.Windows.Forms.TabPage();
this.alertPage = new XenAdmin.TabPages.AlertSummaryPage();
this.updatesPage = new XenAdmin.TabPages.ManageUpdatesPage();
this.eventsPage = new XenAdmin.TabPages.HistoryPage();
this.TitleBackPanel = new XenAdmin.Controls.GradientPanel.VerticalGradientPanel();
this.TitleIcon = new System.Windows.Forms.PictureBox();
@ -284,8 +283,8 @@ namespace XenAdmin
this.statusProgressBar = new System.Windows.Forms.ToolStripProgressBar();
this.statusLabel = new System.Windows.Forms.ToolStripStatusLabel();
this.statusLabelErrors = new System.Windows.Forms.ToolStripStatusLabel();
this.statusLabelUpdates = new System.Windows.Forms.ToolStripStatusLabel();
this.statusLabelAlerts = new System.Windows.Forms.ToolStripStatusLabel();
this.toolStripMenuItemCfu = new System.Windows.Forms.ToolStripMenuItem();
((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).BeginInit();
this.splitContainer1.Panel1.SuspendLayout();
this.splitContainer1.Panel2.SuspendLayout();
@ -320,7 +319,6 @@ namespace XenAdmin
this.splitContainer1.Panel2.BackColor = System.Drawing.SystemColors.Control;
this.splitContainer1.Panel2.Controls.Add(this.TheTabControl);
this.splitContainer1.Panel2.Controls.Add(this.alertPage);
this.splitContainer1.Panel2.Controls.Add(this.updatesPage);
this.splitContainer1.Panel2.Controls.Add(this.eventsPage);
this.splitContainer1.Panel2.Controls.Add(this.TitleBackPanel);
resources.ApplyResources(this.splitContainer1.Panel2, "splitContainer1.Panel2");
@ -528,12 +526,6 @@ namespace XenAdmin
this.alertPage.BackColor = System.Drawing.SystemColors.Window;
this.alertPage.Name = "alertPage";
//
// updatesPage
//
resources.ApplyResources(this.updatesPage, "updatesPage");
this.updatesPage.BackColor = System.Drawing.SystemColors.Window;
this.updatesPage.Name = "updatesPage";
//
// eventsPage
//
resources.ApplyResources(this.eventsPage, "eventsPage");
@ -1844,6 +1836,7 @@ namespace XenAdmin
this.toolStripMenuItem15,
this.viewApplicationLogToolStripMenuItem,
this.toolStripMenuItem17,
this.toolStripMenuItemCfu,
this.xenSourceOnTheWebToolStripMenuItem,
this.xenCenterPluginsOnlineToolStripMenuItem,
this.toolStripSeparator7,
@ -1971,7 +1964,6 @@ namespace XenAdmin
this.statusProgressBar,
this.statusLabel,
this.statusLabelErrors,
this.statusLabelUpdates,
this.statusLabelAlerts});
this.StatusStrip.Name = "StatusStrip";
this.StatusStrip.ShowItemToolTips = true;
@ -2003,18 +1995,6 @@ namespace XenAdmin
this.statusLabelErrors.VisitedLinkColor = System.Drawing.SystemColors.ControlDarkDark;
this.statusLabelErrors.Click += new System.EventHandler(this.statusLabelErrors_Click);
//
// statusLabelUpdates
//
this.statusLabelUpdates.ActiveLinkColor = System.Drawing.SystemColors.ControlDarkDark;
this.statusLabelUpdates.ForeColor = System.Drawing.SystemColors.ControlDarkDark;
this.statusLabelUpdates.IsLink = true;
this.statusLabelUpdates.LinkBehavior = System.Windows.Forms.LinkBehavior.HoverUnderline;
this.statusLabelUpdates.LinkColor = System.Drawing.SystemColors.ControlDarkDark;
this.statusLabelUpdates.Name = "statusLabelUpdates";
resources.ApplyResources(this.statusLabelUpdates, "statusLabelUpdates");
this.statusLabelUpdates.VisitedLinkColor = System.Drawing.SystemColors.ControlDarkDark;
this.statusLabelUpdates.Click += new System.EventHandler(this.statusLabelUpdates_Click);
//
// statusLabelAlerts
//
this.statusLabelAlerts.ActiveLinkColor = System.Drawing.SystemColors.ControlDarkDark;
@ -2027,6 +2007,12 @@ namespace XenAdmin
this.statusLabelAlerts.VisitedLinkColor = System.Drawing.SystemColors.ControlDarkDark;
this.statusLabelAlerts.Click += new System.EventHandler(this.statusLabelAlerts_Click);
//
// toolStripMenuItemCfu
//
this.toolStripMenuItemCfu.Name = "toolStripMenuItemCfu";
resources.ApplyResources(this.toolStripMenuItemCfu, "toolStripMenuItemCfu");
this.toolStripMenuItemCfu.Click += new System.EventHandler(this.toolStripMenuItemCfu_Click);
//
// MainWindow
//
resources.ApplyResources(this, "$this");
@ -2269,7 +2255,6 @@ namespace XenAdmin
private XenAdmin.Commands.CommandToolStripMenuItem restartToolstackToolStripMenuItem;
private XenAdmin.Controls.MainWindowControls.NavigationPane navigationPane;
private XenAdmin.TabPages.AlertSummaryPage alertPage;
private XenAdmin.TabPages.ManageUpdatesPage updatesPage;
private XenAdmin.TabPages.HistoryPage eventsPage;
private System.Windows.Forms.ToolStripMenuItem customTemplatesToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem templatesToolStripMenuItem1;
@ -2300,7 +2285,6 @@ namespace XenAdmin
private XenAdmin.Commands.CommandToolStripMenuItem conversionToolStripMenuItem;
private XenAdmin.Commands.CommandToolStripMenuItem toolStripMenuItemInstallCertificate;
private System.Windows.Forms.ToolStripStatusLabel statusLabelAlerts;
private System.Windows.Forms.ToolStripStatusLabel statusLabelUpdates;
private System.Windows.Forms.ToolStripStatusLabel statusLabelErrors;
private XenAdmin.Commands.CommandToolStripMenuItem toolStripMenuItemRotateSecret;
private XenAdmin.Commands.CommandToolStripMenuItem toolStripMenuItemHaConfigure;
@ -2312,6 +2296,7 @@ namespace XenAdmin
private System.Windows.Forms.ToolStripMenuItem updateClientToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem relNotesToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem downloadInstallToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem toolStripMenuItemCfu;
}
}

69
XenAdmin/MainWindow.cs
View File

@ -255,7 +255,7 @@ namespace XenAdmin
toolStripSeparator7.Visible = xenSourceOnTheWebToolStripMenuItem.Visible = xenCenterPluginsOnlineToolStripMenuItem.Visible = !HiddenFeatures.ToolStripMenuItemHidden;
healthCheckToolStripMenuItem1.Visible = !HiddenFeatures.HealthCheckHidden && (Registry.GetBrandOverride() == "XenCenter" || BrandManager.BrandConsole == "XenCenter");
statusLabelAlerts.Visible = statusLabelUpdates.Visible = statusLabelErrors.Visible = false;
statusLabelAlerts.Visible = statusLabelErrors.Visible = false;
}
private void RegisterEvents()
@ -382,7 +382,7 @@ namespace XenAdmin
{
base.OnShown(e);
TheTabControl.Visible = true;
alertPage.Visible = updatesPage.Visible = eventsPage.Visible = false;
alertPage.Visible = eventsPage.Visible = false;
navigationPane.FocusTreeView();
}
@ -608,8 +608,7 @@ namespace XenAdmin
if (!Program.RunInAutomatedTestMode && !Helpers.CommonCriteriaCertificationRelease)
{
if (!Properties.Settings.Default.SeenAllowUpdatesDialog)
using (var dlg = new NoIconDialog(string.Format(Messages.ALLOWED_UPDATES_DIALOG_MESSAGE,
BrandManager.BrandConsole, BrandManager.ProductBrand),
using (var dlg = new NoIconDialog(string.Format(Messages.ALLOWED_UPDATES_DIALOG_MESSAGE, BrandManager.BrandConsole),
ThreeButtonDialog.ButtonYes, ThreeButtonDialog.ButtonNo)
{
HelpButton = true,
@ -621,7 +620,6 @@ namespace XenAdmin
var result = dlg.ShowDialog(this) == DialogResult.Yes;
Properties.Settings.Default.AllowXenCenterUpdates = result;
Properties.Settings.Default.AllowXenServerUpdates = result;
Properties.Settings.Default.SeenAllowUpdatesDialog = true;
if (result && dlg.IsCheckBoxChecked)
@ -640,7 +638,7 @@ namespace XenAdmin
CheckForUpdatesTimer.Interval = 1000 * 60 * 60 * 24; // 24 hours
CheckForUpdatesTimer.Tick += CheckForUpdatesTimer_Tick;
CheckForUpdatesTimer.Start();
Updates.CheckForUpdates(false);
Updates.CheckForUpdates();
}
if (!Program.RunInAutomatedTestMode && (Registry.GetBrandOverride() == "XenCenter" || BrandManager.BrandConsole == "XenCenter"))
@ -656,7 +654,7 @@ namespace XenAdmin
private void CheckForUpdatesTimer_Tick(object sender, EventArgs e)
{
Updates.CheckForUpdates(false);
Updates.CheckForUpdates();
}
private void HealthCheckResultTimer_Tick(object sender, EventArgs e)
@ -2542,9 +2540,6 @@ namespace XenAdmin
if (alertPage.Visible)
return alertPage.HelpID;
if (updatesPage.Visible)
return updatesPage.HelpID;
if (eventsPage.Visible)
return eventsPage.HelpID;
@ -2629,27 +2624,16 @@ namespace XenAdmin
private void Updates_CollectionChanged(CollectionChangeEventArgs e)
{
Program.Invoke(this, () =>
{
int updatesCount = Updates.UpdateAlerts.Count;
navigationPane.UpdateNotificationsButton(NotificationsSubMode.Updates, updatesCount);
statusLabelUpdates.Text = string.Format(Messages.NOTIFICATIONS_SUBMODE_UPDATES_STATUS, updatesCount);
statusLabelUpdates.Visible = updatesCount > 0;
SetUpdateAlert();
if (updatesPage.Visible)
{
TitleLabel.Text = NotificationsSubModeItem.GetText(NotificationsSubMode.Updates, updatesCount);
TitleIcon.Image = NotificationsSubModeItem.GetImage(NotificationsSubMode.Updates, updatesCount);
}
});
Program.Invoke(this, SetUpdateAlert);
}
private void UpdatesCheck_Completed(bool succeeded, string err)
private void UpdatesCheck_Completed()
{
Program.Invoke(this, SetUpdateAlert);
Program.Invoke(this, () =>
{
toolStripMenuItemCfu.Enabled = true;
SetUpdateAlert();
});
}
private void SetUpdateAlert()
@ -2662,7 +2646,11 @@ namespace XenAdmin
private void UpdatesCheck_Started()
{
Program.Invoke(this, () => { updateClientToolStripMenuItem.Visible = false; });
Program.Invoke(this, () =>
{
updateClientToolStripMenuItem.Visible = false;
toolStripMenuItemCfu.Enabled = false;
});
}
private void CloseWhenActionsCanceled(object o)
@ -2928,24 +2916,13 @@ namespace XenAdmin
switch (submodeItem.SubMode)
{
case NotificationsSubMode.Alerts:
if (updatesPage.Visible)
updatesPage.HidePage();
if (eventsPage.Visible)
eventsPage.HidePage();
alertPage.ShowPage();
break;
case NotificationsSubMode.Updates:
if (alertPage.Visible)
alertPage.HidePage();
if (eventsPage.Visible)
eventsPage.HidePage();
updatesPage.ShowPage();
break;
case NotificationsSubMode.Events:
if (alertPage.Visible)
alertPage.HidePage();
if (updatesPage.Visible)
updatesPage.HidePage();
eventsPage.ShowPage();
break;
}
@ -2970,8 +2947,6 @@ namespace XenAdmin
TheTabControl.Visible = true;
if (alertPage.Visible)
alertPage.HidePage();
if (updatesPage.Visible)
updatesPage.HidePage();
if (eventsPage.Visible)
eventsPage.HidePage();
@ -3304,11 +3279,6 @@ namespace XenAdmin
navigationPane.SwitchToNotificationsView(NotificationsSubMode.Alerts);
}
private void statusLabelUpdates_Click(object sender, EventArgs e)
{
navigationPane.SwitchToNotificationsView(NotificationsSubMode.Updates);
}
private void statusLabelErrors_Click(object sender, EventArgs e)
{
navigationPane.SwitchToNotificationsView(NotificationsSubMode.Events);
@ -3324,5 +3294,10 @@ namespace XenAdmin
{
ClientUpdateAlert.DownloadAndInstallNewClient(updateAlert, this);
}
private void toolStripMenuItemCfu_Click(object sender, EventArgs e)
{
Updates.CheckForUpdates(true);
}
}
}

66
XenAdmin/MainWindow.resx
View File

@ -936,36 +936,6 @@
<data name="&gt;&gt;alertPage.ZOrder" xml:space="preserve">
<value>1</value>
</data>
<data name="updatesPage.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
<value>Top, Bottom, Left, Right</value>
</data>
<data name="updatesPage.Font" type="System.Drawing.Font, System.Drawing">
<value>Segoe UI, 9pt</value>
</data>
<data name="updatesPage.Location" type="System.Drawing.Point, System.Drawing">
<value>0, 30</value>
</data>
<data name="updatesPage.Padding" type="System.Windows.Forms.Padding, System.Windows.Forms">
<value>12, 12, 12, 12</value>
</data>
<data name="updatesPage.Size" type="System.Drawing.Size, System.Drawing">
<value>761, 589</value>
</data>
<data name="updatesPage.TabIndex" type="System.Int32, mscorlib">
<value>0</value>
</data>
<data name="&gt;&gt;updatesPage.Name" xml:space="preserve">
<value>updatesPage</value>
</data>
<data name="&gt;&gt;updatesPage.Type" xml:space="preserve">
<value>XenAdmin.TabPages.ManageUpdatesPage, [XenCenter_No_Space]Main, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</value>
</data>
<data name="&gt;&gt;updatesPage.Parent" xml:space="preserve">
<value>splitContainer1.Panel2</value>
</data>
<data name="&gt;&gt;updatesPage.ZOrder" xml:space="preserve">
<value>2</value>
</data>
<data name="eventsPage.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
<value>Top, Bottom, Left, Right</value>
</data>
@ -994,7 +964,7 @@
<value>splitContainer1.Panel2</value>
</data>
<data name="&gt;&gt;eventsPage.ZOrder" xml:space="preserve">
<value>3</value>
<value>2</value>
</data>
<data name="TitleBackPanel.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
<value>Top, Left, Right</value>
@ -1213,7 +1183,7 @@
<value>splitContainer1.Panel2</value>
</data>
<data name="&gt;&gt;TitleBackPanel.ZOrder" xml:space="preserve">
<value>4</value>
<value>3</value>
</data>
<data name="splitContainer1.Panel2.RightToLeft" type="System.Windows.Forms.RightToLeft, System.Windows.Forms">
<value>No</value>
@ -2739,6 +2709,12 @@
<data name="toolStripMenuItem17.Size" type="System.Drawing.Size, System.Drawing">
<value>183, 6</value>
</data>
<data name="toolStripMenuItemCfu.Size" type="System.Drawing.Size, System.Drawing">
<value>186, 22</value>
</data>
<data name="toolStripMenuItemCfu.Text" xml:space="preserve">
<value>Check for &amp;Updates</value>
</data>
<data name="xenSourceOnTheWebToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
<value>186, 22</value>
</data>
@ -2785,13 +2761,13 @@
<value>Microsoft Sans Serif, 8.25pt</value>
</data>
<data name="downloadInstallToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
<value>180, 22</value>
<value>173, 22</value>
</data>
<data name="downloadInstallToolStripMenuItem.Text" xml:space="preserve">
<value>Download and &amp;Install</value>
</data>
<data name="relNotesToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
<value>180, 22</value>
<value>173, 22</value>
</data>
<data name="relNotesToolStripMenuItem.Text" xml:space="preserve">
<value>v{0} &amp;Release Notes</value>
@ -2875,7 +2851,7 @@
<value>None</value>
</data>
<data name="statusLabel.Size" type="System.Drawing.Size, System.Drawing">
<value>529, 22</value>
<value>647, 22</value>
</data>
<data name="statusLabel.TextAlign" type="System.Drawing.ContentAlignment, System.Drawing">
<value>MiddleLeft</value>
@ -2886,12 +2862,6 @@
<data name="statusLabelErrors.Text" xml:space="preserve">
<value>toolStripStatusLabel3</value>
</data>
<data name="statusLabelUpdates.Size" type="System.Drawing.Size, System.Drawing">
<value>118, 22</value>
</data>
<data name="statusLabelUpdates.Text" xml:space="preserve">
<value>toolStripStatusLabel2</value>
</data>
<data name="statusLabelAlerts.Size" type="System.Drawing.Size, System.Drawing">
<value>118, 22</value>
</data>
@ -2926,7 +2896,7 @@
<value>True</value>
</metadata>
<metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>32</value>
<value>70</value>
</metadata>
<data name="$this.AutoScaleDimensions" type="System.Drawing.SizeF, System.Drawing">
<value>96, 96</value>
@ -4119,18 +4089,18 @@
<data name="&gt;&gt;statusLabelErrors.Type" xml:space="preserve">
<value>System.Windows.Forms.ToolStripStatusLabel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;statusLabelUpdates.Name" xml:space="preserve">
<value>statusLabelUpdates</value>
</data>
<data name="&gt;&gt;statusLabelUpdates.Type" xml:space="preserve">
<value>System.Windows.Forms.ToolStripStatusLabel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;statusLabelAlerts.Name" xml:space="preserve">
<value>statusLabelAlerts</value>
</data>
<data name="&gt;&gt;statusLabelAlerts.Type" xml:space="preserve">
<value>System.Windows.Forms.ToolStripStatusLabel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;toolStripMenuItemCfu.Name" xml:space="preserve">
<value>toolStripMenuItemCfu</value>
</data>
<data name="&gt;&gt;toolStripMenuItemCfu.Type" xml:space="preserve">
<value>System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;$this.Name" xml:space="preserve">
<value>MainWindow</value>
</data>

26
XenAdmin/Properties/Settings.Designer.cs generated
View File

@ -424,32 +424,6 @@ namespace XenAdmin.Properties {
}
}
[global::System.Configuration.UserScopedSettingAttribute()]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Configuration.DefaultSettingValueAttribute("False")]
[global::System.Configuration.SettingsManageabilityAttribute(global::System.Configuration.SettingsManageability.Roaming)]
public bool AllowXenServerUpdates {
get {
return ((bool)(this["AllowXenServerUpdates"]));
}
set {
this["AllowXenServerUpdates"] = value;
}
}
[global::System.Configuration.UserScopedSettingAttribute()]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Configuration.DefaultSettingValueAttribute("")]
[global::System.Configuration.SettingsManageabilityAttribute(global::System.Configuration.SettingsManageability.Roaming)]
public string LatestXenCenterSeen {
get {
return ((string)(this["LatestXenCenterSeen"]));
}
set {
this["LatestXenCenterSeen"] = value;
}
}
[global::System.Configuration.UserScopedSettingAttribute()]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Configuration.DefaultSettingValueAttribute("False")]

6
XenAdmin/Properties/Settings.settings
View File

@ -96,12 +96,6 @@
<Setting Name="AllowXenCenterUpdates" Roaming="true" Type="System.Boolean" Scope="User">
<Value Profile="(Default)">True</Value>
</Setting>
<Setting Name="AllowXenServerUpdates" Roaming="true" Type="System.Boolean" Scope="User">
<Value Profile="(Default)">False</Value>
</Setting>
<Setting Name="LatestXenCenterSeen" Roaming="true" Type="System.String" Scope="User">
<Value Profile="(Default)" />
</Setting>
<Setting Name="SeenAllowUpdatesDialog" Roaming="true" Type="System.Boolean" Scope="User">
<Value Profile="(Default)">False</Value>
</Setting>

5
XenAdmin/Settings.cs
View File

@ -682,11 +682,8 @@ namespace XenAdmin
log.Info($"=== RemindChangePassword: {Properties.Settings.Default.RemindChangePassword}");
if (!Helpers.CommonCriteriaCertificationRelease)
{
log.Info($"=== AllowXenCenterUpdates: {Properties.Settings.Default.AllowXenCenterUpdates}");
log.Info($"=== AllowXenServerUpdates: {Properties.Settings.Default.AllowXenServerUpdates}");
}
log.Info($"=== FillAreaUnderGraphs: {Properties.Settings.Default.FillAreaUnderGraphs}");
log.Info($"=== RememberLastSelectedTab: {Properties.Settings.Default.RememberLastSelectedTab}");

2
XenAdmin/TabPages/AlertSummaryPage.cs
View File

@ -843,7 +843,7 @@ namespace XenAdmin.TabPages
Updates.CheckForUpdatesCompleted -= CheckForUpdatesCompleted;
}
private void CheckForUpdatesCompleted(bool succeeded, string errorMessage)
private void CheckForUpdatesCompleted()
{
Updates.CheckHotfixEligibility();
}

609
XenAdmin/TabPages/ManageUpdatesPage.Designer.cs generated
View File

@ -1,609 +0,0 @@
namespace XenAdmin.TabPages
{
partial class ManageUpdatesPage
{
/// <summary>
/// Required designer variable.
/// </summary>
private System.ComponentModel.IContainer components = null;
/// <summary>
/// Clean up any resources being used.
/// </summary>
/// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
protected override void Dispose(bool disposing)
{
if (disposing)
{
DeregisterEventHandlers();
if (components != null)
components.Dispose();
}
base.Dispose(disposing);
}
#region Windows Form Designer generated code
/// <summary>
/// Required method for Designer support - do not modify
/// the contents of this method with the code editor.
/// </summary>
private void InitializeComponent()
{
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(ManageUpdatesPage));
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle4 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle5 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle6 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle7 = new System.Windows.Forms.DataGridViewCellStyle();
this.tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel();
this.informationLabelIcon = new System.Windows.Forms.PictureBox();
this.informationLabel = new System.Windows.Forms.LinkLabel();
this.tableLayoutPanel2 = new System.Windows.Forms.TableLayoutPanel();
this.toolStrip1 = new XenAdmin.Controls.ToolStripEx();
this.toolStripDropDownButtonView = new System.Windows.Forms.ToolStripDropDownButton();
this.byUpdateToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.byHostToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.toolStripSeparator2 = new System.Windows.Forms.ToolStripSeparator();
this.toolStripDropDownButtonServerFilter = new XenAdmin.Controls.FilterLocationToolStripDropDownButton();
this.toolStripDropDownButtonDateFilter = new XenAdmin.Controls.FilterDatesToolStripDropDownButton();
this.toolStripSeparator3 = new System.Windows.Forms.ToolStripSeparator();
this.toolStripButtonRefresh = new System.Windows.Forms.ToolStripButton();
this.toolStripSeparator1 = new System.Windows.Forms.ToolStripSeparator();
this.toolStripButtonExportAll = new System.Windows.Forms.ToolStripButton();
this.toolStripLabelFiltersOnOff = new System.Windows.Forms.ToolStripLabel();
this.toolStripSplitButtonDismiss = new System.Windows.Forms.ToolStripSplitButton();
this.dismissAllToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.dismissSelectedToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.toolStripButtonRestoreDismissed = new System.Windows.Forms.ToolStripButton();
this.toolStripButtonUpdate = new System.Windows.Forms.ToolStripButton();
this.AutoCheckForUpdatesDisabledLabel = new System.Windows.Forms.Label();
this.pictureBox1 = new System.Windows.Forms.PictureBox();
this.checkForUpdatesNowLink = new System.Windows.Forms.LinkLabel();
this.button2 = new System.Windows.Forms.Button();
this.button1 = new System.Windows.Forms.Button();
this.tableLayoutPanel3 = new System.Windows.Forms.TableLayoutPanel();
this.checkForUpdatesNowButton = new System.Windows.Forms.Button();
this.tableLayoutPanel4 = new System.Windows.Forms.TableLayoutPanel();
this.labelProgress = new System.Windows.Forms.Label();
this.spinner = new XenAdmin.Controls.SpinnerIcon();
this.tableLayouPanel5 = new System.Windows.Forms.TableLayoutPanel();
this.panel1 = new System.Windows.Forms.Panel();
this.dataGridViewHosts = new XenAdmin.TabPages.ManageUpdatesPage.UpdatePageByHostDataGridView();
this.ColumnExpansion = new System.Windows.Forms.DataGridViewImageColumn();
this.ColumnIcon = new System.Windows.Forms.DataGridViewImageColumn();
this.ColumnName = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.ColumnVersion = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.ColumnPatchingStatus = new System.Windows.Forms.DataGridViewImageColumn();
this.ColumnStatus = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.ColumnRequiredUpdate = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.ColumnInstalledUpdate = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.dataGridViewUpdates = new XenAdmin.Controls.DataGridViewEx.DataGridViewEx();
this.ColumnExpand = new System.Windows.Forms.DataGridViewImageColumn();
this.ColumnMessage = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.ColumnLocation = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.ColumnDate = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.ColumnWebPage = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.labelLegacyUpdates = new System.Windows.Forms.Label();
this.tableLayoutPanel1.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.informationLabelIcon)).BeginInit();
this.tableLayoutPanel2.SuspendLayout();
this.toolStrip1.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit();
this.tableLayoutPanel3.SuspendLayout();
this.tableLayoutPanel4.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.spinner)).BeginInit();
this.tableLayouPanel5.SuspendLayout();
this.panel1.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.dataGridViewHosts)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.dataGridViewUpdates)).BeginInit();
this.SuspendLayout();
//
// tableLayoutPanel1
//
resources.ApplyResources(this.tableLayoutPanel1, "tableLayoutPanel1");
this.tableLayoutPanel1.Controls.Add(this.informationLabelIcon, 0, 0);
this.tableLayoutPanel1.Controls.Add(this.informationLabel, 1, 0);
this.tableLayoutPanel1.Name = "tableLayoutPanel1";
//
// informationLabelIcon
//
resources.ApplyResources(this.informationLabelIcon, "informationLabelIcon");
this.informationLabelIcon.Image = global::XenAdmin.Properties.Resources._000_Info3_h32bit_16;
this.informationLabelIcon.InitialImage = global::XenAdmin.Properties.Resources._000_Info3_h32bit_16;
this.informationLabelIcon.Name = "informationLabelIcon";
this.informationLabelIcon.TabStop = false;
//
// informationLabel
//
resources.ApplyResources(this.informationLabel, "informationLabel");
this.informationLabel.Name = "informationLabel";
this.informationLabel.TabStop = true;
this.informationLabel.Click += new System.EventHandler(this.informationLabel_Click);
//
// tableLayoutPanel2
//
resources.ApplyResources(this.tableLayoutPanel2, "tableLayoutPanel2");
this.tableLayoutPanel2.BackColor = System.Drawing.Color.Gainsboro;
this.tableLayoutPanel2.Controls.Add(this.toolStrip1, 0, 0);
this.tableLayoutPanel2.Name = "tableLayoutPanel2";
//
// toolStrip1
//
resources.ApplyResources(this.toolStrip1, "toolStrip1");
this.toolStrip1.BackColor = System.Drawing.Color.WhiteSmoke;
this.toolStrip1.ClickThrough = true;
this.toolStrip1.GripStyle = System.Windows.Forms.ToolStripGripStyle.Hidden;
this.toolStrip1.ImageScalingSize = new System.Drawing.Size(20, 20);
this.toolStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.toolStripDropDownButtonView,
this.toolStripSeparator2,
this.toolStripDropDownButtonServerFilter,
this.toolStripDropDownButtonDateFilter,
this.toolStripSeparator3,
this.toolStripButtonRefresh,
this.toolStripSeparator1,
this.toolStripButtonExportAll,
this.toolStripLabelFiltersOnOff,
this.toolStripSplitButtonDismiss,
this.toolStripButtonRestoreDismissed,
this.toolStripButtonUpdate});
this.toolStrip1.Name = "toolStrip1";
this.toolStrip1.TabStop = true;
//
// toolStripDropDownButtonView
//
this.toolStripDropDownButtonView.AutoToolTip = false;
this.toolStripDropDownButtonView.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Text;
this.toolStripDropDownButtonView.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.byUpdateToolStripMenuItem,
this.byHostToolStripMenuItem});
resources.ApplyResources(this.toolStripDropDownButtonView, "toolStripDropDownButtonView");
this.toolStripDropDownButtonView.Name = "toolStripDropDownButtonView";
//
// byUpdateToolStripMenuItem
//
this.byUpdateToolStripMenuItem.Image = global::XenAdmin.Properties.Resources.notif_updates_16;
resources.ApplyResources(this.byUpdateToolStripMenuItem, "byUpdateToolStripMenuItem");
this.byUpdateToolStripMenuItem.Name = "byUpdateToolStripMenuItem";
this.byUpdateToolStripMenuItem.Click += new System.EventHandler(this.byUpdateToolStripMenuItem_Click);
//
// byHostToolStripMenuItem
//
this.byHostToolStripMenuItem.Image = global::XenAdmin.Properties.Resources._000_TreeConnected_h32bit_16;
resources.ApplyResources(this.byHostToolStripMenuItem, "byHostToolStripMenuItem");
this.byHostToolStripMenuItem.Name = "byHostToolStripMenuItem";
this.byHostToolStripMenuItem.Click += new System.EventHandler(this.byHostToolStripMenuItem_Click);
//
// toolStripSeparator2
//
this.toolStripSeparator2.Name = "toolStripSeparator2";
resources.ApplyResources(this.toolStripSeparator2, "toolStripSeparator2");
//
// toolStripDropDownButtonServerFilter
//
this.toolStripDropDownButtonServerFilter.AutoToolTip = false;
resources.ApplyResources(this.toolStripDropDownButtonServerFilter, "toolStripDropDownButtonServerFilter");
this.toolStripDropDownButtonServerFilter.Margin = new System.Windows.Forms.Padding(2, 1, 0, 2);
this.toolStripDropDownButtonServerFilter.Name = "toolStripDropDownButtonServerFilter";
this.toolStripDropDownButtonServerFilter.FilterChanged += new System.Action(this.toolStripDropDownButtonServerFilter_FilterChanged);
//
// toolStripDropDownButtonDateFilter
//
this.toolStripDropDownButtonDateFilter.AutoToolTip = false;
this.toolStripDropDownButtonDateFilter.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Text;
resources.ApplyResources(this.toolStripDropDownButtonDateFilter, "toolStripDropDownButtonDateFilter");
this.toolStripDropDownButtonDateFilter.Name = "toolStripDropDownButtonDateFilter";
this.toolStripDropDownButtonDateFilter.FilterChanged += new System.Action(this.toolStripDropDownButtonDateFilter_FilterChanged);
//
// toolStripSeparator3
//
this.toolStripSeparator3.Name = "toolStripSeparator3";
resources.ApplyResources(this.toolStripSeparator3, "toolStripSeparator3");
//
// toolStripButtonRefresh
//
this.toolStripButtonRefresh.AutoToolTip = false;
resources.ApplyResources(this.toolStripButtonRefresh, "toolStripButtonRefresh");
this.toolStripButtonRefresh.Name = "toolStripButtonRefresh";
this.toolStripButtonRefresh.Click += new System.EventHandler(this.toolStripButtonRefresh_Click);
//
// toolStripSeparator1
//
this.toolStripSeparator1.Name = "toolStripSeparator1";
resources.ApplyResources(this.toolStripSeparator1, "toolStripSeparator1");
//
// toolStripButtonExportAll
//
this.toolStripButtonExportAll.AutoToolTip = false;
resources.ApplyResources(this.toolStripButtonExportAll, "toolStripButtonExportAll");
this.toolStripButtonExportAll.Name = "toolStripButtonExportAll";
this.toolStripButtonExportAll.Click += new System.EventHandler(this.toolStripButtonExportAll_Click);
//
// toolStripLabelFiltersOnOff
//
this.toolStripLabelFiltersOnOff.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right;
resources.ApplyResources(this.toolStripLabelFiltersOnOff, "toolStripLabelFiltersOnOff");
this.toolStripLabelFiltersOnOff.Name = "toolStripLabelFiltersOnOff";
//
// toolStripSplitButtonDismiss
//
this.toolStripSplitButtonDismiss.AutoToolTip = false;
this.toolStripSplitButtonDismiss.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Text;
this.toolStripSplitButtonDismiss.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.dismissAllToolStripMenuItem,
this.dismissSelectedToolStripMenuItem});
resources.ApplyResources(this.toolStripSplitButtonDismiss, "toolStripSplitButtonDismiss");
this.toolStripSplitButtonDismiss.Name = "toolStripSplitButtonDismiss";
this.toolStripSplitButtonDismiss.DropDownItemClicked += new System.Windows.Forms.ToolStripItemClickedEventHandler(this.toolStripSplitButtonDismiss_DropDownItemClicked);
//
// dismissAllToolStripMenuItem
//
this.dismissAllToolStripMenuItem.Name = "dismissAllToolStripMenuItem";
resources.ApplyResources(this.dismissAllToolStripMenuItem, "dismissAllToolStripMenuItem");
this.dismissAllToolStripMenuItem.Click += new System.EventHandler(this.dismissAllToolStripMenuItem_Click);
//
// dismissSelectedToolStripMenuItem
//
this.dismissSelectedToolStripMenuItem.Name = "dismissSelectedToolStripMenuItem";
resources.ApplyResources(this.dismissSelectedToolStripMenuItem, "dismissSelectedToolStripMenuItem");
this.dismissSelectedToolStripMenuItem.Click += new System.EventHandler(this.dismissSelectedToolStripMenuItem_Click);
//
// toolStripButtonRestoreDismissed
//
this.toolStripButtonRestoreDismissed.AutoToolTip = false;
this.toolStripButtonRestoreDismissed.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Text;
resources.ApplyResources(this.toolStripButtonRestoreDismissed, "toolStripButtonRestoreDismissed");
this.toolStripButtonRestoreDismissed.Name = "toolStripButtonRestoreDismissed";
this.toolStripButtonRestoreDismissed.Click += new System.EventHandler(this.toolStripButtonRestoreDismissed_Click);
//
// toolStripButtonUpdate
//
this.toolStripButtonUpdate.AutoToolTip = false;
this.toolStripButtonUpdate.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Text;
resources.ApplyResources(this.toolStripButtonUpdate, "toolStripButtonUpdate");
this.toolStripButtonUpdate.Name = "toolStripButtonUpdate";
this.toolStripButtonUpdate.Click += new System.EventHandler(this.toolStripButtonUpdate_Click);
//
// AutoCheckForUpdatesDisabledLabel
//
resources.ApplyResources(this.AutoCheckForUpdatesDisabledLabel, "AutoCheckForUpdatesDisabledLabel");
this.AutoCheckForUpdatesDisabledLabel.Name = "AutoCheckForUpdatesDisabledLabel";
//
// pictureBox1
//
resources.ApplyResources(this.pictureBox1, "pictureBox1");
this.pictureBox1.Image = global::XenAdmin.Properties.Resources._000_Info3_h32bit_16;
this.pictureBox1.Name = "pictureBox1";
this.pictureBox1.TabStop = false;
//
// checkForUpdatesNowLink
//
resources.ApplyResources(this.checkForUpdatesNowLink, "checkForUpdatesNowLink");
this.checkForUpdatesNowLink.Name = "checkForUpdatesNowLink";
this.checkForUpdatesNowLink.TabStop = true;
this.checkForUpdatesNowLink.Click += new System.EventHandler(this.checkForUpdatesNowLink_Click);
//
// button2
//
resources.ApplyResources(this.button2, "button2");
this.button2.Name = "button2";
this.button2.UseVisualStyleBackColor = true;
//
// button1
//
resources.ApplyResources(this.button1, "button1");
this.button1.Name = "button1";
this.button1.UseVisualStyleBackColor = true;
//
// tableLayoutPanel3
//
resources.ApplyResources(this.tableLayoutPanel3, "tableLayoutPanel3");
this.tableLayoutPanel3.BackColor = System.Drawing.Color.Transparent;
this.tableLayoutPanel3.Controls.Add(this.checkForUpdatesNowButton, 0, 1);
this.tableLayoutPanel3.Controls.Add(this.tableLayoutPanel4, 0, 0);
this.tableLayoutPanel3.Name = "tableLayoutPanel3";
this.tableLayoutPanel3.Resize += new System.EventHandler(this.tableLayoutPanel3_Resize);
//
// checkForUpdatesNowButton
//
resources.ApplyResources(this.checkForUpdatesNowButton, "checkForUpdatesNowButton");
this.checkForUpdatesNowButton.Name = "checkForUpdatesNowButton";
this.checkForUpdatesNowButton.UseVisualStyleBackColor = true;
this.checkForUpdatesNowButton.Click += new System.EventHandler(this.checkForUpdatesNowButton_Click);
//
// tableLayoutPanel4
//
resources.ApplyResources(this.tableLayoutPanel4, "tableLayoutPanel4");
this.tableLayoutPanel4.Controls.Add(this.labelProgress, 1, 0);
this.tableLayoutPanel4.Controls.Add(this.spinner, 0, 0);
this.tableLayoutPanel4.Cursor = System.Windows.Forms.Cursors.Arrow;
this.tableLayoutPanel4.Name = "tableLayoutPanel4";
//
// labelProgress
//
resources.ApplyResources(this.labelProgress, "labelProgress");
this.labelProgress.Name = "labelProgress";
//
// spinner
//
resources.ApplyResources(this.spinner, "spinner");
this.spinner.Name = "spinner";
this.spinner.TabStop = false;
//
// tableLayouPanel5
//
resources.ApplyResources(this.tableLayouPanel5, "tableLayouPanel5");
this.tableLayouPanel5.Controls.Add(this.pictureBox1, 0, 1);
this.tableLayouPanel5.Controls.Add(this.checkForUpdatesNowLink, 2, 1);
this.tableLayouPanel5.Controls.Add(this.AutoCheckForUpdatesDisabledLabel, 1, 1);
this.tableLayouPanel5.Controls.Add(this.panel1, 0, 2);
this.tableLayouPanel5.Controls.Add(this.labelLegacyUpdates, 0, 0);
this.tableLayouPanel5.Name = "tableLayouPanel5";
//
// panel1
//
this.tableLayouPanel5.SetColumnSpan(this.panel1, 3);
this.panel1.Controls.Add(this.dataGridViewHosts);
this.panel1.Controls.Add(this.dataGridViewUpdates);
resources.ApplyResources(this.panel1, "panel1");
this.panel1.Name = "panel1";
//
// dataGridViewHosts
//
this.dataGridViewHosts.BackgroundColor = System.Drawing.SystemColors.Window;
this.dataGridViewHosts.CellBorderStyle = System.Windows.Forms.DataGridViewCellBorderStyle.None;
this.dataGridViewHosts.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.DisableResizing;
this.dataGridViewHosts.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
this.ColumnExpansion,
this.ColumnIcon,
this.ColumnName,
this.ColumnVersion,
this.ColumnPatchingStatus,
this.ColumnStatus,
this.ColumnRequiredUpdate,
this.ColumnInstalledUpdate});
resources.ApplyResources(this.dataGridViewHosts, "dataGridViewHosts");
this.dataGridViewHosts.MultiSelect = true;
this.dataGridViewHosts.Name = "dataGridViewHosts";
this.dataGridViewHosts.ReadOnly = true;
this.dataGridViewHosts.Updating = false;
//
// ColumnExpansion
//
this.ColumnExpansion.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.AllCells;
dataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
dataGridViewCellStyle1.NullValue = null;
this.ColumnExpansion.DefaultCellStyle = dataGridViewCellStyle1;
resources.ApplyResources(this.ColumnExpansion, "ColumnExpansion");
this.ColumnExpansion.Name = "ColumnExpansion";
this.ColumnExpansion.ReadOnly = true;
//
// ColumnIcon
//
this.ColumnIcon.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.AllCells;
dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
dataGridViewCellStyle2.NullValue = null;
this.ColumnIcon.DefaultCellStyle = dataGridViewCellStyle2;
resources.ApplyResources(this.ColumnIcon, "ColumnIcon");
this.ColumnIcon.Name = "ColumnIcon";
this.ColumnIcon.ReadOnly = true;
this.ColumnIcon.Resizable = System.Windows.Forms.DataGridViewTriState.True;
//
// ColumnName
//
dataGridViewCellStyle3.WrapMode = System.Windows.Forms.DataGridViewTriState.False;
this.ColumnName.DefaultCellStyle = dataGridViewCellStyle3;
this.ColumnName.FillWeight = 40F;
resources.ApplyResources(this.ColumnName, "ColumnName");
this.ColumnName.Name = "ColumnName";
this.ColumnName.ReadOnly = true;
//
// ColumnVersion
//
this.ColumnVersion.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.AllCells;
this.ColumnVersion.FillWeight = 20F;
resources.ApplyResources(this.ColumnVersion, "ColumnVersion");
this.ColumnVersion.Name = "ColumnVersion";
this.ColumnVersion.ReadOnly = true;
this.ColumnVersion.Resizable = System.Windows.Forms.DataGridViewTriState.True;
//
// ColumnPatchingStatus
//
this.ColumnPatchingStatus.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.AllCells;
resources.ApplyResources(this.ColumnPatchingStatus, "ColumnPatchingStatus");
this.ColumnPatchingStatus.Name = "ColumnPatchingStatus";
this.ColumnPatchingStatus.ReadOnly = true;
//
// ColumnStatus
//
this.ColumnStatus.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.AllCells;
this.ColumnStatus.FillWeight = 20F;
resources.ApplyResources(this.ColumnStatus, "ColumnStatus");
this.ColumnStatus.Name = "ColumnStatus";
this.ColumnStatus.ReadOnly = true;
//
// ColumnRequiredUpdate
//
resources.ApplyResources(this.ColumnRequiredUpdate, "ColumnRequiredUpdate");
this.ColumnRequiredUpdate.Name = "ColumnRequiredUpdate";
this.ColumnRequiredUpdate.ReadOnly = true;
this.ColumnRequiredUpdate.Resizable = System.Windows.Forms.DataGridViewTriState.True;
this.ColumnRequiredUpdate.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
//
// ColumnInstalledUpdate
//
resources.ApplyResources(this.ColumnInstalledUpdate, "ColumnInstalledUpdate");
this.ColumnInstalledUpdate.Name = "ColumnInstalledUpdate";
this.ColumnInstalledUpdate.ReadOnly = true;
this.ColumnInstalledUpdate.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
//
// dataGridViewUpdates
//
this.dataGridViewUpdates.AutoSizeRowsMode = System.Windows.Forms.DataGridViewAutoSizeRowsMode.AllCells;
this.dataGridViewUpdates.BackgroundColor = System.Drawing.SystemColors.Window;
this.dataGridViewUpdates.CellBorderStyle = System.Windows.Forms.DataGridViewCellBorderStyle.None;
this.dataGridViewUpdates.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.DisableResizing;
this.dataGridViewUpdates.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
this.ColumnExpand,
this.ColumnMessage,
this.ColumnLocation,
this.ColumnDate,
this.ColumnWebPage});
resources.ApplyResources(this.dataGridViewUpdates, "dataGridViewUpdates");
this.dataGridViewUpdates.MultiSelect = true;
this.dataGridViewUpdates.Name = "dataGridViewUpdates";
this.dataGridViewUpdates.ReadOnly = true;
this.dataGridViewUpdates.CellClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dataGridViewUpdates_CellClick);
this.dataGridViewUpdates.CellDoubleClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dataGridViewUpdates_CellDoubleClick);
this.dataGridViewUpdates.ColumnHeaderMouseClick += new System.Windows.Forms.DataGridViewCellMouseEventHandler(this.dataGridViewUpdates_ColumnHeaderMouseClick);
this.dataGridViewUpdates.SelectionChanged += new System.EventHandler(this.dataGridViewUpdates_SelectionChanged);
this.dataGridViewUpdates.SortCompare += new System.Windows.Forms.DataGridViewSortCompareEventHandler(this.dataGridViewUpdates_SortCompare);
this.dataGridViewUpdates.KeyDown += new System.Windows.Forms.KeyEventHandler(this.dataGridViewUpdates_KeyDown);
//
// ColumnExpand
//
this.ColumnExpand.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.AllCells;
dataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.TopCenter;
dataGridViewCellStyle4.NullValue = null;
dataGridViewCellStyle4.Padding = new System.Windows.Forms.Padding(0, 5, 0, 0);
this.ColumnExpand.DefaultCellStyle = dataGridViewCellStyle4;
resources.ApplyResources(this.ColumnExpand, "ColumnExpand");
this.ColumnExpand.Name = "ColumnExpand";
this.ColumnExpand.ReadOnly = true;
this.ColumnExpand.Resizable = System.Windows.Forms.DataGridViewTriState.True;
//
// ColumnMessage
//
dataGridViewCellStyle5.Alignment = System.Windows.Forms.DataGridViewContentAlignment.TopLeft;
dataGridViewCellStyle5.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
this.ColumnMessage.DefaultCellStyle = dataGridViewCellStyle5;
this.ColumnMessage.FillWeight = 40F;
resources.ApplyResources(this.ColumnMessage, "ColumnMessage");
this.ColumnMessage.Name = "ColumnMessage";
this.ColumnMessage.ReadOnly = true;
//
// ColumnLocation
//
dataGridViewCellStyle6.Alignment = System.Windows.Forms.DataGridViewContentAlignment.TopLeft;
this.ColumnLocation.DefaultCellStyle = dataGridViewCellStyle6;
this.ColumnLocation.FillWeight = 20F;
resources.ApplyResources(this.ColumnLocation, "ColumnLocation");
this.ColumnLocation.Name = "ColumnLocation";
this.ColumnLocation.ReadOnly = true;
this.ColumnLocation.Resizable = System.Windows.Forms.DataGridViewTriState.True;
//
// ColumnDate
//
dataGridViewCellStyle7.Alignment = System.Windows.Forms.DataGridViewContentAlignment.TopLeft;
this.ColumnDate.DefaultCellStyle = dataGridViewCellStyle7;
this.ColumnDate.FillWeight = 20F;
resources.ApplyResources(this.ColumnDate, "ColumnDate");
this.ColumnDate.Name = "ColumnDate";
this.ColumnDate.ReadOnly = true;
//
// ColumnWebPage
//
this.ColumnWebPage.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.AllCells;
resources.ApplyResources(this.ColumnWebPage, "ColumnWebPage");
this.ColumnWebPage.Name = "ColumnWebPage";
this.ColumnWebPage.ReadOnly = true;
this.ColumnWebPage.Resizable = System.Windows.Forms.DataGridViewTriState.True;
this.ColumnWebPage.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
//
// labelLegacyUpdates
//
resources.ApplyResources(this.labelLegacyUpdates, "labelLegacyUpdates");
this.labelLegacyUpdates.BackColor = System.Drawing.Color.LemonChiffon;
this.labelLegacyUpdates.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
this.tableLayouPanel5.SetColumnSpan(this.labelLegacyUpdates, 3);
this.labelLegacyUpdates.Name = "labelLegacyUpdates";
//
// ManageUpdatesPage
//
resources.ApplyResources(this, "$this");
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi;
this.BackColor = System.Drawing.SystemColors.Control;
this.Controls.Add(this.tableLayoutPanel3);
this.Controls.Add(this.tableLayoutPanel2);
this.Controls.Add(this.tableLayouPanel5);
this.Controls.Add(this.tableLayoutPanel1);
this.Name = "ManageUpdatesPage";
this.tableLayoutPanel1.ResumeLayout(false);
this.tableLayoutPanel1.PerformLayout();
((System.ComponentModel.ISupportInitialize)(this.informationLabelIcon)).EndInit();
this.tableLayoutPanel2.ResumeLayout(false);
this.toolStrip1.ResumeLayout(false);
this.toolStrip1.PerformLayout();
((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).EndInit();
this.tableLayoutPanel3.ResumeLayout(false);
this.tableLayoutPanel3.PerformLayout();
this.tableLayoutPanel4.ResumeLayout(false);
this.tableLayoutPanel4.PerformLayout();
((System.ComponentModel.ISupportInitialize)(this.spinner)).EndInit();
this.tableLayouPanel5.ResumeLayout(false);
this.tableLayouPanel5.PerformLayout();
this.panel1.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)(this.dataGridViewHosts)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.dataGridViewUpdates)).EndInit();
this.ResumeLayout(false);
this.PerformLayout();
}
#endregion
private XenAdmin.Controls.DataGridViewEx.DataGridViewEx dataGridViewUpdates;
private System.Windows.Forms.Label labelProgress;
private System.Windows.Forms.TableLayoutPanel tableLayoutPanel1;
private System.Windows.Forms.TableLayoutPanel tableLayoutPanel2;
private System.Windows.Forms.Button button1;
private System.Windows.Forms.PictureBox informationLabelIcon;
private System.Windows.Forms.LinkLabel informationLabel;
private System.Windows.Forms.Button button2;
private Controls.ToolStripEx toolStrip1;
private Controls.FilterLocationToolStripDropDownButton toolStripDropDownButtonServerFilter;
private Controls.FilterDatesToolStripDropDownButton toolStripDropDownButtonDateFilter;
private System.Windows.Forms.ToolStripSeparator toolStripSeparator3;
private System.Windows.Forms.ToolStripButton toolStripButtonRefresh;
private System.Windows.Forms.ToolStripSeparator toolStripSeparator1;
private System.Windows.Forms.ToolStripButton toolStripButtonExportAll;
private System.Windows.Forms.ToolStripLabel toolStripLabelFiltersOnOff;
private System.Windows.Forms.ToolStripSplitButton toolStripSplitButtonDismiss;
private System.Windows.Forms.ToolStripMenuItem dismissAllToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem dismissSelectedToolStripMenuItem;
private System.Windows.Forms.ToolStripButton toolStripButtonRestoreDismissed;
private System.Windows.Forms.Label AutoCheckForUpdatesDisabledLabel;
private System.Windows.Forms.PictureBox pictureBox1;
private System.Windows.Forms.LinkLabel checkForUpdatesNowLink;
private System.Windows.Forms.TableLayoutPanel tableLayoutPanel3;
private System.Windows.Forms.Button checkForUpdatesNowButton;
private System.Windows.Forms.TableLayoutPanel tableLayoutPanel4;
private System.Windows.Forms.DataGridViewImageColumn ColumnExpand;
private System.Windows.Forms.DataGridViewTextBoxColumn ColumnMessage;
private System.Windows.Forms.DataGridViewTextBoxColumn ColumnLocation;
private System.Windows.Forms.DataGridViewTextBoxColumn ColumnDate;
private System.Windows.Forms.DataGridViewTextBoxColumn ColumnWebPage;
private System.Windows.Forms.TableLayoutPanel tableLayouPanel5;
private System.Windows.Forms.ToolStripSeparator toolStripSeparator2;
private System.Windows.Forms.ToolStripDropDownButton toolStripDropDownButtonView;
private System.Windows.Forms.ToolStripMenuItem byUpdateToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem byHostToolStripMenuItem;
private TabPages.ManageUpdatesPage.UpdatePageByHostDataGridView dataGridViewHosts;
private System.Windows.Forms.Panel panel1;
private System.Windows.Forms.DataGridViewImageColumn ColumnExpansion;
private System.Windows.Forms.DataGridViewImageColumn ColumnIcon;
private System.Windows.Forms.DataGridViewTextBoxColumn ColumnName;
private System.Windows.Forms.DataGridViewTextBoxColumn ColumnVersion;
private System.Windows.Forms.DataGridViewImageColumn ColumnPatchingStatus;
private System.Windows.Forms.DataGridViewTextBoxColumn ColumnStatus;
private System.Windows.Forms.DataGridViewTextBoxColumn ColumnRequiredUpdate;
private System.Windows.Forms.DataGridViewTextBoxColumn ColumnInstalledUpdate;
private System.Windows.Forms.ToolStripButton toolStripButtonUpdate;
private Controls.SpinnerIcon spinner;
private System.Windows.Forms.Label labelLegacyUpdates;
}
}

1462
XenAdmin/TabPages/ManageUpdatesPage.cs
View File

File diff suppressed because it is too large Load Diff

1329
XenAdmin/TabPages/ManageUpdatesPage.ja.resx
View File

File diff suppressed because it is too large Load Diff

1329
XenAdmin/TabPages/ManageUpdatesPage.resx
View File

File diff suppressed because it is too large Load Diff

1329
XenAdmin/TabPages/ManageUpdatesPage.zh-CN.resx
View File

File diff suppressed because it is too large Load Diff

16
XenAdmin/XenAdmin.csproj
View File

@ -231,7 +231,6 @@
<Compile Include="Core\Metadata.cs" />
<Compile Include="Diagnostics\Checks\AssertCanEvacuateCheck.cs" />
<Compile Include="Diagnostics\Checks\AssertCanEvacuateUpgradeCheck.cs" />
<Compile Include="Diagnostics\Checks\CfuAvailabilityCheck.cs" />
<Compile Include="Diagnostics\Checks\AutomatedUpdatesLicenseCheck.cs" />
<Compile Include="Diagnostics\Checks\DiskSpaceForBatchUpdatesCheck.cs" />
<Compile Include="Diagnostics\Checks\HealthCheckServiceCheck.cs" />
@ -3183,12 +3182,6 @@
<Compile Include="TabPages\GpuPage.Designer.cs">
<DependentUpon>GpuPage.cs</DependentUpon>
</Compile>
<Compile Include="TabPages\ManageUpdatesPage.cs">
<SubType>UserControl</SubType>
</Compile>
<Compile Include="TabPages\ManageUpdatesPage.Designer.cs">
<DependentUpon>ManageUpdatesPage.cs</DependentUpon>
</Compile>
<Compile Include="Dialogs\OptionsPages\PluginOptionsPage.cs">
<SubType>UserControl</SubType>
</Compile>
@ -5269,15 +5262,6 @@
<EmbeddedResource Include="Dialogs\RestoreSession\LoadSessionDialog.zh-CN.resx">
<DependentUpon>LoadSessionDialog.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="TabPages\ManageUpdatesPage.ja.resx">
<DependentUpon>ManageUpdatesPage.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="TabPages\ManageUpdatesPage.resx">
<DependentUpon>ManageUpdatesPage.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="TabPages\ManageUpdatesPage.zh-CN.resx">
<DependentUpon>ManageUpdatesPage.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="Dialogs\MoveVirtualDiskDialog.ja.resx">
<DependentUpon>MoveVirtualDiskDialog.cs</DependentUpon>
</EmbeddedResource>

6
XenAdmin/app.config
View File

@ -96,12 +96,6 @@
<setting name="AllowXenCenterUpdates" serializeAs="String">
<value>True</value>
</setting>
<setting name="AllowXenServerUpdates" serializeAs="String">
<value>False</value>
</setting>
<setting name="LatestXenCenterSeen" serializeAs="String">
<value />
</setting>
<setting name="SeenAllowUpdatesDialog" serializeAs="String">
<value>False</value>
</setting>

16
XenModel/Actions/ActionBase.cs
View File

@ -219,6 +219,7 @@ namespace XenAdmin.Actions
private bool _isCompleted;
private int _percentComplete;
private Exception _exception;
private bool _suppressHistory;
#region Events
public event Action<ActionBase> Changed;
@ -236,8 +237,19 @@ namespace XenAdmin.Actions
_description = description;
log.Debug(_description);
if (!suppressHistory)
NewAction?.Invoke(this);
SuppressHistory = suppressHistory;
}
protected bool SuppressHistory
{
get => _suppressHistory;
set
{
_suppressHistory = value;
if (!_suppressHistory)
NewAction?.Invoke(this);
}
}
/// <remarks>

2
XenModel/Actions/DummyAction.cs
View File

@ -35,7 +35,7 @@ namespace XenAdmin.Actions
{
public class DummyAction : ActionBase
{
private string _error;
private readonly string _error;
public DummyAction(string title, string description, string error = null)
: base(title, description, false)

54
XenModel/Actions/Updates/DownloadUpdatesXmlAction.cs
View File

@ -57,25 +57,15 @@ namespace XenAdmin.Actions
public List<XenServerVersion> XenServerVersions { get; } = new List<XenServerVersion>();
public List<XenServerPatch> XenServerPatches { get; } = new List<XenServerPatch>();
public List<XenServerVersion> XenServerVersionsForAutoCheck
{
get
{
if(_checkForServerVersion)
{
return XenServerVersions;
}
return new List<XenServerVersion>();
}
}
public List<XenServerVersion> XenServerVersionsForAutoCheck => _checkForServerVersion ? XenServerVersions : new List<XenServerVersion>();
private readonly bool _checkForXenCenter;
private readonly bool _checkForServerVersion;
private readonly bool _checkForPatches;
private readonly string _userAgent;
public DownloadUpdatesXmlAction(bool checkForXenCenter, bool checkForServerVersion, bool checkForPatches, string userAgent)
: base(null, "_get_updates", "_get_updates", true)
public DownloadUpdatesXmlAction(bool checkForXenCenter, bool checkForServerVersion, bool checkForPatches, string userAgent, bool suppressHistory)
: base(null, string.Empty, string.Empty, suppressHistory)
{
Debug.Assert(!string.IsNullOrWhiteSpace(userAgent));
@ -83,17 +73,45 @@ namespace XenAdmin.Actions
_checkForServerVersion = checkForServerVersion;
_checkForPatches = checkForPatches;
_userAgent = userAgent;
Title = Description = string.Format(Messages.AVAILABLE_UPDATES_CHECKING, BrandManager.BrandConsole);
}
protected override void Run()
{
this.Description = Messages.AVAILABLE_UPDATES_SEARCHING;
try
{
XmlDocument xdoc = FetchCheckForUpdatesXml();
XmlDocument xdoc = FetchCheckForUpdatesXml();
GetXenCenterVersions(xdoc);
GetXenServerPatches(xdoc);
GetXenServerVersions(xdoc);
GetXenCenterVersions(xdoc);
GetXenServerPatches(xdoc);
GetXenServerVersions(xdoc);
Description = Messages.COMPLETED;
}
catch (Exception e)
{
if (e is System.Net.Sockets.SocketException)
{
Description = Messages.AVAILABLE_UPDATES_NETWORK_ERROR;
}
else if (!string.IsNullOrWhiteSpace(e.Message))
{
string errorText = e.Message.Trim();
errorText = System.Text.RegularExpressions.Regex.Replace(errorText, @"\r\n+", "");
Description = string.Format(Messages.AVAILABLE_UPDATES_ERROR, errorText);
}
else
{
Description = Messages.AVAILABLE_UPDATES_INTERNAL_ERROR;
}
//if we had originally wanted it to be hidden, make it visible now so the error is shown
if (SuppressHistory)
SuppressHistory = false;
throw;
}
}
private void GetXenCenterVersions(XmlDocument xdoc)

89
XenModel/Messages.Designer.cs generated
View File

@ -5387,7 +5387,7 @@ namespace XenAdmin {
}
/// <summary>
/// Looks up a localized string similar to Would you like {0} to periodically check the internet for new versions of {0} and {1}?.
/// Looks up a localized string similar to Would you like {0} to periodically check the internet for new versions of the application?.
/// </summary>
public static string ALLOWED_UPDATES_DIALOG_MESSAGE {
get {
@ -5827,11 +5827,11 @@ namespace XenAdmin {
}
/// <summary>
/// Looks up a localized string similar to Download.
/// Looks up a localized string similar to Checking for {0} updates.
/// </summary>
public static string AVAILABLE_UPDATES_DOWNLOAD_TEXT {
public static string AVAILABLE_UPDATES_CHECKING {
get {
return ResourceManager.GetString("AVAILABLE_UPDATES_DOWNLOAD_TEXT", resourceCulture);
return ResourceManager.GetString("AVAILABLE_UPDATES_CHECKING", resourceCulture);
}
}
@ -5844,15 +5844,6 @@ namespace XenAdmin {
}
}
/// <summary>
/// Looks up a localized string similar to The following software updates for your system are available online..
/// </summary>
public static string AVAILABLE_UPDATES_FOUND {
get {
return ResourceManager.GetString("AVAILABLE_UPDATES_FOUND", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to There was an internal error when searching for available updates. Please see the logs for more information..
/// </summary>
@ -5871,24 +5862,6 @@ namespace XenAdmin {
}
}
/// <summary>
/// Looks up a localized string similar to No updates found..
/// </summary>
public static string AVAILABLE_UPDATES_NOT_FOUND {
get {
return ResourceManager.GetString("AVAILABLE_UPDATES_NOT_FOUND", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to Searching for updates....
/// </summary>
public static string AVAILABLE_UPDATES_SEARCHING {
get {
return ResourceManager.GetString("AVAILABLE_UPDATES_SEARCHING", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to Backing up server &apos;{0}&apos;.
/// </summary>
@ -7521,15 +7494,6 @@ namespace XenAdmin {
}
}
/// <summary>
/// Looks up a localized string similar to Ability to download updates.
/// </summary>
public static string CFU_STATUS_CHECK_DESCRIPTION {
get {
return ResourceManager.GetString("CFU_STATUS_CHECK_DESCRIPTION", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to Change....
/// </summary>
@ -28958,33 +28922,6 @@ namespace XenAdmin {
}
}
/// <summary>
/// Looks up a localized string similar to Updates.
/// </summary>
public static string NOTIFICATIONS_SUBMODE_UPDATES_READ {
get {
return ResourceManager.GetString("NOTIFICATIONS_SUBMODE_UPDATES_READ", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to Updates: {0}.
/// </summary>
public static string NOTIFICATIONS_SUBMODE_UPDATES_STATUS {
get {
return ResourceManager.GetString("NOTIFICATIONS_SUBMODE_UPDATES_STATUS", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to Updates ({0}).
/// </summary>
public static string NOTIFICATIONS_SUBMODE_UPDATES_UNREAD {
get {
return ResourceManager.GetString("NOTIFICATIONS_SUBMODE_UPDATES_UNREAD", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to Notifications ({0}).
/// </summary>
@ -33086,15 +33023,6 @@ namespace XenAdmin {
}
}
/// <summary>
/// Looks up a localized string similar to Restore dismissed updates.
/// </summary>
public static string RESTORE_DISMISSED_UPDATES {
get {
return ResourceManager.GetString("RESTORE_DISMISSED_UPDATES", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to Backup file loaded to server &apos;{0}&apos;. Refer to the &quot;{1} Administrator&apos;s Guide&quot; for instructions on how to complete the restore procedure..
/// </summary>
@ -33113,15 +33041,6 @@ namespace XenAdmin {
}
}
/// <summary>
/// Looks up a localized string similar to Restoring....
/// </summary>
public static string RESTORING {
get {
return ResourceManager.GetString("RESTORING", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to Restoring server &apos;{0}&apos;.
/// </summary>

31
XenModel/Messages.ja.resx
View File

@ -2119,27 +2119,18 @@ SR の物理使用量が {2} を超えるとアラートが送信されます。
<data name="AVAILABLE" xml:space="preserve">
<value>使用可能</value>
</data>
<data name="AVAILABLE_UPDATES_DOWNLOAD_TEXT" xml:space="preserve">
<value>ダウンロード</value>
<data name="AVAILABLE_UPDATES_CHECKING" xml:space="preserve">
<value>アップデートを検索しています...</value>
</data>
<data name="AVAILABLE_UPDATES_ERROR" xml:space="preserve">
<value>アップデートの検索時にエラーが発生しました。{0}</value>
</data>
<data name="AVAILABLE_UPDATES_FOUND" xml:space="preserve">
<value>以下のソフトウェア アップデートをダウンロードできます。</value>
</data>
<data name="AVAILABLE_UPDATES_INTERNAL_ERROR" xml:space="preserve">
<value>使用可能なアップデートの検索時に内部エラーが発生しました。詳しくはログを参照してください。</value>
</data>
<data name="AVAILABLE_UPDATES_NETWORK_ERROR" xml:space="preserve">
<value>使用可能なアップデートの検索時にネットワーク エラーが発生しました。詳しくはログを参照してください。</value>
</data>
<data name="AVAILABLE_UPDATES_NOT_FOUND" xml:space="preserve">
<value>アップデートが見つかりません。</value>
</data>
<data name="AVAILABLE_UPDATES_SEARCHING" xml:space="preserve">
<value>アップデートを検索しています...</value>
</data>
<data name="BACKINGUP_HOST" xml:space="preserve">
<value>サーバー '{0}' をバックアップしています</value>
</data>
@ -2716,9 +2707,6 @@ SR の物理使用量が {2} を超えるとアラートが送信されます。
<data name="CERTIFICATE_VERIFICATION_KEY" xml:space="preserve">
<value>証明書の検証</value>
</data>
<data name="CFU_STATUS_CHECK_DESCRIPTION" xml:space="preserve">
<value>アップデートをダウンロードする機能</value>
</data>
<data name="CHANGE" xml:space="preserve">
<value>変更...</value>
</data>
@ -10046,15 +10034,6 @@ NFS ストレージ リポジトリを構成する場合は、NFS サーバー
<data name="NOTIFICATIONS_SUBMODE_EVENTS_UNREAD_ONE" xml:space="preserve">
<value>イベント (1 個のエラー)</value>
</data>
<data name="NOTIFICATIONS_SUBMODE_UPDATES_READ" xml:space="preserve">
<value>アップデート</value>
</data>
<data name="NOTIFICATIONS_SUBMODE_UPDATES_STATUS" xml:space="preserve">
<value>アップデート: {0} 個</value>
</data>
<data name="NOTIFICATIONS_SUBMODE_UPDATES_UNREAD" xml:space="preserve">
<value>アップデート ({0})</value>
</data>
<data name="NOTIFICATIONS_TOTAL" xml:space="preserve">
<value>通知 ({0})</value>
</data>
@ -11448,18 +11427,12 @@ NFS ストレージ リポジトリを構成する場合は、NFS サーバー
<data name="RESOLVED_AS" xml:space="preserve">
<value>{0} として解決されました</value>
</data>
<data name="RESTORE_DISMISSED_UPDATES" xml:space="preserve">
<value>クリアされたアップデートを復元</value>
</data>
<data name="RESTORE_FROM_BACKUP_FINALIZE" xml:space="preserve">
<value>バックアップ ファイルがサーバー '{0}' にロードされました。復元手順については、『{1} 管理者ガイド』を参照してください。</value>
</data>
<data name="RESTORE_HOST" xml:space="preserve">
<value>バックアップから復元...</value>
</data>
<data name="RESTORING" xml:space="preserve">
<value>復元しています...</value>
</data>
<data name="RESTORING_HOST" xml:space="preserve">
<value>サーバー '{0}' を復元しています</value>
</data>

33
XenModel/Messages.resx
View File

@ -1970,7 +1970,7 @@ Note that if RBAC is enabled, only alerts which you have privileges to dismiss w
<value>&amp;Show internet proxy settings</value>
</data>
<data name="ALLOWED_UPDATES_DIALOG_MESSAGE" xml:space="preserve">
<value>Would you like {0} to periodically check the internet for new versions of {0} and {1}?</value>
<value>Would you like {0} to periodically check the internet for new versions of the application?</value>
</data>
<data name="ALREADY_ATTACHED_ELSEWHERE" xml:space="preserve">
<value>The SR '{0}' is currently attached elsewhere. Do you want to attach it to '{1}'?
@ -2121,27 +2121,18 @@ Warning: you must ensure that the SR is not in use by any server not connected t
<data name="AVAILABLE" xml:space="preserve">
<value>available</value>
</data>
<data name="AVAILABLE_UPDATES_DOWNLOAD_TEXT" xml:space="preserve">
<value>Download</value>
<data name="AVAILABLE_UPDATES_CHECKING" xml:space="preserve">
<value>Checking for {0} updates</value>
</data>
<data name="AVAILABLE_UPDATES_ERROR" xml:space="preserve">
<value>An error occurred when searching for updates: {0}</value>
</data>
<data name="AVAILABLE_UPDATES_FOUND" xml:space="preserve">
<value>The following software updates for your system are available online.</value>
</data>
<data name="AVAILABLE_UPDATES_INTERNAL_ERROR" xml:space="preserve">
<value>There was an internal error when searching for available updates. Please see the logs for more information.</value>
</data>
<data name="AVAILABLE_UPDATES_NETWORK_ERROR" xml:space="preserve">
<value>There was a network error when searching for available updates. Please see the logs for more information.</value>
</data>
<data name="AVAILABLE_UPDATES_NOT_FOUND" xml:space="preserve">
<value>No updates found.</value>
</data>
<data name="AVAILABLE_UPDATES_SEARCHING" xml:space="preserve">
<value>Searching for updates...</value>
</data>
<data name="BACKINGUP_HOST" xml:space="preserve">
<value>Backing up server '{0}'</value>
</data>
@ -2718,9 +2709,6 @@ If you are upgrading to {0} {1} and above, it is recommended that you first inst
<data name="CERTIFICATE_VERIFICATION_KEY" xml:space="preserve">
<value>Certificate Verification</value>
</data>
<data name="CFU_STATUS_CHECK_DESCRIPTION" xml:space="preserve">
<value>Ability to download updates</value>
</data>
<data name="CHANGE" xml:space="preserve">
<value>Change...</value>
</data>
@ -10068,15 +10056,6 @@ Review these settings, then click Previous if you need to change anything. Other
<data name="NOTIFICATIONS_SUBMODE_EVENTS_UNREAD_ONE" xml:space="preserve">
<value>Events (1 error)</value>
</data>
<data name="NOTIFICATIONS_SUBMODE_UPDATES_READ" xml:space="preserve">
<value>Updates</value>
</data>
<data name="NOTIFICATIONS_SUBMODE_UPDATES_STATUS" xml:space="preserve">
<value>Updates: {0}</value>
</data>
<data name="NOTIFICATIONS_SUBMODE_UPDATES_UNREAD" xml:space="preserve">
<value>Updates ({0})</value>
</data>
<data name="NOTIFICATIONS_TOTAL" xml:space="preserve">
<value>Notifications ({0})</value>
</data>
@ -11477,18 +11456,12 @@ Click Server Status Report to open the Compile Server Status Report Wizard or cl
<data name="RESOLVED_AS" xml:space="preserve">
<value>Resolved as {0}</value>
</data>
<data name="RESTORE_DISMISSED_UPDATES" xml:space="preserve">
<value>Restore dismissed updates</value>
</data>
<data name="RESTORE_FROM_BACKUP_FINALIZE" xml:space="preserve">
<value>Backup file loaded to server '{0}'. Refer to the "{1} Administrator's Guide" for instructions on how to complete the restore procedure.</value>
</data>
<data name="RESTORE_HOST" xml:space="preserve">
<value>Restore From Backup...</value>
</data>
<data name="RESTORING" xml:space="preserve">
<value>Restoring...</value>
</data>
<data name="RESTORING_HOST" xml:space="preserve">
<value>Restoring server '{0}'</value>
</data>

31
XenModel/Messages.zh-CN.resx
View File

@ -2115,27 +2115,18 @@
<data name="AVAILABLE" xml:space="preserve">
<value>可用</value>
</data>
<data name="AVAILABLE_UPDATES_DOWNLOAD_TEXT" xml:space="preserve">
<value>下载</value>
<data name="AVAILABLE_UPDATES_CHECKING" xml:space="preserve">
<value>正在搜索更新...</value>
</data>
<data name="AVAILABLE_UPDATES_ERROR" xml:space="preserve">
<value>搜索更新时出错: {0}</value>
</data>
<data name="AVAILABLE_UPDATES_FOUND" xml:space="preserve">
<value>适用于您系统的以下软件更新在联机时可用。</value>
</data>
<data name="AVAILABLE_UPDATES_INTERNAL_ERROR" xml:space="preserve">
<value>搜索可用更新时出现内部错误。有关详细信息，请参阅日志。</value>
</data>
<data name="AVAILABLE_UPDATES_NETWORK_ERROR" xml:space="preserve">
<value>搜索可用更新时出现网络错误。有关详细信息，请参阅日志。</value>
</data>
<data name="AVAILABLE_UPDATES_NOT_FOUND" xml:space="preserve">
<value>未找到更新。</value>
</data>
<data name="AVAILABLE_UPDATES_SEARCHING" xml:space="preserve">
<value>正在搜索更新...</value>
</data>
<data name="BACKINGUP_HOST" xml:space="preserve">
<value>正在备份服务器“{0}”</value>
</data>
@ -2712,9 +2703,6 @@
<data name="CERTIFICATE_VERIFICATION_KEY" xml:space="preserve">
<value>证书验证</value>
</data>
<data name="CFU_STATUS_CHECK_DESCRIPTION" xml:space="preserve">
<value>能够下载更新</value>
</data>
<data name="CHANGE" xml:space="preserve">
<value>更改...</value>
</data>
@ -10046,15 +10034,6 @@ VM 克隆使用文件管理器的快照和克隆功能来实现高性能，并
<data name="NOTIFICATIONS_SUBMODE_EVENTS_UNREAD_ONE" xml:space="preserve">
<value>事件(1 个错误)</value>
</data>
<data name="NOTIFICATIONS_SUBMODE_UPDATES_READ" xml:space="preserve">
<value>更新</value>
</data>
<data name="NOTIFICATIONS_SUBMODE_UPDATES_STATUS" xml:space="preserve">
<value>更新: {0}</value>
</data>
<data name="NOTIFICATIONS_SUBMODE_UPDATES_UNREAD" xml:space="preserve">
<value>更新({0})</value>
</data>
<data name="NOTIFICATIONS_TOTAL" xml:space="preserve">
<value>通知({0})</value>
</data>
@ -11448,18 +11427,12 @@ VM 克隆使用文件管理器的快照和克隆功能来实现高性能，并
<data name="RESOLVED_AS" xml:space="preserve">
<value>已解析为 {0}</value>
</data>
<data name="RESTORE_DISMISSED_UPDATES" xml:space="preserve">
<value>还原消除的更新</value>
</data>
<data name="RESTORE_FROM_BACKUP_FINALIZE" xml:space="preserve">
<value>备份文件已加载到服务器“{0}”。有关如何完成还原过程的说明，请参阅《{1} 管理员指南》。</value>
</data>
<data name="RESTORE_HOST" xml:space="preserve">
<value>从备份还原...</value>
</data>
<data name="RESTORING" xml:space="preserve">
<value>正在还原...</value>
</data>
<data name="RESTORING_HOST" xml:space="preserve">
<value>正在还原服务器“{0}”</value>
</data>