WinGui:

- Another change to the video tab to make it consistent with the lingui.
- Fix for the Audio Panel to correctly set the default bit-rate for each encoder.

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

diff --git a/win/C#/Controls/AudioPanel.cs b/win/C#/Controls/AudioPanel.cs
index b31d2c17b149990026862c5dc0e4ded04af764bc..6aa3fbd3e1a8f219f0021d42dc0df7b1d00282d2 100644 (file)
--- a/win/C#/Controls/AudioPanel.cs
+++ b/win/C#/Controls/AudioPanel.cs
@@ -6,12 +6,10 @@
 namespace Handbrake.Controls\r
 {\r
     using System;\r
-    using System.Collections;\r
     using System.Collections.Generic;\r
     using System.Globalization;\r
     using System.Linq;\r
     using System.Windows.Forms;\r
-    using Functions;\r
 \r
     using HandBrake.ApplicationServices.Model;\r
     using HandBrake.ApplicationServices.Parsing;\r
@@ -25,9 +23,7 @@ namespace Handbrake.Controls
     public partial class AudioPanel : UserControl\r
     {\r
         private static readonly CultureInfo Culture = new CultureInfo("en-US", false);\r
-\r
         private const string AC3Passthru = "AC3 Passthru";\r
-\r
         private const string DTSPassthru = "DTS Passthru";\r
 \r
         /// <summary>\r
@@ -46,6 +42,7 @@ namespace Handbrake.Controls
         /// </summary>\r
         public event EventHandler AudioListChanged;\r
 \r
+        #region Public Methods\r
         /// <summary>\r
         /// Get the audio panel\r
         /// </summary>\r
@@ -119,9 +116,9 @@ namespace Handbrake.Controls
                 newTrack.Cells[1].Value = "Automatic";\r
                 newTrack.Cells[2].Value = track.Encoder;\r
                 newTrack.Cells[3].Value = track.MixDown;\r
-                newTrack.Cells[4].Value = track.SampleRate;\r
+                newTrack.Cells[4].Value = track.Encoder.Contains(AC3Passthru) || track.Encoder.Contains(DTSPassthru) ? "Auto" : track.SampleRate;\r
                 newTrack.Cells[5].Value = track.Encoder.Contains(AC3Passthru) || track.Encoder.Contains(DTSPassthru) ? "Auto" : track.Bitrate;\r
-                newTrack.Cells[6].Value = track.DRC;\r
+                newTrack.Cells[6].Value = track.Encoder.Contains(AC3Passthru) || track.Encoder.Contains(DTSPassthru) ? string.Empty : track.DRC;\r
                 AddTrackForPreset(newTrack);\r
             }\r
 \r
@@ -170,67 +167,9 @@ namespace Handbrake.Controls
             this.AutomaticTrackSelection();\r
         }\r
 \r
-        private void AutomaticTrackSelection()\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
-            {\r
-                drp_audioTrack.SelectedIndex = 0;\r
-                foreach (DataGridViewRow item in audioList.Rows)\r
-                {\r
-                    if (this.drp_audioTrack.SelectedItem != null)\r
-                    {\r
-                        item.Cells[1].Value = this.drp_audioTrack.SelectedItem.ToString();\r
-                    }\r
-                }\r
-            }\r
-            else\r
-            {\r
-                int mode = Properties.Settings.Default.DubMode;\r
-                switch (mode)\r
-                {\r
-                    case 1:\r
-                    case 3:\r
-                        // Dub Foreign Language Audio \r
-                        // Select the prefered language audio, or the first track if it doesn't exist.\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
+        #endregion\r
 \r
-                            i++;\r
-                        }\r
-\r
-                        if (drp_audioTrack.SelectedItem != null)\r
-                            foreach (DataGridViewRow item in audioList.Rows)\r
-                                item.Cells[1].Value = drp_audioTrack.SelectedItem.ToString();\r
-                        else\r
-                        {\r
-                            drp_audioTrack.SelectedIndex = 0;\r
-                            if (drp_audioTrack.SelectedItem != null)\r
-                                foreach (DataGridViewRow item in audioList.Rows)\r
-                                    item.Cells[1].Value = drp_audioTrack.SelectedItem.ToString();\r
-                        }\r
-\r
-                        break;\r
-                    case 2:\r
-                    default:\r
-                        // Select the first track which is hopefully the default and foreign track.\r
-                        drp_audioTrack.SelectedIndex = 0;\r
-\r
-                        if (drp_audioTrack.SelectedItem != null)\r
-                            foreach (DataGridViewRow item in audioList.Rows)\r
-                                item.Cells[1].Value = drp_audioTrack.SelectedItem.ToString();\r
-                        break;\r
-                }\r
-            }\r
-        }\r
-\r
-        // Control and ListView\r
+        #region Control and ListView\r
 \r
         /// <summary>\r
         /// one of the controls has changed. Event handler\r
