WinGui:

- Removes xvid encoder option.

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

5 files changed, 5 insertions, 37 deletions

diff --git a/win/C#/Functions/QueryParser.cs b/win/C#/Functions/QueryParser.cs
index eb6c06016..4395791e6 100644
--- a/win/C#/Functions/QueryParser.cs
+++ b/win/C#/Functions/QueryParser.cs
@@ -823,9 +823,6 @@ namespace Handbrake.Functions
                     case "ffmpeg":

                         videoEncoderConvertion = "MPEG-4 (FFmpeg)";

                         break;

-                    case "xvid":

-                        videoEncoderConvertion = "MPEG-4 (XviD)";

-                        break;

                     case "x264":

                         videoEncoderConvertion = "H.264 (x264)";

                         break;

diff --git a/win/C#/frmMain.Designer.cs b/win/C#/frmMain.Designer.cs
index 56ee46106..31a435507 100644
--- a/win/C#/frmMain.Designer.cs
+++ b/win/C#/frmMain.Designer.cs
@@ -40,7 +40,7 @@ namespace Handbrake
             this.components = new System.ComponentModel.Container();

             System.Windows.Forms.ContextMenuStrip notifyIconMenu;

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

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

+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = 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();

@@ -357,7 +357,6 @@ namespace Handbrake
             this.drp_videoEncoder.FormattingEnabled = true;

             this.drp_videoEncoder.Items.AddRange(new object[] {

             "MPEG-4 (FFmpeg)",

-            "MPEG-4 (XviD)",

             "H.264 (x264)",

             "VP3 (Theora)"});

             this.drp_videoEncoder.Location = new System.Drawing.Point(125, 35);

@@ -610,9 +609,9 @@ namespace Handbrake
             // 

             // number

             // 

-            dataGridViewCellStyle2.Format = "N0";

-            dataGridViewCellStyle2.NullValue = null;

-            this.number.DefaultCellStyle = dataGridViewCellStyle2;

+            dataGridViewCellStyle1.Format = "N0";

+            dataGridViewCellStyle1.NullValue = null;

+            this.number.DefaultCellStyle = dataGridViewCellStyle1;

             this.number.Frozen = true;

             this.number.HeaderText = "Chapter Number";

             this.number.MaxInputLength = 3;

diff --git a/win/C#/frmMain.cs b/win/C#/frmMain.cs
index f1c6cf366..99a89b9f8 100644
--- a/win/C#/frmMain.cs
+++ b/win/C#/frmMain.cs
@@ -1083,12 +1083,6 @@ namespace Handbrake
                     slider_videoQuality.Value = 1;

                     SliderValue.Text = "0% QP: 31.00";

                     break;

-                case "MPEG-4 (XviD)":

-                    slider_videoQuality.Minimum = 1;

-                    slider_videoQuality.Maximum = 31;

-                    slider_videoQuality.Value = 1;

-                    SliderValue.Text = "0% QP: 31.00";

-                    break;

                 case "H.264 (x264)":

                     slider_videoQuality.Minimum = 0;

                     slider_videoQuality.Value = 0;

@@ -1136,13 +1130,6 @@ namespace Handbrake
                     double val = ((max - min) - (rfValue - min)) / (max - min);

                     SliderValue.Text = Math.Round((val * 100), 2) + "% QP:" + (32 - slider_videoQuality.Value);

                     break;

-                case "MPEG-4 (XviD)":

-                    rfValue = 31 - (slider_videoQuality.Value - 1);

-                    max = slider_videoQuality.Maximum;

-                    min = slider_videoQuality.Minimum;

-                    val = ((max - min) - (rfValue - min)) / (max - min);

-                    SliderValue.Text = Math.Round((val * 100), 2) + "% QP:" + (32 - slider_videoQuality.Value);

-                    break;

                 case "H.264 (x264)":

                     double divided;

                     System.Globalization.CultureInfo culture = System.Globalization.CultureInfo.CreateSpecificCulture("en-US");

@@ -1824,10 +1811,9 @@ namespace Handbrake
                 oldval = drp_videoEncoder.Text;

                 drp_videoEncoder.Items.Clear();

                 drp_videoEncoder.Items.Add("MPEG-4 (FFmpeg)");

-                drp_videoEncoder.Items.Add("MPEG-4 (XviD)");

                 drp_videoEncoder.Items.Add("H.264 (x264)");

                 if (oldval == "VP3 (Theora)")

-                    drp_videoEncoder.SelectedIndex = 2;

+                    drp_videoEncoder.SelectedIndex = 1;

                 else

                     drp_videoEncoder.Text = oldval;

 

@@ -1837,7 +1823,6 @@ namespace Handbrake
                 oldval = drp_videoEncoder.Text;

                 drp_videoEncoder.Items.Clear();

                 drp_videoEncoder.Items.Add("MPEG-4 (FFmpeg)");

-                drp_videoEncoder.Items.Add("MPEG-4 (XviD)");

                 drp_videoEncoder.Items.Add("H.264 (x264)");

                 drp_videoEncoder.Items.Add("VP3 (Theora)");

                 drp_videoEncoder.Text = oldval;

diff --git a/win/C#/frmMain.resx b/win/C#/frmMain.resx
index 9b96457b9..77037cb54 100644
--- a/win/C#/frmMain.resx
+++ b/win/C#/frmMain.resx
@@ -152,12 +152,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.

 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>232, 15</value>

   </metadata>

diff --git a/win/C#/frmMain/QueryGenerator.cs b/win/C#/frmMain/QueryGenerator.cs
index e8407a4bc..16c7fe43a 100644
--- a/win/C#/frmMain/QueryGenerator.cs
+++ b/win/C#/frmMain/QueryGenerator.cs
@@ -179,9 +179,6 @@ namespace Handbrake
                 case "MPEG-4 (FFmpeg)":

                     query += " -e ffmpeg";

                     break;

-                case "MPEG-4 (XviD)":

-                    query += " -e xvid";

-                    break;

                 case "H.264 (x264)":

                     query += " -e x264";

                     break;

@@ -213,10 +210,6 @@ namespace Handbrake
                         value = 31 - (mainWindow.slider_videoQuality.Value -1);

                         query += " -q " + value.ToString(new CultureInfo("en-US"));

                         break;

-                    case "MPEG-4 (XviD)":

-                        value = 31 - (mainWindow.slider_videoQuality.Value - 1);

-                        query += " -q " + value.ToString(new CultureInfo("en-US"));

-                        break;

                     case "H.264 (x264)":

                         double divided;

                         CultureInfo culture = CultureInfo.CreateSpecificCulture("en-US");