MRA:

- all menu related code moved to Mra_menus.cpp;
- mra-specific menu items moved to the Services... submenu;


git-svn-id: http://svn.miranda-ng.org/main/trunk@6616 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c

1 files changed, 1 insertions, 332 deletions

diff --git a/protocols/MRA/src/Mra_svcs.cpp b/protocols/MRA/src/Mra_svcs.cpp
index fa41da557a..5fb31c662a 100644
--- a/protocols/MRA/src/Mra_svcs.cpp
+++ b/protocols/MRA/src/Mra_svcs.cpp
@@ -156,7 +156,7 @@ void CMraProto::SetExtraIcons(HANDLE hContact)
 

 	ExtraIcon_SetIcon(hExtraXstatusIcon, hContact,

 		(IsXStatusValid(dwXStatus) || dwXStatus == MRA_MIR_XSTATUS_UNKNOWN) ? hXStatusAdvancedStatusIcons[dwXStatus] : NULL);

-	ExtraIcon_SetIcon(hExtraInfo, hContact, (dwIconID != -1) ? gdiExtraStatusIconsItems[dwIconID].hIconHandle : NULL);

+	ExtraIcon_SetIcon(hExtraInfo, hContact, (dwIconID != -1) ? gdiExtraStatusIconsItems[dwIconID].hIcolib : NULL);

 }

 

 INT_PTR CMraProto::MraXStatusMenu(WPARAM wParam, LPARAM lParam, LPARAM param)

@@ -166,245 +166,6 @@ INT_PTR CMraProto::MraXStatusMenu(WPARAM wParam, LPARAM lParam, LPARAM param)
 	return 0;

 }

 

-INT_PTR CMraProto::MraGotoInbox(WPARAM wParam, LPARAM lParam)

-{

-	MraMPopSessionQueueAddUrl(hMPopSessionQueue, MRA_WIN_INBOX_URL);

-	return 0;

-}

-

-INT_PTR CMraProto::MraShowInboxStatus(WPARAM wParam, LPARAM lParam)

-{

-	MraUpdateEmailStatus("", "", 0, 0);

-	return 0;

-}

-

-INT_PTR CMraProto::MraSendSMS(WPARAM wParam, LPARAM lParam)

-{

-	if (!m_bLoggedIn || !wParam || !lParam)

-		return 0;

-

-	ptrW lpwszMessageXMLEncoded( mir_utf8decodeW((LPSTR)lParam));

-	if (lpwszMessageXMLEncoded) {

-		CMStringW decoded = DecodeXML( CMStringW(lpwszMessageXMLEncoded));

-		if (decoded.GetLength())

-			MraSMSW(NULL, CMStringA((LPSTR)wParam), decoded);

-	}

-	

-	return 0;

-}

-

-INT_PTR CMraProto::MraEditProfile(WPARAM wParam, LPARAM lParam)

-{

-	MraMPopSessionQueueAddUrl(hMPopSessionQueue, MRA_EDIT_PROFILE_URL);

-	return 0;

-}

-

-INT_PTR CMraProto::MraZhuki(WPARAM wParam, LPARAM lParam)

-{

-	MraMPopSessionQueueAddUrl(hMPopSessionQueue, MRA_ZHUKI_URL);

-	return 0;

-}

-

-INT_PTR CMraProto::MraWebSearch(WPARAM wParam, LPARAM lParam)

-{

-	CallService(MS_UTILS_OPENURL, OUF_NEWWINDOW | OUF_TCHAR, (LPARAM)MRA_SEARCH_URL);

-	return 0;

-}

-

-INT_PTR CMraProto::MraUpdateAllUsersInfo(WPARAM wParam, LPARAM lParam)

-{

-	if ( MessageBox(NULL, TranslateT("Are you sure?"), TranslateTS(MRA_UPD_ALL_USERS_INFO_STR), MB_YESNO | MB_ICONQUESTION) == IDYES ) {

-		for (HANDLE hContact = db_find_first(m_szModuleName); hContact; hContact = db_find_next(hContact, m_szModuleName)) {

-			CMStringA szEmail;

-			if ( mraGetStringA(hContact, "e-mail", szEmail))

-				MraWPRequestByEMail(hContact, ACKTYPE_GETINFO, szEmail);

-		}

-	}

-	return 0;

-}

-

-INT_PTR CMraProto::MraCheckUpdatesUsersAvt(WPARAM wParam, LPARAM lParam)

