using System.Threading;\r
using System.Windows.Forms;\r
\r
+ using HandBrake.Framework.Services;\r
+ using HandBrake.Framework.Services.Interfaces;\r
using HandBrake.ApplicationServices.Services.Interfaces;\r
\r
using Model;\r
/* Private Variables */\r
\r
/// <summary>\r
- /// The current position in the log file\r
+ /// The Encode Object\r
/// </summary>\r
- private int position;\r
+ private readonly IQueue encode;\r
\r
/// <summary>\r
- /// A Timer for this window\r
+ /// The Scan Object\r
/// </summary>\r
- private Timer windowTimer;\r
+ private readonly IScan scan;\r
\r
/// <summary>\r
- /// The Encode Object\r
+ /// The Error service\r
/// </summary>\r
- private IQueue encode;\r
+ private readonly IErrorService errorService = new ErrorService();\r
\r
/// <summary>\r
- /// The Scan Object\r
+ /// The current position in the log file\r
/// </summary>\r
- private IScan scan;\r
+ private int position;\r
+\r
+ /// <summary>\r
+ /// A Timer for this window\r
+ /// </summary>\r
+ private Timer windowTimer;\r
\r
/// <summary>\r
/// The Type of log that the window is currently dealing with\r
{\r
if (rtf_actLog.InvokeRequired)\r
{\r
- IAsyncResult invoked = BeginInvoke(new SetModeCallback(SetMode), new object[] {setMode});\r
+ IAsyncResult invoked = BeginInvoke(new SetModeCallback(SetMode), new object[] { setMode });\r
EndInvoke(invoked);\r
}\r
else\r
this.mode = setMode;\r
\r
Array values = Enum.GetValues(typeof(ActivityLogMode));\r
- Properties.Settings.Default.ActivityWindowLastMode = (int) values.GetValue(Convert.ToInt32(setMode));\r
+ Properties.Settings.Default.ActivityWindowLastMode = (int)values.GetValue(Convert.ToInt32(setMode));\r
Properties.Settings.Default.Save();\r
\r
this.Text = mode == ActivityLogMode.Scan\r
/// 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
- ActivityLogMode activitLogMode = (ActivityLogMode) Enum.ToObject(typeof(ActivityLogMode), Properties.Settings.Default.ActivityWindowLastMode);\r
- SetMode(activitLogMode); \r
+ try\r
+ {\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
+ errorService.ShowError("Error during load.", exc.ToString());\r
+ }\r
}\r
\r
/// <summary>\r
private void stopWindowRefresh(object sender, EventArgs e)\r
{\r
windowTimer.Dispose();\r
+ Reset();\r
LogMonitor(null);\r
}\r
\r
{\r
StringBuilder appendText = new StringBuilder();\r
\r
- if (this.mode == ActivityLogMode.Scan)\r
+ try\r
{\r
- if (scan == null || scan.ActivityLog == string.Empty)\r
+ if (this.mode == ActivityLogMode.Scan)\r
{\r
- appendText.AppendFormat("Waiting for the log to be generated ...\n");\r
- position = 0;\r
- ClearWindowText();\r
- return appendText;\r
- }\r
+ if (scan == null || scan.ActivityLog == string.Empty)\r
+ {\r
+ appendText.AppendFormat("Waiting for the log to be generated ...\n");\r
+ position = 0;\r
+ ClearWindowText();\r
+ return appendText;\r
+ }\r
\r
- using (StringReader reader = new StringReader(scan.ActivityLog))\r
- {\r
- LogReader(reader, appendText);\r
+ using (StringReader reader = new StringReader(scan.ActivityLog))\r
+ {\r
+ LogReader(reader, appendText);\r
+ }\r
}\r
- }\r
- else\r
- {\r
- if (encode == null || encode.ActivityLog == string.Empty)\r
+ else\r
{\r
- appendText.AppendFormat("Waiting for the log to be generated ...\n");\r
- position = 0;\r
- ClearWindowText();\r
- return appendText;\r
- }\r
+ if (encode == null || encode.ActivityLog == string.Empty)\r
+ {\r
+ appendText.AppendFormat("Waiting for the log to be generated ...\n");\r
+ position = 0;\r
+ ClearWindowText();\r
+ return appendText;\r
+ }\r
\r
- using (StringReader reader = new StringReader(encode.ActivityLog))\r
- {\r
- LogReader(reader, appendText);\r
+ using (StringReader reader = new StringReader(encode.ActivityLog))\r
+ {\r
+ LogReader(reader, appendText);\r
+ }\r
}\r
}\r
+ catch (Exception exc)\r
+ {\r
+ windowTimer.Dispose();\r
+ errorService.ShowError("GetLog() Error", exc.ToString());\r
+ }\r
+\r
return appendText;\r
}\r
\r
}\r
\r
/// <summary>\r
- /// Set scan 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 BtnScanLogClick(object sender, EventArgs e)\r
- {\r
- SetMode(ActivityLogMode.Scan);\r
- }\r
-\r
- /// <summary>\r
- /// Set the encode mode\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
OSDN Git Service
