Skip to content

Commit

Permalink
Group chats API:
Browse files Browse the repository at this point in the history 
- for #2574: fixes icons problem after unloading tabSRMM;
- status icons extracted to the separate array;
- another group chat icons are hidden completely to restrict access to them
  • Loading branch information
@georgehazan
georgehazan committed Mar 13, 2021
1 parent b10f9d1 commit 6a53de3
Show file tree
Hide file tree
Showing 41 changed files with 82 additions and 127 deletions.
9 changes: 1 addition & 8 deletions include/m_chat_int.h
View file
Expand Up @@ -66,13 +66,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#define ICON_REMSTATUS 12
#define ICON_TOPIC 13

#define ICON_STATUS0 14
#define ICON_STATUS1 15
#define ICON_STATUS2 16
#define ICON_STATUS3 17
#define ICON_STATUS4 18
#define ICON_STATUS5 19

#define CHATMODE_NORMAL 0
#define CHATMODE_MUTE 1
#define CHATMODE_UNMUTE 2
Expand Down Expand Up @@ -341,7 +334,7 @@ struct CHAT_MANAGER
int logPixelSY, logPixelSX;
char *szActiveWndModule;
wchar_t *szActiveWndID;
HICON hIcons[30];
HICON hStatusIcons[STATUSICONCOUNT];
HBRUSH hListBkgBrush, hListSelectedBkgBrush;
HANDLE hevWinPopup, hevPreCreate;
FONTINFO aFonts[OPTIONS_FONTCOUNT];
Expand Down
12 changes: 0 additions & 12 deletions plugins/Scriver/res/resource.rc
View file
Expand Up @@ -502,18 +502,6 @@ IDI_FILTER ICON "chat/filter.ico"

IDI_NICKLIST ICON "chat/nicklist.ico"

IDI_STATUS3 ICON "chat/4.ico"

IDI_STATUS2 ICON "chat/3.ico"

IDI_STATUS4 ICON "chat/5.ico"

IDI_STATUS1 ICON "chat/2.ico"

IDI_STATUS0 ICON "chat/1.ico"

IDI_STATUS5 ICON "chat/6.ico"

IDI_OVERLAY ICON "chat/overlay.ico"

IDI_NICKLIST2 ICON "chat/nicklist2.ico"
Expand Down
6 changes: 0 additions & 6 deletions plugins/Scriver/src/globals.cpp
View file
Expand Up @@ -72,12 +72,6 @@ static IconItem iconList2[] =
{ LPGEN("Hide nick list"), "nicklist", IDI_NICKLIST }, // 12
{ LPGEN("Show nick list"), "nicklist2", IDI_NICKLIST2 }, // 13
{ LPGEN("Icon overlay"), "overlay", IDI_OVERLAY }, // 14
{ LPGEN("Status 1 (10x10)"), "status0", IDI_STATUS0, 10}, // 15
{ LPGEN("Status 2 (10x10)"), "status1", IDI_STATUS1, 10}, // 16
{ LPGEN("Status 3 (10x10)"), "status2", IDI_STATUS2, 10}, // 17
{ LPGEN("Status 4 (10x10)"), "status3", IDI_STATUS3, 10}, // 18
{ LPGEN("Status 5 (10x10)"), "status4", IDI_STATUS4, 10}, // 19
{ LPGEN("Status 6 (10x10)"), "status5", IDI_STATUS5, 10}, // 20
};

static IconItem iconList3[] =
Expand Down
6 changes: 0 additions & 6 deletions plugins/Scriver/src/resource.h
View file
Expand Up @@ -59,12 +59,6 @@
#define IDI_ADDSTATUS 441
#define IDI_REMSTATUS 442
#define IDI_ACTION 443
#define IDI_STATUS3 453
#define IDI_STATUS2 454
#define IDI_STATUS4 455
#define IDI_STATUS1 456
#define IDI_STATUS0 457
#define IDI_STATUS5 458
#define IDI_OVERLAY 460
#define IDI_NICKLIST2 461
#define IDI_FILTER2 462
Expand Down
7 changes: 0 additions & 7 deletions plugins/TabSRMM/TabSRMM_icons/NOVA/res/ICONS_NOVA.rc
View file
Expand Up @@ -74,8 +74,6 @@ IDI_CONFIGSIDEBAR ICON "sbaroptions.ico"
IDI_RECENTLIST ICON "recentlist.ico"
IDI_USERPREFS ICON "userprefs.ico"

