Winify – Diff between revs 6 and 7
?pathlinks?
Rev 6 | Rev 7 | |||
---|---|---|---|---|
Line 1... | Line 1... | |||
1 | using System; |
1 | using System; |
|
- | 2 | using System.Collections.Specialized; |
||
2 | using System.ComponentModel; |
3 | using System.ComponentModel; |
|
3 | using System.Configuration; |
4 | using System.Configuration; |
|
4 | using System.Diagnostics; |
5 | using System.Diagnostics; |
|
5 | using System.IO; |
6 | using System.IO; |
|
6 | using System.Threading.Tasks; |
7 | using System.Threading.Tasks; |
|
Line 15... | Line 16... | |||
15 | { |
16 | { |
|
16 | public partial class Form1 : Form |
17 | public partial class Form1 : Form |
|
17 | { |
18 | { |
|
18 | #region Private Delegates, Events, Enums, Properties, Indexers and Fields |
19 | #region Private Delegates, Events, Enums, Properties, Indexers and Fields |
|
Line 19... | Line 20... | |||
19 | |
20 | |
|
Line 20... | Line 21... | |||
20 | private readonly GotifyConnectionManager _gotifyConnectionManager; |
21 | private readonly Servers.Servers _servers; |
|
Line 21... | Line 22... | |||
21 | |
22 | |
|
Line 22... | Line 23... | |||
22 | private AboutForm _aboutForm; |
23 | private AboutForm _aboutForm; |
|
Line 23... | Line 24... | |||
23 | |
24 | |
|
Line 44... | Line 45... | |||
44 | // Bind to settings changed event. |
45 | // Bind to settings changed event. |
|
45 | Settings.Default.SettingsLoaded += Default_SettingsLoaded; |
46 | Settings.Default.SettingsLoaded += Default_SettingsLoaded; |
|
46 | Settings.Default.SettingsSaving += Default_SettingsSaving; |
47 | Settings.Default.SettingsSaving += Default_SettingsSaving; |
|
47 | Settings.Default.PropertyChanged += Default_PropertyChanged; |
48 | Settings.Default.PropertyChanged += Default_PropertyChanged; |
|
Line -... | Line 49... | |||
- | 49 | |
||
- | 50 | _servers = new Servers.Servers(); |
||
- | 51 | _servers.Server.CollectionChanged += Server_CollectionChanged; |
||
48 | |
52 | |
|
Line 49... | Line 53... | |||
49 | _gotifyConnectionManager = new GotifyConnectionManager(); |
53 | _gotifyConnectionManager = new GotifyConnectionManager(_servers); |
|
50 | |
54 | |
|
51 | Task.Run(async () => |
55 | Task.Run(async () => |
|
Line 52... | Line 56... | |||
52 | { |
56 | { |
|
- | 57 | var restoredServers = await LoadServers(); |
||
- | 58 | |
||
- | 59 | foreach (var server in restoredServers.Server) |
||
53 | _servers = await LoadServers(); |
60 | { |
|
54 | |
61 | _servers.Server.Add(server); |
|
Line 55... | Line 62... | |||
55 | _gotifyConnectionManager.UpdateServers(_servers); |
62 | } |
|
56 | }); |
63 | }); |
|
Line 62... | Line 69... | |||
62 | /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param> |
69 | /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param> |
|
63 | protected override void Dispose(bool disposing) |
70 | protected override void Dispose(bool disposing) |
|
64 | { |
71 | { |
|
65 | if (disposing && components != null) |
72 | if (disposing && components != null) |
|
66 | { |
73 | { |
|
- | 74 | _servers.Server.CollectionChanged -= Server_CollectionChanged; |
||
- | 75 | |
||
- | 76 | Settings.Default.SettingsLoaded -= Default_SettingsLoaded; |
||
- | 77 | Settings.Default.SettingsSaving -= Default_SettingsSaving; |
||
- | 78 | Settings.Default.PropertyChanged -= Default_PropertyChanged; |
||
- | 79 | |
||
- | 80 | _gotifyConnectionManager?.Dispose(); |
||
- | 81 | _gotifyConnectionManager = null; |
||
- | 82 | |
||
67 | components.Dispose(); |
83 | components.Dispose(); |
|
68 | } |
84 | } |
|
Line 69... | Line 85... | |||
69 | |
85 | |
|
70 | base.Dispose(disposing); |
86 | base.Dispose(disposing); |
|
Line 71... | Line 87... | |||
71 | } |
87 | } |
|
Line 72... | Line 88... | |||
72 | |
88 | |
|
Line -... | Line 89... | |||
- | 89 | #endregion |
||
- | 90 | |
||
- | 91 | #region Event Handlers |
||
- | 92 | |
||
- | 93 | private async void Server_CollectionChanged(object sender, NotifyCollectionChangedEventArgs e) |
||
- | 94 | { |
||
- | 95 | switch (await ServersSerialization.Serialize(_servers, Constants.ServersFile)) |
||
- | 96 | { |
||
- | 97 | case SerializationFailure serializationFailure: |
||
- | 98 | Debug.WriteLine(serializationFailure.Exception.Message); |
||
73 | #endregion |
99 | break; |
|
74 | |
100 | } |
|
75 | #region Event Handlers |
101 | } |
|
76 | |
102 | |
|
Line 94... | Line 120... | |||
94 | return; |
120 | return; |
|
95 | } |
121 | } |
|
Line 96... | Line 122... | |||
96 | |
122 | |
|
97 | _settingsForm = new SettingsForm(_servers); |
123 | _settingsForm = new SettingsForm(_servers); |
|
98 | _settingsForm.Closing += SettingsForm_Closing; |
- | ||
99 | _settingsForm.ServersUpdated += SettingsForm_ServersUpdated; |
124 | _settingsForm.Closing += SettingsForm_Closing; |
|
100 | _settingsForm.Show(); |
125 | _settingsForm.Show(); |
|
Line 101... | Line -... | |||
101 | } |
- | ||
102 | |
- | ||
103 | private async void SettingsForm_ServersUpdated(object sender, ServersUpdatedEventArgs e) |
- | ||
104 | { |
- | ||
105 | _servers = e.Servers; |
- | ||
106 | |
- | ||
107 | switch (await ServersSerialization.Serialize(e.Servers, Constants.ServersFile)) |
- | ||
108 | { |
- | ||
109 | case SerializationSuccess _: |
- | ||
110 | _gotifyConnectionManager.UpdateServers(e.Servers); |
- | ||
111 | break; |
- | ||
112 | case SerializationFailure serializationFailure: |
- | ||
113 | Debug.WriteLine(serializationFailure.Exception.Message); |
- | ||
114 | break; |
- | ||
115 | } |
- | ||
116 | } |
126 | } |
|
117 | |
127 | |
|
118 | private void SettingsForm_Closing(object sender, CancelEventArgs e) |
128 | private void SettingsForm_Closing(object sender, CancelEventArgs e) |
|
119 | { |
129 | { |
|
120 | if (_settingsForm == null) |
130 | if (_settingsForm == null) |
|
121 | { |
131 | { |
|
Line 122... | Line 132... | |||
122 | return; |
132 | return; |
|
123 | } |
- | ||
124 | |
133 | } |
|
125 | _settingsForm.Closing -= SettingsForm_Closing; |
134 | |
|
126 | _settingsForm.ServersUpdated -= SettingsForm_ServersUpdated; |
135 | _settingsForm.Closing -= SettingsForm_Closing; |
|
Line 127... | Line 136... | |||
127 | _settingsForm.Dispose(); |
136 | _settingsForm.Dispose(); |