X-Git-Url: http://git.osdn.jp/view?a=blobdiff_plain;f=win%2FC%23%2FfrmActivityWindow.cs;h=ee3d3bf750d20980f044f3efd290bbfaad629469;hb=4560ade3c833f282f02d15a9473e233488617df9;hp=598851f78bfa24554eb2a19d57df298902d8cce6;hpb=a7b8282331ab68dcdfe6f762c306c54f405dd389;p=handbrake-jp%2Fhandbrake-jp-git.git
diff --git a/win/C#/frmActivityWindow.cs b/win/C#/frmActivityWindow.cs
index 598851f7..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 */
///
- /// The current position in the log file
+ /// The Encode Object
///
- private int position;
+ private readonly IQueue encode;
///
- /// A Timer for this window
+ /// The Scan Object
///
- private Timer windowTimer;
+ private readonly IScan scan;
///
- /// The Encode Object
+ /// The Error service
///
- private IQueue encode;
+ private readonly IErrorService errorService = new ErrorService();
///
- /// The Scan Object
+ /// The current position in the log file
///
- private IScan scan;
+ private int position;
+
+ ///
+ /// A Timer for this window
+ ///
+ private Timer windowTimer;
///
/// 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
@@ -120,7 +127,7 @@ namespace Handbrake
this.mode = setMode;
Array values = Enum.GetValues(typeof(ActivityLogMode));
- Properties.Settings.Default.ActivityWindowLastMode = (int) values.GetValue(Convert.ToInt32(setMode));
+ Properties.Settings.Default.ActivityWindowLastMode = (int)values.GetValue(Convert.ToInt32(setMode));
Properties.Settings.Default.Save();
this.Text = mode == ActivityLogMode.Scan
@@ -151,12 +158,32 @@ namespace Handbrake
/// The sender.
///
///
- /// The e.
+ /// The EventArgs.
///
- 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());
+ }
}
///
@@ -224,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;
}
@@ -407,31 +443,13 @@ namespace Handbrake
}
///
- /// Set scan mode
+ /// Change the Log file in the viewer
///
- ///
- /// The sender.
- ///
- ///
- /// The e.
- ///
- private void BtnScanLogClick(object sender, EventArgs e)
- {
- SetMode(ActivityLogMode.Scan);
- }
-
- ///
- /// Set the encode mode
- ///
- ///
- /// The sender.
- ///
- ///
- /// The e.
- ///
- private void BtnEncodeLogClick(object sender, EventArgs e)
+ /// The Sender
+ /// The EventArgs
+ private void LogSelectorClick(object sender, EventArgs e)
{
- SetMode(ActivityLogMode.Encode);
+ this.SetMode((string)this.logSelector.SelectedItem == "Scan Log" ? ActivityLogMode.Scan : ActivityLogMode.Encode);
}
/* Overrides */