Merge pull request #592 from cjakeman/menu-options02j

02j: Removed menu option ViewDispatcher . Now always available.

Author: cjakeman

Source/Documentation/Manual/images/options-dispatcher.png

@@ -34,6 +34,7 @@ therefore will not see the alerter warning, selecting the related option
 
 
 .. _options-control-confirmations:
+
 Control confirmations
 ---------------------
 
@@ -56,23 +57,6 @@ Control confirmations can also be toggled on and off at runtime using the
 key combination Ctrl-Alt-F10. 
 
 
-.. _options-map-window:
-
-Map window
------------------
-
-It is suggested to always select this option. When this option is selected,
-pressing ``<Ctrl+9>`` at runtime creates an additional window like the
-following. This window coexists with the main Open Rails window, and
-``<Alt+Tab>`` switches between it and the Open Rails window. See the related
-option :ref:`Fast fullscreen Alt+Tab <options-fullscreen>`.
-
-Through this window you can monitor train movements and also influence
-them, by setting signals and switches. A complete description of the
-dispatcher tab can be found :ref:`here <driving-dispatcher>`.
-
-.. image:: images/options-dispatcher.png
-
 Graduated release air brakes
 ----------------------------
 

Source/Documentation/Manual/images/options-general.png

@@ -143,7 +143,6 @@ public OptionsForm(UserSettings settings, UpdateManager updateManager, bool init
             checkAlerterExternal.Checked = Settings.Alerter && !Settings.AlerterDisableExternal;
             checkOverspeedMonitor.Checked = Settings.SpeedControl;
             checkControlConfirmations.Checked = !Settings.SuppressConfirmations;
-            checkViewMapWindow.Checked = Settings.ViewDispatcher;
             checkRetainers.Checked = Settings.RetainersOnAllCars;
             checkGraduatedRelease.Checked = Settings.GraduatedRelease;
             numericBrakePipeChargingRate.Value = Settings.BrakePipeChargingRate;
@@ -426,7 +425,6 @@ void buttonOK_Click(object sender, EventArgs e)
             Settings.AlerterDisableExternal = !checkAlerterExternal.Checked;
             Settings.SpeedControl = checkOverspeedMonitor.Checked;
             Settings.SuppressConfirmations = !checkControlConfirmations.Checked;
-            Settings.ViewDispatcher = checkViewMapWindow.Checked;
             Settings.RetainersOnAllCars = checkRetainers.Checked;
             Settings.GraduatedRelease = checkGraduatedRelease.Checked;
             Settings.BrakePipeChargingRate = (int)numericBrakePipeChargingRate.Value;
@@ -817,7 +815,6 @@ private void InitializeHelpIcons()
             {
                 (pbAlerter, new[] { checkAlerter }),
                 (pbControlConfirmations, new[] { checkControlConfirmations }),
-                (pbMapWindow, new[] { checkViewMapWindow }),
                 (pbRetainers, new[] { checkRetainers }),
                 (pbGraduatedRelease, new[] { checkGraduatedRelease }),
                 (pbBrakePipeChargingRate, new[] { lBrakePipeChargingRate }),
@@ -855,11 +852,6 @@ private void HelpIcon_Click(object sender, EventArgs _)
                     pbControlConfirmations,
                     baseUrl + "/options.html#control-confirmations"
                 },
-                {
-                    pbMapWindow,
-                    // This URL is temporary, waiting for https://open-rails.readthedocs.io to be updated to match the Manual in PDF format.
-                    baseUrl + "/options.html#dispatcher-window"
-                },
                 {
                     pbRetainers,
                     baseUrl + "/options.html#retainer-valve-on-all-cars"

Source/Documentation/Manual/options.rst

@@ -165,28 +165,74 @@ public DispatchViewer(Simulator simulator, Viewer viewer)
 
             this.simulator = simulator;
             this.Viewer = viewer;
-			TimetableWindow = new TimetableWindow(this);
+            TimetableWindow = new TimetableWindow(this);
 
-			nodes = simulator.TDB.TrackDB.TrackNodes;
+            nodes = simulator.TDB.TrackDB.TrackNodes;
 
             // initialise the timer used to handle user input
             UITimer = new Timer();
             UITimer.Interval = 100;
             UITimer.Tick += new System.EventHandler(UITimer_Tick);
             UITimer.Start();
+        }
+
+        public int RedrawCount;
+		public Font trainFont;
+		public Font sidingFont;
+		public Font PlatformFont;
+		public Font SignalFont;
+		public SolidBrush trainBrush;
+		public SolidBrush sidingBrush;
+		public SolidBrush PlatformBrush;
+		public SolidBrush SignalBrush;
+		public SolidBrush InactiveTrainBrush;
+
+		private double lastUpdateTime;
+
+      /// <summary>
+      /// When the user holds down the  "L", "R", "U", "D" buttons,
+      /// shift the view. Avoids the case when the user has to click
+      /// buttons like crazy.
+      /// </summary>
+      /// <param name="sender"></param>
+      /// <param name="e"></param>
+      void UITimer_Tick(object sender, EventArgs e)
+      {
+			if (Viewer.DebugViewerEnabled == false) // Ctrl+9 sets this true to initialise the window and make it visible
+			{
+				this.Visible = false;
+				firstShow = true;
+				return;
+			}
 
-            ViewWindow = new RectangleF(0, 0, 5000f, 5000f);
-            windowSizeUpDown.Accelerations.Add(new NumericUpDownAcceleration(1, 100));
-            boxSetSignal.Items.Add("System Controlled");
-            boxSetSignal.Items.Add("Stop");
-            boxSetSignal.Items.Add("Approach");
-            boxSetSignal.Items.Add("Proceed");
-            chkAllowUserSwitch.Checked = false;
-            selectedTrainList = new List<Train>();
-            if (MultiPlayer.MPManager.IsMultiPlayer()) { MultiPlayer.MPManager.AllowedManualSwitch = false; }
+			if (firstShow)
+            {
+				InitializeWindow();					
+			}
+			this.Visible = true;
 
-            InitData();
-            InitImage();
+			if (Program.Simulator.GameTime - lastUpdateTime < 1)
+				return;
+			
+			lastUpdateTime = Program.Simulator.GameTime;
+
+			GenerateView();
+	  }
+
+		private void InitializeWindow()
+		{
+			ViewWindow = new RectangleF(0, 0, 5000f, 5000f);
+			windowSizeUpDown.Accelerations.Add(new NumericUpDownAcceleration(1, 100));
+			boxSetSignal.Items.Add("System Controlled");
+			boxSetSignal.Items.Add("Stop");
+			boxSetSignal.Items.Add("Approach");
+			boxSetSignal.Items.Add("Proceed");
+			chkAllowUserSwitch.Checked = false;
+			selectedTrainList = new List<Train>();
+			if (MultiPlayer.MPManager.IsMultiPlayer()) { MultiPlayer.MPManager.AllowedManualSwitch = false; }
+
+			InitData();
+			InitImage();
 
 			/*
           if (MultiPlayer.MPManager.IsMultiPlayer())
@@ -213,40 +259,8 @@ public DispatchViewer(Simulator simulator, Viewer viewer)
 			tWindow.SelectedIndex = (MPManager.IsMultiPlayer()) ? 0 : 1;
 			TimetableWindow.SetControls();
 		}
-
-		public int RedrawCount;
-		public Font trainFont;
-		public Font sidingFont;
-		public Font PlatformFont;
-		public Font SignalFont;
-		public SolidBrush trainBrush;
-		public SolidBrush sidingBrush;
-		public SolidBrush PlatformBrush;
-		public SolidBrush SignalBrush;
-		public SolidBrush InactiveTrainBrush;
-
-		private double lastUpdateTime;
-
-      /// <summary>
-      /// When the user holds down the  "L", "R", "U", "D" buttons,
-      /// shift the view. Avoids the case when the user has to click
-      /// buttons like crazy.
-      /// </summary>
-      /// <param name="sender"></param>
-      /// <param name="e"></param>
-      void UITimer_Tick(object sender, EventArgs e)
-      {
-		  if (Viewer.DebugViewerEnabled == false) { this.Visible = false; firstShow = true; return; }
-		  else this.Visible = true;
-
-		 if (Program.Simulator.GameTime - lastUpdateTime < 1) return;
-		 lastUpdateTime = Program.Simulator.GameTime;
-
-			GenerateView();
-	  }
-
-	  #region initData
-	  private void InitData()
+		#region initData
+		private void InitData()
 	  {
 		  if (!loaded)
 		  {