Widow – Diff between revs 21 and 22

Subversion Repositories:
Rev:
Show entire file – Ignore whitespace
Rev 21 Rev 22
Line 27... Line 27...
27 public RuleEditForm RuleEditForm { get; set; } 27 public RuleEditForm RuleEditForm { get; set; }
Line 28... Line 28...
28   28  
Line 29... Line 29...
29 public WindowManipulation WindowManipulation { get; set; } 29 public WindowManipulation WindowManipulation { get; set; }
-   30  
30   31 public AboutForm AboutForm { get; set; }
Line 31... Line 32...
31 public AboutForm AboutForm { get; set; } 32  
Line 32... Line 33...
32 public LogForm LogForm { get; private set; } 33 public LogForm LogForm { get; private set; }
Line 47... Line 48...
47   48  
Line 48... Line 49...
48 Natives.RegisterShellHookWindow(Handle); 49 Natives.RegisterShellHookWindow(Handle);
Line 49... Line -...
49   -  
50 WindowManipulation = new WindowManipulation(Settings.Default, this); -  
51   50  
52 LoadWindows().ContinueWith(task => -  
53 { 51 WindowManipulation = new WindowManipulation(Settings.Default, this);
Line 54... Line 52...
54 WindowManipulation.AddWindows(Windows); 52  
55 }); 53 LoadWindows().ContinueWith(task => { WindowManipulation.AddWindows(Windows); });
56 } 54 }
Line 138... Line 136...
138 LogForm.InvokeIfRequired(form => 136 LogForm.InvokeIfRequired(form =>
139 { 137 {
140 form.logTextBox.Text += "Windows saved." + Environment.NewLine; 138 form.logTextBox.Text += "Windows saved." + Environment.NewLine;
141 }); 139 });
142 } 140 }
-   141  
143 break; 142 break;
144 case SerializationFailure serializationFailure: 143 case SerializationFailure serializationFailure:
145 if (LogForm != null) 144 if (LogForm != null)
146 { 145 {
147 LogForm.InvokeIfRequired(form => 146 LogForm.InvokeIfRequired(form =>
148 { 147 {
-   148 form.logTextBox.Text += "Failed to save windows: " +
149 form.logTextBox.Text += "Failed to save windows: " + serializationFailure.Exception.Message + Environment.NewLine; 149 serializationFailure.Exception.Message + Environment.NewLine;
150 }); 150 });
151 } 151 }
-   152  
152 break; 153 break;
153 } 154 }
154 } 155 }
Line 155... Line 156...
155   156  
Line 215... Line 216...
215 private async void NotifyIcon1_Click(object sender, EventArgs e) 216 private async void NotifyIcon1_Click(object sender, EventArgs e)
216 { 217 {
217 await WindowManipulation.Apply(); 218 await WindowManipulation.Apply();
218 } 219 }
Line -... Line 220...
-   220  
-   221 private void ShowLogToolStripMenuItem_Click(object sender, EventArgs e)
-   222 {
-   223 if (LogForm != null)
-   224 {
-   225 return;
-   226 }
-   227  
-   228 LogForm = new LogForm();
-   229 LogForm.Closed += LogForm_Closed;
-   230 LogForm.Show();
-   231 }
-   232  
-   233 private void LogForm_Closed(object sender, EventArgs e)
-   234 {
-   235 LogForm.Closed -= LogForm_Closed;
-   236 LogForm.Dispose();
-   237 LogForm = null;
-   238 }
219   239  
Line 220... Line 240...
220 #endregion 240 #endregion
Line 221... Line 241...
221   241  
Line 232... Line 252...
232 LogForm.InvokeIfRequired(form => 252 LogForm.InvokeIfRequired(form =>
233 { 253 {
234 form.logTextBox.Text += "Windows loaded." + Environment.NewLine; 254 form.logTextBox.Text += "Windows loaded." + Environment.NewLine;
235 }); 255 });
236 } 256 }
-   257  
237 break; 258 break;
238 case SerializationFailure serializationFailure: 259 case SerializationFailure serializationFailure:
239 Windows = new Windows.Windows(); 260 Windows = new Windows.Windows();
240 if (LogForm != null) 261 if (LogForm != null)
241 { 262 {
242 LogForm.InvokeIfRequired(form => 263 LogForm.InvokeIfRequired(form =>
243 { 264 {
-   265 form.logTextBox.Text += "Failed to load windows: " +
244 form.logTextBox.Text += "Failed to load windows: " + serializationFailure.Exception.Message + Environment.NewLine; 266 serializationFailure.Exception.Message + Environment.NewLine;
245 }); 267 });
246 } 268 }
-   269  
247 break; 270 break;
248 } 271 }
249 } 272 }
Line 250... Line 273...
250   273  
251 #endregion -  
252   -  
253 private void ShowLogToolStripMenuItem_Click(object sender, EventArgs e) -  
254 { -  
255 if (LogForm != null) -  
256 { -  
257 return; -  
258 } -  
259   -  
260 LogForm = new LogForm(); -  
261 LogForm.Closed += LogForm_Closed; -  
262 LogForm.Show(); -  
263 } -  
264   -  
265 private void LogForm_Closed(object sender, EventArgs e) -  
266 { -  
267 LogForm.Closed -= LogForm_Closed; -  
268 LogForm.Dispose(); -  
269 LogForm = null; -  
270 } 274 #endregion
271 } 275 }
272 } 276 }