X-Git-Url: http://git.osdn.jp/view?a=blobdiff_plain;f=win%2FC%23%2FfrmActivityWindow.cs;h=ee3d3bf750d20980f044f3efd290bbfaad629469;hb=4560ade3c833f282f02d15a9473e233488617df9;hp=ffc02fa8f6f2f6f1540c2d46d2018911899fba8b;hpb=84d2ac63386023c9a4c7af3b78339956600dfe76;p=handbrake-jp%2Fhandbrake-jp-git.git

diff --git a/win/C#/frmActivityWindow.cs b/win/C#/frmActivityWindow.cs
index ffc02fa8..ee3d3bf7 100644
--- a/win/C#/frmActivityWindow.cs
+++ b/win/C#/frmActivityWindow.cs
@@ -13,6 +13,8 @@ namespace Handbrake
     using System.Threading;
     using System.Windows.Forms;
 
+    using HandBrake.Framework.Services;
+    using HandBrake.Framework.Services.Interfaces;
     using HandBrake.ApplicationServices.Services.Interfaces;
 
     using Model;
@@ -26,24 +28,29 @@ namespace Handbrake
         /* Private Variables */
 
         /// <summary>
-        /// The current position in the log file
+        /// The Encode Object
         /// </summary>
-        private int position;
+        private readonly IQueue encode;
 
         /// <summary>
-        /// A Timer for this window
+        /// The Scan Object
         /// </summary>
-        private Timer windowTimer;
+        private readonly IScan scan;
 
         /// <summary>
-        /// The Encode Object
+        /// The Error service
         /// </summary>
-        private IQueue encode;
+        private readonly IErrorService errorService = new ErrorService();
 
         /// <summary>
-        /// The Scan Object
+        /// The current position in the log file
         /// </summary>
-        private IScan scan;
+        private int position;
+
+        /// <summary>
+        /// A Timer for this window
+        /// </summary>
+        private Timer windowTimer;
 
         /// <summary>
         /// The Type of log that the window is currently dealing with
@@ -111,7 +118,7 @@ namespace Handbrake
             {
                 if (rtf_actLog.InvokeRequired)
                 {
-                    IAsyncResult invoked = BeginInvoke(new SetModeCallback(SetMode), new object[] {setMode});
+                    IAsyncResult invoked = BeginInvoke(new SetModeCallback(SetMode), new object[] { setMode });
                     EndInvoke(invoked);
                 }
                 else
@@ -151,12 +158,32 @@ namespace Handbrake
         /// The sender.
         /// </param>
         /// <param name="e">
-        /// The e.
+        /// The EventArgs.
         /// </param>
-        private void NewActivityWindow_Load(object sender, EventArgs e)
+        private void ActivityWindowLoad(object sender, EventArgs e)
         {
-            ActivityLogMode activitLogMode = (ActivityLogMode)Enum.ToObject(typeof(ActivityLogMode), Properties.Settings.Default.ActivityWindowLastMode);
-            SetMode(activitLogMode);        
+            try
+            {
+                // Set the inital log file.
+                if (encode.IsEncoding)
+                {
+                    this.logSelector.SelectedIndex = 1;
+                }
+                else if (scan.IsScanning)
+                {
+                    this.logSelector.SelectedIndex = 0;
+                }
+                else
+                {
+                    // Otherwise, use the last mode the window was in.
+                    ActivityLogMode activitLogMode = (ActivityLogMode)Enum.ToObject(typeof(ActivityLogMode), Properties.Settings.Default.ActivityWindowLastMode);
+                    this.logSelector.SelectedIndex = activitLogMode == ActivityLogMode.Scan ? 0 : 1;
+                }
+            }
+            catch (Exception exc)
+            {
+                errorService.ShowError("Error during load.", exc.ToString());
+            }
         }
 
         /// <summary>
@@ -199,6 +226,7 @@ namespace Handbrake
         private void stopWindowRefresh(object sender, EventArgs e)
         {
             windowTimer.Dispose();
+            Reset();
             LogMonitor(null);
         }
 
@@ -223,36 +251,45 @@ namespace Handbrake
         {
             StringBuilder appendText = new StringBuilder();
 
-            if (this.mode == ActivityLogMode.Scan)
+            try
             {
-                if (scan == null || scan.ActivityLog == string.Empty)
+                if (this.mode == ActivityLogMode.Scan)
                 {
-                    appendText.AppendFormat("Waiting for the log to be generated ...\n");
-                    position = 0;
-                    ClearWindowText();
-                    return appendText;
-                }
+                    if (scan == null || scan.ActivityLog == string.Empty)
+                    {
+                        appendText.AppendFormat("Waiting for the log to be generated ...\n");
+                        position = 0;
+                        ClearWindowText();
+                        return appendText;
+                    }
 
-                using (StringReader reader = new StringReader(scan.ActivityLog))
-                {
-                    LogReader(reader, appendText);
+                    using (StringReader reader = new StringReader(scan.ActivityLog))
+                    {
+                        LogReader(reader, appendText);
+                    }
                 }
-            }
-            else
-            {
-                if (encode == null || encode.ActivityLog == string.Empty)
+                else
                 {
-                    appendText.AppendFormat("Waiting for the log to be generated ...\n");
-                    position = 0;
-                    ClearWindowText();
-                    return appendText;
-                }
+                    if (encode == null || encode.ActivityLog == string.Empty)
+                    {
+                        appendText.AppendFormat("Waiting for the log to be generated ...\n");
+                        position = 0;
+                        ClearWindowText();
+                        return appendText;
+                    }
 
-                using (StringReader reader = new StringReader(encode.ActivityLog))
-                {
-                    LogReader(reader, appendText);
+                    using (StringReader reader = new StringReader(encode.ActivityLog))
+                    {
+                        LogReader(reader, appendText);
+                    }
                 }
             }
+            catch (Exception exc)
+            {
+                windowTimer.Dispose();
+                errorService.ShowError("GetLog() Error", exc.ToString());
+            }
+
             return appendText;
         }
 
@@ -406,31 +443,13 @@ namespace Handbrake
         }
 
         /// <summary>
-        /// Set scan mode
+        /// Change the Log file in the viewer
         /// </summary>
-        /// <param name="sender">
-        /// The sender.
-        /// </param>
-        /// <param name="e">
-        /// The e.
-        /// </param>
-        private void BtnScanLogClick(object sender, EventArgs e)
-        {
-            SetMode(ActivityLogMode.Scan);
-        }
-
-        /// <summary>
-        /// Set the encode mode
-        /// </summary>
-        /// <param name="sender">
-        /// The sender.
-        /// </param>
-        /// <param name="e">
-        /// The e.
-        /// </param>
-        private void BtnEncodeLogClick(object sender, EventArgs e)
+        /// <param name="sender">The Sender </param>
+        /// <param name="e">The EventArgs</param>
+        private void LogSelectorClick(object sender, EventArgs e)
         {
-            SetMode(ActivityLogMode.Encode);
+            this.SetMode((string)this.logSelector.SelectedItem == "Scan Log" ? ActivityLogMode.Scan : ActivityLogMode.Encode);
         }
 
         /* Overrides */