merge with trunk

1 files changed, 26 insertions, 26 deletions

diff --git a/plugins/UserInfoEx/src/mir_menuitems.cpp b/plugins/UserInfoEx/src/mir_menuitems.cpp
index 8b33978a46..f3c1c6200c 100644
--- a/plugins/UserInfoEx/src/mir_menuitems.cpp
+++ b/plugins/UserInfoEx/src/mir_menuitems.cpp
@@ -96,7 +96,7 @@ void RebuildContact()
 		//cascade all

 		SET_UID(mi, 0xeb3736b6, 0x3b6, 0x40fa, 0xa7, 0xe5, 0xbb, 0x40, 0xeb, 0x55, 0xf7, 0x84);

 		mi.position = 1000050000;

-		mi.hIcolibItem = IcoLib_GetIcon(ICO_COMMON_MAIN);

+		mi.hIcolibItem = g_plugin.getIconHandle(IDI_MAIN);

 		mi.name.a = MODULELONGNAME;

 		mhRoot = Menu_AddContactMenuItem(&mi);

 		hMenuItem[0] = mhRoot;

@@ -106,7 +106,7 @@ void RebuildContact()
 		//cascade Ex/Import

 		SET_UID(mi, 0x100de420, 0x4835, 0x4f8d, 0xbd, 0x58, 0x4f, 0x31, 0xcc, 0xe6, 0xc1, 0xa8);

 		mi.position = 1000050100;

-		mi.hIcolibItem = IcoLib_GetIcon(ICO_BTN_EXIMPORT);

+		mi.hIcolibItem = g_plugin.getIconHandle(IDI_BTN_EXIMPORT);

 		mi.name.a = LPGEN("Export/import contact");

 		mhExIm = Menu_AddContactMenuItem(&mi);

 		hMenuItem[0] = mhExIm;

@@ -123,7 +123,7 @@ void RebuildContact()
 	mi.pszService = MS_USERINFO_SHOWDIALOG;

 	mi.name.a = LPGEN("User &details");

 	mi.position = 1000050000;

-	mi.hIcolibItem = IcoLib_GetIcon(ICO_COMMON_MAIN);

+	mi.hIcolibItem = g_plugin.getIconHandle(IDI_MAIN);

 	hMenuItem[1] = Menu_AddContactMenuItem(&mi);

 

 	Menu_ConfigureItem(hMenuItem[1], MCI_OPT_HOTKEY, MAKELPARAM(VK_F3, MOD_ALT));

@@ -136,7 +136,7 @@ void RebuildContact()
 	mi.pszService = MS_USERINFO_VCARD_EXPORT;

 	mi.name.a = mhExIm != NULL ? LPGEN("&Export") : LPGEN("&Export user details");

 	mi.position = 1000050200;

-	mi.hIcolibItem = IcoLib_GetIcon(ICO_BTN_EXPORT);

+	mi.hIcolibItem = g_plugin.getIconHandle(IDI_EXPORT);

 	hMenuItem[2] = Menu_AddContactMenuItem(&mi);

 

 	// Import

@@ -144,7 +144,7 @@ void RebuildContact()
 	mi.pszService = MS_USERINFO_VCARD_IMPORT;

 	mi.name.a = mhExIm != NULL ? LPGEN("&Import") : LPGEN("&Import user details");

 	mi.position = 1000050300;

-	mi.hIcolibItem = IcoLib_GetIcon(ICO_BTN_IMPORT);

+	mi.hIcolibItem = g_plugin.getIconHandle(IDI_IMPORT);

 	hMenuItem[3] = Menu_AddContactMenuItem(&mi);

 }

 

@@ -188,7 +188,7 @@ void RebuildMain()
 		//cascade all

 		SET_UID(mi, 0x17d277d5, 0x2772, 0x40c6, 0xbd, 0xbb, 0x2c, 0x3a, 0xcc, 0xda, 0xc, 0x72);

 		mi.position = 500050000;

-		mi.hIcolibItem = IcoLib_GetIcon(ICO_COMMON_MAIN);

