removes redundant labels for What's New and Update Check Failed

Author: cjakeman

Source/Menu/MainForm.Designer.cs

@@ -316,11 +316,6 @@ void CheckForUpdate()
                 return null;
             }, _ =>
             {
-                if (UpdateManager.LastCheckError != null)
-                {
-                    linkLabelUpdate.Text = catalog.GetString("Update check failed");
-                    linkLabelChangeLog.Visible = true;
-                }
                 NotificationManager.CheckNotifications();
             });
         }
@@ -511,27 +506,6 @@ bool CheckUserName(string text)
         #endregion
 
         #region Misc. buttons and options
-        void linkLabelUpdate_LinkClicked(object sender, LinkLabelLinkClickedEventArgs e)
-        {
-            if (UpdateManager.LastCheckError != null)
-            {
-                MessageBox.Show(catalog.GetStringFmt("The update check failed due to an error:\n\n{0}", UpdateManager.LastCheckError), Application.ProductName);
-                return;
-            }
-
-            UpdateManager.Update();
-
-            if (UpdateManager.LastUpdateError != null)
-            {
-                MessageBox.Show(catalog.GetStringFmt("The update failed due to an error:\n\n{0}", UpdateManager.LastUpdateError), Application.ProductName);
-                return;
-            }
-        }
-
-        void linkLabelChangeLog_LinkClicked(object sender, LinkLabelLinkClickedEventArgs e)
-        {
-            Process.Start(UpdateManager.ChangeLogLink);
-        }
 
         void buttonTools_Click(object sender, EventArgs e)
         {

Source/Menu/MainForm.cs

@@ -126,26 +126,23 @@ void SetUpdateNotificationPage()
             if (UpdateManager.LastCheckError != null || Error != null)
             {
                 NewPageCount = 0;
-                //if (ArePagesVisible)
-                {
-                    var message = (UpdateManager.LastCheckError != null) 
-                        ? UpdateManager.LastCheckError.Message
-                        : Error.Message;
-
-                    // Reports notifications are not available.
-                    var channelName = UpdateManager.ChannelName == "" ? "None" : UpdateManager.ChannelName;
-                    var today = DateTime.Now.Date;
-                    new NTitleControl(page, 1, 1, $"{today:dd-MMM-yy}", "Notifications are not available").Add();
-                    new NRecordControl(page, "Update mode", 140, channelName).Add();
-                    new NRecordControl(page, "Installed version", 140, VersionInfo.VersionOrBuild).Add();
-
-                    new NHeadingControl(page, "Notifications are not available", "red").Add();
-                    new NTextControl(page, $"Error: {message}").Add();
-                    new NTextControl(page, "Is your Internet connected?").Add();
-
-                    new NRetryControl(page, "Retry", 140, "Try again to fetch notifications", MainForm).Add();
-                    PageList.Add(page);
-                }
+                var message = (UpdateManager.LastCheckError != null) 
+                    ? UpdateManager.LastCheckError.Message
+                    : Error.Message;
+
+                // Reports notifications are not available.
+                var channelName = UpdateManager.ChannelName == "" ? "None" : UpdateManager.ChannelName;
+                var today = DateTime.Now.Date;
+                new NTitleControl(page, 1, 1, $"{today:dd-MMM-yy}", "Notifications are not available").Add();
+                new NRecordControl(page, "Update mode", 140, channelName).Add();
+                new NRecordControl(page, "Installed version", 140, VersionInfo.VersionOrBuild).Add();
+
+                new NHeadingControl(page, "Notifications are not available", "red").Add();
+                new NTextControl(page, $"Error: {message}").Add();
+                new NTextControl(page, "Is your Internet connected?").Add();
+
+                new NRetryControl(page, "Retry", 140, "Try again to fetch notifications", MainForm).Add();
+                PageList.Add(page);
                 return;
             }
 
@@ -206,12 +203,6 @@ void SetUpdateNotificationPage()
             PageList.Add(page);
         }
 
-        //private bool IsUpdateAvailable()
-        //{
-        //    return UpdateManager.LastUpdate != null
-        //        && UpdateManager.LastUpdate.Version != VersionInfo.Version;
-        //}
-
         private void AddItemToPage(NotificationPage page, Item item)
         {
             if (item is Record record)
@@ -238,6 +229,7 @@ private void AddItemToPage(NotificationPage page, Item item)
 
         /// <summary>
         /// Returns any check that fails.
+        /// (Could be extended to include other SystemInfo values.)
         /// </summary>
         /// <param name="check"></param>
         /// <returns></returns>
@@ -270,6 +262,7 @@ private Check CheckExcludes(Check check)
 
         /// <summary>
         /// Returns any check that succeeds.
+        /// (Could be extended to include other SystemInfo values.)
         /// </summary>
         /// <param name="check"></param>
         /// <returns></returns>
@@ -318,7 +311,7 @@ public void DropUnusedUpdateNotifications()
                 if (updateModeSetting == "" && lowerUpdateMode == "stable")
                     continue;
 
-                // Mark unused updates for deletion
+                // Mark unused updates for deletion outside loop
                 n.ToDelete = lowerUpdateMode != updateModeSetting;
             }
             Notifications.NotificationList.RemoveAll(n => n.ToDelete);