X-Git-Url: http://git.osdn.jp/view?a=blobdiff_plain;f=win%2FC%23%2FfrmOptions.cs;h=9b33b9030cbad90025389242183c2d469618a412;hb=2157ff283ee677c229c017d13a84805b0ab24fd3;hp=66adf04e4678d61bd34d2de73303f2d8a3b4a5c8;hpb=434bd2c69bd7bad39e5c2c43467648d901d58691;p=handbrake-jp%2Fhandbrake-jp-git.git

diff --git a/win/C#/frmOptions.cs b/win/C#/frmOptions.cs
index 66adf04e..9b33b903 100644
--- a/win/C#/frmOptions.cs
+++ b/win/C#/frmOptions.cs
@@ -14,9 +14,13 @@ namespace Handbrake
 {
     public partial class frmOptions : Form
     {
-        public frmOptions()
+        private frmMain mainWindow;
+
+        public frmOptions(frmMain mw)
         {
             InitializeComponent();
+            mainWindow = mw;
+
             IDictionary<string, string> langList = Main.mapLanguages();
             foreach (string item in langList.Keys)
                 drop_preferredLang.Items.Add(item);
@@ -36,13 +40,16 @@ 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;
 
+            // Growl.
+            if (Properties.Settings.Default.growlEncode)
+                check_growlEncode.CheckState = CheckState.Checked;
+
+            if (Properties.Settings.Default.growlQueue)
+                check_GrowlQueue.CheckState = CheckState.Checked;
+
             // Enable auto naming feature.
             if (Properties.Settings.Default.autoNaming)
                 check_autoNaming.CheckState = CheckState.Checked;
@@ -112,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;
@@ -154,12 +157,32 @@ namespace Handbrake
             }
 
             // x264 step
-            CultureInfo culture = CultureInfo.CreateSpecificCulture("en-US");
-            drop_x264step.SelectedItem = Properties.Settings.Default.x264cqstep.ToString(culture);
+            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)
                 check_dvdnav.CheckState = CheckState.Checked;
+
+            // #############################
+            // Debug
+            // #############################
+            if (Properties.Settings.Default.disableResCalc)
+                check_disableResCalc.Checked = true;
         }
 
         #region General
@@ -168,20 +191,26 @@ 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;
         }
 
+        private void check_GrowlQueue_CheckedChanged(object sender, EventArgs e)
+        {
+            Properties.Settings.Default.growlQueue = check_GrowlQueue.Checked;
+        }
+
+        private void check_growlEncode_CheckedChanged(object sender, EventArgs e)
+        {
+            Properties.Settings.Default.growlEncode = check_growlEncode.Checked;
+        }
+
         private void check_autoNaming_CheckedChanged(object sender, EventArgs e)
         {
             Properties.Settings.Default.autoNaming = check_autoNaming.Checked;
@@ -312,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)
         {
@@ -382,6 +407,7 @@ namespace Handbrake
                     Properties.Settings.Default.x264cqstep = 0.20;
                     break;
             }
+            mainWindow.setQualityFromSlider();
         }
 
         private void check_dvdnav_CheckedChanged(object sender, EventArgs e)
@@ -390,11 +416,17 @@ namespace Handbrake
         }
         #endregion
 
+        #region Debug
+        private void check_disableResCalc_CheckedChanged(object sender, EventArgs e)
+        {
+            Properties.Settings.Default.disableResCalc = check_disableResCalc.Checked;
+        }
+        #endregion
+
         private void btn_close_Click(object sender, EventArgs e)
         {
             Properties.Settings.Default.Save(); // Small hack for Vista. Seems to work fine on XP without this
             this.Close();
         }
-
     }
 }
\ No newline at end of file