From 41ba18e9cb1c340cb80c637817231b487c54562e Mon Sep 17 00:00:00 2001 From: George Hazan Date: Thu, 16 Jan 2014 18:15:36 +0000 Subject: Scriver nicklist icons git-svn-id: http://svn.miranda-ng.org/main/trunk@7683 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- plugins/Scriver/src/chat/chat.h | 2 +- plugins/Scriver/src/chat/main.cpp | 26 +++++++ plugins/Scriver/src/chat/window.cpp | 38 +++++----- plugins/Scriver/src/globals.cpp | 139 +++++++++++++++++++----------------- plugins/Scriver/src/msgs.cpp | 6 +- plugins/Scriver/src/statusicon.cpp | 2 + 6 files changed, 122 insertions(+), 91 deletions(-) (limited to 'plugins') diff --git a/plugins/Scriver/src/chat/chat.h b/plugins/Scriver/src/chat/chat.h index a14407e314..ffe9f804bb 100644 --- a/plugins/Scriver/src/chat/chat.h +++ b/plugins/Scriver/src/chat/chat.h @@ -82,7 +82,7 @@ typedef struct{ COLORCHOOSER; //main.c -void LoadIcons(void); +void LoadChatIcons(void); void UpgradeCheck(void); //colorchooser.c diff --git a/plugins/Scriver/src/chat/main.cpp b/plugins/Scriver/src/chat/main.cpp index 5a2cb0854c..d37559ea20 100644 --- a/plugins/Scriver/src/chat/main.cpp +++ b/plugins/Scriver/src/chat/main.cpp @@ -118,6 +118,30 @@ static void OnCreateModule(MODULEINFO *mi) mi->hOfflineIconBig = LoadSkinnedProtoIconBig(mi->pszModule, ID_STATUS_OFFLINE); } +void LoadChatIcons(void) +{ + pci->hIcons[ICON_ACTION] = GetCachedIcon("chat_log_action"); + pci->hIcons[ICON_ADDSTATUS] = GetCachedIcon("chat_log_addstatus"); + pci->hIcons[ICON_HIGHLIGHT] = GetCachedIcon("chat_log_highlight"); + pci->hIcons[ICON_INFO] = GetCachedIcon("chat_log_info"); + pci->hIcons[ICON_JOIN] = GetCachedIcon("chat_log_join"); + pci->hIcons[ICON_KICK] = GetCachedIcon("chat_log_kick"); + pci->hIcons[ICON_MESSAGE] = GetCachedIcon("chat_log_message_in"); + pci->hIcons[ICON_MESSAGEOUT] = GetCachedIcon("chat_log_message_out"); + pci->hIcons[ICON_NICK] = GetCachedIcon("chat_log_nick"); + pci->hIcons[ICON_NOTICE] = GetCachedIcon("chat_log_notice"); + pci->hIcons[ICON_PART] = GetCachedIcon("chat_log_part"); + pci->hIcons[ICON_QUIT] = GetCachedIcon("chat_log_quit"); + pci->hIcons[ICON_REMSTATUS] = GetCachedIcon("chat_log_removestatus"); + pci->hIcons[ICON_TOPIC] = GetCachedIcon("chat_log_topic"); + pci->hIcons[ICON_STATUS1] = GetCachedIcon("chat_status1"); + pci->hIcons[ICON_STATUS2] = GetCachedIcon("chat_status2"); + pci->hIcons[ICON_STATUS3] = GetCachedIcon("chat_status3"); + pci->hIcons[ICON_STATUS4] = GetCachedIcon("chat_status4"); + pci->hIcons[ICON_STATUS0] = GetCachedIcon("chat_status0"); + pci->hIcons[ICON_STATUS5] = GetCachedIcon("chat_status5"); +} + int Chat_Load() { mir_getCI(&g_Settings); @@ -140,6 +164,8 @@ int Chat_Load() pci->OnFlashWindow = OnFlashWindow; pci->ShowRoom = ShowRoom; + LoadChatIcons(); + g_hMenu = LoadMenu(g_hInst, MAKEINTRESOURCE(IDR_MENU)); TranslateMenu(g_hMenu); return 0; diff --git a/plugins/Scriver/src/chat/window.cpp b/plugins/Scriver/src/chat/window.cpp index 4d0159739d..091bab7cbd 100644 --- a/plugins/Scriver/src/chat/window.cpp +++ b/plugins/Scriver/src/chat/window.cpp @@ -555,17 +555,17 @@ static INT_PTR CALLBACK FilterWndProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LP switch (uMsg) { case WM_INITDIALOG: si = (SESSION_INFO *)lParam; - CheckDlgButton(hwndDlg, IDC_CHAT_1, si->iLogFilterFlags&GC_EVENT_ACTION); - CheckDlgButton(hwndDlg, IDC_CHAT_2, si->iLogFilterFlags&GC_EVENT_MESSAGE); - CheckDlgButton(hwndDlg, IDC_CHAT_3, si->iLogFilterFlags&GC_EVENT_NICK); - CheckDlgButton(hwndDlg, IDC_CHAT_4, si->iLogFilterFlags&GC_EVENT_JOIN); - CheckDlgButton(hwndDlg, IDC_CHAT_5, si->iLogFilterFlags&GC_EVENT_PART); - CheckDlgButton(hwndDlg, IDC_CHAT_6, si->iLogFilterFlags&GC_EVENT_TOPIC); - CheckDlgButton(hwndDlg, IDC_CHAT_7, si->iLogFilterFlags&GC_EVENT_ADDSTATUS); - CheckDlgButton(hwndDlg, IDC_CHAT_8, si->iLogFilterFlags&GC_EVENT_INFORMATION); - CheckDlgButton(hwndDlg, IDC_CHAT_9, si->iLogFilterFlags&GC_EVENT_QUIT); - CheckDlgButton(hwndDlg, IDC_CHAT_10, si->iLogFilterFlags&GC_EVENT_KICK); - CheckDlgButton(hwndDlg, IDC_CHAT_11, si->iLogFilterFlags&GC_EVENT_NOTICE); + CheckDlgButton(hwndDlg, IDC_CHAT_1, si->iLogFilterFlags & GC_EVENT_ACTION); + CheckDlgButton(hwndDlg, IDC_CHAT_2, si->iLogFilterFlags & GC_EVENT_MESSAGE); + CheckDlgButton(hwndDlg, IDC_CHAT_3, si->iLogFilterFlags & GC_EVENT_NICK); + CheckDlgButton(hwndDlg, IDC_CHAT_4, si->iLogFilterFlags & GC_EVENT_JOIN); + CheckDlgButton(hwndDlg, IDC_CHAT_5, si->iLogFilterFlags & GC_EVENT_PART); + CheckDlgButton(hwndDlg, IDC_CHAT_6, si->iLogFilterFlags & GC_EVENT_TOPIC); + CheckDlgButton(hwndDlg, IDC_CHAT_7, si->iLogFilterFlags & GC_EVENT_ADDSTATUS); + CheckDlgButton(hwndDlg, IDC_CHAT_8, si->iLogFilterFlags & GC_EVENT_INFORMATION); + CheckDlgButton(hwndDlg, IDC_CHAT_9, si->iLogFilterFlags & GC_EVENT_QUIT); + CheckDlgButton(hwndDlg, IDC_CHAT_10, si->iLogFilterFlags & GC_EVENT_KICK); + CheckDlgButton(hwndDlg, IDC_CHAT_11, si->iLogFilterFlags & GC_EVENT_NOTICE); break; case WM_CTLCOLOREDIT: @@ -601,7 +601,7 @@ static INT_PTR CALLBACK FilterWndProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LP if (IsDlgButtonChecked(hwndDlg, IDC_CHAT_11) == BST_CHECKED) iFlags |= GC_EVENT_NOTICE; - if (iFlags&GC_EVENT_ADDSTATUS) + if (iFlags & GC_EVENT_ADDSTATUS) iFlags |= GC_EVENT_REMOVESTATUS; SendMessage(si->hWnd, GC_CHANGEFILTERFLAG, 0, (LPARAM)iFlags); @@ -623,16 +623,12 @@ static LRESULT CALLBACK ButtonSubclassProc(HWND hwnd, UINT msg, WPARAM wParam, L { switch (msg) { case WM_RBUTTONUP: - HWND hFilter = GetDlgItem(GetParent(hwnd), IDC_CHAT_FILTER); - HWND hColor = GetDlgItem(GetParent(hwnd), IDC_CHAT_COLOR); - HWND hBGColor = GetDlgItem(GetParent(hwnd), IDC_CHAT_BKGCOLOR); - if (db_get_b(NULL, "Chat", "RightClickFilter", 0) != 0) { - if (hFilter == hwnd) + if (GetDlgItem(GetParent(hwnd), IDC_CHAT_FILTER) == hwnd) SendMessage(GetParent(hwnd), GC_SHOWFILTERMENU, 0, 0); - if (hColor == hwnd) + if (GetDlgItem(GetParent(hwnd), IDC_CHAT_COLOR) == hwnd) SendMessage(GetParent(hwnd), GC_SHOWCOLORCHOOSER, 0, (LPARAM)IDC_CHAT_COLOR); - if (hBGColor == hwnd) + if (GetDlgItem(GetParent(hwnd), IDC_CHAT_BKGCOLOR) == hwnd) SendMessage(GetParent(hwnd), GC_SHOWCOLORCHOOSER, 0, (LPARAM)IDC_CHAT_BKGCOLOR); } break; @@ -1463,11 +1459,11 @@ INT_PTR CALLBACK RoomWndProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lPar case GC_UPDATENICKLIST: SendDlgItemMessage(hwndDlg, IDC_CHAT_LIST, WM_SETREDRAW, FALSE, 0); SendMessage(GetDlgItem(hwndDlg, IDC_CHAT_LIST), LB_RESETCONTENT, 0, 0); - for (int index = 0; indexnUsersInNicklist; index++) { + for (int index = 0; index < si->nUsersInNicklist; index++) { USERINFO *ui = pci->SM_GetUserFromIndex(si->ptszID, si->pszModule, index); if (ui) { char szIndicator = SM_GetStatusIndicator(si, ui); - if (szIndicator>'\0') { + if (szIndicator > '\0') { static TCHAR ptszBuf[128]; mir_sntprintf(ptszBuf, SIZEOF(ptszBuf), _T("%c%s"), szIndicator, ui->pszNick); SendMessage(GetDlgItem(hwndDlg, IDC_CHAT_LIST), LB_ADDSTRING, 0, (LPARAM)ptszBuf); diff --git a/plugins/Scriver/src/globals.cpp b/plugins/Scriver/src/globals.cpp index 7486bd6744..943895004d 100644 --- a/plugins/Scriver/src/globals.cpp +++ b/plugins/Scriver/src/globals.cpp @@ -54,13 +54,13 @@ static IconItem iconList[] = { LPGEN("Quote button"), "scriver_QUOTE", IDI_QUOTE }, // 11 { LPGEN("Close button"), "scriver_CLOSEX", IDI_CLOSEX }, // 12 { LPGEN("Icon overlay"), "scriver_OVERLAY", IDI_OVERLAY }, // 13 - { LPGEN("Incoming message (10x10)"),"scriver_INCOMING", IDI_INCOMING, 10}, // 14 - { LPGEN("Outgoing message (10x10)"),"scriver_OUTGOING", IDI_OUTGOING, 10}, // 15 - { LPGEN("Notice (10x10)"), "scriver_NOTICE", IDI_NOTICE, 10}, // 16 + { LPGEN("Incoming message (10x10)"),"scriver_INCOMING", IDI_INCOMING, 10}, // 14 + { LPGEN("Outgoing message (10x10)"),"scriver_OUTGOING", IDI_OUTGOING, 10}, // 15 + { LPGEN("Notice (10x10)"), "scriver_NOTICE", IDI_NOTICE, 10}, // 16 { LPGEN("Window Icon"), "chat_window", IDI_CHANMGR }, // 1 - { LPGEN("Text color"), "chat_fgcol", IDI_COLOR }, // 2 - { LPGEN("Background color"), "chat_bkgcol", IDI_BKGCOLOR }, // 3 + { LPGEN("Text color"), "chat_fgcol", IDI_COLOR }, // 2 + { LPGEN("Background color") , "chat_bkgcol", IDI_BKGCOLOR }, // 3 { LPGEN("Bold"), "chat_bold", IDI_BBOLD }, // 4 { LPGEN("Italics"), "chat_italics", IDI_BITALICS }, // 5 { LPGEN("Underlined"), "chat_underline", IDI_BUNDERLINE }, // 6 @@ -72,65 +72,69 @@ static IconItem iconList[] = { LPGEN("Hide userlist"), "chat_nicklist", IDI_NICKLIST }, // 12 { LPGEN("Show userlist"), "chat_nicklist2", IDI_NICKLIST2 }, // 13 { LPGEN("Icon overlay"), "chat_overlay", IDI_OVERLAY }, // 14 - { LPGEN("Status 1 (10x10)"), "chat_status0", IDI_STATUS0, 10}, // 15 - { LPGEN("Status 2 (10x10)"), "chat_status1", IDI_STATUS1, 10}, // 16 - { LPGEN("Status 3 (10x10)"), "chat_status2", IDI_STATUS2, 10}, // 17 - { LPGEN("Status 4 (10x10)"), "chat_status3", IDI_STATUS3, 10}, // 18 - { LPGEN("Status 5 (10x10)"), "chat_status4", IDI_STATUS4, 10}, // 19 - { LPGEN("Status 6 (10x10)"), "chat_status5", IDI_STATUS5, 10}, // 20 + { LPGEN("Status 1 (10x10)"), "chat_status0", IDI_STATUS0, 10}, // 15 + { LPGEN("Status 2 (10x10)"), "chat_status1", IDI_STATUS1, 10}, // 16 + { LPGEN("Status 3 (10x10)"), "chat_status2", IDI_STATUS2, 10}, // 17 + { LPGEN("Status 4 (10x10)"), "chat_status3", IDI_STATUS3, 10}, // 18 + { LPGEN("Status 5 (10x10)"), "chat_status4", IDI_STATUS4, 10}, // 19 + { LPGEN("Status 6 (10x10)"), "chat_status5", IDI_STATUS5, 10}, // 20 { LPGEN("Message in (10x10)"), "chat_log_message_in", IDI_INCOMING, 10}, // 1 { LPGEN("Message out (10x10)"), "chat_log_message_out", IDI_OUTGOING, 10}, // 2 - { LPGEN("Action (10x10)"), "chat_log_action", IDI_ACTION, 10}, // 3 + { LPGEN("Action (10x10)"), "chat_log_action", IDI_ACTION, 10}, // 3 { LPGEN("Add Status (10x10)"), "chat_log_addstatus", IDI_ADDSTATUS,10}, // 4 { LPGEN("Remove status (10x10)"), "chat_log_removestatus", IDI_REMSTATUS,10}, // 5 - { LPGEN("Join (10x10)"), "chat_log_join", IDI_JOIN, 10}, // 6 - { LPGEN("Leave (10x10)"), "chat_log_part", IDI_PART, 10}, // 7 - { LPGEN("Quit (10x10)"), "chat_log_quit", IDI_QUIT, 10}, // 8 - { LPGEN("Kick (10x10)"), "chat_log_kick", IDI_KICK, 10}, // 9 - { LPGEN("Nickchange (10x10)"), "chat_log_nick", IDI_NICK, 10}, // 10 + { LPGEN("Join (10x10)"), "chat_log_join", IDI_JOIN, 10}, // 6 + { LPGEN("Leave (10x10)"), "chat_log_part", IDI_PART, 10}, // 7 + { LPGEN("Quit (10x10)"), "chat_log_quit", IDI_QUIT, 10}, // 8 + { LPGEN("Kick (10x10)"), "chat_log_kick", IDI_KICK, 10}, // 9 + { LPGEN("Nickchange (10x10)"), "chat_log_nick", IDI_NICK, 10}, // 10 { LPGEN("Notice (10x10)"), "chat_log_notice", IDI_CHAT_NOTICE, 10}, // 11 - { LPGEN("Topic (10x10)"), "chat_log_topic", IDI_TOPIC, 10}, // 12 - { LPGEN("Highlight (10x10)"), "chat_log_highlight", IDI_NOTICE, 10}, // 13 - { LPGEN("Information (10x10)"), "chat_log_info", IDI_INFO, 10}, // 14 + { LPGEN("Topic (10x10)"), "chat_log_topic", IDI_TOPIC, 10}, // 12 + { LPGEN("Highlight (10x10)"), "chat_log_highlight", IDI_NOTICE, 10}, // 13 + { LPGEN("Information (10x10)"), "chat_log_info", IDI_INFO, 10}, // 14 }; void RegisterIcons(void) { HookEvent(ME_SKIN2_ICONSCHANGED, IconsChanged); - Icon_Register(g_hInst, LPGEN("Single Messaging"), iconList, 16); - Icon_Register(g_hInst, LPGEN("Group chats"), iconList+16, 20); + Icon_Register(g_hInst, LPGEN("Single Messaging"), iconList, 16); + Icon_Register(g_hInst, LPGEN("Group chats"), iconList+16, 20); Icon_Register(g_hInst, LPGEN("Single Messaging"), iconList+36, 14); } ///////////////////////////////////////////////////////////////////////////////////////// -int ImageList_AddIcon_Ex(HIMAGELIST hIml, int id) { +int ImageList_AddIcon_Ex(HIMAGELIST hIml, int id) +{ HICON hIcon = LoadSkinnedIcon(id); - int res = ImageList_AddIcon(hIml, hIcon); - Skin_ReleaseIcon(hIcon); - return res; + int res = ImageList_AddIcon(hIml, hIcon); + Skin_ReleaseIcon(hIcon); + return res; } -int ImageList_AddIcon_Ex2(HIMAGELIST hIml, HICON hIcon) { - int res = ImageList_AddIcon(hIml, hIcon); - Skin_ReleaseIcon(hIcon); - return res; +int ImageList_AddIcon_Ex2(HIMAGELIST hIml, HICON hIcon) +{ + int res = ImageList_AddIcon(hIml, hIcon); + Skin_ReleaseIcon(hIcon); + return res; } -int ImageList_ReplaceIcon_Ex(HIMAGELIST hIml, int nIndex, int id) { +int ImageList_ReplaceIcon_Ex(HIMAGELIST hIml, int nIndex, int id) +{ HICON hIcon = LoadSkinnedIcon(id); int res = ImageList_ReplaceIcon(hIml, nIndex, hIcon); Skin_ReleaseIcon(hIcon); return res; } -int ImageList_AddIcon_ProtoEx(HIMAGELIST hIml, const char* szProto, int status) { +int ImageList_AddIcon_ProtoEx(HIMAGELIST hIml, const char* szProto, int status) +{ HICON hIcon = LoadSkinnedProtoIcon(szProto, status); - int res = ImageList_AddIcon(hIml, hIcon); + int res = ImageList_AddIcon(hIml, hIcon); Skin_ReleaseIcon(hIcon); - return res; + return res; } void ReleaseIcons() @@ -143,8 +147,8 @@ void ReleaseIcons() HICON GetCachedIcon(const char *name) { for (int i = 0; i < SIZEOF(iconList); i++) - if (!strcmp(iconList[i].szName, name)) - return Skin_GetIconByHandle(iconList[i].hIcolib); + if (!strcmp(iconList[i].szName, name)) + return Skin_GetIconByHandle(iconList[i].hIcolib); return NULL; } @@ -161,50 +165,53 @@ void LoadGlobalIcons() ImageList_RemoveAll(g_dat.hChatButtonIconList); ImageList_RemoveAll(g_dat.hHelperIconList); ImageList_RemoveAll(g_dat.hSearchEngineIconList); - for (i=0; i < SIZEOF(buttonIcons); i++) { + for (i = 0; i < SIZEOF(buttonIcons); i++) { if (buttonIcons[i] == NULL) ImageList_AddIcon_ProtoEx(g_dat.hButtonIconList, NULL, ID_STATUS_OFFLINE); else ImageList_AddIcon(g_dat.hButtonIconList, GetCachedIcon(buttonIcons[i])); } - for (i=0; i < SIZEOF(chatButtonIcons); i++) + for (i = 0; i < SIZEOF(chatButtonIcons); i++) ImageList_AddIcon(g_dat.hChatButtonIconList, GetCachedIcon(chatButtonIcons[i])); ImageList_AddIcon(g_dat.hHelperIconList, GetCachedIcon("scriver_OVERLAY")); int overlayIcon = ImageList_AddIcon(g_dat.hHelperIconList, GetCachedIcon("scriver_OVERLAY")); ImageList_SetOverlayImage(g_dat.hHelperIconList, overlayIcon, 1); - for (i=IDI_GOOGLE; i < IDI_LASTICON; i++) { + for (i = IDI_GOOGLE; i < IDI_LASTICON; i++) { HICON hIcon = (HICON)LoadImage(g_hInst, MAKEINTRESOURCE(i), IMAGE_ICON, 0, 0, 0); ImageList_AddIcon(g_dat.hSearchEngineIconList, hIcon); DestroyIcon(hIcon); } } -static BOOL CALLBACK LangAddCallback(CHAR * str) { +static struct { UINT cpId; const TCHAR *cpName; } cpTable[] = +{ + { 874, LPGENT("Thai") }, // + { 932, LPGENT("Japanese") }, // + { 936, LPGENT("Simplified Chinese") }, // + { 949, LPGENT("Korean") }, // + { 950, LPGENT("Traditional Chinese") }, // + { 1250, LPGENT("Central European") }, // + { 1251, LPGENT("Cyrillic") }, // + { 1252, LPGENT("Latin I") }, // + { 1253, LPGENT("Greek") }, // + { 1254, LPGENT("Turkish") }, // + { 1255, LPGENT("Hebrew") }, // + { 1256, LPGENT("Arabic") }, // + { 1257, LPGENT("Baltic") }, // + { 1258, LPGENT("Vietnamese") }, // + { 1361, LPGENT("Korean (Johab)") } +}; + +static BOOL CALLBACK LangAddCallback(CHAR * str) +{ int i, count; UINT cp; - static struct { UINT cpId; const TCHAR *cpName; } cpTable[] = { - { 874, LPGENT("Thai") }, // - { 932, LPGENT("Japanese") }, // - { 936, LPGENT("Simplified Chinese") }, // - { 949, LPGENT("Korean") }, // - { 950, LPGENT("Traditional Chinese") }, // - { 1250, LPGENT("Central European") }, // - { 1251, LPGENT("Cyrillic") }, // - { 1252, LPGENT("Latin I") }, // - { 1253, LPGENT("Greek") }, // - { 1254, LPGENT("Turkish") }, // - { 1255, LPGENT("Hebrew") }, // - { 1256, LPGENT("Arabic") }, // - { 1257, LPGENT("Baltic") }, // - { 1258, LPGENT("Vietnamese") }, // - { 1361, LPGENT("Korean (Johab)") } - }; cp = atoi(str); - count = sizeof(cpTable)/sizeof(cpTable[0]); - for (i=0; itype != ACKTYPE_MESSAGE) return 0; - ACKDATA *ack = (ACKDATA*) lParam; + ACKDATA *ack = (ACKDATA*)lParam; MessageSendQueueItem *item = FindSendQueueItem((HANDLE)pAck->hContact, (HANDLE)pAck->hProcess); if (item == NULL) return 0; @@ -401,9 +408,9 @@ static int ackevent(WPARAM wParam, LPARAM lParam) } if (item != NULL && item->hwndErrorDlg == NULL) { if (hwndSender != NULL) { - ErrorWindowData *ewd = (ErrorWindowData *) mir_alloc(sizeof(ErrorWindowData)); + ErrorWindowData *ewd = (ErrorWindowData *)mir_alloc(sizeof(ErrorWindowData)); ewd->szName = GetNickname(item->hContact, item->proto); - ewd->szDescription = mir_a2t((char*) ack->lParam); + ewd->szDescription = mir_a2t((char*)ack->lParam); ewd->szText = GetSendBufferMsg(item); ewd->hwndParent = hwndSender; ewd->queueItem = item; @@ -423,8 +430,8 @@ static int ackevent(WPARAM wParam, LPARAM lParam) dbei.szModule = GetContactProto(item->hContact); dbei.timestamp = time(NULL); dbei.cbBlob = lstrlenA(item->sendBuffer) + 1; - if ( !( item->flags & PREF_UTF)) - dbei.cbBlob *= sizeof(TCHAR) + 1; + if (!(item->flags & PREF_UTF)) + dbei.cbBlob *= sizeof(TCHAR)+1; dbei.pBlob = (PBYTE)item->sendBuffer; MessageWindowEvent evt = { sizeof(evt), (int)item->hSendId, item->hContact, &dbei }; diff --git a/plugins/Scriver/src/msgs.cpp b/plugins/Scriver/src/msgs.cpp index dcd9e2c39b..2dc31ada48 100644 --- a/plugins/Scriver/src/msgs.cpp +++ b/plugins/Scriver/src/msgs.cpp @@ -452,9 +452,6 @@ static int ModuleLoad(WPARAM wParam, LPARAM lParam) static int OnModulesLoaded(WPARAM wParam, LPARAM lParam) { ReloadGlobals(); - RegisterIcons(); - RegisterFontServiceFonts(); - RegisterKeyBindings(); LoadGlobalIcons(); LoadMsgLogIcons(); ModuleLoad(0, 0); @@ -525,6 +522,9 @@ int OnLoadModule(void) RichUtil_Load(); OleInitialize(NULL); InitStatusIcons(); + RegisterIcons(); + RegisterFontServiceFonts(); + RegisterKeyBindings(); HookEvent(ME_OPT_INITIALISE, OptInitialise); HookEvent(ME_DB_EVENT_ADDED, MessageEventAdded); diff --git a/plugins/Scriver/src/statusicon.cpp b/plugins/Scriver/src/statusicon.cpp index f9c3d02936..fa56859f67 100644 --- a/plugins/Scriver/src/statusicon.cpp +++ b/plugins/Scriver/src/statusicon.cpp @@ -71,6 +71,8 @@ static int OnSrmmIconChanged(WPARAM wParam, LPARAM) if (hwnd != NULL) PostMessage(GetParent(hwnd), DM_STATUSICONCHANGE, 0, 0); } + + LoadChatIcons(); return 0; } -- cgit v1.2.3