Winify – Diff between revs 43 and 44

Subversion Repositories:

?pathlinks?

Rev 43 – Rev 48 – Go to most recent revision – Details – Blame – Last modification – View Log

 namespace Winify
+{
     public partial class MainForm : Form
+    {
+        private void LogViewToolStripMenuItem_Click(object sender, EventArgs e)
+        {
+            if (_logViewForm != null) return;
+            _logViewForm = new LogViewForm(this, _memorySink, _cancellationToken);
+            _logViewForm.Closing += LogViewForm_Closing;
+            _logViewForm.Show();
+        }
+        private void LogViewForm_Closing(object sender, CancelEventArgs e)
+        {
+            if (_logViewForm == null) return;
+            _logViewForm.Closing -= LogViewForm_Closing;
+            _logViewForm.Close();
+            _logViewForm = null;
+        }
         #region Public Enums, Properties and Fields
             var servers = await LoadServers();
             _gotifyConnections = new ConcurrentBag<GotifyConnection>();
             foreach (var server in servers.Server)
             {
-                var gotifyConnection = new GotifyConnection(server);
+                var gotifyConnection = new GotifyConnection(server, Configuration);
                 gotifyConnection.GotifyNotification += GotifyConnection_GotifyNotification;
                 gotifyConnection.Start();
                 _gotifyConnections.Add(gotifyConnection);
+            }
                 gotifyConnection = null;
+            }
             foreach (var server in e.Servers.Server)
             {
-                var gotifyConnection = new GotifyConnection(server);
+                var gotifyConnection = new GotifyConnection(server, Configuration);
                 gotifyConnection.GotifyNotification += GotifyConnection_GotifyNotification;
                 gotifyConnection.Start();
                 _gotifyConnections.Add(gotifyConnection);
+            }
         private async void GotifyConnection_GotifyNotification(object sender, GotifyNotificationEventArgs e)
+        {
             var announcements = await LoadAnnouncements();
-            foreach (var announcement in announcements.Announcement)
             foreach (var announcement in announcements.Announcement)
                 if (announcement.AppId == e.Notification.AppId)
+                {
                     var configuredNotification = new ToastForm(
                         $"{e.Notification.Title} ({e.Notification.Server.Name}/{e.Notification.AppId})",
                         e.Notification.Message, announcement.LingerTime, e.Image);
-                    configuredNotification.Show();
+                    Application.Run(configuredNotification);
                     return;
                     return;
+                }
             var notification = new ToastForm(
                 $"{e.Notification.Title} ({e.Notification.Server.Name}/{e.Notification.AppId})",
                 e.Notification.Message, 5000, e.Image);
-            notification.Show();
-        }
-        private void SettingsForm_Closing(object sender, CancelEventArgs e)
+            Application.Run(notification);
+        }
             if (_settingsForm == null)
         private void SettingsForm_Closing(object sender, CancelEventArgs e)
                 return;
             if (_settingsForm == null) return;
             _settingsForm.Save -= SettingsForm_Save;
-            _settingsForm.Closing -= SettingsForm_Closing;
-            _settingsForm.Dispose();
-            _settingsForm = null;
             _settingsForm.Closing -= SettingsForm_Closing;
             _settingsForm.Dispose();
-        private void AboutToolStripMenuItem_Click(object sender, EventArgs e)
+            _settingsForm = null;
+        }
             if (_aboutForm != null)
         private void AboutToolStripMenuItem_Click(object sender, EventArgs e)
-                return;
+        {
-            }
-            _aboutForm = new AboutForm();
-            _aboutForm.Closing += AboutForm_Closing;
+            if (_aboutForm != null) return;
             _aboutForm.Show();
             _aboutForm = new AboutForm();
             _aboutForm.Closing += AboutForm_Closing;
                     return new Servers.Servers();
+            }
+        }
-        #endregion
-        private void LogViewToolStripMenuItem_Click(object sender, EventArgs e)
-        {
-            if (_logViewForm != null)
-            {
-                return;
-            }
-            _logViewForm = new LogViewForm(this, _memorySink, _cancellationToken);
-            _logViewForm.Closing += LogViewForm_Closing;
-            _logViewForm.Show();
-        }
-        private void LogViewForm_Closing(object sender, CancelEventArgs e)
-        {
-            if (_logViewForm == null)
-            {
-                return;
-            }
-            _logViewForm.Closing -= LogViewForm_Closing;
-            _logViewForm.Close();
-            _logViewForm = null;
         #endregion
+    }
+}