From 68924bfc1a213e619563c2cffb6d44b5b5346f6d Mon Sep 17 00:00:00 2001 From: George Hazan Date: Fri, 26 Jun 2015 18:21:10 +0000 Subject: next slice of cutting out unused menu features - popupPosition git-svn-id: http://svn.miranda-ng.org/main/trunk@14400 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- protocols/AimOscar/src/theme.cpp | 1 - protocols/FacebookRM/src/theme.cpp | 2 +- protocols/IRCG/src/services.cpp | 8 ++++---- protocols/IcqOscarJ/src/icq_xstatus.cpp | 2 +- protocols/MRA/src/Mra_menus.cpp | 4 ++-- protocols/MSN/src/msn_menu.cpp | 2 +- protocols/Sametime/src/sametime_session.cpp | 1 - protocols/Tlen/src/tlen.cpp | 4 +--- protocols/Twitter/src/proto.cpp | 2 +- protocols/WhatsApp/src/theme.cpp | 2 +- protocols/Xfire/src/Xfire_game.cpp | 2 +- protocols/Xfire/src/Xfire_gamelist.cpp | 2 +- 12 files changed, 14 insertions(+), 18 deletions(-) (limited to 'protocols') diff --git a/protocols/AimOscar/src/theme.cpp b/protocols/AimOscar/src/theme.cpp index a0c1398634..3626175e4b 100644 --- a/protocols/AimOscar/src/theme.cpp +++ b/protocols/AimOscar/src/theme.cpp @@ -220,7 +220,6 @@ void CAimProto::InitMainMenus(void) mi.icolibItem = GetIconHandle("aim"); mi.ptszName = m_tszUserName; mi.hParentMenu = HGENMENU_ROOT; - mi.popupPosition = 500090000; mi.position = 500090000; hRoot = hMenuRoot = Menu_AddProtoMenuItem(&mi); } diff --git a/protocols/FacebookRM/src/theme.cpp b/protocols/FacebookRM/src/theme.cpp index 934dc808a9..bb5ab200d6 100644 --- a/protocols/FacebookRM/src/theme.cpp +++ b/protocols/FacebookRM/src/theme.cpp @@ -218,7 +218,7 @@ int FacebookProto::OnBuildStatusMenu(WPARAM, LPARAM) HGENMENU hRoot = Menu_GetProtocolRoot(m_szModuleName); if (hRoot == NULL) { CLISTMENUITEM miRoot = { 0 }; - miRoot.popupPosition = 500085000; + miRoot.position = 500085000; miRoot.hParentMenu = HGENMENU_ROOT; miRoot.flags = CMIF_ROOTHANDLE | CMIF_TCHAR | CMIF_KEEPUNTRANSLATED | (this->isOnline() ? 0 : CMIF_GRAYED); miRoot.icolibItem = GetIconHandle("facebook"); diff --git a/protocols/IRCG/src/services.cpp b/protocols/IRCG/src/services.cpp index 9f00d7f631..52d92259e1 100644 --- a/protocols/IRCG/src/services.cpp +++ b/protocols/IRCG/src/services.cpp @@ -146,28 +146,28 @@ void InitContactMenus(void) mi.pszName = LPGEN("Channel &settings"); mi.icolibItem = GetIconHandle(IDI_MANAGER); mir_strcpy(d, IRC_UM_CHANSETTINGS); - mi.popupPosition = 500090002; + mi.position = 500090002; hUMenuChanSettings = Menu_AddContactMenuItem(&mi); hMenuChanSettings = CreateServiceFunction(temp, IrcMenuChanSettings); mi.pszName = LPGEN("&WhoIs info"); mi.icolibItem = GetIconHandle(IDI_WHOIS); mir_strcpy(d, IRC_UM_WHOIS); - mi.popupPosition = 500090001; + mi.position = 500090001; hUMenuWhois = Menu_AddContactMenuItem(&mi); hMenuWhois = CreateServiceFunction(temp, IrcMenuWhois); mi.pszName = LPGEN("Di&sconnect"); mi.icolibItem = GetIconHandle(IDI_DELETE); mir_strcpy(d, IRC_UM_DISCONNECT); - mi.popupPosition = 500090001; + mi.position = 500090001; hUMenuDisconnect = Menu_AddContactMenuItem(&mi); hMenuDisconnect = CreateServiceFunction(temp, IrcMenuDisconnect); mi.pszName = LPGEN("&Add to ignore list"); mi.icolibItem = GetIconHandle(IDI_BLOCK); mir_strcpy(d, IRC_UM_IGNORE); - mi.popupPosition = 500090002; + mi.position = 500090002; hUMenuIgnore = Menu_AddContactMenuItem(&mi); hMenuIgnore = CreateServiceFunction(temp, IrcMenuIgnore); diff --git a/protocols/IcqOscarJ/src/icq_xstatus.cpp b/protocols/IcqOscarJ/src/icq_xstatus.cpp index 75b7dbcd1b..21c1a1374c 100644 --- a/protocols/IcqOscarJ/src/icq_xstatus.cpp +++ b/protocols/IcqOscarJ/src/icq_xstatus.cpp @@ -857,7 +857,7 @@ void CIcqProto::InitXStatusItems(BOOL bAllowStatus) CLISTMENUITEM mi = { 0 }; mi.pszPopupName = szItem; - mi.popupPosition = 500084000; + // mi.popupPosition = 500084000; !!!!!!!!!!!!!!!! mi.position = 2000040000; for (int i = 0; i <= XSTATUS_COUNT; i++) { diff --git a/protocols/MRA/src/Mra_menus.cpp b/protocols/MRA/src/Mra_menus.cpp index fa103f86b7..fe73fa2ca1 100644 --- a/protocols/MRA/src/Mra_menus.cpp +++ b/protocols/MRA/src/Mra_menus.cpp @@ -286,7 +286,7 @@ int CMraProto::MraRebuildStatusMenu(WPARAM, LPARAM) CLISTMENUITEM mi = { 0 }; mi.position = 2000060000; - mi.popupPosition = 500085000; + // mi.popupPosition = 500085000; mi.ptszPopupName = szItem; mi.flags = CMIF_UNICODE; mi.pszService = szServiceFunction; @@ -360,7 +360,6 @@ HGENMENU CMraProto::CListCreateMenu(LONG lPosition, LONG lPopupPosition, BOOL bI mi.flags = CMIF_ROOTHANDLE; mi.hParentMenu = hRootMenu; - mi.popupPosition = lPopupPosition; mi.pszService = szServiceFunction; for (size_t i = 0; i < dwCount; i++) { @@ -369,6 +368,7 @@ HGENMENU CMraProto::CListCreateMenu(LONG lPosition, LONG lPopupPosition, BOOL bI mi.icolibItem = pgdiItems[i].hIcolib; mi.pszName = pgdiItems[i].szDescr; hResult[i] = fnAddFunc(&mi); + Menu_ConfigureItem(hResult[i], MCI_OPT_EXECPARAM, lPopupPosition); } return hRootMenu; diff --git a/protocols/MSN/src/msn_menu.cpp b/protocols/MSN/src/msn_menu.cpp index 33dd616058..89c0bdabe0 100644 --- a/protocols/MSN/src/msn_menu.cpp +++ b/protocols/MSN/src/msn_menu.cpp @@ -276,7 +276,7 @@ void CMsnProto::MsnInitMainMenu(void) HGENMENU hRoot = Menu_GetProtocolRoot(m_szModuleName); if (hRoot == NULL) { - mi.popupPosition = 500085000; + mi.position = 500085000; mi.hParentMenu = HGENMENU_ROOT; mi.flags = CMIF_ROOTHANDLE | CMIF_TCHAR | CMIF_KEEPUNTRANSLATED; mi.icolibItem = GetIconHandle(IDI_MSN); diff --git a/protocols/Sametime/src/sametime_session.cpp b/protocols/Sametime/src/sametime_session.cpp index cea3d51431..9994db0920 100644 --- a/protocols/Sametime/src/sametime_session.cpp +++ b/protocols/Sametime/src/sametime_session.cpp @@ -564,7 +564,6 @@ void CSametimeProto::InitSessionMenu() CLISTMENUITEM mi = { 0 }; mi.flags = CMIF_TCHAR; - mi.popupPosition = 500085001; mi.position = 2000060000; mi.ptszName = LPGENT("Send announcement..."); mir_snprintf(service, _countof(service), "%s%s", m_szModuleName, MS_SAMETIME_MENUANNOUNCESESSION); diff --git a/protocols/Tlen/src/tlen.cpp b/protocols/Tlen/src/tlen.cpp index a6a38e0298..c8cda6ec35 100644 --- a/protocols/Tlen/src/tlen.cpp +++ b/protocols/Tlen/src/tlen.cpp @@ -266,10 +266,7 @@ void TlenProtocol::initMenuItems() CLISTMENUITEM mi = { 0 }; mi.pszContactOwner = m_szModuleName; - mi.popupPosition = 500090000; - mir_strcpy(text, m_szModuleName); - mi.pszService = text; mi.ptszName = m_tszUserName; mi.position = -1999901009; mi.hParentMenu = HGENMENU_ROOT; @@ -279,6 +276,7 @@ void TlenProtocol::initMenuItems() mi.flags = CMIF_ROOTHANDLE; mi.hParentMenu = (HGENMENU)hMenuRoot; + mi.pszService = text; hMenuChats = NULL; diff --git a/protocols/Twitter/src/proto.cpp b/protocols/Twitter/src/proto.cpp index 040ec7d13c..5870a8f12f 100644 --- a/protocols/Twitter/src/proto.cpp +++ b/protocols/Twitter/src/proto.cpp @@ -273,7 +273,7 @@ int TwitterProto::OnBuildStatusMenu(WPARAM, LPARAM) CreateProtoService("/Tweet", &TwitterProto::OnTweet); mir_strcpy(tDest, "/Tweet"); mi.ptszName = LPGENT("Send Tweet..."); - mi.popupPosition = 200001; + mi.position = 200001; mi.icolibItem = GetIconHandle("tweet"); Menu_AddStatusMenuItem(&mi); return 0; diff --git a/protocols/WhatsApp/src/theme.cpp b/protocols/WhatsApp/src/theme.cpp index 2d75c8908d..68c1602f27 100644 --- a/protocols/WhatsApp/src/theme.cpp +++ b/protocols/WhatsApp/src/theme.cpp @@ -56,7 +56,7 @@ int WhatsAppProto::OnBuildStatusMenu(WPARAM wParam, LPARAM lParam) HGENMENU hRoot = Menu_GetProtocolRoot(m_szModuleName); if (hRoot == NULL) { - mi.popupPosition = 500085000; + mi.position = 500085000; mi.hParentMenu = HGENMENU_ROOT; mi.flags = CMIF_ROOTHANDLE | CMIF_TCHAR | CMIF_KEEPUNTRANSLATED | (isOnline() ? 0 : CMIF_GRAYED); mi.icolibItem = GetIconHandle("whatsApp"); diff --git a/protocols/Xfire/src/Xfire_game.cpp b/protocols/Xfire/src/Xfire_game.cpp index 7d10b769c3..8f7f7b6d7f 100644 --- a/protocols/Xfire/src/Xfire_game.cpp +++ b/protocols/Xfire/src/Xfire_game.cpp @@ -437,7 +437,7 @@ void Xfire_game::createMenuitem(unsigned int pos, int dbid) dbid = pos; CLISTMENUITEM mi = { 0 }; - mi.popupPosition = 500084000; + // mi.popupPosition = 500084000; !!!!!!!!!!!!!!!!!!!!!!!! mi.pszPopupName = Translate("Start game"); mi.pszContactOwner = protocolname; diff --git a/protocols/Xfire/src/Xfire_gamelist.cpp b/protocols/Xfire/src/Xfire_gamelist.cpp index a60e870548..624e79a184 100644 --- a/protocols/Xfire/src/Xfire_gamelist.cpp +++ b/protocols/Xfire/src/Xfire_gamelist.cpp @@ -245,7 +245,7 @@ void Xfire_gamelist::createDummyMenuItem() mi.position = 500090001; mi.pszName = Translate("Please wait..."); mi.hIcon = LoadIcon(hinstance, MAKEINTRESOURCE(ID_OP)); - mi.popupPosition = 500084000; + // mi.popupPosition = 500084000; !!!!!!!!!!!!!!!!!!!!!!! mi.pszPopupName = Translate("Start game"); mi.pszContactOwner = protocolname; dummymenuitem = Menu_AddMainMenuItem(&mi); -- cgit v1.2.3