From 680873487c4a7987012606119a744e5ca725ad30 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Sat, 13 Apr 2019 20:22:59 +0300 Subject: merge with trunk --- plugins/UserInfoEx/src/mir_icolib.cpp | 162 +++++++++++++++++----------------- 1 file changed, 81 insertions(+), 81 deletions(-) (limited to 'plugins/UserInfoEx/src/mir_icolib.cpp') diff --git a/plugins/UserInfoEx/src/mir_icolib.cpp b/plugins/UserInfoEx/src/mir_icolib.cpp index a703d3d457..8d13206a7c 100644 --- a/plugins/UserInfoEx/src/mir_icolib.cpp +++ b/plugins/UserInfoEx/src/mir_icolib.cpp @@ -23,109 +23,109 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. static IconItem common[] = { - { LPGEN("Main"), ICO_COMMON_MAIN, IDI_MAIN }, - { LPGEN("Default"), ICO_COMMON_DEFAULT, IDI_DEFAULT } + { LPGEN("Main"), "common_main", IDI_MAIN }, + { LPGEN("Default"), "common_default", IDI_DEFAULT } }; static IconItem icons1[] = { // common - { ICO_COMMON_IM, LPGEN("IM naming"), IDI_MIRANDA }, - { ICO_COMMON_PASSWORD, LPGEN("Password"), IDI_PASSWORD }, - { ICO_COMMON_FEMALE, LPGEN("Female"), IDI_FEMALE }, - { ICO_COMMON_MALE, LPGEN("Male"), IDI_MALE }, - { ICO_COMMON_BIRTHDAY, LPGEN("Birthday"), IDI_BIRTHDAY }, - { ICO_COMMON_CLOCK, LPGEN("Timezone"), IDI_CLOCK, 32 }, - { ICO_COMMON_MARITAL, LPGEN("Marital status"), IDI_MARITAL }, - { ICO_COMMON_ADDRESS, LPGEN("Address"), IDI_TREE_ADDRESS }, - { ICO_COMMON_ANNIVERSARY,LPGEN("Anniversary"), IDI_ANNIVERSARY }, + { "common_im", LPGEN("IM naming"), IDI_MIRANDA }, + { "common_password", LPGEN("Password"), IDI_PASSWORD }, + { "common_female", LPGEN("Female"), IDI_FEMALE }, + { "common_male", LPGEN("Male"), IDI_MALE }, + { "common_birthday", LPGEN("Birthday"), IDI_BIRTHDAY }, + { "common_clock", LPGEN("Timezone"), IDI_CLOCK, 32 }, + { "common_marital", LPGEN("Marital status"), IDI_MARITAL }, + { "common_address", LPGEN("Address"), IDI_TREE_ADDRESS }, + { "common_anniversary", LPGEN("Anniversary"), IDI_ANNIVERSARY }, // zodiac - { ICO_ZOD_AQUARIUS, LPGEN("Aquarius"), IDI_ZOD_AQUARIUS, 128 }, - { ICO_ZOD_ARIES, LPGEN("Aries"), IDI_ZOD_ARIES, 128 }, - { ICO_ZOD_CANCER, LPGEN("Cancer"), IDI_ZOD_CANCER, 128 }, - { ICO_ZOD_CAPRICORN, LPGEN("Capricorn"), IDI_ZOD_CAPRICORN, 128 }, - { ICO_ZOD_GEMINI, LPGEN("Gemini"), IDI_ZOD_GEMINI, 128 }, - { ICO_ZOD_LEO, LPGEN("Leo"), IDI_ZOD_LEO, 128 }, - { ICO_ZOD_LIBRA, LPGEN("Libra"), IDI_ZOD_LIBRA, 128 }, - { ICO_ZOD_PISCES, LPGEN("Pisces"), IDI_ZOD_PISCES, 128 }, - { ICO_ZOD_SAGITTARIUS, LPGEN("Sagittarius"), IDI_ZOD_SAGITTARIUS, 128 }, - { ICO_ZOD_SCORPIO, LPGEN("Scorpio"), IDI_ZOD_SCORPIO, 128 }, - { ICO_ZOD_TAURUS, LPGEN("Taurus"), IDI_ZOD_TAURUS, 128 }, - { ICO_ZOD_VIRGO, LPGEN("Virgo"), IDI_ZOD_VIRGO, 128 }, + { "zod_aquarius", LPGEN("Aquarius"), IDI_ZOD_AQUARIUS, 128 }, + { "zod_aries", LPGEN("Aries"), IDI_ZOD_ARIES, 128 }, + { "zod_cancer", LPGEN("Cancer"), IDI_ZOD_CANCER, 128 }, + { "zod_capricorn", LPGEN("Capricorn"), IDI_ZOD_CAPRICORN, 128 }, + { "zod_gemini", LPGEN("Gemini"), IDI_ZOD_GEMINI, 128 }, + { "zod_leo", LPGEN("Leo"), IDI_ZOD_LEO, 128 }, + { "zod_libra", LPGEN("Libra"), IDI_ZOD_LIBRA, 128 }, + { "zod_pisces", LPGEN("Pisces"), IDI_ZOD_PISCES, 128 }, + { "zod_sagittarius", LPGEN("Sagittarius"), IDI_ZOD_SAGITTARIUS, 128 }, + { "zod_scorpio", LPGEN("Scorpio"), IDI_ZOD_SCORPIO, 128 }, + { "zod_taurus", LPGEN("Taurus"), IDI_ZOD_TAURUS, 128 }, + { "zod_virgo", LPGEN("Virgo"), IDI_ZOD_VIRGO, 128 }, // lists - { ICO_LST_MODULES, LPGEN("Export: modules"), IDI_LST_MODULES }, - { ICO_LST_FOLDER, LPGEN("Export: folder"), IDI_LST_FOLDER }, + { "lst_modules", LPGEN("Export: modules"), IDI_LST_MODULES }, + { "lst_folder", LPGEN("Export: folder"), IDI_LST_FOLDER }, }; static IconItem icons2[] = { // tree - { ICO_TREE_DEFAULT, LPGEN("Default"), IDI_LST_FOLDER }, + { "tree_default", LPGEN("Default"), IDI_LST_FOLDER }, }; static IconItem icons3[] = { // dialogs - { ICO_DLG_DETAILS, LPGEN("Details info bar"), IDI_DLG_DETAILS, 48 }, - { ICO_DLG_PHONE, LPGEN("Phone info bar"), IDI_DLG_PHONE, 32 }, - { ICO_DLG_EMAIL, LPGEN("E-mail info bar"), IDI_DLG_EMAIL, 32 }, - { ICO_DLG_EXPORT, LPGEN("Export VCard"), IDI_EXPORT, 32 }, - { ICO_DLG_IMPORT, LPGEN("Import VCard"), IDI_IMPORT, 32 }, - { ICO_DLG_ANNIVERSARY, LPGEN("Anniversary info bar"), IDI_ANNIVERSARY, 32 }, + { "dlg_details", LPGEN("Details info bar"), IDI_DLG_DETAILS, 48 }, + { "dlg_phone", LPGEN("Phone info bar"), IDI_DLG_PHONE, 32 }, + { "dlg_email", LPGEN("E-mail info bar"), IDI_DLG_EMAIL, 32 }, + { "dlg_export", LPGEN("Export VCard"), IDI_EXPORT, 32 }, + { "dlg_import", LPGEN("Import VCard"), IDI_IMPORT, 32 }, + { "dlg_anniversary", LPGEN("Anniversary info bar"), IDI_ANNIVERSARY, 32 }, }; static IconItem icons4[] = { // button icons - { ICO_BTN_UPDATE, LPGEN("Update"), IDI_BTN_UPDATE }, - { ICO_BTN_IMPORT, LPGEN("Import"), IDI_IMPORT }, - { ICO_BTN_EXPORT, LPGEN("Export"), IDI_EXPORT }, - { ICO_BTN_OK, LPGEN("OK"), IDI_BTN_OK }, - { ICO_BTN_CANCEL, LPGEN("Cancel"), IDI_BTN_CLOSE }, - { ICO_BTN_APPLY, LPGEN("Apply"), IDI_BTN_APPLY }, - { ICO_BTN_GOTO, LPGEN("Goto"), IDI_BTN_GOTO }, - { ICO_BTN_PHONE, LPGEN("Phone"), IDI_BTN_PHONE }, - { ICO_BTN_FAX, LPGEN("Fax"), IDI_BTN_FAX }, - { ICO_BTN_CELLULAR, LPGEN("Cellular"), IDI_BTN_CELLULAR }, - { ICO_BTN_CUSTOMPHONE, LPGEN("Custom phone"), IDI_BTN_CUSTOMPHONE }, - { ICO_BTN_EMAIL, LPGEN("E-mail"), IDI_BTN_EMAIL }, - { ICO_BTN_DOWNARROW, LPGEN("Down arrow"), IDI_BTN_DOWNARROW }, - { ICO_BTN_ADD, LPGEN("Add"), IDI_BTN_ADD }, - { ICO_BTN_EDIT, LPGEN("Edit"), IDI_BTN_EDIT }, - { ICO_BTN_DELETE, LPGEN("Delete"), IDI_BTN_DELETE }, - { ICO_BTN_SEARCH, LPGEN("Search"), IDI_SEARCH }, - { ICO_BTN_EXIMPORT, LPGEN("Export/import"), IDI_BTN_EXIMPORT }, - { ICO_BTN_BDAY_BACKUP, LPGEN("Backup birthday"), IDI_BTN_BIRTHDAY_BACKUP }, + { "btn_update", LPGEN("Update"), IDI_BTN_UPDATE }, + { "btn_import", LPGEN("Import"), IDI_IMPORT }, + { "btn_export", LPGEN("Export"), IDI_EXPORT }, + { "btn_ok", LPGEN("OK"), IDI_BTN_OK }, + { "btn_cancel", LPGEN("Cancel"), IDI_BTN_CLOSE }, + { "btn_apply", LPGEN("Apply"), IDI_BTN_APPLY }, + { "btn_goto", LPGEN("Goto"), IDI_BTN_GOTO }, + { "btn_phone", LPGEN("Phone"), IDI_BTN_PHONE }, + { "btn_fax", LPGEN("Fax"), IDI_BTN_FAX }, + { "btn_cellular", LPGEN("Cellular"), IDI_BTN_CELLULAR }, + { "btn_customphone", LPGEN("Custom phone"), IDI_BTN_CUSTOMPHONE }, + { "btn_email", LPGEN("E-mail"), IDI_BTN_EMAIL }, + { "btn_downarrow", LPGEN("Down arrow"), IDI_BTN_DOWNARROW }, + { "btn_add", LPGEN("Add"), IDI_BTN_ADD }, + { "btn_edit", LPGEN("Edit"), IDI_BTN_EDIT }, + { "btn_delete", LPGEN("Delete"), IDI_BTN_DELETE }, + { "btn_search", LPGEN("Search"), IDI_SEARCH }, + { "btn_eximport", LPGEN("Export/import"), IDI_BTN_EXIMPORT }, + { "btn_bdaybackup", LPGEN("Backup birthday"), IDI_BTN_BIRTHDAY_BACKUP }, }; static IconItem icons5[] = { // birthday and anniversary - { ICO_RMD_DTB0, LPGEN("Birthday today"), IDI_RMD_DTB0 }, - { ICO_RMD_DTB1, LPGEN("Birthday tomorrow"), IDI_RMD_DTB1 }, - { ICO_RMD_DTB2, LPGEN("Birthday in 2 days"), IDI_RMD_DTB2 }, - { ICO_RMD_DTB3, LPGEN("Birthday in 3 days"), IDI_RMD_DTB3 }, - { ICO_RMD_DTB4, LPGEN("Birthday in 4 days"), IDI_RMD_DTB4 }, - { ICO_RMD_DTB5, LPGEN("Birthday in 5 days"), IDI_RMD_DTB5 }, - { ICO_RMD_DTB6, LPGEN("Birthday in 6 days"), IDI_RMD_DTB6 }, - { ICO_RMD_DTB7, LPGEN("Birthday in 7 days"), IDI_RMD_DTB7 }, - { ICO_RMD_DTB8, LPGEN("Birthday in 8 days"), IDI_RMD_DTB8 }, - { ICO_RMD_DTB9, LPGEN("Birthday in 9 days"), IDI_RMD_DTB9 }, - { ICO_RMD_DTBX, LPGEN("Birthday later"), IDI_RMD_DTBX }, - - { ICO_RMD_DTA0, LPGEN("Anniversary today"), IDI_RMD_DTA0 }, - { ICO_RMD_DTA1, LPGEN("Anniversary tomorrow"), IDI_RMD_DTA1 }, - { ICO_RMD_DTA2, LPGEN("Anniversary in 2 days"), IDI_RMD_DTA2 }, - { ICO_RMD_DTA3, LPGEN("Anniversary in 3 days"), IDI_RMD_DTA3 }, - { ICO_RMD_DTA4, LPGEN("Anniversary in 4 days"), IDI_RMD_DTA4 }, - { ICO_RMD_DTA5, LPGEN("Anniversary in 5 days"), IDI_RMD_DTA5 }, - { ICO_RMD_DTA6, LPGEN("Anniversary in 6 days"), IDI_RMD_DTA6 }, - { ICO_RMD_DTA7, LPGEN("Anniversary in 7 days"), IDI_RMD_DTA7 }, - { ICO_RMD_DTA8, LPGEN("Anniversary in 8 days"), IDI_RMD_DTA8 }, - { ICO_RMD_DTA9, LPGEN("Anniversary in 9 days"), IDI_RMD_DTA9 }, - { ICO_RMD_DTAX, LPGEN("Anniversary later"), IDI_RMD_DTAX }, + { "rmd_dtb0", LPGEN("Birthday today"), IDI_RMD_DTB0 }, + { "rmd_dtb1", LPGEN("Birthday tomorrow"), IDI_RMD_DTB1 }, + { "rmd_dtb2", LPGEN("Birthday in 2 days"), IDI_RMD_DTB2 }, + { "rmd_dtb3", LPGEN("Birthday in 3 days"), IDI_RMD_DTB3 }, + { "rmd_dtb4", LPGEN("Birthday in 4 days"), IDI_RMD_DTB4 }, + { "rmd_dtb5", LPGEN("Birthday in 5 days"), IDI_RMD_DTB5 }, + { "rmd_dtb6", LPGEN("Birthday in 6 days"), IDI_RMD_DTB6 }, + { "rmd_dtb7", LPGEN("Birthday in 7 days"), IDI_RMD_DTB7 }, + { "rmd_dtb8", LPGEN("Birthday in 8 days"), IDI_RMD_DTB8 }, + { "rmd_dtb9", LPGEN("Birthday in 9 days"), IDI_RMD_DTB9 }, + { "rmd_dtbx", LPGEN("Birthday later"), IDI_RMD_DTBX }, + + { "rmd_dta0", LPGEN("Anniversary today"), IDI_RMD_DTA0 }, + { "rmd_dta1", LPGEN("Anniversary tomorrow"), IDI_RMD_DTA1 }, + { "rmd_dta2", LPGEN("Anniversary in 2 days"), IDI_RMD_DTA2 }, + { "rmd_dta3", LPGEN("Anniversary in 3 days"), IDI_RMD_DTA3 }, + { "rmd_dta4", LPGEN("Anniversary in 4 days"), IDI_RMD_DTA4 }, + { "rmd_dta5", LPGEN("Anniversary in 5 days"), IDI_RMD_DTA5 }, + { "rmd_dta6", LPGEN("Anniversary in 6 days"), IDI_RMD_DTA6 }, + { "rmd_dta7", LPGEN("Anniversary in 7 days"), IDI_RMD_DTA7 }, + { "rmd_dta8", LPGEN("Anniversary in 8 days"), IDI_RMD_DTA8 }, + { "rmd_dta9", LPGEN("Anniversary in 9 days"), IDI_RMD_DTA9 }, + { "rmd_dtax", LPGEN("Anniversary later"), IDI_RMD_DTAX }, }; ///////////////////////////////////////////////////////////////////////////////////////// @@ -182,7 +182,7 @@ static HINSTANCE IcoLib_CheckIconPackVersion(wchar_t *szIconPack) void IcoLib_SetCtrlIcons(HWND hDlg, const ICONCTRL *pCtrl, BYTE numCtrls) { for (int i = 0; i < numCtrls; i++) { - HICON hIcon = IcoLib_GetIcon(pCtrl[i].pszIcon); + HICON hIcon = g_plugin.getIcon(pCtrl[i].iIcon); if (!pCtrl[i].idCtrl) { SendMessage(hDlg, pCtrl[i].Message, ICON_BIG, (LPARAM)hIcon); continue; @@ -206,16 +206,16 @@ void IcoLib_SetCtrlIcons(HWND hDlg, const ICONCTRL *pCtrl, BYTE numCtrls) void IcoLib_LoadModule() { - g_plugin.registerIcon(SECT_COMMON, common); + g_plugin.registerIcon(SECT_COMMON, common, MODULENAME); wchar_t *szDefaultFile = IcoLib_GetDefaultIconFileName(); HINSTANCE hIconPack = IcoLib_CheckIconPackVersion(szDefaultFile); if (hIconPack) { - Icon_Register(hIconPack, SECT_COMMON, icons1, _countof(icons1), 0, &g_plugin); - Icon_Register(hIconPack, SECT_TREE, icons2, _countof(icons2), 0, &g_plugin); - Icon_Register(hIconPack, SECT_DLG, icons3, _countof(icons3), 0, &g_plugin); - Icon_Register(hIconPack, SECT_BUTTONS, icons4, _countof(icons4), 0, &g_plugin); - Icon_Register(hIconPack, SECT_REMIND, icons5, _countof(icons5), 0, &g_plugin); + Icon_Register(hIconPack, SECT_COMMON, icons1, _countof(icons1), MODULENAME, &g_plugin); + Icon_Register(hIconPack, SECT_TREE, icons2, _countof(icons2), MODULENAME, &g_plugin); + Icon_Register(hIconPack, SECT_DLG, icons3, _countof(icons3), MODULENAME, &g_plugin); + Icon_Register(hIconPack, SECT_BUTTONS, icons4, _countof(icons4), MODULENAME, &g_plugin); + Icon_Register(hIconPack, SECT_REMIND, icons5, _countof(icons5), MODULENAME, &g_plugin); FreeLibrary(hIconPack); } } -- cgit v1.2.3