WinGui: minor bug fixes.

- Queue window now allows selection of queued items on the whole panel, not just the left side of the panel.
- Fixed a few rouge extensions not getting changed correctly when selecting a preset. (may need to revisit this for psp preset)
- When using AAC+AC3 use m4v if mp4 is currently on the extension.
- Fixed the user defaults not setting video / audio encode properly.

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

diff --git a/win/C#/Functions/Common.cs b/win/C#/Functions/Common.cs
index fbd9b6429c289b6e00fe64e7748d570ca5186cf6..9e642b2d5af3db42e1394446dbd1b25c3d43b9f2 100644 (file)
--- a/win/C#/Functions/Common.cs
+++ b/win/C#/Functions/Common.cs
@@ -164,6 +164,11 @@ namespace Handbrake.Functions
             mainWindow.drp_videoEncoder.Text = presetQuery.VideoEncoder;\r
             mainWindow.drp_audioCodec.Text = presetQuery.AudioEncoder;\r
 \r
+            if (presetQuery.AudioEncoder == "AAC + AC3")\r
+            {\r
+                mainWindow.text_destination.Text = mainWindow.text_destination.Text.Replace(".mp4", ".m4v");\r
+            }\r
+\r
             if (presetQuery.IpodAtom == true)\r
                 mainWindow.check_iPodAtom.CheckState = CheckState.Checked;\r
             else\r
@@ -174,7 +179,7 @@ namespace Handbrake.Functions
             else\r
                 mainWindow.check_optimiseMP4.CheckState = CheckState.Unchecked;\r
 \r
-            #endregion\r
+            #endregion  \r
 \r
             // Picture Settings Tab\r
             #region Picture\r
@@ -198,10 +203,6 @@ namespace Handbrake.Functions
             else\r
                 mainWindow.check_deblock.CheckState = CheckState.Unchecked;\r
 \r
-            if (presetQuery.ChapterMarkers == true)\r
-                mainWindow.Check_ChapterMarkers.CheckState = CheckState.Checked;\r
-            else\r
-                mainWindow.Check_ChapterMarkers.CheckState = CheckState.Unchecked;\r
 \r
             if (presetQuery.Anamorphic == true)\r
                 mainWindow.CheckPixelRatio.CheckState = CheckState.Checked;\r
@@ -270,6 +271,19 @@ namespace Handbrake.Functions
 \r
             \r
 \r
+            #endregion\r
+\r
+            // Chapter Markers Tab\r
+            #region Chapter Markers\r
+\r
+            if (presetQuery.ChapterMarkers == true)\r
+            {\r
+                mainWindow.Check_ChapterMarkers.CheckState = CheckState.Checked;\r
+                mainWindow.text_destination.Text = mainWindow.text_destination.Text.Replace(".mp4", ".m4v");\r
+            }\r
+            else\r
+                mainWindow.Check_ChapterMarkers.CheckState = CheckState.Unchecked;\r
+\r
             #endregion\r
 \r
             // Audio Settings Tab\r

diff --git a/win/C#/frmMain.cs b/win/C#/frmMain.cs
index 07eac66cd54cd771f4abfdcccfdc61ae48278c39..034a8a9d59815b3dd4b24eeb1f02eed8b91974b1 100644 (file)
--- a/win/C#/frmMain.cs
+++ b/win/C#/frmMain.cs
@@ -73,6 +73,9 @@ namespace Handbrake
             }\r
 \r
             // Load the presets\r
+            // Set some defaults for the dropdown menus. Just incase the normal or user presets dont load.\r
+            drp_crop.SelectedIndex = 0;\r
+\r
             lblStatus.Text = "Loading Presets ...";\r
             Application.DoEvents();\r
             if (Properties.Settings.Default.updatePresets == "Checked")\r
@@ -102,11 +105,6 @@ namespace Handbrake
                 Thread.Sleep(100);\r
             }\r
 \r
-            // Set some defaults for the dropdown menus. Just incase the normal or user presets dont load.\r
-            drp_crop.SelectedIndex = 0;\r
-            drp_videoEncoder.SelectedIndex = 2;\r
-            drp_audioCodec.SelectedIndex = 0;\r
-\r
             //Finished Loading\r
             lblStatus.Text = "Loading Complete!";\r
             Application.DoEvents();\r
@@ -790,6 +788,7 @@ namespace Handbrake
             {\r
                 drp_audioMixDown.Enabled = false;\r
                 drp_audioMixDown.Text = "Automatic";\r
+                text_destination.Text.Replace(".mp4", ".m4v");\r
             }\r
             else\r
             {\r

diff --git a/win/C#/frmQueue.Designer.cs b/win/C#/frmQueue.Designer.cs
index ca3cc3cbcaee3e7df598e6929ee094b562b97333..d4e5346e0f08bc63a47d1de7ea02bceb84541068 100644 (file)
--- a/win/C#/frmQueue.Designer.cs
+++ b/win/C#/frmQueue.Designer.cs
@@ -122,7 +122,6 @@ namespace Handbrake
             this.list_queue.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
             this.list_queue.HorizontalScrollbar = true;\r
             this.list_queue.Location = new System.Drawing.Point(12, 176);\r
-            this.list_queue.MultiColumn = true;\r
             this.list_queue.Name = "list_queue";\r
             this.list_queue.Size = new System.Drawing.Size(701, 145);\r
             this.list_queue.TabIndex = 28;\r