| /trunk/Widow/MainForm.cs |
|---|
| @@ -29,7 +29,6 @@ |
|---|
| public WindowManipulation WindowManipulation { get; set; } |
| |
| public AboutForm AboutForm { get; set; } |
| |
| public LogForm LogForm { get; private set; } |
| |
| #endregion |
| @@ -50,7 +49,10 @@ |
|---|
| |
| WindowManipulation = new WindowManipulation(Settings.Default, this); |
| |
| LoadWindows().ContinueWith(task => { WindowManipulation.AddWindows(Windows); }); |
| LoadWindows().ContinueWith(task => |
| { |
| WindowManipulation.AddWindows(Windows); |
| }); |
| } |
| |
| /// <summary> |
| @@ -138,7 +140,6 @@ |
|---|
| form.logTextBox.Text += "Windows saved." + Environment.NewLine; |
| }); |
| } |
| |
| break; |
| case SerializationFailure serializationFailure: |
| if (LogForm != null) |
| @@ -145,11 +146,9 @@ |
|---|
| { |
| LogForm.InvokeIfRequired(form => |
| { |
| form.logTextBox.Text += "Failed to save windows: " + |
| serializationFailure.Exception.Message + Environment.NewLine; |
| form.logTextBox.Text += "Failed to save windows: " + serializationFailure.Exception.Message + Environment.NewLine; |
| }); |
| } |
| |
| break; |
| } |
| } |
| @@ -218,25 +217,6 @@ |
|---|
| await WindowManipulation.Apply(); |
| } |
| |
| private void ShowLogToolStripMenuItem_Click(object sender, EventArgs e) |
| { |
| if (LogForm != null) |
| { |
| return; |
| } |
| |
| LogForm = new LogForm(); |
| LogForm.Closed += LogForm_Closed; |
| LogForm.Show(); |
| } |
| |
| private void LogForm_Closed(object sender, EventArgs e) |
| { |
| LogForm.Closed -= LogForm_Closed; |
| LogForm.Dispose(); |
| LogForm = null; |
| } |
| |
| #endregion |
| |
| #region Private Methods |
| @@ -254,7 +234,6 @@ |
|---|
| form.logTextBox.Text += "Windows loaded." + Environment.NewLine; |
| }); |
| } |
| |
| break; |
| case SerializationFailure serializationFailure: |
| Windows = new Windows.Windows(); |
| @@ -262,15 +241,32 @@ |
|---|
| { |
| LogForm.InvokeIfRequired(form => |
| { |
| form.logTextBox.Text += "Failed to load windows: " + |
| serializationFailure.Exception.Message + Environment.NewLine; |
| form.logTextBox.Text += "Failed to load windows: " + serializationFailure.Exception.Message + Environment.NewLine; |
| }); |
| } |
| |
| break; |
| } |
| } |
| |
| #endregion |
| |
| private void ShowLogToolStripMenuItem_Click(object sender, EventArgs e) |
| { |
| if (LogForm != null) |
| { |
| return; |
| } |
| |
| LogForm = new LogForm(); |
| LogForm.Closed += LogForm_Closed; |
| LogForm.Show(); |
| } |
| |
| private void LogForm_Closed(object sender, EventArgs e) |
| { |
| LogForm.Closed -= LogForm_Closed; |
| LogForm.Dispose(); |
| LogForm = null; |
| } |
| } |
| } |
