WinGui: Fix "Set Default" preset option.

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

3 files changed, 37 insertions, 16 deletions

diff --git a/win/CS/frmMain.Designer.cs b/win/CS/frmMain.Designer.cs
index d0b141748..39d329f5a 100644
--- a/win/CS/frmMain.Designer.cs
+++ b/win/CS/frmMain.Designer.cs
@@ -825,6 +825,7 @@ namespace Handbrake
             this.AudioSettings.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));

             this.AudioSettings.Location = new System.Drawing.Point(0, 0);

             this.AudioSettings.Name = "AudioSettings";

+            this.AudioSettings.ScannedTracks = ((System.ComponentModel.BindingList<HandBrake.ApplicationServices.Parsing.Audio>)(resources.GetObject("AudioSettings.ScannedTracks")));

             this.AudioSettings.Size = new System.Drawing.Size(720, 310);

             this.AudioSettings.TabIndex = 0;

             // 

diff --git a/win/CS/frmMain.cs b/win/CS/frmMain.cs
index 3654e41d1..031a632b5 100644
--- a/win/CS/frmMain.cs
+++ b/win/CS/frmMain.cs
@@ -175,20 +175,10 @@ namespace Handbrake
             // Load the user's default settings or Normal Preset

             if (Settings.Default.defaultPreset != string.Empty && presetHandler.GetPreset(Properties.Settings.Default.defaultPreset) != null)

             {

-                string query = presetHandler.GetPreset(Settings.Default.defaultPreset).Query;

-                if (query != null)

-                {

-                    x264Panel.Reset2Defaults();

-

-                    EncodeTask presetQuery = QueryParserUtility.Parse(query);

-                    PresetLoader.LoadPreset(this, presetQuery, Settings.Default.defaultPreset);

-

-                    x264Panel.StandardizeOptString();

-                    x264Panel.SetCurrentSettingsInPanel();

-                }

+                this.loadPreset(Settings.Default.defaultPreset);

             }

             else

-                loadNormalPreset();

+                loadPreset("Normal");

 

             // Register with Growl (if not using Growl for the encoding completion action, this wont hurt anything)

             GrowlCommunicator.Register();

@@ -652,7 +642,7 @@ namespace Handbrake
             {

                 Settings.Default.defaultPreset = treeView_presets.SelectedNode.Text;

                 Settings.Default.Save();

-                MessageBox.Show("New default preset set.", "Alert", MessageBoxButtons.OK, MessageBoxIcon.Information);

+                MessageBox.Show("New default preset set: " + treeView_presets.SelectedNode.Text, "Alert", MessageBoxButtons.OK, MessageBoxIcon.Information);

             }

             else

                 MessageBox.Show("Please select a preset first.", "Warning", MessageBoxButtons.OK, MessageBoxIcon.Warning);

@@ -794,14 +784,17 @@ namespace Handbrake
         /// <summary>

         /// Load the Normal Preset

         /// </summary>

-        private void loadNormalPreset()

+        /// <param name="presetName">

+        /// The preset name.

+        /// </param>

+        private void loadPreset(string presetName)

         {

             foreach (TreeNode treenode in treeView_presets.Nodes)

             {

                 foreach (TreeNode node in treenode.Nodes)

                 {

-                    if (node.Text.Equals("Normal"))

-                        treeView_presets.SelectedNode = treeView_presets.Nodes[treenode.Index].Nodes[0];

+                    if (node.Text.Equals(presetName))

+                        treeView_presets.SelectedNode = node;

                 }

             }

         }

diff --git a/win/CS/frmMain.resx b/win/CS/frmMain.resx
index a737bb095..48e1bc550 100644
--- a/win/CS/frmMain.resx
+++ b/win/CS/frmMain.resx
@@ -233,6 +233,33 @@ to make bitrate allocation decisions.</value>
   <metadata name="frmMainMenu.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">

     <value>106, 15</value>

   </metadata>

+  <data name="AudioSettings.ScannedTracks" mimetype="application/x-microsoft.net.object.binary.base64">

+    <value>