IDI_TAG1 ICON "chat\\tag1.ico"
IDI_TAG2 ICON "chat\\tag2.ico"
IDI_TOPICBUT ICON "chat\\topicbut.ico"
IDI_JOIN ICON "chat\\join.ico"
IDI_TOPIC ICON "chat\\topic.ico"
Expand All @@ -95,12 +93,7 @@ IDI_BKGCOLOR ICON "chat\\bkgcolor.ico"
IDI_CHANMGR ICON "chat\\window.ico"
IDI_FILTER ICON "chat\\filter.ico"
IDI_BLANK ICON "chat\\blank.ico"
IDI_STATUS3 ICON "chat\\4.ico"
IDI_STATUS2 ICON "chat\\3.ico"
IDI_STATUS4 ICON "chat\\5.ico"
IDI_STATUS1 ICON "chat\\2.ico"
IDI_STATUS0 ICON "chat\\blank.ico"
IDI_STATUS5 ICON "chat\\6.ico"
IDI_OVERLAY ICON "chat\\overlay.ico"
IDI_FILTER2 ICON "chat\\filter2.ico"
IDI_SHOWNICKLIST ICON "chat\\nicklist_show.ico"
Expand Down
Binary file removed plugins/TabSRMM/TabSRMM_icons/NOVA/res/chat/2.ico
View file
Binary file not shown.
Binary file removed plugins/TabSRMM/TabSRMM_icons/NOVA/res/chat/3.ico
View file
Binary file not shown.
Binary file removed plugins/TabSRMM/TabSRMM_icons/NOVA/res/chat/4.ico
View file
Binary file not shown.
Binary file removed plugins/TabSRMM/TabSRMM_icons/NOVA/res/chat/5.ico
View file
Binary file not shown.
Binary file removed plugins/TabSRMM/TabSRMM_icons/NOVA/res/chat/6.ico
View file
Binary file not shown.
Binary file removed plugins/TabSRMM/TabSRMM_icons/NOVA/res/chat/tag1.ico
View file
Binary file not shown.
Binary file removed plugins/TabSRMM/TabSRMM_icons/NOVA/res/chat/tag2.ico
View file
Binary file not shown.
8 changes: 0 additions & 8 deletions plugins/TabSRMM/TabSRMM_icons/resource.h
View file
Expand Up @@ -76,12 +76,6 @@
#define IDI_FILTER 203
#define IDI_FILTER2 204
#define IDI_OVERLAY 205
#define IDI_STATUS3 206
#define IDI_STATUS2 207
#define IDI_STATUS4 208
#define IDI_STATUS1 209
#define IDI_STATUS0 210
#define IDI_STATUS5 211
#define IDI_BLANK 212
#define IDI_SHOWNICKLIST 213
#define IDI_HIDENICKLIST 214
Expand All @@ -102,8 +96,6 @@
#define IDI_REMSTATUS 261
#define IDI_ACTION 262
#define IDI_HIGHLIGHT 263
#define IDI_TAG1 264
#define IDI_TAG2 265



Expand Down
2 changes: 0 additions & 2 deletions plugins/TabSRMM/res/resource.rc
View file
Expand Up @@ -9,7 +9,6 @@
//
#include <winres.h>
#include "..\..\..\include\statusmodes.h"
#include "..\..\..\include\chat_resource.h"

