arranges Options > System tab for longer texts

Update Mode texts now have more room for length Russian translations

Author: Chris Jakeman

Source/Menu/Options.Designer.cs

@@ -219,7 +219,7 @@ public OptionsForm(UserSettings settings, UpdateManager updateManager, Telemetry
             checkDataLogTrainSpeed.Checked = Settings.DataLogTrainSpeed;
             labelDataLogTSInterval.Enabled = checkDataLogTrainSpeed.Checked;
             numericDataLogTSInterval.Enabled = checkDataLogTrainSpeed.Checked;
-            checkListDataLogTSContents.Enabled = checkDataLogTrainSpeed.Checked;  
+            checkListDataLogTSContents.Enabled = checkDataLogTrainSpeed.Checked;
             numericDataLogTSInterval.Value = Settings.DataLogTSInterval;
             checkListDataLogTSContents.Items.AddRange(new object[] {
                 catalog.GetString("Time"),
@@ -240,48 +240,7 @@ public OptionsForm(UserSettings settings, UpdateManager updateManager, Telemetry
             checkDataLogStationStops.Checked = Settings.DataLogStationStops;
 
             // System tab
-            comboLanguage.Text = Settings.Language;
-
-            var updateChannelNames = new Dictionary<string, string> {
-                { "stable", catalog.GetString("Stable (recommended)") },
-                { "testing", catalog.GetString("Testing") },
-                { "unstable", catalog.GetString("Unstable") },
-                { "", catalog.GetString("None") },
-            };
-            var updateChannelDescriptions = new Dictionary<string, string> {
-                { "stable", catalog.GetString("Infrequent updates to official, hand-picked versions. Recommended for most users.") },
-                { "testing", catalog.GetString("Weekly updates which may contain noticable defects. For project supporters.") },
-                { "unstable", catalog.GetString("Daily updates which may contain serious defects. For developers only.") },
-                { "", catalog.GetString("No updates.") },
-            };
-            var spacing = labelUpdateMode.Margin.Size;
-            var indent = 180;
-            var top = labelUpdateMode.Bottom + spacing.Height;
-            foreach (var channel in UpdateManager.GetChannels())
-            {
-                var radio = new RadioButton()
-                {
-                    Text = updateChannelNames[channel.ToLowerInvariant()],
-                    Margin = labelUpdateMode.Margin,
-                    Left = spacing.Width + 32, // to leave room for HelpIcon
-                    Top = top,
-                    Checked = updateManager.ChannelName.Equals(channel, StringComparison.InvariantCultureIgnoreCase),
-                    AutoSize = true,
-                    Tag = channel,
-                };
-                tabPageSystem.Controls.Add(radio);
-                var label = new Label()
-                {
-                    Text = updateChannelDescriptions[channel.ToLowerInvariant()],
-                    Margin = labelUpdateMode.Margin,
-                    Left = spacing.Width + indent,
-                    Top = top + 2, // Offset to align with radio button text
-                    Width = tabPageSystem.ClientSize.Width - indent - spacing.Width * 2,
-                    AutoSize = true,
-                };
-                tabPageSystem.Controls.Add(label);
-                top += label.Height + spacing.Height - 3; // -3 to close them up a bit
-            }
+            DrawSystemTab(updateManager);
 
             checkWindowed.Checked = !Settings.FullScreen;
             comboWindowSize.Text = Settings.WindowSize;
@@ -323,6 +282,53 @@ public OptionsForm(UserSettings settings, UpdateManager updateManager, Telemetry
             numericActWeatherRandomizationLevel.Value = Settings.ActWeatherRandomizationLevel;
         }
 
+        private void DrawSystemTab(UpdateManager updateManager)
+        {
+            comboLanguage.Text = Settings.Language;
+
+            var updateChannelNames = new Dictionary<string, string> {
+                { "stable", catalog.GetString("Stable (recommended)") },
+                { "testing", catalog.GetString("Testing") },
+                { "unstable", catalog.GetString("Unstable") },
+                { "", catalog.GetString("None") },
+            };
+            var updateChannelDescriptions = new Dictionary<string, string> {
+                { "stable", catalog.GetString("Infrequent updates to official, hand-picked versions. Recommended for most users.") },
+                { "testing", catalog.GetString("Weekly updates which may contain noticable defects. For project supporters.") },
+                { "unstable", catalog.GetString("Daily updates which may contain serious defects. For developers only.") },
+                { "", catalog.GetString("No updates.") },
+            };
+            var spacing = labelUpdateMode.Margin.Size;
+            var indent = 180;
+            var top = labelUpdateMode.Bottom + spacing.Height;
+            // Positioning gives maximum spave for lengthy Russian text.
+            foreach (var channel in UpdateManager.GetChannels())
+            {
+                var radio = new RadioButton()
+                {
+                    Text = updateChannelNames[channel.ToLowerInvariant()],
+                    Margin = labelUpdateMode.Margin,
+                    Left = spacing.Width + 32, // to leave room for HelpIcon
+                    Top = top,
+                    Checked = updateManager.ChannelName.Equals(channel, StringComparison.InvariantCultureIgnoreCase),
+                    AutoSize = true,
+                    Tag = channel,
+                };
+                tabPageSystem.Controls.Add(radio);
+                var label = new Label()
+                {
+                    Text = updateChannelDescriptions[channel.ToLowerInvariant()],
+                    Margin = labelUpdateMode.Margin,
+                    Left = spacing.Width + 30, // to leave room for HelpIcon
+                    Top = top + spacing.Height + 15, // Offset to place below radio button
+                    Width = tabPageSystem.ClientSize.Width - indent - spacing.Width * 2,
+                    AutoSize = true,
+                };
+                tabPageSystem.Controls.Add(label);
+                top += (label.Height + spacing.Height) * 2 - 5; // -3 to close them up a bit
+            }
+        }
+
         static string ParseCategoryFrom(string name)
         {
             var len = name.IndexOf(' ');

Source/Menu/Options.cs

@@ -120,7 +120,4 @@
   <metadata name="toolTip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>17, 17</value>
   </metadata>
-  <metadata name="toolTip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>17, 17</value>
-  </metadata>
 </root>