WinGui:

- Updated for x264's new default subme of 6. Remember to update your built-in presets!

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

diff --git a/win/C#/Functions/x264Panel.cs b/win/C#/Functions/x264Panel.cs
index 8a93a21..13a734f 100644 (file)
--- a/win/C#/Functions/x264Panel.cs
+++ b/win/C#/Functions/x264Panel.cs
@@ -796,21 +796,20 @@ namespace Handbrake.Functions
             }\r
             else if (mainWindow.drop_bFrames.SelectedIndex == 2)\r
             {\r
-                 /* Only 1 b-frame? Disable b-pyramid. */\r
+                /* Only 1 b-frame? Disable b-pyramid. */\r
                 mainWindow.check_pyrmidalBFrames.Visible = false;\r
                 mainWindow.check_pyrmidalBFrames.CheckState = CheckState.Unchecked;\r
 \r
                 mainWindow.check_weightedBFrames.Visible = true;\r
                 mainWindow.check_BidirectionalRefinement.Visible = true;\r
 \r
-\r
                 /* Only show B-RDO if both bframes and subme allow it. */\r
-                if (mainWindow.drop_subpixelMotionEstimation.SelectedIndex >= 7)\r
+                if (mainWindow.drop_subpixelMotionEstimation.SelectedIndex >= 7 || mainWindow.drop_subpixelMotionEstimation.SelectedIndex == 0)\r
                     mainWindow.check_bFrameRateDistortion.Visible = true;\r
-                \r
+\r
                 /* Only show direct pred when allowed by both bframes and analysis.*/\r
-                if ( mainWindow.drop_analysis.SelectedIndex != 1)\r
-                {   \r
+                if (mainWindow.drop_analysis.SelectedIndex != 1)\r
+                {\r
                     mainWindow.drop_directPrediction.Visible = true;\r
                     mainWindow.lbl_direct_prediction.Visible = true;\r
                 }\r
@@ -822,12 +821,12 @@ namespace Handbrake.Functions
                 mainWindow.check_BidirectionalRefinement.Visible = true;\r
 \r
                 /* Only show B-RDO if both bframes and subme allow it. */\r
-                if (mainWindow.drop_subpixelMotionEstimation.SelectedIndex >= 7)\r
+                if (mainWindow.drop_subpixelMotionEstimation.SelectedIndex >= 7 || mainWindow.drop_subpixelMotionEstimation.SelectedIndex == 0)\r
                     mainWindow.check_bFrameRateDistortion.Visible = true;\r
-               \r
+\r
                 /* Only show direct pred when allowed by both bframes and analysis.*/\r
-                if ( mainWindow.drop_analysis.SelectedIndex != 1)\r
-                {   \r
+                if (mainWindow.drop_analysis.SelectedIndex != 1)\r
+                {\r
                     mainWindow.drop_directPrediction.Visible = true;\r
                     mainWindow.lbl_direct_prediction.Visible = true;\r
                 }\r
@@ -847,29 +846,27 @@ namespace Handbrake.Functions
                 mainWindow.lbl_trellis.Visible = true;\r
             }\r
 \r
-\r
-            if (mainWindow.drop_subpixelMotionEstimation.SelectedIndex < 7)\r
+            if (mainWindow.drop_subpixelMotionEstimation.SelectedIndex < 7 && mainWindow.drop_subpixelMotionEstimation.SelectedIndex != 0)\r
             {\r
                 /* When subme < 6, B-RDO doesn't work. */\r
                 mainWindow.check_bFrameRateDistortion.Visible = false;\r
                 if (sender == "subq" && sender != "brdo")\r
                     mainWindow.check_bFrameRateDistortion.CheckState = CheckState.Unchecked;\r
             }\r
-            else if (mainWindow.drop_bFrames.SelectedIndex >= 2 )\r
+            else if (mainWindow.drop_bFrames.SelectedIndex >= 2)\r
             {\r
                 /* Make sure to only display B-RDO if allowed by both\r
                    the subme and bframe option settings.               */\r
                 mainWindow.check_bFrameRateDistortion.Visible = true;\r
             }\r
 \r
-\r
             if (mainWindow.drop_analysis.SelectedIndex == 1)\r
             {\r
                 /* No analysis? Disable 8x8dct and direct pred */\r
                 mainWindow.check_8x8DCT.Visible = false;\r
                 if (sender != "8x8dct")\r
                     mainWindow.check_8x8DCT.CheckState = CheckState.Unchecked;\r
-                \r
+\r
                 mainWindow.drop_directPrediction.Visible = false;\r
                 if (sender != "direct")\r
                     mainWindow.drop_directPrediction.SelectedIndex = 0;\r
@@ -878,7 +875,7 @@ namespace Handbrake.Functions
             {\r
                 mainWindow.check_8x8DCT.Visible = true;\r
 \r
-                if ( mainWindow.drop_bFrames.SelectedIndex >= 2)\r
+                if (mainWindow.drop_bFrames.SelectedIndex >= 2)\r
                 {\r
                     /* Onlt show direct pred when allowed by both analysis and bframes */\r
                     mainWindow.drop_directPrediction.Visible = true;\r

diff --git a/win/C#/frmMain.Designer.cs b/win/C#/frmMain.Designer.cs
index 9f2ba53..389e715 100644 (file)
--- a/win/C#/frmMain.Designer.cs
+++ b/win/C#/frmMain.Designer.cs
@@ -38,7 +38,7 @@ namespace Handbrake
             System.Windows.Forms.Label Label38;\r
             System.Windows.Forms.ContextMenuStrip notifyIconMenu;\r
             System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(frmMain));\r
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle4 = new System.Windows.Forms.DataGridViewCellStyle();\r
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle();\r
             this.btn_restore = new System.Windows.Forms.ToolStripMenuItem();\r
             this.DVD_Save = new System.Windows.Forms.SaveFileDialog();\r
             this.File_Save = new System.Windows.Forms.SaveFileDialog();\r
@@ -82,10 +82,10 @@ namespace Handbrake
             this.drp_audbit_4 = new System.Windows.Forms.ComboBox();\r
             this.drp_audenc_4 = new System.Windows.Forms.ComboBox();\r
             this.drp_audmix_4 = new System.Windows.Forms.ComboBox();\r
+            this.drop_format = new System.Windows.Forms.ComboBox();\r
             this.lbl_src_res = new System.Windows.Forms.Label();\r
             this.lbl_duration = new System.Windows.Forms.Label();\r
             this.label_duration = new System.Windows.Forms.Label();\r
-            this.drop_format = new System.Windows.Forms.ComboBox();\r
             this.label7 = new System.Windows.Forms.Label();\r
             this.DVD_Open = new System.Windows.Forms.FolderBrowserDialog();\r
             this.File_Open = new System.Windows.Forms.OpenFileDialog();\r
@@ -307,12 +307,12 @@ namespace Handbrake
             this.btn_restore});\r
             notifyIconMenu.Name = "notifyIconMenu";\r
             notifyIconMenu.RenderMode = System.Windows.Forms.ToolStripRenderMode.Professional;\r
-            notifyIconMenu.Size = new System.Drawing.Size(124, 26);\r
+            notifyIconMenu.Size = new System.Drawing.Size(129, 26);\r
             // \r
             // btn_restore\r
             // \r
             this.btn_restore.Name = "btn_restore";\r
-            this.btn_restore.Size = new System.Drawing.Size(123, 22);\r
+            this.btn_restore.Size = new System.Drawing.Size(128, 22);\r
             this.btn_restore.Text = "Restore";\r
             this.btn_restore.Click += new System.EventHandler(this.btn_restore_Click);\r
             // \r
@@ -646,9 +646,9 @@ namespace Handbrake
             // \r
             // number\r
             // \r
-            dataGridViewCellStyle4.Format = "N0";\r
-            dataGridViewCellStyle4.NullValue = null;\r
-            this.number.DefaultCellStyle = dataGridViewCellStyle4;\r
+            dataGridViewCellStyle1.Format = "N0";\r
+            dataGridViewCellStyle1.NullValue = null;\r
+            this.number.DefaultCellStyle = dataGridViewCellStyle1;\r
             this.number.HeaderText = "Chapter Number";\r
             this.number.MaxInputLength = 3;\r
             this.number.Name = "number";\r
@@ -943,6 +943,24 @@ namespace Handbrake
             this.ToolTip.SetToolTip(this.drp_audmix_4, "Please note: Some options require a 5.1 audio channel to be selected");\r
             this.drp_audmix_4.SelectedIndexChanged += new System.EventHandler(this.drp_audmix_4_SelectedIndexChanged);\r
             // \r
+            // drop_format\r
+            // \r
+            this.drop_format.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;\r
+            this.drop_format.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
+            this.drop_format.FormattingEnabled = true;\r
+            this.drop_format.Items.AddRange(new object[] {\r
+            "MP4 File",\r
+            "M4V File",\r
+            "MKV File",\r
+            "AVI File",\r
+            "OGM File"});\r
+            this.drop_format.Location = new System.Drawing.Point(75, 19);\r
+            this.drop_format.Name = "drop_format";\r
+            this.drop_format.Size = new System.Drawing.Size(106, 21);\r
+            this.drop_format.TabIndex = 28;\r
+            this.ToolTip.SetToolTip(this.drop_format, "Select a video encoder");\r
+            this.drop_format.SelectedIndexChanged += new System.EventHandler(this.drop_format_SelectedIndexChanged);\r
+            // \r
             // lbl_src_res\r
             // \r
             this.lbl_src_res.AutoSize = true;\r
@@ -976,24 +994,6 @@ namespace Handbrake
             this.label_duration.TabIndex = 42;\r
             this.label_duration.Text = "Duration:";\r
             // \r
-            // drop_format\r
-            // \r
-            this.drop_format.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;\r
-            this.drop_format.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
-            this.drop_format.FormattingEnabled = true;\r
-            this.drop_format.Items.AddRange(new object[] {\r
-            "MP4 File",\r
-            "M4V File",\r
-            "MKV File",\r
-            "AVI File",\r
-            "OGM File"});\r
-            this.drop_format.Location = new System.Drawing.Point(75, 19);\r
-            this.drop_format.Name = "drop_format";\r
-            this.drop_format.Size = new System.Drawing.Size(106, 21);\r
-            this.drop_format.TabIndex = 28;\r
-            this.ToolTip.SetToolTip(this.drop_format, "Select a video encoder");\r
-            this.drop_format.SelectedIndexChanged += new System.EventHandler(this.drop_format_SelectedIndexChanged);\r
-            // \r
             // label7\r
             // \r
             this.label7.AutoSize = true;\r
@@ -1387,7 +1387,7 @@ namespace Handbrake
             this.TabPage2.Location = new System.Drawing.Point(4, 22);\r
             this.TabPage2.Name = "TabPage2";\r
             this.TabPage2.Padding = new System.Windows.Forms.Padding(3);\r
-            this.TabPage2.Size = new System.Drawing.Size(697, 307);\r
+            this.TabPage2.Size = new System.Drawing.Size(697, 316);\r
             this.TabPage2.TabIndex = 3;\r
             this.TabPage2.Text = "Audio && Subtitles";\r
             // \r
@@ -1727,7 +1727,7 @@ namespace Handbrake
             this.TabPage3.Location = new System.Drawing.Point(4, 22);\r
             this.TabPage3.Name = "TabPage3";\r
             this.TabPage3.Padding = new System.Windows.Forms.Padding(3);\r
-            this.TabPage3.Size = new System.Drawing.Size(697, 307);\r
+            this.TabPage3.Size = new System.Drawing.Size(697, 316);\r
             this.TabPage3.TabIndex = 2;\r
             this.TabPage3.Text = "Video";\r
             // \r
@@ -2270,7 +2270,7 @@ namespace Handbrake
             this.tab_chapters.Controls.Add(this.Check_ChapterMarkers);\r
             this.tab_chapters.Location = new System.Drawing.Point(4, 22);\r
             this.tab_chapters.Name = "tab_chapters";\r
-            this.tab_chapters.Size = new System.Drawing.Size(697, 307);\r
+            this.tab_chapters.Size = new System.Drawing.Size(697, 316);\r
             this.tab_chapters.TabIndex = 6;\r
             this.tab_chapters.Text = "Chapters";\r
             // \r
@@ -2326,7 +2326,7 @@ namespace Handbrake
             this.h264Tab.Location = new System.Drawing.Point(4, 22);\r
             this.h264Tab.Name = "h264Tab";\r
             this.h264Tab.Padding = new System.Windows.Forms.Padding(3);\r
-            this.h264Tab.Size = new System.Drawing.Size(697, 307);\r
+            this.h264Tab.Size = new System.Drawing.Size(697, 316);\r
             this.h264Tab.TabIndex = 8;\r
             this.h264Tab.Text = "Advanced";\r
             // \r
@@ -2580,7 +2580,7 @@ namespace Handbrake
             this.drop_subpixelMotionEstimation.FlatStyle = System.Windows.Forms.FlatStyle.Popup;\r
             this.drop_subpixelMotionEstimation.FormattingEnabled = true;\r
             this.drop_subpixelMotionEstimation.Items.AddRange(new object[] {\r
-            "Default (4)",\r
+            "Default (6)",\r
             "0",\r
             "1",\r
             "2",\r
@@ -2897,7 +2897,7 @@ namespace Handbrake
             this.tabPage4.Controls.Add(this.rtf_query);\r
             this.tabPage4.Location = new System.Drawing.Point(4, 22);\r
             this.tabPage4.Name = "tabPage4";\r
-            this.tabPage4.Size = new System.Drawing.Size(697, 307);\r
+            this.tabPage4.Size = new System.Drawing.Size(697, 316);\r
             this.tabPage4.TabIndex = 7;\r
             this.tabPage4.Text = "Query Editor";\r
             // \r
@@ -3042,7 +3042,7 @@ namespace Handbrake
             this.btn_source.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;\r
             this.btn_source.ImageTransparentColor = System.Drawing.Color.Magenta;\r
             this.btn_source.Name = "btn_source";\r
-            this.btn_source.Size = new System.Drawing.Size(85, 36);\r
+            this.btn_source.Size = new System.Drawing.Size(90, 36);\r
             this.btn_source.Text = "Source";\r
             this.btn_source.Click += new System.EventHandler(this.btn_source_Click);\r
             // \r
@@ -3050,7 +3050,7 @@ namespace Handbrake
             // \r
             this.btn_file_source.Image = global::Handbrake.Properties.Resources.Movies_Small;\r
             this.btn_file_source.Name = "btn_file_source";\r
-            this.btn_file_source.Size = new System.Drawing.Size(194, 22);\r
+            this.btn_file_source.Size = new System.Drawing.Size(214, 22);\r
             this.btn_file_source.Text = "Video File";\r
             this.btn_file_source.Click += new System.EventHandler(this.btn_file_source_Click);\r
             // \r
@@ -3059,20 +3059,20 @@ namespace Handbrake
             this.btn_dvd_source.Image = ((System.Drawing.Image)(resources.GetObject("btn_dvd_source.Image")));\r
             this.btn_dvd_source.ImageTransparentColor = System.Drawing.Color.Magenta;\r
             this.btn_dvd_source.Name = "btn_dvd_source";\r
-            this.btn_dvd_source.Size = new System.Drawing.Size(194, 22);\r
+            this.btn_dvd_source.Size = new System.Drawing.Size(214, 22);\r
             this.btn_dvd_source.Text = "DVD/ VIDEO_TS Folder";\r
             this.btn_dvd_source.Click += new System.EventHandler(this.btn_dvd_source_Click);\r
             // \r
             // toolStripSeparator1\r
             // \r
             this.toolStripSeparator1.Name = "toolStripSeparator1";\r
-            this.toolStripSeparator1.Size = new System.Drawing.Size(191, 6);\r
+            this.toolStripSeparator1.Size = new System.Drawing.Size(211, 6);\r
             // \r
             // mnu_dvd_drive\r
             // \r
             this.mnu_dvd_drive.Image = global::Handbrake.Properties.Resources.disc_small;\r
             this.mnu_dvd_drive.Name = "mnu_dvd_drive";\r
-            this.mnu_dvd_drive.Size = new System.Drawing.Size(194, 22);\r
+            this.mnu_dvd_drive.Size = new System.Drawing.Size(214, 22);\r
             this.mnu_dvd_drive.Text = "[No DVD Drive Ready]";\r
             this.mnu_dvd_drive.Visible = false;\r
             this.mnu_dvd_drive.Click += new System.EventHandler(this.mnu_dvd_drive_Click);\r
@@ -3088,7 +3088,7 @@ namespace Handbrake
             this.btn_start.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;\r
             this.btn_start.ImageTransparentColor = System.Drawing.Color.Magenta;\r
             this.btn_start.Name = "btn_start";\r
-            this.btn_start.Size = new System.Drawing.Size(67, 36);\r
+            this.btn_start.Size = new System.Drawing.Size(70, 36);\r
             this.btn_start.Text = "Start";\r
             this.btn_start.ToolTipText = "Start the encoding process";\r
             this.btn_start.Click += new System.EventHandler(this.btn_start_Click);\r
@@ -3099,7 +3099,7 @@ namespace Handbrake
             this.btn_add2Queue.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;\r
             this.btn_add2Queue.ImageTransparentColor = System.Drawing.Color.Magenta;\r
             this.btn_add2Queue.Name = "btn_add2Queue";\r
-            this.btn_add2Queue.Size = new System.Drawing.Size(110, 36);\r
+            this.btn_add2Queue.Size = new System.Drawing.Size(122, 36);\r
             this.btn_add2Queue.Text = "Add to Queue";\r
             this.btn_add2Queue.ToolTipText = "Add a new item to the Queue";\r
             this.btn_add2Queue.Click += new System.EventHandler(this.btn_add2Queue_Click);\r
@@ -3110,7 +3110,7 @@ namespace Handbrake
             this.btn_showQueue.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;\r
             this.btn_showQueue.ImageTransparentColor = System.Drawing.Color.Magenta;\r
             this.btn_showQueue.Name = "btn_showQueue";\r
-            this.btn_showQueue.Size = new System.Drawing.Size(104, 36);\r
+            this.btn_showQueue.Size = new System.Drawing.Size(115, 36);\r
             this.btn_showQueue.Tag = "";\r
             this.btn_showQueue.Text = "Show Queue";\r
             this.btn_showQueue.Click += new System.EventHandler(this.btn_showQueue_Click);\r
@@ -3126,7 +3126,7 @@ namespace Handbrake
             this.btn_ActivityWindow.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;\r
             this.btn_ActivityWindow.ImageTransparentColor = System.Drawing.Color.Magenta;\r
             this.btn_ActivityWindow.Name = "btn_ActivityWindow";\r
-            this.btn_ActivityWindow.Size = new System.Drawing.Size(120, 36);\r
+            this.btn_ActivityWindow.Size = new System.Drawing.Size(132, 36);\r
             this.btn_ActivityWindow.Text = "Activity Window";\r
             this.btn_ActivityWindow.ToolTipText = "Displays the activity window which displays the log of the last completed or curr" +\r
                 "ently running encode.";\r
@@ -3142,7 +3142,7 @@ namespace Handbrake
             this.btn_minimize.Image = global::Handbrake.Properties.Resources.hb32;\r
             this.btn_minimize.ImageTransparentColor = System.Drawing.Color.Magenta;\r
             this.btn_minimize.Name = "btn_minimize";\r
-            this.btn_minimize.Size = new System.Drawing.Size(144, 36);\r
+            this.btn_minimize.Size = new System.Drawing.Size(162, 36);\r
             this.btn_minimize.Text = "Minimize To System Tray";\r
             this.btn_minimize.Click += new System.EventHandler(this.btn_minimize_Click);\r
             // \r

diff --git a/win/C#/frmMain.resx b/win/C#/frmMain.resx
index d0c9f18..1b5323e 100644 (file)
--- a/win/C#/frmMain.resx
+++ b/win/C#/frmMain.resx
@@ -155,12 +155,6 @@ Make sure you have selected a "Title" from the "Source" box above otherwise
 the list will not be populated with the correct amount of chapters.\r
 Note: Do not change any of the chapter numbers!</value>\r
   </data>\r
-  <metadata name="number.UserAddedColumn" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">\r
-    <value>True</value>\r
-  </metadata>\r
-  <metadata name="name.UserAddedColumn" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">\r
-    <value>True</value>\r
-  </metadata>\r
   <metadata name="DVD_Open.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">\r
     <value>223, 15</value>\r
   </metadata>\r