removed the toggle cuntion form the electric choices also

Author: sweiland-openrails

Source/Documentation/Manual/driving.rst

@@ -537,13 +537,16 @@ By clicking in this menu it is possible:
   for both electric and diesel locomotives;
 - to connect or disconnect locomotive operation with that of the player 
   locomotive;
-- to connect or disconnect the car's air hoses from the rest of the consist;
-- to toggle the angle cocks on the air hoses at either end of the car 
-  between open and closed;
-- to toggle the bleed valve on the car to vent the air pressure from the 
+- to connect of disconnect the battery;
+- to connect or disconnect the Electric Train Supply;
+- to connect or disconnect the car's brake hoses from the rest of the consist;
+- to open or close the angle cocks on the air hoses at either end of the car;
+- to open or close the bleed valve on the car to vent the air pressure from the 
   car's reservoir and release the air brakes to move the car without brakes 
   (e.g. humping, etc.).
 
+Grayed out choices are not applicable for the chosen car.
+
 By toggling the angle cocks on individual cars it is possible to close 
 selected angle cocks of the air hoses so that when the cars are uncoupled, 
 the air pressure in the remaining consist (and optionally in the uncoupled 

Source/Documentation/Manual/images/driving-car-operations.png

@@ -50,6 +50,8 @@ protected override ControlLayout Layout(ControlLayout layout)
 
             TrainCar trainCar = Viewer.PlayerTrain.Cars[CarPosition];
             BrakeSystem brakeSystem = (trainCar as MSTSWagon).BrakeSystem;
+            MSTSLocomotive locomotive = trainCar as MSTSLocomotive;
+            MSTSWagon wagon = trainCar as MSTSWagon;
 
             BrakeSystem rearBrakeSystem = null;
             if (CarPosition + 1 < Viewer.PlayerTrain.Cars.Count)
@@ -58,11 +60,14 @@ protected override ControlLayout Layout(ControlLayout layout)
                 rearBrakeSystem = (rearTrainCar as MSTSWagon).BrakeSystem;
             }
 
+            bool isElectricDieselLocomotive = (Viewer.PlayerTrain.Cars[CarPosition] is MSTSElectricLocomotive) || (Viewer.PlayerTrain.Cars[CarPosition] is MSTSDieselLocomotive);
+ 
             var vbox = base.Layout(layout).AddLayoutVertical();
-            vbox.Add(ID = new Label(vbox.RemainingWidth, Owner.TextFontDefault.Height, Viewer.Catalog.GetString("Car ID") + "  " + (CarPosition >= Viewer.PlayerTrain.Cars.Count? " " :Viewer.PlayerTrain.Cars[CarPosition].CarID), LabelAlignment.Center));
+            vbox.Add(ID = new Label(vbox.RemainingWidth, Owner.TextFontDefault.Height, Viewer.Catalog.GetString("Car ID") + "  " + (CarPosition >= Viewer.PlayerTrain.Cars.Count ? " " : Viewer.PlayerTrain.Cars[CarPosition].CarID), LabelAlignment.Center));
             ID.Color = Color.Red;
             vbox.AddHorizontalSeparator();
 
+            // Handbrake
             string buttonHandbrakeText = "";
             if ((trainCar as MSTSWagon).GetTrainHandbrakeStatus())
                 buttonHandbrakeText = Viewer.Catalog.GetString("Unset Handbrake");
@@ -71,15 +76,38 @@ protected override ControlLayout Layout(ControlLayout layout)
             vbox.Add(buttonHandbrake = new Label(vbox.RemainingWidth, Owner.TextFontDefault.Height, buttonHandbrakeText, LabelAlignment.Center));
             vbox.AddHorizontalSeparator();
 
-            vbox.Add(buttonTogglePower = new Label(vbox.RemainingWidth, Owner.TextFontDefault.Height, Viewer.Catalog.GetString("Toggle Power"), LabelAlignment.Center));
+            // Power Supply
+            if (locomotive != null)
+                if (locomotive.LocomotivePowerSupply.MainPowerSupplyOn)
+                    vbox.Add(buttonTogglePower = new Label(vbox.RemainingWidth, Owner.TextFontDefault.Height, Viewer.Catalog.GetString("Power Off"), LabelAlignment.Center));
+                else
+                    vbox.Add(buttonTogglePower = new Label(vbox.RemainingWidth, Owner.TextFontDefault.Height, Viewer.Catalog.GetString("Power On"), LabelAlignment.Center));
+            else
+                vbox.Add(buttonTogglePower = new Label(vbox.RemainingWidth, Owner.TextFontDefault.Height, Viewer.Catalog.GetString("Power On"), LabelAlignment.Center));
             vbox.AddHorizontalSeparator();
