WinGui:

- Improved audio panel design.

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

diff --git a/win/CS/Controls/AudioPanel.Designer.cs b/win/CS/Controls/AudioPanel.Designer.cs
index 1ef05e377d83001917023b7a5e080ef232ceb7ac..fef5ae9b34c42e2955ef0ec80cc6e1458e250c4f 100644 (file)
--- a/win/CS/Controls/AudioPanel.Designer.cs
+++ b/win/CS/Controls/AudioPanel.Designer.cs
@@ -35,6 +35,7 @@ namespace Handbrake.Controls
         private void InitializeComponent()\r
         {\r
             this.components = new System.ComponentModel.Container();\r
+            System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(AudioPanel));\r
             this.audioMenu = new System.Windows.Forms.ContextMenuStrip(this.components);\r
             this.audioList_moveup = new System.Windows.Forms.ToolStripMenuItem();\r
             this.audioList_movedown = new System.Windows.Forms.ToolStripMenuItem();\r
@@ -43,31 +44,26 @@ namespace Handbrake.Controls
             this.btn_RemoveAudioTrack = new System.Windows.Forms.Button();\r
             this.btn_addAudioTrack = new System.Windows.Forms.Button();\r
             this.lbl_drc = new System.Windows.Forms.Label();\r
-            this.lbl_drcHeader = new System.Windows.Forms.Label();\r
             this.tb_drc = new System.Windows.Forms.TrackBar();\r
             this.label68 = new System.Windows.Forms.Label();\r
-            this.lbl_sampleRate = new System.Windows.Forms.Label();\r
-            this.lbl_bitrate = new System.Windows.Forms.Label();\r
-            this.label65 = new System.Windows.Forms.Label();\r
-            this.lbl_mixdown = new System.Windows.Forms.Label();\r
             this.drp_audioEncoder = new System.Windows.Forms.ComboBox();\r
-            this.label27 = new System.Windows.Forms.Label();\r
             this.drp_audioMix = new System.Windows.Forms.ComboBox();\r
             this.drp_audioTrack = new System.Windows.Forms.ComboBox();\r
             this.drp_audioBitrate = new System.Windows.Forms.ComboBox();\r
             this.drp_audioSample = new System.Windows.Forms.ComboBox();\r
-            this.AudioTrackGroup = new System.Windows.Forms.GroupBox();\r
             this.AudioMenuRowHeightHack = new System.Windows.Forms.ImageList(this.components);\r
-            this.audioList = new System.Windows.Forms.DataGridView();\r
-            this.Source = new System.Windows.Forms.DataGridViewTextBoxColumn();\r
-            this.AudioCodec = new System.Windows.Forms.DataGridViewTextBoxColumn();\r
-            this.Mixdown = new System.Windows.Forms.DataGridViewTextBoxColumn();\r
-            this.Samplerate = new System.Windows.Forms.DataGridViewTextBoxColumn();\r
-            this.Bitrate = new System.Windows.Forms.DataGridViewTextBoxColumn();\r
+            this.label1 = new System.Windows.Forms.Label();\r
+            this.lbl_audioTrack = new System.Windows.Forms.Label();\r
             this.DRC = new System.Windows.Forms.DataGridViewTextBoxColumn();\r
+            this.Bitrate = new System.Windows.Forms.DataGridViewTextBoxColumn();\r
+            this.Samplerate = new System.Windows.Forms.DataGridViewTextBoxColumn();\r
+            this.Mixdown = new System.Windows.Forms.DataGridViewTextBoxColumn();\r
+            this.AudioCodec = new System.Windows.Forms.DataGridViewTextBoxColumn();\r
+            this.Source = new System.Windows.Forms.DataGridViewTextBoxColumn();\r
+            this.audioList = new System.Windows.Forms.DataGridView();\r
+            this.ToolTips = new System.Windows.Forms.ToolTip(this.components);\r
             this.audioMenu.SuspendLayout();\r
             ((System.ComponentModel.ISupportInitialize)(this.tb_drc)).BeginInit();\r