@@ -274,19 +213,13 @@ namespace Handbrake.Controls
                     // Configure the widgets with values\r
                     if (drp_audioEncoder.Text.Contains(AC3Passthru) || drp_audioEncoder.Text.Contains(DTSPassthru))\r
                     {\r
-                        drp_audioMix.Enabled =\r
-                            drp_audioBitrate.Enabled = drp_audioSample.Enabled = tb_drc.Enabled = false;\r
-                        lbl_bitrate.Enabled =\r
-                            lbl_drc.Enabled =\r
-                            lbl_drcHeader.Enabled = lbl_mixdown.Enabled = lbl_sampleRate.Enabled = false;\r
+                        drp_audioMix.Enabled = drp_audioBitrate.Enabled = drp_audioSample.Enabled = tb_drc.Enabled = false;\r
+                        lbl_bitrate.Enabled = lbl_drc.Enabled = lbl_drcHeader.Enabled = lbl_mixdown.Enabled = lbl_sampleRate.Enabled = false;\r
                     }\r
                     else\r
                     {\r
-                        drp_audioMix.Enabled =\r
-                            drp_audioBitrate.Enabled = drp_audioSample.Enabled = tb_drc.Enabled = true;\r
-                        lbl_bitrate.Enabled =\r
-                            lbl_drc.Enabled =\r
-                            lbl_drcHeader.Enabled = lbl_mixdown.Enabled = lbl_sampleRate.Enabled = true;\r
+                        drp_audioMix.Enabled = drp_audioBitrate.Enabled = drp_audioSample.Enabled = tb_drc.Enabled = true;\r
+                        lbl_bitrate.Enabled = lbl_drc.Enabled = lbl_drcHeader.Enabled = lbl_mixdown.Enabled = lbl_sampleRate.Enabled = true;\r
                     }\r
 \r
                     // Update an item in the Audio list if required.\r
@@ -362,7 +295,9 @@ namespace Handbrake.Controls
                 AudioTrackGroup.Text = "Selected Track: None (Click \"Add Track\" to add)";\r
         }\r
 \r
-        // Track Controls\r
+        #endregion\r
+\r
+        #region Track Controls\r
 \r
         /// <summary>\r
         /// The Add Audio Track button event handler\r
@@ -425,7 +360,9 @@ namespace Handbrake.Controls
             RemoveTrack();\r
         }\r
 \r
-        // Audio List Menu\r
+        #endregion\r
+\r
+        #region Audio List Menu\r
 \r
         /// <summary>\r
         /// The Audio List Move Up menu item\r
@@ -469,7 +406,70 @@ namespace Handbrake.Controls
             RemoveTrack();\r
         }\r
 \r
