AutoSave menu included

Author: Roeterdink

Source/Menu/Options.Designer.cs

@@ -440,6 +440,8 @@ void buttonOK_Click(object sender, EventArgs e)
             Settings.PressureUnit = comboPressureUnit.SelectedValue.ToString();
             Settings.Units = comboOtherUnits.SelectedValue.ToString();
             Settings.DisableTCSScripts = !checkEnableTCSScripts.Checked; // Inverted as "Enable scripts" is better UI than "Disable scripts"
+            Settings.AutoSaveActive = checkAutoSaveActive.Checked;
+            Settings.AutoSaveInterval = ButtonAutoSave15.Checked ? 15 : ButtonAutoSave30.Checked ? 30 : 60;
 
             // Audio tab
             Settings.SoundVolumePercent = (int)numericSoundVolumePercent.Value;
@@ -798,6 +800,56 @@ private void checkPerformanceTuner_Click(object sender, EventArgs e)
             labelPerformanceTunerTarget.Enabled = checkPerformanceTuner.Checked;
         }
 
+        private void checkAutoSave_checkchanged(object sender, EventArgs e)
+        {
+            if (checkAutoSaveActive.Checked)
+            {
+                ButtonAutoSave15.Enabled = true;
+                ButtonAutoSave15.Checked = Settings.AutoSaveInterval == 15;
+                ButtonAutoSave30.Enabled = true;
+                ButtonAutoSave30.Checked = Settings.AutoSaveInterval == 30;
+                ButtonAutoSave60.Enabled = true;
+                ButtonAutoSave60.Checked = Settings.AutoSaveInterval == 60;
+            }
+            else
+            {
+                ButtonAutoSave15.Checked = false;
+                ButtonAutoSave15.Enabled = false;
+                ButtonAutoSave30.Checked = false;
+                ButtonAutoSave30.Enabled = false;
+                ButtonAutoSave60.Checked = false;
+                ButtonAutoSave60.Enabled = false;
+            }
+        }
+
+        private void buttonAutoSaveInterval_checkchanged(object sender, EventArgs e)
+        {
+            if (ButtonAutoSave15.Checked)
+            {
+                Settings.AutoSaveInterval = 15;
+                ButtonAutoSave30.Checked = false;
+                ButtonAutoSave60.Checked = false;
+            }
+            else if (ButtonAutoSave30.Checked)
+            {
+                Settings.AutoSaveInterval = 30;
+                ButtonAutoSave15.Checked = false;
+                ButtonAutoSave60.Checked = false;
+            }
+            else if (ButtonAutoSave60.Checked)
+            {
+                Settings.AutoSaveInterval = 60;
+                ButtonAutoSave15.Checked = false;
+                ButtonAutoSave30.Checked = false;
+            }
+            else
+            {
+                Settings.AutoSaveInterval = 15;
+                ButtonAutoSave30.Checked = false;
+                ButtonAutoSave60.Checked = false;
+            }
+        }
+
         #region Help for Options
         // The icons all share the same code which assumes they are named according to a simple scheme as follows:
         //   1. To add a new Help Icon, copy an existing one and paste it onto the tab.
@@ -1081,5 +1133,6 @@ private void HelpIcon_MouseLeave(object sender, EventArgs _)
                 hover.Leave();
         }
         #endregion
+
     }
 }

Source/Menu/Options.cs

@@ -169,6 +169,10 @@ public enum DirectXFeature
         public String Units { get; set; }
         [Default(false)]
         public bool DisableTCSScripts { get; set; }
+        [Default(false)]
+        public bool AutoSaveActive { get; set; }
+        [Default (15)]
+        public int AutoSaveInterval { get; set; }
 
         // Audio settings:
         [Default(100)]

Source/ORTS.Settings/UserSettings.cs

@@ -70,7 +70,7 @@ void buttonQuit_Click(Control arg1, Point arg2)
         void buttonSave_Click(Control arg1, Point arg2)
         {
             GameStateRunActivity.Save();
-            Owner.Viewer.LastSave = Owner.Viewer.RealTime + 60 * 15;
+            Owner.Viewer.LastSave = Owner.Viewer.RealTime + 60 * Owner.Viewer.Simulator.Settings.AutoSaveInterval;
         }
 
         void buttonContinue_Click(Control arg1, Point arg2)

Source/RunActivity/Viewer3D/Popups/QuitWindow.cs

@@ -297,7 +297,7 @@ public Viewer(Simulator simulator, Orts.Viewer3D.Processes.Game game)
             Settings = simulator.Settings;
             Use3DCabProperty = Settings.GetSavingProperty<bool>("Use3DCab");
 
-            LastSave = 15 * 60;
+            LastSave = Simulator.Settings.AutoSaveInterval * 60;
 
             RenderProcess = game.RenderProcess;
             UpdaterProcess = game.UpdaterProcess;
@@ -740,10 +740,10 @@ public void Update(RenderFrame frame, float elapsedRealTime)
             var elapsedTime = new ElapsedTime(Simulator.GetElapsedClockSeconds(elapsedRealTime), elapsedRealTime);
 
             // auto save
-            if (RealTime > LastSave && !Simulator.Paused)
+            if (Simulator.Settings.AutoSaveActive && RealTime > LastSave && !Simulator.Paused)
             {
                 GameStateRunActivity.Save();
-                LastSave = RealTime + 15 * 60;
+                LastSave = RealTime + Simulator.Settings.AutoSaveInterval * 60;
             }
 
             // show message
@@ -944,7 +944,7 @@ void HandleUserInput(ElapsedTime elapsedTime)
             if (UserInput.IsPressed(UserCommand.GameSave))
             {
                 GameStateRunActivity.Save();
-                LastSave = RealTime + 60 * 15;
+                LastSave = RealTime + 60 * Simulator.Settings.AutoSaveInterval;
             }
             if (UserInput.IsPressed(UserCommand.DisplayHelpWindow)) if (UserInput.IsDown(UserCommand.DisplayNextWindowTab)) HelpWindow.TabAction(); else HelpWindow.Visible = !HelpWindow.Visible;
             if (UserInput.IsPressed(UserCommand.DisplayTrackMonitorWindow)) if (UserInput.IsDown(UserCommand.DisplayNextWindowTab)) TrackMonitorWindow.TabAction(); else TrackMonitorWindow.Visible = !TrackMonitorWindow.Visible;