-            this.AudioTrackGroup.SuspendLayout();\r
             ((System.ComponentModel.ISupportInitialize)(this.audioList)).BeginInit();\r
             this.SuspendLayout();\r
             // \r
@@ -138,33 +134,24 @@ namespace Handbrake.Controls
             // \r
             this.lbl_drc.AutoSize = true;\r
             this.lbl_drc.BackColor = System.Drawing.Color.Transparent;\r
-            this.lbl_drc.Location = new System.Drawing.Point(658, 37);\r
+            this.lbl_drc.Location = new System.Drawing.Point(666, 90);\r
             this.lbl_drc.Name = "lbl_drc";\r
             this.lbl_drc.Size = new System.Drawing.Size(13, 13);\r
             this.lbl_drc.TabIndex = 62;\r
             this.lbl_drc.Text = "0";\r
             // \r
-            // lbl_drcHeader\r
-            // \r
-            this.lbl_drcHeader.AutoSize = true;\r
-            this.lbl_drcHeader.BackColor = System.Drawing.Color.Transparent;\r
-            this.lbl_drcHeader.Location = new System.Drawing.Point(607, 17);\r
-            this.lbl_drcHeader.Name = "lbl_drcHeader";\r
-            this.lbl_drcHeader.Size = new System.Drawing.Size(28, 13);\r
-            this.lbl_drcHeader.TabIndex = 61;\r
-            this.lbl_drcHeader.Text = "DRC";\r
-            // \r
             // tb_drc\r
             // \r
             this.tb_drc.BackColor = System.Drawing.SystemColors.Window;\r
             this.tb_drc.LargeChange = 0;\r
-            this.tb_drc.Location = new System.Drawing.Point(598, 29);\r
+            this.tb_drc.Location = new System.Drawing.Point(608, 84);\r
             this.tb_drc.Margin = new System.Windows.Forms.Padding(0);\r
             this.tb_drc.Maximum = 31;\r
             this.tb_drc.Name = "tb_drc";\r
             this.tb_drc.Size = new System.Drawing.Size(57, 45);\r
             this.tb_drc.TabIndex = 60;\r
             this.tb_drc.TickFrequency = 10;\r
+            this.ToolTips.SetToolTip(this.tb_drc, resources.GetString("tb_drc.ToolTip"));\r
             this.tb_drc.Scroll += new System.EventHandler(this.ControlChanged);\r
             // \r
             // label68\r
@@ -178,46 +165,6 @@ namespace Handbrake.Controls
             this.label68.TabIndex = 49;\r
             this.label68.Text = "Audio Tracks";\r
             // \r
-            // lbl_sampleRate\r
-            // \r
-            this.lbl_sampleRate.AutoSize = true;\r
-            this.lbl_sampleRate.BackColor = System.Drawing.Color.Transparent;\r
-            this.lbl_sampleRate.Location = new System.Drawing.Point(463, 17);\r
-            this.lbl_sampleRate.Name = "lbl_sampleRate";\r
-            this.lbl_sampleRate.Size = new System.Drawing.Size(61, 13);\r
-            this.lbl_sampleRate.TabIndex = 57;\r
-            this.lbl_sampleRate.Text = "Samplerate";\r
-            // \r
-            // lbl_bitrate\r
-            // \r
-            this.lbl_bitrate.AutoSize = true;\r
-            this.lbl_bitrate.BackColor = System.Drawing.Color.Transparent;\r
-            this.lbl_bitrate.Location = new System.Drawing.Point(538, 17);\r
-            this.lbl_bitrate.Name = "lbl_bitrate";\r
-            this.lbl_bitrate.Size = new System.Drawing.Size(39, 13);\r
-            this.lbl_bitrate.TabIndex = 59;\r
-            this.lbl_bitrate.Text = "Bitrate";\r
-            // \r
-            // label65\r
-            // \r
-            this.label65.AutoSize = true;\r
-            this.label65.BackColor = System.Drawing.Color.Transparent;\r
-            this.label65.Location = new System.Drawing.Point(234, 17);\r
-            this.label65.Name = "label65";\r
-            this.label65.Size = new System.Drawing.Size(67, 13);\r
-            this.label65.TabIndex = 53;\r
-            this.label65.Text = "Audio Codec";\r
-            // \r
-            // lbl_mixdown\r
-            // \r
-            this.lbl_mixdown.AutoSize = true;\r
-            this.lbl_mixdown.BackColor = System.Drawing.Color.Transparent;\r
-            this.lbl_mixdown.Location = new System.Drawing.Point(368, 17);\r
-            this.lbl_mixdown.Name = "lbl_mixdown";\r
-            this.lbl_mixdown.Size = new System.Drawing.Size(49, 13);\r
-            this.lbl_mixdown.TabIndex = 55;\r
-            this.lbl_mixdown.Text = "Mixdown";\r
-            // \r
             // drp_audioEncoder\r
             // \r
             this.drp_audioEncoder.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;\r
