WinGui:

- Removes xvid encoder option.

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

diff --git a/win/C#/Functions/QueryParser.cs b/win/C#/Functions/QueryParser.cs
index eb6c060..4395791 100644 (file)
--- a/win/C#/Functions/QueryParser.cs
+++ b/win/C#/Functions/QueryParser.cs
@@ -823,9 +823,6 @@ namespace Handbrake.Functions
                     case "ffmpeg":\r
                         videoEncoderConvertion = "MPEG-4 (FFmpeg)";\r
                         break;\r
-                    case "xvid":\r
-                        videoEncoderConvertion = "MPEG-4 (XviD)";\r
-                        break;\r
                     case "x264":\r
                         videoEncoderConvertion = "H.264 (x264)";\r
                         break;\r

diff --git a/win/C#/frmMain.Designer.cs b/win/C#/frmMain.Designer.cs
index 56ee461..31a4355 100644 (file)
--- a/win/C#/frmMain.Designer.cs
+++ b/win/C#/frmMain.Designer.cs
@@ -40,7 +40,7 @@ namespace Handbrake
             this.components = new System.ComponentModel.Container();\r
             System.Windows.Forms.ContextMenuStrip notifyIconMenu;\r
             System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(frmMain));\r
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = 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
@@ -357,7 +357,6 @@ namespace Handbrake
             this.drp_videoEncoder.FormattingEnabled = true;\r
             this.drp_videoEncoder.Items.AddRange(new object[] {\r
             "MPEG-4 (FFmpeg)",\r
-            "MPEG-4 (XviD)",\r
             "H.264 (x264)",\r
             "VP3 (Theora)"});\r
             this.drp_videoEncoder.Location = new System.Drawing.Point(125, 35);\r
@@ -610,9 +609,9 @@ namespace Handbrake
             // \r
             // number\r
             // \r
-            dataGridViewCellStyle2.Format = "N0";\r
-            dataGridViewCellStyle2.NullValue = null;\r
-            this.number.DefaultCellStyle = dataGridViewCellStyle2;\r
+            dataGridViewCellStyle1.Format = "N0";\r
+            dataGridViewCellStyle1.NullValue = null;\r
+            this.number.DefaultCellStyle = dataGridViewCellStyle1;\r
             this.number.Frozen = true;\r
             this.number.HeaderText = "Chapter Number";\r
             this.number.MaxInputLength = 3;\r

diff --git a/win/C#/frmMain.cs b/win/C#/frmMain.cs
index f1c6cf3..99a89b9 100644 (file)
--- a/win/C#/frmMain.cs
+++ b/win/C#/frmMain.cs
@@ -1083,12 +1083,6 @@ namespace Handbrake
                     slider_videoQuality.Value = 1;\r
                     SliderValue.Text = "0% QP: 31.00";\r
                     break;\r
-                case "MPEG-4 (XviD)":\r
-                    slider_videoQuality.Minimum = 1;\r
-                    slider_videoQuality.Maximum = 31;\r
-                    slider_videoQuality.Value = 1;\r
-                    SliderValue.Text = "0% QP: 31.00";\r
-                    break;\r
                 case "H.264 (x264)":\r
                     slider_videoQuality.Minimum = 0;\r
                     slider_videoQuality.Value = 0;\r
@@ -1136,13 +1130,6 @@ namespace Handbrake
                     double val = ((max - min) - (rfValue - min)) / (max - min);\r
                     SliderValue.Text = Math.Round((val * 100), 2) + "% QP:" + (32 - slider_videoQuality.Value);\r
                     break;\r
-                case "MPEG-4 (XviD)":\r
-                    rfValue = 31 - (slider_videoQuality.Value - 1);\r
-                    max = slider_videoQuality.Maximum;\r
-                    min = slider_videoQuality.Minimum;\r
-                    val = ((max - min) - (rfValue - min)) / (max - min);\r
-                    SliderValue.Text = Math.Round((val * 100), 2) + "% QP:" + (32 - slider_videoQuality.Value);\r
-                    break;\r
                 case "H.264 (x264)":\r
                     double divided;\r
                     System.Globalization.CultureInfo culture = System.Globalization.CultureInfo.CreateSpecificCulture("en-US");\r
@@ -1824,10 +1811,9 @@ namespace Handbrake
                 oldval = drp_videoEncoder.Text;\r
                 drp_videoEncoder.Items.Clear();\r
                 drp_videoEncoder.Items.Add("MPEG-4 (FFmpeg)");\r
-                drp_videoEncoder.Items.Add("MPEG-4 (XviD)");\r
                 drp_videoEncoder.Items.Add("H.264 (x264)");\r
                 if (oldval == "VP3 (Theora)")\r
-                    drp_videoEncoder.SelectedIndex = 2;\r
+                    drp_videoEncoder.SelectedIndex = 1;\r
                 else\r
                     drp_videoEncoder.Text = oldval;\r
 \r
@@ -1837,7 +1823,6 @@ namespace Handbrake
                 oldval = drp_videoEncoder.Text;\r
                 drp_videoEncoder.Items.Clear();\r
                 drp_videoEncoder.Items.Add("MPEG-4 (FFmpeg)");\r
-                drp_videoEncoder.Items.Add("MPEG-4 (XviD)");\r
                 drp_videoEncoder.Items.Add("H.264 (x264)");\r
                 drp_videoEncoder.Items.Add("VP3 (Theora)");\r
                 drp_videoEncoder.Text = oldval;\r

diff --git a/win/C#/frmMain.resx b/win/C#/frmMain.resx
index 9b96457..77037cb 100644 (file)
--- 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.\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>232, 15</value>\r
   </metadata>\r

diff --git a/win/C#/frmMain/QueryGenerator.cs b/win/C#/frmMain/QueryGenerator.cs
index e8407a4..16c7fe4 100644 (file)
--- a/win/C#/frmMain/QueryGenerator.cs
+++ b/win/C#/frmMain/QueryGenerator.cs
@@ -179,9 +179,6 @@ namespace Handbrake
                 case "MPEG-4 (FFmpeg)":\r
                     query += " -e ffmpeg";\r
                     break;\r
-                case "MPEG-4 (XviD)":\r
-                    query += " -e xvid";\r
-                    break;\r
                 case "H.264 (x264)":\r
                     query += " -e x264";\r
                     break;\r
@@ -213,10 +210,6 @@ namespace Handbrake
                         value = 31 - (mainWindow.slider_videoQuality.Value -1);\r
                         query += " -q " + value.ToString(new CultureInfo("en-US"));\r
                         break;\r
-                    case "MPEG-4 (XviD)":\r
-                        value = 31 - (mainWindow.slider_videoQuality.Value - 1);\r
-                        query += " -q " + value.ToString(new CultureInfo("en-US"));\r
-                        break;\r
                     case "H.264 (x264)":\r
                         double divided;\r
                         CultureInfo culture = CultureInfo.CreateSpecificCulture("en-US");\r