Rebrand HexTray and fix icon rendering for certain events

This commit is contained in:
Berke Viktor 2012-07-18 22:23:09 +02:00
parent a251934b36
commit 7fff475fda
22 changed files with 19 additions and 27 deletions

View File

@ -96,15 +96,13 @@
</ItemDefinitionGroup> </ItemDefinitionGroup>
<ItemGroup> <ItemGroup>
<None Include="bitmaps\sd.bmp" /> <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\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\sd.ico" />
<None Include="icons\server_notice.ico" /> <None Include="icons\notice.ico" />
<None Include="icons\hexchat.ico" /> <None Include="icons\hexchat.ico" />
<None Include="xtray.def" /> <None Include="xtray.def" />
</ItemGroup> </ItemGroup>

View File

@ -27,31 +27,25 @@
<None Include="bitmaps\sd.bmp"> <None Include="bitmaps\sd.bmp">
<Filter>Resource Files\bitmaps</Filter> <Filter>Resource Files\bitmaps</Filter>
</None> </None>
<None Include="icons\banned.ico"> <None Include="icons\ban.ico">
<Filter>Resource Files\icons</Filter> <Filter>Resource Files\icons</Filter>
</None> </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> <Filter>Resource Files\icons</Filter>
</None> </None>
<None Include="icons\highlight.ico"> <None Include="icons\highlight.ico">
<Filter>Resource Files\icons</Filter> <Filter>Resource Files\icons</Filter>
</None> </None>
<None Include="icons\highlight-1-3.ico"> <None Include="icons\kick.ico">
<Filter>Resource Files\icons</Filter> <Filter>Resource Files\icons</Filter>
</None> </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> <Filter>Resource Files\icons</Filter>
</None> </None>
<None Include="icons\sd.ico"> <None Include="icons\sd.ico">
<Filter>Resource Files\icons</Filter> <Filter>Resource Files\icons</Filter>
</None> </None>
<None Include="icons\server_notice.ico"> <None Include="icons\notice.ico">
<Filter>Resource Files\icons</Filter> <Filter>Resource Files\icons</Filter>
</None> </None>
<None Include="icons\hexchat.ico"> <None Include="icons\hexchat.ico">

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.4 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.4 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.4 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.4 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.4 KiB

After

Width:  |  Height:  |  Size: 1.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.4 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.4 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.4 KiB

View File

@ -279,13 +279,13 @@ END
// Icon with lowest ID value placed first to ensure application icon // Icon with lowest ID value placed first to ensure application icon
// remains consistent on all systems. // remains consistent on all systems.
ICO_XCHAT ICON "icons\\hexchat.ico" 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_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"
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
// //

View File

@ -49,7 +49,7 @@ HWND g_hXchatWnd;
HWND g_hHotkeyWnd; HWND g_hHotkeyWnd;
HWND g_hPrefDlg; HWND g_hPrefDlg;
HMENU g_hTrayMenu; HMENU g_hTrayMenu;
HICON g_hIcons[11]; HICON g_hIcons[24];
HANDLE g_hInstance; HANDLE g_hInstance;
/*****************************************************/ /*****************************************************/
/***************** Preferences ***********************/ /***************** 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_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[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[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[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[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[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[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[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 ************************************************************************/ /************************* Add our icon to the tray ************************************************************************/

View File

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

BIN
src/pixmaps/ban.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.2 KiB

BIN
src/pixmaps/disconnect.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.4 KiB

BIN
src/pixmaps/kick.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.0 KiB

BIN
src/pixmaps/notice.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.7 KiB