-        // Private Functions\r
+        #endregion\r
+\r
+        #region Private Functions\r
+\r
+\r
+        private void AutomaticTrackSelection()\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
+            {\r
+                drp_audioTrack.SelectedIndex = 0;\r
+                foreach (DataGridViewRow item in audioList.Rows)\r
+                {\r
+                    if (this.drp_audioTrack.SelectedItem != null)\r
+                    {\r
+                        item.Cells[1].Value = this.drp_audioTrack.SelectedItem.ToString();\r
+                    }\r
+                }\r
+            }\r
+            else\r
+            {\r
+                int mode = Properties.Settings.Default.DubMode;\r
+                switch (mode)\r
+                {\r
+                    case 1:\r
+                    case 3:\r
+                        // Dub Foreign Language Audio \r
+                        // Select the prefered language audio, or the first track if it doesn't exist.\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 (DataGridViewRow item in audioList.Rows)\r
+                                item.Cells[1].Value = drp_audioTrack.SelectedItem.ToString();\r
+                        else\r
+                        {\r
+                            drp_audioTrack.SelectedIndex = 0;\r
+                            if (drp_audioTrack.SelectedItem != null)\r
+                                foreach (DataGridViewRow item in audioList.Rows)\r
+                                    item.Cells[1].Value = drp_audioTrack.SelectedItem.ToString();\r
+                        }\r
+\r
+                        break;\r
+                    case 2:\r
+                    default:\r
+                        // Select the first track which is hopefully the default and foreign track.\r
+                        drp_audioTrack.SelectedIndex = 0;\r
+\r
+                        if (drp_audioTrack.SelectedItem != null)\r
+                            foreach (DataGridViewRow item in audioList.Rows)\r
+                                item.Cells[1].Value = drp_audioTrack.SelectedItem.ToString();\r
+                        break;\r
+                }\r
+            }\r
+        }\r
 \r
         /// <summary>\r
         /// Add track for preset\r
@@ -582,6 +582,9 @@ namespace Handbrake.Controls
         private void SetBitrate()\r
         {\r
             int max = 0;\r
+            string defaultRate = "160";\r
+\r
+            // Remove defaults\r
             drp_audioBitrate.Items.Remove("Auto");\r
             drp_audioBitrate.Items.Remove("192");\r
             drp_audioBitrate.Items.Remove("224");\r
@@ -592,32 +595,38 @@ namespace Handbrake.Controls
             drp_audioBitrate.Items.Remove("640");\r
             drp_audioBitrate.Items.Remove("768");\r
 \r
+            // Find Max and Defaults based on encoders\r
             switch (drp_audioEncoder.Text)\r
             {\r
                 case "AAC (faac)":\r
                     max = drp_audioMix.Text.Contains("6 Channel") ? 768 : 320;\r
+                    defaultRate = "160";\r
                     break;\r
                 case "MP3 (lame)":\r
                     max = 320;\r
+                    defaultRate = "160";\r
                     break;\r
                 case "Vorbis (vorbis)":\r
+                    defaultRate = "160";\r
                     max = 384;\r
                     break;\r
                 case "AC3 (ffmpeg)":\r
+                    defaultRate = "640";\r
                     max = 640;\r
                     break;\r
                 case AC3Passthru:\r
                     drp_audioBitrate.Items.Add("Auto");\r
-                    drp_audioBitrate.SelectedItem = "Auto";\r
+                    defaultRate = "Auto";\r
                     drp_audioSample.SelectedItem = "Auto";\r
                     break;\r
                 case DTSPassthru:\r
                     drp_audioBitrate.Items.Add("Auto");\r
-                    drp_audioBitrate.SelectedItem = "Auto";\r
+                    defaultRate = "Auto";\r
                     drp_audioSample.SelectedItem = "Auto";\r
                     break;\r
             }\r
 \r
+            // Re-add appropiate options\r
             if (max > 160)\r
             {\r
                 drp_audioBitrate.Items.Add("192");\r
@@ -642,13 +651,8 @@ namespace Handbrake.Controls
                 drp_audioBitrate.Items.Add("768");\r
             }\r
 \r
-            if (drp_audioBitrate.SelectedItem == null && audioList.SelectedRows.Count == 0)\r
-                drp_audioBitrate.SelectedIndex = drp_audioBitrate.Items.Count - 1;\r
-\r
-            if (drp_audioBitrate.SelectedItem == null && audioList.SelectedRows.Count != 0 && (string)this.audioList.SelectedRows[0].Cells[5].Value == "Auto")\r
-            {\r
-                drp_audioBitrate.SelectedItem = "160";\r
-            }\r
+            // Set the default bit-rate\r
+            drp_audioBitrate.SelectedItem = defaultRate;\r
         }\r
 \r
         /// <summary>\r
@@ -694,5 +698,7 @@ namespace Handbrake.Controls
                     break;\r
             }\r
         }\r
+\r
+        #endregion\r
     }\r
 }
\ No newline at end of file