-{

-	if ( MessageBox(NULL, TranslateT("Are you sure?"), TranslateTS(MRA_CHK_USERS_AVATARS_STR), MB_YESNO | MB_ICONQUESTION) == IDYES) {

-		for (HANDLE hContact = db_find_first(m_szModuleName); hContact; hContact = db_find_next(hContact, m_szModuleName)) {

-			CMStringA szEmail;

-			if (mraGetStringA(hContact, "e-mail", szEmail))

-				if ( !IsEMailChatAgent(szEmail))

-					MraAvatarsQueueGetAvatarSimple(hAvatarsQueueHandle, 0, hContact, 0);

-		}

-	}

-	return 0;

-}

-

-INT_PTR CMraProto::MraRequestAuthForAll(WPARAM wParam, LPARAM lParam)

-{

-	if ( MessageBox(NULL, TranslateT("Are you sure?"), TranslateTS(MRA_REQ_AUTH_FOR_ALL_STR), MB_YESNO | MB_ICONQUESTION) == IDYES) {

-		for (HANDLE hContact = db_find_first(m_szModuleName); hContact; hContact = db_find_next(hContact, m_szModuleName)) {

-			DWORD dwContactSeverFlags;

-			if (GetContactBasicInfoW(hContact, NULL, NULL, NULL, &dwContactSeverFlags, NULL, NULL, NULL, NULL) == NO_ERROR)

-			if (dwContactSeverFlags & CONTACT_INTFLAG_NOT_AUTHORIZED && dwContactSeverFlags != -1)

-				MraRequestAuthorization((WPARAM)hContact, 0);

-		}

-	}

-	return 0;

-}

-

-INT_PTR CMraProto::MraRequestAuthorization(WPARAM wParam, LPARAM lParam)

-{

-	HANDLE hContact = (HANDLE)wParam;

-	if (!hContact)

-		return 0;

-

-	CMStringW wszAuthMessage;

-	if ( !mraGetStringW(NULL, "AuthMessage", wszAuthMessage))

-		wszAuthMessage = TranslateT(MRA_DEFAULT_AUTH_MESSAGE);

-

-	if ( !wszAuthMessage.IsEmpty()) {

-		CMStringA szEmail;

-		if ( mraGetStringA(hContact, "e-mail", szEmail)) {

-			BOOL bSlowSend = getByte("SlowSend", MRA_DEFAULT_SLOW_SEND);

-			int iRet = MraMessage(bSlowSend, hContact, ACKTYPE_AUTHREQ, MESSAGE_FLAG_AUTHORIZE, szEmail, wszAuthMessage, NULL, 0);

-			if (bSlowSend == FALSE)

-				ProtoBroadcastAck(hContact, ACKTYPE_AUTHREQ, ACKRESULT_SUCCESS, (HANDLE)iRet, 0);

-

-			return 0;

-		}

-	}

-

-	return 1;

-}

-

-INT_PTR CMraProto::MraGrantAuthorization(WPARAM wParam, LPARAM lParam)

-{

-	if (!m_bLoggedIn || !wParam)

-		return 0;

-

-	// send without reason, do we need any ?

-	CMStringA szEmail;

-	if (mraGetStringA((HANDLE)wParam, "e-mail", szEmail))

-		MraAuthorize(szEmail);

-

-	return 0;

-}

-

-INT_PTR CMraProto::MraSendPostcard(WPARAM wParam, LPARAM lParam)

-{

-	if (!m_bLoggedIn)

-		return 0;

-

-	DWORD dwContactEMailCount = GetContactEMailCount((HANDLE)wParam, FALSE);

-	if (dwContactEMailCount) {

-		if (dwContactEMailCount == 1) {

-			CMStringA szUrl, szEmail;

-			if ( GetContactFirstEMail((HANDLE)wParam, FALSE, szEmail)) {

-				szEmail.MakeLower();

-				szUrl.Format("http://cards.mail.ru/event.html?rcptname=%s&rcptemail=%s", GetContactNameA((HANDLE)wParam), szEmail);

-				MraMPopSessionQueueAddUrl(hMPopSessionQueue, szUrl);

-			}

-		}

-		else MraSelectEMailDlgShow((HANDLE)wParam, MRA_SELECT_EMAIL_TYPE_SEND_POSTCARD);

-	}

-	return 0;

-}

-

-INT_PTR CMraProto::MraViewAlbum(WPARAM wParam, LPARAM lParam)

-{

-	if (!m_bLoggedIn)

-		return 0;

-

-	DWORD dwContactEMailMRCount = GetContactEMailCount((HANDLE)wParam, TRUE);

-	if (dwContactEMailMRCount) {

-		if (dwContactEMailMRCount == 1) {

-			CMStringA szEmail;

-			if ( GetContactFirstEMail((HANDLE)wParam, TRUE, szEmail))

-				MraMPopSessionQueueAddUrlAndEMail(hMPopSessionQueue, MRA_FOTO_URL, szEmail);

-		}

-		else MraSelectEMailDlgShow((HANDLE)wParam, MRA_SELECT_EMAIL_TYPE_VIEW_ALBUM);

-	}

-	return 0;

-}

