WinGui: Another fix for the preset service which was not correctly updating presets when installing a new version.

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

5 files changed, 48 insertions, 23 deletions

diff --git a/win/CS/HandBrake.ApplicationServices/Services/Interfaces/IPresetService.cs b/win/CS/HandBrake.ApplicationServices/Services/Interfaces/IPresetService.cs
index b7d65c1a1..d5807aff9 100644
--- a/win/CS/HandBrake.ApplicationServices/Services/Interfaces/IPresetService.cs
+++ b/win/CS/HandBrake.ApplicationServices/Services/Interfaces/IPresetService.cs
@@ -74,7 +74,7 @@ namespace HandBrake.ApplicationServices.Services.Interfaces
         /// <param name="cliPath">

         /// The Path to the CLI, leave blank for current folder.

         /// </param>

-        void UpdateBuiltInPresets(string cliPath);

+        void UpdateBuiltInPresets();

 

         /// <summary>

         /// Check if the built in Presets stored are not out of date.

diff --git a/win/CS/HandBrake.ApplicationServices/Services/PresetService.cs b/win/CS/HandBrake.ApplicationServices/Services/PresetService.cs
index 75d9805cc..09788e6b4 100644
--- a/win/CS/HandBrake.ApplicationServices/Services/PresetService.cs
+++ b/win/CS/HandBrake.ApplicationServices/Services/PresetService.cs
@@ -64,7 +64,7 @@ namespace HandBrake.ApplicationServices.Services
             // If the preset file doesn't exist. Create it.

             if (!File.Exists(this.builtInPresetFile))

             {

-                this.UpdateBuiltInPresets(string.Empty);

+                this.UpdateBuiltInPresets();

             }

 

             this.LoadPresets();

@@ -204,10 +204,10 @@ namespace HandBrake.ApplicationServices.Services
         /// <param name="cliPath">

         /// The Path to the CLI, leave blank for current folder.

         /// </param>

-        public void UpdateBuiltInPresets(string cliPath)

+        public void UpdateBuiltInPresets()

         {

             // Create a new tempory file and execute the CLI to get the built in Presets.

-            string handbrakeCLIPath = Path.Combine(cliPath, "HandBrakeCLI.exe");

+            string handbrakeCLIPath = Path.Combine(System.Windows.Forms.Application.StartupPath, "HandBrakeCLI.exe");

             string presetsPath = Path.Combine(Path.GetTempPath(), "temp_presets.dat");

             string strCmdLine = String.Format(@"cmd /c """"{0}"" --preset-list >""{1}"" 2>&1""", handbrakeCLIPath, presetsPath);

 

@@ -299,7 +299,7 @@ namespace HandBrake.ApplicationServices.Services
                 {

                     if (preset[0].Version != Properties.Settings.Default.HandBrakeVersion)

                     {

-                        this.UpdateBuiltInPresets(string.Empty);

+                        this.UpdateBuiltInPresets();

                         return true;

                     }

                 }       

@@ -390,7 +390,7 @@ namespace HandBrake.ApplicationServices.Services
             catch (Exception exc)

             {

                 RecoverFromCorruptedPresetFile(this.builtInPresetFile);

-                this.UpdateBuiltInPresets(string.Empty);

+                this.UpdateBuiltInPresets();

                 throw new GeneralApplicationException("HandBrake has detected corruption in the presets file and has attempted to rebuild this file.", "Please restart HandBrake before continuing.", exc);              

             }

 

diff --git a/win/CS/frmMain.Designer.cs b/win/CS/frmMain.Designer.cs
index 7e3d61e57..fb00665b3 100644
--- a/win/CS/frmMain.Designer.cs
+++ b/win/CS/frmMain.Designer.cs
@@ -39,7 +39,7 @@ namespace Handbrake
             this.components = new System.ComponentModel.Container();

             System.Windows.Forms.ContextMenuStrip notifyIconMenu;

             System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(frmMain));

-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle();

+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle();

             this.btn_restore = new System.Windows.Forms.ToolStripMenuItem();

             this.DVD_Save = new System.Windows.Forms.SaveFileDialog();

             this.ToolTip = new System.Windows.Forms.ToolTip(this.components);

@@ -387,9 +387,9 @@ namespace Handbrake
             // 

             // number

             // 

