OSDN Git Service

WinGui:
authorsr55 <sr55@b64f7644-9d1e-0410-96f1-a4d463321fa5>
Mon, 8 Feb 2010 20:59:46 +0000 (20:59 +0000)
committersr55 <sr55@b64f7644-9d1e-0410-96f1-a4d463321fa5>
Mon, 8 Feb 2010 20:59:46 +0000 (20:59 +0000)
- Banish % Quality display.
- Code Refactoring.

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

win/C#/Controls/AudioPanel.cs
win/C#/Controls/x264Panel.cs
win/C#/EncodeQueue/Queue.cs
win/C#/Functions/PresetLoader.cs
win/C#/Functions/QueryGenerator.cs
win/C#/Functions/QueryParser.cs
win/C#/frmMain.Designer.cs
win/C#/frmMain.cs

index a56daa3..b60bf76 100644 (file)
@@ -112,6 +112,53 @@ namespace Handbrake.Controls
             }\r
         }\r
 \r
+        /// <summary>\r
+        /// Set the Track list dropdown from the parsed title captured during the scan\r
+        /// </summary>\r
+        /// <param name="selectedTitle"></param>\r
+        public void SetTrackList(Parsing.Title selectedTitle)\r
+        {\r
+            drp_audioTrack.Items.Clear();\r
+            drp_audioTrack.Items.Add("Automatic");\r
+            drp_audioTrack.Items.Add("None");\r
+            drp_audioTrack.Items.AddRange(selectedTitle.AudioTracks.ToArray());\r
+\r
+            // Handle Native Language and "Dub Foreign language audio" and "Use Foreign language audio and Subtitles" Options\r
+            if (Properties.Settings.Default.NativeLanguage == "Any")\r
+                drp_audioTrack.SelectedIndex = drp_audioTrack.Items.Count >= 3 ? 2 : 0;\r
+            else\r
+            {\r
+                if (Properties.Settings.Default.DubAudio) // "Dub Foreign language audio" \r
+                {\r
+                    int i = 0;\r
+                    foreach (object item in drp_audioTrack.Items)\r
+                    {\r
+                        if (item.ToString().Contains(Properties.Settings.Default.NativeLanguage))\r
+                        {\r
+                            drp_audioTrack.SelectedIndex = i;\r
+                            break;\r
+                        }\r
+\r
+                        i++;\r
+                    }\r
+\r
+                    if (drp_audioTrack.SelectedItem != null)\r
+                        foreach (ListViewItem item in lv_audioList.Items)\r
+                            item.SubItems[1].Text = drp_audioTrack.SelectedItem.ToString();\r
+                    else\r
+                    {\r
+                        drp_audioTrack.SelectedIndex = 0;\r
+                        if (drp_audioTrack.SelectedItem != null)\r
+                            foreach (ListViewItem item in lv_audioList.Items)\r
+                                item.SubItems[1].Text = drp_audioTrack.SelectedItem.ToString();\r
+                    }\r
+                }\r
+                else\r
+                    drp_audioTrack.SelectedIndex = drp_audioTrack.Items.Count >= 3 ? 2 : 0; // "Use Foreign language audio and Subtitles"\r
+            }\r
+            drp_audioMix.SelectedIndex = 0;\r
+        }\r
+\r
         // Control and ListView\r
         private void controlChanged(object sender, EventArgs e)\r
         {\r
@@ -246,48 +293,6 @@ namespace Handbrake.Controls
         }\r
 \r
         // Public Functions\r