-            vbox.Add(buttonToggleMU = new Label(vbox.RemainingWidth, Owner.TextFontDefault.Height, Viewer.Catalog.GetString("Toggle MU Connection"), LabelAlignment.Center));
+
+            // MU Connection
+            if ((locomotive != null) && (locomotive.RemoteControlGroup >= 0))
+                vbox.Add(buttonToggleMU = new Label(vbox.RemainingWidth, Owner.TextFontDefault.Height, Viewer.Catalog.GetString("Disconnect MU Connection"), LabelAlignment.Center));
+            else
+                vbox.Add(buttonToggleMU = new Label(vbox.RemainingWidth, Owner.TextFontDefault.Height, Viewer.Catalog.GetString("Connect MU Connection"), LabelAlignment.Center));
             vbox.AddHorizontalSeparator();
-            vbox.Add(buttonToggleBatterySwitch = new Label(vbox.RemainingWidth, Owner.TextFontDefault.Height, Viewer.Catalog.GetString("Toggle Battery Switch"), LabelAlignment.Center));
+
+            // Battery Switch
+            if ((wagon != null) && (wagon.PowerSupply is IPowerSupply) && (wagon.PowerSupply.BatterySwitch.On))
+                vbox.Add(buttonToggleBatterySwitch = new Label(vbox.RemainingWidth, Owner.TextFontDefault.Height, Viewer.Catalog.GetString("Battery Switch Off"), LabelAlignment.Center));
+            else
+                vbox.Add(buttonToggleBatterySwitch = new Label(vbox.RemainingWidth, Owner.TextFontDefault.Height, Viewer.Catalog.GetString("Battery Switch On"), LabelAlignment.Center));
             vbox.AddHorizontalSeparator();
-            vbox.Add(buttonToggleElectricTrainSupplyCable = new Label(vbox.RemainingWidth, Owner.TextFontDefault.Height, Viewer.Catalog.GetString("Toggle Electric Train Supply Connection"), LabelAlignment.Center));
+
+            // Electric Train Supply Connection
+            if ((wagon.PowerSupply != null) && wagon.PowerSupply.FrontElectricTrainSupplyCableConnected)
+                vbox.Add(buttonToggleElectricTrainSupplyCable = new Label(vbox.RemainingWidth, Owner.TextFontDefault.Height, Viewer.Catalog.GetString("Disonnect Electric Train Supply"), LabelAlignment.Center));
+            else
+                vbox.Add(buttonToggleElectricTrainSupplyCable = new Label(vbox.RemainingWidth, Owner.TextFontDefault.Height, Viewer.Catalog.GetString("Connect Electric Train Supply"), LabelAlignment.Center));
             vbox.AddHorizontalSeparator();
 
+            // Front Brake Hose
             string buttonToggleFronBrakeHoseText = "";
             if (brakeSystem.FrontBrakeHoseConnected)
                 buttonToggleFronBrakeHoseText = Viewer.Catalog.GetString("Disconnect Front Brake Hose");
@@ -88,6 +116,7 @@ protected override ControlLayout Layout(ControlLayout layout)
             vbox.Add(buttonToggleFrontBrakeHose = new Label(vbox.RemainingWidth, Owner.TextFontDefault.Height, buttonToggleFronBrakeHoseText, LabelAlignment.Center));
             vbox.AddHorizontalSeparator();
 
+            // Rear Brake Hose
             string buttonToggleRearBrakeHoseText = "";
             if (((CarPosition + 1) < Viewer.PlayerTrain.Cars.Count) && (rearBrakeSystem.FrontBrakeHoseConnected))
                 buttonToggleRearBrakeHoseText = Viewer.Catalog.GetString("Disconnect Rear Brake Hose");
@@ -96,6 +125,7 @@ protected override ControlLayout Layout(ControlLayout layout)
             vbox.Add(buttonToggleRearBrakeHose = new Label(vbox.RemainingWidth, Owner.TextFontDefault.Height, buttonToggleRearBrakeHoseText, LabelAlignment.Center));
             vbox.AddHorizontalSeparator();
 
+            // Front Angle Cock
             string buttonToggleAngleCockAText = "";
             if (brakeSystem.AngleCockAOpen)
                 buttonToggleAngleCockAText = Viewer.Catalog.GetString("Close Front Angle Cock");
@@ -104,6 +134,7 @@ protected override ControlLayout Layout(ControlLayout layout)
             vbox.Add(buttonToggleAngleCockA = new Label(vbox.RemainingWidth, Owner.TextFontDefault.Height, buttonToggleAngleCockAText, LabelAlignment.Center));
             vbox.AddHorizontalSeparator();
 
