WinGui:

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

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

6 files changed, 29 insertions, 121 deletions

diff --git a/win/C#/Functions/Common.cs b/win/C#/Functions/Common.cs
index eb6f8500d..708a7167e 100644
--- a/win/C#/Functions/Common.cs
+++ b/win/C#/Functions/Common.cs
@@ -133,8 +133,6 @@ namespace Handbrake.Functions
                 mainWindow.lbl_deblockVal.Text = "Off";

             }

 

-

-

             if (presetQuery.Anamorphic == true)

                 mainWindow.drp_anamorphic.SelectedIndex = 1;

             else

@@ -162,11 +160,7 @@ namespace Handbrake.Functions
                 mainWindow.text_height.Text = "";

             }

 

-            if (presetQuery.VFR == true)

-                mainWindow.check_vfr.CheckState = CheckState.Checked;

-            else

-                mainWindow.check_vfr.CheckState = CheckState.Unchecked;

-            #endregion

+           #endregion

 

             // Video Settings Tab

             #region video

@@ -203,9 +197,6 @@ namespace Handbrake.Functions
                 mainWindow.check_largeFile.CheckState = CheckState.Unchecked;

                 mainWindow.check_largeFile.BackColor = Color.Transparent;

             }

-

-

-

             #endregion

 

             // Chapter Markers Tab

@@ -564,9 +555,6 @@ namespace Handbrake.Functions
 

             if (mainWindow.check_detelecine.Checked)

                 query += " --detelecine";

-

-            if (mainWindow.check_vfr.Checked)

-                query += " -V ";

             #endregion

 

             // Video Settings Tab

@@ -616,10 +604,7 @@ namespace Handbrake.Functions
                 query += " -T ";

 

             if (mainWindow.drp_videoFramerate.Text != "Same as source")

-            {

-                if (!mainWindow.check_vfr.Checked)

-                    query += " -r " + mainWindow.drp_videoFramerate.Text;

-            }

+                query += " -r " + mainWindow.drp_videoFramerate.Text;

 

             switch (mainWindow.drp_deNoise.Text)

             {

diff --git a/win/C#/Functions/QueryParser.cs b/win/C#/Functions/QueryParser.cs
index 0d64749be..f120f5671 100644
--- a/win/C#/Functions/QueryParser.cs
+++ b/win/C#/Functions/QueryParser.cs
@@ -219,18 +219,6 @@ namespace Handbrake.Functions
             }

         }

 

-        private Boolean q_vfr;

-        /// <summary>

-        /// Returns a boolean to indicate wither DeTelecine is on or off

-        /// </summary>

-        public Boolean VFR

-        {

-            get

-            {

-                return this.q_vfr;

-            }

-        }

-

         private int q_deBlock;

         /// <summary>

         /// Returns a boolean to indicate wither DeBlock is on or off.

@@ -820,7 +808,6 @@ namespace Handbrake.Functions
             Match chapterMarkers = Regex.Match(input, @" -m");

             Match chapterMarkersFileMode = Regex.Match(input, @"--markers");

             Match crop = Regex.Match(input, @"--crop ([0-9]*):([0-9]*):([0-9]*):([0-9]*)");

-            Match vfr = Regex.Match(input, @" -V");

             Match lanamorphic = Regex.Match(input, @" -P");

             Match decomb = Regex.Match(input, @" --decomb");

 

@@ -1013,7 +1000,6 @@ namespace Handbrake.Functions
                 if (chapterMarkersFileMode.Success == true || chapterMarkers.Success == true)

                     thisQuery.q_chapterMarkers = true;

                 

-                thisQuery.q_vfr = vfr.Success;

                 thisQuery.q_looseAnamorphic = lanamorphic.Success;

 

                 #endregion

diff --git a/win/C#/Functions/x264Panel.cs b/win/C#/Functions/x264Panel.cs
index 13a734f6f..629625856 100644
--- 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)

                - CABAC (when 0 turn off trellis)

                - subme  (if under 6 turn off brdo)

-               - analysis (if none, turn off 8x8dct and direct pred)

+               - analysis (if none, turn off 8x8dct)

                - refs (under 2, disable mixed-refs)

             */

             if (mainWindow.drop_bFrames.SelectedIndex < 2)

@@ -807,12 +807,9 @@ namespace Handbrake.Functions
                 if (mainWindow.drop_subpixelMotionEstimation.SelectedIndex >= 7 || mainWindow.drop_subpixelMotionEstimation.SelectedIndex == 0)

                     mainWindow.check_bFrameRateDistortion.Visible = true;

 