diff --git a/win/C#/frmMain.Designer.cs b/win/C#/frmMain.Designer.cs
index 9c01eab9c2503d3bb74388a7cb29d49ffdff6659..525da334c6b73b040ae42723599678d530a65678 100644 (file)
--- a/win/C#/frmMain.Designer.cs
+++ b/win/C#/frmMain.Designer.cs
@@ -67,6 +67,9 @@ namespace Handbrake
             this.btn_export = new System.Windows.Forms.Button();\r
             this.drop_mode = new System.Windows.Forms.ComboBox();\r
             this.btn_generate_Query = new System.Windows.Forms.Button();\r
+            this.radio_cq = new System.Windows.Forms.RadioButton();\r
+            this.radio_avgBitrate = new System.Windows.Forms.RadioButton();\r
+            this.check_2PassEncode = new System.Windows.Forms.CheckBox();\r
             this.treeView_presets = new System.Windows.Forms.TreeView();\r
             this.presets_menu = new System.Windows.Forms.ContextMenuStrip(this.components);\r
             this.pmnu_expandAll = new System.Windows.Forms.ToolStripMenuItem();\r
@@ -93,24 +96,28 @@ 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_rfwarn = 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.panel1 = new System.Windows.Forms.Panel();\r
+            this.radio_constantFramerate = new System.Windows.Forms.RadioButton();\r
+            this.radio_peakAndVariable = new System.Windows.Forms.RadioButton();\r
             this.label25 = new System.Windows.Forms.Label();\r
-            this.check_2PassEncode = new System.Windows.Forms.CheckBox();\r
             this.Label2 = new System.Windows.Forms.Label();\r
             this.lbl_SliderValue = new System.Windows.Forms.Label();\r
             this.lbl_framerate = 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
@@ -172,14 +179,6 @@ namespace Handbrake
             this.SourceLayoutPanel = new System.Windows.Forms.FlowLayoutPanel();\r
             this.openPreset = new System.Windows.Forms.OpenFileDialog();\r
             this.File_ChapterImport = new System.Windows.Forms.OpenFileDialog();\r
-            this.radio_constantFramerate = new System.Windows.Forms.RadioButton();\r
-            this.radio_peakAndVariable = new System.Windows.Forms.RadioButton();\r
-            this.panel1 = new System.Windows.Forms.Panel();\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
@@ -189,6 +188,7 @@ namespace Handbrake
             this.frmMainMenu.SuspendLayout();\r
             this.tab_audio.SuspendLayout();\r
             this.tab_video.SuspendLayout();\r
+            this.panel1.SuspendLayout();\r
             this.tab_picture.SuspendLayout();\r
             this.tabs_panel.SuspendLayout();\r
             this.tab_filters.SuspendLayout();\r
@@ -208,7 +208,6 @@ namespace Handbrake
             this.tableLayoutPanel3.SuspendLayout();\r
             this.tableLayoutPanel1.SuspendLayout();\r
             this.SourceLayoutPanel.SuspendLayout();\r
-            this.panel1.SuspendLayout();\r
             this.SuspendLayout();\r
             // \r
             // notifyIconMenu\r
@@ -550,6 +549,47 @@ namespace Handbrake
             this.btn_generate_Query.UseVisualStyleBackColor = true;\r
             this.btn_generate_Query.Click += new System.EventHandler(this.btn_generate_Query_Click);\r
             // \r