+		mi.hIcolibItem = g_plugin.getIconHandle(IDI_MAIN);

 		mi.name.a = MODULELONGNAME;

 		mhRoot = Menu_AddMainMenuItem(&mi);

 		hMenuItem[item++] = mhRoot;

@@ -198,7 +198,7 @@ void RebuildMain()
 		//cascade Ex/Import

 		SET_UID(mi, 0x80666af7, 0x1c92, 0x4ea6, 0xa8, 0xdc, 0x25, 0x88, 0x88, 0x27, 0x92, 0x68);

 		mi.position = 500050000;

-		mi.hIcolibItem = IcoLib_GetIcon(ICO_BTN_EXIMPORT);

+		mi.hIcolibItem = g_plugin.getIconHandle(IDI_BTN_EXIMPORT);

 		mi.name.a = LPGEN("Export/import contact");

 		mhExIm = Menu_AddMainMenuItem(&mi);

 		hMenuItem[item++] = mhExIm;

@@ -215,7 +215,7 @@ void RebuildMain()
 	mi.pszService = MS_USERINFO_SHOWDIALOG;

 	mi.name.a = LPGEN("View/change my &details...");

 	mi.position = 500050000;

-	mi.hIcolibItem = IcoLib_GetIcon(ICO_COMMON_MAIN);

+	mi.hIcolibItem = g_plugin.getIconHandle(IDI_MAIN);

 	hMenuItem[item++] = Menu_AddMainMenuItem(&mi);

 

 	// VCard's Ex/Import menuitems

@@ -226,7 +226,7 @@ void RebuildMain()
 	mi.pszService = MS_USERINFO_VCARD_EXPORTALL;

 	mi.name.a = LPGEN("Export all contacts");

 	mi.position = 500150000;

-	mi.hIcolibItem = IcoLib_GetIcon(ICO_BTN_EXPORT);

+	mi.hIcolibItem = g_plugin.getIconHandle(IDI_EXPORT);

 	hMenuItem[item++] = Menu_AddMainMenuItem(&mi);

 

 	// Import

@@ -234,7 +234,7 @@ void RebuildMain()
 	mi.pszService = MS_USERINFO_VCARD_IMPORTALL;

 	mi.name.a = LPGEN("Import all contacts");

 	mi.position = 500151000;

-	mi.hIcolibItem = IcoLib_GetIcon(ICO_BTN_IMPORT);

+	mi.hIcolibItem = g_plugin.getIconHandle(IDI_IMPORT);

 	hMenuItem[item++] = Menu_AddMainMenuItem(&mi);

 

 	// reminder

@@ -248,7 +248,7 @@ void RebuildMain()
 		mi.pszService = MS_USERINFO_REMINDER_AGGRASIVEBACKUP;

 		mi.name.a = LPGEN("Backup birthdays");

 		mi.position = 500253000;

-		mi.hIcolibItem = IcoLib_GetIcon(ICO_BTN_BDAY_BACKUP);

+		mi.hIcolibItem = g_plugin.getIconHandle(IDI_BTN_BIRTHDAY_BACKUP);

 		hMenuItem[item++] = Menu_AddMainMenuItem(&mi);

 

 		// Check anniversaries

@@ -256,7 +256,7 @@ void RebuildMain()
 		mi.pszService = MS_USERINFO_REMINDER_CHECK;

 		mi.name.a = LPGEN("Check anniversaries");

 		mi.position = 500251000;

-		mi.hIcolibItem = IcoLib_GetIcon(ICO_BTN_SEARCH);

+		mi.hIcolibItem = g_plugin.getIconHandle(IDI_SEARCH);

 		hMenuItem[item++] = Menu_AddMainMenuItem(&mi);

 	}

 	else {

@@ -269,7 +269,7 @@ void RebuildMain()
 	mi.pszService = MS_USERINFO_REFRESH;

 	mi.name.a = LPGEN("Refresh contact details");

 	mi.position = 500254000;

-	mi.hIcolibItem = IcoLib_GetIcon(ICO_BTN_UPDATE);

+	mi.hIcolibItem = g_plugin.getIconHandle(IDI_BTN_UPDATE);

 	hMenuItem[item++] = Menu_AddMainMenuItem(&mi);

 

 	// anniversary list

@@ -277,7 +277,7 @@ void RebuildMain()
 	mi.pszService = MS_USERINFO_REMINDER_LIST;

 	mi.name.a = LPGEN("Anniversary list");

 	mi.position = 500252000;

-	mi.hIcolibItem = IcoLib_GetIcon(ICO_COMMON_ANNIVERSARY);

+	mi.hIcolibItem = g_plugin.getIconHandle(IDI_ANNIVERSARY);

 	hMenuItem[item++] = Menu_AddMainMenuItem(&mi);

 }

 