-

-INT_PTR CMraProto::MraReadBlog(WPARAM wParam, LPARAM lParam)

-{

-	if (!m_bLoggedIn)

-		return 0;

-

-	DWORD dwContactEMailMRCount = GetContactEMailCount((HANDLE)wParam, TRUE);

-	if (dwContactEMailMRCount)

-	if (dwContactEMailMRCount == 1) {

-		CMStringA szEmail;

-		if (GetContactFirstEMail((HANDLE)wParam, TRUE, szEmail))

-			MraMPopSessionQueueAddUrlAndEMail(hMPopSessionQueue, MRA_BLOGS_URL, szEmail);

-	}

-	else MraSelectEMailDlgShow((HANDLE)wParam, MRA_SELECT_EMAIL_TYPE_READ_BLOG);

-

-	return 0;

-}

-

-INT_PTR CMraProto::MraReplyBlogStatus(WPARAM wParam, LPARAM lParam)

-{

-	if (!m_bLoggedIn)

-		return 0;

-

-	CMStringW blogStatusMsg;

-	mraGetStringW((HANDLE)wParam, DBSETTING_BLOGSTATUS, blogStatusMsg);

-	if (!blogStatusMsg.IsEmpty()|| wParam == 0)

-		MraSendReplyBlogStatus((HANDLE)wParam);

-

-	return 0;

-}

-

-INT_PTR CMraProto::MraViewVideo(WPARAM wParam, LPARAM lParam)

-{

-	if (!m_bLoggedIn)

-		return 0;

-

-	DWORD dwContactEMailMRCount = GetContactEMailCount((HANDLE)wParam, TRUE);

-	if (dwContactEMailMRCount) {

-		if (dwContactEMailMRCount == 1) {

-			CMStringA szEmail;

-			if (GetContactFirstEMail((HANDLE)wParam, TRUE, szEmail))

-				MraMPopSessionQueueAddUrlAndEMail(hMPopSessionQueue, MRA_VIDEO_URL, szEmail);

-		}

-		else MraSelectEMailDlgShow((HANDLE)wParam, MRA_SELECT_EMAIL_TYPE_VIEW_VIDEO);

-	}

-	return 0;

-}

-

-INT_PTR CMraProto::MraAnswers(WPARAM wParam, LPARAM lParam)

-{

-	if (!m_bLoggedIn)

-		return 0;

-

-	DWORD dwContactEMailMRCount = GetContactEMailCount((HANDLE)wParam, TRUE);

-	if (dwContactEMailMRCount) {

-		if (dwContactEMailMRCount == 1) {

-			CMStringA szEmail;

-			if (GetContactFirstEMail((HANDLE)wParam, TRUE, szEmail))

-				MraMPopSessionQueueAddUrlAndEMail(hMPopSessionQueue, MRA_ANSWERS_URL, szEmail);

-		}

-		else MraSelectEMailDlgShow((HANDLE)wParam, MRA_SELECT_EMAIL_TYPE_ANSWERS);

-	}

-	return 0;

-}

-

-INT_PTR CMraProto::MraWorld(WPARAM wParam, LPARAM lParam)

-{

-	if (!m_bLoggedIn)

-		return 0;

-

-	DWORD dwContactEMailMRCount = GetContactEMailCount((HANDLE)wParam, TRUE);

-	if (dwContactEMailMRCount) {

-		if (dwContactEMailMRCount == 1) {

-			CMStringA szEmail;

-			if (GetContactFirstEMail((HANDLE)wParam, TRUE, szEmail))

-				MraMPopSessionQueueAddUrlAndEMail(hMPopSessionQueue, MRA_WORLD_URL, szEmail);

-		}

-		else MraSelectEMailDlgShow((HANDLE)wParam, MRA_SELECT_EMAIL_TYPE_WORLD);

-	}

-	return 0;

-}

-

 /////////////////////////////////////////////////////////////////////////////////////////

 

 int CMraProto::MraContactDeleted(WPARAM wParam, LPARAM lParam)

@@ -534,57 +295,6 @@ int CMraProto::MraDbSettingChanged(WPARAM wParam, LPARAM lParam)
 	return 0;

 }

 

-int CMraProto::MraRebuildContactMenu(WPARAM wParam, LPARAM lParam)

