Merge remote-tracking branch 'or/master' into work

Sharpe49 · Apr 20, 2023 · 4e32512 · 4e32512
2 parents 3da8c09 + efe66c5
commit 4e32512
Show file tree

Hide file tree

Showing 19 changed files with 527 additions and 325 deletions.
diff --git a/Source/Documentation/Manual/options.rst b/Source/Documentation/Manual/options.rst
@@ -617,14 +617,19 @@ bottom of the screen.
 This is helpful for operations that don't have visible feedback and also
 allows you to control the train without being in the cab.
 
-The default setting is checked. 
-Uncheck this option if you prefer to monitor your cab instruments and
-don't want to see these messages.
+Informational, Warning and Error messages are displayed here also. 
+
+The default setting of this option is to show all messages. Dropdown list gives the following choices:
+
+- None: no messages suppressed (default)
+- Information: informational messages and control confirmations suppressed
+- Warning: warning messages and the ones mentioned above suppressed
+- Error: error messages and the ones mentioned above suppressed
 
 OR uses the same message scheme for system messages such as "Game saved"
 or "Replay ended" but you cannot suppress these system messages.
 
-Once the game has started, you can toggle the confirmations on and off 
+Once the game has started, you can cycle through the above settings  
 by pressing ``Ctrl+Alt+F10``. 
 
 

diff --git a/Source/Menu/Options.Designer.cs b/Source/Menu/Options.Designer.cs
diff --git a/Source/Menu/Options.cs b/Source/Menu/Options.cs
@@ -259,7 +259,20 @@ orderby folder.Key
             checkWindowed.Checked = !Settings.FullScreen;
             comboWindowSize.Text = Settings.WindowSize;
             checkWindowGlass.Checked = Settings.WindowGlass;
-            checkControlConfirmations.Checked = !Settings.SuppressConfirmations;
+
+            // keep values in line with enum Orts.Simulation.ConfirmLevel
+            // see also function Message(CabControl control, ConfirmLevel level, string message)
+            // in Source\Orts.Simulation\Simulation\Confirmer.cs
+            comboControlConfirmations.DataSource = new[] {
+                new ComboBoxMember { Code = "None", Name = catalog.GetString("None") },
+                new ComboBoxMember { Code = "Information", Name = catalog.GetString("Information") },
+                new ComboBoxMember { Code = "Warning", Name = catalog.GetString("Warning") },
+                new ComboBoxMember { Code = "Error", Name = catalog.GetString("Error") },
+            }.ToList();
+            comboControlConfirmations.DisplayMember = "Name";
+            comboControlConfirmations.ValueMember = "Code";
+            comboControlConfirmations.SelectedIndex = Settings.SuppressConfirmations;
+
             numericWebServerPort.Value = Settings.WebServerPort;
             checkPerformanceTuner.Checked = Settings.PerformanceTuner;
             labelPerformanceTunerTarget.Enabled = checkPerformanceTuner.Checked;
@@ -447,7 +460,7 @@ void buttonOK_Click(object sender, EventArgs e)
             Settings.FullScreen = !checkWindowed.Checked;
             Settings.WindowSize = GetValidWindowSize(comboWindowSize.Text);
             Settings.WindowGlass = checkWindowGlass.Checked;
-            Settings.SuppressConfirmations = !checkControlConfirmations.Checked;
+            Settings.SuppressConfirmations = comboControlConfirmations.SelectedIndex;
             Settings.WebServerPort = (int)numericWebServerPort.Value;
             Settings.PerformanceTuner = checkPerformanceTuner.Checked;
             Settings.PerformanceTunerTarget = (int)numericPerformanceTunerTarget.Value;
@@ -829,7 +842,7 @@ private void InitializeHelpIcons()
                 (pbLanguage, new Control[] { labelLanguage, comboLanguage }),
                 (pbWindowed, new Control[] { checkWindowed, labelWindowSize, comboWindowSize }),
                 (pbWindowGlass, new[] { checkWindowGlass }),
-                (pbControlConfirmations, new[] { checkControlConfirmations }),
+                (pbControlConfirmations, new Control[] { labelControlConfirmations, comboControlConfirmations }),
                 (pbWebServerPort, new Control[] { labelWebServerPort }),
                 (pbPerformanceTuner, new Control[] { checkPerformanceTuner, labelPerformanceTunerTarget }),
             };

diff --git a/Source/ORTS.Settings/UserSettings.cs b/Source/ORTS.Settings/UserSettings.cs
@@ -278,8 +278,8 @@ public enum DirectXFeature
         public string WindowSize { get; set; }
         [Default(false)]
         public bool WindowGlass { get; set; }
-        [Default(false)]
-        public bool SuppressConfirmations { get; set; }
+        [Default(0)]
+        public int SuppressConfirmations { get; set; }
         [Default(2150)]
         public int WebServerPort { get; set; }
         [Default(false)]