WinGui:

- Removed VFR option and label.
- Renamed checkboxes as per #1768
- Fixed x264Panel.cs animate bug as per #1765

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

diff --git a/win/C#/Functions/Common.cs b/win/C#/Functions/Common.cs
index eb6f850..708a716 100644 (file)
--- a/win/C#/Functions/Common.cs
+++ b/win/C#/Functions/Common.cs
@@ -133,8 +133,6 @@ namespace Handbrake.Functions
                 mainWindow.lbl_deblockVal.Text = "Off";\r
             }\r
 \r
-\r
-\r
             if (presetQuery.Anamorphic == true)\r
                 mainWindow.drp_anamorphic.SelectedIndex = 1;\r
             else\r
@@ -162,11 +160,7 @@ namespace Handbrake.Functions
                 mainWindow.text_height.Text = "";\r
             }\r
 \r
-            if (presetQuery.VFR == true)\r
-                mainWindow.check_vfr.CheckState = CheckState.Checked;\r
-            else\r
-                mainWindow.check_vfr.CheckState = CheckState.Unchecked;\r
-            #endregion\r
+           #endregion\r
 \r
             // Video Settings Tab\r
             #region video\r
@@ -203,9 +197,6 @@ namespace Handbrake.Functions
                 mainWindow.check_largeFile.CheckState = CheckState.Unchecked;\r
                 mainWindow.check_largeFile.BackColor = Color.Transparent;\r
             }\r
-\r
-\r
-\r
             #endregion\r
 \r
             // Chapter Markers Tab\r
@@ -564,9 +555,6 @@ namespace Handbrake.Functions
 \r
             if (mainWindow.check_detelecine.Checked)\r
                 query += " --detelecine";\r
-\r
-            if (mainWindow.check_vfr.Checked)\r
-                query += " -V ";\r
             #endregion\r
 \r
             // Video Settings Tab\r
@@ -616,10 +604,7 @@ namespace Handbrake.Functions
                 query += " -T ";\r
 \r
             if (mainWindow.drp_videoFramerate.Text != "Same as source")\r
-            {\r
-                if (!mainWindow.check_vfr.Checked)\r
-                    query += " -r " + mainWindow.drp_videoFramerate.Text;\r
-            }\r
+                query += " -r " + mainWindow.drp_videoFramerate.Text;\r
 \r
             switch (mainWindow.drp_deNoise.Text)\r
             {\r

diff --git a/win/C#/Functions/QueryParser.cs b/win/C#/Functions/QueryParser.cs
index 0d64749..f120f56 100644 (file)
--- a/win/C#/Functions/QueryParser.cs
+++ b/win/C#/Functions/QueryParser.cs
@@ -219,18 +219,6 @@ namespace Handbrake.Functions
             }\r
         }\r
 \r
-        private Boolean q_vfr;\r
-        /// <summary>\r
-        /// Returns a boolean to indicate wither DeTelecine is on or off\r
-        /// </summary>\r
-        public Boolean VFR\r
-        {\r
-            get\r
-            {\r
-                return this.q_vfr;\r
-            }\r
-        }\r
-\r
         private int q_deBlock;\r
         /// <summary>\r
         /// Returns a boolean to indicate wither DeBlock is on or off.\r
@@ -820,7 +808,6 @@ namespace Handbrake.Functions
             Match chapterMarkers = Regex.Match(input, @" -m");\r
             Match chapterMarkersFileMode = Regex.Match(input, @"--markers");\r
             Match crop = Regex.Match(input, @"--crop ([0-9]*):([0-9]*):([0-9]*):([0-9]*)");\r
-            Match vfr = Regex.Match(input, @" -V");\r
             Match lanamorphic = Regex.Match(input, @" -P");\r
             Match decomb = Regex.Match(input, @" --decomb");\r
 \r
@@ -1013,7 +1000,6 @@ namespace Handbrake.Functions
                 if (chapterMarkersFileMode.Success == true || chapterMarkers.Success == true)\r
                     thisQuery.q_chapterMarkers = true;\r
                 \r
-                thisQuery.q_vfr = vfr.Success;\r
                 thisQuery.q_looseAnamorphic = lanamorphic.Success;\r
 \r
                 #endregion\r

diff --git a/win/C#/Functions/x264Panel.cs b/win/C#/Functions/x264Panel.cs
index 13a734f..6296258 100644 (file)
--- a/win/C#/Functions/x264Panel.cs
+++ b/win/C#/Functions/x264Panel.cs
@@ -773,7 +773,7 @@ namespace Handbrake.Functions
                - B-frames (when 0 turn of b-frame specific stuff, when < 2 disable b-pyramid)\r
                - CABAC (when 0 turn off trellis)\r
                - subme  (if under 6 turn off brdo)\r
