X-Git-Url: http://git.osdn.jp/view?a=blobdiff_plain;f=win%2FC%23%2FfrmOptions.cs;h=5427aeb20195d6c372555fea8f0f391d65883051;hb=b8c7cf18f82ad8552e4a79ab3e93794a2e7759e5;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..5427aeb2 100644
--- a/win/C#/frmOptions.cs
+++ b/win/C#/frmOptions.cs
@@ -21,7 +21,7 @@ namespace Handbrake
             InitializeComponent();
             mainWindow = mw;
 
-            IDictionary<string, string> langList = Main.mapLanguages();
+            IDictionary<string, string> langList = Main.MapLanguages();
             foreach (string item in langList.Keys)
                 drop_preferredLang.Items.Add(item);
 
@@ -36,13 +36,23 @@ namespace Handbrake
                 ToolTip.Active = true;
             }
 
-            // Setup Widgets to match settings.
+            // Update Check
             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;
+            // Days between update checks
+            switch (Properties.Settings.Default.daysBetweenUpdateCheck)
+            {
+                case 1:
+                    drop_updateCheckDays.SelectedIndex = 0;
+                    break;
+                case 7:
+                    drop_updateCheckDays.SelectedIndex = 1;
+                    break;
+                case 30:
+                    drop_updateCheckDays.SelectedIndex = 2;
+                    break;
+            }
 
             // On Encode Completeion Action
             drp_completeOption.Text = Properties.Settings.Default.CompletionOption;
@@ -106,7 +116,6 @@ namespace Handbrake
             // Log Verbosity Level
             cb_logVerboseLvl.SelectedIndex = Properties.Settings.Default.verboseLevel;
 
-
             // Save logs in the same directory as encoded files
             if (Properties.Settings.Default.saveLogWithVideo)
                 check_saveLogWithVideo.CheckState = CheckState.Checked;
@@ -118,15 +127,12 @@ namespace Handbrake
             // The saved log path
             text_logPath.Text = Properties.Settings.Default.saveLogPath;
 
+            check_clearOldLogs.Checked = Properties.Settings.Default.clearOldLogs;
 
             // #############################
             // 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;
@@ -138,6 +144,7 @@ namespace Handbrake
             // Enable / Disable Query editor tab
             if (Properties.Settings.Default.QueryEditorTab)
                 check_queryEditorTab.CheckState = CheckState.Checked;
+            check_promptOnUnmatchingQueries.Enabled = check_queryEditorTab.Checked;
 
             // Prompt on inconsistant queries
             check_promptOnUnmatchingQueries.Checked = Properties.Settings.Default.PromptOnUnmatchingQueries;
@@ -150,27 +157,32 @@ namespace Handbrake
             if (Properties.Settings.Default.enocdeStatusInGui)
                 check_inGuiStatus.CheckState = CheckState.Checked;
 
-            // Days between update checks
-            switch (Properties.Settings.Default.daysBetweenUpdateCheck)
+            check_showCliForInGUIEncode.Checked = Properties.Settings.Default.showCliForInGuiEncodeStatus;
+            check_showCliForInGUIEncode.Enabled = check_inGuiStatus.Checked;
+
+            // Set the preview count
+            drop_previewScanCount.SelectedItem = Properties.Settings.Default.previewScanCount.ToString();
+
+            // x264 step
+            string step = Properties.Settings.Default.x264cqstep.ToString(new CultureInfo("en-US"));
+            switch (step)
             {
-                case 1:
-                    drop_updateCheckDays.SelectedIndex = 0;
+                case "1":
+                    drop_x264step.SelectedIndex = 0;
                     break;
-                case 7:
-                    drop_updateCheckDays.SelectedIndex = 1;
+                case "0.5":
+                    drop_x264step.SelectedIndex = 1;
                     break;
-                case 30:
-                    drop_updateCheckDays.SelectedIndex = 2;
+                case "0.25":
+                    drop_x264step.SelectedIndex = 2;
+                    break;
+                case "0.2":
+                    drop_x264step.SelectedIndex = 3;
                     break;
             }
 
-            // x264 step
-            CultureInfo culture = CultureInfo.CreateSpecificCulture("en-US");
-            string test = Properties.Settings.Default.x264cqstep.ToString(culture);
-            drop_x264step.SelectedItem = test;
-
             // Use Experimental dvdnav