@@ -229,22 +176,13 @@ namespace Handbrake.Controls
             "AC3 Passthru",\r
             "AC3 (ffmpeg)",\r
             "DTS Passthru"});\r
-            this.drp_audioEncoder.Location = new System.Drawing.Point(215, 34);\r
+            this.drp_audioEncoder.Location = new System.Drawing.Point(191, 87);\r
             this.drp_audioEncoder.Name = "drp_audioEncoder";\r
             this.drp_audioEncoder.Size = new System.Drawing.Size(111, 21);\r
             this.drp_audioEncoder.TabIndex = 52;\r
+            this.ToolTips.SetToolTip(this.drp_audioEncoder, "Set the audio codec to encode the selected track with.");\r
             this.drp_audioEncoder.SelectedIndexChanged += new System.EventHandler(this.ControlChanged);\r
             // \r
-            // label27\r
-            // \r
-            this.label27.AutoSize = true;\r
-            this.label27.BackColor = System.Drawing.Color.Transparent;\r
-            this.label27.Location = new System.Drawing.Point(86, 17);\r
-            this.label27.Name = "label27";\r
-            this.label27.Size = new System.Drawing.Size(40, 13);\r
-            this.label27.TabIndex = 51;\r
-            this.label27.Text = "Source";\r
-            // \r
             // drp_audioMix\r
             // \r
             this.drp_audioMix.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;\r
@@ -256,10 +194,11 @@ namespace Handbrake.Controls
             "Dolby Surround",\r
             "Dolby Pro Logic II",\r
             "6 Channel Discrete"});\r
-            this.drp_audioMix.Location = new System.Drawing.Point(332, 34);\r
+            this.drp_audioMix.Location = new System.Drawing.Point(309, 87);\r
             this.drp_audioMix.Name = "drp_audioMix";\r
-            this.drp_audioMix.Size = new System.Drawing.Size(129, 21);\r
+            this.drp_audioMix.Size = new System.Drawing.Size(147, 21);\r
             this.drp_audioMix.TabIndex = 54;\r
+            this.ToolTips.SetToolTip(this.drp_audioMix, "Set the mixdown for the selected audio track.");\r
             this.drp_audioMix.SelectedIndexChanged += new System.EventHandler(this.ControlChanged);\r
             // \r
             // drp_audioTrack\r
@@ -268,10 +207,11 @@ namespace Handbrake.Controls
             this.drp_audioTrack.FormattingEnabled = true;\r
             this.drp_audioTrack.Items.AddRange(new object[] {\r
             "Automatic"});\r
-            this.drp_audioTrack.Location = new System.Drawing.Point(15, 34);\r
+            this.drp_audioTrack.Location = new System.Drawing.Point(16, 87);\r
             this.drp_audioTrack.Name = "drp_audioTrack";\r
-            this.drp_audioTrack.Size = new System.Drawing.Size(194, 21);\r
+            this.drp_audioTrack.Size = new System.Drawing.Size(170, 21);\r
             this.drp_audioTrack.TabIndex = 50;\r
+            this.ToolTips.SetToolTip(this.drp_audioTrack, "The list of audio tracks available from your source.");\r
             this.drp_audioTrack.SelectedIndexChanged += new System.EventHandler(this.ControlChanged);\r
             // \r
             // drp_audioBitrate\r