-               - analysis (if none, turn off 8x8dct and direct pred)\r
+               - analysis (if none, turn off 8x8dct)\r
                - refs (under 2, disable mixed-refs)\r
             */\r
             if (mainWindow.drop_bFrames.SelectedIndex < 2)\r
@@ -807,12 +807,9 @@ namespace Handbrake.Functions
                 if (mainWindow.drop_subpixelMotionEstimation.SelectedIndex >= 7 || mainWindow.drop_subpixelMotionEstimation.SelectedIndex == 0)\r
                     mainWindow.check_bFrameRateDistortion.Visible = true;\r
 \r
-                /* Only show direct pred when allowed by both bframes and analysis.*/\r
-                if (mainWindow.drop_analysis.SelectedIndex != 1)\r
-                {\r
-                    mainWindow.drop_directPrediction.Visible = true;\r
-                    mainWindow.lbl_direct_prediction.Visible = true;\r
-                }\r
+                mainWindow.drop_directPrediction.Visible = true;\r
+                mainWindow.lbl_direct_prediction.Visible = true;\r
+                \r
             }\r
             else\r
             {\r
@@ -824,13 +821,8 @@ namespace Handbrake.Functions
                 if (mainWindow.drop_subpixelMotionEstimation.SelectedIndex >= 7 || mainWindow.drop_subpixelMotionEstimation.SelectedIndex == 0)\r
                     mainWindow.check_bFrameRateDistortion.Visible = true;\r
 \r
-                /* Only show direct pred when allowed by both bframes and analysis.*/\r
-                if (mainWindow.drop_analysis.SelectedIndex != 1)\r
-                {\r
-                    mainWindow.drop_directPrediction.Visible = true;\r
-                    mainWindow.lbl_direct_prediction.Visible = true;\r
-                }\r
-\r
+                mainWindow.drop_directPrediction.Visible = true;\r
+                mainWindow.lbl_direct_prediction.Visible = true;\r
             }\r
 \r
             if (mainWindow.check_Cabac.Checked == false)\r
@@ -862,27 +854,14 @@ namespace Handbrake.Functions
 \r
             if (mainWindow.drop_analysis.SelectedIndex == 1)\r
             {\r
-                /* No analysis? Disable 8x8dct and direct pred */\r
+                /* No analysis? Disable 8x8dct */\r
                 mainWindow.check_8x8DCT.Visible = false;\r
                 if (sender != "8x8dct")\r
                     mainWindow.check_8x8DCT.CheckState = CheckState.Unchecked;\r
-\r
-                mainWindow.drop_directPrediction.Visible = false;\r
-                if (sender != "direct")\r
-                    mainWindow.drop_directPrediction.SelectedIndex = 0;\r
             }\r
             else\r
