WinGui:

- Fix a Culture issue in the Query Generator for Audio Panels

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

3 files changed, 15 insertions, 7 deletions

diff --git a/win/CS/Functions/QueryGenerator.cs b/win/CS/Functions/QueryGenerator.cs
index 2c9019049..7f1f06f55 100644
--- a/win/CS/Functions/QueryGenerator.cs
+++ b/win/CS/Functions/QueryGenerator.cs
@@ -27,6 +27,10 @@ namespace Handbrake.Functions
     {

         private static readonly IUserSettingService UserSettingService = new UserSettingService();

 

+        /// <summary>

+        /// The Culture

+        /// </summary>

+        private static readonly CultureInfo Culture = new CultureInfo("en-US", false);

 

         public static string GenerateQueryForPreset(frmMain mainWindow, QueryPictureSettingsMode mode, bool filters, int width, int height)

         {

@@ -407,13 +411,13 @@ namespace Handbrake.Functions
                 samplerates += string.IsNullOrEmpty(samplerates) ? rate : string.Format(",{0}", rate);

 

                 // Audio Bitrates (-B)

-                bitrates += string.IsNullOrEmpty(bitrates) ? audioTrack.Bitrate.ToString() : string.Format(",{0}", audioTrack.Bitrate);

+                bitrates += string.IsNullOrEmpty(bitrates) ? audioTrack.Bitrate.ToString(Culture) : string.Format(",{0}", audioTrack.Bitrate);

 

                 // Audio DRC Values

-                drvValues += string.IsNullOrEmpty(drvValues) ? audioTrack.DRC.ToString() : string.Format(",{0}", audioTrack.DRC);

+                drvValues += string.IsNullOrEmpty(drvValues) ? audioTrack.DRC.ToString(Culture) : string.Format(",{0}", audioTrack.DRC.ToString(Culture));

 

                 // Audio Gain Control

-                gainValues += string.IsNullOrEmpty(gainValues) ? audioTrack.Gain.ToString() : string.Format(",{0}", audioTrack.Gain);

+                gainValues += string.IsNullOrEmpty(gainValues) ? audioTrack.Gain.ToString(Culture) : string.Format(",{0}", audioTrack.Gain.ToString(Culture));

             }

 

             return string.Format(" -a {0} -E {1} -B {2} -6 {3} -R {4} -D {5} --gain={6}", tracks, encoders, bitrates, mixdowns, samplerates, drvValues, gainValues);

diff --git a/win/CS/ToolWindows/AdvancedAudio.cs b/win/CS/ToolWindows/AdvancedAudio.cs
index fba1f7cb6..6b4ebed61 100644
--- a/win/CS/ToolWindows/AdvancedAudio.cs
+++ b/win/CS/ToolWindows/AdvancedAudio.cs
@@ -20,7 +20,7 @@ namespace Handbrake.ToolWindows
         private static readonly CultureInfo Culture = new CultureInfo("en-US", false);

 

         /// <summary>

-        /// The Advanced Audio Panel

+        /// Initializes a new instance of the <see cref="AdvancedAudio"/> class. 

         /// </summary>

         public AdvancedAudio()

         {

@@ -71,9 +71,13 @@ namespace Handbrake.ToolWindows
                     drcValue = ((track.DRC * 10) + 1) - 10;

                 int.TryParse(drcValue.ToString(Culture), out drcCalculated);

                 tb_drc.Value = drcCalculated;

-                lbl_drc.Text = track.DRC.ToString();

+                lbl_drc.Text = track.DRC.ToString(Culture);

                 tb_drc.Enabled = track.TrackDisplay.Contains("(AC3)");

 

+                if (!tb_drc.Enabled)

+                {

+                    Console.WriteLine("test");

+                }

             }

         }

 

@@ -140,7 +144,7 @@ namespace Handbrake.ToolWindows
             else

                 value = ((tb_drc.Value - 1) / 10.0) + 1;

 

-            lbl_drc.Text = value.ToString();

+            lbl_drc.Text = value.ToString(Culture);

             track.DRC = value;

         }

     }

diff --git a/win/CS/frmActivityWindow.Designer.cs b/win/CS/frmActivityWindow.Designer.cs
index 4344c4e87..134689c0a 100644
--- a/win/CS/frmActivityWindow.Designer.cs
+++ b/win/CS/frmActivityWindow.Designer.cs
@@ -75,7 +75,7 @@ namespace Handbrake
             // 

             this.mnu_copy_log.Image = global::Handbrake.Properties.Resources.copy;

             this.mnu_copy_log.Name = "mnu_copy_log";

-            this.mnu_copy_log.Size = new System.Drawing.Size(253, 22);

+            this.mnu_copy_log.Size = new System.Drawing.Size(177, 22);

             this.mnu_copy_log.Text = "Copy";

             this.mnu_copy_log.Click += new System.EventHandler(this.MnuCopyLogClick);

             //