WinGui:

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

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

diff --git a/win/C#/Controls/x264Panel.cs b/win/C#/Controls/x264Panel.cs
index a338796..59ed2c6 100644 (file)
--- a/win/C#/Controls/x264Panel.cs
+++ b/win/C#/Controls/x264Panel.cs
@@ -35,7 +35,11 @@ namespace Handbrake.Controls
         /// </summary>\r
         public string X264Query\r
         {\r
-            get { return " -x " + rtf_x264Query.Text; }\r
+            get\r
+            {\r
+                string query = " -x " + rtf_x264Query.Text;\r
+                return query;\r
+            }\r
             set { rtf_x264Query.Text = value; }\r
         }\r
 \r

diff --git a/win/C#/frmMain.Designer.cs b/win/C#/frmMain.Designer.cs
index 106aaa0..6189025 100644 (file)
--- a/win/C#/frmMain.Designer.cs
+++ b/win/C#/frmMain.Designer.cs
@@ -1077,7 +1077,6 @@ namespace Handbrake
             this.x264Panel.Name = "x264Panel";\r
             this.x264Panel.Size = new System.Drawing.Size(720, 306);\r
             this.x264Panel.TabIndex = 0;\r
-            this.x264Panel.X264Query = " -x  -x  -x  -x ";\r
             // \r
             // tab_query\r
             // \r

diff --git a/win/C#/frmOptions.Designer.cs b/win/C#/frmOptions.Designer.cs
index 4e99bae..dac9e9a 100644 (file)
--- a/win/C#/frmOptions.Designer.cs
+++ b/win/C#/frmOptions.Designer.cs
@@ -605,7 +605,7 @@ namespace Handbrake
             this.check_clearOldLogs.AutoSize = true;\r
             this.check_clearOldLogs.Location = new System.Drawing.Point(73, 226);\r
             this.check_clearOldLogs.Name = "check_clearOldLogs";\r
-            this.check_clearOldLogs.Size = new System.Drawing.Size(166, 17);\r
+            this.check_clearOldLogs.Size = new System.Drawing.Size(162, 17);\r
             this.check_clearOldLogs.TabIndex = 90;\r
             this.check_clearOldLogs.Text = "Clear logs older than 30 days";\r
             this.ToolTip.SetToolTip(this.check_clearOldLogs, "Clear logs which are older than 30 days.\r\nThis only applies to HandBrakes Applica" +\r
@@ -631,7 +631,7 @@ namespace Handbrake
             this.check_cli_minimized.AutoSize = true;\r
             this.check_cli_minimized.Location = new System.Drawing.Point(73, 14);\r
             this.check_cli_minimized.Name = "check_cli_minimized";\r
-            this.check_cli_minimized.Size = new System.Drawing.Size(137, 17);\r
+            this.check_cli_minimized.Size = new System.Drawing.Size(135, 17);\r
             this.check_cli_minimized.TabIndex = 76;\r
             this.check_cli_minimized.Text = "Start window minimized";\r
             this.ToolTip.SetToolTip(this.check_cli_minimized, "Starts a CLI window minimized.");\r
@@ -713,7 +713,7 @@ namespace Handbrake
             this.check_logsInSpecifiedLocation.AutoSize = true;\r
             this.check_logsInSpecifiedLocation.Location = new System.Drawing.Point(73, 131);\r
             this.check_logsInSpecifiedLocation.Name = "check_logsInSpecifiedLocation";\r
-            this.check_logsInSpecifiedLocation.Size = new System.Drawing.Size(306, 17);\r
+            this.check_logsInSpecifiedLocation.Size = new System.Drawing.Size(305, 17);\r
             this.check_logsInSpecifiedLocation.TabIndex = 87;\r
             this.check_logsInSpecifiedLocation.Text = "Put a copy of individual encode logs in a specified location:";\r
             this.ToolTip.SetToolTip(this.check_logsInSpecifiedLocation, "Place a copy of the encode log in the same folder as the encoded movie.");\r