-        public void SetTrackList(Parsing.Title selectedTitle)\r
-        {\r
-            drp_audioTrack.Items.Clear();\r
-            drp_audioTrack.Items.Add("Automatic");\r
-            drp_audioTrack.Items.Add("None");\r
-            drp_audioTrack.Items.AddRange(selectedTitle.AudioTracks.ToArray());\r
-\r
-            // Handle Native Language and "Dub Foreign language audio" and "Use Foreign language audio and Subtitles" Options\r
-            if (Properties.Settings.Default.NativeLanguage == "Any")\r
-                drp_audioTrack.SelectedIndex = drp_audioTrack.Items.Count >= 3 ? 2 : 0;\r
-            else\r
-            {\r
-                if (Properties.Settings.Default.DubAudio) // "Dub Foreign language audio" \r
-                {\r
-                    int i = 0;\r
-                    foreach (object item in drp_audioTrack.Items)\r
-                    {\r
-                        if (item.ToString().Contains(Properties.Settings.Default.NativeLanguage))\r
-                        {\r
-                            drp_audioTrack.SelectedIndex = i;\r
-                            break;\r
-                        }\r
-\r
-                        i++;\r
-                    }\r
-\r
-                    if (drp_audioTrack.SelectedItem != null)\r
-                        foreach (ListViewItem item in lv_audioList.Items)\r
-                            item.SubItems[1].Text = drp_audioTrack.SelectedItem.ToString();\r
-                    else\r
-                    {\r
-                        drp_audioTrack.SelectedIndex = 0;\r
-                        if (drp_audioTrack.SelectedItem != null)\r
-                            foreach (ListViewItem item in lv_audioList.Items)\r
-                                item.SubItems[1].Text = drp_audioTrack.SelectedItem.ToString();\r
-                    }\r
-                }\r
-                else\r
-                    drp_audioTrack.SelectedIndex = drp_audioTrack.Items.Count >= 3 ? 2 : 0; // "Use Foreign language audio and Subtitles"\r
-            }\r
-            drp_audioMix.SelectedIndex = 0;\r
-        }\r
         private void AddTrackForPreset(ListViewItem item)\r
         {\r
             lv_audioList.Items.Add(item);\r
index 4229c82..78480b2 100644 (file)
@@ -11,6 +11,14 @@ namespace Handbrake.Controls
 {\r
     public partial class x264Panel : UserControl\r
     {\r
+        /* \r
+         * TODO This code was ported from the obj-c MacGUI code. It's really messy and could really do with being cleaned up\r
+         * at some point.\r
+         */\r
+\r
+        /// <summary>\r
+        /// Initializes a new instance of the x264 panel user control\r
+        /// </summary>\r
         public x264Panel()\r
         {\r
             InitializeComponent();\r
@@ -18,109 +26,22 @@ namespace Handbrake.Controls
             if (Properties.Settings.Default.tooltipEnable)\r
                 ToolTip.Active = true;\r
 \r
-            reset2Defaults();\r
+            Reset2Defaults();\r
         }\r
 \r
-        public string x264Query\r
+        /// <summary>\r
+        /// Gets or sets the X264 query string\r
+        /// </summary>\r
+        public string X264Query\r
         {\r
             get { return rtf_x264Query.Text; }\r
             set { rtf_x264Query.Text = value; }\r
         }\r
-\r
-        private void widgetControlChanged(object sender, EventArgs e)\r
-        {\r
-            Control changedControlName = (Control) sender;\r
-            string controlName = "";\r
-\r
-            switch (changedControlName.Name.Trim())\r
-            {\r
-                case "drop_refFrames":\r
-                    controlName = "ref";\r
-                    break;\r
-                case "check_mixedReferences":\r
-                    controlName = "mixed-refs";\r
-                    break;\r
-                case "drop_bFrames":\r
-                    controlName = "bframes";\r
-                    break;\r
-                case "drop_directPrediction":\r
-                    controlName = "direct";\r
-                    break;\r
-                case "check_weightedBFrames":\r
-                    controlName = "weightb";\r
-                    break;\r
-                case "check_pyrmidalBFrames":\r
-                    controlName = "b-pyramid";\r
-                    break;\r
-                case "drop_MotionEstimationMethod":\r
-                    controlName = "me";\r
-                    break;\r
-                case "drop_MotionEstimationRange":\r
-                    controlName = "merange";\r
-                    break;\r
-                case "drop_subpixelMotionEstimation":\r
-                    controlName = "subq";\r
-                    break;\r
-                case "drop_analysis":\r
-                    controlName = "analyse";\r
-                    break;\r
-                case "check_8x8DCT":\r
-                    controlName = "8x8dct";\r
-                    break;\r
-                case "drop_deblockAlpha":\r
-                    controlName = "deblock";\r
-                    break;\r
-                case "drop_deblockBeta":\r
-                    controlName = "deblock";\r
-                    break;\r
-                case "drop_trellis":\r
-                    controlName = "trellis";\r
-                    break;\r
-                case "check_noFastPSkip":\r
-                    controlName = "no-fast-pskip";\r
-                    break;\r
-                case "check_noDCTDecimate":\r
-                    controlName = "no-dct-decimate";\r
-                    break;\r
-                case "check_Cabac":\r
-                    controlName = "cabac";\r
-                    break;\r
-                case "slider_psyrd":\r
-                    controlName = "psy-rd";\r
-                    break;\r
-                case "slider_psytrellis":\r
-                    controlName = "psy-rd";\r
-                    break;\r
-                case "drop_adaptBFrames":\r
-                    controlName = "b-adapt";\r
-                    break;\r
-            }\r
-            on_x264_WidgetChange(controlName);\r
-        }\r
-        private void rtf_x264Query_TextChanged(object sender, EventArgs e)\r
-        {\r
-            if (rtf_x264Query.Text.EndsWith("\n"))\r
-            {\r
-                string query = rtf_x264Query.Text.Replace("\n", "");\r
-                reset2Defaults();\r
-                rtf_x264Query.Text = query;\r
-                X264_StandardizeOptString();\r
-                X264_SetCurrentSettingsInPanel();\r
-\r
-                if (rtf_x264Query.Text == string.Empty)\r
-                    reset2Defaults();\r
-            }\r
-        }\r
-        private void btn_reset_Click(object sender, EventArgs e)\r
-        {\r
-            rtf_x264Query.Text = "";\r
-            reset2Defaults();\r
-        }\r
         \r
         /// <summary>\r
         /// Reset all components to defaults and clears the x264 rtf box\r
         /// </summary>\r
-        public void reset2Defaults()\r
+        public void Reset2Defaults()\r
         {\r
             check_8x8DCT.CheckState = CheckState.Checked;\r
             check_Cabac.CheckState = CheckState.Checked;\r
@@ -427,9 +348,9 @@ namespace Handbrake.Controls
         /// <summary>\r
         /// This function will update the X264 Query when one of the GUI widgets changes.\r
         /// </summary>\r
-        private void on_x264_WidgetChange(string sender)\r
+        private void OnX264WidgetChange(string sender)\r
         {\r
-            animate(sender);\r
+            Animate(sender);\r
             String optNameToChange = sender;\r
             String currentOptString = rtf_x264Query.Text;\r
 \r
@@ -440,9 +361,9 @@ namespace Handbrake.Controls
 \r
             // IF the current H264 Option String Contains Multiple Items or Just 1 Item\r
             if ((currentOptString.Contains(checkOptNameToChange)) || (currentOptString.StartsWith(checkOptNameToChangeBegin)))\r
-                hasOptions(currentOptString, optNameToChange);\r
+                HasOptions(currentOptString, optNameToChange);\r
             else // IF there is no options in the rich text box!\r
-                hasNoOptions(optNameToChange);\r
+                HasNoOptions(optNameToChange);\r
         }\r
 \r
         /// <summary>\r
@@ -451,7 +372,7 @@ namespace Handbrake.Controls
         /// </summary>\r
         /// <param name="currentOptString"></param>\r
         /// <param name="optNameToChange"></param>\r
-        private void hasOptions(string currentOptString, string optNameToChange)\r
+        private void HasOptions(string currentOptString, string optNameToChange)\r
         {\r
             String thisOpt;             // The separated option such as "bframes=3"\r
             String optName;        // The option name such as "bframes"\r
@@ -663,7 +584,7 @@ namespace Handbrake.Controls
         /// e.g no-fast-pskip\r
         /// </summary>\r
         /// <param name="optNameToChange"></param>\r
-        private void hasNoOptions(string optNameToChange)\r
+        private void HasNoOptions(IEquatable<string> optNameToChange)\r
         {\r
             string colon = "";\r
             if (rtf_x264Query.Text != "")\r
@@ -852,7 +773,7 @@ namespace Handbrake.Controls
         /// Shows and hides controls based on the values of other controls.\r
         /// </summary>\r
         /// <param name="sender"></param>\r
-        private void animate(string sender)\r
+        private void Animate(string sender)\r
         {\r
             /* Lots of situations to cover.\r
                   - B-frames (when 0 turn of b-frame specific stuff, when < 2 disable b-pyramid)\r
@@ -998,5 +919,96 @@ namespace Handbrake.Controls
                 break;\r
             }\r
         }\r
+\r
+\r
+        private void widgetControlChanged(object sender, EventArgs e)\r
+        {\r
+            Control changedControlName = (Control)sender;\r
+            string controlName = "";\r
+\r
+            switch (changedControlName.Name.Trim())\r
+            {\r
+                case "drop_refFrames":\r
+                    controlName = "ref";\r
+                    break;\r
+                case "check_mixedReferences":\r
+                    controlName = "mixed-refs";\r
+                    break;\r
+                case "drop_bFrames":\r
+                    controlName = "bframes";\r
+                    break;\r
+                case "drop_directPrediction":\r
+                    controlName = "direct";\r
+                    break;\r
+                case "check_weightedBFrames":\r
+                    controlName = "weightb";\r
+                    break;\r
+                case "check_pyrmidalBFrames":\r
+                    controlName = "b-pyramid";\r
+                    break;\r
+                case "drop_MotionEstimationMethod":\r
+                    controlName = "me";\r
+                    break;\r
+                case "drop_MotionEstimationRange":\r
+                    controlName = "merange";\r
+                    break;\r
+                case "drop_subpixelMotionEstimation":\r
+                    controlName = "subq";\r
+                    break;\r
+                case "drop_analysis":\r
+                    controlName = "analyse";\r
+                    break;\r
+                case "check_8x8DCT":\r
+                    controlName = "8x8dct";\r
+                    break;\r
+                case "drop_deblockAlpha":\r
+                    controlName = "deblock";\r
+                    break;\r
+                case "drop_deblockBeta":\r
+                    controlName = "deblock";\r
+                    break;\r
+                case "drop_trellis":\r
+                    controlName = "trellis";\r
+                    break;\r
+                case "check_noFastPSkip":\r
+                    controlName = "no-fast-pskip";\r
+                    break;\r
+                case "check_noDCTDecimate":\r
+                    controlName = "no-dct-decimate";\r
+                    break;\r
+                case "check_Cabac":\r
+                    controlName = "cabac";\r
+                    break;\r
+                case "slider_psyrd":\r
+                    controlName = "psy-rd";\r
+                    break;\r
+                case "slider_psytrellis":\r
+                    controlName = "psy-rd";\r
+                    break;\r
+                case "drop_adaptBFrames":\r
+                    controlName = "b-adapt";\r
+                    break;\r
+            }\r
+            OnX264WidgetChange(controlName);\r
+        }\r
+        private void rtf_x264Query_TextChanged(object sender, EventArgs e)\r
+        {\r
+            if (rtf_x264Query.Text.EndsWith("\n"))\r
+            {\r
+                string query = rtf_x264Query.Text.Replace("\n", "");\r
+                Reset2Defaults();\r
+                rtf_x264Query.Text = query;\r
+                X264_StandardizeOptString();\r
+                X264_SetCurrentSettingsInPanel();\r
+\r
+                if (rtf_x264Query.Text == string.Empty)\r
+                    Reset2Defaults();\r
+            }\r
+        }\r
+        private void btn_reset_Click(object sender, EventArgs e)\r
+        {\r
+            rtf_x264Query.Text = "";\r
+            Reset2Defaults();\r
+        }\r
     }\r
 }
\ No newline at end of file
index 664710e..da9b786 100644 (file)
@@ -158,8 +158,7 @@ namespace Handbrake.EncodeQueue
             }\r
             catch (Exception)\r
             {\r
-                // Any Errors will be out of diskspace/permissions problems. \r
-                // Don't report them as they'll annoy the user.\r
+                return;\r
             }\r
         }\r
 \r
index c88ff2d..a6614b9 100644 (file)
@@ -217,7 +217,7 @@ namespace Handbrake.Functions
             #endregion\r
 \r
             #region Other\r
-            mainWindow.x264Panel.x264Query = presetQuery.H264Query;\r
+            mainWindow.x264Panel.X264Query = presetQuery.H264Query;\r
 \r
             // Set the preset name\r
             mainWindow.labelPreset.Text = "Output Settings (Preset: " + name + ")";\r
index 03fa22c..499b11d 100644 (file)
@@ -9,6 +9,7 @@ using System.Windows.Forms;
 using System.Globalization;\r
 using System.IO;\r
 using System.Collections.Generic;\r
+using Handbrake.Model;\r
 \r
 namespace Handbrake.Functions\r
 {\r
@@ -400,7 +401,7 @@ namespace Handbrake.Functions
                 string srtDefault = String.Empty;\r
                 int srtCount = 0;\r
 \r
-                List<Controls.SubtitleInfo> SubList = mainWindow.Subtitles.GetSubtitleInfoList();\r
+                List<SubtitleInfo> SubList = mainWindow.Subtitles.GetSubtitleInfoList();\r
 \r
                 foreach (var item in SubList)\r
                 {\r
@@ -524,8 +525,8 @@ namespace Handbrake.Functions
             #endregion\r
 \r
             #region  H264 Tab\r
-            if (mainWindow.x264Panel.x264Query != "")\r
-                query += " -x " + mainWindow.x264Panel.x264Query;\r
+            if (mainWindow.x264Panel.X264Query != "")\r
+                query += " -x " + mainWindow.x264Panel.X264Query;\r
             #endregion\r
 \r
             #region Processors / Other\r
index 413f8fa..216d114 100644 (file)
@@ -424,7 +424,7 @@ namespace Handbrake.Functions
             catch (Exception exc)\r
             {\r
                 MessageBox.Show(\r
-                    "An error has occured in the Query Parser. Please report this error on the forum in the 'Windows' support section. \n\n" +\r
+                    "An error has occured in the Query Parser.\n\n" +\r
                     exc, "Error", MessageBoxButtons.OK, MessageBoxIcon.Error);\r
             }\r
 \r
index f716d92..6da486a 100644 (file)
@@ -100,9 +100,9 @@ namespace Handbrake
             this.Label47 = new System.Windows.Forms.Label();\r
             this.Label3 = new System.Windows.Forms.Label();\r
             this.tab_audio = new System.Windows.Forms.TabPage();\r
+            this.AudioSettings = new Handbrake.Controls.AudioPanel();\r
             this.AudioMenuRowHeightHack = new System.Windows.Forms.ImageList(this.components);\r
             this.tab_video = new System.Windows.Forms.TabPage();\r
-            this.lbl_qualityValue = new System.Windows.Forms.Label();\r
             this.radio_cq = new System.Windows.Forms.RadioButton();\r
             this.radio_avgBitrate = new System.Windows.Forms.RadioButton();\r
             this.radio_targetFilesize = new System.Windows.Forms.RadioButton();\r
@@ -112,13 +112,17 @@ namespace Handbrake
             this.lbl_SliderValue = new System.Windows.Forms.Label();\r
             this.Label46 = new System.Windows.Forms.Label();\r
             this.tab_picture = new System.Windows.Forms.TabPage();\r
+            this.PictureSettings = new Handbrake.Controls.PictureSettings();\r
             this.Check_ChapterMarkers = new System.Windows.Forms.CheckBox();\r
             this.tabs_panel = new System.Windows.Forms.TabControl();\r
             this.tab_filters = new System.Windows.Forms.TabPage();\r
+            this.Filters = new Handbrake.Controls.Filters();\r
             this.tab_subtitles = new System.Windows.Forms.TabPage();\r
+            this.Subtitles = new Handbrake.Controls.Subtitles();\r
             this.tab_chapters = new System.Windows.Forms.TabPage();\r
             this.label31 = new System.Windows.Forms.Label();\r
             this.tab_advanced = new System.Windows.Forms.TabPage();\r
+            this.x264Panel = new Handbrake.Controls.x264Panel();\r
             this.tab_query = new System.Windows.Forms.TabPage();\r
             this.btn_clear = new System.Windows.Forms.Button();\r
             this.label34 = new System.Windows.Forms.Label();\r
@@ -171,11 +175,6 @@ namespace Handbrake
             this.flowLayoutPanel1 = new System.Windows.Forms.FlowLayoutPanel();\r
             this.openPreset = new System.Windows.Forms.OpenFileDialog();\r
             this.File_ChapterImport = new System.Windows.Forms.OpenFileDialog();\r
-            this.PictureSettings = new Handbrake.Controls.PictureSettings();\r
-            this.Filters = new Handbrake.Controls.Filters();\r
-            this.AudioSettings = new Handbrake.Controls.AudioPanel();\r
-            this.Subtitles = new Handbrake.Controls.Subtitles();\r
-            this.x264Panel = new Handbrake.Controls.x264Panel();\r
             notifyIconMenu = new System.Windows.Forms.ContextMenuStrip(this.components);\r
             notifyIconMenu.SuspendLayout();\r
             ((System.ComponentModel.ISupportInitialize)(this.slider_videoQuality)).BeginInit();\r
@@ -807,6 +806,15 @@ namespace Handbrake
             this.tab_audio.Text = "Audio";\r
             this.tab_audio.UseVisualStyleBackColor = true;\r
             // \r
+            // AudioSettings\r
+            // \r
+            this.AudioSettings.BackColor = System.Drawing.Color.Transparent;\r
+            this.AudioSettings.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
+            this.AudioSettings.Location = new System.Drawing.Point(0, 0);\r
+            this.AudioSettings.Name = "AudioSettings";\r
+            this.AudioSettings.Size = new System.Drawing.Size(715, 310);\r
+            this.AudioSettings.TabIndex = 0;\r
+            // \r
             // AudioMenuRowHeightHack\r
             // \r
             this.AudioMenuRowHeightHack.ColorDepth = System.Windows.Forms.ColorDepth.Depth8Bit;\r
@@ -816,7 +824,6 @@ namespace Handbrake
             // tab_video\r
             // \r
             this.tab_video.BackColor = System.Drawing.Color.Transparent;\r
-            this.tab_video.Controls.Add(this.lbl_qualityValue);\r
             this.tab_video.Controls.Add(this.radio_cq);\r
             this.tab_video.Controls.Add(this.radio_avgBitrate);\r
             this.tab_video.Controls.Add(this.radio_targetFilesize);\r
@@ -840,16 +847,6 @@ namespace Handbrake
             this.tab_video.Text = "Video";\r
             this.tab_video.UseVisualStyleBackColor = true;\r
             // \r
-            // lbl_qualityValue\r
-            // \r
-            this.lbl_qualityValue.AutoSize = true;\r
-            this.lbl_qualityValue.BackColor = System.Drawing.Color.Transparent;\r
-            this.lbl_qualityValue.Location = new System.Drawing.Point(534, 100);\r
-            this.lbl_qualityValue.Name = "lbl_qualityValue";\r
-            this.lbl_qualityValue.Size = new System.Drawing.Size(24, 13);\r
-            this.lbl_qualityValue.TabIndex = 19;\r
-            this.lbl_qualityValue.Text = "0%";\r
-            // \r
             // radio_cq\r
             // \r
             this.radio_cq.AutoSize = true;\r
@@ -955,6 +952,17 @@ namespace Handbrake
             this.tab_picture.Text = "Picture";\r
             this.tab_picture.UseVisualStyleBackColor = true;\r
             // \r
+            // PictureSettings\r
+            // \r
+            this.PictureSettings.BackColor = System.Drawing.Color.Transparent;\r
+            this.PictureSettings.CurrentlySelectedPreset = null;\r
+            this.PictureSettings.Enabled = false;\r
+            this.PictureSettings.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
+            this.PictureSettings.Location = new System.Drawing.Point(0, 0);\r
+            this.PictureSettings.Name = "PictureSettings";\r
+            this.PictureSettings.Size = new System.Drawing.Size(666, 279);\r
+            this.PictureSettings.TabIndex = 0;\r
+            // \r
             // Check_ChapterMarkers\r
             // \r
             this.Check_ChapterMarkers.AutoSize = true;\r
@@ -994,6 +1002,15 @@ namespace Handbrake
             this.tab_filters.Text = "Video Filters";\r
             this.tab_filters.UseVisualStyleBackColor = true;\r
             // \r
+            // Filters\r
+            // \r
+            this.Filters.BackColor = System.Drawing.Color.Transparent;\r
+            this.Filters.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
+            this.Filters.Location = new System.Drawing.Point(0, 0);\r
+            this.Filters.Name = "Filters";\r
+            this.Filters.Size = new System.Drawing.Size(713, 310);\r
+            this.Filters.TabIndex = 0;\r
+            // \r
             // tab_subtitles\r
             // \r
             this.tab_subtitles.Controls.Add(this.Subtitles);\r
@@ -1005,6 +1022,15 @@ namespace Handbrake
             this.tab_subtitles.Text = "Subtitles";\r
             this.tab_subtitles.UseVisualStyleBackColor = true;\r
             // \r
+            // Subtitles\r
+            // \r
+            this.Subtitles.BackColor = System.Drawing.Color.Transparent;\r
+            this.Subtitles.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
+            this.Subtitles.Location = new System.Drawing.Point(0, 0);\r
+            this.Subtitles.Name = "Subtitles";\r
+            this.Subtitles.Size = new System.Drawing.Size(722, 310);\r
+            this.Subtitles.TabIndex = 0;\r
+            // \r
             // tab_chapters\r
             // \r
             this.tab_chapters.BackColor = System.Drawing.Color.Transparent;\r
@@ -1042,6 +1068,16 @@ namespace Handbrake
             this.tab_advanced.Text = "Advanced";\r
             this.tab_advanced.UseVisualStyleBackColor = true;\r
             // \r
+            // x264Panel\r
+            // \r
+            this.x264Panel.BackColor = System.Drawing.Color.Transparent;\r
+            this.x264Panel.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
+            this.x264Panel.Location = new System.Drawing.Point(0, 0);\r
+            this.x264Panel.Name = "x264Panel";\r
+            this.x264Panel.Size = new System.Drawing.Size(720, 306);\r
+            this.x264Panel.TabIndex = 0;\r
+            this.x264Panel.X264Query = "";\r
+            // \r
             // tab_query\r
             // \r
             this.tab_query.Controls.Add(this.btn_clear);\r
@@ -1609,54 +1645,6 @@ namespace Handbrake
             // \r
             this.File_ChapterImport.Filter = "CSV Files|*.csv";\r
             // \r
-            // PictureSettings\r
-            // \r
-            this.PictureSettings.BackColor = System.Drawing.Color.Transparent;\r
-            this.PictureSettings.CurrentlySelectedPreset = null;\r
-            this.PictureSettings.Enabled = false;\r
-            this.PictureSettings.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
-            this.PictureSettings.Location = new System.Drawing.Point(0, 0);\r
-            this.PictureSettings.Name = "PictureSettings";\r
-            this.PictureSettings.Size = new System.Drawing.Size(666, 279);\r
-            this.PictureSettings.TabIndex = 0;\r
-            // \r
-            // Filters\r
-            // \r
-            this.Filters.BackColor = System.Drawing.Color.Transparent;\r
-            this.Filters.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
-            this.Filters.Location = new System.Drawing.Point(0, 0);\r
-            this.Filters.Name = "Filters";\r
-            this.Filters.Size = new System.Drawing.Size(713, 310);\r
-            this.Filters.TabIndex = 0;\r
-            // \r
-            // AudioSettings\r
-            // \r
-            this.AudioSettings.BackColor = System.Drawing.Color.Transparent;\r
-            this.AudioSettings.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
-            this.AudioSettings.Location = new System.Drawing.Point(0, 0);\r
-            this.AudioSettings.Name = "AudioSettings";\r
-            this.AudioSettings.Size = new System.Drawing.Size(715, 310);\r
-            this.AudioSettings.TabIndex = 0;\r
-            // \r
-            // Subtitles\r
-            // \r
-            this.Subtitles.BackColor = System.Drawing.Color.Transparent;\r
-            this.Subtitles.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
-            this.Subtitles.Location = new System.Drawing.Point(0, 0);\r
-            this.Subtitles.Name = "Subtitles";\r
-            this.Subtitles.Size = new System.Drawing.Size(722, 310);\r
-            this.Subtitles.TabIndex = 0;\r
-            // \r
-            // x264Panel\r
-            // \r
-            this.x264Panel.BackColor = System.Drawing.Color.Transparent;\r
-            this.x264Panel.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
-            this.x264Panel.Location = new System.Drawing.Point(0, 0);\r
-            this.x264Panel.Name = "x264Panel";\r
-            this.x264Panel.Size = new System.Drawing.Size(720, 306);\r
-            this.x264Panel.TabIndex = 0;\r
-            this.x264Panel.x264Query = "";\r
-            // \r
             // frmMain\r
             // \r
             this.AllowDrop = true;\r
@@ -1858,7 +1846,6 @@ namespace Handbrake
         private ToolStripMenuItem mnu_resetChapters;\r
         private ToolStripMenuItem pmnu_import;\r
         private ToolStripSeparator toolStripSeparator2;\r
-        internal Label lbl_qualityValue;\r
         internal ComboBox drop_mode;\r
     }\r
 }
\ No newline at end of file
index 4b2ddb7..0d16309 100644 (file)
@@ -111,7 +111,7 @@ namespace Handbrake
 \r
                     if (query != null)\r
                     {\r
-                        x264Panel.reset2Defaults();\r
+                        x264Panel.Reset2Defaults();\r
 \r
                         QueryParser presetQuery = QueryParser.Parse(query);\r
                         PresetLoader.LoadPreset(this, presetQuery, Properties.Settings.Default.defaultPreset, loadPictureSettings);\r
@@ -597,7 +597,7 @@ namespace Handbrake
                     if (query != null)\r
                     {\r
                         //Ok, Reset all the H264 widgets before changing the preset\r
-                        x264Panel.reset2Defaults();\r
+                        x264Panel.Reset2Defaults();\r
 \r
                         // Send the query from the file to the Query Parser class\r
                         QueryParser presetQuery = QueryParser.Parse(query);\r
@@ -1262,7 +1262,7 @@ namespace Handbrake
                 check_turbo.CheckState = CheckState.Unchecked;\r
                 check_turbo.Enabled = false;\r
                 tab_advanced.Enabled = false;\r
-                x264Panel.x264Query = "";\r
+                x264Panel.X264Query = "";\r
                 check_iPodAtom.Enabled = false;\r
                 check_iPodAtom.Checked = false;\r
             }\r
@@ -1387,27 +1387,15 @@ namespace Handbrake
             switch (drp_videoEncoder.Text)\r
             {\r
                 case "MPEG-4 (FFmpeg)":\r
-                    double rfValue = 31 - (slider_videoQuality.Value - 1);\r
-                    double max = slider_videoQuality.Maximum;\r
-                    double min = slider_videoQuality.Minimum;\r
-                    double val = ((max - min) - (rfValue - min)) / (max - min);\r
                     lbl_SliderValue.Text = "QP:" + (32 - slider_videoQuality.Value);\r
-                    lbl_qualityValue.Text = Math.Round((val * 100), 2).ToString(new CultureInfo("en-US")) + "%";\r
                     break;\r
                 case "H.264 (x264)":\r
-                    rfValue = 51.0 - slider_videoQuality.Value * cqStep;\r
-                    max = slider_videoQuality.Maximum * cqStep;\r
-                    min = slider_videoQuality.Minimum;\r
-                    val = ((max - min) - (rfValue - min)) / (max - min);\r
+                    double rfValue = 51.0 - slider_videoQuality.Value * cqStep;\r
                     rfValue = Math.Round(rfValue, 2);\r
                     lbl_SliderValue.Text = "RF:" + rfValue.ToString(new CultureInfo("en-US"));\r
-                    lbl_qualityValue.Text = Math.Round((val * 100), 2).ToString(new CultureInfo("en-US")) + "%";\r
                     break;\r
                 case "VP3 (Theora)":\r
-                    rfValue = slider_videoQuality.Value;\r
-                    double value = rfValue / 63;\r
                     lbl_SliderValue.Text = "QP:" + slider_videoQuality.Value;\r
-                    lbl_qualityValue.Text = Math.Round((value * 100), 2).ToString(new CultureInfo("en-US")) + "%";\r
                     break;\r
             }\r
         }\r
@@ -1679,7 +1667,7 @@ namespace Handbrake
             if (query != null)\r
             {\r
                 //Ok, Reset all the H264 widgets before changing the preset\r
-                x264Panel.reset2Defaults();\r
+                x264Panel.Reset2Defaults();\r
 \r
                 // Send the query from the file to the Query Parser class\r
                 QueryParser presetQuery = QueryParser.Parse(query);\r