@@ -326,7 +326,7 @@ void RebuildGroup()
 		//cascade all

 		SET_UID(mi, 0xfefe20db, 0x431f, 0x4fef, 0x9d, 0xa6, 0x70, 0xcd, 0x25, 0xf1, 0x2f, 0x1d);

 		mi.position = 250000;

-		mi.hIcolibItem = IcoLib_GetIcon(ICO_COMMON_MAIN);

+		mi.hIcolibItem = g_plugin.getIconHandle(IDI_MAIN);

 		mi.name.a = MODULELONGNAME;

 		mhRoot = Menu_AddGroupMenuItem(&mi);

 		hMenuItem[item++] = mhRoot;

@@ -336,7 +336,7 @@ void RebuildGroup()
 		//cascade Ex/Import

 		SET_UID(mi, 0x3ec4da1, 0x8a1a, 0x4734, 0xba, 0x99, 0x7, 0x9c, 0x2, 0x46, 0xff, 0xec);

 		mi.position = 250100;

-		mi.hIcolibItem = IcoLib_GetIcon(ICO_BTN_EXIMPORT);

+		mi.hIcolibItem = g_plugin.getIconHandle(IDI_BTN_EXIMPORT);

 		mi.name.a = LPGEN("Export/import contact");

 		mhExIm = Menu_AddGroupMenuItem(&mi);

 		hMenuItem[item++] = mhExIm;

@@ -355,7 +355,7 @@ void RebuildGroup()
 	mi.pszService = MS_USERINFO_VCARD_EXPORTALL;

 	mi.name.a = LPGEN("Export all contacts");

 	mi.position = 250200;

-	mi.hIcolibItem = IcoLib_GetIcon(ICO_BTN_EXPORT);

+	mi.hIcolibItem = g_plugin.getIconHandle(IDI_EXPORT);

 	hMenuItem[item++] = Menu_AddGroupMenuItem(&mi);

 

 	// Import

@@ -363,7 +363,7 @@ void RebuildGroup()
 	mi.pszService = MS_USERINFO_VCARD_IMPORTALL;

 	mi.name.a = LPGEN("Import all contacts");

 	mi.position = 250300;

-	mi.hIcolibItem = IcoLib_GetIcon(ICO_BTN_IMPORT);

+	mi.hIcolibItem = g_plugin.getIconHandle(IDI_IMPORT);

 	hMenuItem[item++] = Menu_AddGroupMenuItem(&mi);

 }

 

@@ -418,7 +418,7 @@ void RebuildSubGroup()
 		//cascade all

 		SET_UID(mi, 0x77b46004, 0xe845, 0x41f4, 0x9a, 0x56, 0x72, 0xd9, 0xa5, 0x61, 0x4d, 0x5);

 		mi.position = 1050000;

-		mi.hIcolibItem = IcoLib_GetIcon(ICO_COMMON_MAIN);

+		mi.hIcolibItem = g_plugin.getIconHandle(IDI_MAIN);

 		mi.name.a = MODULELONGNAME;

 		mhRoot = Menu_AddSubGroupMenuItem(&mi);

 		hMenuItem[item++] = mhRoot;

@@ -428,7 +428,7 @@ void RebuildSubGroup()
 		//cascade Ex/Import

 		SET_UID(mi, 0xac5e810b, 0x4b41, 0x477c, 0x98, 0xfe, 0x8, 0x88, 0xec, 0x6f, 0xc3, 0xcf);

 		mi.position = 1050100;

-		mi.hIcolibItem = IcoLib_GetIcon(ICO_BTN_EXIMPORT);

