From 81cc0996f38dca205fe283e24d64df6e9cea7c10 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Fri, 17 Jan 2014 15:14:41 +0000 Subject: - icons management also moved to core; - forced ReloadSettings() after initialization git-svn-id: http://svn.miranda-ng.org/main/trunk@7690 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- plugins/Scriver/src/chat/chat.h | 1 - plugins/Scriver/src/chat/main.cpp | 27 +-------------------------- plugins/Scriver/src/statusicon.cpp | 2 -- plugins/TabSRMM/src/chat/main.cpp | 23 +---------------------- 4 files changed, 2 insertions(+), 51 deletions(-) (limited to 'plugins') diff --git a/plugins/Scriver/src/chat/chat.h b/plugins/Scriver/src/chat/chat.h index ffe9f804bb..323f8cf9ea 100644 --- a/plugins/Scriver/src/chat/chat.h +++ b/plugins/Scriver/src/chat/chat.h @@ -82,7 +82,6 @@ typedef struct{ COLORCHOOSER; //main.c -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 6a54c7b865..fab57d653a 100644 --- a/plugins/Scriver/src/chat/main.cpp +++ b/plugins/Scriver/src/chat/main.cpp @@ -116,30 +116,6 @@ 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() { CHAT_MANAGER_INITDATA data = { &g_Settings, sizeof(MODULEINFO), sizeof(SESSION_INFO), LPGENT("Messaging")_T("/")LPGENT("Group chats") }; @@ -160,8 +136,7 @@ int Chat_Load() pci->OnSetStatusBar = OnSetStatusBar; pci->OnFlashWindow = OnFlashWindow; pci->ShowRoom = ShowRoom; - - LoadChatIcons(); + pci->ReloadSettings(); g_hMenu = LoadMenu(g_hInst, MAKEINTRESOURCE(IDR_MENU)); TranslateMenu(g_hMenu); diff --git a/plugins/Scriver/src/statusicon.cpp b/plugins/Scriver/src/statusicon.cpp index fa56859f67..f9c3d02936 100644 --- a/plugins/Scriver/src/statusicon.cpp +++ b/plugins/Scriver/src/statusicon.cpp @@ -71,8 +71,6 @@ static int OnSrmmIconChanged(WPARAM wParam, LPARAM) if (hwnd != NULL) PostMessage(GetParent(hwnd), DM_STATUSICONCHANGE, 0, 0); } - - LoadChatIcons(); return 0; } diff --git a/plugins/TabSRMM/src/chat/main.cpp b/plugins/TabSRMM/src/chat/main.cpp index 690e5665e4..bd043c637b 100644 --- a/plugins/TabSRMM/src/chat/main.cpp +++ b/plugins/TabSRMM/src/chat/main.cpp @@ -202,28 +202,6 @@ static void OnLoadSettings() void Chat_ModulesLoaded() { - ZeroMemory(pci->hIcons, sizeof(HICON)* (ICON_STATUS5 - ICON_ACTION)); - pci->hIcons[ICON_ACTION] = LoadIconEx(IDI_ACTION, "log_action", 16, 16); - pci->hIcons[ICON_ADDSTATUS] = LoadIconEx(IDI_ADDSTATUS, "log_addstatus", 16, 16); - pci->hIcons[ICON_HIGHLIGHT] = LoadIconEx(IDI_HIGHLIGHT, "log_highlight", 16, 16); - pci->hIcons[ICON_INFO] = LoadIconEx(IDI_INFO, "log_info", 16, 16); - pci->hIcons[ICON_JOIN] = LoadIconEx(IDI_JOIN, "log_join", 16, 16); - pci->hIcons[ICON_KICK] = LoadIconEx(IDI_KICK, "log_kick", 16, 16); - pci->hIcons[ICON_MESSAGE] = LoadIconEx(IDI_MESSAGE, "log_message_in", 16, 16); - pci->hIcons[ICON_MESSAGEOUT] = LoadIconEx(IDI_MESSAGEOUT, "log_message_out", 16, 16); - pci->hIcons[ICON_NICK] = LoadIconEx(IDI_NICK, "log_nick", 16, 16); - pci->hIcons[ICON_NOTICE] = LoadIconEx(IDI_NOTICE, "log_notice", 16, 16); - pci->hIcons[ICON_PART] = LoadIconEx(IDI_PART, "log_part", 16, 16); - pci->hIcons[ICON_QUIT] = LoadIconEx(IDI_QUIT, "log_quit", 16, 16); - pci->hIcons[ICON_REMSTATUS] = LoadIconEx(IDI_REMSTATUS, "log_removestatus", 16, 16); - pci->hIcons[ICON_TOPIC] = LoadIconEx(IDI_TOPIC, "log_topic", 16, 16); - pci->hIcons[ICON_STATUS1] = LoadIconEx(IDI_STATUS1, "status1", 16, 16); - pci->hIcons[ICON_STATUS2] = LoadIconEx(IDI_STATUS2, "status2", 16, 16); - pci->hIcons[ICON_STATUS3] = LoadIconEx(IDI_STATUS3, "status3", 16, 16); - pci->hIcons[ICON_STATUS4] = LoadIconEx(IDI_STATUS4, "status4", 16, 16); - pci->hIcons[ICON_STATUS0] = LoadIconEx(IDI_STATUS0, "status0", 16, 16); - pci->hIcons[ICON_STATUS5] = LoadIconEx(IDI_STATUS5, "status5", 16, 16); - g_Settings.hIconOverlay = LoadIconEx(IDI_OVERLAY, "overlay", 16, 16); } @@ -295,6 +273,7 @@ int Chat_Load() // this operation is unsafe, that's why we restore the old pci state on exit pci->DoSoundsFlashPopupTrayStuff = DoSoundsFlashPopupTrayStuff; + pci->ReloadSettings(); g_hMenu = LoadMenu(g_hInst, MAKEINTRESOURCE(IDR_MENU)); -- cgit v1.2.3