-            dataGridViewCellStyle2.Format = "N0";

-            dataGridViewCellStyle2.NullValue = null;

-            this.number.DefaultCellStyle = dataGridViewCellStyle2;

+            dataGridViewCellStyle1.Format = "N0";

+            dataGridViewCellStyle1.NullValue = null;

+            this.number.DefaultCellStyle = dataGridViewCellStyle1;

             this.number.Frozen = true;

             this.number.HeaderText = "Chapter Number";

             this.number.MaxInputLength = 3;

@@ -823,6 +823,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(715, 310);

             this.AudioSettings.TabIndex = 0;

             // 

diff --git a/win/CS/frmMain.cs b/win/CS/frmMain.cs
index 2ff793c3a..fb22a8d27 100644
--- a/win/CS/frmMain.cs
+++ b/win/CS/frmMain.cs
@@ -668,7 +668,7 @@ namespace Handbrake
 

         private void MnuResetBuiltInPresets_Click(object sender, EventArgs e)

         {

-            presetHandler.UpdateBuiltInPresets(string.Empty);

+            presetHandler.UpdateBuiltInPresets();

             LoadPresetPanel();

             treeView_presets.ExpandAll();

         }

diff --git a/win/CS/frmMain.resx b/win/CS/frmMain.resx
index 9ec365918..331aa148f 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

+        ZGlvLCBIYW5kQnJha2UuQXBwbGljYXRpb25TZXJ2aWNlcywgVmVyc2lvbj0wLjkuNS4zOTg5LCBDdWx0

+        dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGxdXQgAAAAJYWRkTmV3UG9zFnJhaXNlTGlzdENo

+        YW5nZWRFdmVudHMWcmFpc2VJdGVtQ2hhbmdlZEV2ZW50cwhhbGxvd05ldwlhbGxvd0VkaXQLYWxsb3dS

+        ZW1vdmUPdXNlclNldEFsbG93TmV3EkNvbGxlY3Rpb25gMStpdGVtcwAAAAAAAAADCAEBAQEBAakBU3lz

+        dGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tIYW5kQnJha2UuQXBwbGljYXRpb25TZXJ2aWNl

+        cy5QYXJzaW5nLkF1ZGlvLCBIYW5kQnJha2UuQXBwbGljYXRpb25TZXJ2aWNlcywgVmVyc2lvbj0wLjku

+        NS4zOTg5LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGxdXQIAAAD/////AQABAQEA

+        CQMAAAAMBAAAAFdIYW5kQnJha2UuQXBwbGljYXRpb25TZXJ2aWNlcywgVmVyc2lvbj0wLjkuNS4zOTg5

+        LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAwAAAKkBU3lzdGVtLkNvbGxlY3Rp

+        b25zLkdlbmVyaWMuTGlzdGAxW1tIYW5kQnJha2UuQXBwbGljYXRpb25TZXJ2aWNlcy5QYXJzaW5nLkF1

+        ZGlvLCBIYW5kQnJha2UuQXBwbGljYXRpb25TZXJ2aWNlcywgVmVyc2lvbj0wLjkuNS4zOTg5LCBDdWx0

+        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>

@@ -640,18 +667,6 @@ Clear the text box below to return to the internal query generation.</value>
   <metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">

     <value>98</value>

   </metadata>

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

-    <value>664, 15</value>

-  </metadata>

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

-    <value>310, 54</value>

-  </metadata>

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

-    <value>423, 54</value>

-  </metadata>

-  <metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">

-    <value>98</value>

-  </metadata>

   <data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">

     <value>

         AAABAAYAMDAAAAEACACoDgAAZgAAACAgAAABAAgAqAgAAA4PAAAQEAAAAQAIAGgFAAC2FwAAMDAAAAEA

@@ -1031,4 +1046,13 @@ Clear the text box below to return to the internal query generation.</value>
         AAD6AQAA4AEAAMABAACAAQAAgAEAAMBBAADAYQAAjGEAAIRhAADc+wAA3/8AAA==

 </value>

   </data>

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

+    <value>664, 15</value>

+  </metadata>

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

+    <value>310, 54</value>

+  </metadata>

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

+    <value>423, 54</value>

+  </metadata>

 </root>
\ No newline at end of file