-            {\r
                 mainWindow.check_8x8DCT.Visible = true;\r
 \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
-                }\r
-            }\r
-\r
-\r
             if (mainWindow.drop_refFrames.SelectedIndex < 3)\r
             {\r
                 mainWindow.check_mixedReferences.Visible = false;\r

diff --git a/win/C#/frmMain.Designer.cs b/win/C#/frmMain.Designer.cs
index 9c32cda..75f2ed8 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 dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle();\r
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = 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
@@ -153,7 +153,6 @@ namespace Handbrake
             this.Label32 = new System.Windows.Forms.Label();\r
             this.TabPage3 = new System.Windows.Forms.TabPage();\r
             this.label25 = new System.Windows.Forms.Label();\r
-            this.lbl_vfr = new System.Windows.Forms.Label();\r
             this.check_grayscale = new System.Windows.Forms.CheckBox();\r
             this.Label22 = new System.Windows.Forms.Label();\r
             this.check_2PassEncode = new System.Windows.Forms.CheckBox();\r
@@ -180,7 +179,6 @@ namespace Handbrake
             this.lbl_Aspect = new System.Windows.Forms.Label();\r
             this.Label91 = new System.Windows.Forms.Label();\r
             this.Label55 = new System.Windows.Forms.Label();\r
-            this.check_vfr = new System.Windows.Forms.CheckBox();\r
             this.label24 = new System.Windows.Forms.Label();\r
             this.drp_deNoise = new System.Windows.Forms.ComboBox();\r
             this.label11 = new System.Windows.Forms.Label();\r
@@ -453,9 +451,9 @@ namespace Handbrake
             this.check_largeFile.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
             this.check_largeFile.Location = new System.Drawing.Point(193, 22);\r
             this.check_largeFile.Name = "check_largeFile";\r
-            this.check_largeFile.Size = new System.Drawing.Size(82, 17);\r
+            this.check_largeFile.Size = new System.Drawing.Size(105, 17);\r
             this.check_largeFile.TabIndex = 4;\r
-            this.check_largeFile.Text = "64Bit MP4";\r
+            this.check_largeFile.Text = "Large file size";\r
             this.ToolTip.SetToolTip(this.check_largeFile, "Allows creation of MP4 files greater than 4GB.\r\nWarning: Breaks iPod, Apple TV (V" +\r
                     "ersion 1 only) and PS3 compatibility.\r\nRequires .mp4/.m4v file extension");\r
             this.check_largeFile.UseVisualStyleBackColor = false;\r
@@ -603,11 +601,11 @@ namespace Handbrake
             this.check_optimiseMP4.AutoSize = true;\r
             this.check_optimiseMP4.BackColor = System.Drawing.Color.Transparent;\r
             this.check_optimiseMP4.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
-            this.check_optimiseMP4.Location = new System.Drawing.Point(281, 22);\r
+            this.check_optimiseMP4.Location = new System.Drawing.Point(304, 21);\r
             this.check_optimiseMP4.Name = "check_optimiseMP4";\r
-            this.check_optimiseMP4.Size = new System.Drawing.Size(143, 17);\r
+            this.check_optimiseMP4.Size = new System.Drawing.Size(110, 17);\r
             this.check_optimiseMP4.TabIndex = 25;\r
-            this.check_optimiseMP4.Text = "HTTP Optimized MP4";\r
+            this.check_optimiseMP4.Text = "Web optimized";\r
             this.ToolTip.SetToolTip(this.check_optimiseMP4, "MP4 files can be optimized for progressive downloads over the Web,\r\nbut note that" +\r
                     " QuickTime can only read the files as long as the file extension is .mp4\r\nCan on" +\r
                     "ly be used with H.264 ");\r
@@ -618,11 +616,11 @@ namespace Handbrake
             this.check_iPodAtom.AutoSize = true;\r
             this.check_iPodAtom.BackColor = System.Drawing.Color.Transparent;\r
             this.check_iPodAtom.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
-            this.check_iPodAtom.Location = new System.Drawing.Point(430, 22);\r
+            this.check_iPodAtom.Location = new System.Drawing.Point(420, 20);\r
             this.check_iPodAtom.Name = "check_iPodAtom";\r
-            this.check_iPodAtom.Size = new System.Drawing.Size(122, 17);\r
+            this.check_iPodAtom.Size = new System.Drawing.Size(117, 17);\r
             this.check_iPodAtom.TabIndex = 26;\r
-            this.check_iPodAtom.Text = "Insert iPod Atom";\r
+            this.check_iPodAtom.Text = "iPod 5G support";\r
             this.ToolTip.SetToolTip(this.check_iPodAtom, "Required for 5th and 6th Generation iPods.\r\nEncodes will not sync if this is not " +\r
                     "enabled for H.264 encodes");\r
             this.check_iPodAtom.UseVisualStyleBackColor = false;\r
@@ -644,9 +642,9 @@ namespace Handbrake
             // \r
             // number\r
             // \r
-            dataGridViewCellStyle1.Format = "N0";\r
-            dataGridViewCellStyle1.NullValue = null;\r
-            this.number.DefaultCellStyle = dataGridViewCellStyle1;\r
+            dataGridViewCellStyle2.Format = "N0";\r
+            dataGridViewCellStyle2.NullValue = null;\r
+            this.number.DefaultCellStyle = dataGridViewCellStyle2;\r
             this.number.HeaderText = "Chapter Number";\r
             this.number.MaxInputLength = 3;\r
             this.number.Name = "number";\r
@@ -1689,7 +1687,6 @@ namespace Handbrake
             this.TabPage3.Controls.Add(this.drp_videoEncoder);\r
             this.TabPage3.Controls.Add(this.Label47);\r
             this.TabPage3.Controls.Add(this.label25);\r
-            this.TabPage3.Controls.Add(this.lbl_vfr);\r
             this.TabPage3.Controls.Add(this.check_grayscale);\r
             this.TabPage3.Controls.Add(this.check_turbo);\r
             this.TabPage3.Controls.Add(this.Label22);\r
@@ -1722,18 +1719,6 @@ namespace Handbrake
             this.label25.TabIndex = 0;\r
             this.label25.Text = "Video";\r
             // \r
-            // lbl_vfr\r
-            // \r
-            this.lbl_vfr.AutoSize = true;\r
-            this.lbl_vfr.BackColor = System.Drawing.Color.Transparent;\r
-            this.lbl_vfr.Font = new System.Drawing.Font("Verdana", 6.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
-            this.lbl_vfr.Location = new System.Drawing.Point(123, 97);\r
-            this.lbl_vfr.Name = "lbl_vfr";\r
-            this.lbl_vfr.Size = new System.Drawing.Size(52, 12);\r
-            this.lbl_vfr.TabIndex = 3;\r
-            this.lbl_vfr.Text = "(VFR On)";\r
-            this.lbl_vfr.Visible = false;\r
-            // \r
             // check_grayscale\r
             // \r
             this.check_grayscale.AutoSize = true;\r
@@ -1849,7 +1834,6 @@ namespace Handbrake
             this.TabPage1.Controls.Add(this.text_height);\r
             this.TabPage1.Controls.Add(this.Label55);\r
             this.TabPage1.Controls.Add(this.text_width);\r
-            this.TabPage1.Controls.Add(this.check_vfr);\r
             this.TabPage1.Controls.Add(this.label24);\r
             this.TabPage1.Controls.Add(this.drp_deNoise);\r
             this.TabPage1.Controls.Add(this.label11);\r
@@ -2072,19 +2056,6 @@ namespace Handbrake
             this.Label55.TabIndex = 16;\r
             this.Label55.Text = "Width/Height:";\r
             // \r
-            // check_vfr\r
-            // \r
-            this.check_vfr.AutoSize = true;\r
-            this.check_vfr.BackColor = System.Drawing.Color.Transparent;\r
-            this.check_vfr.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
-            this.check_vfr.Location = new System.Drawing.Point(413, 165);\r
-            this.check_vfr.Name = "check_vfr";\r
-            this.check_vfr.Size = new System.Drawing.Size(48, 17);\r
-            this.check_vfr.TabIndex = 24;\r
-            this.check_vfr.Text = "VFR";\r
-            this.check_vfr.UseVisualStyleBackColor = false;\r
-            this.check_vfr.CheckedChanged += new System.EventHandler(this.check_vfr_CheckedChanged);\r
-            // \r
             // label24\r
             // \r
             this.label24.AutoSize = true;\r
@@ -3164,8 +3135,8 @@ namespace Handbrake
             this.Controls.Add(this.groupBox_dest);\r
             this.Controls.Add(this.groupBox_output);\r
             this.Controls.Add(this.groupBox2);\r
-            this.Controls.Add(this.advancedOptions);\r
             this.Controls.Add(this.toolStrip1);\r
+            this.Controls.Add(this.advancedOptions);\r
             this.Controls.Add(this.frmMainMenu);\r
             this.Controls.Add(this.StatusStrip);\r
             this.DoubleBuffered = true;\r
@@ -3294,9 +3265,7 @@ namespace Handbrake
         private System.Windows.Forms.SaveFileDialog DVD_Save;\r
         private System.Windows.Forms.OpenFileDialog File_Open;\r
         private System.Windows.Forms.ToolStripSeparator toolStripSeparator7;\r
-        internal System.Windows.Forms.CheckBox check_vfr;\r
         internal System.Windows.Forms.CheckBox check_iPodAtom;\r
-        internal System.Windows.Forms.Label lbl_vfr;\r
         internal System.Windows.Forms.Label label26;\r
         internal System.Windows.Forms.Label Label56;\r
         internal System.Windows.Forms.Label lbl_Aspect;\r

diff --git a/win/C#/frmMain.cs b/win/C#/frmMain.cs
index 3e50e0c..df78634 100644 (file)
--- a/win/C#/frmMain.cs
+++ b/win/C#/frmMain.cs
@@ -748,24 +748,6 @@ namespace Handbrake
             text_top.Enabled = false;\r
             text_bottom.Enabled = false;\r
         }\r
-        private void check_vfr_CheckedChanged(object sender, EventArgs e)\r
-        {\r
-            if (check_vfr.CheckState == CheckState.Checked)\r
-            {\r
-                check_detelecine.Enabled = false;\r
-                check_detelecine.CheckState = CheckState.Checked;\r
-                drp_videoFramerate.Enabled = false;\r
-                drp_videoFramerate.SelectedItem = "29.97";\r
-                lbl_vfr.Visible = true;\r
-            }\r
-            else\r
-            {\r
-                check_detelecine.Enabled = true;\r
-                drp_videoFramerate.Enabled = true;\r
-                drp_videoFramerate.SelectedItem = "Automatic";\r
-                lbl_vfr.Visible = false;\r
-            }\r
-        }\r
         private void drp_anamorphic_SelectedIndexChanged(object sender, EventArgs e)\r
         {\r
             if (drp_anamorphic.SelectedIndex == 1)\r
@@ -1904,6 +1886,7 @@ namespace Handbrake
         }\r
         #endregion\r
 \r
+ \r
         // This is the END of the road ------------------------------------------------------------------------------\r
     }\r
 }
\ No newline at end of file

diff --git a/win/C#/frmMain.resx b/win/C#/frmMain.resx
index a016a18..5bc2f65 100644 (file)
--- a/win/C#/frmMain.resx
+++ b/win/C#/frmMain.resx
@@ -155,6 +155,12 @@ 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