@@ -289,10 +229,11 @@ namespace Handbrake.Controls
             "112",\r
             "128",\r
             "160"});\r
-            this.drp_audioBitrate.Location = new System.Drawing.Point(525, 34);\r
+            this.drp_audioBitrate.Location = new System.Drawing.Point(534, 87);\r
             this.drp_audioBitrate.Name = "drp_audioBitrate";\r
-            this.drp_audioBitrate.Size = new System.Drawing.Size(70, 21);\r
+            this.drp_audioBitrate.Size = new System.Drawing.Size(67, 21);\r
             this.drp_audioBitrate.TabIndex = 58;\r
+            this.ToolTips.SetToolTip(this.drp_audioBitrate, "Set the bitrate for the selected audio track.");\r
             this.drp_audioBitrate.SelectedIndexChanged += new System.EventHandler(this.ControlChanged);\r
             // \r
             // drp_audioSample\r
@@ -306,41 +247,100 @@ namespace Handbrake.Controls
             "32",\r
             "24",\r
             "22.05"});\r
-            this.drp_audioSample.Location = new System.Drawing.Point(467, 34);\r
+            this.drp_audioSample.Location = new System.Drawing.Point(461, 87);\r
             this.drp_audioSample.Name = "drp_audioSample";\r
-            this.drp_audioSample.Size = new System.Drawing.Size(55, 21);\r
+            this.drp_audioSample.Size = new System.Drawing.Size(67, 21);\r
             this.drp_audioSample.TabIndex = 56;\r
+            this.ToolTips.SetToolTip(this.drp_audioSample, "Set the samplerate for the selected audio track.");\r
             this.drp_audioSample.SelectedIndexChanged += new System.EventHandler(this.ControlChanged);\r
             // \r
-            // AudioTrackGroup\r
-            // \r
-            this.AudioTrackGroup.BackColor = System.Drawing.Color.Transparent;\r
-            this.AudioTrackGroup.Controls.Add(this.drp_audioTrack);\r
-            this.AudioTrackGroup.Controls.Add(this.drp_audioSample);\r
-            this.AudioTrackGroup.Controls.Add(this.drp_audioBitrate);\r
-            this.AudioTrackGroup.Controls.Add(this.drp_audioMix);\r
-            this.AudioTrackGroup.Controls.Add(this.lbl_drc);\r
-            this.AudioTrackGroup.Controls.Add(this.label27);\r
-            this.AudioTrackGroup.Controls.Add(this.lbl_drcHeader);\r
-            this.AudioTrackGroup.Controls.Add(this.drp_audioEncoder);\r
-            this.AudioTrackGroup.Controls.Add(this.tb_drc);\r
-            this.AudioTrackGroup.Controls.Add(this.lbl_mixdown);\r
-            this.AudioTrackGroup.Controls.Add(this.label65);\r
-            this.AudioTrackGroup.Controls.Add(this.lbl_sampleRate);\r
-            this.AudioTrackGroup.Controls.Add(this.lbl_bitrate);\r
-            this.AudioTrackGroup.Location = new System.Drawing.Point(16, 67);\r
-            this.AudioTrackGroup.Name = "AudioTrackGroup";\r
-            this.AudioTrackGroup.Size = new System.Drawing.Size(685, 77);\r
-            this.AudioTrackGroup.TabIndex = 66;\r
-            this.AudioTrackGroup.TabStop = false;\r
-            this.AudioTrackGroup.Text = "Selected Track: New Track";\r
-            // \r
             // AudioMenuRowHeightHack\r
             // \r
             this.AudioMenuRowHeightHack.ColorDepth = System.Windows.Forms.ColorDepth.Depth8Bit;\r
             this.AudioMenuRowHeightHack.ImageSize = new System.Drawing.Size(1, 18);\r
             this.AudioMenuRowHeightHack.TransparentColor = System.Drawing.Color.Transparent;\r
             // \r
