From c4582dd65b444e5dae29ada7cc3f6c9a9c20edf3 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Sun, 2 Dec 2012 18:19:49 +0000 Subject: new easy standard way of registering icons: Icon_Register git-svn-id: http://svn.miranda-ng.org/main/trunk@2601 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- plugins/Dbx_mmap_SA/src/dialogs.cpp | 25 ++++++++----------------- 1 file changed, 8 insertions(+), 17 deletions(-) (limited to 'plugins/Dbx_mmap_SA/src') diff --git a/plugins/Dbx_mmap_SA/src/dialogs.cpp b/plugins/Dbx_mmap_SA/src/dialogs.cpp index a73745051f..11c1afc70f 100644 --- a/plugins/Dbx_mmap_SA/src/dialogs.cpp +++ b/plugins/Dbx_mmap_SA/src/dialogs.cpp @@ -80,31 +80,22 @@ void xModifyMenu(HANDLE hMenu,long flags,const TCHAR* name, HICON hIcon) CallService(MS_CLIST_MODIFYMENUITEM,(WPARAM)hMenu,(LPARAM)&mi); } +static IconItem iconList[] = +{ + { LPGEN("Database"), "database", IDI_ICON2 }, + { LPGEN("Change Password"), "password", IDI_ICON3 } +}; + int InitMenus(WPARAM, LPARAM) { HookEvent(ME_OPT_INITIALISE, OptionsInit); - TCHAR szFile[MAX_PATH]; - GetModuleFileName(g_hInst, szFile, MAX_PATH); - - SKINICONDESC sid = { sizeof(sid) }; - sid.ptszDefaultFile = szFile; - sid.flags = SIDF_ALL_TCHAR; - sid.ptszSection = LPGENT("Database"); - sid.ptszDescription = LPGENT("Database"); - sid.pszName = "database"; - sid.iDefaultIndex = -IDI_ICON2; - Skin_AddIcon(&sid); - - sid.ptszDescription = LPGENT("Change Password"); - sid.pszName = "password"; - sid.iDefaultIndex = -IDI_ICON3; - HANDLE hIcon = Skin_AddIcon(&sid); + Icon_Register(g_hInst, LPGEN("Database"), iconList, SIZEOF(iconList)); // main menu item CLISTMENUITEM mi = { sizeof(mi) }; mi.flags = CMIM_ALL | CMIF_TCHAR | CMIF_ICONFROMICOLIB; - mi.icolibItem = hIcon; + mi.icolibItem = iconList[1].hIcolib; mi.ptszName = (g_Db->m_bEncoding) ? LPGENT("Change password") : LPGENT("Set password"); mi.ptszPopupName = LPGENT("Database"); mi.pszService = MS_DB_CHANGEPASSWORD; -- cgit v1.2.3