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.h | 94 ++----------------------------------- 1 file changed, 5 insertions(+), 89 deletions(-) (limited to 'plugins/UserInfoEx/src/mir_icolib.h') diff --git a/plugins/UserInfoEx/src/mir_icolib.h b/plugins/UserInfoEx/src/mir_icolib.h index de9424ac25..e632d47394 100644 --- a/plugins/UserInfoEx/src/mir_icolib.h +++ b/plugins/UserInfoEx/src/mir_icolib.h @@ -29,101 +29,17 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #define SECT_TREE LPGEN("Extended user info") "/" LPGEN("Treeview") #define SECT_REMIND LPGEN("Extended user info") "/" LPGEN("Reminder") -// icons -#define ICO_COMMON_MAIN MODULENAME"_common_main" -#define ICO_COMMON_DEFAULT MODULENAME"_common_default" -#define ICO_COMMON_IM MODULENAME"_common_im" -#define ICO_COMMON_FEMALE MODULENAME"_common_female" -#define ICO_COMMON_MALE MODULENAME"_common_male" -#define ICO_COMMON_BIRTHDAY MODULENAME"_common_birthday" -#define ICO_COMMON_ANNIVERSARY MODULENAME"_common_anniversary" -#define ICO_COMMON_CLOCK MODULENAME"_common_clock" -#define ICO_COMMON_MARITAL MODULENAME"_common_marital" -#define ICO_COMMON_PASSWORD MODULENAME"_common_password" -#define ICO_COMMON_ADDRESS MODULENAME"_common_address" -#define ICO_DLG_DETAILS MODULENAME"_dlg_details" -#define ICO_DLG_PHONE MODULENAME"_dlg_phone" -#define ICO_DLG_EMAIL MODULENAME"_dlg_email" -#define ICO_DLG_EXPORT MODULENAME"_dlg_export" -#define ICO_DLG_IMPORT MODULENAME"_dlg_import" -#define ICO_DLG_ANNIVERSARY MODULENAME"_dlg_anniversary" -#define ICO_DLG_SEARCH MODULENAME"_dlg_search" -#define ICO_LST_MODULES MODULENAME"_lst_modules" -#define ICO_LST_FOLDER MODULENAME"_lst_folder" -#define ICO_BTN_UPDATE MODULENAME"_btn_update" -#define ICO_BTN_OK MODULENAME"_btn_ok" -#define ICO_BTN_CANCEL MODULENAME"_btn_cancel" -#define ICO_BTN_APPLY MODULENAME"_btn_apply" -#define ICO_BTN_GOTO MODULENAME"_btn_goto" -#define ICO_BTN_ADD MODULENAME"_btn_add" -#define ICO_BTN_EDIT MODULENAME"_btn_edit" -#define ICO_BTN_DELETE MODULENAME"_btn_delete" -#define ICO_BTN_IMPORT MODULENAME"_btn_import" -#define ICO_BTN_EXPORT MODULENAME"_btn_export" -#define ICO_BTN_NOTES MODULENAME"_btn_notes" -#define ICO_BTN_ABOUT MODULENAME"_btn_about" -#define ICO_BTN_PROFILE MODULENAME"_btn_profile" -#define ICO_BTN_DOWNARROW MODULENAME"_btn_downarrow" -#define ICO_BTN_PHONE MODULENAME"_btn_phone" -#define ICO_BTN_FAX MODULENAME"_btn_fax" -#define ICO_BTN_CELLULAR MODULENAME"_btn_cellular" -#define ICO_BTN_CUSTOMPHONE MODULENAME"_btn_customphone" -#define ICO_BTN_EMAIL MODULENAME"_btn_email" -#define ICO_BTN_SEARCH MODULENAME"_btn_search" -#define ICO_BTN_EXIMPORT MODULENAME"_btn_eximport" -#define ICO_BTN_BDAY_BACKUP MODULENAME"_btn_bdaybackup" -#define ICO_BTN_YES MODULENAME"_btn_yes" -#define ICO_BTN_NO MODULENAME"_btn_no" -#define ICO_BTN_IGNORE MODULENAME"_btn_ignore" -#define ICO_ZOD_AQUARIUS MODULENAME"_zod_aquarius" -#define ICO_ZOD_ARIES MODULENAME"_zod_aries" -#define ICO_ZOD_CANCER MODULENAME"_zod_cancer" -#define ICO_ZOD_CAPRICORN MODULENAME"_zod_capricorn" -#define ICO_ZOD_GEMINI MODULENAME"_zod_gemini" -#define ICO_ZOD_LEO MODULENAME"_zod_leo" -#define ICO_ZOD_LIBRA MODULENAME"_zod_libra" -#define ICO_ZOD_PISCES MODULENAME"_zod_pisces" -#define ICO_ZOD_SAGITTARIUS MODULENAME"_zod_sagittarius" -#define ICO_ZOD_SCORPIO MODULENAME"_zod_scorpio" -#define ICO_ZOD_TAURUS MODULENAME"_zod_taurus" -#define ICO_ZOD_VIRGO MODULENAME"_zod_virgo" -#define ICO_TREE_DEFAULT MODULENAME"_tree_default" - -#define ICO_RMD_DTB0 MODULENAME"_rmd_dtb0" -#define ICO_RMD_DTB1 MODULENAME"_rmd_dtb1" -#define ICO_RMD_DTB2 MODULENAME"_rmd_dtb2" -#define ICO_RMD_DTB3 MODULENAME"_rmd_dtb3" -#define ICO_RMD_DTB4 MODULENAME"_rmd_dtb4" -#define ICO_RMD_DTB5 MODULENAME"_rmd_dtb5" -#define ICO_RMD_DTB6 MODULENAME"_rmd_dtb6" -#define ICO_RMD_DTB7 MODULENAME"_rmd_dtb7" -#define ICO_RMD_DTB8 MODULENAME"_rmd_dtb8" -#define ICO_RMD_DTB9 MODULENAME"_rmd_dtb9" -#define ICO_RMD_DTBX MODULENAME"_rmd_dtbx" - -#define ICO_RMD_DTA0 MODULENAME"_rmd_dta0" -#define ICO_RMD_DTA1 MODULENAME"_rmd_dta1" -#define ICO_RMD_DTA2 MODULENAME"_rmd_dta2" -#define ICO_RMD_DTA3 MODULENAME"_rmd_dta3" -#define ICO_RMD_DTA4 MODULENAME"_rmd_dta4" -#define ICO_RMD_DTA5 MODULENAME"_rmd_dta5" -#define ICO_RMD_DTA6 MODULENAME"_rmd_dta6" -#define ICO_RMD_DTA7 MODULENAME"_rmd_dta7" -#define ICO_RMD_DTA8 MODULENAME"_rmd_dta8" -#define ICO_RMD_DTA9 MODULENAME"_rmd_dta9" -#define ICO_RMD_DTAX MODULENAME"_rmd_dtax" - #define SET_ICONS_CHECKFILEVERSION "CheckIconPackVersion" #define SET_ICONS_BUTTONS "ButtonIcons" #define ICONINDEX(id) max((min((id), IDI_LASTICON)) - IDI_FIRST_ICON, 0) -typedef struct TIconCtrl +struct ICONCTRL { - LPCSTR pszIcon; - UINT Message; - WORD idCtrl; -} ICONCTRL, *LPICONCTRL; + int iIcon; + UINT Message; + WORD idCtrl; +}; LPTSTR IcoLib_GetDefaultIconFileName(); void IcoLib_SetCtrlIcons(HWND hDlg, const ICONCTRL* pCtrl, BYTE numCtrls); -- cgit v1.2.3