WinGui:

- Fix a few culture issues with my last checkin.

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

diff --git a/win/C#/Functions/PresetLoader.cs b/win/C#/Functions/PresetLoader.cs
index b34fff85daa2b345fe85ac5a6808bb234796bfca..6730b8e4964f742d8efe124d3560c8f69b66a233 100644 (file)
--- a/win/C#/Functions/PresetLoader.cs
+++ b/win/C#/Functions/PresetLoader.cs
@@ -179,7 +179,9 @@ namespace Handbrake.Functions
                         int.TryParse(val.ToString(), out value);\r
                     }\r
 \r
-                    mainWindow.slider_videoQuality.Value = value;\r
+                    int safevalue;\r
+                    int.TryParse(value.ToString(culture), out safevalue);\r
+                    mainWindow.slider_videoQuality.Value = safevalue;\r
                 }\r
                 else\r
                 {\r

diff --git a/win/C#/Functions/QueryGenerator.cs b/win/C#/Functions/QueryGenerator.cs
index a9a923a4703120d3209f2f37b4e9ac3b7e2cf436..da44e607659c6f67e632f1eb1acaf6c92b05e065 100644 (file)
--- a/win/C#/Functions/QueryGenerator.cs
+++ b/win/C#/Functions/QueryGenerator.cs
@@ -222,7 +222,9 @@ namespace Handbrake.Functions
                         query += " -q " + value.ToString(new CultureInfo("en-US"));\r
                         break;\r
                     case "H.264 (x264)":\r
-                        double divided = Properties.Settings.Default.x264cqstep;\r
+                        double divided;\r
+                        CultureInfo culture = CultureInfo.CreateSpecificCulture("en-US");\r
+                        double.TryParse(Properties.Settings.Default.x264cqstep.ToString(culture), out divided);\r
                         value = 51 - mainWindow.slider_videoQuality.Value * divided;\r
                         value = Math.Round(value, 2);\r
                         query += " -q " + value.ToString(new CultureInfo("en-US"));\r

diff --git a/win/C#/frmMain.cs b/win/C#/frmMain.cs
index 2f2583dcce153edf4758acd7e352166926dcd2cd..0aec0fac2a8955b1e85cb3cb76067f4f2cfcdf31 100644 (file)
--- a/win/C#/frmMain.cs
+++ b/win/C#/frmMain.cs
@@ -7,6 +7,7 @@
 using System;\r
 using System.Collections.Generic;\r
 using System.Drawing;\r
+using System.Globalization;\r
 using System.Windows.Forms;\r
 using System.IO;\r
 using System.Diagnostics;\r
@@ -1048,7 +1049,11 @@ namespace Handbrake
                     slider_videoQuality.Minimum = 0;\r
                     slider_videoQuality.TickFrequency = 1;\r
 \r
-                    double multiplier = 1.0 / Properties.Settings.Default.x264cqstep;\r
+                    double divider;\r
+                    CultureInfo culture = CultureInfo.CreateSpecificCulture("en-US");\r
+                    double.TryParse(Properties.Settings.Default.x264cqstep.ToString(culture), out divider);\r
+\r
+                    double multiplier = 1.0 / divider;\r
                     double value = slider_videoQuality.Value*multiplier;\r
                     \r
                     switch (Properties.Settings.Default.x264cqstep.ToString())\r
@@ -1114,7 +1119,9 @@ namespace Handbrake
                     SliderValue.Text = Math.Round((val * 100), 2) + "% QP:" + (32 - slider_videoQuality.Value);\r
                     break;\r
                 case "H.264 (x264)":\r
-                    double divided = Properties.Settings.Default.x264cqstep;\r
+                    double divided;\r
+                    CultureInfo culture = CultureInfo.CreateSpecificCulture("en-US");\r
+                    double.TryParse(Properties.Settings.Default.x264cqstep.ToString(culture), out divided);\r
                     rfValue = 51.0 - slider_videoQuality.Value * divided;\r
                     max = slider_videoQuality.Maximum * divided;\r
                     min = slider_videoQuality.Minimum;\r