diff options
| author | George Hazan <george.hazan@gmail.com> | 2015-06-28 17:41:48 +0000 |
|---|---|---|
| committer | George Hazan <george.hazan@gmail.com> | 2015-06-28 17:41:48 +0000 |
| commit | 59cd198e89782263777c57dcd54704ecb1e10212 (patch) | |
| tree | 9515cc2c31c1254c330e79906bb669279af9b8a5 /protocols | |
| parent | ca2afc50a432cefe892c6877710642bce6bd57c9 (diff) | |
finally CLISTEVENT removed completely
git-svn-id: http://svn.miranda-ng.org/main/trunk@14430 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'protocols')
30 files changed, 277 insertions, 277 deletions
diff --git a/protocols/AimOscar/src/theme.cpp b/protocols/AimOscar/src/theme.cpp index 321630221c..7a36990d79 100644 --- a/protocols/AimOscar/src/theme.cpp +++ b/protocols/AimOscar/src/theme.cpp @@ -211,9 +211,9 @@ void CAimProto::InitMainMenus(void) {
HGENMENU hRoot = Menu_GetProtocolRoot(m_szModuleName);
if (hRoot == NULL) {
- CLISTMENUITEM mi = { 0 };
+ TMO_MenuItem mi = { 0 };
mi.flags = CMIF_TCHAR | CMIF_KEEPUNTRANSLATED;
- mi.icolibItem = GetIconHandle("aim");
+ mi.hIcolibItem = GetIconHandle("aim");
mi.name.t = m_tszUserName;
mi.position = 500090000;
hRoot = hMenuRoot = Menu_AddProtoMenuItem(&mi);
@@ -225,39 +225,39 @@ void CAimProto::InitMainMenus(void) }
}
- CLISTMENUITEM mi = { 0 };
- mi.hParentMenu = hRoot;
+ TMO_MenuItem mi = { 0 };
+ mi.root = hRoot;
mi.pszService = "/ManageAccount";
CreateProtoService(mi.pszService, &CAimProto::ManageAccount);
mi.position = 201001;
- mi.icolibItem = GetIconHandle("aim");
+ mi.hIcolibItem = GetIconHandle("aim");
mi.name.a = LPGEN("Manage Account");
hMainMenu[0] = Menu_AddProtoMenuItem(&mi, m_szModuleName);
mi.pszService = "/InstantIdle";
CreateProtoService(mi.pszService, &CAimProto::InstantIdle);
mi.position = 201002;
- mi.icolibItem = GetIconHandle("idle");
+ mi.hIcolibItem = GetIconHandle("idle");
mi.name.a = LPGEN("Instant Idle");
hMainMenu[1] = Menu_AddProtoMenuItem(&mi, m_szModuleName);
mi.pszService = "/JoinChatRoom";
CreateProtoService(mi.pszService, &CAimProto::JoinChatUI);
mi.position = 201003;
- mi.icolibItem = GetIconHandle("aol");
+ mi.hIcolibItem = GetIconHandle("aol");
mi.name.a = LPGEN( "Join Chat Room" );
hMainMenu[2] = Menu_AddProtoMenuItem(&mi, m_szModuleName);
}
void CAimProto::InitContactMenus(void)
{
- CLISTMENUITEM mi = { 0 };
+ TMO_MenuItem mi = { 0 };
CreateProtoService("/GetHTMLAwayMsg",&CAimProto::GetHTMLAwayMsg);
mi.pszService = "/GetHTMLAwayMsg";
mi.position = -2000006000;
- mi.icolibItem = GetIconHandle("away");
+ mi.hIcolibItem = GetIconHandle("away");
mi.name.a = LPGEN("Read &HTML Away Message");
mi.flags = CMIF_NOTOFFLINE | CMIF_HIDDEN;
hHTMLAwayContextMenuItem = Menu_AddContactMenuItem(&mi, m_szModuleName);
@@ -265,7 +265,7 @@ void CAimProto::InitContactMenus(void) CreateProtoService("/GetProfile", &CAimProto::GetProfile);
mi.pszService = "/GetProfile";
mi.position = -2000005090;
- mi.icolibItem = GetIconHandle("profile");
+ mi.hIcolibItem = GetIconHandle("profile");
mi.name.a = LPGEN("Read Profile");
mi.flags = CMIF_NOTOFFLINE;
Menu_AddContactMenuItem(&mi, m_szModuleName);
@@ -273,7 +273,7 @@ void CAimProto::InitContactMenus(void) CreateProtoService("/AddToServerList", &CAimProto::AddToServerList);
mi.pszService = "/AddToServerList";
mi.position = -2000005080;
- mi.icolibItem = GetIconHandle("add");
+ mi.hIcolibItem = GetIconHandle("add");
mi.name.a = LPGEN("Add To Server List");
mi.flags = CMIF_NOTONLINE | CMIF_HIDDEN;
hAddToServerListContextMenuItem = Menu_AddContactMenuItem(&mi, m_szModuleName);
@@ -281,7 +281,7 @@ void CAimProto::InitContactMenus(void) CreateProtoService("/BlockCommand", &CAimProto::BlockBuddy);
mi.pszService = "/BlockCommand";
mi.position = -2000005060;
- mi.icolibItem = GetIconHandle("block");
+ mi.hIcolibItem = GetIconHandle("block");
mi.name.a = LPGEN("&Block");
mi.flags = CMIF_HIDDEN;
hBlockContextMenuItem = Menu_AddContactMenuItem(&mi, m_szModuleName);
diff --git a/protocols/FacebookRM/src/theme.cpp b/protocols/FacebookRM/src/theme.cpp index 88e8d3ded4..3a4cbbf803 100644 --- a/protocols/FacebookRM/src/theme.cpp +++ b/protocols/FacebookRM/src/theme.cpp @@ -107,72 +107,72 @@ void InitContactMenus() {
HookEvent(ME_CLIST_PREBUILDCONTACTMENU, PrebuildContactMenu);
- CLISTMENUITEM mi = { 0 };
+ TMO_MenuItem mi = { 0 };
mi.position = -2000006000;
- mi.icolibItem = Skin_GetIconHandle(SKINICON_EVENT_URL);
+ mi.hIcolibItem = Skin_GetIconHandle(SKINICON_EVENT_URL);
mi.name.a = LPGEN("Visit profile");
mi.pszService = "FacebookProto/VisitProfile";
CreateServiceFunction(mi.pszService, GlobalService<&FacebookProto::VisitProfile>);
g_hContactMenuVisitProfile = Menu_AddContactMenuItem(&mi);
mi.position = -2000006001;
- mi.icolibItem = GetIconHandle("friendship");
+ mi.hIcolibItem = GetIconHandle("friendship");
mi.name.a = LPGEN("Visit friendship details");
mi.pszService = "FacebookProto/VisitFriendship";
CreateServiceFunction(mi.pszService, GlobalService<&FacebookProto::VisitFriendship>);
g_hContactMenuVisitFriendship = Menu_AddContactMenuItem(&mi);
mi.position = -2000006002;
- mi.icolibItem = GetIconHandle("conversation");
+ mi.hIcolibItem = GetIconHandle("conversation");
mi.name.a = LPGEN("Visit conversation");
mi.pszService = "FacebookProto/VisitConversation";
CreateServiceFunction(mi.pszService, GlobalService<&FacebookProto::VisitConversation>);
g_hContactMenuVisitConversation = Menu_AddContactMenuItem(&mi);
mi.position = -2000006003;
- mi.icolibItem = GetIconHandle("mind");
+ mi.hIcolibItem = GetIconHandle("mind");
mi.name.a = LPGEN("Share status...");
mi.pszService = "FacebookProto/Mind";
CreateServiceFunction(mi.pszService, GlobalService<&FacebookProto::OnMind>);
g_hContactMenuPostStatus = Menu_AddContactMenuItem(&mi);
mi.position = -2000006004;
- mi.icolibItem = GetIconHandle("poke");
+ mi.hIcolibItem = GetIconHandle("poke");
mi.name.a = LPGEN("Poke");
mi.pszService = "FacebookProto/Poke";
CreateServiceFunction(mi.pszService, GlobalService<&FacebookProto::Poke>);
g_hContactMenuPoke = Menu_AddContactMenuItem(&mi);
mi.position = -2000006010;
- mi.icolibItem = Skin_GetIconHandle(SKINICON_AUTH_REVOKE);
+ mi.hIcolibItem = Skin_GetIconHandle(SKINICON_AUTH_REVOKE);
mi.name.a = LPGEN("Cancel friendship");
mi.pszService = "FacebookProto/CancelFriendship";
CreateServiceFunction(mi.pszService, GlobalService<&FacebookProto::CancelFriendship>);
g_hContactMenuAuthRevoke = Menu_AddContactMenuItem(&mi);
mi.position = -2000006011;
- mi.icolibItem = Skin_GetIconHandle(SKINICON_AUTH_REVOKE);
+ mi.hIcolibItem = Skin_GetIconHandle(SKINICON_AUTH_REVOKE);
mi.name.a = LPGEN("Cancel friendship request");
mi.pszService = "FacebookProto/CancelFriendshipRequest";
CreateServiceFunction(mi.pszService, GlobalService<&FacebookProto::OnCancelFriendshipRequest>);
g_hContactMenuAuthCancel = Menu_AddContactMenuItem(&mi);
mi.position = -2000006012;
- mi.icolibItem = Skin_GetIconHandle(SKINICON_AUTH_REQUEST);
+ mi.hIcolibItem = Skin_GetIconHandle(SKINICON_AUTH_REQUEST);
mi.name.a = LPGEN("Request friendship");
mi.pszService = "FacebookProto/RequestFriendship";
CreateServiceFunction(mi.pszService, GlobalService<&FacebookProto::RequestFriendship>);
g_hContactMenuAuthAsk = Menu_AddContactMenuItem(&mi);
mi.position = -2000006013;
- mi.icolibItem = Skin_GetIconHandle(SKINICON_AUTH_GRANT);
+ mi.hIcolibItem = Skin_GetIconHandle(SKINICON_AUTH_GRANT);
mi.name.a = LPGEN("Approve friendship");
mi.pszService = "FacebookProto/ApproveFriendship";
CreateServiceFunction(mi.pszService, GlobalService<&FacebookProto::ApproveFriendship>);
g_hContactMenuAuthGrant = Menu_AddContactMenuItem(&mi);
mi.position = -2000006014;
- mi.icolibItem = Skin_GetIconHandle(SKINICON_AUTH_REVOKE);
+ mi.hIcolibItem = Skin_GetIconHandle(SKINICON_AUTH_REVOKE);
mi.name.a = LPGEN("Deny friendship request");
mi.pszService = "FacebookProto/DenyFriendship";
CreateServiceFunction(mi.pszService, GlobalService<&FacebookProto::DenyFriendship>);
@@ -210,10 +210,10 @@ int FacebookProto::OnBuildStatusMenu(WPARAM, LPARAM) {
HGENMENU hRoot = Menu_GetProtocolRoot(m_szModuleName);
if (hRoot == NULL) {
- CLISTMENUITEM miRoot = { 0 };
+ TMO_MenuItem miRoot = { 0 };
miRoot.position = 500085000;
miRoot.flags = CMIF_TCHAR | CMIF_KEEPUNTRANSLATED | (this->isOnline() ? 0 : CMIF_GRAYED);
- miRoot.icolibItem = GetIconHandle("facebook");
+ miRoot.hIcolibItem = GetIconHandle("facebook");
miRoot.name.t = m_tszUserName;
hRoot = m_hMenuRoot = Menu_AddProtoMenuItem(&miRoot);
}
@@ -224,48 +224,48 @@ int FacebookProto::OnBuildStatusMenu(WPARAM, LPARAM) }
}
- CLISTMENUITEM mi = { 0 };
+ TMO_MenuItem mi = { 0 };
mi.flags = (this->isOnline() ? 0 : CMIF_GRAYED);
mi.position = 201001;
- mi.hParentMenu = hRoot;
+ mi.root = hRoot;
mi.pszService = "/Mind";
- CreateProtoService(mi.pszService, &FacebookProto::OnMind); + CreateProtoService(mi.pszService, &FacebookProto::OnMind);
mi.name.a = LPGEN("Share status...");
- mi.icolibItem = GetIconHandle("mind");
+ mi.hIcolibItem = GetIconHandle("mind");
m_hStatusMind = Menu_AddProtoMenuItem(&mi, m_szModuleName);
mi.pszService = "/VisitProfile";
- CreateProtoService(mi.pszService, &FacebookProto::VisitProfile); + CreateProtoService(mi.pszService, &FacebookProto::VisitProfile);
mi.name.a = LPGEN("Visit profile");
- mi.icolibItem = Skin_GetIconHandle(SKINICON_EVENT_URL);
+ mi.hIcolibItem = Skin_GetIconHandle(SKINICON_EVENT_URL);
Menu_AddProtoMenuItem(&mi, m_szModuleName);
mi.pszService = "/VisitNotifications";
- CreateProtoService(mi.pszService, &FacebookProto::VisitNotifications); + CreateProtoService(mi.pszService, &FacebookProto::VisitNotifications);
mi.name.a = LPGEN("Visit notifications");
- mi.icolibItem = Skin_GetIconHandle(SKINICON_EVENT_URL);
+ mi.hIcolibItem = Skin_GetIconHandle(SKINICON_EVENT_URL);
Menu_AddProtoMenuItem(&mi, m_szModuleName);
// Services...
- mi.hParentMenu = m_hMenuServicesRoot = Menu_CreateRoot(MO_PROTO, LPGENT("Services..."), mi.position, Skin_GetIconHandle(SKINICON_OTHER_HELP));
+ mi.root = m_hMenuServicesRoot = Menu_CreateRoot(MO_PROTO, LPGENT("Services..."), mi.position, Skin_GetIconHandle(SKINICON_OTHER_HELP));
mi.pszService = "/RefreshBuddyList";
CreateProtoService(mi.pszService, &FacebookProto::RefreshBuddyList);
mi.name.a = LPGEN("Refresh Buddy List");
- mi.icolibItem = GetIconHandle("friendship");
+ mi.hIcolibItem = GetIconHandle("friendship");
Menu_AddProtoMenuItem(&mi, m_szModuleName);
mi.pszService = "/CheckFriendRequests";
CreateProtoService(mi.pszService, &FacebookProto::CheckFriendRequests);
mi.name.a = LPGEN("Check Friends Requests");
- mi.icolibItem = Skin_GetIconHandle(SKINICON_AUTH_REQUEST);
+ mi.hIcolibItem = Skin_GetIconHandle(SKINICON_AUTH_REQUEST);
Menu_AddProtoMenuItem(&mi, m_szModuleName);
mi.pszService = "/CheckNewsfeeds";
CreateProtoService(mi.pszService, &FacebookProto::CheckNewsfeeds);
mi.name.a = LPGEN("Check Newsfeeds");
- mi.icolibItem = GetIconHandle("newsfeed");
+ mi.hIcolibItem = GetIconHandle("newsfeed");
Menu_AddProtoMenuItem(&mi, m_szModuleName);
return 0;
}
diff --git a/protocols/GTalkExt/src/menu.cpp b/protocols/GTalkExt/src/menu.cpp index e9da9939d3..549619069d 100644 --- a/protocols/GTalkExt/src/menu.cpp +++ b/protocols/GTalkExt/src/menu.cpp @@ -44,9 +44,9 @@ int InitMenus(WPARAM wParam, LPARAM lParam) mir_snprintf(szServiceName, _countof(szServiceName), "%s/%s", szModuleName, MS_GTALKEXT_OPENMAILBOX);
CreateServiceFunctionParam(szServiceName, OpenMailboxMenuHandler, (LPARAM)szModuleName);
- CLISTMENUITEM mi = { 0 };
- mi.hParentMenu = HGENMENU(wParam);
- mi.icolibItem = g_hPopupIcon;
+ TMO_MenuItem mi = { 0 };
+ mi.root = HGENMENU(wParam);
+ mi.hIcolibItem = g_hPopupIcon;
mi.position = 200101;
mi.name.a = LPGEN("Open mailbox");
mi.pszService = szServiceName;
diff --git a/protocols/Gadu-Gadu/src/gg.cpp b/protocols/Gadu-Gadu/src/gg.cpp index 0e8d5463b0..3c496a0263 100644 --- a/protocols/Gadu-Gadu/src/gg.cpp +++ b/protocols/Gadu-Gadu/src/gg.cpp @@ -235,9 +235,9 @@ INT_PTR GGPROTO::blockuser(WPARAM hContact, LPARAM lParam) #define GGS_BLOCKUSER "/BlockUser"
void GGPROTO::block_init()
{
- CLISTMENUITEM mi = { 0 };
+ TMO_MenuItem mi = { 0 };
mi.position = -500050000;
- mi.icolibItem = iconList[8].hIcolib;
+ mi.hIcolibItem = iconList[8].hIcolib;
mi.name.a = LPGEN("&Block");
mi.pszService = GGS_BLOCKUSER;
hBlockMenuItem = Menu_AddContactMenuItem(&mi, m_szModuleName);
@@ -257,28 +257,28 @@ void GGPROTO::block_uninit() // Menus initialization
void GGPROTO::menus_init()
{
- CLISTMENUITEM mi = { 0 };
+ TMO_MenuItem mi = { 0 };
HGENMENU hGCRoot, hCLRoot, hRoot = Menu_GetProtocolRoot(m_szModuleName);
if (hRoot == NULL) {
mi.name.t = m_tszUserName;
mi.position = 500090000;
mi.flags = CMIF_TCHAR | CMIF_KEEPUNTRANSLATED;
- mi.icolibItem = iconList[0].hIcolib;
+ mi.hIcolibItem = iconList[0].hIcolib;
hGCRoot = hCLRoot = hRoot = hMenuRoot = Menu_AddProtoMenuItem(&mi);
}
else {
- mi.hParentMenu = hRoot;
+ mi.root = hRoot;
mi.flags = CMIF_TCHAR;
mi.name.t = LPGENT("Conference");
mi.position = 200001;
- mi.icolibItem = iconList[14].hIcolib;
+ mi.hIcolibItem = iconList[14].hIcolib;
hGCRoot = Menu_AddProtoMenuItem(&mi, m_szModuleName);
mi.name.t = LPGENT("Contact list");
mi.position = 200002;
- mi.icolibItem = iconList[7].hIcolib;
+ mi.hIcolibItem = iconList[7].hIcolib;
hCLRoot = Menu_AddProtoMenuItem(&mi, m_szModuleName);
if (hMenuRoot)
diff --git a/protocols/Gadu-Gadu/src/groupchat.cpp b/protocols/Gadu-Gadu/src/groupchat.cpp index 61e1318022..5f1b0ec623 100644 --- a/protocols/Gadu-Gadu/src/groupchat.cpp +++ b/protocols/Gadu-Gadu/src/groupchat.cpp @@ -57,15 +57,15 @@ int GGPROTO::gc_init() void GGPROTO::gc_menus_init(HGENMENU hRoot)
{
if (gc_enabled) {
- CLISTMENUITEM mi = { 0 };
+ TMO_MenuItem mi = { 0 };
mi.flags = CMIF_TCHAR;
- mi.hParentMenu = hRoot;
+ mi.root = hRoot;
// Conferencing
mi.pszService = GGS_OPEN_CONF;
CreateProtoService(mi.pszService, &GGPROTO::gc_openconf);
mi.position = 2000050001;
- mi.icolibItem = iconList[14].hIcolib;
+ mi.hIcolibItem = iconList[14].hIcolib;
mi.name.t = LPGENT("Open &conference...");
hMainMenu[0] = Menu_AddProtoMenuItem(&mi, m_szModuleName);
@@ -73,7 +73,7 @@ void GGPROTO::gc_menus_init(HGENMENU hRoot) mi.pszService = GGS_CLEAR_IGNORED;
CreateProtoService(mi.pszService, &GGPROTO::gc_clearignored);
mi.position = 2000050002;
- mi.icolibItem = iconList[15].hIcolib;
+ mi.hIcolibItem = iconList[15].hIcolib;
mi.name.t = LPGENT("&Clear ignored conferences");
hMainMenu[1] = Menu_AddProtoMenuItem(&mi, m_szModuleName);
}
diff --git a/protocols/Gadu-Gadu/src/image.cpp b/protocols/Gadu-Gadu/src/image.cpp index 6591861af4..860cc2f965 100644 --- a/protocols/Gadu-Gadu/src/image.cpp +++ b/protocols/Gadu-Gadu/src/image.cpp @@ -69,9 +69,9 @@ int gg_img_remove(GGIMAGEDLGDATA *dat); int GGPROTO::img_init()
{
// Send image contact menu item
- CLISTMENUITEM mi = { 0 };
+ TMO_MenuItem mi = { 0 };
mi.position = -2000010000;
- mi.icolibItem = iconList[11].hIcolib;
+ mi.hIcolibItem = iconList[11].hIcolib;
mi.name.a = LPGEN("&Image");
mi.pszService = GGS_SENDIMAGE;
hImageMenuItem = Menu_AddContactMenuItem(&mi, m_szModuleName);
diff --git a/protocols/Gadu-Gadu/src/import.cpp b/protocols/Gadu-Gadu/src/import.cpp index 7a4cea35cd..c44e098383 100644 --- a/protocols/Gadu-Gadu/src/import.cpp +++ b/protocols/Gadu-Gadu/src/import.cpp @@ -514,15 +514,15 @@ INT_PTR GGPROTO::export_server(WPARAM wParam, LPARAM lParam) void GGPROTO::import_init(HGENMENU hRoot)
{
- CLISTMENUITEM mi = { 0 };
+ TMO_MenuItem mi = { 0 };
mi.flags = CMIF_TCHAR;
- mi.hParentMenu = hRoot;
+ mi.root = hRoot;
// Import from server item
mi.pszService = GGS_IMPORT_SERVER;
CreateProtoService(mi.pszService, &GGPROTO::import_server);
mi.position = 2000500001;
- mi.icolibItem = iconList[1].hIcolib;
+ mi.hIcolibItem = iconList[1].hIcolib;
mi.name.t = LPGENT("Import List From &Server");
hMainMenu[2] = Menu_AddProtoMenuItem(&mi, m_szModuleName);
@@ -530,7 +530,7 @@ void GGPROTO::import_init(HGENMENU hRoot) mi.pszService = GGS_IMPORT_TEXT;
CreateProtoService(mi.pszService, &GGPROTO::import_text);
mi.position = 2000500002;
- mi.icolibItem = iconList[2].hIcolib;
+ mi.hIcolibItem = iconList[2].hIcolib;
mi.name.t = LPGENT("Import List From &Text File...");
hMainMenu[3] = Menu_AddProtoMenuItem(&mi, m_szModuleName);
@@ -538,7 +538,7 @@ void GGPROTO::import_init(HGENMENU hRoot) mi.pszService = GGS_REMOVE_SERVER;
CreateProtoService(mi.pszService, &GGPROTO::remove_server);
mi.position = 2000500003;
- mi.icolibItem = iconList[3].hIcolib;
+ mi.hIcolibItem = iconList[3].hIcolib;
mi.name.t = LPGENT("&Remove List From Server");
hMainMenu[4] = Menu_AddProtoMenuItem(&mi, m_szModuleName);
@@ -546,7 +546,7 @@ void GGPROTO::import_init(HGENMENU hRoot) mi.pszService = GGS_EXPORT_SERVER;
CreateProtoService(mi.pszService, &GGPROTO::export_server);
mi.position = 2005000001;
- mi.icolibItem = iconList[4].hIcolib;
+ mi.hIcolibItem = iconList[4].hIcolib;
mi.name.t = LPGENT("Export List To &Server");
hMainMenu[5] = Menu_AddProtoMenuItem(&mi, m_szModuleName);
@@ -554,7 +554,7 @@ void GGPROTO::import_init(HGENMENU hRoot) mi.pszService = GGS_EXPORT_TEXT;
CreateProtoService(mi.pszService, &GGPROTO::export_text);
mi.position = 2005000002;
- mi.icolibItem = iconList[5].hIcolib;
+ mi.hIcolibItem = iconList[5].hIcolib;
mi.name.t = LPGENT("Export List To &Text File...");
hMainMenu[6] = Menu_AddProtoMenuItem(&mi, m_szModuleName);
}
diff --git a/protocols/Gadu-Gadu/src/sessions.cpp b/protocols/Gadu-Gadu/src/sessions.cpp index 4823849635..6364386820 100644 --- a/protocols/Gadu-Gadu/src/sessions.cpp +++ b/protocols/Gadu-Gadu/src/sessions.cpp @@ -416,14 +416,14 @@ BOOL GGPROTO::sessions_closedlg() void GGPROTO::sessions_menus_init(HGENMENU hRoot)
{
- CLISTMENUITEM mi = { 0 };
+ TMO_MenuItem mi = { 0 };
mi.flags = CMIF_TCHAR;
- mi.hParentMenu = hRoot;
+ mi.root = hRoot;
mi.pszService = GGS_CONCUR_SESS;
CreateProtoService(mi.pszService, &GGPROTO::sessions_view);
mi.position = (hMenuRoot) ? 2050000001 : 200003;
- mi.icolibItem = iconList[16].hIcolib;
+ mi.hIcolibItem = iconList[16].hIcolib;
mi.name.t = LPGENT("Concurrent &sessions");
Menu_AddProtoMenuItem(&mi, m_szModuleName);
}
diff --git a/protocols/IRCG/src/services.cpp b/protocols/IRCG/src/services.cpp index 095b23b114..f77fa7312f 100644 --- a/protocols/IRCG/src/services.cpp +++ b/protocols/IRCG/src/services.cpp @@ -26,11 +26,11 @@ void CIrcProto::InitMainMenus(void) HGENMENU hRoot = Menu_GetProtocolRoot(m_szModuleName);
if (hRoot == NULL) {
// Root popupmenuitem
- CLISTMENUITEM mi = { 0 };
+ TMO_MenuItem mi = { 0 };
mi.name.t = m_tszUserName;
mi.position = -1999901010;
mi.flags = CMIF_TCHAR | CMIF_KEEPUNTRANSLATED;
- mi.icolibItem = GetIconHandle(IDI_MAIN);
+ mi.hIcolibItem = GetIconHandle(IDI_MAIN);
hRoot = hMenuRoot = Menu_AddProtoMenuItem(&mi);
}
else {
@@ -40,11 +40,11 @@ void CIrcProto::InitMainMenus(void) }
}
- CLISTMENUITEM mi = { 0 };
- mi.hParentMenu = hRoot;
+ TMO_MenuItem mi = { 0 };
+ mi.root = hRoot;
mi.name.a = LPGEN("&Quick connect");
- mi.icolibItem = GetIconHandle(IDI_QUICK);
+ mi.hIcolibItem = GetIconHandle(IDI_QUICK);
mi.pszService = IRC_QUICKCONNECT;
mi.position = 201001;
hMenuQuick = Menu_AddProtoMenuItem(&mi, m_szModuleName);
@@ -52,26 +52,26 @@ void CIrcProto::InitMainMenus(void) if (m_iStatus != ID_STATUS_OFFLINE) mi.flags |= CMIF_GRAYED;
mi.name.a = LPGEN("&Join channel");
- mi.icolibItem = Skin_GetIconHandle(SKINICON_CHAT_JOIN);//GetIconHandle(IDI_JOIN);
+ mi.hIcolibItem = Skin_GetIconHandle(SKINICON_CHAT_JOIN);//GetIconHandle(IDI_JOIN);
mi.pszService = IRC_JOINCHANNEL;
mi.position = 201002;
hMenuJoin = Menu_AddProtoMenuItem(&mi, m_szModuleName);
mi.name.a = LPGEN("&Change your nickname");
- mi.icolibItem = GetIconHandle(IDI_RENAME);
+ mi.hIcolibItem = GetIconHandle(IDI_RENAME);
mi.pszService = IRC_CHANGENICK;
mi.position = 201003;
hMenuNick = Menu_AddProtoMenuItem(&mi, m_szModuleName);
mi.name.a = LPGEN("Show the &list of available channels");
- mi.icolibItem = GetIconHandle(IDI_LIST);
+ mi.hIcolibItem = GetIconHandle(IDI_LIST);
mi.pszService = IRC_SHOWLIST;
mi.position = 201004;
hMenuList = Menu_AddProtoMenuItem(&mi, m_szModuleName);
if (m_useServer) mi.flags &= ~CMIF_GRAYED;
mi.name.a = LPGEN("&Show the server window");
- mi.icolibItem = GetIconHandle(IDI_SERVER);
+ mi.hIcolibItem = GetIconHandle(IDI_SERVER);
mi.pszService = IRC_SHOWSERVER;
mi.position = 201005;
hMenuServer = Menu_AddProtoMenuItem(&mi, m_szModuleName);
@@ -135,32 +135,32 @@ void InitContactMenus(void) char temp[MAXMODULELABELLENGTH];
char *d = temp + mir_snprintf(temp, _countof(temp), "IRC");
- CLISTMENUITEM mi = { 0 };
+ TMO_MenuItem mi = { 0 };
mi.pszService = temp;
mi.name.a = LPGEN("Channel &settings");
- mi.icolibItem = GetIconHandle(IDI_MANAGER);
+ mi.hIcolibItem = GetIconHandle(IDI_MANAGER);
mir_strcpy(d, IRC_UM_CHANSETTINGS);
mi.position = 500090002;
hUMenuChanSettings = Menu_AddContactMenuItem(&mi);
hMenuChanSettings = CreateServiceFunction(temp, IrcMenuChanSettings);
mi.name.a = LPGEN("&WhoIs info");
- mi.icolibItem = GetIconHandle(IDI_WHOIS);
+ mi.hIcolibItem = GetIconHandle(IDI_WHOIS);
mir_strcpy(d, IRC_UM_WHOIS);
mi.position = 500090001;
hUMenuWhois = Menu_AddContactMenuItem(&mi);
hMenuWhois = CreateServiceFunction(temp, IrcMenuWhois);
mi.name.a = LPGEN("Di&sconnect");
- mi.icolibItem = GetIconHandle(IDI_DELETE);
+ mi.hIcolibItem = GetIconHandle(IDI_DELETE);
mir_strcpy(d, IRC_UM_DISCONNECT);
mi.position = 500090001;
hUMenuDisconnect = Menu_AddContactMenuItem(&mi);
hMenuDisconnect = CreateServiceFunction(temp, IrcMenuDisconnect);
mi.name.a = LPGEN("&Add to ignore list");
- mi.icolibItem = GetIconHandle(IDI_BLOCK);
+ mi.hIcolibItem = GetIconHandle(IDI_BLOCK);
mir_strcpy(d, IRC_UM_IGNORE);
mi.position = 500090002;
hUMenuIgnore = Menu_AddContactMenuItem(&mi);
diff --git a/protocols/IcqOscarJ/src/icq_menu.cpp b/protocols/IcqOscarJ/src/icq_menu.cpp index 6de74333e1..055ab5ecde 100644 --- a/protocols/IcqOscarJ/src/icq_menu.cpp +++ b/protocols/IcqOscarJ/src/icq_menu.cpp @@ -111,7 +111,7 @@ void g_MenuInit(void) char str[MAXMODULELABELLENGTH], *pszDest = str + 3;
mir_strcpy(str, "ICQ");
- CLISTMENUITEM mi = { 0 };
+ TMO_MenuItem mi = { 0 };
mi.pszService = str;
// "Request authorization"
@@ -119,7 +119,7 @@ void g_MenuInit(void) mi.name.a = LPGEN("Request authorization");
mi.position = 1000030000;
- mi.icolibItem = Skin_GetIconHandle(SKINICON_AUTH_REQUEST);
+ mi.hIcolibItem = Skin_GetIconHandle(SKINICON_AUTH_REQUEST);
g_hContactMenuItems[ICMI_AUTH_REQUEST] = Menu_AddContactMenuItem(&mi);
// "Grant authorization"
@@ -127,7 +127,7 @@ void g_MenuInit(void) mi.name.a = LPGEN("Grant authorization");
mi.position = 1000029999;
- mi.icolibItem = Skin_GetIconHandle(SKINICON_AUTH_GRANT);
+ mi.hIcolibItem = Skin_GetIconHandle(SKINICON_AUTH_GRANT);
g_hContactMenuItems[ICMI_AUTH_GRANT] = Menu_AddContactMenuItem(&mi);
// "Revoke authorization"
@@ -135,7 +135,7 @@ void g_MenuInit(void) mi.name.a = LPGEN("Revoke authorization");
mi.position = 1000029998;
- mi.icolibItem = Skin_GetIconHandle(SKINICON_AUTH_REVOKE);
+ mi.hIcolibItem = Skin_GetIconHandle(SKINICON_AUTH_REVOKE);
g_hContactMenuItems[ICMI_AUTH_REVOKE] = Menu_AddContactMenuItem(&mi);
// "Add to server list"
@@ -143,7 +143,7 @@ void g_MenuInit(void) mi.name.a = LPGEN("Add to server list");
mi.position = -2049999999;
- mi.icolibItem = Skin_GetIconHandle(SKINICON_AUTH_ADD);
+ mi.hIcolibItem = Skin_GetIconHandle(SKINICON_AUTH_ADD);
g_hContactMenuItems[ICMI_ADD_TO_SERVLIST] = Menu_AddContactMenuItem(&mi);
// "Show custom status details"
@@ -151,7 +151,7 @@ void g_MenuInit(void) mi.name.a = LPGEN("Show custom status details");
mi.position = -2000004999;
- mi.icolibItem = 0;
+ mi.hIcolibItem = 0;
g_hContactMenuItems[ICMI_XSTATUS_DETAILS] = Menu_AddContactMenuItem(&mi);
// "Open ICQ profile"
diff --git a/protocols/IcqOscarJ/src/icq_xstatus.cpp b/protocols/IcqOscarJ/src/icq_xstatus.cpp index 2283dadbfa..725eb5ca87 100644 --- a/protocols/IcqOscarJ/src/icq_xstatus.cpp +++ b/protocols/IcqOscarJ/src/icq_xstatus.cpp @@ -853,16 +853,16 @@ void CIcqProto::InitXStatusItems(BOOL bAllowStatus) TCHAR szItem[MAX_PATH + 64];
mir_sntprintf(szItem, _countof(szItem), TranslateT("%s Custom Status"), m_tszUserName);
- CLISTMENUITEM mi = { 0 };
- mi.hParentMenu = Menu_GetProtocolRoot(m_szModuleName);
+ TMO_MenuItem mi = { 0 };
+ mi.root = Menu_GetProtocolRoot(m_szModuleName);
mi.name.t = szItem;
mi.position = 10001;
hRoot = Menu_AddStatusMenuItem(&mi);
}
- CLISTMENUITEM mi = { 0 };
+ TMO_MenuItem mi = { 0 };
mi.position = 2000040000;
- mi.hParentMenu = hRoot;
+ mi.root = hRoot;
int bXStatusMenuBuilt = 0;
for (int i = 0; i <= XSTATUS_COUNT; i++) {
@@ -877,7 +877,7 @@ void CIcqProto::InitXStatusItems(BOOL bAllowStatus) CreateProtoServiceParam(srvFce, &CIcqProto::menuXStatus, i);
mi.flags = (bXStatus == i ? CMIF_CHECKED : 0);
- mi.icolibItem = i ? hXStatusIcons[i-1] : NULL;
+ mi.hIcolibItem = i ? hXStatusIcons[i-1] : NULL;
mi.name.a = i ? (char*)nameXStatus[i-1] : (char *)LPGEN("None");
mi.pszService = srvFce;
diff --git a/protocols/JabberG/src/jabber_menu.cpp b/protocols/JabberG/src/jabber_menu.cpp index 313bc40593..ebf46c4838 100644 --- a/protocols/JabberG/src/jabber_menu.cpp +++ b/protocols/JabberG/src/jabber_menu.cpp @@ -198,12 +198,12 @@ void g_MenuInit(void) //////////////////////////////////////////////////////////////////////////////////////
// Contact menu initialization
- CLISTMENUITEM mi = { 0 };
+ TMO_MenuItem mi = { 0 };
// "Request authorization"
mi.name.a = LPGEN("Request authorization");
mi.position = -2000001000;
- mi.icolibItem = Skin_GetIconHandle(SKINICON_AUTH_REQUEST);
+ mi.hIcolibItem = Skin_GetIconHandle(SKINICON_AUTH_REQUEST);
mi.pszService = "Jabber/ReqAuth";
g_hMenuRequestAuth = Menu_AddContactMenuItem(&mi);
CreateServiceFunction(mi.pszService, JabberMenuHandleRequestAuth);
@@ -212,7 +212,7 @@ void g_MenuInit(void) mi.pszService = "Jabber/GrantAuth";
mi.name.a = LPGEN("Grant authorization");
mi.position = -2000001001;
- mi.icolibItem = Skin_GetIconHandle(SKINICON_AUTH_GRANT);
+ mi.hIcolibItem = Skin_GetIconHandle(SKINICON_AUTH_GRANT);
g_hMenuGrantAuth = Menu_AddContactMenuItem(&mi);
CreateServiceFunction(mi.pszService, JabberMenuHandleGrantAuth);
@@ -220,7 +220,7 @@ void g_MenuInit(void) mi.pszService = "Jabber/RevokeAuth";
mi.name.a = LPGEN("Revoke authorization");
mi.position = -2000001002;
- mi.icolibItem = Skin_GetIconHandle(SKINICON_AUTH_REVOKE);
+ mi.hIcolibItem = Skin_GetIconHandle(SKINICON_AUTH_REVOKE);
g_hMenuRevokeAuth = Menu_AddContactMenuItem(&mi);
CreateServiceFunction(mi.pszService, JabberMenuRevokeAuth);
@@ -228,7 +228,7 @@ void g_MenuInit(void) mi.pszService = "Jabber/ConvertChatContact";
mi.name.a = LPGEN("Convert");
mi.position = -1999901004;
- mi.icolibItem = g_GetIconHandle(IDI_USER2ROOM);
+ mi.hIcolibItem = g_GetIconHandle(IDI_USER2ROOM);
g_hMenuConvert = Menu_AddContactMenuItem(&mi);
CreateServiceFunction(mi.pszService, JabberMenuConvertChatContact);
@@ -236,7 +236,7 @@ void g_MenuInit(void) mi.pszService = "Jabber/AddToRoster";
mi.name.a = LPGEN("Add to roster");
mi.position = -1999901005;
- mi.icolibItem = Skin_GetIconHandle(SKINICON_AUTH_ADD);
+ mi.hIcolibItem = Skin_GetIconHandle(SKINICON_AUTH_ADD);
g_hMenuRosterAdd = Menu_AddContactMenuItem(&mi);
CreateServiceFunction(mi.pszService, JabberMenuRosterAdd);
@@ -244,7 +244,7 @@ void g_MenuInit(void) mi.pszService = "Jabber/AddToBookmarks";
mi.name.a = LPGEN("Add to Bookmarks");
mi.position = -1999901006;
- mi.icolibItem = g_GetIconHandle(IDI_BOOKMARKS);
+ mi.hIcolibItem = g_GetIconHandle(IDI_BOOKMARKS);
g_hMenuAddBookmark = Menu_AddContactMenuItem(&mi);
CreateServiceFunction(mi.pszService, JabberMenuBookmarkAdd);
@@ -252,7 +252,7 @@ void g_MenuInit(void) mi.pszService = "Jabber/TransportLogin";
mi.name.a = LPGEN("Login/logout");
mi.position = -1999901007;
- mi.icolibItem = g_GetIconHandle(IDI_LOGIN);
+ mi.hIcolibItem = g_GetIconHandle(IDI_LOGIN);
g_hMenuLogin = Menu_AddContactMenuItem(&mi);
CreateServiceFunction(mi.pszService, JabberMenuTransportLogin);
@@ -260,7 +260,7 @@ void g_MenuInit(void) mi.pszService = "Jabber/TransportGetNicks";
mi.name.a = LPGEN("Resolve nicks");
mi.position = -1999901008;
- mi.icolibItem = g_GetIconHandle(IDI_REFRESH);
+ mi.hIcolibItem = g_GetIconHandle(IDI_REFRESH);
g_hMenuRefresh = Menu_AddContactMenuItem(&mi);
CreateServiceFunction(mi.pszService, JabberMenuTransportResolve);
@@ -268,7 +268,7 @@ void g_MenuInit(void) mi.pszService = "Jabber/RunCommands";
mi.name.a = LPGEN("Commands");
mi.position = -1999901009;
- mi.icolibItem = g_GetIconHandle(IDI_COMMAND);
+ mi.hIcolibItem = g_GetIconHandle(IDI_COMMAND);
g_hMenuCommands = Menu_AddContactMenuItem(&mi);
CreateServiceFunction(mi.pszService, JabberContactMenuRunCommands);
@@ -276,7 +276,7 @@ void g_MenuInit(void) mi.pszService = "Jabber/SendNote";
mi.name.a = LPGEN("Send Note");
mi.position = -1999901010;
- mi.icolibItem = g_GetIconHandle(IDI_SEND_NOTE);
+ mi.hIcolibItem = g_GetIconHandle(IDI_SEND_NOTE);
g_hMenuSendNote = Menu_AddContactMenuItem(&mi);
CreateServiceFunction(mi.pszService, JabberMenuSendNote);
@@ -284,44 +284,44 @@ void g_MenuInit(void) mi.pszService = "Jabber/DirectPresenceDummySvc";
mi.name.a = LPGEN("Send Presence");
mi.position = -1999901011;
- mi.icolibItem = g_GetIconHandle(IDI_NOTES);
+ mi.hIcolibItem = g_GetIconHandle(IDI_NOTES);
g_hMenuDirectPresence[0] = Menu_AddContactMenuItem(&mi);
mi.flags |= CMIF_TCHAR;
- mi.hParentMenu = g_hMenuDirectPresence[0];
+ mi.root = g_hMenuDirectPresence[0];
for (int i = 0; i < _countof(PresenceModeArray); i++) {
char buf[] = "Jabber/DirectPresenceX";
buf[_countof(buf) - 2] = '0' + i;
mi.pszService = buf;
mi.name.t = pcli->pfnGetStatusModeDescription(PresenceModeArray[i].mode, 0);
mi.position = -1999901000;
- mi.icolibItem = Skin_LoadIcon(PresenceModeArray[i].icon);
+ mi.hIcolibItem = Skin_LoadIcon(PresenceModeArray[i].icon);
g_hMenuDirectPresence[i + 1] = Menu_AddContactMenuItem(&mi);
CreateServiceFunctionParam(mi.pszService, JabberMenuHandleDirectPresence, PresenceModeArray[i].mode);
}
mi.flags &= ~(CMIF_TCHAR);
- mi.hParentMenu = NULL;
+ mi.root = NULL;
// Resource selector
mi.pszService = "Jabber/ResourceSelectorDummySvc";
mi.name.a = LPGEN("Jabber Resource");
mi.position = -1999901011;
- mi.icolibItem = g_GetIconHandle(IDI_JABBER);
+ mi.hIcolibItem = g_GetIconHandle(IDI_JABBER);
g_hMenuResourcesRoot = Menu_AddContactMenuItem(&mi);
mi.pszService = "Jabber/UseResource_last";
mi.name.a = LPGEN("Last Active");
mi.position = -1999901000;
- mi.hParentMenu = g_hMenuResourcesRoot;
- mi.icolibItem = g_GetIconHandle(IDI_JABBER);
+ mi.root = g_hMenuResourcesRoot;
+ mi.hIcolibItem = g_GetIconHandle(IDI_JABBER);
g_hMenuResourcesActive = Menu_AddContactMenuItem(&mi);
CreateServiceFunctionParam(mi.pszService, JabberMenuHandleResource, MENUITEM_LASTSEEN);
mi.pszService = "Jabber/UseResource_server";
mi.name.a = LPGEN("Server's Choice");
mi.position = -1999901000;
- mi.icolibItem = g_GetIconHandle(IDI_NODE_SERVER);
+ mi.hIcolibItem = g_GetIconHandle(IDI_NODE_SERVER);
g_hMenuResourcesServer = Menu_AddContactMenuItem(&mi);
CreateServiceFunctionParam(mi.pszService, JabberMenuHandleResource, MENUITEM_SERVER);
}
@@ -417,7 +417,7 @@ int CJabberProto::OnPrebuildContactMenu(WPARAM hContact, LPARAM) }
char text[256];
- CLISTMENUITEM mi = { 0 };
+ TMO_MenuItem mi = { 0 };
mi.pszService = text;
CMString szTmp;
@@ -427,7 +427,7 @@ int CJabberProto::OnPrebuildContactMenu(WPARAM hContact, LPARAM) CreateProtoServiceParam(text, &CJabberProto::OnMenuHandleResource, MENUITEM_RESOURCES + i);
mi.name.a = "";
mi.position = i;
- mi.hParentMenu = g_hMenuResourcesRoot;
+ mi.root = g_hMenuResourcesRoot;
m_phMenuResourceItems[i] = Menu_AddContactMenuItem(&mi, m_szModuleName);
}
if (i < item->arResources.getCount()) {
@@ -580,11 +580,11 @@ void CJabberProto::MenuInit() {
HGENMENU hJabberRoot = Menu_GetProtocolRoot(m_szModuleName);
if (hJabberRoot == NULL) {
- CLISTMENUITEM mi = { 0 };
+ TMO_MenuItem mi = { 0 };
mi.name.t = m_tszUserName;
mi.position = -1999901006;
mi.flags = CMIF_TCHAR | CMIF_KEEPUNTRANSLATED;
- mi.icolibItem = m_hProtoIcon;
+ mi.hIcolibItem = m_hProtoIcon;
hJabberRoot = m_hMenuRoot = Menu_AddProtoMenuItem(&mi);
}
else {
@@ -594,59 +594,59 @@ void CJabberProto::MenuInit() }
}
- CLISTMENUITEM mi = { 0 };
- mi.hParentMenu = hJabberRoot;
+ TMO_MenuItem mi = { 0 };
+ mi.root = hJabberRoot;
// "Bookmarks..."
mi.pszService = "/Bookmarks";
CreateProtoService(mi.pszService, &CJabberProto::OnMenuHandleBookmarks);
mi.name.a = LPGEN("Bookmarks");
mi.position = 200001;
- mi.icolibItem = GetIconHandle(IDI_BOOKMARKS);
+ mi.hIcolibItem = GetIconHandle(IDI_BOOKMARKS);
m_hMenuBookmarks = Menu_AddProtoMenuItem(&mi, m_szModuleName);
// "Services..."
mi.pszService = NULL;
mi.name.a = LPGEN("Services...");
mi.position = 200003;
- mi.icolibItem = GetIconHandle(IDI_SERVICE_DISCOVERY);
+ mi.hIcolibItem = GetIconHandle(IDI_SERVICE_DISCOVERY);
HGENMENU hMenuServicesRoot = Menu_AddProtoMenuItem(&mi, m_szModuleName);
// "Service Discovery..."
- mi.hParentMenu = hMenuServicesRoot;
+ mi.root = hMenuServicesRoot;
mi.pszService = "/ServiceDiscovery";
CreateProtoService(mi.pszService, &CJabberProto::OnMenuHandleServiceDiscovery);
mi.name.a = LPGEN("Service Discovery");
mi.position = 2000050001;
- mi.icolibItem = GetIconHandle(IDI_SERVICE_DISCOVERY);
+ mi.hIcolibItem = GetIconHandle(IDI_SERVICE_DISCOVERY);
m_hMenuServiceDiscovery = Menu_AddProtoMenuItem(&mi, m_szModuleName);
mi.pszService = "/SD/MyTransports";
CreateProtoService(mi.pszService, &CJabberProto::OnMenuHandleServiceDiscoveryMyTransports);
mi.name.a = LPGEN("Registered Transports");
mi.position = 2000050003;
- mi.icolibItem = GetIconHandle(IDI_TRANSPORTL);
+ mi.hIcolibItem = GetIconHandle(IDI_TRANSPORTL);
m_hMenuSDMyTransports = Menu_AddProtoMenuItem(&mi, m_szModuleName);
mi.pszService = "/SD/Transports";
CreateProtoService(mi.pszService, &CJabberProto::OnMenuHandleServiceDiscoveryTransports);
mi.name.a = LPGEN("Local Server Transports");
mi.position = 2000050004;
- mi.icolibItem = GetIconHandle(IDI_TRANSPORT);
+ mi.hIcolibItem = GetIconHandle(IDI_TRANSPORT);
m_hMenuSDTransports = Menu_AddProtoMenuItem(&mi, m_szModuleName);
mi.pszService = "/SD/Conferences";
CreateProtoService(mi.pszService, &CJabberProto::OnMenuHandleServiceDiscoveryConferences);
mi.name.a = LPGEN("Browse chatrooms");
mi.position = 2000050005;
- mi.icolibItem = GetIconHandle(IDI_GROUP);
+ mi.hIcolibItem = GetIconHandle(IDI_GROUP);
m_hMenuSDConferences = Menu_AddProtoMenuItem(&mi, m_szModuleName);
mi.pszService = "/Groupchat";
CreateProtoService(mi.pszService, &CJabberProto::OnMenuHandleJoinGroupchat);
mi.name.a = LPGEN("Create/Join group chat");
mi.position = 2000050006;
- mi.icolibItem = GetIconHandle(IDI_GROUP);
+ mi.hIcolibItem = GetIconHandle(IDI_GROUP);
m_hMenuGroupchat = Menu_AddProtoMenuItem(&mi, m_szModuleName);
// "Change Password..."
@@ -654,7 +654,7 @@ void CJabberProto::MenuInit() CreateProtoService(mi.pszService, &CJabberProto::OnMenuHandleChangePassword);
mi.name.a = LPGEN("Change Password");
mi.position = 2000050007;
- mi.icolibItem = GetIconHandle(IDI_KEYS);
+ mi.hIcolibItem = GetIconHandle(IDI_KEYS);
m_hMenuChangePassword = Menu_AddProtoMenuItem(&mi, m_szModuleName);
// "Roster editor"
@@ -662,7 +662,7 @@ void CJabberProto::MenuInit() CreateProtoService(mi.pszService, &CJabberProto::OnMenuHandleRosterControl);
mi.name.a = LPGEN("Roster editor");
mi.position = 2000050009;
- mi.icolibItem = GetIconHandle(IDI_AGENTS);
+ mi.hIcolibItem = GetIconHandle(IDI_AGENTS);
m_hMenuRosterControl = Menu_AddProtoMenuItem(&mi, m_szModuleName);
// "XML Console"
@@ -670,14 +670,14 @@ void CJabberProto::MenuInit() CreateProtoService(mi.pszService, &CJabberProto::OnMenuHandleConsole);
mi.name.a = LPGEN("XML Console");
mi.position = 2000050010;
- mi.icolibItem = GetIconHandle(IDI_CONSOLE);
+ mi.hIcolibItem = GetIconHandle(IDI_CONSOLE);
Menu_AddProtoMenuItem(&mi, m_szModuleName);
mi.pszService = "/Notes";
CreateProtoService(mi.pszService, &CJabberProto::OnMenuHandleNotes);
mi.name.a = LPGEN("Notes");
mi.position = 2000050011;
- mi.icolibItem = GetIconHandle(IDI_NOTES);
+ mi.hIcolibItem = GetIconHandle(IDI_NOTES);
m_hMenuNotes = Menu_AddProtoMenuItem(&mi, m_szModuleName);
BuildPrivacyMenu();
@@ -692,7 +692,7 @@ void CJabberProto::MenuInit() mi.pszService = NULL;
mi.position = 200006;
- mi.hParentMenu = hJabberRoot;
+ mi.root = hJabberRoot;
mi.name.a = LPGEN("Resource priority");
mi.flags = CMIF_HIDDEN;
m_hMenuPriorityRoot = Menu_AddProtoMenuItem(&mi);
@@ -703,7 +703,7 @@ void CJabberProto::MenuInit() mi.name.t = szName;
mi.position = 2000040000;
mi.flags = CMIF_TCHAR | CMIF_KEEPUNTRANSLATED;
- mi.hParentMenu = m_hMenuPriorityRoot;
+ mi.root = m_hMenuPriorityRoot;
mir_snprintf(srvFce, _countof(srvFce), "/menuSetPriority/%d", 0);
bool needServices = !ProtoServiceExists(m_szModuleName, srvFce);
@@ -720,11 +720,11 @@ void CJabberProto::MenuInit() mir_snprintf(srvFce, _countof(srvFce), "/menuSetPriority/%d", steps[i]);
if (steps[i] > 0) {
mir_sntprintf(szName, TranslateT("Increase priority by %d"), steps[i]);
- mi.icolibItem = GetIconHandle(IDI_ARROW_UP);
+ mi.hIcolibItem = GetIconHandle(IDI_ARROW_UP);
}
else {
mir_sntprintf(szName, TranslateT("Decrease priority by %d"), -steps[i]);
- mi.icolibItem = GetIconHandle(IDI_ARROW_DOWN);
+ mi.hIcolibItem = GetIconHandle(IDI_ARROW_DOWN);
}
if (needServices)
diff --git a/protocols/JabberG/src/jabber_privacy.cpp b/protocols/JabberG/src/jabber_privacy.cpp index 48b3900a8d..f102978ef8 100644 --- a/protocols/JabberG/src/jabber_privacy.cpp +++ b/protocols/JabberG/src/jabber_privacy.cpp @@ -2090,21 +2090,21 @@ INT_PTR __cdecl CJabberProto::menuSetPrivacyList(WPARAM, LPARAM, LPARAM iList) void CJabberProto::BuildPrivacyMenu()
{
- CLISTMENUITEM mi = { 0 };
+ TMO_MenuItem mi = { 0 };
mi.position = 200005;
- mi.icolibItem = GetIconHandle(IDI_AGENTS);
+ mi.hIcolibItem = GetIconHandle(IDI_AGENTS);
mi.flags = CMIF_HIDDEN;
mi.name.a = LPGEN("Privacy Lists");
- mi.hParentMenu = Menu_GetProtocolRoot(m_szModuleName);
+ mi.root = Menu_GetProtocolRoot(m_szModuleName);
m_hPrivacyMenuRoot = Menu_AddProtoMenuItem(&mi);
mi.pszService = "/PrivacyLists";
CreateProtoService(mi.pszService, &CJabberProto::OnMenuHandlePrivacyLists);
mi.position = 3000040000;
mi.flags = CMIF_TCHAR;
- mi.icolibItem = GetIconHandle(IDI_PRIVACY_LISTS);
+ mi.hIcolibItem = GetIconHandle(IDI_PRIVACY_LISTS);
mi.name.t = LPGENT("List Editor...");
- mi.hParentMenu = m_hPrivacyMenuRoot;
+ mi.root = m_hPrivacyMenuRoot;
Menu_AddProtoMenuItem(&mi, m_szModuleName);
}
@@ -2120,10 +2120,10 @@ void CJabberProto::BuildPrivacyListsMenu(bool bDeleteOld) char srvFce[MAX_PATH + 64];
- CLISTMENUITEM mi = { 0 };
+ TMO_MenuItem mi = { 0 };
mi.position = 2000040000;
mi.flags = CMIF_TCHAR;
- mi.hParentMenu = m_hPrivacyMenuRoot;
+ mi.root = m_hPrivacyMenuRoot;
mi.pszService = srvFce;
int i = 0;
@@ -2133,7 +2133,7 @@ void CJabberProto::BuildPrivacyListsMenu(bool bDeleteOld) m_privacyMenuServiceAllocated = i;
}
mi.position++;
- mi.icolibItem = Skin_GetIconHandle(m_privacyListManager.GetActiveListName() ? SKINICON_OTHER_SMALLDOT : SKINICON_OTHER_EMPTYBLOB);
+ mi.hIcolibItem = Skin_GetIconHandle(m_privacyListManager.GetActiveListName() ? SKINICON_OTHER_SMALLDOT : SKINICON_OTHER_EMPTYBLOB);
mi.name.t = LPGENT("<none>");
m_hPrivacyMenuItems.insert(Menu_AddProtoMenuItem(&mi, m_szModuleName));
@@ -2147,7 +2147,7 @@ void CJabberProto::BuildPrivacyListsMenu(bool bDeleteOld) }
mi.position++;
- mi.icolibItem = Skin_GetIconHandle(
+ mi.hIcolibItem = Skin_GetIconHandle(
mir_tstrcmp(m_privacyListManager.GetActiveListName(), pList->GetListName()) ? SKINICON_OTHER_SMALLDOT : SKINICON_OTHER_EMPTYBLOB);
mi.name.t = pList->GetListName();
m_hPrivacyMenuItems.insert(Menu_AddProtoMenuItem(&mi, m_szModuleName));
diff --git a/protocols/JabberG/src/jabber_xstatus.cpp b/protocols/JabberG/src/jabber_xstatus.cpp index 93aad6d7e3..a9454ec559 100644 --- a/protocols/JabberG/src/jabber_xstatus.cpp +++ b/protocols/JabberG/src/jabber_xstatus.cpp @@ -465,12 +465,12 @@ void CPepGuiService::RebuildMenu() char szService[128];
mir_snprintf(szService, "/AdvStatusSet/%s", m_name);
- CLISTMENUITEM mi = { 0 };
- mi.hParentMenu = hJabberRoot;
+ TMO_MenuItem mi = { 0 };
+ mi.root = hJabberRoot;
mi.pszService = szService;
mi.position = 200010;
mi.flags = CMIF_TCHAR | CMIF_HIDDEN;
- mi.icolibItem = m_hIcolibItem;
+ mi.hIcolibItem = m_hIcolibItem;
mi.name.t = m_szText ? m_szText : _T("<advanced status slot>");
m_hMenuItem = Menu_AddProtoMenuItem(&mi, m_proto->m_szModuleName);
}
diff --git a/protocols/MRA/src/Mra_menus.cpp b/protocols/MRA/src/Mra_menus.cpp index c935384d93..41563e74bb 100644 --- a/protocols/MRA/src/Mra_menus.cpp +++ b/protocols/MRA/src/Mra_menus.cpp @@ -284,16 +284,16 @@ int CMraProto::MraRebuildStatusMenu(WPARAM, LPARAM) TCHAR szItem[MAX_PATH + 64];
mir_sntprintf(szItem, _countof(szItem), _T("%s Custom Status"), m_tszUserName);
- CLISTMENUITEM mi = { 0 };
- mi.hParentMenu = Menu_GetProtocolRoot(m_szModuleName);
+ TMO_MenuItem mi = { 0 };
+ mi.root = Menu_GetProtocolRoot(m_szModuleName);
mi.name.t = szItem;
mi.position = 10001;
hRoot = Menu_AddStatusMenuItem(&mi);
}
- CLISTMENUITEM mi = { 0 };
+ TMO_MenuItem mi = { 0 };
mi.position = 2000060000;
- mi.hParentMenu = hRoot;
+ mi.root = hRoot;
mi.flags = CMIF_UNICODE;
mi.pszService = szServiceFunction;
@@ -312,11 +312,11 @@ int CMraProto::MraRebuildStatusMenu(WPARAM, LPARAM) else
mi.name.t = (TCHAR*)lpcszXStatusNameDef[i];
- mi.icolibItem = hXStatusAdvancedStatusIcons[i];
+ mi.hIcolibItem = hXStatusAdvancedStatusIcons[i];
}
else {
mi.name.t = (TCHAR*)lpcszXStatusNameDef[i];
- mi.icolibItem = NULL;
+ mi.hIcolibItem = NULL;
}
hXStatusMenuItems[i] = Menu_AddStatusMenuItem(&mi, m_szModuleName);
}
@@ -332,9 +332,9 @@ HGENMENU CMraProto::CListCreateMenu(LONG lPosition, LONG lPopupPosition, BOOL bI char szServiceFunction[MAX_PATH];
- CLISTMENUITEM mi = { 0 };
+ TMO_MenuItem mi = { 0 };
- HGENMENU hRootMenu, (__stdcall *fnAddFunc)(CLISTMENUITEM*, const char*, int);
+ HGENMENU hRootMenu, (__stdcall *fnAddFunc)(TMO_MenuItem*, const char*, int);
if (bIsMain) {
fnAddFunc = Menu_AddProtoMenuItem;
@@ -342,12 +342,12 @@ HGENMENU CMraProto::CListCreateMenu(LONG lPosition, LONG lPopupPosition, BOOL bI if (hRootMenu == NULL) {
mi.name.t = m_tszUserName;
mi.flags = CMIF_TCHAR | CMIF_KEEPUNTRANSLATED;
- mi.icolibItem = g_hMainIcon;
+ mi.hIcolibItem = g_hMainIcon;
hRootMenu = Menu_AddProtoMenuItem(&mi);
}
mi.position = 20003;
- mi.hParentMenu = hRootMenu;
+ mi.root = hRootMenu;
}
else {
fnAddFunc = Menu_AddContactMenuItem;
@@ -356,16 +356,16 @@ HGENMENU CMraProto::CListCreateMenu(LONG lPosition, LONG lPopupPosition, BOOL bI mi.flags = 0;
mi.name.a = LPGEN("Services...");
- mi.icolibItem = g_hMainIcon;
+ mi.hIcolibItem = g_hMainIcon;
hRootMenu = fnAddFunc(&mi, m_szModuleName, hLangpack);
- mi.hParentMenu = hRootMenu;
+ mi.root = hRootMenu;
mi.pszService = szServiceFunction;
for (size_t i = 0; i < dwCount; i++) {
mi.pszService = pgdiItems[i].szName;
mi.position = int(lPosition + i);
- mi.icolibItem = pgdiItems[i].hIcolib;
+ mi.hIcolibItem = pgdiItems[i].hIcolib;
mi.name.a = pgdiItems[i].szDescr;
hResult[i] = fnAddFunc(&mi, m_szModuleName, hLangpack);
Menu_ConfigureItem(hResult[i], MCI_OPT_EXECPARAM, lPopupPosition);
diff --git a/protocols/MSN/src/msn_menu.cpp b/protocols/MSN/src/msn_menu.cpp index 334d51c66f..877c5a2f5d 100644 --- a/protocols/MSN/src/msn_menu.cpp +++ b/protocols/MSN/src/msn_menu.cpp @@ -268,13 +268,13 @@ INT_PTR CMsnProto::SetNicknameUI(WPARAM, LPARAM) void CMsnProto::MsnInitMainMenu(void)
{
- CLISTMENUITEM mi = { 0 };
+ TMO_MenuItem mi = { 0 };
HGENMENU hRoot = Menu_GetProtocolRoot(m_szModuleName);
if (hRoot == NULL) {
mi.position = 500085000;
mi.flags = CMIF_TCHAR | CMIF_KEEPUNTRANSLATED;
- mi.icolibItem = GetIconHandle(IDI_MSN);
+ mi.hIcolibItem = GetIconHandle(IDI_MSN);
mi.name.t = m_tszUserName;
hRoot = mainMenuRoot = Menu_AddProtoMenuItem(&mi);
}
@@ -284,13 +284,13 @@ void CMsnProto::MsnInitMainMenu(void) }
mi.flags = 0;
- mi.hParentMenu = hRoot;
+ mi.root = hRoot;
#ifdef OBSOLETE
mi.pszService = MS_SET_NICKNAME_UI;
CreateProtoService(mi.pszService, &CMsnProto::SetNicknameUI);
mi.position = 201001;
- mi.icolibItem = GetIconHandle(IDI_MSN);
+ mi.hIcolibItem = GetIconHandle(IDI_MSN);
mi.name.a = LPGEN("Set &Nickname");
menuItemsMain[0] = Menu_AddProtoMenuItem(&mi, m_szModuleName);
#endif
@@ -298,28 +298,28 @@ void CMsnProto::MsnInitMainMenu(void) mi.pszService = MSN_INVITE;
CreateProtoService(mi.pszService, &CMsnProto::MsnInviteCommand);
mi.position = 201002;
- mi.icolibItem = GetIconHandle(IDI_INVITE);
+ mi.hIcolibItem = GetIconHandle(IDI_INVITE);
mi.name.a = LPGEN("Create &Chat");
menuItemsMain[0] = Menu_AddProtoMenuItem(&mi, m_szModuleName);
mi.pszService = MS_GOTO_INBOX;
CreateProtoService(mi.pszService, &CMsnProto::MsnGotoInbox);
mi.position = 201003;
- mi.icolibItem = GetIconHandle(IDI_INBOX);
+ mi.hIcolibItem = GetIconHandle(IDI_INBOX);
mi.name.a = LPGEN("Display &Hotmail Inbox");
menuItemsMain[1] = Menu_AddProtoMenuItem(&mi, m_szModuleName);
mi.pszService = MS_EDIT_PROFILE;
CreateProtoService(mi.pszService, &CMsnProto::MsnEditProfile);
mi.position = 201004;
- mi.icolibItem = GetIconHandle(IDI_PROFILE);
+ mi.hIcolibItem = GetIconHandle(IDI_PROFILE);
mi.name.a = LPGEN("View &Profile");
menuItemsMain[2] = Menu_AddProtoMenuItem(&mi, m_szModuleName);
mi.pszService = MS_EDIT_ALERTS;
CreateProtoService(mi.pszService, &CMsnProto::MsnSetupAlerts);
mi.position = 201004;
- mi.icolibItem = GetIconHandle(IDI_PROFILE);
+ mi.hIcolibItem = GetIconHandle(IDI_PROFILE);
mi.name.a = LPGEN("Setup Live &Alerts");
menuItemsMain[3] = Menu_AddProtoMenuItem(&mi, m_szModuleName);
@@ -398,20 +398,20 @@ void MSN_InitContactMenu(void) mir_strcpy(servicefunction, "MSN");
char* tDest = servicefunction + mir_strlen(servicefunction);
- CLISTMENUITEM mi = { 0 };
+ TMO_MenuItem mi = { 0 };
mi.pszService = servicefunction;
mir_strcpy(tDest, MSN_BLOCK);
hBlockCom = CreateServiceFunction(servicefunction, MsnMenuBlockCommand);
mi.position = -500050000;
- mi.icolibItem = GetIconHandle(IDI_MSNBLOCK);
+ mi.hIcolibItem = GetIconHandle(IDI_MSNBLOCK);
mi.name.a = LPGEN("&Block");
hBlockMenuItem = Menu_AddContactMenuItem(&mi);
mir_strcpy(tDest, MSN_VIEW_PROFILE);
hViewProfile = CreateServiceFunction(servicefunction, MsnMenuViewProfile);
mi.position = -500050003;
- mi.icolibItem = GetIconHandle(IDI_PROFILE);
+ mi.hIcolibItem = GetIconHandle(IDI_PROFILE);
mi.name.a = LPGEN("View &Profile");
hLiveSpaceMenuItem = Menu_AddContactMenuItem(&mi);
@@ -420,7 +420,7 @@ void MSN_InitContactMenu(void) hNetMeeting = CreateServiceFunction(servicefunction, MsnMenuSendNetMeeting);
mi.flags = CMIF_NOTOFFLINE;
mi.position = -500050002;
- mi.icolibItem = GetIconHandle(IDI_NETMEETING);
+ mi.hIcolibItem = GetIconHandle(IDI_NETMEETING);
mi.name.a = LPGEN("&Start Netmeeting");
hNetmeetingMenuItem = Menu_AddContactMenuItem(&mi);
#endif
@@ -429,7 +429,7 @@ void MSN_InitContactMenu(void) hSendHotMail = CreateServiceFunction(servicefunction, MsnMenuSendHotmail);
mi.position = -2000010005;
mi.flags = CMIF_HIDDEN;
- mi.icolibItem = Skin_GetIconHandle(SKINICON_OTHER_SENDEMAIL);
+ mi.hIcolibItem = Skin_GetIconHandle(SKINICON_OTHER_SENDEMAIL);
mi.name.a = LPGEN("Open &Hotmail Inbox");
hOpenInboxMenuItem = Menu_AddContactMenuItem(&mi);
diff --git a/protocols/Sametime/src/conference.cpp b/protocols/Sametime/src/conference.cpp index 3ac009dc6e..0eebe780b6 100644 --- a/protocols/Sametime/src/conference.cpp +++ b/protocols/Sametime/src/conference.cpp @@ -508,17 +508,17 @@ void CSametimeProto::InitConferenceMenu() CreateProtoService(MS_SAMETIME_MENULEAVECHAT, &CSametimeProto::onMenuLeaveChat);
CreateProtoService(MS_SAMETIME_MENUCREATECHAT, &CSametimeProto::onMenuCreateChat);
- CLISTMENUITEM mi = { 0 };
+ TMO_MenuItem mi = { 0 };
mi.flags = CMIF_TCHAR | CMIF_NOTOFFLINE;
mi.name.t = LPGENT("Leave conference");
mi.pszService = MS_SAMETIME_MENULEAVECHAT;
- mi.icolibItem = GetIconHandle(IDI_ICON_LEAVE);
+ mi.hIcolibItem = GetIconHandle(IDI_ICON_LEAVE);
hLeaveChatMenuItem = Menu_AddContactMenuItem(&mi, m_szModuleName);
mi.name.t = LPGENT("Start conference");
mi.pszService = MS_SAMETIME_MENUCREATECHAT;
- mi.icolibItem = GetIconHandle(IDI_ICON_INVITE);
+ mi.hIcolibItem = GetIconHandle(IDI_ICON_INVITE);
hCreateChatMenuItem = Menu_AddContactMenuItem(&mi);
HookProtoEvent(ME_CLIST_PREBUILDCONTACTMENU, &CSametimeProto::PrebuildContactMenu);
diff --git a/protocols/Sametime/src/sametime_session.cpp b/protocols/Sametime/src/sametime_session.cpp index 96826d75d9..4b49c436ea 100644 --- a/protocols/Sametime/src/sametime_session.cpp +++ b/protocols/Sametime/src/sametime_session.cpp @@ -560,11 +560,11 @@ void CSametimeProto::InitSessionMenu() CreateProtoService(MS_SAMETIME_MENUANNOUNCESESSION, &CSametimeProto::SessionAnnounce);
- CLISTMENUITEM mi = { 0 };
+ TMO_MenuItem mi = { 0 };
mi.flags = CMIF_TCHAR;
mi.position = 2000060000;
mi.name.t = LPGENT("Send announcement...");
mi.pszService = MS_SAMETIME_MENUANNOUNCESESSION;
- mi.icolibItem = GetIconHandle(IDI_ICON_ANNOUNCE);
+ mi.hIcolibItem = GetIconHandle(IDI_ICON_ANNOUNCE);
Menu_AddContactMenuItem(&mi, m_szModuleName);
}
diff --git a/protocols/SkypeWeb/src/skype_menus.cpp b/protocols/SkypeWeb/src/skype_menus.cpp index 15700ec21a..8400cc483a 100644 --- a/protocols/SkypeWeb/src/skype_menus.cpp +++ b/protocols/SkypeWeb/src/skype_menus.cpp @@ -60,14 +60,14 @@ void CSkypeProto::InitMenus() //hChooserMenu = Menu_AddObject("SkypeAccountChooser", LPGEN("Skype menu chooser"), 0, "Skype/MenuChoose");
- CLISTMENUITEM mi = { 0 };
+ TMO_MenuItem mi = { 0 };
mi.flags = CMIF_TCHAR;
// Request authorization
mi.pszService = MODULE"/RequestAuth";
mi.name.t = LPGENT("Request authorization");
mi.position = CMI_POSITION + CMI_AUTH_REQUEST;
- mi.icolibItem = ::Skin_GetIconHandle(SKINICON_AUTH_REQUEST);
+ mi.hIcolibItem = ::Skin_GetIconHandle(SKINICON_AUTH_REQUEST);
ContactMenuItems[CMI_AUTH_REQUEST] = Menu_AddContactMenuItem(&mi);
CreateServiceFunction(mi.pszService, GlobalService<&CSkypeProto::OnRequestAuth>);
@@ -75,28 +75,28 @@ void CSkypeProto::InitMenus() mi.pszService = MODULE"/GrantAuth";
mi.name.t = LPGENT("Grant authorization");
mi.position = CMI_POSITION + CMI_AUTH_GRANT;
- mi.icolibItem = ::Skin_GetIconHandle(SKINICON_AUTH_GRANT);
+ mi.hIcolibItem = ::Skin_GetIconHandle(SKINICON_AUTH_GRANT);
ContactMenuItems[CMI_AUTH_GRANT] = Menu_AddContactMenuItem(&mi);
CreateServiceFunction(mi.pszService, GlobalService<&CSkypeProto::OnGrantAuth>);
mi.pszService = MODULE"/GetHistory";
mi.name.t = LPGENT("Get server history");
mi.position = CMI_POSITION + CMI_GETSERVERHISTORY;
- mi.icolibItem = GetIconHandle("synchistory");
+ mi.hIcolibItem = GetIconHandle("synchistory");
ContactMenuItems[CMI_GETSERVERHISTORY] = Menu_AddContactMenuItem(&mi);
CreateServiceFunction(mi.pszService, GlobalService<&CSkypeProto::GetContactHistory>);
mi.pszService = MODULE"/BlockContact";
mi.name.t = LPGENT("Block contact");
mi.position = CMI_POSITION + CMI_BLOCK;
- mi.icolibItem = GetIconHandle("user_block");
+ mi.hIcolibItem = GetIconHandle("user_block");
ContactMenuItems[CMI_BLOCK] = Menu_AddContactMenuItem(&mi);
CreateServiceFunction(mi.pszService, GlobalService<&CSkypeProto::BlockContact>);
mi.pszService = MODULE"/UnblockContact";
mi.name.t = LPGENT("Unblock contact");
mi.position = CMI_POSITION + CMI_UNBLOCK;
- mi.icolibItem = GetIconHandle("user_unblock");
+ mi.hIcolibItem = GetIconHandle("user_unblock");
ContactMenuItems[CMI_UNBLOCK] = Menu_AddContactMenuItem(&mi);
CreateServiceFunction(mi.pszService, GlobalService<&CSkypeProto::UnblockContact>);
}
@@ -111,22 +111,22 @@ int CSkypeProto::OnInitStatusMenu() HGENMENU hStatusMenuRoot = Menu_GetProtocolRoot(m_szModuleName);
if (!hStatusMenuRoot)
{
- CLISTMENUITEM mi = { 0 };
+ TMO_MenuItem mi = { 0 };
mi.name.t = m_tszUserName;
mi.position = -1999901006;
mi.flags = CMIF_TCHAR | CMIF_KEEPUNTRANSLATED;
- mi.icolibItem = Skin_GetIconHandle("main");
+ mi.hIcolibItem = Skin_GetIconHandle("main");
hStatusMenuRoot = Menu_AddProtoMenuItem(&mi);
}
- CLISTMENUITEM mi = { 0 };
- mi.hParentMenu = hStatusMenuRoot;
+ TMO_MenuItem mi = { 0 };
+ mi.root = hStatusMenuRoot;
mi.pszService = "/CreateNewChat";
CreateProtoService(mi.pszService, &CSkypeProto::SvcCreateChat);
mi.name.a = LPGEN("Create new chat");
mi.position = SMI_POSITION + SMI_CREATECHAT;
- mi.icolibItem = GetIconHandle("conference");
+ mi.hIcolibItem = GetIconHandle("conference");
Menu_AddProtoMenuItem(&mi, m_szModuleName);
return 0;
}
\ No newline at end of file diff --git a/protocols/Steam/src/steam_menus.cpp b/protocols/Steam/src/steam_menus.cpp index 5ec4a180b1..ce37b63de8 100644 --- a/protocols/Steam/src/steam_menus.cpp +++ b/protocols/Steam/src/steam_menus.cpp @@ -98,7 +98,7 @@ void CSteamProto::OnInitStatusMenu() {
HGENMENU hSteamRoot = Menu_GetProtocolRoot(m_szModuleName);
if (!hSteamRoot) {
- CLISTMENUITEM mi = { 0 };
+ TMO_MenuItem mi = { 0 };
mi.name.t = m_tszUserName;
mi.position = -1999901006;
mi.flags = CMIF_TCHAR | CMIF_KEEPUNTRANSLATED;
@@ -109,8 +109,8 @@ void CSteamProto::OnInitStatusMenu() m_hMenuRoot = NULL;
}
- CLISTMENUITEM mi = { 0 };
- mi.hParentMenu = hSteamRoot;
+ TMO_MenuItem mi = { 0 };
+ mi.root = hSteamRoot;
// Show block list
mi.pszService = "/BlockList";
@@ -126,14 +126,14 @@ void CSteamProto::InitMenus() //////////////////////////////////////////////////////////////////////////////////////
// Contact menu initialization
- CLISTMENUITEM mi = { 0 };
+ TMO_MenuItem mi = { 0 };
mi.flags = CMIF_TCHAR;
// "Request authorization"
mi.pszService = MODULE "/AuthRequest";
mi.name.t = LPGENT("Request authorization");
mi.position = -201001000 + CMI_AUTH_REQUEST;
- mi.icolibItem = Skin_GetIconHandle(SKINICON_AUTH_REQUEST);
+ mi.hIcolibItem = Skin_GetIconHandle(SKINICON_AUTH_REQUEST);
contactMenuItems[CMI_AUTH_REQUEST] = Menu_AddContactMenuItem(&mi);
CreateServiceFunction(mi.pszService, GlobalService<&CSteamProto::AuthRequestCommand>);
@@ -141,7 +141,7 @@ void CSteamProto::InitMenus() mi.pszService = MODULE "/Block";
mi.name.t = LPGENT("Block");
mi.position = -201001001 + CMI_BLOCK;
- mi.icolibItem = Skin_GetIconHandle(SKINICON_AUTH_REQUEST);
+ mi.hIcolibItem = Skin_GetIconHandle(SKINICON_AUTH_REQUEST);
contactMenuItems[CMI_BLOCK] = Menu_AddContactMenuItem(&mi);
CreateServiceFunction(mi.pszService, GlobalService<&CSteamProto::BlockCommand>);
@@ -151,7 +151,7 @@ void CSteamProto::InitMenus() mi.pszService = MODULE "/JoinToGame";
mi.name.t = LPGENT("Join to game");
mi.position = -200001000 + CMI_JOIN_GAME;
- mi.icolibItem = NULL;
+ mi.hIcolibItem = NULL;
contactMenuItems[CMI_JOIN_GAME] = Menu_AddContactMenuItem(&mi);
CreateServiceFunction(mi.pszService, GlobalService<&CSteamProto::JoinToGameCommand>);
}
diff --git a/protocols/Tlen/src/tlen.cpp b/protocols/Tlen/src/tlen.cpp index 9476cb3f37..da55e2f5f2 100644 --- a/protocols/Tlen/src/tlen.cpp +++ b/protocols/Tlen/src/tlen.cpp @@ -264,8 +264,8 @@ void TlenProtocol::initMenuItems() strncpy_s(text, m_szModuleName, _TRUNCATE);
char *pSvcName = text + mir_strlen(text);
- CLISTMENUITEM mi = { 0 };
- mi.hParentMenu = hMenuRoot = Menu_CreateRoot(MO_MAIN, m_tszUserName, -1999901009, GetIconHandle(IDI_TLEN));
+ TMO_MenuItem mi = { 0 };
+ mi.root = hMenuRoot = Menu_CreateRoot(MO_MAIN, m_tszUserName, -1999901009, GetIconHandle(IDI_TLEN));
mi.pszService = text;
hMenuChats = NULL;
@@ -275,7 +275,7 @@ void TlenProtocol::initMenuItems() CreateProtoService(pSvcName, &TlenProtocol::MUCMenuHandleMUC);
mi.name.a = LPGEN("Multi-User Conference");
mi.position = 2000050002;
- mi.icolibItem = GetIconHandle(IDI_MUC);
+ mi.hIcolibItem = GetIconHandle(IDI_MUC);
mi.pszService = text;
hMenuMUC = Menu_AddMainMenuItem(&mi);
@@ -283,19 +283,19 @@ void TlenProtocol::initMenuItems() CreateProtoService(pSvcName, &TlenProtocol::MenuHandleInbox);
mi.name.a = LPGEN("Tlen Mail");
mi.position = 2000050003;
- mi.icolibItem = GetIconHandle(IDI_MAIL);
+ mi.hIcolibItem = GetIconHandle(IDI_MAIL);
mi.pszService = text;
hMenuInbox = Menu_AddMainMenuItem(&mi);
// contact menu items
- mi.hParentMenu = NULL;
+ mi.root = NULL;
// "Send picture"
mi.pszService = "/SendPicture";
CreateProtoService(mi.pszService, &TlenProtocol::ContactMenuHandleSendPicture);
mi.name.a = LPGEN("Send picture");
mi.position = -2000019030;
- mi.icolibItem = GetIconHandle(IDI_IMAGE);
+ mi.hIcolibItem = GetIconHandle(IDI_IMAGE);
hMenuPicture = Menu_AddContactMenuItem(&mi, m_szModuleName);
// "Invite to MUC"
@@ -303,7 +303,7 @@ void TlenProtocol::initMenuItems() CreateProtoService(mi.pszService, &TlenProtocol::MUCContactMenuHandleMUC);
mi.name.a = LPGEN("Multi-User Conference");
mi.position = -2000019020;
- mi.icolibItem = GetIconHandle(IDI_MUC);
+ mi.hIcolibItem = GetIconHandle(IDI_MUC);
hMenuContactMUC = Menu_AddContactMenuItem(&mi, m_szModuleName);
// "Invite to voice chat"
@@ -311,7 +311,7 @@ void TlenProtocol::initMenuItems() CreateProtoService(mi.pszService, &TlenProtocol::VoiceContactMenuHandleVoice);
mi.name.a = LPGEN("Voice Chat");
mi.position = -2000019010;
- mi.icolibItem = GetIconHandle(IDI_VOICE);
+ mi.hIcolibItem = GetIconHandle(IDI_VOICE);
hMenuContactVoice = Menu_AddContactMenuItem(&mi, m_szModuleName);
// "Request authorization"
@@ -319,7 +319,7 @@ void TlenProtocol::initMenuItems() CreateProtoService(mi.pszService, &TlenProtocol::ContactMenuHandleRequestAuth);
mi.name.a = LPGEN("Request authorization");
mi.position = -2000001001;
- mi.icolibItem = Skin_GetIconHandle(SKINICON_AUTH_REQUEST);
+ mi.hIcolibItem = Skin_GetIconHandle(SKINICON_AUTH_REQUEST);
hMenuContactRequestAuth = Menu_AddContactMenuItem(&mi, m_szModuleName);
// "Grant authorization"
@@ -327,7 +327,7 @@ void TlenProtocol::initMenuItems() CreateProtoService(mi.pszService, &TlenProtocol::ContactMenuHandleGrantAuth);
mi.name.a = LPGEN("Grant authorization");
mi.position = -2000001000;
- mi.icolibItem = Skin_GetIconHandle(SKINICON_AUTH_GRANT);
+ mi.hIcolibItem = Skin_GetIconHandle(SKINICON_AUTH_GRANT);
hMenuContactGrantAuth = Menu_AddContactMenuItem(&mi, m_szModuleName);
}
diff --git a/protocols/Tox/src/tox_menus.cpp b/protocols/Tox/src/tox_menus.cpp index fd99f26022..22852b5b4d 100644 --- a/protocols/Tox/src/tox_menus.cpp +++ b/protocols/Tox/src/tox_menus.cpp @@ -41,14 +41,14 @@ void CToxProto::InitMenus() //hChooserMenu = Menu_AddObject("SkypeAccountChooser", LPGEN("Skype menu chooser"), 0, "Skype/MenuChoose");
- CLISTMENUITEM mi = { 0 };
+ TMO_MenuItem mi = { 0 };
mi.flags = CMIF_TCHAR;
// Request authorization
mi.pszService = MODULE"/RequestAuth";
mi.name.t = LPGENT("Request authorization");
mi.position = CMI_POSITION + CMI_AUTH_REQUEST;
- mi.icolibItem = ::Skin_GetIconHandle(SKINICON_AUTH_REQUEST);
+ mi.hIcolibItem = ::Skin_GetIconHandle(SKINICON_AUTH_REQUEST);
ContactMenuItems[CMI_AUTH_REQUEST] = Menu_AddContactMenuItem(&mi);
CreateServiceFunction(mi.pszService, GlobalService<&CToxProto::OnRequestAuth>);
@@ -56,7 +56,7 @@ void CToxProto::InitMenus() mi.pszService = MODULE"/GrantAuth";
mi.name.t = LPGENT("Grant authorization");
mi.position = CMI_POSITION + CMI_AUTH_GRANT;
- mi.icolibItem = ::Skin_GetIconHandle(SKINICON_AUTH_GRANT);
+ mi.hIcolibItem = ::Skin_GetIconHandle(SKINICON_AUTH_GRANT);
ContactMenuItems[CMI_AUTH_GRANT] = Menu_AddContactMenuItem(&mi);
CreateServiceFunction(mi.pszService, GlobalService<&CToxProto::OnGrantAuth>);
@@ -64,7 +64,7 @@ void CToxProto::InitMenus() mi.pszService = MODULE"/Audio/Call";
mi.name.t = LPGENT("Call");
mi.position = -2000020000 + CMI_AUDIO_CALL;
- mi.icolibItem = GetIconHandle("audio_start");
+ mi.hIcolibItem = GetIconHandle("audio_start");
ContactMenuItems[CMI_AUDIO_CALL] = Menu_AddContactMenuItem(&mi);
CreateServiceFunction(mi.pszService, GlobalService<&CToxProto::OnSendAudioCall>);
}
@@ -79,16 +79,16 @@ int CToxProto::OnInitStatusMenu() HGENMENU hStatusMenuRoot = Menu_GetProtocolRoot(m_szModuleName);
if (!hStatusMenuRoot)
{
- CLISTMENUITEM mi = { 0 };
+ TMO_MenuItem mi = { 0 };
mi.name.t = m_tszUserName;
mi.position = -1999901006;
mi.flags = CMIF_TCHAR | CMIF_KEEPUNTRANSLATED;
- mi.icolibItem = Skin_GetIconHandle("main");
+ mi.hIcolibItem = Skin_GetIconHandle("main");
hStatusMenuRoot = Menu_AddProtoMenuItem(&mi);
}
- CLISTMENUITEM mi = { 0 };
- mi.hParentMenu = hStatusMenuRoot;
+ TMO_MenuItem mi = { 0 };
+ mi.root = hStatusMenuRoot;
// Create copy tox id command
mi.pszService = "/CopyToxID";
@@ -103,7 +103,7 @@ int CToxProto::OnInitStatusMenu() CreateProtoService(mi.pszService, &CToxProto::OnCreateChatRoom);
mi.name.t = LPGENT("Create group chat");
mi.position = SMI_POSITION + SMI_GROUPCHAT_CREATE;
- mi.icolibItem = Skin_GetIconHandle("conference");
+ mi.hIcolibItem = Skin_GetIconHandle("conference");
HGENMENU hCreateChatRoom = Menu_AddProtoMenuItem(&mi, m_szModuleName);*/
return 0;
diff --git a/protocols/Twitter/src/proto.cpp b/protocols/Twitter/src/proto.cpp index ba5ebc4672..0d65b25b0c 100644 --- a/protocols/Twitter/src/proto.cpp +++ b/protocols/Twitter/src/proto.cpp @@ -260,10 +260,10 @@ int TwitterProto::OnBuildStatusMenu(WPARAM, LPARAM) mir_strcpy(text, m_szModuleName);
char *tDest = text + mir_strlen(text);
- CLISTMENUITEM mi = { 0 };
+ TMO_MenuItem mi = { 0 };
mi.pszService = text;
- mi.hParentMenu = hRoot;
+ mi.root = hRoot;
mi.flags = CMIF_TCHAR;
mi.position = 1001;
Menu_AddStatusMenuItem(&mi);
@@ -274,7 +274,7 @@ int TwitterProto::OnBuildStatusMenu(WPARAM, LPARAM) mir_strcpy(tDest, "/Tweet");
mi.name.t = LPGENT("Send Tweet...");
mi.position = 200001;
- mi.icolibItem = GetIconHandle("tweet");
+ mi.hIcolibItem = GetIconHandle("tweet");
Menu_AddStatusMenuItem(&mi);
return 0;
}
diff --git a/protocols/Twitter/src/theme.cpp b/protocols/Twitter/src/theme.cpp index 53606e35a5..30e88a23b0 100644 --- a/protocols/Twitter/src/theme.cpp +++ b/protocols/Twitter/src/theme.cpp @@ -86,18 +86,18 @@ void InitContactMenus() {
g_hMenuEvts[0] = HookEvent(ME_CLIST_PREBUILDCONTACTMENU, PrebuildContactMenu);
- CLISTMENUITEM mi = { 0 };
+ TMO_MenuItem mi = { 0 };
mi.flags = CMIF_NOTOFFLINE | CMIF_TCHAR;
mi.position = -2000006000;
- mi.icolibItem = GetIconHandle("reply");
+ mi.hIcolibItem = GetIconHandle("reply");
mi.name.t = LPGENT("Reply...");
mi.pszService = "Twitter/ReplyToTweet";
g_hMenuEvts[1] = CreateServiceFunction(mi.pszService, GlobalService<&TwitterProto::ReplyToTweet>);
g_hMenuItems[0] = Menu_AddContactMenuItem(&mi);
mi.position = -2000006000;
- mi.icolibItem = GetIconHandle("homepage");
+ mi.hIcolibItem = GetIconHandle("homepage");
mi.name.t = LPGENT("Visit Homepage");
mi.pszService = "Twitter/VisitHomepage";
g_hMenuEvts[2] = CreateServiceFunction(mi.pszService, GlobalService<&TwitterProto::VisitHomepage>);
diff --git a/protocols/VKontakte/src/vk_proto.cpp b/protocols/VKontakte/src/vk_proto.cpp index 1ab461cc26..bd1bf48bd5 100644 --- a/protocols/VKontakte/src/vk_proto.cpp +++ b/protocols/VKontakte/src/vk_proto.cpp @@ -191,42 +191,42 @@ void CVkProto::InitMenus() CreateProtoService(PS_SETSTATUSMSG, &CVkProto::SvcSetStatusMsg);
CreateProtoService(PS_WALLPOST, &CVkProto::SvcWallPost);
- CLISTMENUITEM mi = { 0 };
- mi.hParentMenu = Menu_GetProtocolRoot(m_szModuleName);
+ TMO_MenuItem mi = { 0 };
+ mi.root = Menu_GetProtocolRoot(m_szModuleName);
// Proto menu
mi.pszService = PS_CREATECHAT;
mi.position = 10009 + PMI_CREATECHAT;
- mi.icolibItem = Skin_GetIconHandle(SKINICON_CHAT_JOIN);
+ mi.hIcolibItem = Skin_GetIconHandle(SKINICON_CHAT_JOIN);
mi.name.a = LPGEN("Create new chat");
g_hProtoMenuItems[PMI_CREATECHAT] = Menu_AddProtoMenuItem(&mi, m_szModuleName);
mi.pszService = PS_SETSTATUSMSG;
mi.position = 10009 + PMI_SETSTATUSMSG;
- mi.icolibItem = IcoLib_GetIconByHandle(GetIconHandle(IDI_STATUS));
+ mi.hIcolibItem = IcoLib_GetIconByHandle(GetIconHandle(IDI_STATUS));
mi.name.a = LPGEN("Status message");
g_hProtoMenuItems[PMI_SETSTATUSMSG] = Menu_AddProtoMenuItem(&mi, m_szModuleName);
mi.pszService = PS_WALLPOST;
mi.position = 10009 + PMI_WALLPOST;
- mi.icolibItem = IcoLib_GetIconByHandle(GetIconHandle(IDI_WALL));
+ mi.hIcolibItem = IcoLib_GetIconByHandle(GetIconHandle(IDI_WALL));
mi.name.a = LPGEN("Send message to my wall");
g_hProtoMenuItems[PMI_WALLPOST] = Menu_AddProtoMenuItem(&mi, m_szModuleName);
mi.pszService = PS_LOADVKNEWS;
mi.position = 10009 + PMI_LOADVKNEWS;
- mi.icolibItem = IcoLib_GetIconByHandle(GetIconHandle(IDI_NOTIFICATION));
+ mi.hIcolibItem = IcoLib_GetIconByHandle(GetIconHandle(IDI_NOTIFICATION));
mi.name.a = LPGEN("Load news from VK");
g_hProtoMenuItems[PMI_LOADVKNEWS] = Menu_AddProtoMenuItem(&mi, m_szModuleName);
mi.pszService = PS_VISITPROFILE;
mi.position = 10009 + PMI_VISITPROFILE;
- mi.icolibItem = IcoLib_GetIconByHandle(GetIconHandle(IDI_VISITPROFILE));
+ mi.hIcolibItem = IcoLib_GetIconByHandle(GetIconHandle(IDI_VISITPROFILE));
mi.name.a = LPGEN("Visit profile");
g_hProtoMenuItems[PMI_VISITPROFILE] = Menu_AddProtoMenuItem(&mi, m_szModuleName);
// Contact Menu Items
- mi.hParentMenu = NULL;
+ mi.root = NULL;
mi.flags = CMIF_TCHAR;
mi.pszService = PS_VISITPROFILE;
@@ -236,94 +236,94 @@ void CVkProto::InitMenus() mi.pszService = PS_WALLPOST;
mi.position = -200001000 + CMI_WALLPOST;
- mi.icolibItem = IcoLib_GetIconByHandle(GetIconHandle(IDI_WALL));
+ mi.hIcolibItem = IcoLib_GetIconByHandle(GetIconHandle(IDI_WALL));
mi.name.t = LPGENT("Send message to user\'s wall");
g_hContactMenuItems[CMI_WALLPOST] = Menu_AddContactMenuItem(&mi, m_szModuleName);
mi.pszService = PS_ADDASFRIEND;
mi.position = -200001000 + CMI_ADDASFRIEND;
- mi.icolibItem = IcoLib_GetIconByHandle(GetIconHandle(IDI_FRIENDADD));
+ mi.hIcolibItem = IcoLib_GetIconByHandle(GetIconHandle(IDI_FRIENDADD));
mi.name.t = LPGENT("Add as friend");
g_hContactMenuItems[CMI_ADDASFRIEND] = Menu_AddContactMenuItem(&mi, m_szModuleName);
mi.pszService = PS_DELETEFRIEND;
mi.position = -200001000 + CMI_DELETEFRIEND;
- mi.icolibItem = IcoLib_GetIconByHandle(GetIconHandle(IDI_FRIENDDEL));
+ mi.hIcolibItem = IcoLib_GetIconByHandle(GetIconHandle(IDI_FRIENDDEL));
mi.name.t = LPGENT("Delete from friend list");
g_hContactMenuItems[CMI_DELETEFRIEND] = Menu_AddContactMenuItem(&mi, m_szModuleName);
mi.pszService = PS_BANUSER;
mi.position = -200001000 + CMI_BANUSER;
- mi.icolibItem = IcoLib_GetIconByHandle(GetIconHandle(IDI_BAN));
+ mi.hIcolibItem = IcoLib_GetIconByHandle(GetIconHandle(IDI_BAN));
mi.name.t = LPGENT("Ban user");
g_hContactMenuItems[CMI_BANUSER] = Menu_AddContactMenuItem(&mi, m_szModuleName);
mi.pszService = PS_REPORTABUSE;
mi.position = -200001000 + CMI_REPORTABUSE;
- mi.icolibItem = IcoLib_GetIconByHandle(GetIconHandle(IDI_ABUSE));
+ mi.hIcolibItem = IcoLib_GetIconByHandle(GetIconHandle(IDI_ABUSE));
mi.name.t = LPGENT("Report abuse");
g_hContactMenuItems[CMI_REPORTABUSE] = Menu_AddContactMenuItem(&mi, m_szModuleName);
mi.pszService = PS_DESTROYKICKCHAT;
mi.position = -200001000 + CMI_DESTROYKICKCHAT;
- mi.icolibItem = IcoLib_GetIconByHandle(GetIconHandle(IDI_FRIENDDEL));
+ mi.hIcolibItem = IcoLib_GetIconByHandle(GetIconHandle(IDI_FRIENDDEL));
mi.name.t = LPGENT("Destroy room");
g_hContactMenuItems[CMI_DESTROYKICKCHAT] = Menu_AddContactMenuItem(&mi, m_szModuleName);
mi.pszService = PS_OPENBROADCAST;
mi.position = -200001000 + CMI_OPENBROADCAST;
- mi.icolibItem = IcoLib_GetIconByHandle(GetIconHandle(IDI_BROADCAST));
+ mi.hIcolibItem = IcoLib_GetIconByHandle(GetIconHandle(IDI_BROADCAST));
mi.name.t = LPGENT("Open broadcast");
g_hContactMenuItems[CMI_OPENBROADCAST] = Menu_AddContactMenuItem(&mi, m_szModuleName);
mi.pszService = PS_LOADVKNEWS;
mi.position = -200001000 + CMI_LOADVKNEWS;
- mi.icolibItem = IcoLib_GetIconByHandle(GetIconHandle(IDI_NOTIFICATION));
+ mi.hIcolibItem = IcoLib_GetIconByHandle(GetIconHandle(IDI_NOTIFICATION));
mi.name.t = LPGENT("Load news from VK");
g_hContactMenuItems[CMI_LOADVKNEWS] = Menu_AddContactMenuItem(&mi, m_szModuleName);
// Sync history menu
mi.pszService = PS_GETSERVERHISTORY;
mi.position = -200001000 + CMI_GETSERVERHISTORY;
- mi.icolibItem = IcoLib_GetIconByHandle(GetIconHandle(IDI_HISTORY));
+ mi.hIcolibItem = IcoLib_GetIconByHandle(GetIconHandle(IDI_HISTORY));
mi.name.t = LPGENT("Reload messages from vk.com...");
g_hContactMenuItems[CMI_GETSERVERHISTORY] = Menu_AddContactMenuItem(&mi, m_szModuleName);
- mi.hParentMenu = g_hContactMenuItems[CMI_GETSERVERHISTORY];
+ mi.root = g_hContactMenuItems[CMI_GETSERVERHISTORY];
mi.pszService = PS_GETSERVERHISTORYLAST1DAY;
mi.position = -200001000 + CMI_GETSERVERHISTORY + 100 + CHMI_GETSERVERHISTORYLAST1DAY;
- mi.icolibItem = IcoLib_GetIconByHandle(GetIconHandle(IDI_HISTORY));
+ mi.hIcolibItem = IcoLib_GetIconByHandle(GetIconHandle(IDI_HISTORY));
mi.name.t = LPGENT("for last 1 day");
g_hContactHistoryMenuItems[CHMI_GETSERVERHISTORYLAST1DAY] = Menu_AddContactMenuItem(&mi, m_szModuleName);
mi.pszService = PS_GETSERVERHISTORYLAST3DAY;
mi.position = -200001000 + CMI_GETSERVERHISTORY + 100 + CHMI_GETSERVERHISTORYLAST3DAY;
- mi.icolibItem = IcoLib_GetIconByHandle(GetIconHandle(IDI_HISTORY));
+ mi.hIcolibItem = IcoLib_GetIconByHandle(GetIconHandle(IDI_HISTORY));
mi.name.t = LPGENT("for last 3 days");
g_hContactHistoryMenuItems[CHMI_GETSERVERHISTORYLAST3DAY] = Menu_AddContactMenuItem(&mi, m_szModuleName);
mi.pszService = PS_GETSERVERHISTORYLAST7DAY;
mi.position = -200001000 + CMI_GETSERVERHISTORY + 100 + CHMI_GETSERVERHISTORYLAST7DAY;
- mi.icolibItem = IcoLib_GetIconByHandle(GetIconHandle(IDI_HISTORY));
+ mi.hIcolibItem = IcoLib_GetIconByHandle(GetIconHandle(IDI_HISTORY));
mi.name.t = LPGENT("for last week");
g_hContactHistoryMenuItems[CHMI_GETSERVERHISTORYLAST7DAY] = Menu_AddContactMenuItem(&mi, m_szModuleName);
mi.pszService = PS_GETSERVERHISTORYLAST30DAY;
mi.position = -200001000 + CMI_GETSERVERHISTORY + 100 + CHMI_GETSERVERHISTORYLAST30DAY;
- mi.icolibItem = IcoLib_GetIconByHandle(GetIconHandle(IDI_HISTORY));
+ mi.hIcolibItem = IcoLib_GetIconByHandle(GetIconHandle(IDI_HISTORY));
mi.name.t = LPGENT("for last 30 days");
g_hContactHistoryMenuItems[CHMI_GETSERVERHISTORYLAST30DAY] = Menu_AddContactMenuItem(&mi, m_szModuleName);
mi.pszService = PS_GETSERVERHISTORYLAST90DAY;
mi.position = -200001000 + CMI_GETSERVERHISTORY + 100 + CHMI_GETSERVERHISTORYLAST90DAY;
- mi.icolibItem = IcoLib_GetIconByHandle(GetIconHandle(IDI_HISTORY));
+ mi.hIcolibItem = IcoLib_GetIconByHandle(GetIconHandle(IDI_HISTORY));
mi.name.t = LPGENT("for last 90 days");
g_hContactHistoryMenuItems[CHMI_GETSERVERHISTORYLAST90DAY] = Menu_AddContactMenuItem(&mi, m_szModuleName);
mi.pszService = PS_GETALLSERVERHISTORY;
mi.position = -200001000 + CMI_GETSERVERHISTORY + 100 + CHMI_GETALLSERVERHISTORY;
- mi.icolibItem = IcoLib_GetIconByHandle(GetIconHandle(IDI_HISTORY));
+ mi.hIcolibItem = IcoLib_GetIconByHandle(GetIconHandle(IDI_HISTORY));
mi.name.t = LPGENT("for all time");
g_hContactHistoryMenuItems[CHMI_GETALLSERVERHISTORY] = Menu_AddContactMenuItem(&mi, m_szModuleName);
}
diff --git a/protocols/WhatsApp/src/theme.cpp b/protocols/WhatsApp/src/theme.cpp index b5fe0ad6b5..90d82bb60d 100644 --- a/protocols/WhatsApp/src/theme.cpp +++ b/protocols/WhatsApp/src/theme.cpp @@ -49,10 +49,10 @@ int WhatsAppProto::OnBuildStatusMenu(WPARAM wParam, LPARAM lParam) {
HGENMENU hRoot = Menu_GetProtocolRoot(m_szModuleName);
if (hRoot == NULL) {
- CLISTMENUITEM mi = { 0 };
+ TMO_MenuItem mi = { 0 };
mi.position = 500085000;
mi.flags = CMIF_TCHAR | CMIF_KEEPUNTRANSLATED | (isOnline() ? 0 : CMIF_GRAYED);
- mi.icolibItem = GetIconHandle("whatsApp");
+ mi.hIcolibItem = GetIconHandle("whatsApp");
mi.name.t = m_tszUserName;
hRoot = m_hMenuRoot = Menu_AddProtoMenuItem(&mi);
}
@@ -63,15 +63,15 @@ int WhatsAppProto::OnBuildStatusMenu(WPARAM wParam, LPARAM lParam) }
}
- CLISTMENUITEM mi = { 0 };
+ TMO_MenuItem mi = { 0 };
mi.flags = (isOnline() ? 0 : CMIF_GRAYED);
mi.position = 201001;
mi.pszService = "/CreateGroup";
CreateProtoService(mi.pszService, &WhatsAppProto::OnCreateGroup);
- mi.hParentMenu = hRoot;
+ mi.root = hRoot;
mi.name.a = LPGEN("Create group");
- mi.icolibItem = GetIconHandle("createGroup");
+ mi.hIcolibItem = GetIconHandle("createGroup");
m_hMenuCreateGroup = Menu_AddProtoMenuItem(&mi, m_szModuleName);
return 0;
}
diff --git a/protocols/Xfire/src/Xfire_game.cpp b/protocols/Xfire/src/Xfire_game.cpp index 44feae968d..2ae07c6912 100644 --- a/protocols/Xfire/src/Xfire_game.cpp +++ b/protocols/Xfire/src/Xfire_game.cpp @@ -436,8 +436,8 @@ void Xfire_game::createMenuitem(unsigned int pos, int dbid) if (dbid < 0)
dbid = pos;
- CLISTMENUITEM mi = { 0 };
- mi.hParentMenu = Menu_CreateRoot(MO_MAIN, LPGENT("Start game"), 500084000);
+ TMO_MenuItem mi = { 0 };
+ mi.root = Menu_CreateRoot(MO_MAIN, LPGENT("Start game"), 500084000);
mir_snprintf(temp, _countof(temp), servicefunction, this->id);
//wenn die servicefunktion schon exisitert vernichten, hehe
@@ -446,7 +446,7 @@ void Xfire_game::createMenuitem(unsigned int pos, int dbid) CreateServiceFunctionParam(temp, StartGame, this->id);
mi.pszService = temp;
mi.position = 500090002 + pos;
- mi.icolibItem = this->hicon ? this->hicon : LoadIcon(hinstance, MAKEINTRESOURCE(ID_OP));
+ mi.hIcolibItem = this->hicon ? this->hicon : LoadIcon(hinstance, MAKEINTRESOURCE(ID_OP));
mi.name.a = menuitemtext(this->name);
this->menuhandle = Menu_AddMainMenuItem(&mi);
diff --git a/protocols/Xfire/src/Xfire_gamelist.cpp b/protocols/Xfire/src/Xfire_gamelist.cpp index 052f2fd624..a417177ad3 100644 --- a/protocols/Xfire/src/Xfire_gamelist.cpp +++ b/protocols/Xfire/src/Xfire_gamelist.cpp @@ -241,11 +241,11 @@ void Xfire_gamelist::clearGamelist() { //erstellt ein dummyeintrag
void Xfire_gamelist::createDummyMenuItem()
{
- CLISTMENUITEM mi = { 0 };
- mi.hParentMenu = Menu_CreateRoot(MO_MAIN, LPGENT("Start game"), 500084000);
+ TMO_MenuItem mi = { 0 };
+ mi.root = Menu_CreateRoot(MO_MAIN, LPGENT("Start game"), 500084000);
mi.position = 500090001;
mi.name.a = Translate("Please wait...");
- mi.icolibItem = LoadIcon(hinstance, MAKEINTRESOURCE(ID_OP));
+ mi.hIcolibItem = LoadIcon(hinstance, MAKEINTRESOURCE(ID_OP));
dummymenuitem = Menu_AddMainMenuItem(&mi);
}
diff --git a/protocols/Xfire/src/main.cpp b/protocols/Xfire/src/main.cpp index 3be2481fef..e14629a20e 100644 --- a/protocols/Xfire/src/main.cpp +++ b/protocols/Xfire/src/main.cpp @@ -1113,10 +1113,10 @@ extern "C" __declspec(dllexport) int Load(void) CreateDirectoryA(AvatarsFolder, NULL);
// erweiterte Kontextmenüpunkte
- CLISTMENUITEM mi = { 0 };
+ TMO_MenuItem mi = { 0 };
mi.position = 500090000;
mi.name.a = protocolname;
- mi.hParentMenu = Menu_AddContactMenuItem(&mi, protocolname);
+ mi.root = Menu_AddContactMenuItem(&mi, protocolname);
mi.flags = CMIF_TCHAR;
char servicefunction[100];
@@ -1124,42 +1124,42 @@ extern "C" __declspec(dllexport) int Load(void) // gotoprofilemenüpunkt
CreateProtoServiceFunction(protocolname, "/GotoProfile", GotoProfile);
mi.pszService = "/GotoProfile";
- mi.icolibItem = LoadIcon(hinstance, MAKEINTRESOURCE(ID_OP));
+ mi.hIcolibItem = LoadIcon(hinstance, MAKEINTRESOURCE(ID_OP));
mi.name.t = LPGENT("&XFire Online Profile");
Menu_AddContactMenuItem(&mi, protocolname);
// gotoxfireclansitemenüpunkt
CreateProtoServiceFunction(protocolname, "/GotoXFireClanSite", GotoXFireClanSite);
mi.pszService = "/GotoXFireClanSite";
- mi.icolibItem = LoadIcon(hinstance, MAKEINTRESOURCE(ID_OP));
+ mi.hIcolibItem = LoadIcon(hinstance, MAKEINTRESOURCE(ID_OP));
mi.name.t = LPGENT("XFire &Clan Site");
gotoclansite = Menu_AddContactMenuItem(&mi, protocolname);
// kopiermenüpunkt
CreateProtoServiceFunction(protocolname, "/GetIPPort", GetIPPort);
mi.pszService = "/GetIPPort";
- mi.icolibItem = LoadIcon(hinstance, MAKEINTRESOURCE(ID_OP));
+ mi.hIcolibItem = LoadIcon(hinstance, MAKEINTRESOURCE(ID_OP));
mi.name.t = LPGENT("C&opy Server Address and Port");
copyipport = Menu_AddContactMenuItem(&mi, protocolname);
// kopiermenüpunkt
CreateProtoServiceFunction(protocolname, "/VoiceIPPort", GetVIPPort);
mi.pszService = "/VoiceIPPort";
- mi.icolibItem = LoadIcon(hinstance, MAKEINTRESOURCE(ID_OP));
+ mi.hIcolibItem = LoadIcon(hinstance, MAKEINTRESOURCE(ID_OP));
mi.name.t = LPGENT("Cop&y Voice Server Address and Port");
vipport = Menu_AddContactMenuItem(&mi, protocolname);
// joinmenüpunkt
CreateProtoServiceFunction(protocolname, "/JoinGame", JoinGame);
mi.pszService = "/JoinGame";
- mi.icolibItem = LoadIcon(hinstance, MAKEINTRESOURCE(ID_OP));
+ mi.hIcolibItem = LoadIcon(hinstance, MAKEINTRESOURCE(ID_OP));
mi.name.t = LPGENT("Join &Game...");
joingame = Menu_AddContactMenuItem(&mi, protocolname);
// playmenüpunkt
CreateProtoServiceFunction(protocolname, "/StartThisGame", StartThisGame);
mi.pszService = "/StartThisGame";
- mi.icolibItem = LoadIcon(hinstance, MAKEINTRESOURCE(ID_OP));
+ mi.hIcolibItem = LoadIcon(hinstance, MAKEINTRESOURCE(ID_OP));
mi.name.t = LPGENT("Play this game...");
startthisgame = Menu_AddContactMenuItem(&mi, protocolname);
@@ -1167,25 +1167,25 @@ extern "C" __declspec(dllexport) int Load(void) CreateProtoServiceFunction(protocolname, "/RemoveFriend", RemoveFriend);
mi.pszService = "/RemoveFriend";
mi.position = 2000070000;
- mi.icolibItem = LoadIcon(hinstance, MAKEINTRESOURCE(ID_OP));
+ mi.hIcolibItem = LoadIcon(hinstance, MAKEINTRESOURCE(ID_OP));
mi.name.t = LPGENT("Remove F&riend...");
removefriend = Menu_AddContactMenuItem(&mi, protocolname);
// block user
CreateProtoServiceFunction(protocolname, "/BlockFriend", BlockFriend);
mi.pszService = "/BlockFriend";
- mi.icolibItem = LoadIcon(hinstance, MAKEINTRESOURCE(ID_OP));
+ mi.hIcolibItem = LoadIcon(hinstance, MAKEINTRESOURCE(ID_OP));
mi.name.t = LPGENT("Block U&ser...");
blockfriend = Menu_AddContactMenuItem(&mi, protocolname);
// main menu items
// my fire profile
- mi.hParentMenu = Menu_CreateRoot(MO_MAIN, _T(protocolname), 500090000);
+ mi.root = Menu_CreateRoot(MO_MAIN, _T(protocolname), 500090000);
strncpy_s(servicefunction, protocolname, _TRUNCATE);
strncat_s(servicefunction, "GotoProfile2", _TRUNCATE);
CreateServiceFunction(servicefunction, GotoProfile2);
mi.position = 500090000;
- mi.icolibItem = LoadIcon(hinstance, MAKEINTRESOURCE(ID_OP));
+ mi.hIcolibItem = LoadIcon(hinstance, MAKEINTRESOURCE(ID_OP));
mi.name.t = LPGENT("&My XFire Online Profile");
Menu_AddMainMenuItem(&mi);
@@ -1193,7 +1193,7 @@ extern "C" __declspec(dllexport) int Load(void) strncpy_s(servicefunction, protocolname, _TRUNCATE);
strncat_s(servicefunction, "GotoProfileAct", _TRUNCATE);
CreateServiceFunction(servicefunction, GotoProfileAct);
- mi.icolibItem = LoadIcon(hinstance, MAKEINTRESOURCE(ID_OP));
+ mi.hIcolibItem = LoadIcon(hinstance, MAKEINTRESOURCE(ID_OP));
mi.name.t = LPGENT("&Activity Report");
Menu_AddMainMenuItem(&mi);
@@ -1201,14 +1201,14 @@ extern "C" __declspec(dllexport) int Load(void) strncpy_s(servicefunction, protocolname, _TRUNCATE);
strncat_s(servicefunction, "ReScanMyGames", _TRUNCATE);
CreateServiceFunction(servicefunction, ReScanMyGames);
- mi.icolibItem = LoadIcon(hinstance, MAKEINTRESOURCE(ID_OP));
+ mi.hIcolibItem = LoadIcon(hinstance, MAKEINTRESOURCE(ID_OP));
mi.name.t = LPGENT("&Rescan my games...");
Menu_AddMainMenuItem(&mi);
strncpy_s(servicefunction, protocolname, _TRUNCATE);
strncat_s(servicefunction, "SetNick", _TRUNCATE);
CreateServiceFunction(servicefunction, SetNickDlg);
- mi.icolibItem = LoadIcon(hinstance, MAKEINTRESOURCE(ID_OP));
+ mi.hIcolibItem = LoadIcon(hinstance, MAKEINTRESOURCE(ID_OP));
mi.name.t = LPGENT("Set &Nickname");
Menu_AddMainMenuItem(&mi);
diff --git a/protocols/Yahoo/src/services.cpp b/protocols/Yahoo/src/services.cpp index d534f092d1..a0094138e9 100644 --- a/protocols/Yahoo/src/services.cpp +++ b/protocols/Yahoo/src/services.cpp @@ -358,13 +358,13 @@ INT_PTR __cdecl CYahooProto::GetUnreadEmailCount(WPARAM, LPARAM) void CYahooProto::MenuMainInit(void)
{
- CLISTMENUITEM mi = { 0 };
+ TMO_MenuItem mi = { 0 };
HGENMENU hRoot = Menu_GetProtocolRoot(m_szModuleName);
if (hRoot == NULL) {
mi.position = 500015000;
mi.flags = CMIF_TCHAR | CMIF_KEEPUNTRANSLATED;
- mi.icolibItem = GetIconHandle(IDI_YAHOO);
+ mi.hIcolibItem = GetIconHandle(IDI_YAHOO);
mi.name.t = m_tszUserName;
hRoot = mainMenuRoot = Menu_AddProtoMenuItem(&mi);
}
@@ -376,13 +376,13 @@ void CYahooProto::MenuMainInit(void) }
mi.flags = 0;
- mi.hParentMenu = hRoot;
+ mi.root = hRoot;
// Show custom status menu
mi.pszService = YAHOO_SET_CUST_STAT;
CreateProtoService(mi.pszService, &CYahooProto::SetCustomStatCommand);
mi.position = 290000;
- mi.icolibItem = GetIconHandle(IDI_SET_STATUS);
+ mi.hIcolibItem = GetIconHandle(IDI_SET_STATUS);
mi.name.a = LPGEN("Set &Custom Status");
menuItemsAll[0] = Menu_AddProtoMenuItem(&mi, m_szModuleName);
@@ -390,7 +390,7 @@ void CYahooProto::MenuMainInit(void) mi.pszService = YAHOO_EDIT_MY_PROFILE;
CreateProtoService(mi.pszService, &CYahooProto::OnEditMyProfile);
mi.position = 290005;
- mi.icolibItem = GetIconHandle(IDI_PROFILE);
+ mi.hIcolibItem = GetIconHandle(IDI_PROFILE);
mi.name.a = LPGEN("&Edit My Profile");
menuItemsAll[1] = Menu_AddProtoMenuItem(&mi, m_szModuleName);
@@ -398,7 +398,7 @@ void CYahooProto::MenuMainInit(void) mi.pszService = YAHOO_SHOW_MY_PROFILE;
CreateProtoService(mi.pszService, &CYahooProto::OnShowMyProfileCommand);
mi.position = 290006;
- mi.icolibItem = GetIconHandle(IDI_PROFILE);
+ mi.hIcolibItem = GetIconHandle(IDI_PROFILE);
mi.name.a = LPGEN("&My Profile");
menuItemsAll[2] = Menu_AddProtoMenuItem(&mi, m_szModuleName);
@@ -406,7 +406,7 @@ void CYahooProto::MenuMainInit(void) mi.pszService = YAHOO_YAHOO_MAIL;
CreateProtoService(mi.pszService, &CYahooProto::OnGotoMailboxCommand);
mi.position = 290010;
- mi.icolibItem = GetIconHandle(IDI_INBOX);
+ mi.hIcolibItem = GetIconHandle(IDI_INBOX);
mi.name.a = LPGEN("&Yahoo Mail");
menuItemsAll[3] = Menu_AddProtoMenuItem(&mi, m_szModuleName);
@@ -414,7 +414,7 @@ void CYahooProto::MenuMainInit(void) mi.pszService = YAHOO_AB;
CreateProtoService(mi.pszService, &CYahooProto::OnABCommand);
mi.position = 290015;
- mi.icolibItem = GetIconHandle(IDI_YAB);
+ mi.hIcolibItem = GetIconHandle(IDI_YAB);
mi.name.a = LPGEN("&Address Book");
menuItemsAll[4] = Menu_AddProtoMenuItem(&mi, m_szModuleName);
@@ -422,7 +422,7 @@ void CYahooProto::MenuMainInit(void) mi.pszService = YAHOO_CALENDAR;
CreateProtoService(mi.pszService, &CYahooProto::OnCalendarCommand);
mi.position = 290017;
- mi.icolibItem = GetIconHandle(IDI_CALENDAR);
+ mi.hIcolibItem = GetIconHandle(IDI_CALENDAR);
mi.name.a = LPGEN("&Calendar");
menuItemsAll[5] = Menu_AddProtoMenuItem(&mi, m_szModuleName);
@@ -430,21 +430,21 @@ void CYahooProto::MenuMainInit(void) mi.pszService = "/JoinChatRoom";
CreateProtoService(mi.pszService, &CYahooProto::CreateConference);
mi.position = 290018;
- mi.icolibItem = GetIconHandle(IDI_YAHOO);
+ mi.hIcolibItem = GetIconHandle(IDI_YAHOO);
mi.name.a = LPGEN("Create Conference");
menuItemsAll[6] = Menu_AddProtoMenuItem(&mi, m_szModuleName);
}
void CYahooProto::MenuContactInit(void)
{
- CLISTMENUITEM mi = { 0 };
+ TMO_MenuItem mi = { 0 };
// Show Profile
CreateProtoService(YAHOO_SHOW_PROFILE, &CYahooProto::OnShowProfileCommand);
mi.pszService = YAHOO_SHOW_PROFILE;
mi.position = -2000006000;
- mi.icolibItem = GetIconHandle(IDI_PROFILE);
+ mi.hIcolibItem = GetIconHandle(IDI_PROFILE);
mi.name.a = LPGEN("&Show Profile");
hShowProfileMenuItem = Menu_AddContactMenuItem(&mi, m_szModuleName);
}
|