+            // radio_cq\r
+            // \r
+            this.radio_cq.AutoSize = true;\r
+            this.radio_cq.BackColor = System.Drawing.Color.Transparent;\r
+            this.radio_cq.Location = new System.Drawing.Point(366, 37);\r
+            this.radio_cq.Name = "radio_cq";\r
+            this.radio_cq.Size = new System.Drawing.Size(110, 17);\r
+            this.radio_cq.TabIndex = 3;\r
+            this.radio_cq.Text = "Constant Quality:";\r
+            this.ToolTip.SetToolTip(this.radio_cq, resources.GetString("radio_cq.ToolTip"));\r
+            this.radio_cq.UseVisualStyleBackColor = false;\r
+            this.radio_cq.CheckedChanged += new System.EventHandler(this.radio_cq_CheckedChanged);\r
+            // \r
+            // radio_avgBitrate\r
+            // \r
+            this.radio_avgBitrate.AutoSize = true;\r
+            this.radio_avgBitrate.BackColor = System.Drawing.Color.Transparent;\r
+            this.radio_avgBitrate.Checked = true;\r
+            this.radio_avgBitrate.Location = new System.Drawing.Point(367, 108);\r
+            this.radio_avgBitrate.Name = "radio_avgBitrate";\r
+            this.radio_avgBitrate.Size = new System.Drawing.Size(116, 17);\r
+            this.radio_avgBitrate.TabIndex = 4;\r
+            this.radio_avgBitrate.TabStop = true;\r
+            this.radio_avgBitrate.Text = "Avg Bitrate (kbps):";\r
+            this.ToolTip.SetToolTip(this.radio_avgBitrate, resources.GetString("radio_avgBitrate.ToolTip"));\r
+            this.radio_avgBitrate.UseVisualStyleBackColor = false;\r
+            this.radio_avgBitrate.CheckedChanged += new System.EventHandler(this.radio_avgBitrate_CheckedChanged);\r
+            // \r
+            // check_2PassEncode\r
+            // \r
+            this.check_2PassEncode.AutoSize = true;\r
+            this.check_2PassEncode.BackColor = System.Drawing.Color.Transparent;\r
+            this.check_2PassEncode.Location = new System.Drawing.Point(385, 134);\r
+            this.check_2PassEncode.Name = "check_2PassEncode";\r
+            this.check_2PassEncode.Size = new System.Drawing.Size(104, 17);\r
+            this.check_2PassEncode.TabIndex = 10;\r
+            this.check_2PassEncode.Text = "2-Pass Encoding";\r
+            this.ToolTip.SetToolTip(this.check_2PassEncode, resources.GetString("check_2PassEncode.ToolTip"));\r
+            this.check_2PassEncode.UseVisualStyleBackColor = false;\r
+            this.check_2PassEncode.CheckedChanged += new System.EventHandler(this.check_2PassEncode_CheckedChanged);\r
+            // \r
             // treeView_presets\r
             // \r
             this.treeView_presets.ContextMenuStrip = this.presets_menu;\r
@@ -775,6 +815,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
@@ -785,7 +834,6 @@ namespace Handbrake
             // \r
             this.tab_video.BackColor = System.Drawing.Color.Transparent;\r
             this.tab_video.Controls.Add(this.panel1);\r
-            this.tab_video.Controls.Add(this.lbl_rfwarn);\r
             this.tab_video.Controls.Add(this.drp_videoFramerate);\r
             this.tab_video.Controls.Add(this.radio_cq);\r
             this.tab_video.Controls.Add(this.radio_avgBitrate);\r
@@ -807,46 +855,38 @@ namespace Handbrake
             this.tab_video.Text = "Video";\r
             this.tab_video.UseVisualStyleBackColor = true;\r
             // \r
-            // lbl_rfwarn\r
+            // panel1\r
             // \r
-            this.lbl_rfwarn.AutoSize = true;\r
-            this.lbl_rfwarn.BackColor = System.Drawing.Color.Transparent;\r
-            this.lbl_rfwarn.ForeColor = System.Drawing.Color.Red;\r
-            this.lbl_rfwarn.Location = new System.Drawing.Point(363, 257);\r
-            this.lbl_rfwarn.Name = "lbl_rfwarn";\r
-            this.lbl_rfwarn.Size = new System.Drawing.Size(321, 39);\r
-            this.lbl_rfwarn.TabIndex = 0;\r
-            this.lbl_rfwarn.Text = "RF:0 is x264\'s lossless mode.\r\nThis will result in a very large output which may " +\r
-                "not be compatible\r\nwith your playback software.";\r
-            this.lbl_rfwarn.Visible = false;\r
+            this.panel1.Controls.Add(this.radio_constantFramerate);\r
+            this.panel1.Controls.Add(this.radio_peakAndVariable);\r
+            this.panel1.Location = new System.Drawing.Point(125, 92);\r
+            this.panel1.Name = "panel1";\r
+            this.panel1.Size = new System.Drawing.Size(184, 59);\r
+            this.panel1.TabIndex = 20;\r
             // \r