+		mi.hIcolibItem = g_plugin.getIconHandle(IDI_BTN_EXIMPORT);

 		mi.name.a = LPGEN("Export/import group");

 		mhExIm = Menu_AddSubGroupMenuItem(&mi);

 		hMenuItem[item++] = mhExIm;

@@ -448,7 +448,7 @@ void RebuildSubGroup()
 	if (!ServiceExists(mi.pszService)) CreateServiceFunction(mi.pszService, svcExIm_Group_Service);

 	mi.name.a = mhExIm != NULL ? LPGEN("&Export") : LPGEN("&Export group");

 	mi.position = 1050200;

-	mi.hIcolibItem = IcoLib_GetIcon(ICO_BTN_EXPORT);

+	mi.hIcolibItem = g_plugin.getIconHandle(IDI_EXPORT);

 	gmp.wParam = TRUE;

 	hMenuItem[item++] = Menu_AddSubGroupMenuItem(&mi, &gmp);

 

@@ -458,7 +458,7 @@ void RebuildSubGroup()
 	if (!ServiceExists(mi.pszService)) CreateServiceFunction(mi.pszService, svcExIm_Group_Service);

 	mi.name.a = mhExIm != NULL ? LPGEN("&Import") : LPGEN("&Import group");

 	mi.position = 1050300;

-	mi.hIcolibItem = IcoLib_GetIcon(ICO_BTN_IMPORT);

+	mi.hIcolibItem = g_plugin.getIconHandle(IDI_IMPORT);

 	gmp.wParam = FALSE;

 	hMenuItem[item++] = Menu_AddSubGroupMenuItem(&mi, &gmp);

 }

@@ -539,7 +539,7 @@ INT_PTR RebuildAccount(WPARAM, LPARAM lParam)
 		case 5:

 			// cascade all

 			mi.position = 50100;

-			mi.hIcolibItem = IcoLib_GetIcon(ICO_COMMON_MAIN);

+			mi.hIcolibItem = g_plugin.getIconHandle(IDI_MAIN);

 			mi.name.a = MODULELONGNAME;

 			hMenuItemAccount[mItems*i + item] = Menu_AddStatusMenuItem(&mi, pa->szModuleName);

 			mhRoot = hMenuItemAccount[mItems*i + item++];

@@ -548,7 +548,7 @@ INT_PTR RebuildAccount(WPARAM, LPARAM lParam)
 		case 9:

 			// cascade Ex/Import

 			mi.position = 50100;

-			mi.hIcolibItem = IcoLib_GetIcon(ICO_BTN_EXIMPORT);

+			mi.hIcolibItem = g_plugin.getIconHandle(IDI_BTN_EXIMPORT);

 			mi.name.a = LPGEN("Export/import");

 			hMenuItemAccount[mItems*i + item] = Menu_AddStatusMenuItem(&mi, pa->szModuleName);

 			mhRoot = hMenuItemAccount[mItems*i + item++];

@@ -567,7 +567,7 @@ INT_PTR RebuildAccount(WPARAM, LPARAM lParam)
 		CreateServiceFunction(mi.pszService, svcExIm_Account_Service);

 		mi.name.a = LPGEN("&Export xml");

 		mi.position = 50200;

-		mi.hIcolibItem = IcoLib_GetIcon(ICO_BTN_EXPORT);

+		mi.hIcolibItem = g_plugin.getIconHandle(IDI_EXPORT);

 		hMenuItemAccount[mItems*i + item++] = Menu_AddStatusMenuItem(&mi, pa->szModuleName);

 

 		// Import

@@ -575,7 +575,7 @@ INT_PTR RebuildAccount(WPARAM, LPARAM lParam)
 		CreateServiceFunction(mi.pszService, svcExIm_Account_Service);

 		mi.name.a = LPGEN("&Import xml");

 		mi.position = 50300;

-		mi.hIcolibItem = IcoLib_GetIcon(ICO_BTN_IMPORT);

+		mi.hIcolibItem = g_plugin.getIconHandle(IDI_IMPORT);

 		hMenuItemAccount[mItems*i + item++] = Menu_AddStatusMenuItem(&mi, pa->szModuleName);

 	}

 	return 0;