WinGui:

- Bug fixes with the audio panel in relation to not loading the apple tv preset correctly.
- Small UI font size issue fixed with sample rate dropdowns.

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

diff --git a/win/C#/Functions/Common.cs b/win/C#/Functions/Common.cs
index 6a4effaa73cbf713c50496973919eb34a7ae6b68..2772762da9bc1a452ea223ae563562d51cefa81e 100644 (file)
--- a/win/C#/Functions/Common.cs
+++ b/win/C#/Functions/Common.cs
@@ -294,7 +294,18 @@ namespace Handbrake.Functions
             else\r
                 mainWindow.drp_track1Audio.Text = presetQuery.AudioTrack1;\r
 \r
-            if (presetQuery.AudioTrack2 == "None")\r
+            \r
+            if (presetQuery.AudioEncoder2 != null)  // Fix for loading in built in presets. Where 2 encoders but no tracks in the preset.\r
+            {\r
+                mainWindow.drp_track2Audio.Enabled = true;\r
+                mainWindow.drp_audsr_2.Enabled = true;\r
+                mainWindow.drp_audmix_2.Enabled = true;\r
+                mainWindow.drp_audenc_2.Enabled = true;\r
+                mainWindow.drp_audbit_2.Enabled = true;\r
+                mainWindow.drp_audsr_2.Text = "48";\r
+                mainWindow.drp_track2Audio.Text = "Automatic";\r
+            }\r
+            else if (presetQuery.AudioTrack2 == "None")\r
             {\r
                 mainWindow.drp_track2Audio.SelectedIndex = 0;\r
                 mainWindow.drp_audsr_2.Enabled = false;\r

diff --git a/win/C#/frmMain.Designer.cs b/win/C#/frmMain.Designer.cs
index 9376527aff66c43b300f108137e800f897bb3a98..735acb822eedc0fedeeb73ad850e8e443cfd9771 100644 (file)
--- a/win/C#/frmMain.Designer.cs
+++ b/win/C#/frmMain.Designer.cs
@@ -37,7 +37,7 @@ namespace Handbrake
             this.components = new System.ComponentModel.Container();\r
             System.Windows.Forms.Label Label38;\r
             System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(frmMain));\r
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle();\r
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle();\r
             this.DVD_Save = new System.Windows.Forms.SaveFileDialog();\r
             this.File_Save = new System.Windows.Forms.SaveFileDialog();\r
             this.ToolTip = new System.Windows.Forms.ToolTip(this.components);\r
@@ -407,7 +407,7 @@ namespace Handbrake
             // \r
             // drp_audsr_1\r
             // \r