-            // radio_cq\r
+            // radio_constantFramerate\r
             // \r
-            this.radio_cq.AutoSize = true;\r
-            this.radio_cq.BackColor = System.Drawing.Color.Transparent;\r
-            this.radio_cq.Location = new System.Drawing.Point(366, 37);\r
-            this.radio_cq.Name = "radio_cq";\r
-            this.radio_cq.Size = new System.Drawing.Size(110, 17);\r
-            this.radio_cq.TabIndex = 3;\r
-            this.radio_cq.Text = "Constant Quality:";\r
-            this.ToolTip.SetToolTip(this.radio_cq, resources.GetString("radio_cq.ToolTip"));\r
-            this.radio_cq.UseVisualStyleBackColor = false;\r
-            this.radio_cq.CheckedChanged += new System.EventHandler(this.radio_cq_CheckedChanged);\r
+            this.radio_constantFramerate.AutoSize = true;\r
+            this.radio_constantFramerate.BackColor = System.Drawing.Color.Transparent;\r
+            this.radio_constantFramerate.Checked = true;\r
+            this.radio_constantFramerate.Location = new System.Drawing.Point(0, 0);\r
+            this.radio_constantFramerate.Name = "radio_constantFramerate";\r
+            this.radio_constantFramerate.Size = new System.Drawing.Size(122, 17);\r
+            this.radio_constantFramerate.TabIndex = 17;\r
+            this.radio_constantFramerate.TabStop = true;\r
+            this.radio_constantFramerate.Text = "Constant Framerate";\r
+            this.radio_constantFramerate.UseVisualStyleBackColor = false;\r
             // \r
-            // radio_avgBitrate\r
+            // radio_peakAndVariable\r
             // \r
-            this.radio_avgBitrate.AutoSize = true;\r
-            this.radio_avgBitrate.BackColor = System.Drawing.Color.Transparent;\r
-            this.radio_avgBitrate.Checked = true;\r
-            this.radio_avgBitrate.Location = new System.Drawing.Point(367, 108);\r
-            this.radio_avgBitrate.Name = "radio_avgBitrate";\r
-            this.radio_avgBitrate.Size = new System.Drawing.Size(116, 17);\r
-            this.radio_avgBitrate.TabIndex = 4;\r
-            this.radio_avgBitrate.TabStop = true;\r
-            this.radio_avgBitrate.Text = "Avg Bitrate (kbps):";\r
-            this.ToolTip.SetToolTip(this.radio_avgBitrate, resources.GetString("radio_avgBitrate.ToolTip"));\r
-            this.radio_avgBitrate.UseVisualStyleBackColor = false;\r
-            this.radio_avgBitrate.CheckedChanged += new System.EventHandler(this.radio_avgBitrate_CheckedChanged);\r
+            this.radio_peakAndVariable.AutoSize = true;\r
+            this.radio_peakAndVariable.BackColor = System.Drawing.Color.Transparent;\r
+            this.radio_peakAndVariable.Location = new System.Drawing.Point(0, 23);\r
+            this.radio_peakAndVariable.Name = "radio_peakAndVariable";\r
+            this.radio_peakAndVariable.Size = new System.Drawing.Size(116, 17);\r
+            this.radio_peakAndVariable.TabIndex = 19;\r
+            this.radio_peakAndVariable.Text = "Variable Framerate";\r
+            this.radio_peakAndVariable.UseVisualStyleBackColor = false;\r
             // \r
             // label25\r
             // \r
@@ -859,19 +899,6 @@ namespace Handbrake
             this.label25.TabIndex = 8;\r
             this.label25.Text = "Video";\r
             // \r
-            // check_2PassEncode\r
-            // \r
-            this.check_2PassEncode.AutoSize = true;\r
-            this.check_2PassEncode.BackColor = System.Drawing.Color.Transparent;\r
-            this.check_2PassEncode.Location = new System.Drawing.Point(385, 134);\r
-            this.check_2PassEncode.Name = "check_2PassEncode";\r
-            this.check_2PassEncode.Size = new System.Drawing.Size(104, 17);\r
-            this.check_2PassEncode.TabIndex = 10;\r
-            this.check_2PassEncode.Text = "2-Pass Encoding";\r
-            this.ToolTip.SetToolTip(this.check_2PassEncode, resources.GetString("check_2PassEncode.ToolTip"));\r
-            this.check_2PassEncode.UseVisualStyleBackColor = false;\r
-            this.check_2PassEncode.CheckedChanged += new System.EventHandler(this.check_2PassEncode_CheckedChanged);\r
-            // \r
             // Label2\r
             // \r
             this.Label2.AutoSize = true;\r