-                /* Only show direct pred when allowed by both bframes and analysis.*/

-                if (mainWindow.drop_analysis.SelectedIndex != 1)

-                {

-                    mainWindow.drop_directPrediction.Visible = true;

-                    mainWindow.lbl_direct_prediction.Visible = true;

-                }

+                mainWindow.drop_directPrediction.Visible = true;

+                mainWindow.lbl_direct_prediction.Visible = true;

+                

             }

             else

             {

@@ -824,13 +821,8 @@ namespace Handbrake.Functions
                 if (mainWindow.drop_subpixelMotionEstimation.SelectedIndex >= 7 || mainWindow.drop_subpixelMotionEstimation.SelectedIndex == 0)

                     mainWindow.check_bFrameRateDistortion.Visible = true;

 

-                /* Only show direct pred when allowed by both bframes and analysis.*/

-                if (mainWindow.drop_analysis.SelectedIndex != 1)

-                {

-                    mainWindow.drop_directPrediction.Visible = true;

-                    mainWindow.lbl_direct_prediction.Visible = true;

-                }

-

+                mainWindow.drop_directPrediction.Visible = true;

+                mainWindow.lbl_direct_prediction.Visible = true;

             }

 

             if (mainWindow.check_Cabac.Checked == false)

@@ -862,27 +854,14 @@ namespace Handbrake.Functions
 

             if (mainWindow.drop_analysis.SelectedIndex == 1)

             {

-                /* No analysis? Disable 8x8dct and direct pred */

+                /* No analysis? Disable 8x8dct */

                 mainWindow.check_8x8DCT.Visible = false;

                 if (sender != "8x8dct")

                     mainWindow.check_8x8DCT.CheckState = CheckState.Unchecked;

-

-                mainWindow.drop_directPrediction.Visible = false;

-                if (sender != "direct")

-                    mainWindow.drop_directPrediction.SelectedIndex = 0;

             }

             else

-            {

                 mainWindow.check_8x8DCT.Visible = true;

 

-                if (mainWindow.drop_bFrames.SelectedIndex >= 2)

-                {

-                    /* Onlt show direct pred when allowed by both analysis and bframes */

-                    mainWindow.drop_directPrediction.Visible = true;

-                }

-            }

-

-

             if (mainWindow.drop_refFrames.SelectedIndex < 3)

             {

                 mainWindow.check_mixedReferences.Visible = false;

diff --git a/win/C#/frmMain.Designer.cs b/win/C#/frmMain.Designer.cs
index 9c32cda67..75f2ed8b2 100644
--- a/win/C#/frmMain.Designer.cs
+++ b/win/C#/frmMain.Designer.cs
@@ -38,7 +38,7 @@ namespace Handbrake
             System.Windows.Forms.Label Label38;

             System.Windows.Forms.ContextMenuStrip notifyIconMenu;

             System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(frmMain));

-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle();

+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle();

             this.btn_restore = new System.Windows.Forms.ToolStripMenuItem();

             this.DVD_Save = new System.Windows.Forms.SaveFileDialog();

             this.File_Save = new System.Windows.Forms.SaveFileDialog();

@@ -153,7 +153,6 @@ namespace Handbrake
             this.Label32 = new System.Windows.Forms.Label();

             this.TabPage3 = new System.Windows.Forms.TabPage();

             this.label25 = new System.Windows.Forms.Label();

-            this.lbl_vfr = new System.Windows.Forms.Label();

             this.check_grayscale = new System.Windows.Forms.CheckBox();

             this.Label22 = new System.Windows.Forms.Label();

             this.check_2PassEncode = new System.Windows.Forms.CheckBox();

@@ -180,7 +179,6 @@ namespace Handbrake
             this.lbl_Aspect = new System.Windows.Forms.Label();

             this.Label91 = new System.Windows.Forms.Label();

             this.Label55 = new System.Windows.Forms.Label();

-            this.check_vfr = new System.Windows.Forms.CheckBox();

             this.label24 = new System.Windows.Forms.Label();

             this.drp_deNoise = new System.Windows.Forms.ComboBox();

             this.label11 = new System.Windows.Forms.Label();

@@ -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)));

             this.check_largeFile.Location = new System.Drawing.Point(193, 22);

             this.check_largeFile.Name = "check_largeFile";

-            this.check_largeFile.Size = new System.Drawing.Size(82, 17);

+            this.check_largeFile.Size = new System.Drawing.Size(105, 17);

             this.check_largeFile.TabIndex = 4;

-            this.check_largeFile.Text = "64Bit MP4";