+            // label1\r
+            // \r
+            this.label1.AutoSize = true;\r
+            this.label1.BackColor = System.Drawing.Color.Transparent;\r
+            this.label1.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
+            this.label1.Location = new System.Drawing.Point(13, 66);\r
+            this.label1.Name = "label1";\r
+            this.label1.Size = new System.Drawing.Size(94, 13);\r
+            this.label1.TabIndex = 68;\r
+            this.label1.Text = "Selected Track:";\r
+            // \r
+            // lbl_audioTrack\r
+            // \r
+            this.lbl_audioTrack.AutoSize = true;\r
+            this.lbl_audioTrack.BackColor = System.Drawing.Color.Transparent;\r
+            this.lbl_audioTrack.Location = new System.Drawing.Point(113, 66);\r
+            this.lbl_audioTrack.Name = "lbl_audioTrack";\r
+            this.lbl_audioTrack.Size = new System.Drawing.Size(32, 13);\r
+            this.lbl_audioTrack.TabIndex = 69;\r
+            this.lbl_audioTrack.Text = "None";\r
+            // \r
+            // DRC\r
+            // \r
+            this.DRC.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill;\r
+            this.DRC.DataPropertyName = "DRC";\r
+            this.DRC.FillWeight = 96.36334F;\r
+            this.DRC.HeaderText = "DRC";\r
+            this.DRC.Name = "DRC";\r
+            this.DRC.ReadOnly = true;\r
+            this.DRC.Resizable = System.Windows.Forms.DataGridViewTriState.True;\r
+            this.DRC.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;\r
+            // \r
+            // Bitrate\r
+            // \r
+            this.Bitrate.DataPropertyName = "BitRateDisplayValue";\r
+            this.Bitrate.FillWeight = 49.69727F;\r
+            this.Bitrate.HeaderText = "Bitrate";\r
+            this.Bitrate.Name = "Bitrate";\r
+            this.Bitrate.ReadOnly = true;\r
+            this.Bitrate.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;\r
+            this.Bitrate.Width = 75;\r
+            // \r
+            // Samplerate\r
+            // \r
+            this.Samplerate.DataPropertyName = "SampleRateDisplayValue";\r
+            this.Samplerate.FillWeight = 49.69727F;\r
+            this.Samplerate.HeaderText = "Samplerate";\r
+            this.Samplerate.Name = "Samplerate";\r
+            this.Samplerate.ReadOnly = true;\r
+            this.Samplerate.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;\r
+            this.Samplerate.Width = 75;\r
+            // \r
+            // Mixdown\r
+            // \r
+            this.Mixdown.DataPropertyName = "Mixdown";\r
+            this.Mixdown.FillWeight = 49.69727F;\r
+            this.Mixdown.HeaderText = "Mixdown";\r
+            this.Mixdown.Name = "Mixdown";\r
+            this.Mixdown.ReadOnly = true;\r
+            this.Mixdown.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;\r
+            this.Mixdown.Width = 150;\r
+            // \r
+            // AudioCodec\r
+            // \r
+            this.AudioCodec.DataPropertyName = "Encoder";\r
+            this.AudioCodec.HeaderText = "Audio Codec";\r
+            this.AudioCodec.Name = "AudioCodec";\r
+            this.AudioCodec.ReadOnly = true;\r
+            this.AudioCodec.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;\r
+            this.AudioCodec.Width = 120;\r
+            // \r
+            // Source\r
+            // \r
+            this.Source.DataPropertyName = "SourceTrack";\r
+            this.Source.FillWeight = 49.69727F;\r
+            this.Source.HeaderText = "Source";\r
+            this.Source.Name = "Source";\r
+            this.Source.ReadOnly = true;\r
+            this.Source.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;\r
+            this.Source.Width = 170;\r
+            // \r
             // audioList\r
             // \r
             this.audioList.AllowUserToAddRows = false;\r
@@ -358,7 +358,7 @@ namespace Handbrake.Controls
             this.DRC});\r
             this.audioList.ContextMenuStrip = this.audioMenu;\r
             this.audioList.GridColor = System.Drawing.Color.White;\r
