diff --git a/XenAdmin/Core/Metadata.cs b/XenAdmin/Core/Metadata.cs
index cadf5f412..fa4688ecb 100644
--- a/XenAdmin/Core/Metadata.cs
+++ b/XenAdmin/Core/Metadata.cs
@@ -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,
diff --git a/XenAdmin/Core/Updates.cs b/XenAdmin/Core/Updates.cs
index 69186c4c9..8f9894200 100644
--- a/XenAdmin/Core/Updates.cs
+++ b/XenAdmin/Core/Updates.cs
@@ -94,13 +94,9 @@ namespace XenAdmin.Core
if (Helpers.CommonCriteriaCertificationRelease)
return;
- if (Properties.Settings.Default.AllowXenCenterUpdates ||
- Properties.Settings.Default.AllowXenServerUpdates ||
- force || forceRefresh)
+ if (Properties.Settings.Default.AllowXenCenterUpdates || force || forceRefresh)
{
- var action = CreateDownloadUpdatesXmlAction(
- Properties.Settings.Default.AllowXenCenterUpdates || force,
- Properties.Settings.Default.AllowXenServerUpdates || force);
+ var action = CreateDownloadUpdatesXmlAction(Properties.Settings.Default.AllowXenCenterUpdates || force);
action.Completed += actionCompleted;
diff --git a/XenAdmin/Dialogs/OptionsPages/UpdatesOptionsPage.Designer.cs b/XenAdmin/Dialogs/OptionsPages/UpdatesOptionsPage.Designer.cs
index 3d5cd9d2a..de4e172ac 100644
--- a/XenAdmin/Dialogs/OptionsPages/UpdatesOptionsPage.Designer.cs
+++ b/XenAdmin/Dialogs/OptionsPages/UpdatesOptionsPage.Designer.cs
@@ -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;
}
}
diff --git a/XenAdmin/Dialogs/OptionsPages/UpdatesOptionsPage.cs b/XenAdmin/Dialogs/OptionsPages/UpdatesOptionsPage.cs
index 0239067ba..0972e8a8a 100644
--- a/XenAdmin/Dialogs/OptionsPages/UpdatesOptionsPage.cs
+++ b/XenAdmin/Dialogs/OptionsPages/UpdatesOptionsPage.cs
@@ -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()
@@ -72,16 +68,12 @@ namespace XenAdmin.Dialogs.OptionsPages
public void Save()
{
bool checkXenCenterUpdates = AllowXenCenterUpdatesCheckBox.Checked != Properties.Settings.Default.AllowXenCenterUpdates;
- bool checkVersionUpdates = AllowXenServerUpdatesCheckBox.Checked != Properties.Settings.Default.AllowXenServerUpdates;
if (checkXenCenterUpdates)
+ {
Properties.Settings.Default.AllowXenCenterUpdates = AllowXenCenterUpdatesCheckBox.Checked;
-
- if (checkVersionUpdates)
- Properties.Settings.Default.AllowXenServerUpdates = AllowXenServerUpdatesCheckBox.Checked;
-
- if(checkXenCenterUpdates || checkVersionUpdates)
Updates.CheckForUpdates(false, true);
+ }
}
#endregion
diff --git a/XenAdmin/Dialogs/OptionsPages/UpdatesOptionsPage.resx b/XenAdmin/Dialogs/OptionsPages/UpdatesOptionsPage.resx
index 5c3dfd6d4..c86fa38ed 100644
--- a/XenAdmin/Dialogs/OptionsPages/UpdatesOptionsPage.resx
+++ b/XenAdmin/Dialogs/OptionsPages/UpdatesOptionsPage.resx
@@ -154,7 +154,7 @@
0
- 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.
+ You can configure {0} to periodically check for available updates and prompt you when a new version of the application is available for download.
UpdatesBlurb
@@ -204,42 +204,6 @@
1
-
- True
-
-
- Tahoma, 8pt
-
-
- NoControl
-
-
- 3, 64
-
-
- 3, 0, 0, 0
-
-
- 173, 17
-
-
- 2
-
-
- Check for new &versions of {0}
-
-
- AllowXenServerUpdatesCheckBox
-
-
- System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- UpdatesTableLayoutPanel
-
-
- 2
-
Fill
@@ -250,7 +214,7 @@
0, 0
- 4
+ 3
447, 225
@@ -271,7 +235,7 @@
0
- <?xml version="1.0" encoding="utf-16"?><TableLayoutSettings><Controls><Control Name="UpdatesBlurb" Row="0" RowSpan="1" Column="0" ColumnSpan="1" /><Control Name="AllowXenCenterUpdatesCheckBox" Row="1" RowSpan="1" Column="0" ColumnSpan="1" /><Control Name="AllowXenServerUpdatesCheckBox" Row="2" RowSpan="1" Column="0" ColumnSpan="1" /></Controls><Columns Styles="Percent,100" /><Rows Styles="AutoSize,0,AutoSize,0,AutoSize,0,Percent,100" /></TableLayoutSettings>
+ <?xml version="1.0" encoding="utf-16"?><TableLayoutSettings><Controls><Control Name="UpdatesBlurb" Row="0" RowSpan="1" Column="0" ColumnSpan="1" /><Control Name="AllowXenCenterUpdatesCheckBox" Row="1" RowSpan="1" Column="0" ColumnSpan="1" /></Controls><Columns Styles="Percent,100" /><Rows Styles="AutoSize,0,AutoSize,0,Percent,100,Absolute,20" /></TableLayoutSettings>
True
diff --git a/XenAdmin/MainWindow.cs b/XenAdmin/MainWindow.cs
index 76645fd17..ef742c8ff 100755
--- a/XenAdmin/MainWindow.cs
+++ b/XenAdmin/MainWindow.cs
@@ -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)
diff --git a/XenAdmin/Properties/Settings.Designer.cs b/XenAdmin/Properties/Settings.Designer.cs
index 370e98664..4b40cb39e 100644
--- a/XenAdmin/Properties/Settings.Designer.cs
+++ b/XenAdmin/Properties/Settings.Designer.cs
@@ -424,19 +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("")]
diff --git a/XenAdmin/Properties/Settings.settings b/XenAdmin/Properties/Settings.settings
index 33b53ae14..df8423735 100644
--- a/XenAdmin/Properties/Settings.settings
+++ b/XenAdmin/Properties/Settings.settings
@@ -96,9 +96,6 @@
True
-
- False
-
diff --git a/XenAdmin/Settings.cs b/XenAdmin/Settings.cs
index 365fafa89..5497493c6 100644
--- a/XenAdmin/Settings.cs
+++ b/XenAdmin/Settings.cs
@@ -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}");
diff --git a/XenAdmin/app.config b/XenAdmin/app.config
index d28529da2..979e3084b 100644
--- a/XenAdmin/app.config
+++ b/XenAdmin/app.config
@@ -96,9 +96,6 @@
True
-
- False
-
diff --git a/XenModel/Messages.Designer.cs b/XenModel/Messages.Designer.cs
index f8171dcfb..c2c57b346 100755
--- a/XenModel/Messages.Designer.cs
+++ b/XenModel/Messages.Designer.cs
@@ -5387,7 +5387,7 @@ namespace XenAdmin {
}
///
- /// 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?.
///
public static string ALLOWED_UPDATES_DIALOG_MESSAGE {
get {
diff --git a/XenModel/Messages.resx b/XenModel/Messages.resx
index 999b68505..8f79b30cb 100755
--- a/XenModel/Messages.resx
+++ b/XenModel/Messages.resx
@@ -1970,7 +1970,7 @@ Note that if RBAC is enabled, only alerts which you have privileges to dismiss w
&Show internet proxy settings
- Would you like {0} to periodically check the internet for new versions of {0} and {1}?
+ Would you like {0} to periodically check the internet for new versions of the application?
The SR '{0}' is currently attached elsewhere. Do you want to attach it to '{1}'?