Updated EULA, Launch Kit

Added icons

Author: codestackdev

Installer/register.cmd

@@ -0,0 +1 @@
+"%Windir%\Microsoft.NET\Framework64\v4.0.30319\regasm" /codebase "%~dp0CodeStack.Sw.MyToolbar.dll"

Installer/unregister.cmd

@@ -0,0 +1 @@
+"%Windir%\Microsoft.NET\Framework64\v4.0.30319\regasm" /codebase "%~dp0CodeStack.Sw.MyToolbar.dll" /u

MyToolbarSwAddin.cs

@@ -13,6 +13,7 @@
 using Xarial.Community.AppLaunchKit.Attributes;
 using Xarial.Community.AppLaunchKit;
 using System.Drawing;
+using Xarial.Community.AppLaunchKit.Exceptions;
 
 namespace CodeStack.Community.Sw.MyToolbar
 {
@@ -47,7 +48,7 @@ internal static Icon Icon
             {
                 get
                 {
-                    return null;
+                    return Resources.custom_toolbars_icon;
                 }
             }
         }
@@ -131,6 +132,8 @@ public bool ConnectToSW(object ThisSW, int cookie)
                 m_LaunchKit = new LaunchKitController(this.GetType(),
                     new IntPtr(m_App.IFrameObject().GetHWnd()));
 
+                m_LaunchKit.CheckForUpdatesService.CheckUpdateFailed += OnCheckUpdateFailed;
+
                 m_LaunchKit.StartServices();
 
                 m_AddinCookie = cookie;
@@ -145,18 +148,39 @@ public bool ConnectToSW(object ThisSW, int cookie)
 
                 return true;
             }
-            catch(Exception ex)
+            catch (UpdatesCheckException)
+            {
+                ShowCheckUpdatesFailedWarning();
+                return true;
+            }
+            catch (EulaNotAgreedException)
+            {
+                return false;
+            }
+            catch (Exception ex)
             {
-                m_App.SendMsgToUser2("Critical Error:"
+                m_App.SendMsgToUser2($"{Resources.AppTitle}. Critical Error:"
                     + System.Environment.NewLine
-                    + ex.Message, 
+                    + ex.Message,
                     (int)swMessageBoxIcon_e.swMbStop,
                     (int)swMessageBoxBtn_e.swMbOk);
 
                 return false;
             }
         }
 
+        private void ShowCheckUpdatesFailedWarning()
+        {
+            m_App.SendMsgToUser2($"{Resources.AppTitle}. Failed to check for updates",
+                                (int)swMessageBoxIcon_e.swMbWarning,
+                                (int)swMessageBoxBtn_e.swMbOk);
+        }
+
+        private void OnCheckUpdateFailed(Exception err)
+        {
+            ShowCheckUpdatesFailedWarning();
+        }
+
         public bool DisconnectFromSW()
         {
             try
@@ -315,7 +339,7 @@ private static CustomToolbarInfo TryReadInfoFromCache()
         private static string TryCreateDefaultIcon()
         {
             var imgPath = Path.Combine(Locations.AppDirectoryPath,
-                    nameof(Resources.codestack_toolbar) + ".png");
+                    nameof(Resources.custom_toolbars_toolbar) + ".png");
 
             try
             {
@@ -326,7 +350,7 @@ private static string TryCreateDefaultIcon()
                     Directory.CreateDirectory(dir);
                 }
 
-                Resources.codestack_toolbar.Save(imgPath);
+                Resources.custom_toolbars_toolbar.Save(imgPath);
             }
             catch
             {

Properties/Resources.Designer.cs

@@ -121,8 +121,11 @@
     <value>MyToolbar</value>
   </data>
   <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
-  <data name="codestack_toolbar" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\codestack-toolbar.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  <data name="custom_toolbars_icon" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\custom_toolbars_icon.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="custom_toolbars_toolbar" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\custom-toolbars-toolbar.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="eula" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\eula.rtf;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>