-            this.audioList.Location = new System.Drawing.Point(16, 150);\r
+            this.audioList.Location = new System.Drawing.Point(16, 114);\r
             this.audioList.Name = "audioList";\r
             this.audioList.RowHeadersBorderStyle = System.Windows.Forms.DataGridViewHeaderBorderStyle.None;\r
             this.audioList.RowHeadersVisible = false;\r
@@ -368,86 +368,33 @@ namespace Handbrake.Controls
             this.audioList.ShowCellToolTips = false;\r
             this.audioList.ShowEditingIcon = false;\r
             this.audioList.ShowRowErrors = false;\r
-            this.audioList.Size = new System.Drawing.Size(685, 140);\r
+            this.audioList.Size = new System.Drawing.Size(685, 180);\r
             this.audioList.TabIndex = 67;\r
+            this.ToolTips.SetToolTip(this.audioList, "The audio tracks to be encoded into the output file.");\r
             this.audioList.SelectionChanged += new System.EventHandler(this.audioList_SelectionChanged);\r
             // \r
-            // Source\r
-            // \r
-            this.Source.DataPropertyName = "SourceTrack";\r
-            this.Source.FillWeight = 49.69727F;\r
-            this.Source.HeaderText = "Source";\r
-            this.Source.Name = "Source";\r
-            this.Source.ReadOnly = true;\r
-            this.Source.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;\r
-            this.Source.Width = 170;\r
-            // \r
-            // AudioCodec\r
-            // \r
-            this.AudioCodec.DataPropertyName = "Encoder";\r
-            this.AudioCodec.HeaderText = "Audio Codec";\r
-            this.AudioCodec.Name = "AudioCodec";\r
-            this.AudioCodec.ReadOnly = true;\r
-            this.AudioCodec.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;\r
-            this.AudioCodec.Width = 120;\r
-            // \r
-            // Mixdown\r
-            // \r
-            this.Mixdown.DataPropertyName = "Mixdown";\r
-            this.Mixdown.FillWeight = 49.69727F;\r
-            this.Mixdown.HeaderText = "Mixdown";\r
-            this.Mixdown.Name = "Mixdown";\r
-            this.Mixdown.ReadOnly = true;\r
-            this.Mixdown.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;\r
-            this.Mixdown.Width = 150;\r
-            // \r
-            // Samplerate\r
-            // \r
-            this.Samplerate.DataPropertyName = "SampleRateDisplayValue";\r
-            this.Samplerate.FillWeight = 49.69727F;\r
-            this.Samplerate.HeaderText = "Samplerate";\r
-            this.Samplerate.Name = "Samplerate";\r
-            this.Samplerate.ReadOnly = true;\r
-            this.Samplerate.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;\r
-            this.Samplerate.Width = 75;\r
-            // \r
-            // Bitrate\r
-            // \r
-            this.Bitrate.DataPropertyName = "BitRateDisplayValue";\r
-            this.Bitrate.FillWeight = 49.69727F;\r
-            this.Bitrate.HeaderText = "Bitrate";\r
-            this.Bitrate.Name = "Bitrate";\r
-            this.Bitrate.ReadOnly = true;\r
-            this.Bitrate.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;\r
-            this.Bitrate.Width = 75;\r
-            // \r
-            // DRC\r
-            // \r
-            this.DRC.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill;\r
-            this.DRC.DataPropertyName = "DRC";\r
-            this.DRC.FillWeight = 96.36334F;\r
-            this.DRC.HeaderText = "DRC";\r
-            this.DRC.Name = "DRC";\r
-            this.DRC.ReadOnly = true;\r
-            this.DRC.Resizable = System.Windows.Forms.DataGridViewTriState.True;\r
-            this.DRC.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;\r
-            // \r
             // AudioPanel\r
             // \r
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Inherit;\r
             this.BackColor = System.Drawing.Color.Transparent;\r
