Winify – Diff between revs 55 and 56

Subversion Repositories:

?pathlinks?

Rev 55 – Rev 71 – Go to most recent revision – Details – Blame – Last modification – View Log

 using Toasts;
 using Winify.Gotify;
 using Winify.Settings;
 using Winify.Utilities;
 using Winify.Utilities.Serialization;
+using ScheduledContinuation = Toasts.ScheduledContinuation;
+using Toasts = Toasts.Toasts;
 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
         private LogViewForm _logViewForm;
+        private readonly LogMemorySink _memorySink;
-        private readonly LogMemorySink _memorySink;
+        private readonly global::Toasts.Toasts _toasts;
         #endregion
         #region Constructors, Destructors and Finalizers
+        public MainForm()
+        {
-        public MainForm()
+            _cancellationTokenSource = new CancellationTokenSource();
             _cancellationToken = _cancellationTokenSource.Token;
             _cancellationTokenSource = new CancellationTokenSource();
-            _cancellationToken = _cancellationTokenSource.Token;
+            ChangedConfigurationContinuation = new ScheduledContinuation();
                 gotifyConnection.Start();
                 _gotifyConnections.Add(gotifyConnection);
+            }
+        }
+        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;
+        }
         private async void SettingsToolStripMenuItem_Click(object sender, EventArgs e)
+        {
             if (_settingsForm == null)
+            {
                 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);
-                    Application.Run(configuredNotification);
+                    await _toasts.Queue(configuredNotification);
                     return;
+                }
             if (Configuration.InfiniteToastDuration)
+            {
                 var infiniteToastForm = new ToastForm(
                     $"{e.Notification.Title} ({e.Notification.Server.Name}/{e.Notification.AppId})",
                     e.Notification.Message, e.Image);
-                Application.Run(infiniteToastForm);
+                await _toasts.Queue(infiniteToastForm);
                 return;
             }
             var toastForm = new ToastForm(
                 $"{e.Notification.Title} ({e.Notification.Server.Name}/{e.Notification.AppId})",
                 e.Notification.Message, Configuration.ToastDuration, e.Image);