/////////////////////////////////////////////////////////////////////////////
#undef APSTUDIO_READONLY_SYMBOLS
Expand Down Expand Up @@ -874,7 +873,6 @@ END
BEGIN
"#include <winres.h>\r\n"
"#include ""..\\..\\..\\include\\statusmodes.h""\r\n"
"#include ""..\\..\\..\\include\\chat_resource.h""\r\n"
"\0"
END

Expand Down
7 changes: 0 additions & 7 deletions plugins/TabSRMM/src/chat_options.cpp
View file
Expand Up @@ -183,13 +183,6 @@ static IconItem _icons[] =
{
{ LPGEN("Window Icon"), "chat_window", IDI_CHANMGR },
{ LPGEN("Icon overlay"), "chat_overlay", IDI_OVERLAY },

{ LPGEN("Status 1 (10x10)"), "chat_status0", IDI_STATUS0 },
{ LPGEN("Status 2 (10x10)"), "chat_status1", IDI_STATUS1 },
{ LPGEN("Status 3 (10x10)"), "chat_status2", IDI_STATUS2 },
{ LPGEN("Status 4 (10x10)"), "chat_status3", IDI_STATUS3 },
{ LPGEN("Status 5 (10x10)"), "chat_status4", IDI_STATUS4 },
{ LPGEN("Status 6 (10x10)"), "chat_status5", IDI_STATUS5 }
};

static IconItem _logicons[] =
Expand Down
11 changes: 6 additions & 5 deletions plugins/TabSRMM/src/chat_tools.cpp
View file
Expand Up @@ -194,7 +194,7 @@ BOOL DoPopup(SESSION_INFO *si, GCEVENT *gce)
}