+            this.Controls.Add(this.label1);\r
+            this.Controls.Add(this.lbl_audioTrack);\r
+            this.Controls.Add(this.drp_audioTrack);\r
+            this.Controls.Add(this.drp_audioSample);\r
             this.Controls.Add(this.audioList);\r
             this.Controls.Add(this.label68);\r
+            this.Controls.Add(this.drp_audioBitrate);\r
+            this.Controls.Add(this.drp_audioMix);\r
             this.Controls.Add(this.btn_addAudioTrack);\r
-            this.Controls.Add(this.AudioTrackGroup);\r
+            this.Controls.Add(this.lbl_drc);\r
             this.Controls.Add(this.btn_RemoveAudioTrack);\r
+            this.Controls.Add(this.drp_audioEncoder);\r
+            this.Controls.Add(this.tb_drc);\r
             this.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
             this.Name = "AudioPanel";\r
             this.Size = new System.Drawing.Size(720, 310);\r
             this.audioMenu.ResumeLayout(false);\r
             ((System.ComponentModel.ISupportInitialize)(this.tb_drc)).EndInit();\r
-            this.AudioTrackGroup.ResumeLayout(false);\r
-            this.AudioTrackGroup.PerformLayout();\r
             ((System.ComponentModel.ISupportInitialize)(this.audioList)).EndInit();\r
             this.ResumeLayout(false);\r
             this.PerformLayout();\r
@@ -459,19 +406,12 @@ namespace Handbrake.Controls
         private System.Windows.Forms.Button btn_RemoveAudioTrack;\r
         private System.Windows.Forms.Button btn_addAudioTrack;\r
         internal System.Windows.Forms.Label lbl_drc;\r
-        internal System.Windows.Forms.Label lbl_drcHeader;\r
         internal System.Windows.Forms.TrackBar tb_drc;\r
         internal System.Windows.Forms.Label label68;\r
-        internal System.Windows.Forms.Label lbl_sampleRate;\r
-        internal System.Windows.Forms.Label lbl_bitrate;\r
-        internal System.Windows.Forms.Label label65;\r
-        internal System.Windows.Forms.Label lbl_mixdown;\r
         internal System.Windows.Forms.ComboBox drp_audioEncoder;\r
-        internal System.Windows.Forms.Label label27;\r
         internal System.Windows.Forms.ComboBox drp_audioMix;\r
         internal System.Windows.Forms.ComboBox drp_audioTrack;\r
         internal System.Windows.Forms.ComboBox drp_audioSample;\r
-        private System.Windows.Forms.GroupBox AudioTrackGroup;\r
         private System.Windows.Forms.ImageList AudioMenuRowHeightHack;\r
         private System.Windows.Forms.ContextMenuStrip audioMenu;\r
         private System.Windows.Forms.ToolStripMenuItem audioList_moveup;\r
@@ -479,12 +419,15 @@ namespace Handbrake.Controls
         private System.Windows.Forms.ToolStripSeparator toolStripSeparator2;\r
         private System.Windows.Forms.ToolStripMenuItem audioList_remove;\r
         internal System.Windows.Forms.ComboBox drp_audioBitrate;\r
-        private System.Windows.Forms.DataGridView audioList;\r
-        private System.Windows.Forms.DataGridViewTextBoxColumn Source;\r
-        private System.Windows.Forms.DataGridViewTextBoxColumn AudioCodec;\r
-        private System.Windows.Forms.DataGridViewTextBoxColumn Mixdown;\r
-        private System.Windows.Forms.DataGridViewTextBoxColumn Samplerate;\r
-        private System.Windows.Forms.DataGridViewTextBoxColumn Bitrate;\r
+        internal System.Windows.Forms.Label label1;\r
+        internal System.Windows.Forms.Label lbl_audioTrack;\r
         private System.Windows.Forms.DataGridViewTextBoxColumn DRC;\r
+        private System.Windows.Forms.DataGridViewTextBoxColumn Bitrate;\r
+        private System.Windows.Forms.DataGridViewTextBoxColumn Samplerate;\r
+        private System.Windows.Forms.DataGridViewTextBoxColumn Mixdown;\r
+        private System.Windows.Forms.DataGridViewTextBoxColumn AudioCodec;\r
+        private System.Windows.Forms.DataGridViewTextBoxColumn Source;\r
+        private System.Windows.Forms.DataGridView audioList;\r
+        private System.Windows.Forms.ToolTip ToolTips;\r
     }\r
 }\r