+            // Rear Angle Cock
             string buttonToggleAngleCockBText = "";
             if (brakeSystem.AngleCockBOpen)
                 buttonToggleAngleCockBText = Viewer.Catalog.GetString("Close Rear Angle Cock");
@@ -112,6 +143,7 @@ protected override ControlLayout Layout(ControlLayout layout)
             vbox.Add(buttonToggleAngleCockB = new Label(vbox.RemainingWidth, Owner.TextFontDefault.Height, buttonToggleAngleCockBText, LabelAlignment.Center));
             vbox.AddHorizontalSeparator();
 
+            // Bleed Off Valve
             string buttonToggleBleedOffValveAText = "";
             if (brakeSystem.BleedOffValveOpen)
                 buttonToggleBleedOffValveAText = Viewer.Catalog.GetString("Close Bleed Off Valve");
@@ -120,29 +152,63 @@ protected override ControlLayout Layout(ControlLayout layout)
             vbox.Add(buttonToggleBleedOffValve = new Label(vbox.RemainingWidth, Owner.TextFontDefault.Height, buttonToggleBleedOffValveAText, LabelAlignment.Center));
             vbox.AddHorizontalSeparator();
 
+            // Close button
             vbox.Add(buttonClose = new Label(vbox.RemainingWidth, Owner.TextFontDefault.Height, Viewer.Catalog.GetString("Close window"), LabelAlignment.Center));
 
+            // add click controls
+
+            // Handbrake
             if ((trainCar as MSTSWagon).HandBrakePresent)
                 buttonHandbrake.Click += new Action<Control, Point>(buttonHandbrake_Click);
             else
                 buttonHandbrake.Color = Color.Gray;
-            buttonTogglePower.Click += new Action<Control, Point>(buttonTogglePower_Click);
-            buttonToggleMU.Click += new Action<Control, Point>(buttonToggleMU_Click);
-            buttonToggleBatterySwitch.Click += new Action<Control, Point>(buttonToggleBatterySwitch_Click);
-            buttonToggleElectricTrainSupplyCable.Click += new Action<Control, Point>(buttonToggleElectricTrainSupplyCable_Click);
 
+            // Power Supply
+            if (isElectricDieselLocomotive)
+                buttonTogglePower.Click += new Action<Control, Point>(buttonTogglePower_Click);
+            else
+                buttonTogglePower.Color = Color.Gray;
+
+            // MU Connection
+            if (isElectricDieselLocomotive)
+                buttonToggleMU.Click += new Action<Control, Point>(buttonToggleMU_Click);
+            else
+                buttonToggleMU.Color = Color.Gray;
+
+            // Battery Switch
+            if ((wagon != null) && (wagon.PowerSupply is IPowerSupply))
+                buttonToggleBatterySwitch.Click += new Action<Control, Point>(buttonToggleBatterySwitch_Click);
+            else
+                buttonToggleBatterySwitch.Color = Color.Gray;
+
+            // Electric Train Supply Connection
+            if ((wagon != null) && (wagon.PowerSupply != null))
+                buttonToggleElectricTrainSupplyCable.Click += new Action<Control, Point>(buttonToggleElectricTrainSupplyCable_Click);
+            else
+                buttonToggleElectricTrainSupplyCable.Color = Color.Gray;
+
+            // Front Brake Hose
             if (CarPosition > 0)
                 buttonToggleFrontBrakeHose.Click += new Action<Control, Point>(buttonToggleFrontBrakeHose_Click);
             else
                 buttonToggleFrontBrakeHose.Color = Color.Gray;
+
+            // Rear Brake Hose
             if (CarPosition < (Viewer.PlayerTrain.Cars.Count - 1))
                 buttonToggleRearBrakeHose.Click += new Action<Control, Point>(buttonToggleRearBrakeHose_Click);
             else
                 buttonToggleRearBrakeHose.Color = Color.Gray;
 
+            // Front Angle Cock
             buttonToggleAngleCockA.Click += new Action<Control, Point>(buttonToggleAngleCockA_Click);
+
+            // Rear Angle Cock
             buttonToggleAngleCockB.Click += new Action<Control, Point>(buttonToggleAngleCockB_Click);
+
+            // Bleed Off Valve
             buttonToggleBleedOffValve.Click += new Action<Control, Point>(buttonToggleBleedOffValve_Click);
+
+            // Close button
             buttonClose.Click += new Action<Control, Point>(buttonClose_Click);
 
             return vbox;