WinGui:

- Attempt to stop the autogen code from adding extra -x to the x264 query.

git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@3149 b64f7644-9d1e-0410-96f1-a4d463321fa5

3 files changed, 8 insertions, 5 deletions

diff --git a/win/C#/Controls/x264Panel.cs b/win/C#/Controls/x264Panel.cs
index a33879632..59ed2c6ab 100644
--- a/win/C#/Controls/x264Panel.cs
+++ b/win/C#/Controls/x264Panel.cs
@@ -35,7 +35,11 @@ namespace Handbrake.Controls
         /// </summary>

         public string X264Query

         {

-            get { return " -x " + rtf_x264Query.Text; }

+            get

+            {

+                string query = " -x " + rtf_x264Query.Text;

+                return query;

+            }

             set { rtf_x264Query.Text = value; }

         }

 

diff --git a/win/C#/frmMain.Designer.cs b/win/C#/frmMain.Designer.cs
index 106aaa039..618902549 100644
--- a/win/C#/frmMain.Designer.cs
+++ b/win/C#/frmMain.Designer.cs
@@ -1077,7 +1077,6 @@ namespace Handbrake
             this.x264Panel.Name = "x264Panel";

             this.x264Panel.Size = new System.Drawing.Size(720, 306);

             this.x264Panel.TabIndex = 0;

-            this.x264Panel.X264Query = " -x  -x  -x  -x ";

             // 

             // tab_query

             // 

diff --git a/win/C#/frmOptions.Designer.cs b/win/C#/frmOptions.Designer.cs
index 4e99bae61..dac9e9a19 100644
--- a/win/C#/frmOptions.Designer.cs
+++ b/win/C#/frmOptions.Designer.cs
@@ -605,7 +605,7 @@ namespace Handbrake
             this.check_clearOldLogs.AutoSize = true;

             this.check_clearOldLogs.Location = new System.Drawing.Point(73, 226);

             this.check_clearOldLogs.Name = "check_clearOldLogs";

-            this.check_clearOldLogs.Size = new System.Drawing.Size(166, 17);

+            this.check_clearOldLogs.Size = new System.Drawing.Size(162, 17);

             this.check_clearOldLogs.TabIndex = 90;

             this.check_clearOldLogs.Text = "Clear logs older than 30 days";

             this.ToolTip.SetToolTip(this.check_clearOldLogs, "Clear logs which are older than 30 days.\r\nThis only applies to HandBrakes Applica" +

@@ -631,7 +631,7 @@ namespace Handbrake
             this.check_cli_minimized.AutoSize = true;

             this.check_cli_minimized.Location = new System.Drawing.Point(73, 14);

             this.check_cli_minimized.Name = "check_cli_minimized";

-            this.check_cli_minimized.Size = new System.Drawing.Size(137, 17);

+            this.check_cli_minimized.Size = new System.Drawing.Size(135, 17);

             this.check_cli_minimized.TabIndex = 76;

             this.check_cli_minimized.Text = "Start window minimized";

             this.ToolTip.SetToolTip(this.check_cli_minimized, "Starts a CLI window minimized.");

@@ -713,7 +713,7 @@ namespace Handbrake
             this.check_logsInSpecifiedLocation.AutoSize = true;

             this.check_logsInSpecifiedLocation.Location = new System.Drawing.Point(73, 131);

             this.check_logsInSpecifiedLocation.Name = "check_logsInSpecifiedLocation";

-            this.check_logsInSpecifiedLocation.Size = new System.Drawing.Size(306, 17);

+            this.check_logsInSpecifiedLocation.Size = new System.Drawing.Size(305, 17);

             this.check_logsInSpecifiedLocation.TabIndex = 87;

             this.check_logsInSpecifiedLocation.Text = "Put a copy of individual encode logs in a specified location:";

             this.ToolTip.SetToolTip(this.check_logsInSpecifiedLocation, "Place a copy of the encode log in the same folder as the encoded movie.");