X-Git-Url: http://git.osdn.jp/view?a=blobdiff_plain;f=win%2FC%23%2FfrmOptions.cs;h=77a7a58cef3ec79d9284758aa1e3b011e91cef43;hb=cfa1fb7010dc9324e15d257bad7a73af66e9eb10;hp=462bdb8c41071519951dd2c63bbf6e8308f6f22e;hpb=73d182f093e0fc27ca530bad00b423b39c1cb672;p=handbrake-jp%2Fhandbrake-jp-git.git

diff --git a/win/C#/frmOptions.cs b/win/C#/frmOptions.cs
index 462bdb8c..77a7a58c 100644
--- a/win/C#/frmOptions.cs
+++ b/win/C#/frmOptions.cs
@@ -40,10 +40,6 @@ namespace Handbrake
             if (Properties.Settings.Default.updateStatus)
                 check_updateCheck.CheckState = CheckState.Checked;
 
-            // enable loading of default user settings.
-            if (Properties.Settings.Default.defaultSettings)
-                check_userDefaultSettings.CheckState = CheckState.Checked;
-
             // On Encode Completeion Action
             drp_completeOption.Text = Properties.Settings.Default.CompletionOption;
 
@@ -123,10 +119,6 @@ namespace Handbrake
             // Advanced
             // #############################
 
-            // Enable GUI DVD Drive detection code
-            if (Properties.Settings.Default.drive_detection)
-                btn_drive_detect.CheckState = CheckState.Checked;
-
             // Minimise to Tray
             if (Properties.Settings.Default.trayIconAlerts)
                 check_trayStatusAlerts.CheckState = CheckState.Checked;
@@ -165,12 +157,25 @@ namespace Handbrake
             }
 
             // x264 step
-            CultureInfo culture = CultureInfo.CreateSpecificCulture("en-US");
-            string test = Properties.Settings.Default.x264cqstep.ToString(culture);
-            drop_x264step.SelectedItem = test;
+            string step = Properties.Settings.Default.x264cqstep.ToString(new CultureInfo("en-US"));
+            switch (step)
+            {
+                case "1":
+                    drop_x264step.SelectedIndex = 0;
+                    break;
+                case "0.5":
+                    drop_x264step.SelectedIndex = 1;
+                    break;
+                case "0.25":
+                    drop_x264step.SelectedIndex = 2;
+                    break;
+                case "0.2":
+                    drop_x264step.SelectedIndex = 3;
+                    break;
+            }
 
             // Use Experimental dvdnav
-            if (Properties.Settings.Default.dvdnav)
+            if (Properties.Settings.Default.noDvdNav)
                 check_dvdnav.CheckState = CheckState.Checked;
 
             // #############################
@@ -186,15 +191,11 @@ namespace Handbrake
             Properties.Settings.Default.updateStatus = check_updateCheck.Checked;
         }
 
-        private void check_userDefaultSettings_CheckedChanged(object sender, EventArgs e)
-        {
-            Properties.Settings.Default.defaultSettings = check_userDefaultSettings.Checked;
-        }
-
         private void check_tooltip_CheckedChanged(object sender, EventArgs e)
         {
             Properties.Settings.Default.tooltipEnable = check_tooltip.Checked;
         }
+
         private void drp_completeOption_SelectedIndexChanged(object sender, EventArgs e)
         {
             Properties.Settings.Default.CompletionOption = drp_completeOption.Text;
@@ -340,10 +341,6 @@ namespace Handbrake
         #endregion
 
         #region Advanced
-        private void btn_drive_detect_CheckedChanged(object sender, EventArgs e)
-        {
-            Properties.Settings.Default.drive_detection = btn_drive_detect.Checked;
-        }
 
         private void check_mainMinimize_CheckedChanged(object sender, EventArgs e)
         {
@@ -398,16 +395,16 @@ namespace Handbrake
             switch (drop_x264step.SelectedIndex)
             {
                 case 0:
-                    Properties.Settings.Default.x264cqstep = "1.0";
+                    Properties.Settings.Default.x264cqstep = 1.0;
                     break;
                 case 1:
-                    Properties.Settings.Default.x264cqstep = "0.50";
+                    Properties.Settings.Default.x264cqstep = 0.50;
                     break;
                 case 2:
-                    Properties.Settings.Default.x264cqstep = "0.25";
+                    Properties.Settings.Default.x264cqstep = 0.25;
                     break;
                 case 3:
-                    Properties.Settings.Default.x264cqstep = "0.20";
+                    Properties.Settings.Default.x264cqstep = 0.20;
                     break;
             }
             mainWindow.setQualityFromSlider();
@@ -415,7 +412,7 @@ namespace Handbrake
 
         private void check_dvdnav_CheckedChanged(object sender, EventArgs e)
         {
-            Properties.Settings.Default.dvdnav = check_dvdnav.Checked;
+            Properties.Settings.Default.noDvdNav = check_dvdnav.Checked;
         }
         #endregion