-{

-	BOOL bIsContactMRA, bHasEMail, bHasEMailMR, bChatAgent;

-	DWORD dwContactSeverFlags = 0;

-	CMStringW blogStatusMsgSize;

-	HANDLE hContact = (HANDLE)wParam;

-

-	// proto own contact

-	bIsContactMRA = IsContactMra(hContact);

-	if (bIsContactMRA) {

-		bHasEMail = TRUE;

-		bHasEMailMR = TRUE;

-		bChatAgent = IsContactChatAgent(hContact);

-		GetContactBasicInfoW(hContact, NULL, NULL, NULL, &dwContactSeverFlags, NULL, NULL, NULL, NULL);

-		mraGetStringW(hContact, DBSETTING_BLOGSTATUS, blogStatusMsgSize);

-	}

-	// non proto contact

-	else bHasEMail = bHasEMailMR = bChatAgent = FALSE;

-

-	//"Request authorization"

-	Menu_ShowItem(hContactMenuItems[0], (m_bLoggedIn && bIsContactMRA));// && (dwContactSeverFlags&CONTACT_INTFLAG_NOT_AUTHORIZED)

-

-	//"Grant authorization"

-	Menu_ShowItem(hContactMenuItems[1], (m_bLoggedIn && bIsContactMRA && bChatAgent == FALSE));

-

-	//"&Send postcard"

-	Menu_ShowItem(hContactMenuItems[2], (m_bLoggedIn && bHasEMail && bChatAgent == FALSE));

-

-	//"&View Album"

-	Menu_ShowItem(hContactMenuItems[3], (m_bLoggedIn && bHasEMailMR && bChatAgent == FALSE));

-

-	//"&Read Blog"

-	Menu_ShowItem(hContactMenuItems[4], (m_bLoggedIn && bHasEMailMR && bChatAgent == FALSE));

-

-	//"Reply Blog Status"

-	Menu_ShowItem(hContactMenuItems[5], (m_bLoggedIn && blogStatusMsgSize.GetLength() && bChatAgent == FALSE));

-

-	//"View Video"

-	Menu_ShowItem(hContactMenuItems[6], (m_bLoggedIn && bHasEMailMR && bChatAgent == FALSE));

-

-	//"Answers"

-	Menu_ShowItem(hContactMenuItems[7], (m_bLoggedIn && bHasEMailMR && bChatAgent == FALSE));

-

-	//"World"

-	Menu_ShowItem(hContactMenuItems[8], (m_bLoggedIn && bHasEMailMR && bChatAgent == FALSE));

-

-	//"Send &Nudge"

-	Menu_ShowItem(hContactMenuItems[9], (!m_heNudgeReceived) ? (m_bLoggedIn && bIsContactMRA) : 0);

-	return 0;

-}

-

 /////////////////////////////////////////////////////////////////////////////////////////

 // Extra icons

 

@@ -594,47 +304,6 @@ int CMraProto::MraExtraIconsApply(WPARAM wParam, LPARAM lParam)
 	return 0;

 }

 

-/////////////////////////////////////////////////////////////////////////////////////////

-

-int CMraProto::MraRebuildStatusMenu(WPARAM wParam, LPARAM lParam)

-{

-	CHAR szServiceFunction[MAX_PATH*2], *pszServiceFunctionName, szValueName[MAX_PATH];

-	strncpy(szServiceFunction, m_szModuleName, sizeof(szServiceFunction));

-	pszServiceFunctionName = szServiceFunction + strlen(m_szModuleName);

-

-	TCHAR szItem[MAX_PATH+64];

-	mir_sntprintf(szItem, SIZEOF(szItem), _T("%s Custom Status"), m_tszUserName);

-

-	CLISTMENUITEM mi = { sizeof(mi) };

-	mi.position = 2000060000;

-	mi.popupPosition = 500085000;

-	mi.ptszPopupName = szItem;

-	mi.flags = CMIF_UNICODE;

-	mi.pszService = szServiceFunction;

-	mi.pszContactOwner = m_szModuleName;

-

-	CMStringW szStatusTitle;

-	for (size_t i = 0; i < MRA_XSTATUS_COUNT; i++)  {

-		mir_snprintf(pszServiceFunctionName, 100, "/menuXStatus%ld", i);

-		mi.position++;

-		if (i) {

-			mir_snprintf(szValueName, SIZEOF(szValueName), "XStatus%ldName", i);

-			if ( mraGetStringW(NULL, szValueName, szStatusTitle))

-				mi.ptszName = (TCHAR*)szStatusTitle.c_str();

-			else

-				mi.ptszName = lpcszXStatusNameDef[i];

-

-			mi.icolibItem = hXStatusAdvancedStatusIcons[i];

-		}

-		else {

-			mi.ptszName = lpcszXStatusNameDef[i];

-			mi.hIcon = NULL;

-		}

-		hXStatusMenuItems[i] = Menu_AddStatusMenuItem(&mi);

-	}

-	return 0;

-}

-

 INT_PTR CMraProto::MraSetListeningTo(WPARAM wParam, LPARAM lParam)

 {

 	LISTENINGTOINFO *pliInfo = (LISTENINGTOINFO*)lParam;