From ef3b236d73cebc45b1970d106abc622ae606024f Mon Sep 17 00:00:00 2001
From: Dimitrij <kvarkas@gmail.com>
Date: Mon, 6 Oct 2025 17:27:25 +0100
Subject: [PATCH] fix element placement for #2842

---
 .../OptionsPages/AdvancedPage.Designer.cs     | 28 ++++-----
 .../UI/Forms/OptionsPages/AdvancedPage.resx   | 62 ++++++++++++++++++-
 2 files changed, 75 insertions(+), 15 deletions(-)

diff --git a/mRemoteNG/UI/Forms/OptionsPages/AdvancedPage.Designer.cs b/mRemoteNG/UI/Forms/OptionsPages/AdvancedPage.Designer.cs
index 1980f235b..b0fdbb7ef 100644
--- a/mRemoteNG/UI/Forms/OptionsPages/AdvancedPage.Designer.cs
+++ b/mRemoteNG/UI/Forms/OptionsPages/AdvancedPage.Designer.cs
@@ -62,7 +62,7 @@ namespace mRemoteNG.UI.Forms.OptionsPages
             // 
             chkAutomaticReconnect._mice = MrngCheckBox.MouseState.OUT;
             chkAutomaticReconnect.AutoSize = true;
-            chkAutomaticReconnect.Font = new System.Drawing.Font("Segoe UI", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point);
+            chkAutomaticReconnect.Font = new System.Drawing.Font("Segoe UI", 8.25F);
             chkAutomaticReconnect.Location = new System.Drawing.Point(9, 8);
             chkAutomaticReconnect.Name = "chkAutomaticReconnect";
             chkAutomaticReconnect.Size = new System.Drawing.Size(421, 17);
@@ -74,11 +74,11 @@ namespace mRemoteNG.UI.Forms.OptionsPages
             // numPuttyWaitTime
             // 
             numPuttyWaitTime.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
-            numPuttyWaitTime.Location = new System.Drawing.Point(840, 321);
-            numPuttyWaitTime.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6);
+            numPuttyWaitTime.Location = new System.Drawing.Point(379, 175);
+            numPuttyWaitTime.Margin = new System.Windows.Forms.Padding(6);
             numPuttyWaitTime.Maximum = new decimal(new int[] { 999, 0, 0, 0 });
             numPuttyWaitTime.Name = "numPuttyWaitTime";
-            numPuttyWaitTime.Size = new System.Drawing.Size(135, 22);
+            numPuttyWaitTime.Size = new System.Drawing.Size(64, 22);
             numPuttyWaitTime.TabIndex = 7;
             numPuttyWaitTime.Value = new decimal(new int[] { 5, 0, 0, 0 });
             // 
@@ -86,10 +86,10 @@ namespace mRemoteNG.UI.Forms.OptionsPages
             // 
             chkUseCustomPuttyPath._mice = MrngCheckBox.MouseState.OUT;
             chkUseCustomPuttyPath.AutoSize = true;
-            chkUseCustomPuttyPath.Font = new System.Drawing.Font("Segoe UI", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point);
+            chkUseCustomPuttyPath.Font = new System.Drawing.Font("Segoe UI", 8.25F);
             chkUseCustomPuttyPath.Location = new System.Drawing.Point(9, 78);
             chkUseCustomPuttyPath.Name = "chkUseCustomPuttyPath";
-            chkUseCustomPuttyPath.Size = new System.Drawing.Size(148, 17);
+            chkUseCustomPuttyPath.Size = new System.Drawing.Size(146, 17);
             chkUseCustomPuttyPath.TabIndex = 3;
             chkUseCustomPuttyPath.Text = "Use custom PuTTY path:";
             chkUseCustomPuttyPath.UseVisualStyleBackColor = true;
@@ -107,11 +107,11 @@ namespace mRemoteNG.UI.Forms.OptionsPages
             // numUVNCSCPort
             // 
             numUVNCSCPort.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
-            numUVNCSCPort.Location = new System.Drawing.Point(840, 384);
-            numUVNCSCPort.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6);
+            numUVNCSCPort.Location = new System.Drawing.Point(379, 202);
+            numUVNCSCPort.Margin = new System.Windows.Forms.Padding(6);
             numUVNCSCPort.Maximum = new decimal(new int[] { 65535, 0, 0, 0 });
             numUVNCSCPort.Name = "numUVNCSCPort";
