CLI: update the built in presets

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

diff --git a/win/C#/frmActivityWindow.cs b/win/C#/frmActivityWindow.cs
index 78c7927..ee3d3bf 100644 (file)
--- a/win/C#/frmActivityWindow.cs
+++ b/win/C#/frmActivityWindow.cs
@@ -13,7 +13,8 @@ namespace Handbrake
     using System.Threading;\r
     using System.Windows.Forms;\r
 \r
-    using HandBrake.ApplicationServices.Services;\r
+    using HandBrake.Framework.Services;\r
+    using HandBrake.Framework.Services.Interfaces;\r
     using HandBrake.ApplicationServices.Services.Interfaces;\r
 \r
     using Model;\r
@@ -157,14 +158,27 @@ namespace Handbrake
         /// The sender.\r
         /// </param>\r
         /// <param name="e">\r
-        /// The e.\r
+        /// The EventArgs.\r
         /// </param>\r
-        private void NewActivityWindow_Load(object sender, EventArgs e)\r
+        private void ActivityWindowLoad(object sender, EventArgs e)\r
         {\r
             try\r
             {\r
-                ActivityLogMode activitLogMode = (ActivityLogMode)Enum.ToObject(typeof(ActivityLogMode), Properties.Settings.Default.ActivityWindowLastMode);\r
-                SetMode(activitLogMode);\r
+                // Set the inital log file.\r
+                if (encode.IsEncoding)\r
+                {\r
+                    this.logSelector.SelectedIndex = 1;\r
+                }\r
+                else if (scan.IsScanning)\r
+                {\r
+                    this.logSelector.SelectedIndex = 0;\r
+                }\r
+                else\r
+                {\r
+                    // Otherwise, use the last mode the window was in.\r
+                    ActivityLogMode activitLogMode = (ActivityLogMode)Enum.ToObject(typeof(ActivityLogMode), Properties.Settings.Default.ActivityWindowLastMode);\r
+                    this.logSelector.SelectedIndex = activitLogMode == ActivityLogMode.Scan ? 0 : 1;\r
+                }\r
             }\r
             catch (Exception exc)\r
             {\r
@@ -272,6 +286,7 @@ namespace Handbrake
             }\r
             catch (Exception exc)\r
             {\r
+                windowTimer.Dispose();\r
                 errorService.ShowError("GetLog() Error", exc.ToString());\r
             }\r
 \r
@@ -428,31 +443,13 @@ namespace Handbrake
         }\r
 \r
         /// <summary>\r
-        /// Set scan mode\r
-        /// </summary>\r
-        /// <param name="sender">\r
-        /// The sender.\r
-        /// </param>\r
-        /// <param name="e">\r
-        /// The e.\r
-        /// </param>\r
-        private void BtnScanLogClick(object sender, EventArgs e)\r
-        {\r
-            SetMode(ActivityLogMode.Scan);\r
-        }\r
-\r
-        /// <summary>\r
-        /// Set the encode mode\r
+        /// Change the Log file in the viewer\r
         /// </summary>\r
-        /// <param name="sender">\r
-        /// The sender.\r
-        /// </param>\r
-        /// <param name="e">\r
-        /// The e.\r
-        /// </param>\r
-        private void BtnEncodeLogClick(object sender, EventArgs e)\r
+        /// <param name="sender">The Sender </param>\r
+        /// <param name="e">The EventArgs</param>\r
+        private void LogSelectorClick(object sender, EventArgs e)\r
         {\r
-            SetMode(ActivityLogMode.Encode);\r
+            this.SetMode((string)this.logSelector.SelectedItem == "Scan Log" ? ActivityLogMode.Scan : ActivityLogMode.Encode);\r
         }\r
 \r
         /* Overrides */\r