WinGui: Re-checkin updated stylecop settings

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

diff --git a/win/C#/frmOptions.cs b/win/C#/frmOptions.cs
index 399cf01..4475d90 100644 (file)
--- a/win/C#/frmOptions.cs
+++ b/win/C#/frmOptions.cs
@@ -112,10 +112,6 @@ namespace Handbrake
             // CLI\r
             // #############################\r
 \r
-            // Enable Start CLI minimized\r
-            if (Properties.Settings.Default.cli_minimized)\r
-                check_cli_minimized.CheckState = CheckState.Checked;\r
-\r
             // Priority level for encodes\r
             drp_Priority.Text = Properties.Settings.Default.processPriority;\r
 \r
@@ -161,12 +157,8 @@ namespace Handbrake
             if (Properties.Settings.Default.presetNotification)\r
                 check_disablePresetNotification.CheckState = CheckState.Checked;\r
 \r
-            // Experimental In-GUI encode status indicator.\r
-            if (Properties.Settings.Default.enocdeStatusInGui)\r
-                check_inGuiStatus.CheckState = CheckState.Checked;\r
-\r
+            // Show CLI Window\r
             check_showCliForInGUIEncode.Checked = Properties.Settings.Default.showCliForInGuiEncodeStatus;\r
-            check_showCliForInGUIEncode.Enabled = check_inGuiStatus.Checked;\r
 \r
             // Set the preview count\r
             drop_previewScanCount.SelectedItem = Properties.Settings.Default.previewScanCount.ToString();\r
@@ -326,11 +318,6 @@ namespace Handbrake
 \r
         #region CLI\r
 \r
-        private void check_cli_minimized_CheckedChanged(object sender, EventArgs e)\r
-        {\r
-            Properties.Settings.Default.cli_minimized = check_cli_minimized.Checked;\r
-        }\r
-\r
         private void drp_Priority_SelectedIndexChanged(object sender, EventArgs e)\r
         {\r
             Properties.Settings.Default.processPriority = drp_Priority.Text;\r
@@ -427,24 +414,6 @@ namespace Handbrake
             Properties.Settings.Default.presetNotification = check_disablePresetNotification.Checked;\r
         }\r
 \r
-        private void check_inGuiStatus_CheckedChanged(object sender, EventArgs e)\r
-        {\r
-            Properties.Settings.Default.enocdeStatusInGui = check_inGuiStatus.Checked;\r
-\r
-            check_showCliForInGUIEncode.Enabled = check_inGuiStatus.Checked;\r
-\r
-            if (this.IsHandleCreated)\r
-                if (check_inGuiStatus.Checked)\r
-                {\r
-                    MessageBox.Show(\r
-                        "This feature is experimental!\n\n You will not be able to \91Stop\92 an encode mid-process.\n"\r
-                        + "Doing so will render the file unplayable.\n" +\r
-                        "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" +\r
-                        "You are also limited to 1 instance of HandBrakeCLI on your system.", \r
-                        "Warning", MessageBoxButtons.OK, MessageBoxIcon.Warning);\r
-                }\r
-        }\r
-\r
         private void check_showCliForInGUIEncode_CheckedChanged(object sender, EventArgs e)\r
         {\r
             Properties.Settings.Default.showCliForInGuiEncodeStatus = check_showCliForInGUIEncode.Checked;\r
@@ -504,10 +473,11 @@ namespace Handbrake
         /// </summary>\r
         private static void UpdateApplicationServicesSettings()\r
         {\r
-            Init.SetupSettings(Settings.Default.cli_minimized, Settings.Default.CompletionOption, Settings.Default.noDvdNav,\r
-                               Settings.Default.enocdeStatusInGui, Settings.Default.growlEncode, Settings.Default.growlQueue,\r
+            string versionId = String.Format("Windows GUI {1} {0}", Settings.Default.hb_build, Settings.Default.hb_version);\r
+            Init.SetupSettings(versionId, Program.InstanceId, Settings.Default.CompletionOption, Settings.Default.noDvdNav,\r
+                               Settings.Default.growlEncode, Settings.Default.growlQueue,\r
                                Settings.Default.processPriority, Settings.Default.saveLogPath, Settings.Default.saveLogToSpecifiedPath,\r
-                               Settings.Default.saveLogWithVideo, Settings.Default.showCliForInGuiEncodeStatus);\r
+                               Settings.Default.saveLogWithVideo, Settings.Default.showCliForInGuiEncodeStatus, Settings.Default.preventSleep);\r
         }\r
     }\r
 }
\ No newline at end of file