-            numUVNCSCPort.Size = new System.Drawing.Size(135, 22);
+            numUVNCSCPort.Size = new System.Drawing.Size(64, 22);
             numUVNCSCPort.TabIndex = 8;
             numUVNCSCPort.Value = new decimal(new int[] { 5500, 0, 0, 0 });
             numUVNCSCPort.Visible = false;
@@ -120,7 +120,7 @@ namespace mRemoteNG.UI.Forms.OptionsPages
             // 
             txtCustomPuttyPath.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
             txtCustomPuttyPath.Enabled = false;
-            txtCustomPuttyPath.Font = new System.Drawing.Font("Segoe UI", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point);
+            txtCustomPuttyPath.Font = new System.Drawing.Font("Segoe UI", 8.25F);
             txtCustomPuttyPath.Location = new System.Drawing.Point(27, 100);
             txtCustomPuttyPath.Name = "txtCustomPuttyPath";
             txtCustomPuttyPath.Size = new System.Drawing.Size(346, 22);
@@ -176,7 +176,7 @@ namespace mRemoteNG.UI.Forms.OptionsPages
             // 
             chkLoadBalanceInfoUseUtf8._mice = MrngCheckBox.MouseState.OUT;
             chkLoadBalanceInfoUseUtf8.AutoSize = true;
-            chkLoadBalanceInfoUseUtf8.Font = new System.Drawing.Font("Segoe UI", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point);
+            chkLoadBalanceInfoUseUtf8.Font = new System.Drawing.Font("Segoe UI", 8.25F);
             chkLoadBalanceInfoUseUtf8.Location = new System.Drawing.Point(9, 54);
             chkLoadBalanceInfoUseUtf8.Name = "chkLoadBalanceInfoUseUtf8";
             chkLoadBalanceInfoUseUtf8.Size = new System.Drawing.Size(317, 17);
@@ -188,7 +188,7 @@ namespace mRemoteNG.UI.Forms.OptionsPages
             // 
             chkNoReconnect._mice = MrngCheckBox.MouseState.OUT;
             chkNoReconnect.AutoSize = true;
-            chkNoReconnect.Font = new System.Drawing.Font("Segoe UI", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point);
+            chkNoReconnect.Font = new System.Drawing.Font("Segoe UI", 8.25F);
             chkNoReconnect.Location = new System.Drawing.Point(27, 31);
             chkNoReconnect.Name = "chkNoReconnect";
             chkNoReconnect.Size = new System.Drawing.Size(430, 17);
@@ -214,9 +214,9 @@ namespace mRemoteNG.UI.Forms.OptionsPages
             Controls.Add(lblUVNCSCPort);
             Controls.Add(lblSeconds);
             Controls.Add(btnBrowseCustomPuttyPath);
-            Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            Margin = new System.Windows.Forms.Padding(4);
             Name = "AdvancedPage";
-            Size = new System.Drawing.Size(610, 490);
+            Size = new System.Drawing.Size(589, 440);
             ((System.ComponentModel.ISupportInitialize)numPuttyWaitTime).EndInit();
             ((System.ComponentModel.ISupportInitialize)numUVNCSCPort).EndInit();
             ResumeLayout(false);
diff --git a/mRemoteNG/UI/Forms/OptionsPages/AdvancedPage.resx b/mRemoteNG/UI/Forms/OptionsPages/AdvancedPage.resx
index f298a7be8..8b2ff64a1 100644
--- a/mRemoteNG/UI/Forms/OptionsPages/AdvancedPage.resx
+++ b/mRemoteNG/UI/Forms/OptionsPages/AdvancedPage.resx
@@ -1,4 +1,64 @@
-<root>
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!--
+    Microsoft ResX Schema
+
+    Version 2.0
+
+    The primary goals of this format is to allow a simple XML format
+    that is mostly human readable. The generation and parsing of the
+    various data types are done through the TypeConverter classes
+    associated with the data types.
+
+    Example:
+
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+
+    There are any number of "resheader" rows that contain simple
+    name/value pairs.
+
+    Each data row contains a name, and value. The row also contains a
+    type or mimetype. Type corresponds to a .NET class that support
+    text/value conversion through the TypeConverter architecture.
+    Classes that don't support this are serialized and stored with the
+    mimetype set.
+
+    The mimetype is used for serialized objects, and tells the
+    ResXResourceReader how to depersist the object. This is currently not
+    extensible. For a given mimetype the value must be set accordingly:
+
+    Note - application/x-microsoft.net.object.binary.base64 is the format
+    that the ResXResourceWriter will generate, however the reader can
+    read any of the formats listed below.
+
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
   <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
     <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
     <xsd:element name="root" msdata:IsDataSet="true">