diff --git a/win/CS/Controls/AudioPanel.cs b/win/CS/Controls/AudioPanel.cs
index 6ff6824c0fe81e3ad77ebfab5ff867d9aaff4707..d569a1f6a621eb92c511309880aa85d0f924a50c 100644 (file)
--- a/win/CS/Controls/AudioPanel.cs
+++ b/win/CS/Controls/AudioPanel.cs
@@ -226,12 +226,10 @@ namespace Handbrake.Controls
                     if (drp_audioEncoder.Text.Contains(AC3Passthru) || drp_audioEncoder.Text.Contains(DTSPassthru))\r
                     {\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 = 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
@@ -270,6 +268,12 @@ namespace Handbrake.Controls
             }\r
 \r
             audioList.Refresh();\r
+\r
+            if (audioList.SelectedRows.Count == 1)\r
+            {\r
+                AudioTrack item = audioList.SelectedRows[0].DataBoundItem as AudioTrack;\r
+                if (item != null) lbl_audioTrack.Text = track.SourceTrack;\r
+            }\r
         }\r
 \r
         /// <summary>\r
@@ -302,11 +306,11 @@ namespace Handbrake.Controls
                     tb_drc.Value = drcCalculated;\r
                     lbl_drc.Text = track.DRC.ToString();\r
 \r
-                    AudioTrackGroup.Text = "Selected Track: " + track.SourceTrack;\r
+                    lbl_audioTrack.Text = track.SourceTrack;\r
                 }\r
             }\r
             else\r
-                AudioTrackGroup.Text = "Selected Track: None (Click \"Add Track\" to add)";\r
+                lbl_audioTrack.Text = "(Click \"Add Track\" to add)";\r
         }\r
 \r
         #endregion\r

diff --git a/win/CS/Controls/AudioPanel.resx b/win/CS/Controls/AudioPanel.resx
index f114f86068bc0e7954a1bfd11a7e71eda398a550..053c14c9de5b18abb5c46330e464520181d5fdbd 100644 (file)
--- a/win/CS/Controls/AudioPanel.resx
+++ b/win/CS/Controls/AudioPanel.resx
@@ -120,25 +120,36 @@
   <metadata name="audioMenu.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">\r
     <value>216, 16</value>\r
   </metadata>\r
+  <metadata name="ToolTips.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">\r
+    <value>330, 16</value>\r
+  </metadata>\r
+  <data name="tb_drc.ToolTip" xml:space="preserve">\r
+    <value>Dynamic Range Compression\r
+Adjust the dynamic range of the output audio track.\r
+\r
+For source audio that has a wide dynamic range (very loud and very soft\r
+sequences), DRC allows you to 'compress' the range by making loud\r
+sections softer and soft sections louder</value>\r
+  </data>\r
   <metadata name="AudioMenuRowHeightHack.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">\r
     <value>35, 17</value>\r
   </metadata>\r
-  <metadata name="Source.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">\r
+  <metadata name="DRC.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">\r
     <value>True</value>\r
   </metadata>\r
-  <metadata name="AudioCodec.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">\r
+  <metadata name="Bitrate.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">\r
     <value>True</value>\r
   </metadata>\r
-  <metadata name="Mixdown.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">\r
+  <metadata name="Samplerate.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">\r
     <value>True</value>\r
   </metadata>\r
-  <metadata name="Samplerate.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">\r
+  <metadata name="Mixdown.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">\r
     <value>True</value>\r
   </metadata>\r
-  <metadata name="Bitrate.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">\r
+  <metadata name="AudioCodec.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">\r
     <value>True</value>\r
   </metadata>\r
-  <metadata name="DRC.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">\r
+  <metadata name="Source.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">\r
     <value>True</value>\r
   </metadata>\r
 </root>
\ No newline at end of file