WinGui:

[handbrake-jp/handbrake-jp-git.git] / win / C# / frmOptions.cs

diff --git a/win/C#/frmOptions.cs b/win/C#/frmOptions.cs
index 0206d1c..77a7a58 100644 (file)
--- a/win/C#/frmOptions.cs
+++ b/win/C#/frmOptions.cs
@@ -40,13 +40,16 @@ namespace Handbrake
             if (Properties.Settings.Default.updateStatus)\r
                 check_updateCheck.CheckState = CheckState.Checked;\r
 \r
-            // enable loading of default user settings.\r
-            if (Properties.Settings.Default.defaultSettings)\r
-                check_userDefaultSettings.CheckState = CheckState.Checked;\r
-\r
             // On Encode Completeion Action\r
             drp_completeOption.Text = Properties.Settings.Default.CompletionOption;\r
 \r
+            // Growl.\r
+            if (Properties.Settings.Default.growlEncode)\r
+                check_growlEncode.CheckState = CheckState.Checked;\r
+\r
+            if (Properties.Settings.Default.growlQueue)\r
+                check_GrowlQueue.CheckState = CheckState.Checked;\r
+\r
             // Enable auto naming feature.\r
             if (Properties.Settings.Default.autoNaming)\r
                 check_autoNaming.CheckState = CheckState.Checked;\r
@@ -116,10 +119,6 @@ namespace Handbrake
             // Advanced\r
             // #############################\r
 \r
-            // Enable GUI DVD Drive detection code\r
-            if (Properties.Settings.Default.drive_detection)\r
-                btn_drive_detect.CheckState = CheckState.Checked;\r
-\r
             // Minimise to Tray\r
             if (Properties.Settings.Default.trayIconAlerts)\r
                 check_trayStatusAlerts.CheckState = CheckState.Checked;\r
@@ -158,13 +157,32 @@ namespace Handbrake
             }\r
 \r
             // x264 step\r
-            CultureInfo culture = CultureInfo.CreateSpecificCulture("en-US");\r
-            string test = Properties.Settings.Default.x264cqstep.ToString(culture);\r
-            drop_x264step.SelectedItem = test;\r
+            string step = Properties.Settings.Default.x264cqstep.ToString(new CultureInfo("en-US"));\r
+            switch (step)\r
+            {\r
+                case "1":\r
+                    drop_x264step.SelectedIndex = 0;\r
+                    break;\r
+                case "0.5":\r
+                    drop_x264step.SelectedIndex = 1;\r
+                    break;\r
+                case "0.25":\r
+                    drop_x264step.SelectedIndex = 2;\r
+                    break;\r
+                case "0.2":\r
+                    drop_x264step.SelectedIndex = 3;\r
+                    break;\r
+            }\r
 \r
             // Use Experimental dvdnav\r
-            if (Properties.Settings.Default.dvdnav)\r
+            if (Properties.Settings.Default.noDvdNav)\r
                 check_dvdnav.CheckState = CheckState.Checked;\r
+\r
+            // #############################\r
+            // Debug\r
+            // #############################\r
+            if (Properties.Settings.Default.disableResCalc)\r
+                check_disableResCalc.Checked = true;\r
         }\r
 \r
         #region General\r
@@ -173,20 +191,26 @@ namespace Handbrake
             Properties.Settings.Default.updateStatus = check_updateCheck.Checked;\r
         }\r
 \r
-        private void check_userDefaultSettings_CheckedChanged(object sender, EventArgs e)\r
-        {\r
-            Properties.Settings.Default.defaultSettings = check_userDefaultSettings.Checked;\r
-        }\r
-\r
         private void check_tooltip_CheckedChanged(object sender, EventArgs e)\r
         {\r
             Properties.Settings.Default.tooltipEnable = check_tooltip.Checked;\r
         }\r
+\r
         private void drp_completeOption_SelectedIndexChanged(object sender, EventArgs e)\r
         {\r
             Properties.Settings.Default.CompletionOption = drp_completeOption.Text;\r
         }\r
 \r
+        private void check_GrowlQueue_CheckedChanged(object sender, EventArgs e)\r
+        {\r
+            Properties.Settings.Default.growlQueue = check_GrowlQueue.Checked;\r
+        }\r
+\r
+        private void check_growlEncode_CheckedChanged(object sender, EventArgs e)\r
+        {\r
+            Properties.Settings.Default.growlEncode = check_growlEncode.Checked;\r
+        }\r
+\r
         private void check_autoNaming_CheckedChanged(object sender, EventArgs e)\r
         {\r
             Properties.Settings.Default.autoNaming = check_autoNaming.Checked;\r
@@ -317,10 +341,6 @@ namespace Handbrake
         #endregion\r
 \r
         #region Advanced\r
-        private void btn_drive_detect_CheckedChanged(object sender, EventArgs e)\r
-        {\r
-            Properties.Settings.Default.drive_detection = btn_drive_detect.Checked;\r
-        }\r
 \r
         private void check_mainMinimize_CheckedChanged(object sender, EventArgs e)\r
         {\r
@@ -375,16 +395,16 @@ namespace Handbrake
             switch (drop_x264step.SelectedIndex)\r
             {\r
                 case 0:\r
-                    Properties.Settings.Default.x264cqstep = "1.0";\r
+                    Properties.Settings.Default.x264cqstep = 1.0;\r
                     break;\r
                 case 1:\r
-                    Properties.Settings.Default.x264cqstep = "0.50";\r
+                    Properties.Settings.Default.x264cqstep = 0.50;\r
                     break;\r
                 case 2:\r
-                    Properties.Settings.Default.x264cqstep = "0.25";\r
+                    Properties.Settings.Default.x264cqstep = 0.25;\r
                     break;\r
                 case 3:\r
-                    Properties.Settings.Default.x264cqstep = "0.20";\r
+                    Properties.Settings.Default.x264cqstep = 0.20;\r
                     break;\r
             }\r
             mainWindow.setQualityFromSlider();\r
@@ -392,7 +412,14 @@ namespace Handbrake
 \r
         private void check_dvdnav_CheckedChanged(object sender, EventArgs e)\r
         {\r
-            Properties.Settings.Default.dvdnav = check_dvdnav.Checked;\r
+            Properties.Settings.Default.noDvdNav = check_dvdnav.Checked;\r
+        }\r
+        #endregion\r
+\r
+        #region Debug\r
+        private void check_disableResCalc_CheckedChanged(object sender, EventArgs e)\r
+        {\r
+            Properties.Settings.Default.disableResCalc = check_disableResCalc.Checked;\r
         }\r
         #endregion\r
 \r
@@ -401,6 +428,5 @@ namespace Handbrake
             Properties.Settings.Default.Save(); // Small hack for Vista. Seems to work fine on XP without this\r
             this.Close();\r
         }\r
-\r
     }\r
 }
\ No newline at end of file