+            this.check_largeFile.Text = "Large file size";

             this.ToolTip.SetToolTip(this.check_largeFile, "Allows creation of MP4 files greater than 4GB.\r\nWarning: Breaks iPod, Apple TV (V" +

                     "ersion 1 only) and PS3 compatibility.\r\nRequires .mp4/.m4v file extension");

             this.check_largeFile.UseVisualStyleBackColor = false;

@@ -603,11 +601,11 @@ namespace Handbrake
             this.check_optimiseMP4.AutoSize = true;

             this.check_optimiseMP4.BackColor = System.Drawing.Color.Transparent;

             this.check_optimiseMP4.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));

-            this.check_optimiseMP4.Location = new System.Drawing.Point(281, 22);

+            this.check_optimiseMP4.Location = new System.Drawing.Point(304, 21);

             this.check_optimiseMP4.Name = "check_optimiseMP4";

-            this.check_optimiseMP4.Size = new System.Drawing.Size(143, 17);

+            this.check_optimiseMP4.Size = new System.Drawing.Size(110, 17);

             this.check_optimiseMP4.TabIndex = 25;

-            this.check_optimiseMP4.Text = "HTTP Optimized MP4";

+            this.check_optimiseMP4.Text = "Web optimized";

             this.ToolTip.SetToolTip(this.check_optimiseMP4, "MP4 files can be optimized for progressive downloads over the Web,\r\nbut note that" +

                     " QuickTime can only read the files as long as the file extension is .mp4\r\nCan on" +

                     "ly be used with H.264 ");

@@ -618,11 +616,11 @@ namespace Handbrake
             this.check_iPodAtom.AutoSize = true;

             this.check_iPodAtom.BackColor = System.Drawing.Color.Transparent;

             this.check_iPodAtom.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));

-            this.check_iPodAtom.Location = new System.Drawing.Point(430, 22);

+            this.check_iPodAtom.Location = new System.Drawing.Point(420, 20);

             this.check_iPodAtom.Name = "check_iPodAtom";

-            this.check_iPodAtom.Size = new System.Drawing.Size(122, 17);

+            this.check_iPodAtom.Size = new System.Drawing.Size(117, 17);

             this.check_iPodAtom.TabIndex = 26;

-            this.check_iPodAtom.Text = "Insert iPod Atom";

+            this.check_iPodAtom.Text = "iPod 5G support";

             this.ToolTip.SetToolTip(this.check_iPodAtom, "Required for 5th and 6th Generation iPods.\r\nEncodes will not sync if this is not " +

                     "enabled for H.264 encodes");

             this.check_iPodAtom.UseVisualStyleBackColor = false;

@@ -644,9 +642,9 @@ namespace Handbrake
             // 

             // number

             // 

-            dataGridViewCellStyle1.Format = "N0";

-            dataGridViewCellStyle1.NullValue = null;

-            this.number.DefaultCellStyle = dataGridViewCellStyle1;

+            dataGridViewCellStyle2.Format = "N0";

+            dataGridViewCellStyle2.NullValue = null;

+            this.number.DefaultCellStyle = dataGridViewCellStyle2;

             this.number.HeaderText = "Chapter Number";

             this.number.MaxInputLength = 3;

             this.number.Name = "number";

@@ -1689,7 +1687,6 @@ namespace Handbrake
             this.TabPage3.Controls.Add(this.drp_videoEncoder);

             this.TabPage3.Controls.Add(this.Label47);

             this.TabPage3.Controls.Add(this.label25);

-            this.TabPage3.Controls.Add(this.lbl_vfr);

             this.TabPage3.Controls.Add(this.check_grayscale);

             this.TabPage3.Controls.Add(this.check_turbo);

             this.TabPage3.Controls.Add(this.Label22);

@@ -1722,18 +1719,6 @@ namespace Handbrake
             this.label25.TabIndex = 0;

             this.label25.Text = "Video";

             // 

-            // lbl_vfr

-            // 

-            this.lbl_vfr.AutoSize = true;

-            this.lbl_vfr.BackColor = System.Drawing.Color.Transparent;

-            this.lbl_vfr.Font = new System.Drawing.Font("Verdana", 6.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));

-            this.lbl_vfr.Location = new System.Drawing.Point(123, 97);

-            this.lbl_vfr.Name = "lbl_vfr";

-            this.lbl_vfr.Size = new System.Drawing.Size(52, 12);

-            this.lbl_vfr.TabIndex = 3;

-            this.lbl_vfr.Text = "(VFR On)";

-            this.lbl_vfr.Visible = false;