-            if (Properties.Settings.Default.dvdnav)
+            if (Properties.Settings.Default.noDvdNav)
                 check_dvdnav.CheckState = CheckState.Checked;
 
             // #############################
@@ -186,15 +198,27 @@ namespace Handbrake
             Properties.Settings.Default.updateStatus = check_updateCheck.Checked;
         }
 
-        private void check_userDefaultSettings_CheckedChanged(object sender, EventArgs e)
+        private void drop_updateCheckDays_SelectedIndexChanged(object sender, EventArgs e)
         {
-            Properties.Settings.Default.defaultSettings = check_userDefaultSettings.Checked;
+            switch (drop_updateCheckDays.SelectedIndex)
+            {
+                case 0:
+                    Properties.Settings.Default.daysBetweenUpdateCheck = 1;
+                    break;
+                case 1:
+                    Properties.Settings.Default.daysBetweenUpdateCheck = 7;
+                    break;
+                case 2:
+                    Properties.Settings.Default.daysBetweenUpdateCheck = 30;
+                    break;
+            }
         }
 
         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;
@@ -270,7 +294,7 @@ namespace Handbrake
         {
             if (radio_foreignAndSubs.Checked)
                 Properties.Settings.Default.DubAudio = false;
-        }       
+        }
         #endregion
 
         #region CLI
@@ -332,18 +356,19 @@ namespace Handbrake
             DialogResult result = MessageBox.Show("Are you sure you wish to clear the log file directory?", "Clear Logs", MessageBoxButtons.YesNoCancel, MessageBoxIcon.Question);
             if (result == DialogResult.Yes)
             {
-                Main.clearLogs();
+                Main.ClearLogs();
                 MessageBox.Show(this, "HandBrake's Log file directory has been cleared!", "Notice", MessageBoxButtons.OK,
                                 MessageBoxIcon.Information);
             }
         }
-        #endregion
 
-        #region Advanced
-        private void btn_drive_detect_CheckedChanged(object sender, EventArgs e)
+        private void check_clearOldLogs_CheckedChanged(object sender, EventArgs e)
         {
-            Properties.Settings.Default.drive_detection = btn_drive_detect.Checked;
+            Properties.Settings.Default.clearOldLogs = check_clearOldLogs.Checked;
         }
+        #endregion
+
+        #region Advanced
 
         private void check_mainMinimize_CheckedChanged(object sender, EventArgs e)
         {
@@ -375,22 +400,28 @@ namespace Handbrake
         private void check_inGuiStatus_CheckedChanged(object sender, EventArgs e)
         {
             Properties.Settings.Default.enocdeStatusInGui = check_inGuiStatus.Checked;
+
+            check_showCliForInGUIEncode.Enabled = check_inGuiStatus.Checked;
+
+            if (this.IsHandleCreated)
+                if (check_inGuiStatus.Checked)
+                {
+                    MessageBox.Show("This feature is experimental!\n\n You will not be able to ‘Stop’ an encode mid-process.\n"
+                                    + "Doing so will render the file unplayable.\n" +
+                                    "If you enable 'Show CLI Window', you'll be ablt to hit ctrl-c in the encode window to cleanly exit the CLI. This will give you a playable file.\n\n" +
+                                    "You are also limited to 1 instance of HandBrakeCLI on your system.",
+                                    "Warning", MessageBoxButtons.OK, MessageBoxIcon.Warning);
+                }
         }
 
-        private void drop_updateCheckDays_SelectedIndexChanged(object sender, EventArgs e)
+        private void check_showCliForInGUIEncode_CheckedChanged(object sender, EventArgs e)
         {
-            switch (drop_updateCheckDays.SelectedIndex)
-            {
-                case 0:
-                    Properties.Settings.Default.daysBetweenUpdateCheck = 1;
-                    break;
-                case 1:
-                    Properties.Settings.Default.daysBetweenUpdateCheck = 7;
-                    break;
-                case 2:
-                    Properties.Settings.Default.daysBetweenUpdateCheck = 30;
-                    break;
-            }
+            Properties.Settings.Default.showCliForInGuiEncodeStatus = check_showCliForInGUIEncode.Checked;
+        }
+
+        private void drop_previewScanCount_SelectedIndexChanged(object sender, EventArgs e)
+        {
+            Properties.Settings.Default.previewScanCount = int.Parse(drop_previewScanCount.SelectedItem.ToString());
         }
 
         private void x264step_SelectedIndexChanged(object sender, EventArgs e)
@@ -398,16 +429,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 +446,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