Automatic merge of T1.5.1-569-g8f17be306 and 14 pull requests

- Pull request #757 at 98dd1a7: Unify RailDriver code implementations
- Pull request #831 at 3e672a8: 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 d05f581: Notify out of focus
- Pull request #855 at b39e5d8: Adds new route from TrainSimulations
- Pull request #857 at 9afc8c3: Adding Air Flow Meters
- Pull request #863 at a34b857: Alternate preset 3D cabviewpoints
- Pull request #864 at e71bc5a: Fixes for Undesired Emergency Applications
- Pull request #865 at 776d6df: Dispatcher window improvements
- Pull request #866 at c15333e: Fix Articulation For 0-Axle Train Cars
- Pull request #870 at 5cb32fa: Fix water restore
- Pull request #871 at c2388e6: Signal aspects are multiplied when reopening Dispatcher Window
- Pull request #872 at 00c5b8b: Fix Retainer State Disappearing from HUD on Restore

Author: openrails-bot

Source/RunActivity/Viewer3D/WebServices/SwitchPanel/SwitchOnPanelDefinition.cs

@@ -115,6 +115,10 @@ public void init(UserCommand userCommand)
                     init2(ORTS.Common.Input.UserCommand.ControlBrakeHoseConnect, ORTS.Common.Input.UserCommand.ControlBrakeHoseDisconnect);
                     break;
 
+                case ORTS.Common.Input.UserCommand.ControlRetainersOn:
+                    init2(ORTS.Common.Input.UserCommand.ControlRetainersOn, ORTS.Common.Input.UserCommand.ControlRetainersOff);
+                    break;
+
                 default:
                     init1(userCommand);
                     break;
@@ -273,6 +277,9 @@ private string determineDescription(UserCommand userCommand)
                 case ORTS.Common.Input.UserCommand.ControlCylinderCocks:
                     description = Viewer.Catalog.GetParticularString("SwitchPanel", "Cyl Cocks");
                     break;
+                case ORTS.Common.Input.UserCommand.ControlRetainersOn:
+                    description = Viewer.Catalog.GetParticularString("SwitchPanel", "Retainers");
+                    break;
             }
 
             return description;

Source/RunActivity/Viewer3D/WebServices/SwitchPanel/SwitchOnPanelStatus.cs

@@ -454,6 +454,17 @@ private static void getStatusCylinderCocks(ref SwitchOnPanelStatus switchOnPanel
             }
         }
 
+        private static void getStatusRetainers(ref SwitchOnPanelStatus switchOnPanelStatus)
+        {
+            Train train = Viewer.PlayerLocomotive.Train;
+
+            if (train.RetainerSetting != Orts.Simulation.RollingStocks.SubSystems.Brakes.RetainerSetting.Exhaust)
+            {
+                switchOnPanelStatus.Status = train.RetainerPercent + "% " + Viewer.Catalog.GetString(GetStringAttribute.GetPrettyName(train.RetainerSetting));
+                switchOnPanelStatus.Color = "orange";
+            }
+        }
+
         public static void getStatus(UserCommand userCommand, ref SwitchOnPanelStatus switchOnPanelStatus)
         {
             switchOnPanelStatus.Status = "";
@@ -527,6 +538,9 @@ public static void getStatus(UserCommand userCommand, ref SwitchOnPanelStatus sw
                     case UserCommand.ControlCylinderCocks:
                         getStatusCylinderCocks(ref switchOnPanelStatus);
                         break;
+                    case UserCommand.ControlRetainersOn:
+                        getStatusRetainers(ref switchOnPanelStatus);
+                        break;
                 }
             }
             catch (Exception ex)

Source/RunActivity/Viewer3D/WebServices/SwitchPanel/SwitchesOnPanel.cs

@@ -77,6 +77,7 @@ public void setDefinitions(SwitchOnPanel[,] SwitchesOnPanelArray)
                     SwitchesOnPanelArray[1, 5].initDefinition(UserCommand.ControlHeadlightIncrease);
                     SwitchesOnPanelArray[1, 6].initDefinition(UserCommand.ControlHandbrakeFull);
                     SwitchesOnPanelArray[1, 7].initDefinition(UserCommand.ControlBrakeHoseConnect);
+                    SwitchesOnPanelArray[1, 8].initDefinition(UserCommand.ControlRetainersOn);
                     break;
 
                 case TrainCar.EngineTypes.Diesel:
@@ -98,6 +99,7 @@ public void setDefinitions(SwitchOnPanel[,] SwitchesOnPanelArray)
                     SwitchesOnPanelArray[1, 5].initDefinition(UserCommand.ControlHeadlightIncrease);
                     SwitchesOnPanelArray[1, 6].initDefinition(UserCommand.ControlHandbrakeFull);
                     SwitchesOnPanelArray[1, 7].initDefinition(UserCommand.ControlBrakeHoseConnect);
+                    SwitchesOnPanelArray[1, 8].initDefinition(UserCommand.ControlRetainersOn);
                     break;
 
                 case TrainCar.EngineTypes.Steam:
@@ -116,6 +118,7 @@ public void setDefinitions(SwitchOnPanel[,] SwitchesOnPanelArray)
                     SwitchesOnPanelArray[1, 2].initDefinition(UserCommand.ControlHeadlightIncrease);
                     SwitchesOnPanelArray[1, 3].initDefinition(UserCommand.ControlHandbrakeFull);
                     SwitchesOnPanelArray[1, 4].initDefinition(UserCommand.ControlBrakeHoseConnect);
+                    SwitchesOnPanelArray[1, 5].initDefinition(UserCommand.ControlRetainersOn);
                     break;
 
                 case TrainCar.EngineTypes.Control: