From 02ed4455c23e3562d71bfc80a0e2c4fede8708f1 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Sun, 14 Jun 2015 13:17:26 +0000 Subject: - all icolib services removed; - IcoLib_* functions are bound directly to the code git-svn-id: http://svn.miranda-ng.org/main/trunk@14161 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- plugins/UserInfoEx/src/Flags/svc_flagsicons.cpp | 6 +-- plugins/UserInfoEx/src/classMAnnivDate.cpp | 4 +- plugins/UserInfoEx/src/classPsTreeItem.cpp | 10 ++--- plugins/UserInfoEx/src/ctrl_button.cpp | 2 +- plugins/UserInfoEx/src/ctrl_contact.cpp | 24 +++++----- plugins/UserInfoEx/src/dlg_anniversarylist.cpp | 4 +- plugins/UserInfoEx/src/dlg_msgbox.cpp | 26 +++++------ plugins/UserInfoEx/src/dlg_propsheet.cpp | 12 ++--- .../UserInfoEx/src/ex_import/dlg_ExImModules.cpp | 4 +- plugins/UserInfoEx/src/mir_icolib.cpp | 6 +-- plugins/UserInfoEx/src/mir_menuitems.cpp | 52 +++++++++++----------- plugins/UserInfoEx/src/psp_anniversary.cpp | 6 +-- plugins/UserInfoEx/src/psp_base.cpp | 2 +- plugins/UserInfoEx/src/psp_contact.cpp | 8 ++-- plugins/UserInfoEx/src/psp_options.cpp | 6 +-- plugins/UserInfoEx/src/svc_email.cpp | 2 +- plugins/UserInfoEx/src/svc_homepage.cpp | 2 +- plugins/UserInfoEx/src/svc_refreshci.cpp | 10 ++--- plugins/UserInfoEx/src/svc_reminder.cpp | 16 +++---- 19 files changed, 101 insertions(+), 101 deletions(-) (limited to 'plugins/UserInfoEx') diff --git a/plugins/UserInfoEx/src/Flags/svc_flagsicons.cpp b/plugins/UserInfoEx/src/Flags/svc_flagsicons.cpp index 1a9ebac3b0..efb5c18697 100644 --- a/plugins/UserInfoEx/src/Flags/svc_flagsicons.cpp +++ b/plugins/UserInfoEx/src/Flags/svc_flagsicons.cpp @@ -134,7 +134,7 @@ HICON LoadFlag(int countryNumber) char szId[20]; mir_snprintf(szId, SIZEOF(szId), (countryNumber == 0xFFFF) ? "%s_0x%X" : "%s_%i", "flags", countryNumber); /* buffer safe */ - return Skin_GetIcon(szId); + return IcoLib_GetIcon(szId); } HANDLE LoadFlagHandle(int countryNumber) @@ -403,7 +403,7 @@ void InitIcons() sid.hDefaultIcon = ImageList_ExtractIcon(NULL, himl, index); index = CountryNumberToIndex(countries[i].id); - phIconHandles[index] = Skin_AddIcon(&sid); + phIconHandles[index] = IcoLib_AddIcon(&sid); if (sid.hDefaultIcon!=NULL) DestroyIcon(sid.hDefaultIcon); mir_free(sid.description.t); sid.description.t = NULL; } @@ -422,7 +422,7 @@ void UninitIcons() /* create identifier */ char szId[20]; mir_snprintf(szId, SIZEOF(szId), (countries[i].id == 0xFFFF) ? "%s0x%X" : "%s%i", "flags_", countries[i].id); /* buffer safe */ - Skin_RemoveIcon(szId); + IcoLib_RemoveIcon(szId); } mir_free(phIconHandles); /* does NULL check */ } diff --git a/plugins/UserInfoEx/src/classMAnnivDate.cpp b/plugins/UserInfoEx/src/classMAnnivDate.cpp index 73fb57c38c..3b166e29b0 100644 --- a/plugins/UserInfoEx/src/classMAnnivDate.cpp +++ b/plugins/UserInfoEx/src/classMAnnivDate.cpp @@ -241,7 +241,7 @@ MZodiac MAnnivDate::Zodiac() for (i = 0; i < 13 && (wDays < zodiac[i].startDays || wDays > zodiac[i].endDays); i++); MZodiac mZodiac; - mZodiac.hIcon = Skin_GetIcon(zodiac[i].szZodiacIcon); + mZodiac.hIcon = IcoLib_GetIcon(zodiac[i].szZodiacIcon); mZodiac.pszName = zodiac[i].szZodiac; return mZodiac; } @@ -692,7 +692,7 @@ static WORD AskUser(MCONTACT hContact, MAnnivDate *pOldCustomDate, MAnnivDate *p MB.cbSize = sizeof(MSGBOX); MB.hParent = NULL; - MB.hiLogo = Skin_GetIcon(ICO_DLG_ANNIVERSARY); + MB.hiLogo = IcoLib_GetIcon(ICO_DLG_ANNIVERSARY); MB.hiMsg = NULL; MB.uType = MB_YESALLNO|MB_ICON_QUESTION|MB_INFOBAR|MB_NOPOPUP; MB.ptszTitle = LPGENT("Update custom birthday"); diff --git a/plugins/UserInfoEx/src/classPsTreeItem.cpp b/plugins/UserInfoEx/src/classPsTreeItem.cpp index 8882cc5cef..2231f7c157 100644 --- a/plugins/UserInfoEx/src/classPsTreeItem.cpp +++ b/plugins/UserInfoEx/src/classPsTreeItem.cpp @@ -282,7 +282,7 @@ HICON CPsTreeItem::ProtoIcon() if (!mir_tcsnicmp(pa[i]->tszAccountName, _A2T(_pszName), mir_tstrlen(pa[i]->tszAccountName))) { CHAR szIconID[MAX_PATH]; mir_snprintf(szIconID, SIZEOF(szIconID), "core_status_%s1", pa[i]->szModuleName); - HICON hIco = Skin_GetIcon(szIconID); + HICON hIco = IcoLib_GetIcon(szIconID); if (!hIco) hIco = (HICON)CallProtoService(pa[i]->szModuleName, PS_LOADICON, PLI_PROTOCOL, NULL); @@ -313,7 +313,7 @@ int CPsTreeItem::Icon(HIMAGELIST hIml, OPTIONSDIALOGPAGE *odp, BYTE bInitIconsOn LPCSTR pszIconName = IconKey(); // use icolib to handle icons - HICON hIcon = Skin_GetIcon(pszIconName); + HICON hIcon = IcoLib_GetIcon(pszIconName); if (!hIcon) { bool bNeedFree = false; @@ -360,10 +360,10 @@ int CPsTreeItem::Icon(HIMAGELIST hIml, OPTIONSDIALOGPAGE *odp, BYTE bInitIconsOn sid.hDefaultIcon = ImageList_GetIcon(hIml, 0, ILD_NORMAL), bNeedFree = true; } // add file to icolib - Skin_AddIcon(&sid); + IcoLib_AddIcon(&sid); if (!bInitIconsOnly) - hIcon = Skin_GetIcon(pszIconName); + hIcon = IcoLib_GetIcon(pszIconName); if (bNeedFree) DestroyIcon(sid.hDefaultIcon); } @@ -600,7 +600,7 @@ void CPsTreeItem::OnIconsChanged(CPsTree *pTree) RECT rc; // update tree item icons - if (pTree->ImageList() && (hIcon = Skin_GetIcon(IconKey())) != NULL) { + if (pTree->ImageList() && (hIcon = IcoLib_GetIcon(IconKey())) != NULL) { _iImage = (_iImage > 0) ? ImageList_ReplaceIcon(pTree->ImageList(), _iImage, hIcon) : ImageList_AddIcon(pTree->ImageList(), hIcon); diff --git a/plugins/UserInfoEx/src/ctrl_button.cpp b/plugins/UserInfoEx/src/ctrl_button.cpp index 45670de8a2..50ff993163 100644 --- a/plugins/UserInfoEx/src/ctrl_button.cpp +++ b/plugins/UserInfoEx/src/ctrl_button.cpp @@ -371,7 +371,7 @@ static LRESULT CALLBACK Button_WndProc(HWND hwndBtn, UINT uMsg, WPARAM wParam, L bct->hFont = (HFONT)GetStockObject(DEFAULT_GUI_FONT); bct->dwStyle = cs->style; if (cs->style & MBS_DOWNARROW) - bct->arrow = Skin_GetIcon(ICO_BTN_DOWNARROW); + bct->arrow = IcoLib_GetIcon(ICO_BTN_DOWNARROW); LoadTheme(bct); SetWindowLongPtr(hwndBtn, 0, (LONG_PTR)bct); if (cs->lpszName) SetWindowText(hwndBtn, cs->lpszName); diff --git a/plugins/UserInfoEx/src/ctrl_contact.cpp b/plugins/UserInfoEx/src/ctrl_contact.cpp index ccc30ead81..bf4e43afd5 100644 --- a/plugins/UserInfoEx/src/ctrl_contact.cpp +++ b/plugins/UserInfoEx/src/ctrl_contact.cpp @@ -151,10 +151,10 @@ static INT_PTR CALLBACK DlgProc_EMail(HWND hDlg, UINT msg, WPARAM wParam, LPARAM return FALSE; SetUserData(hDlg, lParam); - SendDlgItemMessage(hDlg, IDC_HEADERBAR, WM_SETICON, 0, (LPARAM)Skin_GetIcon(ICO_DLG_EMAIL, TRUE)); + SendDlgItemMessage(hDlg, IDC_HEADERBAR, WM_SETICON, 0, (LPARAM)IcoLib_GetIcon(ICO_DLG_EMAIL, TRUE)); if (db_get_b(NULL, MODNAME, SET_ICONS_BUTTONS, 1)) { - SendDlgItemMessage(hDlg, IDOK, BM_SETIMAGE, IMAGE_ICON, (LPARAM)Skin_GetIcon(ICO_BTN_OK)); - SendDlgItemMessage(hDlg, IDCANCEL, BM_SETIMAGE, IMAGE_ICON, (LPARAM)Skin_GetIcon(ICO_BTN_CANCEL)); + SendDlgItemMessage(hDlg, IDOK, BM_SETIMAGE, IMAGE_ICON, (LPARAM)IcoLib_GetIcon(ICO_BTN_OK)); + SendDlgItemMessage(hDlg, IDCANCEL, BM_SETIMAGE, IMAGE_ICON, (LPARAM)IcoLib_GetIcon(ICO_BTN_CANCEL)); } if (*cbi->pszVal) @@ -243,10 +243,10 @@ INT_PTR CALLBACK DlgProc_Phone(HWND hDlg, UINT msg, WPARAM wParam, LPARAM lParam if (!cbi) return FALSE; SetUserData(hDlg, lParam); - SendDlgItemMessage(hDlg, IDC_HEADERBAR, WM_SETICON, 0, (LPARAM)Skin_GetIcon(ICO_DLG_PHONE, TRUE)); + SendDlgItemMessage(hDlg, IDC_HEADERBAR, WM_SETICON, 0, (LPARAM)IcoLib_GetIcon(ICO_DLG_PHONE, TRUE)); if (db_get_b(NULL, MODNAME, SET_ICONS_BUTTONS, 1)) { - SendDlgItemMessage(hDlg, IDOK, BM_SETIMAGE, IMAGE_ICON, (LPARAM)Skin_GetIcon(ICO_BTN_OK)); - SendDlgItemMessage(hDlg, IDCANCEL, BM_SETIMAGE, IMAGE_ICON, (LPARAM)Skin_GetIcon(ICO_BTN_CANCEL)); + SendDlgItemMessage(hDlg, IDOK, BM_SETIMAGE, IMAGE_ICON, (LPARAM)IcoLib_GetIcon(ICO_BTN_OK)); + SendDlgItemMessage(hDlg, IDCANCEL, BM_SETIMAGE, IMAGE_ICON, (LPARAM)IcoLib_GetIcon(ICO_BTN_CANCEL)); } // translate Userinfo buttons @@ -577,17 +577,17 @@ static LRESULT CALLBACK CtrlContactWndProc(HWND hwnd, UINT msg, WPARAM wParam, L **/ case WM_SETICON: { - HICON hIcon = Skin_GetIcon(ICO_BTN_ADD); + HICON hIcon = IcoLib_GetIcon(ICO_BTN_ADD); SendMessage(cbex->hBtnAdd, BM_SETIMAGE, IMAGE_ICON, (LPARAM)hIcon); SetWindowText(cbex->hBtnAdd, (hIcon ? _T("") : _T("+"))); - hIcon = Skin_GetIcon(ICO_BTN_DELETE); + hIcon = IcoLib_GetIcon(ICO_BTN_DELETE); SendMessage(cbex->hBtnDel, BM_SETIMAGE, IMAGE_ICON, (LPARAM)hIcon); SetWindowText(cbex->hBtnDel, (hIcon ? _T("") : _T("-"))); if (cbex->pItems && cbex->numItems > 0) { for (int i = 0; i < cbex->numItems; i++) - cbex->pItems[i].hIcon = Skin_GetIcon(cbex->pItems[i].pszIcon); + cbex->pItems[i].hIcon = IcoLib_GetIcon(cbex->pItems[i].pszIcon); if (cbex->iSelectedItem >= 0 && cbex->iSelectedItem < cbex->numItems) SendMessage(cbex->hBtnEdit, BM_SETIMAGE, IMAGE_ICON, (LPARAM)cbex->pItems[cbex->iSelectedItem].hIcon); @@ -786,7 +786,7 @@ static LRESULT CALLBACK CtrlContactWndProc(HWND hwnd, UINT msg, WPARAM wParam, L } mBox.cbSize = sizeof(MSGBOX); mBox.hParent = hDlgDetails; - mBox.hiLogo = Skin_GetIcon(ICO_DLG_PHONE); + mBox.hiLogo = IcoLib_GetIcon(ICO_DLG_PHONE); mBox.uType = MB_YESNO|MB_ICON_QUESTION|MB_NOPOPUP; mBox.ptszTitle = TranslateT("Delete"); mBox.ptszMsg = szMsg; @@ -955,7 +955,7 @@ static LRESULT CALLBACK CtrlContactWndProc(HWND hwnd, UINT msg, WPARAM wParam, L // set icon if ((pItem->wMask & CBEXIM_ICONTEXT) && pItem->pszIcon) { cbex->pItems[cbex->numItems].pszIcon = pItem->pszIcon; - cbex->pItems[cbex->numItems].hIcon = Skin_GetIcon(pItem->pszIcon); + cbex->pItems[cbex->numItems].hIcon = IcoLib_GetIcon(pItem->pszIcon); } // set flags cbex->pItems[cbex->numItems].wFlags = (pItem->wMask & CBEXIM_CAT) ? pItem->wFlags : 0; @@ -1000,7 +1000,7 @@ static LRESULT CALLBACK CtrlContactWndProc(HWND hwnd, UINT msg, WPARAM wParam, L // set icon if ((pItem->wMask & CBEXIM_ICONTEXT) && pItem->pszIcon) { cbex->pItems[pItem->iItem].pszIcon = pItem->pszIcon; - cbex->pItems[pItem->iItem].hIcon = Skin_GetIcon(pItem->pszIcon); + cbex->pItems[pItem->iItem].hIcon = IcoLib_GetIcon(pItem->pszIcon); if (pItem->iItem == cbex->iSelectedItem) SendMessage(cbex->hBtnEdit, BM_SETIMAGE, IMAGE_ICON, (LPARAM)cbex->pItems[pItem->iItem].hIcon); } diff --git a/plugins/UserInfoEx/src/dlg_anniversarylist.cpp b/plugins/UserInfoEx/src/dlg_anniversarylist.cpp index 9e433a4f30..2c698d806b 100644 --- a/plugins/UserInfoEx/src/dlg_anniversarylist.cpp +++ b/plugins/UserInfoEx/src/dlg_anniversarylist.cpp @@ -307,7 +307,7 @@ class CAnnivList break; // set icons - hIcon = Skin_GetIcon(ICO_DLG_ANNIVERSARY); + hIcon = IcoLib_GetIcon(ICO_DLG_ANNIVERSARY); SendDlgItemMessage(hDlg, IDC_HEADERBAR, WM_SETICON, 0, (LPARAM)hIcon); SendMessage(hDlg, WM_SETICON, ICON_BIG, (LPARAM)hIcon); @@ -962,7 +962,7 @@ void DlgAnniversaryListOnTopToolBarLoaded() TTBButton ttb = { sizeof(ttb) }; ttb.dwFlags = TTBBF_VISIBLE | TTBBF_SHOWTOOLTIP; ttb.pszService = MS_USERINFO_REMINDER_LIST; - ttb.hIconHandleUp = Skin_GetIconHandle(ICO_COMMON_ANNIVERSARY); + ttb.hIconHandleUp = IcoLib_GetIconHandle(ICO_COMMON_ANNIVERSARY); ttb.name = ttb.pszTooltipUp = LPGEN("Anniversary list"); TopToolbar_AddButton(&ttb); } diff --git a/plugins/UserInfoEx/src/dlg_msgbox.cpp b/plugins/UserInfoEx/src/dlg_msgbox.cpp index e401c411f9..aa3793c929 100644 --- a/plugins/UserInfoEx/src/dlg_msgbox.cpp +++ b/plugins/UserInfoEx/src/dlg_msgbox.cpp @@ -108,53 +108,53 @@ static void MakePopupAction(POPUPACTION &pa, int id) switch (id) { case IDOK: - pa.lchIcon = Skin_GetIcon(ICO_BTN_OK); + pa.lchIcon = IcoLib_GetIcon(ICO_BTN_OK); mir_strcpy(pa.lpzTitle, MODNAME"/Ok"); break; case IDCLOSE: case IDCANCEL: - pa.lchIcon = Skin_GetIcon(ICO_BTN_CANCEL); + pa.lchIcon = IcoLib_GetIcon(ICO_BTN_CANCEL); mir_strcpy(pa.lpzTitle, MODNAME"/Cancel"); break; case IDABORT: - pa.lchIcon = Skin_GetIcon(ICO_BTN_CANCEL); + pa.lchIcon = IcoLib_GetIcon(ICO_BTN_CANCEL); mir_strcpy(pa.lpzTitle, MODNAME"/Abort"); break; case IDRETRY: - pa.lchIcon = Skin_GetIcon(ICO_BTN_UPDATE); + pa.lchIcon = IcoLib_GetIcon(ICO_BTN_UPDATE); mir_strcpy(pa.lpzTitle, MODNAME"/Retry"); break; case IDIGNORE: - pa.lchIcon = Skin_GetIcon(ICO_BTN_OK); + pa.lchIcon = IcoLib_GetIcon(ICO_BTN_OK); mir_strcpy(pa.lpzTitle, MODNAME"/Ignore"); break; case IDYES: - pa.lchIcon = Skin_GetIcon(ICO_BTN_OK); + pa.lchIcon = IcoLib_GetIcon(ICO_BTN_OK); mir_strcpy(pa.lpzTitle, MODNAME"/Yes"); break; case IDNO: - pa.lchIcon = Skin_GetIcon(ICO_BTN_CANCEL); + pa.lchIcon = IcoLib_GetIcon(ICO_BTN_CANCEL); mir_strcpy(pa.lpzTitle, MODNAME"/No"); break; case IDHELP: - pa.lchIcon = Skin_GetIcon(ICO_BTN_CANCEL); + pa.lchIcon = IcoLib_GetIcon(ICO_BTN_CANCEL); mir_strcpy(pa.lpzTitle, MODNAME"/Help"); break; case IDALL: - pa.lchIcon = Skin_GetIcon(ICO_BTN_OK); + pa.lchIcon = IcoLib_GetIcon(ICO_BTN_OK); mir_strcpy(pa.lpzTitle, MODNAME"/All"); break; case IDNONE: - pa.lchIcon = Skin_GetIcon(ICO_BTN_CANCEL); + pa.lchIcon = IcoLib_GetIcon(ICO_BTN_CANCEL); mir_strcpy(pa.lpzTitle, MODNAME"/None"); } } @@ -199,7 +199,7 @@ static INT_PTR CALLBACK MsgBoxProc(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM l // set infobar's logo icon SendDlgItemMessage(hDlg, ICO_DLGLOGO, STM_SETIMAGE, IMAGE_ICON, - (pMsgBox->hiLogo ? (LPARAM)pMsgBox->hiLogo : (LPARAM)Skin_GetIcon(ICO_DLG_DETAILS,TRUE))); + (pMsgBox->hiLogo ? (LPARAM)pMsgBox->hiLogo : (LPARAM)IcoLib_GetIcon(ICO_DLG_DETAILS,TRUE))); // enable headerbar ShowWindow(GetDlgItem(hDlg, TXT_NAME), SW_SHOW); @@ -671,7 +671,7 @@ INT_PTR CALLBACK MsgBox(HWND hParent, UINT uType, LPCTSTR pszTitle, LPCTSTR pszI MSGBOX mb = { 0 }; mb.cbSize = sizeof(MSGBOX); mb.hParent = hParent; - mb.hiLogo = Skin_GetIcon(ICO_COMMON_MAIN); + mb.hiLogo = IcoLib_GetIcon(ICO_COMMON_MAIN); mb.hiMsg = NULL; mb.ptszTitle = TranslateTS(pszTitle); mb.ptszInfoText = TranslateTS(pszInfo); @@ -698,7 +698,7 @@ INT_PTR CALLBACK MsgErr(HWND hParent, LPCTSTR pszFormat, ...) MSGBOX mb = {0}; mb.cbSize = sizeof(MSGBOX); mb.hParent = hParent; - mb.hiLogo = Skin_GetIcon(ICO_COMMON_MAIN); + mb.hiLogo = IcoLib_GetIcon(ICO_COMMON_MAIN); mb.hiMsg = NULL; mb.ptszTitle = tszTitle; mb.ptszMsg = tszMsg; diff --git a/plugins/UserInfoEx/src/dlg_propsheet.cpp b/plugins/UserInfoEx/src/dlg_propsheet.cpp index 16174e982b..cda3ae98e7 100644 --- a/plugins/UserInfoEx/src/dlg_propsheet.cpp +++ b/plugins/UserInfoEx/src/dlg_propsheet.cpp @@ -273,7 +273,7 @@ static INT_PTR ShowDialog(WPARAM wParam, LPARAM lParam) return 1; } - HICON hDefIcon = Skin_GetIcon(ICO_TREE_DEFAULT); + HICON hDefIcon = IcoLib_GetIcon(ICO_TREE_DEFAULT); if (!hDefIcon) hDefIcon = (HICON)LoadImage(ghInst, MAKEINTRESOURCE(IDI_DEFAULT), IMAGE_ICON, metrics.x, metrics.y, 0); @@ -551,7 +551,7 @@ void DlgContactInfoInitTreeIcons() metrics.x = GetSystemMetrics(SM_CXSMICON); metrics.y = GetSystemMetrics(SM_CYSMICON); if (psh._hImages = ImageList_Create(metrics.x, metrics.y, ILC_COLOR32 | ILC_MASK, 0, 1)) { - HICON hDefIcon = Skin_GetIcon(ICO_TREE_DEFAULT); + HICON hDefIcon = IcoLib_GetIcon(ICO_TREE_DEFAULT); if (!hDefIcon) hDefIcon = (HICON)LoadImage(ghInst, MAKEINTRESOURCE(IDI_DEFAULT), IMAGE_ICON, metrics.x, metrics.y, 0); @@ -715,8 +715,8 @@ static INT_PTR CALLBACK DlgProc(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lPar ShowWindow(GetDlgItem(hDlg, IDC_PAGETITLEBG2), !IsAeroMode()); // set icons - SendMessage(hDlg, WM_SETICON, ICON_SMALL, (LPARAM)Skin_GetIcon(ICO_COMMON_MAIN)); - SendMessage(hDlg, WM_SETICON, ICON_BIG, (LPARAM)Skin_GetIcon(ICO_COMMON_MAIN, 32)); + SendMessage(hDlg, WM_SETICON, ICON_SMALL, (LPARAM)IcoLib_GetIcon(ICO_COMMON_MAIN)); + SendMessage(hDlg, WM_SETICON, ICON_BIG, (LPARAM)IcoLib_GetIcon(ICO_COMMON_MAIN, 32)); DlgProc(hDlg, HM_RELOADICONS, NULL, NULL); // load basic protocol for current contact (for faster load later on and better handling for owner protocol) @@ -1144,12 +1144,12 @@ static INT_PTR CALLBACK DlgProc(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lPar IcoLib_SetCtrlIcons(hDlg, idIcon, numIconsToSet); if (hCtrl = GetDlgItem(hDlg, BTN_IMPORT)) { - hIcon = Skin_GetIcon(ICO_BTN_IMPORT); + hIcon = IcoLib_GetIcon(ICO_BTN_IMPORT); SendMessage(hCtrl, BM_SETIMAGE, IMAGE_ICON, (LPARAM)hIcon); SetWindowText(hCtrl, hIcon ? _T("") : _T("I")); } if (hCtrl = GetDlgItem(hDlg, BTN_EXPORT)) { - hIcon = Skin_GetIcon(ICO_BTN_EXPORT); + hIcon = IcoLib_GetIcon(ICO_BTN_EXPORT); SendMessage(hCtrl, BM_SETIMAGE, IMAGE_ICON, (LPARAM)hIcon); SetWindowText(hCtrl, hIcon ? _T("") : _T("E")); } diff --git a/plugins/UserInfoEx/src/ex_import/dlg_ExImModules.cpp b/plugins/UserInfoEx/src/ex_import/dlg_ExImModules.cpp index a2617a0db1..682110ae8a 100644 --- a/plugins/UserInfoEx/src/ex_import/dlg_ExImModules.cpp +++ b/plugins/UserInfoEx/src/ex_import/dlg_ExImModules.cpp @@ -187,8 +187,8 @@ INT_PTR CALLBACK SelectModulesToExport_DlgProc(HWND hDlg, UINT uMsg, WPARAM wPar SendMessage(hTree, TVM_SETIMAGELIST, TVSIL_NORMAL, (LPARAM)hImages); bImagesLoaded - = ((((hIcon = Skin_GetIcon(ICO_LST_MODULES)) != NULL) && 0 == ImageList_AddIcon(hImages, hIcon)) - && (((hIcon = Skin_GetIcon(ICO_LST_FOLDER)) != NULL) && 1 == ImageList_AddIcon(hImages, hIcon))); + = ((((hIcon = IcoLib_GetIcon(ICO_LST_MODULES)) != NULL) && 0 == ImageList_AddIcon(hImages, hIcon)) + && (((hIcon = IcoLib_GetIcon(ICO_LST_FOLDER)) != NULL) && 1 == ImageList_AddIcon(hImages, hIcon))); } } // do the translation stuff diff --git a/plugins/UserInfoEx/src/mir_icolib.cpp b/plugins/UserInfoEx/src/mir_icolib.cpp index 2154abdc46..ecdaafe2d1 100644 --- a/plugins/UserInfoEx/src/mir_icolib.cpp +++ b/plugins/UserInfoEx/src/mir_icolib.cpp @@ -186,7 +186,7 @@ static void IcoLib_CheckIconPackVersion(LPTSTR szIconPack) void IcoLib_SetCtrlIcons(HWND hDlg, const ICONCTRL *pCtrl, BYTE numCtrls) { for (int i = 0; i < numCtrls; i++) { - HICON hIcon = Skin_GetIcon(pCtrl[i].pszIcon); + HICON hIcon = IcoLib_GetIcon(pCtrl[i].pszIcon); if (pCtrl[i].idCtrl) { HWND hCtrl = GetDlgItem(hDlg, pCtrl[i].idCtrl); switch (pCtrl[i].Message) { @@ -259,7 +259,7 @@ static HANDLE IcoLib_RegisterIconHandleEx(LPSTR szIconID, LPSTR szDescription, L sid.hDefaultIcon = hDefIcon; sid.iDefaultIndex = -1; } - hIconHandle = Skin_AddIcon(&sid); + hIconHandle = IcoLib_AddIcon(&sid); } MIR_FREE(sid.description.t); MIR_FREE(sid.section.t); @@ -304,7 +304,7 @@ HANDLE IcoLib_RegisterIconHandle(LPSTR szIconID, LPSTR szDescription, LPSTR szSe **/ HICON IcoLib_RegisterIcon(LPSTR szIconID, LPSTR szDescription, LPSTR szSection, int idIcon, int Size) { - return Skin_GetIconByHandle(IcoLib_RegisterIconHandle(szIconID, szDescription, szSection, idIcon, Size)); + return IcoLib_GetIconByHandle(IcoLib_RegisterIconHandle(szIconID, szDescription, szSection, idIcon, Size)); } /** diff --git a/plugins/UserInfoEx/src/mir_menuitems.cpp b/plugins/UserInfoEx/src/mir_menuitems.cpp index 1a60f3a48d..08b486726b 100644 --- a/plugins/UserInfoEx/src/mir_menuitems.cpp +++ b/plugins/UserInfoEx/src/mir_menuitems.cpp @@ -99,7 +99,7 @@ void RebuildContact() //cascade all mi.position = 1000050000; mi.popupPosition = 1000050000; - mi.hIcon = Skin_GetIcon(ICO_COMMON_MAIN); + mi.hIcon = IcoLib_GetIcon(ICO_COMMON_MAIN); mi.pszName = MODULELONGNAME; mhRoot = Menu_AddContactMenuItem(&mi); hMenuItem[item++] = mhRoot; @@ -109,7 +109,7 @@ void RebuildContact() //cascade Ex/Import mi.position = 1000050100; mi.popupPosition = 1000050100; - mi.hIcon = Skin_GetIcon(ICO_BTN_EXIMPORT); + mi.hIcon = IcoLib_GetIcon(ICO_BTN_EXIMPORT); mi.pszName = LPGEN("Export/import contact"); mhExIm = Menu_AddContactMenuItem(&mi); hMenuItem[item++] = mhExIm; @@ -127,7 +127,7 @@ void RebuildContact() mi.pszService = MS_USERINFO_SHOWDIALOG; mi.pszName = LPGEN("User &details"); mi.position = 1000050000; - mi.hIcon = Skin_GetIcon(ICO_COMMON_MAIN); + mi.hIcon = IcoLib_GetIcon(ICO_COMMON_MAIN); mi.hotKey = MAKELPARAM(VK_F3, MOD_ALT); hMenuItem[item++] = Menu_AddContactMenuItem(&mi); mi.hotKey = NULL; @@ -141,14 +141,14 @@ void RebuildContact() mi.pszService = MS_USERINFO_VCARD_EXPORT; mi.pszName = mhExIm != HGENMENU_ROOT ? LPGEN("&Export") : LPGEN("&Export user details"); mi.position = 1000050200; - mi.hIcon = Skin_GetIcon(ICO_BTN_EXPORT); + mi.hIcon = IcoLib_GetIcon(ICO_BTN_EXPORT); hMenuItem[item++] = Menu_AddContactMenuItem(&mi); // Import mi.pszService = MS_USERINFO_VCARD_IMPORT; mi.pszName = mhExIm != HGENMENU_ROOT ? LPGEN("&Import") : LPGEN("&Import user details"); mi.position = 1000050300; - mi.hIcon = Skin_GetIcon(ICO_BTN_IMPORT); + mi.hIcon = IcoLib_GetIcon(ICO_BTN_IMPORT); hMenuItem[item++] = Menu_AddContactMenuItem(&mi); } } @@ -196,7 +196,7 @@ void RebuildMain() //cascade all mi.position = 500050000; mi.popupPosition = 500050000; - mi.hIcon = Skin_GetIcon(ICO_COMMON_MAIN); + mi.hIcon = IcoLib_GetIcon(ICO_COMMON_MAIN); mi.pszName = MODULELONGNAME; mhRoot = Menu_AddMainMenuItem(&mi); hMenuItem[item++] = mhRoot; @@ -206,7 +206,7 @@ void RebuildMain() //cascade Ex/Import mi.position = 500050000; mi.popupPosition = 500050000; - mi.hIcon = Skin_GetIcon(ICO_BTN_EXIMPORT); + mi.hIcon = IcoLib_GetIcon(ICO_BTN_EXIMPORT); mi.pszName = LPGEN("Export/import contact"); mhExIm = Menu_AddMainMenuItem(&mi); hMenuItem[item++] = mhExIm; @@ -224,7 +224,7 @@ void RebuildMain() mi.pszService = MS_USERINFO_SHOWDIALOG; mi.pszName = LPGEN("View/change my &details..."); mi.position = 500050000; - mi.hIcon = Skin_GetIcon(ICO_COMMON_MAIN); + mi.hIcon = IcoLib_GetIcon(ICO_COMMON_MAIN); hMenuItem[item++] = Menu_AddMainMenuItem(&mi); } @@ -235,14 +235,14 @@ void RebuildMain() mi.pszService = MS_USERINFO_VCARD_EXPORTALL; mi.pszName = LPGEN("Export all contacts"); mi.position = 500150000; - mi.hIcon = Skin_GetIcon(ICO_BTN_EXPORT); + mi.hIcon = IcoLib_GetIcon(ICO_BTN_EXPORT); hMenuItem[item++] = Menu_AddMainMenuItem(&mi); // Import mi.pszService = MS_USERINFO_VCARD_IMPORTALL; mi.pszName = LPGEN("Import all contacts"); mi.position = 500151000; - mi.hIcon = Skin_GetIcon(ICO_BTN_IMPORT); + mi.hIcon = IcoLib_GetIcon(ICO_BTN_IMPORT); hMenuItem[item++] = Menu_AddMainMenuItem(&mi); } @@ -258,13 +258,13 @@ void RebuildMain() mi.pszService = MS_USERINFO_REMINDER_AGGRASIVEBACKUP; mi.pszName = LPGEN("Backup birthdays"); mi.position = 500253000; - mi.hIcon = Skin_GetIcon(ICO_BTN_BDAY_BACKUP); + mi.hIcon = IcoLib_GetIcon(ICO_BTN_BDAY_BACKUP); hMenuItem[item++] = Menu_AddMainMenuItem(&mi); // Check anniversaries mi.pszService = MS_USERINFO_REMINDER_CHECK; mi.pszName = LPGEN("Check anniversaries"); mi.position = 500251000; - mi.hIcon = Skin_GetIcon(ICO_BTN_SEARCH); + mi.hIcon = IcoLib_GetIcon(ICO_BTN_SEARCH); hMenuItem[item++] = Menu_AddMainMenuItem(&mi); } else { @@ -275,7 +275,7 @@ void RebuildMain() mi.pszService = MS_USERINFO_REFRESH; mi.pszName = LPGEN("Refresh contact details"); mi.position = 500254000; - mi.hIcon = Skin_GetIcon(ICO_BTN_UPDATE); + mi.hIcon = IcoLib_GetIcon(ICO_BTN_UPDATE); hMenuItem[item++] = Menu_AddMainMenuItem(&mi); } @@ -284,7 +284,7 @@ void RebuildMain() mi.pszService = MS_USERINFO_REMINDER_LIST; mi.pszName = LPGEN("Anniversary list"); mi.position = 500252000; - mi.hIcon = Skin_GetIcon(ICO_COMMON_ANNIVERSARY); + mi.hIcon = IcoLib_GetIcon(ICO_COMMON_ANNIVERSARY); hMenuItem[item++] = Menu_AddMainMenuItem(&mi); } } @@ -341,7 +341,7 @@ void RebuildGroup() //cascade all mi.position = 250000; mi.popupPosition = 250000; - mi.hIcon = Skin_GetIcon(ICO_COMMON_MAIN); + mi.hIcon = IcoLib_GetIcon(ICO_COMMON_MAIN); mi.pszName = MODULELONGNAME; mhRoot = Menu_AddGroupMenuItem(0, &mi); hMenuItem[item++] = mhRoot; @@ -351,7 +351,7 @@ void RebuildGroup() //cascade Ex/Import mi.position = 250100; mi.popupPosition = 250100; - mi.hIcon = Skin_GetIcon(ICO_BTN_EXIMPORT); + mi.hIcon = IcoLib_GetIcon(ICO_BTN_EXIMPORT); mi.pszName = LPGEN("Export/import contact"); mhExIm = Menu_AddGroupMenuItem(0, &mi); hMenuItem[item++] = mhExIm; @@ -370,14 +370,14 @@ void RebuildGroup() mi.pszService = MS_USERINFO_VCARD_EXPORTALL; mi.pszName = LPGEN("Export all contacts"); mi.position = 250200; - mi.hIcon = Skin_GetIcon(ICO_BTN_EXPORT); + mi.hIcon = IcoLib_GetIcon(ICO_BTN_EXPORT); hMenuItem[item++] = Menu_AddGroupMenuItem(0, &mi); // Import mi.pszService = MS_USERINFO_VCARD_IMPORTALL; mi.pszName = LPGEN("Import all contacts"); mi.position = 250300; - mi.hIcon = Skin_GetIcon(ICO_BTN_IMPORT); + mi.hIcon = IcoLib_GetIcon(ICO_BTN_IMPORT); hMenuItem[item++] = Menu_AddGroupMenuItem(0, &mi); } } @@ -438,7 +438,7 @@ void RebuildSubGroup() //cascade all mi.position = 1050000; mi.popupPosition = 1050000; - mi.hIcon = Skin_GetIcon(ICO_COMMON_MAIN); + mi.hIcon = IcoLib_GetIcon(ICO_COMMON_MAIN); mi.pszName = MODULELONGNAME; mhRoot = Menu_AddSubGroupMenuItem(0, &mi); hMenuItem[item++] = mhRoot; @@ -448,7 +448,7 @@ void RebuildSubGroup() //cascade Ex/Import mi.position = 1050100; mi.popupPosition = 1050100; - mi.hIcon = Skin_GetIcon(ICO_BTN_EXIMPORT); + mi.hIcon = IcoLib_GetIcon(ICO_BTN_EXIMPORT); mi.pszName = LPGEN("Export/import group"); mhExIm = Menu_AddSubGroupMenuItem(0, &mi); hMenuItem[item++] = mhExIm; @@ -468,7 +468,7 @@ void RebuildSubGroup() if (!ServiceExists(mi.pszService)) CreateServiceFunction(mi.pszService, svcExIm_Group_Service); mi.pszName = mhExIm != HGENMENU_ROOT ? LPGEN("&Export") : LPGEN("&Export group"); mi.position = 1050200; - mi.hIcon = Skin_GetIcon(ICO_BTN_EXPORT); + mi.hIcon = IcoLib_GetIcon(ICO_BTN_EXPORT); gmp.lParam=0; gmp.wParam=TRUE; hMenuItem[item++] = Menu_AddSubGroupMenuItem(&gmp, &mi); @@ -478,7 +478,7 @@ void RebuildSubGroup() if (!ServiceExists(mi.pszService)) CreateServiceFunction(mi.pszService, svcExIm_Group_Service); mi.pszName = mhExIm != HGENMENU_ROOT ? LPGEN("&Import") : LPGEN("&Import group"); mi.position = 1050300; - mi.hIcon = Skin_GetIcon(ICO_BTN_IMPORT); + mi.hIcon = IcoLib_GetIcon(ICO_BTN_IMPORT); gmp.lParam=0; gmp.wParam=FALSE; hMenuItem[item++] = Menu_AddSubGroupMenuItem(&gmp, &mi); @@ -568,7 +568,7 @@ INT_PTR RebuildAccount(WPARAM wParam, LPARAM lParam) case 5: //cascade all mi.position = 50100; - mi.hIcon = Skin_GetIcon(ICO_COMMON_MAIN); + mi.hIcon = IcoLib_GetIcon(ICO_COMMON_MAIN); mi.pszName = MODULELONGNAME; hMenuItemAccount[mItems*i + item] = Menu_AddStatusMenuItem(&mi); mhRoot = hMenuItemAccount[mItems*i + item++]; @@ -577,7 +577,7 @@ INT_PTR RebuildAccount(WPARAM wParam, LPARAM lParam) case 9: //cascade Ex/Import mi.position = 50100; - mi.hIcon = Skin_GetIcon(ICO_BTN_EXIMPORT); + mi.hIcon = IcoLib_GetIcon(ICO_BTN_EXIMPORT); mi.pszName = LPGEN("Export/import"); hMenuItemAccount[mItems*i + item] = Menu_AddStatusMenuItem(&mi); mhRoot = hMenuItemAccount[mItems*i + item++]; @@ -597,7 +597,7 @@ INT_PTR RebuildAccount(WPARAM wParam, LPARAM lParam) if (!ServiceExists(mi.pszService)) CreateServiceFunction(mi.pszService, svcExIm_Account_Service); mi.pszName = LPGEN("&Export xml"); mi.position = 50200; - mi.hIcon = Skin_GetIcon(ICO_BTN_EXPORT); + mi.hIcon = IcoLib_GetIcon(ICO_BTN_EXPORT); hMenuItemAccount[mItems*i + item++] = Menu_AddStatusMenuItem(&mi); // Import @@ -605,7 +605,7 @@ INT_PTR RebuildAccount(WPARAM wParam, LPARAM lParam) if (!ServiceExists(mi.pszService)) CreateServiceFunction(mi.pszService, svcExIm_Account_Service); mi.pszName = LPGEN("&Import xml"); mi.position = 50300; - mi.hIcon = Skin_GetIcon(ICO_BTN_IMPORT); + mi.hIcon = IcoLib_GetIcon(ICO_BTN_IMPORT); hMenuItemAccount[mItems*i + item++] = Menu_AddStatusMenuItem(&mi); } } diff --git a/plugins/UserInfoEx/src/psp_anniversary.cpp b/plugins/UserInfoEx/src/psp_anniversary.cpp index 44fa7e62e3..b4b90ae57b 100644 --- a/plugins/UserInfoEx/src/psp_anniversary.cpp +++ b/plugins/UserInfoEx/src/psp_anniversary.cpp @@ -45,10 +45,10 @@ static INT_PTR CALLBACK DlgProc_AnniversaryEditor(HWND hDlg, UINT uMsg, WPARAM w // set icons if (db_get_b(NULL, MODNAME, SET_ICONS_BUTTONS, 1)) { - SendDlgItemMessage(hDlg, IDOK, BM_SETIMAGE, IMAGE_ICON, (LPARAM)Skin_GetIcon(ICO_BTN_OK)); - SendDlgItemMessage(hDlg, IDCANCEL, BM_SETIMAGE, IMAGE_ICON, (LPARAM)Skin_GetIcon(ICO_BTN_CANCEL)); + SendDlgItemMessage(hDlg, IDOK, BM_SETIMAGE, IMAGE_ICON, (LPARAM)IcoLib_GetIcon(ICO_BTN_OK)); + SendDlgItemMessage(hDlg, IDCANCEL, BM_SETIMAGE, IMAGE_ICON, (LPARAM)IcoLib_GetIcon(ICO_BTN_CANCEL)); } - SendDlgItemMessage(hDlg, IDC_HEADERBAR, WM_SETICON, 0, (LPARAM)Skin_GetIcon(ICO_DLG_ANNIVERSARY, TRUE)); + SendDlgItemMessage(hDlg, IDC_HEADERBAR, WM_SETICON, 0, (LPARAM)IcoLib_GetIcon(ICO_DLG_ANNIVERSARY, TRUE)); // translate controls SendDlgItemMessage(hDlg, IDOK, BUTTONTRANSLATE, NULL, NULL); diff --git a/plugins/UserInfoEx/src/psp_base.cpp b/plugins/UserInfoEx/src/psp_base.cpp index 6ea57ed3b6..eda25cd133 100644 --- a/plugins/UserInfoEx/src/psp_base.cpp +++ b/plugins/UserInfoEx/src/psp_base.cpp @@ -26,7 +26,7 @@ void UpDate_CountryIcon(HWND hCtrl, int countryID) HICON hIcon = LoadFlagIcon(countryID); HICON hOld = Static_SetIcon(hCtrl, hIcon); ShowWindow(hCtrl, hIcon ? SW_SHOW : SW_HIDE); - Skin_ReleaseIcon(hOld); + IcoLib_ReleaseIcon(hOld); } // Default dialog procedure, which handles common functions diff --git a/plugins/UserInfoEx/src/psp_contact.cpp b/plugins/UserInfoEx/src/psp_contact.cpp index 265a8ce014..089f4239c8 100644 --- a/plugins/UserInfoEx/src/psp_contact.cpp +++ b/plugins/UserInfoEx/src/psp_contact.cpp @@ -125,11 +125,11 @@ INT_PTR CALLBACK PSPProcContactHome(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM case PSN_ICONCHANGED: { - HICON hIcon = Skin_GetIcon(ICO_BTN_GOTO); + HICON hIcon = IcoLib_GetIcon(ICO_BTN_GOTO); SendDlgItemMessage(hDlg, BTN_GOTO, BM_SETIMAGE, IMAGE_ICON, (LPARAM)hIcon); SetDlgItemText(hDlg, BTN_GOTO, hIcon ? _T("") : _T("->")); - hIcon = Skin_GetIcon(ICO_COMMON_ADDRESS); + hIcon = IcoLib_GetIcon(ICO_COMMON_ADDRESS); SendDlgItemMessage(hDlg, ICO_ADDRESS, STM_SETIMAGE, IMAGE_ICON, (LPARAM)hIcon); ShowWindow(GetDlgItem(hDlg, ICO_ADDRESS), hIcon ? SW_SHOW : SW_HIDE); @@ -270,11 +270,11 @@ INT_PTR CALLBACK PSPProcContactWork(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM case PSN_ICONCHANGED: { - HICON hIcon = Skin_GetIcon(ICO_BTN_GOTO); + HICON hIcon = IcoLib_GetIcon(ICO_BTN_GOTO); SendDlgItemMessage(hDlg, BTN_GOTO, BM_SETIMAGE, IMAGE_ICON, (LPARAM)hIcon); SetDlgItemText(hDlg, BTN_GOTO, hIcon ? _T("") : _T("->")); - hIcon = Skin_GetIcon(ICO_COMMON_ADDRESS); + hIcon = IcoLib_GetIcon(ICO_COMMON_ADDRESS); SendDlgItemMessage(hDlg, ICO_ADDRESS, STM_SETIMAGE, IMAGE_ICON, (LPARAM)hIcon); ShowWindow(GetDlgItem(hDlg, ICO_ADDRESS), hIcon ? SW_SHOW : SW_HIDE); diff --git a/plugins/UserInfoEx/src/psp_options.cpp b/plugins/UserInfoEx/src/psp_options.cpp index 7f490cfae8..2d0b2c20c0 100644 --- a/plugins/UserInfoEx/src/psp_options.cpp +++ b/plugins/UserInfoEx/src/psp_options.cpp @@ -596,7 +596,7 @@ static INT_PTR CALLBACK DlgProc_ReminderOpts(HWND hDlg, UINT uMsg, WPARAM wParam TranslateDialogDefault(hDlg); ShowWindow(GetDlgItem(hDlg, CHECK_REMIND_SECURED), myGlobals.UseDbxTree ? SW_HIDE : SW_SHOW); - SendDlgItemMessage(hDlg, ICO_BIRTHDAY, STM_SETIMAGE, IMAGE_ICON, (LPARAM)Skin_GetIcon(ICO_DLG_ANNIVERSARY, TRUE)); + SendDlgItemMessage(hDlg, ICO_BIRTHDAY, STM_SETIMAGE, IMAGE_ICON, (LPARAM)IcoLib_GetIcon(ICO_DLG_ANNIVERSARY, TRUE)); // set colours SendDlgItemMessage(hDlg, EDIT_REMIND, EM_LIMITTEXT, 2, 0); @@ -897,7 +897,7 @@ static INT_PTR CALLBACK DlgProc_Popups(HWND hDlg, UINT uMsg, WPARAM wParam, LPAR // Birthday mir_tstrncpy(ppd.lptzContactName, TranslateT("Birthday"), SIZEOF(ppd.lptzContactName)); - ppd.lchIcon = Skin_GetIcon(ICO_RMD_DTB0); + ppd.lchIcon = IcoLib_GetIcon(ICO_RMD_DTB0); if (IsDlgButtonChecked(hDlg, CHECK_OPT_POPUP_WINCLR)) { ppd.colorBack = GetSysColor(COLOR_BTNFACE); ppd.colorText = GetSysColor(COLOR_WINDOWTEXT); @@ -910,7 +910,7 @@ static INT_PTR CALLBACK DlgProc_Popups(HWND hDlg, UINT uMsg, WPARAM wParam, LPAR // Anniversary mir_tstrncpy(ppd.lptzContactName, TranslateT("Anniversary"), SIZEOF(ppd.lptzContactName)); - ppd.lchIcon = Skin_GetIcon(ICO_RMD_DTAX); + ppd.lchIcon = IcoLib_GetIcon(ICO_RMD_DTAX); if (IsDlgButtonChecked(hDlg, CHECK_OPT_POPUP_WINCLR)) { ppd.colorBack = GetSysColor(COLOR_BTNFACE); ppd.colorText = GetSysColor(COLOR_WINDOWTEXT); diff --git a/plugins/UserInfoEx/src/svc_email.cpp b/plugins/UserInfoEx/src/svc_email.cpp index bcc90fa7b2..351e36c9f2 100644 --- a/plugins/UserInfoEx/src/svc_email.cpp +++ b/plugins/UserInfoEx/src/svc_email.cpp @@ -185,7 +185,7 @@ void SvcEMailRebuildMenu() // insert contact menuitem CLISTMENUITEM mi = { sizeof(mi) }; mi.position = -2000010000; - mi.hIcon = Skin_GetIcon(ICO_BTN_EMAIL); + mi.hIcon = IcoLib_GetIcon(ICO_BTN_EMAIL); mi.pszName = "&E-mail"; mi.pszService = MS_EMAIL_SENDEMAIL; ghMenuItem = Menu_AddContactMenuItem(&mi); diff --git a/plugins/UserInfoEx/src/svc_homepage.cpp b/plugins/UserInfoEx/src/svc_homepage.cpp index 1d3d9205dc..33b847f650 100644 --- a/plugins/UserInfoEx/src/svc_homepage.cpp +++ b/plugins/UserInfoEx/src/svc_homepage.cpp @@ -155,7 +155,7 @@ void SvcHomepageRebuildMenu() // insert contact menuitem CLISTMENUITEM mi = { sizeof(mi) }; mi.position = -2000010000; - mi.hIcon = Skin_GetIcon(ICO_BTN_GOTO); + mi.hIcon = IcoLib_GetIcon(ICO_BTN_GOTO); mi.pszName = LPGEN("&Homepage"); mi.pszService = MS_USERINFO_HOMEPAGE_OPENURL; ghMenuItem = Menu_AddContactMenuItem(&mi); diff --git a/plugins/UserInfoEx/src/svc_refreshci.cpp b/plugins/UserInfoEx/src/svc_refreshci.cpp index 1c8e27499f..ddf2672909 100644 --- a/plugins/UserInfoEx/src/svc_refreshci.cpp +++ b/plugins/UserInfoEx/src/svc_refreshci.cpp @@ -401,7 +401,7 @@ public: _popupButtons[0].cbSize = sizeof(POPUPACTION); _popupButtons[0].flags = PAF_ENABLED; - _popupButtons[0].lchIcon = Skin_GetIcon(ICO_BTN_DOWNARROW); + _popupButtons[0].lchIcon = IcoLib_GetIcon(ICO_BTN_DOWNARROW); _popupButtons[0].wParam = MAKEWORD(IDSKIP, BN_CLICKED); _popupButtons[0].lParam = NULL; mir_strcpy(_popupButtons[0].lpzTitle, MODNAME"/Hide"); @@ -409,7 +409,7 @@ public: // cancel button _popupButtons[1].cbSize = sizeof(POPUPACTION); _popupButtons[1].flags = PAF_ENABLED; - _popupButtons[1].lchIcon = Skin_GetIcon(ICO_BTN_CANCEL); + _popupButtons[1].lchIcon = IcoLib_GetIcon(ICO_BTN_CANCEL); _popupButtons[1].wParam = MAKEWORD(IDCANCEL, BN_CLICKED); _popupButtons[1].lParam = NULL; mir_strcpy(_popupButtons[1].lpzTitle, MODNAME"/Cancel"); @@ -423,7 +423,7 @@ public: { POPUPDATAT_V2 pd = { 0 }; pd.cbSize = sizeof(pd); - pd.lchIcon = Skin_GetIcon(ICO_BTN_UPDATE); + pd.lchIcon = IcoLib_GetIcon(ICO_BTN_UPDATE); pd.iSeconds = -1; pd.PluginData = this; pd.PluginWindowProc = CPopupUpdProgress::WndProc; @@ -613,7 +613,7 @@ class CContactUpdater : public CContactQueue CLISTMENUITEM clmi = { sizeof(clmi) }; clmi.flags = CMIM_NAME|CMIM_ICON; clmi.pszName = LPGEN("Refresh contact details"); - clmi.hIcon = Skin_GetIcon(ICO_BTN_UPDATE); + clmi.hIcon = IcoLib_GetIcon(ICO_BTN_UPDATE); Menu_ModifyItem(hMenuItemRefresh, &clmi); } } @@ -730,7 +730,7 @@ public: CLISTMENUITEM clmi = { sizeof(clmi) }; clmi.flags = CMIM_NAME|CMIM_ICON; clmi.pszName = LPGEN("Abort Refreshing Contact Details"); - clmi.hIcon = Skin_GetIcon(ICO_BTN_CANCEL); + clmi.hIcon = IcoLib_GetIcon(ICO_BTN_CANCEL); Menu_ModifyItem(hMenuItemRefresh, &clmi); } } diff --git a/plugins/UserInfoEx/src/svc_reminder.cpp b/plugins/UserInfoEx/src/svc_reminder.cpp index 4c0f839e5a..62b097bf4e 100644 --- a/plugins/UserInfoEx/src/svc_reminder.cpp +++ b/plugins/UserInfoEx/src/svc_reminder.cpp @@ -146,19 +146,19 @@ static HICON GetAnnivIcon(const CEvent &evt) switch (evt._eType) { case CEvent::BIRTHDAY: if (evt._wDaysLeft > 9) - hIcon = Skin_GetIcon(ICO_RMD_DTBX); + hIcon = IcoLib_GetIcon(ICO_RMD_DTBX); else { mir_snprintf(szIcon, SIZEOF(szIcon), MODNAME"_rmd_dtb%u", evt._wDaysLeft); - hIcon = Skin_GetIcon(szIcon); + hIcon = IcoLib_GetIcon(szIcon); } break; case CEvent::ANNIVERSARY: if (evt._wDaysLeft > 9) - hIcon = Skin_GetIcon(ICO_RMD_DTAX); + hIcon = IcoLib_GetIcon(ICO_RMD_DTAX); else { mir_snprintf(szIcon, SIZEOF(szIcon), MODNAME"_rmd_dta%u", evt._wDaysLeft); - hIcon = Skin_GetIcon(szIcon); + hIcon = IcoLib_GetIcon(szIcon); } } return hIcon; @@ -319,12 +319,12 @@ static void NotifyFlashCListIcon(MCONTACT hContact, const CEvent &evt) switch (evt._eType) { case CEvent::BIRTHDAY: mir_sntprintf(szMsg, SIZEOF(szMsg), TranslateT("%s has %s today."), DB::Contact::DisplayName(hContact), TranslateT("Birthday")); - cle.hIcon = Skin_GetIcon(ICO_COMMON_BIRTHDAY); + cle.hIcon = IcoLib_GetIcon(ICO_COMMON_BIRTHDAY); break; case CEvent::ANNIVERSARY: mir_sntprintf(szMsg, SIZEOF(szMsg), TranslateT("%s has %s today."), DB::Contact::DisplayName(hContact), TranslateT("an anniversary")); - cle.hIcon = Skin_GetIcon(ICO_COMMON_ANNIVERSARY); + cle.hIcon = IcoLib_GetIcon(ICO_COMMON_ANNIVERSARY); break; default: @@ -684,7 +684,7 @@ void SvcReminderOnTopToolBarLoaded() ttb.dwFlags = TTBBF_VISIBLE | TTBBF_SHOWTOOLTIP; ttb.pszService = MS_USERINFO_REMINDER_CHECK; ttb.name = ttb.pszTooltipUp = LPGEN("Check anniversaries"); - ttb.hIconHandleUp = Skin_GetIconHandle(ICO_COMMON_BIRTHDAY); + ttb.hIconHandleUp = IcoLib_GetIconHandle(ICO_COMMON_BIRTHDAY); TopToolbar_AddButton(&ttb); } @@ -738,7 +738,7 @@ static INT_PTR BackupBirthdayService(WPARAM hContact, LPARAM lParam) MSGBOX mBox; mBox.cbSize = sizeof(MSGBOX); mBox.hParent = NULL; - mBox.hiLogo = Skin_GetIcon(ICO_COMMON_BIRTHDAY); + mBox.hiLogo = IcoLib_GetIcon(ICO_COMMON_BIRTHDAY); mBox.uType = MB_ICON_INFO; mBox.ptszTitle = TranslateT("Update custom birthday"); mBox.ptszMsg = TranslateT("Backing up and syncing all birthdays complete!"); -- cgit v1.2.3