@@ -916,13 +943,25 @@ 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.PresetMaximumResolution = new System.Drawing.Size(0, 0);\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
             this.Check_ChapterMarkers.BackColor = System.Drawing.Color.Transparent;\r
             this.Check_ChapterMarkers.Location = new System.Drawing.Point(16, 32);\r
             this.Check_ChapterMarkers.Name = "Check_ChapterMarkers";\r
-            this.Check_ChapterMarkers.Size = new System.Drawing.Size(140, 17);\r
+            this.Check_ChapterMarkers.Size = new System.Drawing.Size(136, 17);\r
             this.Check_ChapterMarkers.TabIndex = 4;\r
             this.Check_ChapterMarkers.Text = "Create chapter markers";\r
             this.Check_ChapterMarkers.UseVisualStyleBackColor = false;\r
@@ -954,6 +993,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
@@ -965,6 +1013,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
@@ -1003,6 +1060,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
@@ -1655,87 +1722,6 @@ namespace Handbrake
             // \r
             this.File_ChapterImport.Filter = "CSV Files|*.csv";\r
             // \r
-            // radio_constantFramerate\r
-            // \r
-            this.radio_constantFramerate.AutoSize = true;\r
-            this.radio_constantFramerate.BackColor = System.Drawing.Color.Transparent;\r
-            this.radio_constantFramerate.Checked = true;\r
-            this.radio_constantFramerate.Location = new System.Drawing.Point(0, 0);\r
-            this.radio_constantFramerate.Name = "radio_constantFramerate";\r
-            this.radio_constantFramerate.Size = new System.Drawing.Size(122, 17);\r
-            this.radio_constantFramerate.TabIndex = 17;\r
-            this.radio_constantFramerate.Text = "Constant Framerate";\r
-            this.radio_constantFramerate.UseVisualStyleBackColor = false;\r
-            // \r
-            // radio_peakAndVariable\r
-            // \r
-            this.radio_peakAndVariable.AutoSize = true;\r
-            this.radio_peakAndVariable.BackColor = System.Drawing.Color.Transparent;\r
-            this.radio_peakAndVariable.Location = new System.Drawing.Point(0, 23);\r
-            this.radio_peakAndVariable.Name = "radio_peakAndVariable";\r
-            this.radio_peakAndVariable.Size = new System.Drawing.Size(116, 17);\r
-            this.radio_peakAndVariable.TabIndex = 19;\r
-            this.radio_peakAndVariable.Text = "Variable Framerate";\r
-            this.radio_peakAndVariable.UseVisualStyleBackColor = false;\r
-            // \r
-            // panel1\r
-            // \r
-            this.panel1.Controls.Add(this.radio_constantFramerate);\r
-            this.panel1.Controls.Add(this.radio_peakAndVariable);\r
-            this.panel1.Location = new System.Drawing.Point(125, 92);\r
-            this.panel1.Name = "panel1";\r
-            this.panel1.Size = new System.Drawing.Size(184, 59);\r
-            this.panel1.TabIndex = 20;\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.PresetMaximumResolution = new System.Drawing.Size(0, 0);\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
@@ -1772,6 +1758,8 @@ namespace Handbrake
             this.tab_audio.ResumeLayout(false);\r
             this.tab_video.ResumeLayout(false);\r
             this.tab_video.PerformLayout();\r
+            this.panel1.ResumeLayout(false);\r
+            this.panel1.PerformLayout();\r
             this.tab_picture.ResumeLayout(false);\r
             this.tabs_panel.ResumeLayout(false);\r
             this.tab_filters.ResumeLayout(false);\r
