Update V1.0.10

Irval1337 · Apr 1, 2021 · 4c42bb7 · 4c42bb7
1 parent 29c3973
commit 4c42bb7
Show file tree

Hide file tree

Showing 23 changed files with 37 additions and 5 deletions.
diff --git a/Examples/NotificationExample/Form1.cs b/Examples/NotificationExample/Form1.cs
@@ -1,5 +1,7 @@
 using System;
+using System.Collections.Generic;
 using System.Drawing;
+using System.IO;
 using System.Windows.Forms;
 using NotificationManager;
 
@@ -18,6 +20,8 @@ public Form1()
             notify1.MaxTextWidth = 250;
             notify1.EnableOffset = false;
             notify1.HasHighlighting = false;
+            notify1.onFinish += Finish;
+            notify1.onClose += Close;
 
             notify2.PositionType = NotificationPosition.Right;
             notify2.InvertAdding = true;
@@ -67,5 +71,15 @@ private void button7_Click(object sender, EventArgs e)
         {
             notify1.InvertAdding = notify2.InvertAdding = notify3.InvertAdding = notify4.InvertAdding = !notify4.InvertAdding;
         }
+
+        private void Close(object sender, EventArgs e)
+        {
+            File.AppendAllLines("log.txt", new List<string>() { "Closed" });
+        }
+
+        private void Finish(object sender, EventArgs e)
+        {
+            File.AppendAllLines("log.txt", new List<string>() { "Finished" });
+        }
     }
 }
diff --git a/Examples/NotificationExample/NotificationExample.csproj b/Examples/NotificationExample/NotificationExample.csproj
@@ -33,8 +33,8 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="NotificationManager, Version=1.0.9.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\NotificationManager.1.0.9\lib\net472\NotificationManager.dll</HintPath>
+    <Reference Include="NotificationManager, Version=1.0.10.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\NotificationManager.1.0.10\lib\net472\NotificationManager.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />

diff --git a/Examples/NotificationExample/packages.config b/Examples/NotificationExample/packages.config
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="NotificationManager" version="1.0.9" targetFramework="net472" />
+  <package id="NotificationManager" version="1.0.10" targetFramework="net472" />
 </packages>
diff --git a/.../NotificationManager.1.0.9/.signature.p7s → ...NotificationManager.1.0.10/.signature.p7s b/.../NotificationManager.1.0.9/.signature.p7s → ...NotificationManager.1.0.10/.signature.p7s
diff --git a/Examples/packages/NotificationManager.1.0.10/NotificationManager.1.0.10.nupkg b/Examples/packages/NotificationManager.1.0.10/NotificationManager.1.0.10.nupkg
diff --git a/Examples/packages/NotificationManager.1.0.10/lib/net40/NotificationManager.dll b/Examples/packages/NotificationManager.1.0.10/lib/net40/NotificationManager.dll
diff --git a/Examples/packages/NotificationManager.1.0.10/lib/net45/NotificationManager.dll b/Examples/packages/NotificationManager.1.0.10/lib/net45/NotificationManager.dll
diff --git a/Examples/packages/NotificationManager.1.0.10/lib/net46/NotificationManager.dll b/Examples/packages/NotificationManager.1.0.10/lib/net46/NotificationManager.dll
diff --git a/Examples/packages/NotificationManager.1.0.10/lib/net461/NotificationManager.dll b/Examples/packages/NotificationManager.1.0.10/lib/net461/NotificationManager.dll
diff --git a/Examples/packages/NotificationManager.1.0.10/lib/net471/NotificationManager.dll b/Examples/packages/NotificationManager.1.0.10/lib/net471/NotificationManager.dll
diff --git a/Examples/packages/NotificationManager.1.0.10/lib/net472/NotificationManager.dll b/Examples/packages/NotificationManager.1.0.10/lib/net472/NotificationManager.dll
diff --git a/Examples/packages/NotificationManager.1.0.10/lib/net48/NotificationManager.dll b/Examples/packages/NotificationManager.1.0.10/lib/net48/NotificationManager.dll
diff --git a/Examples/packages/NotificationManager.1.0.9/NotificationManager.1.0.9.nupkg b/Examples/packages/NotificationManager.1.0.9/NotificationManager.1.0.9.nupkg
diff --git a/Examples/packages/NotificationManager.1.0.9/lib/net40/NotificationManager.dll b/Examples/packages/NotificationManager.1.0.9/lib/net40/NotificationManager.dll
diff --git a/Examples/packages/NotificationManager.1.0.9/lib/net45/NotificationManager.dll b/Examples/packages/NotificationManager.1.0.9/lib/net45/NotificationManager.dll
diff --git a/Examples/packages/NotificationManager.1.0.9/lib/net46/NotificationManager.dll b/Examples/packages/NotificationManager.1.0.9/lib/net46/NotificationManager.dll
diff --git a/Examples/packages/NotificationManager.1.0.9/lib/net461/NotificationManager.dll b/Examples/packages/NotificationManager.1.0.9/lib/net461/NotificationManager.dll
diff --git a/Examples/packages/NotificationManager.1.0.9/lib/net471/NotificationManager.dll b/Examples/packages/NotificationManager.1.0.9/lib/net471/NotificationManager.dll
diff --git a/Examples/packages/NotificationManager.1.0.9/lib/net472/NotificationManager.dll b/Examples/packages/NotificationManager.1.0.9/lib/net472/NotificationManager.dll
diff --git a/Examples/packages/NotificationManager.1.0.9/lib/net48/NotificationManager.dll b/Examples/packages/NotificationManager.1.0.9/lib/net48/NotificationManager.dll
diff --git a/NotificationLib/NotificationLib/Manager.cs b/NotificationLib/NotificationLib/Manager.cs
@@ -46,6 +46,16 @@ public class Manager
 		/// </summary>
         public NotificationPosition PositionType = NotificationPosition.Right;
 
+        /// <summary>
+		/// Событие искусственного закрытия уведомления.
+		/// </summary>
+        public System.EventHandler onClose = delegate { };
+
+        /// <summary>
+		/// Событие закрытия уведомления по завершении таймера.
+		/// </summary>
+        public System.EventHandler onFinish = delegate { };
+
         /// <summary>
 		/// Смещение уведомлений после закрытия предыдущего.
 		/// </summary>

diff --git a/NotificationLib/NotificationLib/NotificationForm.cs b/NotificationLib/NotificationLib/NotificationForm.cs
@@ -15,6 +15,8 @@ public NotificationForm()
 
         public Manager manager;
 
+        private bool wasClosed = false, state = true;
+
         private enum Action
         {
             wait,
@@ -87,6 +89,11 @@ private void timer1_Tick(object sender, EventArgs e)
                                 ((NotificationForm)frm).ChangePosition();
                         }
 
+                        if (wasClosed)
+                            manager.onClose(sender, e);
+                        else
+                            manager.onFinish(sender, e);
+
                         this.Close();
                     }
                     break;
@@ -225,6 +232,7 @@ private void Notification_FormClosing(object sender, FormClosingEventArgs e)
 
         private void button1_Click(object sender, EventArgs e)
         {
+            wasClosed = true;
             timer1.Interval = manager.TimerInterval;
             action = Action.close;
         }

diff --git a/NotificationLib/NotificationLib/Properties/AssemblyInfo.cs b/NotificationLib/NotificationLib/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@
 // Можно задать все значения или принять номера сборки и редакции по умолчанию 
 // используя "*", как показано ниже:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.9")]
-[assembly: AssemblyFileVersion("1.0.9")]
+[assembly: AssemblyVersion("1.0.10")]
+[assembly: AssemblyFileVersion("1.0.10")]