Automatic merge of T1.5.1-1204-g8bc1d82939 and 17 pull requests

- Pull request #799 at dfc715e: Consolidated wind simulation
- Pull request #839 at d00beb9: First phase of https://blueprints.launchpad.net/or/+spec/additional-cruise-control-parameters
- Pull request #885 at 45ca50d: feat: Add notifications to Menu
- Pull request #891 at 9a1d6b2: Auto save
- Pull request #892 at 1f5ba4c: Signal Function OPP_SIG_ID_TRAINPATH
- Pull request #952 at 8347095: Investigation - Pulsing graphics
- Pull request #953 at a519452: Fix Lights Crash on Corrupt Shapes
- Pull request #954 at 62061b8: Multiple Track Profiles & Superelevation Improvements
- Pull request #962 at 46d0472: Fix pantographs on unpowered cars
- Pull request #972 at e90a2aa: On Map window color changed switch or signal is not changed
- Pull request #980 at a7406de: Downloading route content (Github, zip) second part 
- Pull request #981 at 10d297f: Multiple type trainset lightglows
- Pull request #982 at efcf19c: WEB based Switch Panel enhancement: Alerter
- Pull request #983 at 202316e: WEB based Switch Panel bug: DPU window
- Pull request #984 at 0f8122e: Player train switching for timetable mode
- Pull request #900 at c27f32d: DMI updates
- Pull request #876 at f92de76: docs: add source for documents previously on website to source Documentation folder

Author: openrails-bot

Source/Menu/MainForm.cs

@@ -1613,6 +1613,15 @@ public void UpdateNotificationPageAlert()
                 pbNotificationsSome.Visible = true;
                 lblNotificationCount.Visible = true;
                 lblNotificationCount.Text = $"{NotificationManager.NewPages.Count - NotificationManager.NewPages.Viewed}";