-            this.drp_audsr_1.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
+            this.drp_audsr_1.Font = new System.Drawing.Font("Verdana", 6.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
             this.drp_audsr_1.FormattingEnabled = true;\r
             this.drp_audsr_1.Items.AddRange(new object[] {\r
             "48",\r
@@ -417,7 +417,7 @@ namespace Handbrake
             "22.05"});\r
             this.drp_audsr_1.Location = new System.Drawing.Point(488, 52);\r
             this.drp_audsr_1.Name = "drp_audsr_1";\r
-            this.drp_audsr_1.Size = new System.Drawing.Size(43, 21);\r
+            this.drp_audsr_1.Size = new System.Drawing.Size(43, 20);\r
             this.drp_audsr_1.TabIndex = 9;\r
             this.drp_audsr_1.Text = "48";\r
             this.ToolTip.SetToolTip(this.drp_audsr_1, "Set the Audio Sample Rate");\r
@@ -623,9 +623,9 @@ namespace Handbrake
             // \r
             // number\r
             // \r
-            dataGridViewCellStyle2.Format = "N0";\r
-            dataGridViewCellStyle2.NullValue = null;\r
-            this.number.DefaultCellStyle = dataGridViewCellStyle2;\r
+            dataGridViewCellStyle1.Format = "N0";\r
+            dataGridViewCellStyle1.NullValue = null;\r
+            this.number.DefaultCellStyle = dataGridViewCellStyle1;\r
             this.number.HeaderText = "Chapter Number";\r
             this.number.MaxInputLength = 3;\r
             this.number.Name = "number";\r
@@ -746,7 +746,7 @@ namespace Handbrake
             // \r
             // drp_audsr_2\r
             // \r
-            this.drp_audsr_2.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
+            this.drp_audsr_2.Font = new System.Drawing.Font("Verdana", 6.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
             this.drp_audsr_2.FormattingEnabled = true;\r
             this.drp_audsr_2.Items.AddRange(new object[] {\r
             "48",\r
@@ -756,7 +756,7 @@ namespace Handbrake
             "22.05"});\r
             this.drp_audsr_2.Location = new System.Drawing.Point(488, 92);\r
             this.drp_audsr_2.Name = "drp_audsr_2";\r
-            this.drp_audsr_2.Size = new System.Drawing.Size(43, 21);\r
+            this.drp_audsr_2.Size = new System.Drawing.Size(43, 20);\r
             this.drp_audsr_2.TabIndex = 20;\r
             this.drp_audsr_2.Text = "48";\r
             this.ToolTip.SetToolTip(this.drp_audsr_2, "Set the Audio Sample Rate");\r
@@ -778,7 +778,7 @@ namespace Handbrake
             // drp_audsr_3\r
             // \r
             this.drp_audsr_3.Enabled = false;\r
-            this.drp_audsr_3.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
+            this.drp_audsr_3.Font = new System.Drawing.Font("Verdana", 6.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
             this.drp_audsr_3.FormattingEnabled = true;\r
             this.drp_audsr_3.Items.AddRange(new object[] {\r
             "48",\r
@@ -788,7 +788,7 @@ namespace Handbrake
             "22.05"});\r
             this.drp_audsr_3.Location = new System.Drawing.Point(488, 128);\r
             this.drp_audsr_3.Name = "drp_audsr_3";\r
-            this.drp_audsr_3.Size = new System.Drawing.Size(43, 21);\r
+            this.drp_audsr_3.Size = new System.Drawing.Size(43, 20);\r
             this.drp_audsr_3.TabIndex = 28;\r
             this.drp_audsr_3.Text = "48";\r
             this.ToolTip.SetToolTip(this.drp_audsr_3, "Set the Audio Sample Rate");\r
@@ -861,7 +861,7 @@ namespace Handbrake
             // drp_audsr_4\r
             // \r
             this.drp_audsr_4.Enabled = false;\r
-            this.drp_audsr_4.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
+            this.drp_audsr_4.Font = new System.Drawing.Font("Verdana", 6.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
             this.drp_audsr_4.FormattingEnabled = true;\r
             this.drp_audsr_4.Items.AddRange(new object[] {\r
             "48",\r
@@ -869,9 +869,9 @@ namespace Handbrake
             "32",\r
             "24",\r
             "22.05"});\r
-            this.drp_audsr_4.Location = new System.Drawing.Point(488, 166);\r
+            this.drp_audsr_4.Location = new System.Drawing.Point(488, 167);\r
             this.drp_audsr_4.Name = "drp_audsr_4";\r
-            this.drp_audsr_4.Size = new System.Drawing.Size(43, 21);\r
+            this.drp_audsr_4.Size = new System.Drawing.Size(43, 20);\r
             this.drp_audsr_4.TabIndex = 36;\r
             this.drp_audsr_4.Text = "48";\r
             this.ToolTip.SetToolTip(this.drp_audsr_4, "Set the Audio Sample Rate");\r

diff --git a/win/C#/frmMain.cs b/win/C#/frmMain.cs
index b2bd1e472e11576c3a2e86bb7739ba7f45b79a17..b3c131d6bdf73f37fbf95a7d5d1ad2e57e2e376d 100644 (file)
--- a/win/C#/frmMain.cs
+++ b/win/C#/frmMain.cs
@@ -1801,20 +1801,24 @@ namespace Handbrake
             {\r
                 drp_audenc_1.Items.Clear();\r
                 drp_audenc_1.Items.Add("AAC");\r
+                drp_audenc_1.Items.Add("AC3");\r
                 drp_audenc_1.SelectedIndex = 0;\r
 \r
                 drp_audenc_2.Items.Clear();\r
                 drp_audenc_2.Items.Add("AAC");\r
+                drp_audenc_2.Items.Add("AC3");\r
                 if (drp_audenc_2.Enabled)\r
                     drp_audenc_2.SelectedIndex = 0;\r
 \r
                 drp_audenc_3.Items.Clear();\r
                 drp_audenc_3.Items.Add("AAC");\r
+                drp_audenc_3.Items.Add("AC3");\r
                 if (drp_audenc_3.Enabled)\r
                     drp_audenc_3.SelectedIndex = 0;\r
 \r
                 drp_audenc_4.Items.Clear();\r
                 drp_audenc_4.Items.Add("AAC");\r
+                drp_audenc_4.Items.Add("AC3");\r
                 if (drp_audenc_4.Enabled)\r
                     drp_audenc_4.SelectedIndex = 0;\r
             }\r

diff --git a/win/C#/frmMain.resx b/win/C#/frmMain.resx
index e9b8e49f460e588c6c1689b637ff8b42b38c32be..e91100bb4841d31ed7eeb5189bb170abf45d7335 100644 (file)
--- a/win/C#/frmMain.resx
+++ b/win/C#/frmMain.resx
@@ -149,12 +149,6 @@ Make sure you have selected a "Title" from the "Source" box above otherwise
 the list will not be populated with the correct amount of chapters.\r
 Note: Do not change any of the chapter numbers!</value>\r
   </data>\r
-  <metadata name="number.UserAddedColumn" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">\r
-    <value>True</value>\r
-  </metadata>\r
-  <metadata name="name.UserAddedColumn" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">\r
-    <value>True</value>\r
-  </metadata>\r
   <metadata name="DVD_Open.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">\r
     <value>223, 15</value>\r
   </metadata>\r