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

3 files changed, 23 insertions, 11 deletions

diff --git a/win/C#/Functions/Common.cs b/win/C#/Functions/Common.cs
index fbd9b6429..9e642b2d5 100644
--- 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;

             mainWindow.drp_audioCodec.Text = presetQuery.AudioEncoder;

 

+            if (presetQuery.AudioEncoder == "AAC + AC3")

+            {

+                mainWindow.text_destination.Text = mainWindow.text_destination.Text.Replace(".mp4", ".m4v");

+            }

+

             if (presetQuery.IpodAtom == true)

                 mainWindow.check_iPodAtom.CheckState = CheckState.Checked;

             else

@@ -174,7 +179,7 @@ namespace Handbrake.Functions
             else

                 mainWindow.check_optimiseMP4.CheckState = CheckState.Unchecked;

 

-            #endregion

+            #endregion  

 

             // Picture Settings Tab

             #region Picture

@@ -198,10 +203,6 @@ namespace Handbrake.Functions
             else

                 mainWindow.check_deblock.CheckState = CheckState.Unchecked;

 

-            if (presetQuery.ChapterMarkers == true)

-                mainWindow.Check_ChapterMarkers.CheckState = CheckState.Checked;

-            else

-                mainWindow.Check_ChapterMarkers.CheckState = CheckState.Unchecked;

 

             if (presetQuery.Anamorphic == true)

                 mainWindow.CheckPixelRatio.CheckState = CheckState.Checked;

@@ -272,6 +273,19 @@ namespace Handbrake.Functions
 

             #endregion

 

+            // Chapter Markers Tab

+            #region Chapter Markers

+

+            if (presetQuery.ChapterMarkers == true)

+            {

+                mainWindow.Check_ChapterMarkers.CheckState = CheckState.Checked;

+                mainWindow.text_destination.Text = mainWindow.text_destination.Text.Replace(".mp4", ".m4v");

+            }

+            else

+                mainWindow.Check_ChapterMarkers.CheckState = CheckState.Unchecked;

+

+            #endregion

+

             // Audio Settings Tab

             #region Audio

             mainWindow.drp_audioBitrate.Text = presetQuery.AudioBitrate;

diff --git a/win/C#/frmMain.cs b/win/C#/frmMain.cs
index 07eac66cd..034a8a9d5 100644
--- a/win/C#/frmMain.cs
+++ b/win/C#/frmMain.cs
@@ -73,6 +73,9 @@ namespace Handbrake
             }

 

             // Load the presets

+            // Set some defaults for the dropdown menus. Just incase the normal or user presets dont load.

+            drp_crop.SelectedIndex = 0;

+

             lblStatus.Text = "Loading Presets ...";

             Application.DoEvents();

             if (Properties.Settings.Default.updatePresets == "Checked")

@@ -102,11 +105,6 @@ namespace Handbrake
                 Thread.Sleep(100);

             }

 

-            // Set some defaults for the dropdown menus. Just incase the normal or user presets dont load.

-            drp_crop.SelectedIndex = 0;

-            drp_videoEncoder.SelectedIndex = 2;

-            drp_audioCodec.SelectedIndex = 0;

-

             //Finished Loading

             lblStatus.Text = "Loading Complete!";

             Application.DoEvents();

@@ -790,6 +788,7 @@ namespace Handbrake
             {

                 drp_audioMixDown.Enabled = false;

                 drp_audioMixDown.Text = "Automatic";

+                text_destination.Text.Replace(".mp4", ".m4v");

             }

             else

             {

diff --git a/win/C#/frmQueue.Designer.cs b/win/C#/frmQueue.Designer.cs
index ca3cc3cbc..d4e5346e0 100644
--- 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)));

             this.list_queue.HorizontalScrollbar = true;

             this.list_queue.Location = new System.Drawing.Point(12, 176);

-            this.list_queue.MultiColumn = true;

             this.list_queue.Name = "list_queue";

             this.list_queue.Size = new System.Drawing.Size(701, 145);

             this.list_queue.TabIndex = 28;