-            // 

             // check_grayscale

             // 

             this.check_grayscale.AutoSize = true;

@@ -1849,7 +1834,6 @@ namespace Handbrake
             this.TabPage1.Controls.Add(this.text_height);

             this.TabPage1.Controls.Add(this.Label55);

             this.TabPage1.Controls.Add(this.text_width);

-            this.TabPage1.Controls.Add(this.check_vfr);

             this.TabPage1.Controls.Add(this.label24);

             this.TabPage1.Controls.Add(this.drp_deNoise);

             this.TabPage1.Controls.Add(this.label11);

@@ -2072,19 +2056,6 @@ namespace Handbrake
             this.Label55.TabIndex = 16;

             this.Label55.Text = "Width/Height:";

             // 

-            // check_vfr

-            // 

-            this.check_vfr.AutoSize = true;

-            this.check_vfr.BackColor = System.Drawing.Color.Transparent;

-            this.check_vfr.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));

-            this.check_vfr.Location = new System.Drawing.Point(413, 165);

-            this.check_vfr.Name = "check_vfr";

-            this.check_vfr.Size = new System.Drawing.Size(48, 17);

-            this.check_vfr.TabIndex = 24;

-            this.check_vfr.Text = "VFR";

-            this.check_vfr.UseVisualStyleBackColor = false;

-            this.check_vfr.CheckedChanged += new System.EventHandler(this.check_vfr_CheckedChanged);

-            // 

             // label24

             // 

             this.label24.AutoSize = true;

@@ -3164,8 +3135,8 @@ namespace Handbrake
             this.Controls.Add(this.groupBox_dest);

             this.Controls.Add(this.groupBox_output);

             this.Controls.Add(this.groupBox2);

-            this.Controls.Add(this.advancedOptions);

             this.Controls.Add(this.toolStrip1);

+            this.Controls.Add(this.advancedOptions);

             this.Controls.Add(this.frmMainMenu);

             this.Controls.Add(this.StatusStrip);

             this.DoubleBuffered = true;

@@ -3294,9 +3265,7 @@ namespace Handbrake
         private System.Windows.Forms.SaveFileDialog DVD_Save;

         private System.Windows.Forms.OpenFileDialog File_Open;

         private System.Windows.Forms.ToolStripSeparator toolStripSeparator7;

-        internal System.Windows.Forms.CheckBox check_vfr;

         internal System.Windows.Forms.CheckBox check_iPodAtom;

-        internal System.Windows.Forms.Label lbl_vfr;

         internal System.Windows.Forms.Label label26;

         internal System.Windows.Forms.Label Label56;

         internal System.Windows.Forms.Label lbl_Aspect;

diff --git a/win/C#/frmMain.cs b/win/C#/frmMain.cs
index 3e50e0cd1..df78634b5 100644
--- a/win/C#/frmMain.cs
+++ b/win/C#/frmMain.cs
@@ -748,24 +748,6 @@ namespace Handbrake
             text_top.Enabled = false;

             text_bottom.Enabled = false;

         }

-        private void check_vfr_CheckedChanged(object sender, EventArgs e)

-        {

-            if (check_vfr.CheckState == CheckState.Checked)

-            {

-                check_detelecine.Enabled = false;

-                check_detelecine.CheckState = CheckState.Checked;

-                drp_videoFramerate.Enabled = false;

-                drp_videoFramerate.SelectedItem = "29.97";

-                lbl_vfr.Visible = true;

-            }

-            else

-            {

-                check_detelecine.Enabled = true;

-                drp_videoFramerate.Enabled = true;

-                drp_videoFramerate.SelectedItem = "Automatic";

-                lbl_vfr.Visible = false;

-            }

-        }

         private void drp_anamorphic_SelectedIndexChanged(object sender, EventArgs e)

         {

             if (drp_anamorphic.SelectedIndex == 1)

@@ -1904,6 +1886,7 @@ namespace Handbrake
         }

         #endregion

 

+ 

         // This is the END of the road ------------------------------------------------------------------------------

     }

 }
\ No newline at end of file
diff --git a/win/C#/frmMain.resx b/win/C#/frmMain.resx
index a016a1825..5bc2f65cb 100644
--- 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.

 Note: Do not change any of the chapter numbers!</value>

   </data>

+  <metadata name="number.UserAddedColumn" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">

+    <value>True</value>

+  </metadata>

+  <metadata name="name.UserAddedColumn" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">

+    <value>True</value>

+  </metadata>

   <metadata name="DVD_Open.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">

     <value>223, 15</value>

   </metadata>