WinGui: Some behavioural fixes to the audio panel controls.

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

diff --git a/win/CS/Controls/AudioPanel.Designer.cs b/win/CS/Controls/AudioPanel.Designer.cs
index 09d35c910ad782ba7692a02d85b025e734335c98..7f3c58fc9e9809388823d795ce1fb8e337b9cc62 100644 (file)
--- a/win/CS/Controls/AudioPanel.Designer.cs
+++ b/win/CS/Controls/AudioPanel.Designer.cs
@@ -157,6 +157,7 @@ namespace Handbrake.Controls
             // drp_audioMix\r
             // \r
             this.drp_audioMix.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;\r
+            this.drp_audioMix.Enabled = false;\r
             this.drp_audioMix.FormattingEnabled = true;\r
             this.drp_audioMix.Items.AddRange(new object[] {\r
             "Automatic",\r
@@ -189,6 +190,7 @@ namespace Handbrake.Controls
             // drp_audioBitrate\r
             // \r
             this.drp_audioBitrate.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;\r
+            this.drp_audioBitrate.Enabled = false;\r
             this.drp_audioBitrate.FormattingEnabled = true;\r
             this.drp_audioBitrate.Items.AddRange(new object[] {\r
             "32",\r
@@ -211,6 +213,7 @@ namespace Handbrake.Controls
             // drp_audioSample\r
             // \r
             this.drp_audioSample.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;\r
+            this.drp_audioSample.Enabled = false;\r
             this.drp_audioSample.FormattingEnabled = true;\r
             this.drp_audioSample.Items.AddRange(new object[] {\r
             "Auto",\r
@@ -336,6 +339,7 @@ namespace Handbrake.Controls
             // btn_AdvancedAudio\r
             // \r
             this.btn_AdvancedAudio.BackColor = System.Drawing.Color.Transparent;\r
+            this.btn_AdvancedAudio.Enabled = false;\r
             this.btn_AdvancedAudio.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
             this.btn_AdvancedAudio.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(0)))));\r
             this.btn_AdvancedAudio.Location = new System.Drawing.Point(607, 65);\r

diff --git a/win/CS/Controls/AudioPanel.cs b/win/CS/Controls/AudioPanel.cs
index 8463e996942c9d98e4c5d2de9b244b81c0c032fa..e07cf1e3ae403b796636d3508ce215633d340b62 100644 (file)
--- a/win/CS/Controls/AudioPanel.cs
+++ b/win/CS/Controls/AudioPanel.cs
@@ -136,7 +136,7 @@ namespace Handbrake.Controls
                 drp_audioEncoder.Items.Add(EnumHelper<AudioEncoder>.GetDisplay(AudioEncoder.ffflac));\r
             }\r
 \r
-            if (!drp_audioEncoder.Text.Contains(oldval))\r
+            if (!drp_audioEncoder.Items.Contains(oldval))\r
                 drp_audioEncoder.SelectedIndex = 0;\r
             else\r
                 drp_audioEncoder.SelectedItem = oldval;\r
@@ -248,15 +248,19 @@ namespace Handbrake.Controls
             // Some Sanity Checking\r
             if (audioList.SelectedRows.Count == 0)\r
             {\r
+                drp_audioMix.Enabled = drp_audioBitrate.Enabled = drp_audioSample.Enabled = btn_AdvancedAudio.Enabled = false;\r
                 return;\r
             }\r
 \r
             AudioTrack track = audioList.SelectedRows[0].DataBoundItem as AudioTrack;\r
             if (track == null)\r
             {\r
+                drp_audioMix.Enabled = drp_audioBitrate.Enabled = drp_audioSample.Enabled = btn_AdvancedAudio.Enabled = false;\r
                 return;\r
             }\r
 \r
+            drp_audioMix.Enabled = drp_audioBitrate.Enabled = drp_audioSample.Enabled = btn_AdvancedAudio.Enabled = true;\r
+\r
             // Handle the changed control and selected audio track.\r
             switch (ctl.Name)\r
             {\r
@@ -491,11 +495,11 @@ namespace Handbrake.Controls
         {\r
             RemoveTrack();\r
 \r
-            if (this.AudioTracks.Count == 0)\r
-            {\r
-                drp_audioMix.Enabled =\r
-                    drp_audioBitrate.Enabled = drp_audioSample.Enabled = btn_AdvancedAudio.Enabled = true;\r
-            }\r
+            //if (this.AudioTracks.Count == 0)\r
+            //{\r
+            //    drp_audioMix.Enabled =\r
+            //        drp_audioBitrate.Enabled = drp_audioSample.Enabled = btn_AdvancedAudio.Enabled = true;\r
+            //}\r
         }\r
 \r
         /// <summary>\r
@@ -714,7 +718,7 @@ namespace Handbrake.Controls
         {\r
             this.AudioTracks.Clear();\r
 \r
-            drp_audioMix.Enabled = drp_audioBitrate.Enabled = drp_audioSample.Enabled = btn_AdvancedAudio.Enabled = true;\r
+            //drp_audioMix.Enabled = drp_audioBitrate.Enabled = drp_audioSample.Enabled = btn_AdvancedAudio.Enabled = true;\r
 \r
             if (this.AudioListChanged != null)\r
                 this.AudioListChanged(this, new EventArgs());\r

diff --git a/win/CS/Controls/AudioPanel.resx b/win/CS/Controls/AudioPanel.resx
index a361bc4010e23b603f5eefc9ccaec3032203c760..696d4eed5a3fdfa22c05b01448f810b7170cf51e 100644 (file)
--- a/win/CS/Controls/AudioPanel.resx
+++ b/win/CS/Controls/AudioPanel.resx
@@ -123,9 +123,6 @@
   <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
-  <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
   <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