Skip to content

Commit 4ae28a0

Browse files
author
Chris Jakeman
committed
Moves Window controls to System tab
1 parent 1e8b53c commit 4ae28a0

File tree

6 files changed

+141
-102
lines changed

6 files changed

+141
-102
lines changed

Source/Documentation/Manual/options.rst

Lines changed: 21 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -305,12 +305,6 @@ In legacy routes, all the content was assigned to categories 0-10.
305305
In more modern routes, content may be assigned to categories between 0 and 49.
306306
Content builders are advised to reserve values 50 to 99 for objects used in building the route.
307307

308-
Window size
309-
-----------
310-
311-
This pair of values defines the size of the OR window. There are some
312-
preconfigured pairs of values, however you may also manually enter a
313-
different size to be used.
314308

315309
Ambient daylight brightness
316310
---------------------------
@@ -535,14 +529,34 @@ access the location and make the necessary changes.
535529

536530
.. _options-updater:
537531

538-
Updater Options
532+
System Options
539533
===============
540534

541535
.. image:: images/options-updater.png
542536

543537
These options control which OR version update channel is active (see also
544538
:ref:`here <updating-or>`). The various options available are self-explanatory.
545539

540+
Windowed
541+
--------
542+
If the ``Windowed`` checkbox is checked, Open Rails will run in a window
543+
instead of full screen.
544+
545+
Once the game has started, you can toggle between windowed mode and full screen by
546+
pressing ``<Alt+Enter>``.
547+
548+
549+
Window size
550+
-----------
551+
552+
This pair of values defines the size of the OR window. There are some
553+
preconfigured pairs of values and you can also enter a
554+
specific width and height to be used.
555+
556+
The format is <width>x<height>, for example 1024x768.
557+
558+
559+
546560
.. _options-experimental:
547561

548562
Experimental Options

Source/Documentation/Manual/start.rst

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -79,9 +79,6 @@ useful to document and investigate malfunctions.
7979
At every restart of the game (that is, after clicking ``Start`` or ``Server``
8080
or ``Client``) the log file is cleared and a new one is generated.
8181

82-
If the ``Windowed`` checkbox is checked, Open Rails will run in a window
83-
instead of full screen.
84-
8582
If you wish to fine-tune Open Rails for your system, click on the
8683
``Options`` button. See the Chapter: :ref:`Open Rails Options <options>` which describes
8784
the extensive set of OR options. It is recommended that you read this

Source/Menu/MainForm.Designer.cs

Lines changed: 2 additions & 18 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Source/Menu/MainForm.cs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -658,7 +658,6 @@ void buttonStartMP_Click(object sender, EventArgs e)
658658
void LoadOptions()
659659
{
660660
checkBoxWarnings.Checked = Settings.Logging;
661-
checkBoxWindowed.Checked = !Settings.FullScreen;
662661
//Debrief activity evaluation
663662
checkDebriefActivityEval.Checked = Settings.DebriefActivityEval;
664663
//TO DO: Debrief TTactivity evaluation
@@ -673,7 +672,6 @@ void LoadOptions()
673672
void SaveOptions()
674673
{
675674
Settings.Logging = checkBoxWarnings.Checked;
676-
Settings.FullScreen = !checkBoxWindowed.Checked;
677675
Settings.Multiplayer_User = textBoxMPUser.Text;
678676
//Debrief activity evaluation
679677
Settings.DebriefActivityEval = checkDebriefActivityEval.Checked;

0 commit comments

Comments
 (0)