WingMan – Diff between revs 5 and 6

Subversion Repositories:
Rev:
Show entire fileRegard whitespace
Rev 5 Rev 6
Line 1... Line 1...
1 using System; 1 using System;
2 using System.Collections.Generic; 2 using System.Collections.Generic;
3 using System.Drawing; 3 using System.Drawing;
4 using System.Linq; 4 using System.Linq;
5 using System.Net; 5 using System.Net;
-   6 using System.Threading.Tasks;
6 using System.Windows.Forms; 7 using System.Windows.Forms;
7 using Gma.System.MouseKeyHook; 8 using Gma.System.MouseKeyHook;
8 using WingMan.Communication; 9 using WingMan.Communication;
9 using WingMan.MouseKey; 10 using WingMan.MouseKey;
10 using WingMan.Properties; 11 using WingMan.Properties;
Line 15... Line 16...
15 { 16 {
16 public WingManForm() 17 public WingManForm()
17 { 18 {
18 InitializeComponent(); 19 InitializeComponent();
Line -... Line 20...
-   20  
-   21 FormTaskScheduler = TaskScheduler.FromCurrentSynchronizationContext();
19   22  
Line 20... Line 23...
20 MQTTCommunication = new MQTTCommunication(); 23 MQTTCommunication = new MQTTCommunication(FormTaskScheduler);
Line 21... Line 24...
21   24  
22 MouseKeyBindings = new MouseKeyBindings(new List<MouseKeyBinding>()); 25 MouseKeyBindings = new MouseKeyBindings(new List<MouseKeyBinding>());
Line 47... Line 50...
47 MouseKeyBindingsSynchronizer.OnMouseKeyBindingsSynchronized += OnMouseKeyBindingsSynchronized; 50 MouseKeyBindingsSynchronizer.OnMouseKeyBindingsSynchronized += OnMouseKeyBindingsSynchronized;
48 } 51 }
Line 49... Line 52...
49   52  
50 private void OnMouseKeyBindingsSynchronized(object sender, MouseKeyBindingsSynchronizedEventArgs e) 53 private void OnMouseKeyBindingsSynchronized(object sender, MouseKeyBindingsSynchronizedEventArgs e)
51 { -  
52 this.Invoke((MethodInvoker) delegate -  
53 { 54 {
54 foreach (var binding in e.ExchangeBindings) 55 foreach (var binding in e.ExchangeBindings)
55 { 56 {
56 ActivityTextBox.AppendText( 57 ActivityTextBox.AppendText(
Line 81... Line 82...
81 WingBindingsListBox.Items.AddRange(exchangeBindings.Names.Select(name => (object)name).ToArray()); 82 WingBindingsListBox.Items.AddRange(exchangeBindings.Names.Select(name => (object) name).ToArray());
Line 82... Line 83...
82   83  
Line 83... Line 84...
83 } 84 }
84   -  
85 WingBindingSource.ResetBindings(false); -  
86   85  
Line -... Line 86...
-   86 WingBindingSource.ResetBindings(false);
-   87 }
87 }); 88  
Line 88... Line 89...
88 } 89 private static TaskScheduler FormTaskScheduler { get; set; }
Line 89... Line 90...
89   90  
Line 327... Line 328...
327 await LobbyMessageSynchronizer.Broadcast(LobbySayTextBox.Text).ConfigureAwait(false); 328 await LobbyMessageSynchronizer.Broadcast(LobbySayTextBox.Text).ConfigureAwait(false);
Line 328... Line 329...
328   329  
329 LobbySayTextBox.Text = string.Empty; 330 LobbySayTextBox.Text = string.Empty;
Line 330... Line 331...
330 } 331 }
331   332  
332 private void WingBindingsComboBoxIndexChanged(object sender, EventArgs e) 333 private void WingBindingsComboBoxSelectionChangeCompleted(object sender, EventArgs e)
333 { 334 {
334 var exchangeBinding = (MouseKeyBindingExchange) WingBindingsComboBox.SelectedItem; 335 var exchangeBinding = (MouseKeyBindingExchange)WingBindingsComboBox.SelectedItem;