Rebrand HexTray and fix icon rendering for certain events

plugins/hextray/hextray.vcxproj

@@ -96,15 +96,13 @@
   </ItemDefinitionGroup>
   <ItemGroup>
     <None Include="bitmaps\sd.bmp" />
-    <None Include="icons\banned.ico" />
+    <None Include="icons\ban.ico" />
-    <None Include="icons\chan_msg.ico" />
+    <None Include="icons\disconnect.ico" />
-    <None Include="icons\disconnected.ico" />
-    <None Include="icons\highlight-1-3.ico" />
     <None Include="icons\highlight.ico" />
-    <None Include="icons\kicked.ico" />
+    <None Include="icons\kick.ico" />
-    <None Include="icons\priv_msg-1-2-2.ico" />
+    <None Include="icons\message.ico" />
     <None Include="icons\sd.ico" />
-    <None Include="icons\server_notice.ico" />
+    <None Include="icons\notice.ico" />
     <None Include="icons\hexchat.ico" />
     <None Include="xtray.def" />
   </ItemGroup>

plugins/hextray/hextray.vcxproj.filters

@@ -27,31 +27,25 @@
     <None Include="bitmaps\sd.bmp">
       <Filter>Resource Files\bitmaps</Filter>
     </None>
-    <None Include="icons\banned.ico">
+    <None Include="icons\ban.ico">
       <Filter>Resource Files\icons</Filter>
     </None>
-    <None Include="icons\chan_msg.ico">
+    <None Include="icons\disconnect.ico">
-      <Filter>Resource Files\icons</Filter>
-    </None>
-    <None Include="icons\disconnected.ico">
       <Filter>Resource Files\icons</Filter>
     </None>
     <None Include="icons\highlight.ico">
       <Filter>Resource Files\icons</Filter>
     </None>
-    <None Include="icons\highlight-1-3.ico">
+    <None Include="icons\kick.ico">
       <Filter>Resource Files\icons</Filter>
     </None>
-    <None Include="icons\kicked.ico">
+    <None Include="icons\message.ico">
-      <Filter>Resource Files\icons</Filter>
-    </None>
-    <None Include="icons\priv_msg-1-2-2.ico">
       <Filter>Resource Files\icons</Filter>
     </None>
     <None Include="icons\sd.ico">
       <Filter>Resource Files\icons</Filter>
     </None>
-    <None Include="icons\server_notice.ico">
+    <None Include="icons\notice.ico">
       <Filter>Resource Files\icons</Filter>
     </None>
     <None Include="icons\hexchat.ico">

plugins/hextray/resource.rc

@@ -279,13 +279,13 @@ END
 // Icon with lowest ID value placed first to ensure application icon
 // remains consistent on all systems.
 ICO_XCHAT               ICON                    "icons\\hexchat.ico"
-ICO_BANNED              ICON                    "icons\\banned.ico"
+ICO_BANNED              ICON                    "icons\\ban.ico"
-ICO_CHANMSG             ICON                    "icons\\chan_msg.ico"
+ICO_CHANMSG             ICON                    "icons\\message.ico"
 ICO_HIGHLIGHT           ICON                    "icons\\highlight.ico"
-ICO_KICKED              ICON                    "icons\\kicked.ico"
+ICO_KICKED              ICON                    "icons\\kick.ico"
-ICO_PMSG                ICON                    "icons\\priv_msg-1-2-2.ico"
+ICO_PMSG                ICON                    "icons\\message.ico"
-ICO_SNOTICE             ICON                    "icons\\server_notice.ico"
+ICO_SNOTICE             ICON                    "icons\\notice.ico"
-ICO_DISCONNECTED        ICON                    "icons\\disconnected.ico"
+ICO_DISCONNECTED        ICON                    "icons\\disconnect.ico"
 
 /////////////////////////////////////////////////////////////////////////////
 //

plugins/hextray/xtray.cpp

@@ -49,7 +49,7 @@ HWND	g_hXchatWnd;
 HWND	g_hHotkeyWnd;
 HWND	g_hPrefDlg;
 HMENU	g_hTrayMenu;
-HICON	g_hIcons[11];
+HICON	g_hIcons[24];
 HANDLE	g_hInstance;
 /*****************************************************/
 /***************** Preferences ***********************/
@@ -104,13 +104,13 @@ int xchat_plugin_init(xchat_plugin *plugin_handle, char **plugin_name, char **pl
 	g_hPrefDlg		= CreateDialog((HINSTANCE)g_hInstance, MAKEINTRESOURCE(IDD_PREF),  g_hXchatWnd, (DLGPROC)PrefProc);
 
 	g_hIcons[0]	= (HICON)LoadImage((HINSTANCE)g_hInstance, MAKEINTRESOURCE(ICO_XCHAT),			IMAGE_ICON, 16, 16, LR_DEFAULTCOLOR);
-	g_hIcons[1]	= (HICON)LoadImage((HINSTANCE)g_hInstance, MAKEINTRESOURCE(ICO_CHANMSG),		IMAGE_ICON, 16, 16, LR_DEFAULTCOLOR);
 	g_hIcons[2]	= (HICON)LoadImage((HINSTANCE)g_hInstance, MAKEINTRESOURCE(ICO_HIGHLIGHT),		IMAGE_ICON, 16, 16, LR_DEFAULTCOLOR);
 	g_hIcons[5]	= (HICON)LoadImage((HINSTANCE)g_hInstance, MAKEINTRESOURCE(ICO_BANNED),			IMAGE_ICON, 16, 16, LR_DEFAULTCOLOR);
 	g_hIcons[6]	= (HICON)LoadImage((HINSTANCE)g_hInstance, MAKEINTRESOURCE(ICO_KICKED),			IMAGE_ICON, 16, 16, LR_DEFAULTCOLOR);
 	g_hIcons[8]	= (HICON)LoadImage((HINSTANCE)g_hInstance, MAKEINTRESOURCE(ICO_PMSG),			IMAGE_ICON, 16, 16, LR_DEFAULTCOLOR);
 	g_hIcons[10]= (HICON)LoadImage((HINSTANCE)g_hInstance, MAKEINTRESOURCE(ICO_SNOTICE),		IMAGE_ICON, 16, 16, LR_DEFAULTCOLOR);
 	g_hIcons[11]= (HICON)LoadImage((HINSTANCE)g_hInstance, MAKEINTRESOURCE(ICO_DISCONNECTED),	IMAGE_ICON, 16, 16, LR_DEFAULTCOLOR);
+	g_hIcons[22]	= (HICON)LoadImage((HINSTANCE)g_hInstance, MAKEINTRESOURCE(ICO_CHANMSG),		IMAGE_ICON, 16, 16, LR_DEFAULTCOLOR);
 
 	/***************************************************************************************************************************/
 	/************************* Add our icon to the tray ************************************************************************/

plugins/hextray/xtray.h

@@ -24,7 +24,7 @@ extern HWND				g_hXchatWnd;
 extern HWND				g_hHotkeyWnd;
 extern HWND				g_hPrefDlg;
 extern HMENU			g_hTrayMenu;
-extern HICON			g_hIcons[11];
+extern HICON			g_hIcons[24];
 extern HANDLE			g_hInstance;
 extern unsigned int		g_dwPrefs;
 extern TCHAR			g_szAway[512];