From 076cabdea7e702883ba808f2c066091b477b5eb0 Mon Sep 17 00:00:00 2001
From: Zougi <zougi.fr@gmail.com>
Date: Fri, 4 Sep 2015 12:38:19 +0200
Subject: [PATCH] notifyiconsystray now more generic

---
 LyncLogger.v11.suo              | Bin 74752 -> 77312 bytes
 LyncLogger/LyncLogger.cs        |   5 ++--
 LyncLogger/NotifyIconSystray.cs |  45 +++++++++++++++++++++++++-------
 LyncLogger/Program.cs           |   1 +
 4 files changed, 39 insertions(+), 12 deletions(-)

diff --git a/LyncLogger.v11.suo b/LyncLogger.v11.suo
index 0b709dc372ab898229a54e3f3fe6b35d7153c877..1d358e2cff93f071e4f55a4cf6239c77e3f548f3 100755
GIT binary patch
delta 4300
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

delta 4086
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

diff --git a/LyncLogger/LyncLogger.cs b/LyncLogger/LyncLogger.cs
index d299a2c..48dc6c2 100755
--- a/LyncLogger/LyncLogger.cs
+++ b/LyncLogger/LyncLogger.cs
@@ -10,6 +10,7 @@
 using System.ComponentModel;
 using System.Reflection;
 using log4net;
+using IconSystray;
 
 namespace LyncLogger
 {
@@ -55,7 +56,7 @@ public void run()
                     if (e.NewState == ClientState.SignedOut)
                     {
                         _log.Info("User signed out. Watch for signed in event");
-                        NotifyIconSystray.ChangeLoggerStatus(false);
+                        NotifyIconSystray.ChangeStatus(false);
                         run();
                     }
                 };
@@ -72,7 +73,7 @@ public void run()
                     {
                         _log.Info("watch conversation");
                         conversations.ConversationAdded += conversations_ConversationAdded;
-                        NotifyIconSystray.ChangeLoggerStatus(true);
+                        NotifyIconSystray.ChangeStatus(true);
                     }
                     else
                     {
diff --git a/LyncLogger/NotifyIconSystray.cs b/LyncLogger/NotifyIconSystray.cs
index 8dc1cc3..cda90e7 100755
--- a/LyncLogger/NotifyIconSystray.cs
+++ b/LyncLogger/NotifyIconSystray.cs
@@ -9,7 +9,7 @@
 using System.Threading.Tasks;
 using System.Windows.Forms;
 
-namespace LyncLogger
+namespace IconSystray
 {
     /// <summary>
     /// Handles the systray icon
@@ -17,28 +17,46 @@ namespace LyncLogger
     static class NotifyIconSystray
     {
         private static NotifyIcon notifyIcon;
-        public delegate void LoggerStatus(bool status);
+        public delegate void Status(bool status);
         private static string _name;
+        public delegate void CallbackQuit();
+        public static event CallbackQuit OnQuit;
+
+        private static string _on_text = "on";
+        private static string _on_image = "icon.ico";
+        public static void setOnIcon(string text, string imageName)
+        {
+            _on_text = text;
+            _on_image = imageName;
+        }
+
+        private static string _off_text = "off";
+        private static string _off_image = "icon_off.ico";
+        public static void setOffIcon(string text, string imageName)
+        {
+            _off_text = text;
+            _off_image = imageName;
+        }
 
         /// <summary>
         /// This method allows to change the state of icon and tooltip
         /// true = Log Active: the logger detected the client and is active.
         /// </summary>
         /// <param name="status"></param>
-        public static void LoggerStatus_DelegateMethod(bool status)
+        public static void Status_DelegateMethod(bool status)
         {
-            string text = String.Format("{0}\nstatus: {1}", _name, status ? "on" : "off");
+            string text = String.Format("{0}\nstatus: {1}", _name, status ? _on_text : _off_text);
 
-            string iconName = status ? "icon.ico" : "icon_off.ico";
+            string iconName = status ? _on_image : _off_image;
 
             setNotifyIcon(iconName, text);
         }
 
         /// <summary>
-        /// This delegate allows us to call LoggerStatus_DelegateMethod in the backgroundworker
+        /// This delegate allows us to call Status_DelegateMethod in the backgroundworker
         /// It changes the indicator that displays the state of the app.
         /// </summary>
-        public static LoggerStatus ChangeLoggerStatus = LoggerStatus_DelegateMethod;
+        public static Status ChangeStatus = Status_DelegateMethod;
 
         /// <summary>
         /// set text and icon for the taskbar
@@ -65,18 +83,25 @@ public static void setNotifyIcon(string iconName, string text)
         /// </summary>
         /// <param name="name">name displayed on mouse hover</param>
         /// <param name="items">items to add to the context menu</param>
-        public static void addNotifyIcon(String name, MenuItem[] items)
+        public static void addNotifyIcon(String name, MenuItem[] items = null)
         {
             _name = name;
             notifyIcon = new System.Windows.Forms.NotifyIcon();
             notifyIcon.Visible = true;
 
-            LoggerStatus_DelegateMethod(false); //set name and icon
+            Status_DelegateMethod(false); //set name and icon
 
             ContextMenu contextMenu1 = new ContextMenu();
-            contextMenu1.MenuItems.AddRange(items);
+            if (items != null)
+            {
+                contextMenu1.MenuItems.AddRange(items);
+            }
             contextMenu1.MenuItems.Add(new MenuItem("Quit", (s, e) =>
             {
+                if (OnQuit != null)
+                {
+                    OnQuit();
+                }
                 disposeNotifyIcon();
             }));
             notifyIcon.ContextMenu = contextMenu1;
diff --git a/LyncLogger/Program.cs b/LyncLogger/Program.cs
index 43dabee..fabc3ce 100755
--- a/LyncLogger/Program.cs
+++ b/LyncLogger/Program.cs
@@ -11,6 +11,7 @@
 using System.ComponentModel;
 using log4net;
 using Microsoft.Win32;
+using IconSystray;
 
 namespace LyncLogger
 {