+
+                // If screen scaling != 100%, then the count doesn't lie on top of the red circle, so adjust its position.
+                if (NotificationManager.ScreenScaling != 1.0 & NotificationManager.ScreenAdjusted == false)
+                {
+                    var adjustment = (int)((NotificationManager.ScreenScaling - 1.0) * 20); // 20 to adjust 125% by 5 pixels
+                    lblNotificationCount.Top -= adjustment;
+                    lblNotificationCount.Left -= adjustment;
+                    NotificationManager.ScreenAdjusted = true;
+                }
             }
             else
             {

Source/Menu/Menu.csproj

@@ -31,6 +31,7 @@
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\3rdPartyLibs\GNU.Gettext.WinForms.dll</HintPath>
     </Reference>
+    <Reference Include="PresentationFramework" />
     <Reference Include="System.DirectoryServices" />
     <Reference Include="System.Net.Http" />
     <Reference Include="WindowsBase" />

Source/Menu/Notifications/NotificationManager.cs

@@ -1,4 +1,4 @@
-// COPYRIGHT 2009, 2010, 2011, 2012, 2013, 2014, 2015 by the Open Rails project.
+// COPYRIGHT 2009 - 2024 by the Open Rails project.
 // 
 // This file is part of Open Rails.
 // 
@@ -22,7 +22,9 @@
 using System.Linq;
 using System.Net;
 using System.Resources;
+using System.Runtime.InteropServices;
 using System.Text;
+using System.Windows;
 using System.Windows.Forms;
 using Newtonsoft.Json;
 using ORTS.Common;
@@ -75,6 +77,8 @@ public class PageTracking
         public Image FirstImage { get; private set; }
         public Image LastImage { get; private set; }
         public PageTracking NewPages { get; private set; }
+        public double ScreenScaling { get; private set; }
+        public bool ScreenAdjusted { get; set; }
 
         public NotificationManager(MainForm mainForm, ResourceManager resources, UpdateManager updateManager, UserSettings settings, Panel panel)
         {
@@ -83,14 +87,20 @@ public NotificationManager(MainForm mainForm, ResourceManager resources, UpdateM
             this.Settings = settings;
             Panel = panel;
             NewPages = new PageTracking();
-            
+            ScreenScaling = GetScalingFactor();
+
             // Load images of arrows
             PreviousImage = (Image)resources.GetObject("Notification_previous");
             NextImage = (Image)resources.GetObject("Notification_next");
             FirstImage = (Image)resources.GetObject("Notification_first");
             LastImage = (Image)resources.GetObject("Notification_last");
         }
-        
+
+        public double GetScalingFactor()
+        {
+            return Screen.PrimaryScreen.Bounds.Width / SystemParameters.PrimaryScreenWidth;
+        }
+
         public void CheckNotifications()
         {
             try
@@ -100,8 +110,8 @@ public void CheckNotifications()
                 CurrentPageIndex = 0;
                 Notifications = GetNotifications();
                 ParameterDictionary = new Dictionary<string, string>(StringComparer.OrdinalIgnoreCase);
-                
-                // To support testing, add any overriding values to the ValueDictionary
+
+                // To support testing, add any overriding values to the ParameterDictionary
                 GetOverrideParameters()?.ParameterValueList.ForEach(i => ParameterDictionary.Add(i.Parameter, i.Value));
                 LogOverrideParameters();
 
@@ -220,7 +230,7 @@ public void PopulatePage()
 
                 Page.NDetailList.Add(new NTitleControl(Panel, CurrentPageIndex + 1, list.Count, n.Date, n.Title));
 
-                // Check constraints foPageNoem
+                // Check criteria for each item and add the successful items to the current page
                 foreach (var item in n.ItemList)
                 {
                     if (AreItemChecksMet(item)) AddItemToPage(Page, item);
@@ -280,6 +290,11 @@ private bool AreNotificationChecksMet(Notification notification)
             return true;
         }
 
+        /// <summary>
+        ///  For the checks in the item, compares parameter values with criteria values
+        /// </summary>
+        /// <param name="item"></param>
+        /// <returns></returns>
         private bool AreItemChecksMet(Item item)
         {
             if (item.IncludeIf != null || item.IncludeIfNot != null)

Source/Menu/Notifications/Notifications.cs

@@ -1,4 +1,4 @@
-// COPYRIGHT 2009, 2010, 2011, 2012, 2013, 2014, 2015 by the Open Rails project.
+// COPYRIGHT 2009 - 2024 by the Open Rails project.
 // 
 // This file is part of Open Rails.
 // 
@@ -73,51 +73,29 @@ public class Item
         public string Color { get; set; } = "black";
         public int Indent { get; set; } = 140;
     }
-    //public class Met
-    //{
-    //    public List<Item> ItemList { get; set; }
-    //    public List<CheckId> CheckIdList { get; set; }
-    //}
-    //public class CheckId
-    //{
-    //    public string Id { get; set; }
-    //}
 
     public class Check
     {
         public string Id { get; set; }
         public List<AnyOf> AnyOfList { get; set; }
-        //public List<Item> UnmetItemList { get; set; }
     }
 
-    //public class CheckAllOf
-    //{
-    //    public List<Criteria> AllOfList { get; set; }
-    //}
     public class AnyOf
     {
         public List<Criteria> AllOfList { get; set; }
     }
 
-    //public class Excludes : CheckAllOf
-    //{
-    //}
-
-    //public class Includes : CheckAllOf
-    //{
-    //}
-
     class Contains : Criteria { }
     class NotContains : Criteria { }
 
-    // Not implemented yet
+    // Not implemented as not needed yet
     // String comparison, not numerical
     class NoLessThan : Criteria { }
     class NoMoreThan : Criteria { }
 
     public class Criteria
     {
-        // System Information "examples"
+                                                // System Information "examples"
         public string Property { get; set; }    // installed_version, direct3d, runtime, system, memory, cpu, gpu
         public string Value { get; set; }       // {{new_version}}, {{10_0}}
     }

Source/ORTS.Common/SystemInfo.cs

@@ -69,7 +69,7 @@ static SystemInfo()
             {
                 // Likely to catch multiple exceptions like:
                 // Exception thrown: 'System.IO.InvalidDataException' in ORTS.Menu.dll
-                //Trace.WriteLine(error);
+                Trace.WriteLine(error);
             }
 
             NativeMethods.GlobalMemoryStatusEx(MemoryStatusExtended);