Automatic merge of T1.5.1-535-g2f57132ee and 9 pull requests

- Pull request #757 at 98dd1a7: Unify RailDriver code implementations
- Pull request #799 at dc03850: Consolidated wind simulation
- Pull request #821 at cc3af66: Adds suppression of safety valves
- Pull request #831 at 61bbf43: poor mans switch panel on tablet
- Pull request #839 at d00beb9: First phase of https://blueprints.launchpad.net/or/+spec/additional-cruise-control-parameters
- Pull request #841 at 410a585: https://blueprints.launchpad.net/or/+spec/animating-trainset-windows
- Pull request #853 at 52a513d: Notify out of focus
- Pull request #855 at b39e5d8: Adds new route from TrainSimulations
- Pull request #856 at ce66076: Add Alternate Syntax for Confusing Tokens

Author: openrails-bot

Source/RunActivity/Viewer3D/Popups/OutOfFocusWindow.cs

@@ -16,6 +16,13 @@
 // along with Open Rails.  If not, see <http://www.gnu.org/licenses/>.
 //
 
+/*
+ * This out of focus window is a somewhat strange Window
+ * When the main window is out of focus (so not receving any keystrokes)
+ *     it is surrounded by a red square to notify the user
+ * The red square is the only functionality, so no save, no move, no resize etc.
+ */
+
 using Microsoft.Xna.Framework;
 using Microsoft.Xna.Framework.Graphics;
 

Source/RunActivity/Viewer3D/Popups/Window.cs

@@ -45,7 +45,11 @@ public abstract class Window : RenderPrimitive
         VertexBuffer WindowVertexBuffer;
         IndexBuffer WindowIndexBuffer;
 
-        readonly bool DoNotDisplayWindow;
+        public bool DoNotDisplayWindow // true for a NotInFocus window
+        {
+            get;
+            private set;
+        }
 
         public Window(WindowManager owner, int width, int height, string caption)
         {

Source/RunActivity/Viewer3D/Popups/WindowManager.cs

@@ -171,14 +171,20 @@ public void Initialize()
         public void Save(BinaryWriter outf)
         {
             foreach (var window in Windows)
-                window.Save(outf);
+                if (!window.DoNotDisplayWindow)
+                    // This if is added to not do the save in case of the out of focus window
+                    // See Source\RunActivity\Viewer3D\Popups\OutOfFocusWindow.cs
+                    window.Save(outf);
         }
 
         [CallOnThread("Render")]
         public void Restore(BinaryReader inf)
         {
             foreach (var window in Windows)
-                window.Restore(inf);
+                if (!window.DoNotDisplayWindow)
+                    // This if is added to not do the restore in case of the out of focus window
+                    // See Source\RunActivity\Viewer3D\Popups\OutOfFocusWindow.cs
+                    window.Restore(inf);
         }
 
 		[CallOnThread("Updater")]