/trunk/Winify/Form1.cs |
@@ -47,7 +47,6 @@ |
|
// Upgrade settings if required. |
if (!ConfigurationManager.OpenExeConfiguration(ConfigurationUserLevel.PerUserRoamingAndLocal).HasFile) |
{ |
if (Properties.Settings.Default.UpdateRequired) |
{ |
Properties.Settings.Default.Upgrade(); |
@@ -60,7 +59,6 @@ |
Process.Start(Application.ExecutablePath); |
Environment.Exit(0); |
} |
} |
|
// Bind to settings changed event. |
Properties.Settings.Default.SettingsLoaded += Default_SettingsLoaded; |
@@ -126,10 +124,7 @@ |
|
private async void SettingsToolStripMenuItem_Click(object sender, EventArgs e) |
{ |
if (_settingsForm != null) |
{ |
return; |
} |
if (_settingsForm != null) return; |
|
var servers = await LoadServers(); |
var announcements = await LoadAnnouncements(); |
@@ -170,7 +165,6 @@ |
var announcements = await LoadAnnouncements(); |
|
foreach (var announcement in announcements.Announcement) |
{ |
if (announcement.AppId == e.Notification.AppId) |
{ |
var configuredNotification = new Notification( |
@@ -183,7 +177,6 @@ |
|
return; |
} |
} |
|
var notification = new Notification( |
$"{e.Notification.Title} ({e.Notification.Server.Name}/{e.Notification.AppId})", |
@@ -196,10 +189,7 @@ |
|
private void SettingsForm_Closing(object sender, CancelEventArgs e) |
{ |
if (_settingsForm == null) |
{ |
return; |
} |
if (_settingsForm == null) return; |
|
_settingsForm.Save -= SettingsForm_Save; |
_settingsForm.Closing -= SettingsForm_Closing; |
@@ -209,10 +199,7 @@ |
|
private void AboutToolStripMenuItem_Click(object sender, EventArgs e) |
{ |
if (_aboutForm != null) |
{ |
return; |
} |
if (_aboutForm != null) return; |
|
_aboutForm = new AboutForm(); |
_aboutForm.Closing += AboutForm_Closing; |
@@ -221,10 +208,7 @@ |
|
private void AboutForm_Closing(object sender, CancelEventArgs e) |
{ |
if (_aboutForm == null) |
{ |
return; |
} |
if (_aboutForm == null) return; |
|
_aboutForm.Closing -= AboutForm_Closing; |
_aboutForm.Dispose(); |
@@ -286,9 +270,7 @@ |
private static async Task<Announcements.Announcements> LoadAnnouncements() |
{ |
if (!Directory.Exists(Constants.UserApplicationDirectory)) |
{ |
Directory.CreateDirectory(Constants.UserApplicationDirectory); |
} |
|
var deserializationResult = |
await ServersSerialization.Deserialize<Announcements.Announcements>(Constants.AnnouncementsFile, |
@@ -309,9 +291,7 @@ |
private static async Task<global::Servers.Servers> LoadServers() |
{ |
if (!Directory.Exists(Constants.UserApplicationDirectory)) |
{ |
Directory.CreateDirectory(Constants.UserApplicationDirectory); |
} |
|
var deserializationResult = |
await ServersSerialization.Deserialize<global::Servers.Servers>(Constants.ServersFile, |