if (iNewEvent == GC_EVENT_MESSAGE) {
ShowPopup(si->hContact, si, g_chatApi.hIcons[ICON_MESSAGE], si->pszModule, si->ptszName, clr ? clr : g_chatApi.aFonts[9].color,
ShowPopup(si->hContact, si, g_chatApi.getIcon(GC_EVENT_MESSAGE), si->pszModule, si->ptszName, clr ? clr : g_chatApi.aFonts[9].color,
TranslateT("%s%s says:%s %s"), bbStart, gce->pszNick.w, bbEnd, g_chatApi.RemoveFormatting(gce->pszText.w));
}
else oldDoPopup(si, gce);
Expand Down Expand Up @@ -292,15 +292,16 @@ BOOL DoSoundsFlashPopupTrayStuff(SESSION_INFO *si, GCEVENT *gce, BOOL bHighlight

// dialog event processing
if (dat) {
HICON hIconHighlight = g_chatApi.getIcon(GC_EVENT_HIGHLIGHT), hIconMessage = g_chatApi.getIcon(GC_EVENT_MESSAGE);
HICON hNotifyIcon = (bManyFix && !bInactive) ? 0 : g_chatApi.getIcon(iEvent);
BOOL bForcedIcon = (hNotifyIcon == g_chatApi.hIcons[ICON_HIGHLIGHT] || hNotifyIcon == g_chatApi.hIcons[ICON_MESSAGE]);
BOOL bForcedIcon = (hNotifyIcon == hIconHighlight || hNotifyIcon == hIconMessage);

if ((iEvent & si->iLogTrayFlags) || bForcedIcon) {
if (!bActiveTab) {
if (hNotifyIcon == g_chatApi.hIcons[ICON_HIGHLIGHT])
if (hNotifyIcon == hIconHighlight)
dat->m_iFlashIcon = hNotifyIcon;
else {
if (dat->m_iFlashIcon != g_chatApi.hIcons[ICON_HIGHLIGHT] && dat->m_iFlashIcon != g_chatApi.hIcons[ICON_MESSAGE])
if (dat->m_iFlashIcon != hIconHighlight && dat->m_iFlashIcon != hIconMessage)
dat->m_iFlashIcon = hNotifyIcon;
}
dat->m_bCanFlashTab = TRUE;
Expand Down Expand Up @@ -344,7 +345,7 @@ BOOL DoSoundsFlashPopupTrayStuff(SESSION_INFO *si, GCEVENT *gce, BOOL bHighlight
}

HICON hIcon = (HICON)SendMessage(dat->m_pContainer->m_hwnd, WM_GETICON, ICON_BIG, 0);
if (hNotifyIcon == g_chatApi.hIcons[ICON_HIGHLIGHT] || (hIcon != g_chatApi.hIcons[ICON_MESSAGE] && hIcon != g_chatApi.hIcons[ICON_HIGHLIGHT])) {
if (hNotifyIcon == hIconHighlight || (hIcon != hIconMessage && hIcon != hIconHighlight)) {
dat->m_pContainer->SetIcon(dat, hNotifyIcon);
dat->m_pContainer->m_flags.m_bNeedsUpdateTitle = true;
}
Expand Down
2 changes: 1 addition & 1 deletion plugins/TabSRMM/src/hotkeyhandler.cpp
View file
Expand Up @@ -198,7 +198,7 @@ LONG_PTR CALLBACK HotkeyHandlerDlgProc(HWND hwndDlg, UINT msg, WPARAM wParam, LP
HICON hIcon;

if (dis->itemData > 0)
hIcon = (dis->itemData & 0x10000000) ? g_chatApi.hIcons[ICON_HIGHLIGHT] : PluginConfig.g_IconMsgEvent;
hIcon = (dis->itemData & 0x10000000) ? g_chatApi.getIcon(GC_EVENT_HIGHLIGHT) : PluginConfig.g_IconMsgEvent;
else if (dat != nullptr) {
hIcon = dat->GetMyContactIcon(nullptr);
idle = dat->m_idle;
Expand Down
2 changes: 1 addition & 1 deletion plugins/TabSRMM/src/msgdialog.cpp
View file
Expand Up @@ -2923,7 +2923,7 @@ INT_PTR CMsgDialog::DlgProc(UINT uMsg, WPARAM wParam, LPARAM lParam)

int nickIndex = 0;
for (int i = 0; i < STATUSICONCOUNT; i++) {
if (hIcon == g_chatApi.hIcons[ICON_STATUS0 + i]) {
if (hIcon == g_chatApi.hStatusIcons[i]) {
nickIndex = i;
break;
}
Expand Down
Binary file removed src/core/stdmsg/res/1.ico
View file
Binary file not shown.
Binary file removed src/core/stdmsg/res/2.ico
View file
Binary file not shown.
Binary file removed src/core/stdmsg/res/3.ico
View file
Binary file not shown.
Binary file removed src/core/stdmsg/res/4.ico
View file
Binary file not shown.
Binary file removed src/core/stdmsg/res/5.ico
View file
Binary file not shown.
Binary file removed src/core/stdmsg/res/6.ico
View file
Binary file not shown.
12 changes: 0 additions & 12 deletions src/core/stdmsg/res/resource.rc
View file
Expand Up @@ -461,18 +461,6 @@ IDI_NICKLIST ICON "nicklist.ico"

IDI_BLANK ICON "blank.ico"

IDI_STATUS3 ICON "4.ico"

IDI_STATUS2 ICON "3.ico"

IDI_STATUS4 ICON "5.ico"

IDI_STATUS1 ICON "2.ico"

IDI_STATUS0 ICON "1.ico"

IDI_STATUS5 ICON "6.ico"

IDI_CLOSE ICON "close.ico"

IDI_OVERLAY ICON "overlay.ico"
Expand Down
7 changes: 0 additions & 7 deletions src/core/stdmsg/src/chat_options.cpp
View file
Expand Up @@ -102,13 +102,6 @@ static IconItem iconList1[] =
{ LPGEN("Show nick list"), "nicklist2", IDI_NICKLIST2 },
{ LPGEN("Icon overlay"), "overlay", IDI_OVERLAY },
{ LPGEN("Close"), "close", IDI_CLOSE },

{ LPGEN("Status 1 (10x10)"), "status0", IDI_STATUS0, 10 },
{ LPGEN("Status 2 (10x10)"), "status1", IDI_STATUS1, 10 },
{ LPGEN("Status 3 (10x10)"), "status2", IDI_STATUS2, 10 },
{ LPGEN("Status 4 (10x10)"), "status3", IDI_STATUS3, 10 },
{ LPGEN("Status 5 (10x10)"), "status4", IDI_STATUS4, 10 },
{ LPGEN("Status 6 (10x10)"), "status5", IDI_STATUS5, 10 }
};

static IconItem iconList2[] =
Expand Down
6 changes: 0 additions & 6 deletions src/core/stdmsg/src/resource.h
View file
Expand Up @@ -38,12 +38,6 @@
#define IDI_TAG1 149
#define IDI_TAG2 150
#define IDR_MENU 151
#define IDI_STATUS3 153
#define IDI_STATUS2 154
#define IDI_STATUS4 155
#define IDI_STATUS1 156
#define IDI_STATUS0 157
#define IDI_STATUS5 158
#define IDI_CLOSE 159
#define IDI_OVERLAY 160
#define IDI_NICKLIST2 161
Expand Down
0 plugins/Scriver/res/chat/1.ico → src/mir_app/res/chat/1.ico
View file
File renamed without changes.
0 plugins/Scriver/res/chat/2.ico → src/mir_app/res/chat/2.ico
View file
File renamed without changes.
0 plugins/Scriver/res/chat/3.ico → src/mir_app/res/chat/3.ico
View file
File renamed without changes.
0 plugins/Scriver/res/chat/4.ico → src/mir_app/res/chat/4.ico
View file
File renamed without changes.
0 plugins/Scriver/res/chat/5.ico → src/mir_app/res/chat/5.ico
View file
File renamed without changes.
0 plugins/Scriver/res/chat/6.ico → src/mir_app/res/chat/6.ico
View file
File renamed without changes.
11 changes: 11 additions & 0 deletions src/mir_app/res/resource.rc
View file
Expand Up @@ -1407,6 +1407,17 @@ IDI_SOUND ICON "sound.ico"

IDI_DATABASE ICON "database.ico"

IDI_STATUS0 ICON "chat/1.ico"

IDI_STATUS1 ICON "chat/2.ico"

IDI_STATUS2 ICON "chat/3.ico"

IDI_STATUS3 ICON "chat/4.ico"

IDI_STATUS4 ICON "chat/5.ico"

IDI_STATUS5 ICON "chat/6.ico"

/////////////////////////////////////////////////////////////////////////////
//
Expand Down
1 change: 1 addition & 0 deletions src/mir_app/src/chat.h
View file
Expand Up @@ -35,6 +35,7 @@ extern int g_cbSession, g_cbModuleInfo, g_iFontMode;
extern wchar_t *g_szFontGroup;
extern mir_cs csChat;

extern HICON g_hChatIcons[20];
extern DWORD g_dwDiskLogFlags;
extern HCURSOR g_hCurHyperlinkHand;
extern char* pLogIconBmpBits[14];
Expand Down
2 changes: 1 addition & 1 deletion src/mir_app/src/chat_log.cpp
View file
Expand Up @@ -435,7 +435,7 @@ void LoadMsgLogBitmaps(void)
pLogIconBmpBits[i] = (char*)mir_alloc(size);
size_t rtfHeaderSize = mir_snprintf((char *)pLogIconBmpBits[i], size, "{\\pict\\dibitmap0\\wbmbitspixel%u\\wbmplanes1\\wbmwidthbytes%u\\picw%u\\pich%u ", bih.biBitCount, widthBytes, bih.biWidth, bih.biHeight);

HICON hIcon = g_chatApi.hIcons[i];
HICON hIcon = g_hChatIcons[i];
HBITMAP hoBmp = (HBITMAP)SelectObject(hdcMem, hBmp);
FillRect(hdcMem, &rc, hBkgBrush);
DrawIconEx(hdcMem, 0, 0, hIcon, bih.biWidth, bih.biHeight, 0, nullptr, DI_NORMAL);
Expand Down
5 changes: 3 additions & 2 deletions src/mir_app/src/chat_manager.cpp
View file
Expand Up @@ -288,9 +288,9 @@ static HICON SM_GetStatusIcon(SESSION_INFO *si, USERINFO *ui)

STATUSINFO *ti = g_chatApi.TM_FindStatus(si->pStatuses, g_chatApi.TM_WordToString(si->pStatuses, ui->Status));
if (ti != nullptr)
return g_chatApi.hIcons[ICON_STATUS0 + ti->iIconIndex];
return g_chatApi.hStatusIcons[ti->iIconIndex];

return g_chatApi.hIcons[ICON_STATUS0];
return g_chatApi.hStatusIcons[0];
}

BOOL SM_AddEvent(const wchar_t *pszID, const char *pszModule, GCEVENT *gce, bool bIsHighlighted)
Expand Down Expand Up @@ -997,6 +997,7 @@ MIR_APP_DLL(CHAT_MANAGER*) Chat_CustomizeApi(const CHAT_MANAGER_INITDATA *pInit)

ResetApi();

LoadChatIcons();
RegisterFonts();
OptionsInit();
return &g_chatApi;
Expand Down
1 change: 1 addition & 0 deletions src/mir_app/src/chat_opts.cpp
View file
Expand Up @@ -26,6 +26,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.

extern SESSION_INFO g_TabSession;

HICON g_hChatIcons[20];
DWORD g_dwDiskLogFlags;
HPLUGIN g_pChatPlugin;
GlobalLogSettingsBase *g_Settings;
Expand Down
55 changes: 35 additions & 20 deletions src/mir_app/src/chat_svc.cpp
View file
Expand Up @@ -49,26 +49,27 @@ static HANDLE

void LoadChatIcons(void)
{
g_chatApi.hIcons[ICON_ACTION] = LoadIconEx("log_action", FALSE);
g_chatApi.hIcons[ICON_ADDSTATUS] = LoadIconEx("log_addstatus", FALSE);
g_chatApi.hIcons[ICON_HIGHLIGHT] = LoadIconEx("log_highlight", FALSE);
g_chatApi.hIcons[ICON_INFO] = LoadIconEx("log_info", FALSE);
g_chatApi.hIcons[ICON_JOIN] = LoadIconEx("log_join", FALSE);
g_chatApi.hIcons[ICON_KICK] = LoadIconEx("log_kick", FALSE);
g_chatApi.hIcons[ICON_MESSAGE] = LoadIconEx("log_message_in", FALSE);
g_chatApi.hIcons[ICON_MESSAGEOUT] = LoadIconEx("log_message_out", FALSE);
g_chatApi.hIcons[ICON_NICK] = LoadIconEx("log_nick", FALSE);
g_chatApi.hIcons[ICON_NOTICE] = LoadIconEx("log_notice", FALSE);
g_chatApi.hIcons[ICON_PART] = LoadIconEx("log_part", FALSE);
g_chatApi.hIcons[ICON_QUIT] = LoadIconEx("log_quit", FALSE);
g_chatApi.hIcons[ICON_REMSTATUS] = LoadIconEx("log_removestatus", FALSE);
g_chatApi.hIcons[ICON_TOPIC] = LoadIconEx("log_topic", FALSE);
g_chatApi.hIcons[ICON_STATUS0] = LoadIconEx("status0", FALSE);
g_chatApi.hIcons[ICON_STATUS1] = LoadIconEx("status1", FALSE);
g_chatApi.hIcons[ICON_STATUS2] = LoadIconEx("status2", FALSE);
g_chatApi.hIcons[ICON_STATUS3] = LoadIconEx("status3", FALSE);
g_chatApi.hIcons[ICON_STATUS4] = LoadIconEx("status4", FALSE);
g_chatApi.hIcons[ICON_STATUS5] = LoadIconEx("status5", FALSE);
g_hChatIcons[ICON_ACTION] = LoadIconEx("log_action", FALSE);
g_hChatIcons[ICON_ADDSTATUS] = LoadIconEx("log_addstatus", FALSE);
g_hChatIcons[ICON_HIGHLIGHT] = LoadIconEx("log_highlight", FALSE);
g_hChatIcons[ICON_INFO] = LoadIconEx("log_info", FALSE);
g_hChatIcons[ICON_JOIN] = LoadIconEx("log_join", FALSE);
g_hChatIcons[ICON_KICK] = LoadIconEx("log_kick", FALSE);
g_hChatIcons[ICON_MESSAGE] = LoadIconEx("log_message_in", FALSE);
g_hChatIcons[ICON_MESSAGEOUT] = LoadIconEx("log_message_out", FALSE);
g_hChatIcons[ICON_NICK] = LoadIconEx("log_nick", FALSE);
g_hChatIcons[ICON_NOTICE] = LoadIconEx("log_notice", FALSE);
g_hChatIcons[ICON_PART] = LoadIconEx("log_part", FALSE);
g_hChatIcons[ICON_QUIT] = LoadIconEx("log_quit", FALSE);
g_hChatIcons[ICON_REMSTATUS] = LoadIconEx("log_removestatus", FALSE);
g_hChatIcons[ICON_TOPIC] = LoadIconEx("log_topic", FALSE);

g_chatApi.hStatusIcons[0] = g_plugin.getIcon(IDI_STATUS0);
g_chatApi.hStatusIcons[1] = g_plugin.getIcon(IDI_STATUS1);
g_chatApi.hStatusIcons[2] = g_plugin.getIcon(IDI_STATUS2);
g_chatApi.hStatusIcons[3] = g_plugin.getIcon(IDI_STATUS3);
g_chatApi.hStatusIcons[4] = g_plugin.getIcon(IDI_STATUS4);
g_chatApi.hStatusIcons[5] = g_plugin.getIcon(IDI_STATUS5);

FreeMsgLogBitmaps();
LoadMsgLogBitmaps();
Expand Down Expand Up @@ -862,6 +863,18 @@ static int ModulesLoaded(WPARAM, LPARAM)
return 0;
}

/////////////////////////////////////////////////////////////////////////////////////////

static IconItem iconList[] =
{
{ LPGEN("Status 1 (10x10)"), "status0", IDI_STATUS0, 10 },
{ LPGEN("Status 2 (10x10)"), "status1", IDI_STATUS1, 10 },
{ LPGEN("Status 3 (10x10)"), "status2", IDI_STATUS2, 10 },
{ LPGEN("Status 4 (10x10)"), "status3", IDI_STATUS3, 10 },
{ LPGEN("Status 5 (10x10)"), "status4", IDI_STATUS4, 10 },
{ LPGEN("Status 6 (10x10)"), "status5", IDI_STATUS5, 10 }
};

static bool bInited = false;

int LoadChatModule(void)
Expand All @@ -879,6 +892,8 @@ int LoadChatModule(void)
g_chatApi.hevPreCreate = CreateHookableEvent(ME_MSG_PRECREATEEVENT);
g_chatApi.hevWinPopup = CreateHookableEvent(ME_MSG_WINDOWPOPUP);

g_plugin.registerIcon(LPGEN("Messaging") "/" LPGEN("Group chats"), iconList, "chat");

g_plugin.addSound("ChatHighlight", LPGENW("Group chats"), LPGENW("Message is highlighted"));
g_plugin.addSound("ChatAction", LPGENW("Group chats"), LPGENW("User has performed an action"));
g_plugin.addSound("ChatJoin", LPGENW("Group chats"), LPGENW("User has joined"));
Expand Down

0 comments on commit 6a53de3

Please sign in to comment.