+        AAEAAAD/////AQAAAAAAAAAMAgAAAElTeXN0ZW0sIFZlcnNpb249NC4wLjAuMCwgQ3VsdHVyZT1uZXV0

+        cmFsLCBQdWJsaWNLZXlUb2tlbj1iNzdhNWM1NjE5MzRlMDg5BQEAAACrAVN5c3RlbS5Db21wb25lbnRN

+        b2RlbC5CaW5kaW5nTGlzdGAxW1tIYW5kQnJha2UuQXBwbGljYXRpb25TZXJ2aWNlcy5QYXJzaW5nLkF1

+        ZGlvLCBIYW5kQnJha2UuQXBwbGljYXRpb25TZXJ2aWNlcywgVmVyc2lvbj0wLjkuNS40MTE0LCBDdWx0

+        dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGxdXQgAAAAJYWRkTmV3UG9zFnJhaXNlTGlzdENo

+        YW5nZWRFdmVudHMWcmFpc2VJdGVtQ2hhbmdlZEV2ZW50cwhhbGxvd05ldwlhbGxvd0VkaXQLYWxsb3dS

+        ZW1vdmUPdXNlclNldEFsbG93TmV3EkNvbGxlY3Rpb25gMStpdGVtcwAAAAAAAAADCAEBAQEBAakBU3lz

+        dGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tIYW5kQnJha2UuQXBwbGljYXRpb25TZXJ2aWNl

+        cy5QYXJzaW5nLkF1ZGlvLCBIYW5kQnJha2UuQXBwbGljYXRpb25TZXJ2aWNlcywgVmVyc2lvbj0wLjku

+        NS40MTE0LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGxdXQIAAAD/////AQABAQEA

+        CQMAAAAMBAAAAFdIYW5kQnJha2UuQXBwbGljYXRpb25TZXJ2aWNlcywgVmVyc2lvbj0wLjkuNS40MTE0

+        LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAwAAAKkBU3lzdGVtLkNvbGxlY3Rp

+        b25zLkdlbmVyaWMuTGlzdGAxW1tIYW5kQnJha2UuQXBwbGljYXRpb25TZXJ2aWNlcy5QYXJzaW5nLkF1

+        ZGlvLCBIYW5kQnJha2UuQXBwbGljYXRpb25TZXJ2aWNlcywgVmVyc2lvbj0wLjkuNS40MTE0LCBDdWx0

+        dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGxdXQMAAAAGX2l0ZW1zBV9zaXplCF92ZXJzaW9u

+        BAAALUhhbmRCcmFrZS5BcHBsaWNhdGlvblNlcnZpY2VzLlBhcnNpbmcuQXVkaW9bXQQAAAAICAkFAAAA

+        AQAAAAEAAAAHBQAAAAABAAAABAAAAAQrSGFuZEJyYWtlLkFwcGxpY2F0aW9uU2VydmljZXMuUGFyc2lu

+        Zy5BdWRpbwQAAAAJBgAAAA0DBQYAAAArSGFuZEJyYWtlLkFwcGxpY2F0aW9uU2VydmljZXMuUGFyc2lu

+        Zy5BdWRpbwcAAAAcPFRyYWNrTnVtYmVyPmtfX0JhY2tpbmdGaWVsZBk8TGFuZ3VhZ2U+a19fQmFja2lu

+        Z0ZpZWxkHTxMYW5ndWFnZUNvZGU+a19fQmFja2luZ0ZpZWxkHDxEZXNjcmlwdGlvbj5rX19CYWNraW5n

+        RmllbGQXPEZvcm1hdD5rX19CYWNraW5nRmllbGQbPFNhbXBsZVJhdGU+a19fQmFja2luZ0ZpZWxkGDxC

+        aXRyYXRlPmtfX0JhY2tpbmdGaWVsZAABAQEBAAAICAgEAAAAAAAAAAoKBgcAAAAKTm9uZSBGb3VuZAoA

+        AAAAAAAAAAs=

+</value>

+  </data>

   <metadata name="AudioMenuRowHeightHack.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">

     <value>17, 54</value>

   </metadata>