From 402cf5c0416f7de3bcd9f40d3876d635acc280fc Mon Sep 17 00:00:00 2001 From: George Hazan Date: Thu, 9 Jul 2015 18:50:05 +0000 Subject: finally, normal icolib icons in Popup+ git-svn-id: http://svn.miranda-ng.org/main/trunk@14521 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- plugins/Popup/src/actions.cpp | 25 +++++++++---------------- 1 file changed, 9 insertions(+), 16 deletions(-) (limited to 'plugins/Popup/src/actions.cpp') diff --git a/plugins/Popup/src/actions.cpp b/plugins/Popup/src/actions.cpp index b897255edc..f6a6b419d9 100644 --- a/plugins/Popup/src/actions.cpp +++ b/plugins/Popup/src/actions.cpp @@ -35,21 +35,14 @@ void LoadActions() { POPUPACTION actions[] = { - { sizeof(POPUPACTION), IcoLib_GetIcon(ICO_ACT_REPLY, 0), LPGEN("General")"/"LPGEN("Quick reply"), 0 }, - { sizeof(POPUPACTION), IcoLib_GetIcon(ICO_ACT_MESS, 0), LPGEN("General")"/"LPGEN("Send message"), 0 }, - { sizeof(POPUPACTION), IcoLib_GetIcon(ICO_ACT_INFO, 0), LPGEN("General")"/"LPGEN("User details"), 0 }, - { sizeof(POPUPACTION), IcoLib_GetIcon(ICO_ACT_MENU, 0), LPGEN("General")"/"LPGEN("Contact menu"), 0 }, - { sizeof(POPUPACTION), IcoLib_GetIcon(ICO_ACT_ADD, 0), LPGEN("General")"/"LPGEN("Add permanently"), 0 }, - { sizeof(POPUPACTION), IcoLib_GetIcon(ICO_ACT_PIN, 0), LPGEN("General")"/"LPGEN("Pin popup"), 0 }, - { sizeof(POPUPACTION), IcoLib_GetIcon(ICO_ACT_CLOSE, 0), LPGEN("General")"/"LPGEN("Dismiss popup"), 0 }, - { sizeof(POPUPACTION), IcoLib_GetIcon(ICO_ACT_COPY, 0), LPGEN("General")"/"LPGEN("Copy to clipboard"), 0 }, - - // remove popup action -#if defined(_DEBUG) - { sizeof(POPUPACTION), IcoLib_GetIcon(ICO_POPUP_ON, 0), "Popup Plus/Test action", PAF_ENABLED }, - { sizeof(POPUPACTION), IcoLib_GetIcon(ICO_ACT_CLOSE, 0), "Popup Plus/Second test action", 0 }, - { sizeof(POPUPACTION), Skin_LoadIcon(SKINICON_OTHER_MIRANDA), "Popup Plus/One more action", PAF_ENABLED }, -#endif + { sizeof(POPUPACTION), LoadIconEx(IDI_ACT_REPLY), LPGEN("General")"/"LPGEN("Quick reply"), 0 }, + { sizeof(POPUPACTION), LoadIconEx(IDI_ACT_MESSAGE), LPGEN("General")"/"LPGEN("Send message"), 0 }, + { sizeof(POPUPACTION), LoadIconEx(IDI_ACT_INFO), LPGEN("General")"/"LPGEN("User details"), 0 }, + { sizeof(POPUPACTION), LoadIconEx(IDI_ACT_MENU), LPGEN("General")"/"LPGEN("Contact menu"), 0 }, + { sizeof(POPUPACTION), LoadIconEx(IDI_ACT_ADD), LPGEN("General")"/"LPGEN("Add permanently"), 0 }, + { sizeof(POPUPACTION), LoadIconEx(IDI_ACT_PIN), LPGEN("General")"/"LPGEN("Pin popup"), 0 }, + { sizeof(POPUPACTION), LoadIconEx(IDI_ACT_CLOSE), LPGEN("General")"/"LPGEN("Dismiss popup"), 0 }, + { sizeof(POPUPACTION), LoadIconEx(IDI_ACT_COPY), LPGEN("General")"/"LPGEN("Copy to clipboard"), 0 }, }; for (int i = 0; i < _countof(actions); ++i) @@ -189,7 +182,7 @@ INT_PTR CALLBACK DlgProcPopupActions(HWND hwnd, UINT msg, WPARAM wParam, LPARAM TranslateDialogDefault(hwnd); - SendDlgItemMessage(hwnd, IDC_ICO_INFO, STM_SETICON, (WPARAM)IcoLib_GetIcon(ICO_MISC_NOTIFY, 0), 0); + SendDlgItemMessage(hwnd, IDC_ICO_INFO, STM_SETICON, (WPARAM)LoadIconEx(IDI_MB_INFO), 0); CheckDlgButton(hwnd, IDC_CHK_ENABLEACTIONS, PopupOptions.actions & ACT_ENABLE ? BST_CHECKED : BST_UNCHECKED); CheckDlgButton(hwnd, IDC_CHK_IMCONTACTSONLY, PopupOptions.actions & ACT_DEF_IMONLY ? BST_CHECKED : BST_UNCHECKED); -- cgit v1.2.3