X-Git-Url: http://git.osdn.jp/view?a=blobdiff_plain;f=win%2FC%23%2FfrmOptions.cs;h=5427aeb20195d6c372555fea8f0f391d65883051;hb=b8c7cf18f82ad8552e4a79ab3e93794a2e7759e5;hp=77a7a58cef3ec79d9284758aa1e3b011e91cef43;hpb=1e81d28bc495538522f8ae9c35addf9f880bb849;p=handbrake-jp%2Fhandbrake-jp-git.git

diff --git a/win/C#/frmOptions.cs b/win/C#/frmOptions.cs
index 77a7a58c..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,10 +36,24 @@ namespace Handbrake
                 ToolTip.Active = true;
             }
 
-            // Setup Widgets to match settings.
+            // Update Check
             if (Properties.Settings.Default.updateStatus)
                 check_updateCheck.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;
 
@@ -102,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;
@@ -114,6 +127,7 @@ namespace Handbrake
             // The saved log path
             text_logPath.Text = Properties.Settings.Default.saveLogPath;
 
+            check_clearOldLogs.Checked = Properties.Settings.Default.clearOldLogs;
 
             // #############################
             // Advanced
@@ -130,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;
@@ -142,19 +157,11 @@ namespace Handbrake
             if (Properties.Settings.Default.enocdeStatusInGui)
                 check_inGuiStatus.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;
-            }
+            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"));
@@ -191,6 +198,22 @@ namespace Handbrake
             Properties.Settings.Default.updateStatus = check_updateCheck.Checked;
         }
 
+        private void drop_updateCheckDays_SelectedIndexChanged(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;
+            }
+        }
+
         private void check_tooltip_CheckedChanged(object sender, EventArgs e)
         {
             Properties.Settings.Default.tooltipEnable = check_tooltip.Checked;
@@ -271,7 +294,7 @@ namespace Handbrake
         {
             if (radio_foreignAndSubs.Checked)
                 Properties.Settings.Default.DubAudio = false;
-        }       
+        }
         #endregion
 
         #region CLI
@@ -333,11 +356,16 @@ 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);
             }
         }
+
+        private void check_clearOldLogs_CheckedChanged(object sender, EventArgs e)
+        {
+            Properties.Settings.Default.clearOldLogs = check_clearOldLogs.Checked;
+        }
         #endregion
 
         #region Advanced
@@ -372,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)