Content tab from Options moved to Manually Installed tab from Content form, documentation changed occordingly

Author: sweiland-openrails

Source/Documentation/Manual/images/content-form-auto-installed.PNG

@@ -16,14 +16,14 @@ installation profile.
 
 .. image:: images/start-activity.png
 
-If not, then the next ``Download Content`` form is shown where you can download content. This form is described in the next `Content` chapter.
+If not, then the next ``Content`` form is shown where you can download content. This form is described in the next `Content` chapter.
 
 Content
 =======
 
-Clicking on the ``Content`` button makes the ``Download Content`` form popup (if not already there for a new empty Open Rails installation):
+Clicking on the ``Content`` button makes the ``Content`` form popup with the tab ``Auto Installed`` open:
 
-.. image:: images/download-content-form.png
+.. image:: images/content-form-auto-installed.png
 
 Select the route to be installed. This list will be enlarged by the OR team when suitable routes become available.
 However it is still possible to install routes manually as described in the next chapter.
@@ -49,8 +49,36 @@ name of one of the MSTS routes in your MSTS installation.
 
 You can easily add, remove or move other content profiles and select 
 among them (e.g. if you have any so-called ``mini-routes`` installed.). 
-Click on the ``Options`` button and select the ``Content`` tab. See the 
-:ref:`Content Options <options-Content>` discussed below for more instructions.
+
+For this select the ``Manually Installed`` tab on the ``Content`` form:
+
+.. image:: images/content-form-manually-installed.png
+
+This window allows you to add, remove or modify access to content.
+Each profile may be a folder containing one or more routes, or an MSTS
+installation. 
+Profiles located on other drives, or on a USB key, can be added even if they are
+not always available.
+
+Click on the *Add* button, and locate the desired installation. ORTS will
+automatically enter a proposed name in the *Route:* window that will
+appear in the *Installation set:* window on the main menu form. Modify
+the name if desired, then click *OK* to add the new path and name to
+Open Rails.
+
+Please do not store content or any files within the folder containing the Open Rails software.
+This is because the Updater operates by wiping out the contents of that folder before replacing it
+with a new updated version. 
+It would be unfriendly for users to lose content that they have stored there, so
+attempts to add a profile folder stored there are blocked and lead to an error message. 
+
+To remove an entry (note that this does not remove the installation
+itself!) select the entry in the window, and click *Delete*, then *OK*
+to close the window. 
+
+To modify an entry, select the route to be changed. Make the necessary changes in the ``Route`` and/or ``Path`` fields.
+The *Browse...* button can be used to chnage the Path by browsing. Click *OK*
+to close the window and save the changes to OR. 
 
 .. _updating-or:
 

Source/Documentation/Manual/images/content-form-manually-installed.PNG

@@ -39,6 +39,7 @@ public partial class ContentForm : Form
     {
         private readonly GettextResourceManager Catalog;
         private readonly UserSettings Settings;
+        private readonly string BaseDocumentationUrl;
 
         private readonly IDictionary<string, ContentRouteSettings.Route> AutoInstallRoutes;
 
@@ -60,7 +61,7 @@ public partial class ContentForm : Form
         private bool In_dataGridViewManualInstall_SelectionChanged = false;
         private bool In_buttonManualInstallAdd_Click = false;
 
-        public ContentForm(UserSettings settings)
+        public ContentForm(UserSettings settings, string baseDocumentationUrl)
         {
             InitializeComponent();
 
@@ -76,6 +77,7 @@ public ContentForm(UserSettings settings)
             Localizer.Localize(this, Catalog);
 
             Settings = settings;
+            BaseDocumentationUrl = baseDocumentationUrl;
 
             //
             // "Auto Installed" tab
@@ -143,6 +145,25 @@ private void tabControlContent_Selecting(object sender, TabControlCancelEventArg
             }
         }
 
+        private void pbContent_Click(object sender, EventArgs e)
+        {
+            string fileName = "";
+            if (tabControlContent.SelectedTab == tabControlContent.TabPages["tabPageAutoInstall"])
+            {
+                fileName = BaseDocumentationUrl + "/start.html#content";
+            }
+            if (tabControlContent.SelectedTab == tabControlContent.TabPages["tabPageManuallyInstall"])
+            {
+                fileName = BaseDocumentationUrl + "/start.html#installation-profiles";
+            }
+
+            Process.Start(new ProcessStartInfo
+            {
+                FileName = fileName,
+                UseShellExecute = true
+            });
+        }
+
         #region Auto Installed
         //
         // "Auto Installed" tab

Source/Documentation/Manual/images/download-content-form.png

@@ -117,16 +117,4 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
-  <metadata name="dgvTextBoxColumnManualInstallRoute.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="dgvTextBoxColumnManualInstallPath.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="dgvTextBoxColumnManualInstallRoute.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="dgvTextBoxColumnManualInstallPath.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
 </root>

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

@@ -109,6 +109,8 @@ internal string RunActivityProgram
 
         GettextResourceManager catalog = new GettextResourceManager("Menu");
 
+        public string BaseDocumentationUrl;
+
         #region Main Form
         public MainForm()
         {
@@ -129,6 +131,16 @@ public MainForm()
             UpdateEnabled();
             UpdateManager = new UpdateManager(System.IO.Path.GetDirectoryName(Application.ExecutablePath), Application.ProductName, VersionInfo.VersionOrBuild);
             ElevationIcon = new Icon(SystemIcons.Shield, SystemInformation.SmallIconSize).ToBitmap();
+
+            BaseDocumentationUrl = "https://open-rails.readthedocs.io/en/latest";
+            if (VersionInfo.Version.Length > 0)
+            {
+                if (VersionInfo.Version.StartsWith("T") || VersionInfo.Version.StartsWith("U"))
+                {
+                    BaseDocumentationUrl = "https://open-rails.readthedocs.io/en/unstable";
+                }
+            }
+ 
         }
 
         void MainForm_Shown(object sender, EventArgs e)
@@ -561,7 +573,7 @@ void buttonOptions_Click(object sender, EventArgs e)
         {
             SaveOptions();
 
-            using (var form = new OptionsForm(Settings, UpdateManager))
+            using (var form = new OptionsForm(Settings, UpdateManager, BaseDocumentationUrl))
             {
                 switch (form.ShowDialog(this))
                 {
@@ -578,7 +590,7 @@ void buttonOptions_Click(object sender, EventArgs e)
 
         void buttonDownloadContent_Click(object sender, EventArgs e)
         {
-            using (var form = new ContentForm(Settings))
+            using (var form = new ContentForm(Settings, BaseDocumentationUrl))
             {
                 form.ShowDialog(this);
             }
@@ -757,7 +769,7 @@ public void LoadFolderList()
 
                 if (!initialized && Folders.Count == 0)
                 {
-                    using (var form = new ContentForm(Settings))
+                    using (var form = new ContentForm(Settings, BaseDocumentationUrl))
                     {
                         switch (form.ShowDialog(this))
                         {