X-Git-Url: http://git.osdn.jp/view?a=blobdiff_plain;f=win%2FC%23%2FfrmOptions.cs;h=aef7555143b4ebdf7fb6f76c5afecea3e2621113;hb=d571d3e6a3bb4bbeda35cac674f697a253a11e94;hp=790c20ec6d90ff4ba0a9b89a134fd62d3808f37e;hpb=ad88ce530b12ba093a3756b36645dfb269fb5d42;p=handbrake-jp%2Fhandbrake-jp-git.git

diff --git a/win/C#/frmOptions.cs b/win/C#/frmOptions.cs
index 790c20ec..aef75551 100644
--- a/win/C#/frmOptions.cs
+++ b/win/C#/frmOptions.cs
@@ -4,14 +4,15 @@
  	   Homepage: <http://handbrake.fr>.
  	   It may be used under the terms of the GNU General Public License. */
 
-using System;
-using System.Collections.Generic;
-using System.Globalization;
-using System.Windows.Forms;
-using Handbrake.Functions;
-
 namespace Handbrake
 {
+    using System;
+    using System.Collections.Generic;
+    using System.Diagnostics;
+    using System.Globalization;
+    using System.Windows.Forms;
+    using Functions;
+
     public partial class frmOptions : Form
     {
         private frmMain mainWindow;
@@ -116,7 +117,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;
@@ -128,6 +128,7 @@ namespace Handbrake
             // The saved log path
             text_logPath.Text = Properties.Settings.Default.saveLogPath;
 
+            check_clearOldLogs.Checked = Properties.Settings.Default.clearOldLogs;
 
             // #############################
             // Advanced
@@ -144,6 +145,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;
@@ -156,6 +158,9 @@ namespace Handbrake
             if (Properties.Settings.Default.enocdeStatusInGui)
                 check_inGuiStatus.CheckState = CheckState.Checked;
 
+            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();
 
@@ -189,6 +194,7 @@ namespace Handbrake
         }
 
         #region General
+
         private void check_updateCheck_CheckedChanged(object sender, EventArgs e)
         {
             Properties.Settings.Default.updateStatus = check_updateCheck.Checked;
@@ -250,7 +256,7 @@ namespace Handbrake
         {
             if (text_an_path.Text == string.Empty)
             {
-                Properties.Settings.Default.autoNamePath = "";
+                Properties.Settings.Default.autoNamePath = string.Empty;
                 text_an_path.Text = "Click 'Browse' to set the default location";
             }
             else
@@ -261,39 +267,48 @@ namespace Handbrake
         {
             Properties.Settings.Default.useM4v = check_m4v.Checked;
         }
+
         #endregion
 
         #region Picture
+
         private void btn_vlcPath_Click(object sender, EventArgs e)
         {
             openFile_vlc.ShowDialog();
             if (openFile_vlc.FileName != string.Empty)
                 txt_vlcPath.Text = openFile_vlc.FileName;
         }
+
         private void txt_vlcPath_TextChanged(object sender, EventArgs e)
         {
             Properties.Settings.Default.VLC_Path = txt_vlcPath.Text;
         }
+
         #endregion
 
         #region Audio and Subtitles
+
         private void drop_preferredLang_SelectedIndexChanged(object sender, EventArgs e)
         {
             Properties.Settings.Default.NativeLanguage = drop_preferredLang.SelectedItem.ToString();
         }
+
         private void radio_dub_CheckedChanged(object sender, EventArgs e)
         {
             if (radio_dub.Checked)
                 Properties.Settings.Default.DubAudio = true;
         }
+
         private void radio_foreignAndSubs_CheckedChanged(object sender, EventArgs e)
         {
             if (radio_foreignAndSubs.Checked)
                 Properties.Settings.Default.DubAudio = false;
-        }       
+        }
+
         #endregion
 
         #region CLI
+
         private void check_cli_minimized_CheckedChanged(object sender, EventArgs e)
         {
             Properties.Settings.Default.cli_minimized = check_cli_minimized.Checked;
@@ -341,7 +356,7 @@ namespace Handbrake
         {
             string logDir = Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData) + "\\HandBrake\\logs";
             string windir = Environment.GetEnvironmentVariable("WINDIR");
-            System.Diagnostics.Process prc = new System.Diagnostics.Process();
+            Process prc = new Process();
             prc.StartInfo.FileName = windir + @"\explorer.exe";
             prc.StartInfo.Arguments = logDir;
             prc.Start();
@@ -349,14 +364,21 @@ namespace Handbrake
 
         private void btn_clearLogs_Click(object sender, EventArgs e)
         {
-            DialogResult result = MessageBox.Show("Are you sure you wish to clear the log file directory?", "Clear Logs", MessageBoxButtons.YesNoCancel, MessageBoxIcon.Question);
+            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();
-                MessageBox.Show(this, "HandBrake's Log file directory has been cleared!", "Notice", MessageBoxButtons.OK,
+                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
@@ -391,9 +413,26 @@ 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 check_showCliForInGUIEncode_CheckedChanged(object sender, EventArgs e)
+        {
+            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());
@@ -423,13 +462,16 @@ namespace Handbrake
         {
             Properties.Settings.Default.noDvdNav = check_dvdnav.Checked;
         }
+
         #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)