@@ -1801,8 +1789,6 @@ namespace Handbrake
             this.tableLayoutPanel1.PerformLayout();\r
             this.SourceLayoutPanel.ResumeLayout(false);\r
             this.SourceLayoutPanel.PerformLayout();\r
-            this.panel1.ResumeLayout(false);\r
-            this.panel1.PerformLayout();\r
             this.ResumeLayout(false);\r
             this.PerformLayout();\r
 \r
@@ -1929,7 +1915,6 @@ namespace Handbrake
         private ToolStripMenuItem btnTitleSpecific;\r
         private ToolStripMenuItem FileTitleSpecificScan;\r
         private ToolStripMenuItem FolderTitleSpecificScan;\r
-        internal Label lbl_rfwarn;\r
         private ToolStripSeparator toolStripSeparator8;\r
         private ToolStripDropDownButton toolStripDropDownButton1;\r
         private ToolStripMenuItem MnuUserGuide;\r

diff --git a/win/C#/frmMain.cs b/win/C#/frmMain.cs
index 93742674fe4191231340ae76d243386d1cc25c45..a3cd44187a1131970980e535aa5769e1afad4c3b 100644 (file)
--- a/win/C#/frmMain.cs
+++ b/win/C#/frmMain.cs
@@ -1879,7 +1879,12 @@ namespace Handbrake
                     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
-                    this.lbl_rfwarn.Visible = rfValue == 0;\r
+\r
+                    if (rfValue == 0)\r
+                    {\r
+                        lbl_SliderValue.Text += " (Warning: lossless)";\r
+                    }\r
+                    \r
                     break;\r
                 case "VP3 (Theora)":\r
                     lbl_SliderValue.Text = "QP:" + slider_videoQuality.Value;\r

diff --git a/win/C#/frmMain.resx b/win/C#/frmMain.resx
index 58a090f55624afa4dd0baed80f568d3a13c790aa..a737bb095ca8bf7eac77b277d888f8dc3cc4a077 100644 (file)
--- a/win/C#/frmMain.resx
+++ b/win/C#/frmMain.resx
@@ -192,24 +192,6 @@ The Following options are not 100% accurate:
 - Encode video between a start and end time, measured in seconds\r
 - Encode video between a start and end frame.</value>\r
   </data>\r
-  <metadata name="presets_menu.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">\r
-    <value>984, 17</value>\r
-  </metadata>\r
-  <metadata name="DVD_Open.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">\r
-    <value>232, 15</value>\r
-  </metadata>\r
-  <metadata name="File_Open.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">\r
-    <value>450, 15</value>\r
-  </metadata>\r
-  <metadata name="ISO_Open.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">\r
-    <value>343, 15</value>\r
-  </metadata>\r
-  <metadata name="frmMainMenu.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">\r
-    <value>106, 15</value>\r
-  </metadata>\r
-  <metadata name="AudioMenuRowHeightHack.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">\r
-    <value>17, 54</value>\r
-  </metadata>\r
   <data name="radio_cq.ToolTip" xml:space="preserve">\r
     <value>Set the desired quality factor. The encoder targets a certain quality.\r
 The scale used by each video encoder is different.\r
@@ -236,6 +218,24 @@ prerequisite. During the 1st pass, statistics about the video
 are collected. Then in a second pass, those statistics are used\r
 to make bitrate allocation decisions.</value>\r
   </data>\r
+  <metadata name="presets_menu.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">\r
+    <value>984, 17</value>\r
+  </metadata>\r
+  <metadata name="DVD_Open.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">\r
+    <value>232, 15</value>\r
+  </metadata>\r
+  <metadata name="File_Open.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">\r
+    <value>450, 15</value>\r
+  </metadata>\r
+  <metadata name="ISO_Open.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">\r
+    <value>343, 15</value>\r
+  </metadata>\r
+  <metadata name="frmMainMenu.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">\r
+    <value>106, 15</value>\r
+  </metadata>\r
+  <metadata name="AudioMenuRowHeightHack.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">\r
+    <value>17, 54</value>\r
+  </metadata>\r
   <data name="label34.Text" xml:space="preserve">\r
     <value>Here you can alter the query generated by this program. This feature is for one job overriding of the automatic query generation.\r
 Don't forget to re-generate this query if you change any GUI options.\r