Jabber: Minor LPGEN fixes

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

3 files changed, 34 insertions, 31 deletions

diff --git a/protocols/JabberG/src/jabber_menu.cpp b/protocols/JabberG/src/jabber_menu.cpp
index 396254b83e..ad77799568 100644
--- a/protocols/JabberG/src/jabber_menu.cpp
+++ b/protocols/JabberG/src/jabber_menu.cpp
@@ -741,7 +741,7 @@ void CJabberProto::MenuInit()
 	mi.pszService = srvFce;

 	mi.ptszName = szName;

 	mi.position = 2000040000;

-	mi.flags = CMIF_CHILDPOPUP | CMIF_TCHAR;

+	mi.flags = CMIF_CHILDPOPUP | CMIF_TCHAR | CMIF_KEEPUNTRANSLATED;

 	mi.hParentMenu = m_hMenuPriorityRoot;

 

 	mir_snprintf(srvFce, SIZEOF(srvFce), "%s/menuSetPriority/0", m_szModuleName);

@@ -756,10 +756,15 @@ void CJabberProto::MenuInit()
 			continue;

 		}

 

-		mi.icolibItem = (steps[i] > 0) ? GetIconHandle(IDI_ARROW_UP) : GetIconHandle(IDI_ARROW_DOWN);

-

 		mir_snprintf(srvFce, SIZEOF(srvFce), "%s/menuSetPriority/%d", m_szModuleName, steps[i]);

-		mir_sntprintf(szName, SIZEOF(szName), (steps[i] > 0) ? TranslateT("Increase priority by %d") : TranslateT("Decrease priority by %d"), abs(steps[i]));

+		if(steps[i] > 0) {

+			mir_sntprintf(szName, SIZEOF(szName), TranslateT("Increase priority by %d"), steps[i]);

+			mi.icolibItem = GetIconHandle(IDI_ARROW_UP);

+		}

+		else {

+			mir_sntprintf(szName, SIZEOF(szName), TranslateT("Decrease priority by %d"), -steps[i]);

+			mi.icolibItem = GetIconHandle(IDI_ARROW_DOWN);

+		}

 

 		if (needServices)

 			CreateProtoServiceParam(svcName, &CJabberProto::OnMenuSetPriority, (LPARAM)steps[i]);

@@ -803,7 +808,7 @@ void CJabberProto::UpdatePriorityMenu(short priority)
 	mir_sntprintf(szName, SIZEOF(szName), TranslateT("Resource priority [%d]"), (int)priority);

 

 	CLISTMENUITEM mi = { sizeof(mi) };

-	mi.flags = CMIF_TCHAR | CMIM_NAME;

+	mi.flags = CMIF_TCHAR | CMIM_NAME | CMIF_KEEPUNTRANSLATED;

 	mi.ptszName = szName;

 	Menu_ModifyItem(m_hMenuPriorityRoot, &mi);

 

diff --git a/protocols/JabberG/src/jabber_privacy.cpp b/protocols/JabberG/src/jabber_privacy.cpp
index 1b6ff96e2a..beb5e511c2 100644
--- a/protocols/JabberG/src/jabber_privacy.cpp
+++ b/protocols/JabberG/src/jabber_privacy.cpp
@@ -380,8 +380,8 @@ public:
 

 		PostMessage(m_hwnd, WM_COMMAND, MAKEWPARAM(IDC_COMBO_TYPE, CBN_SELCHANGE), 0);

 

-		SendDlgItemMessage(m_hwnd, IDC_COMBO_ACTION, CB_ADDSTRING, 0, (LPARAM)TranslateTS(_T("Deny")));

-		SendDlgItemMessage(m_hwnd, IDC_COMBO_ACTION, CB_ADDSTRING, 0, (LPARAM)TranslateTS(_T("Allow")));

+		SendDlgItemMessage(m_hwnd, IDC_COMBO_ACTION, CB_ADDSTRING, 0, (LPARAM)TranslateT("Deny"));

+		SendDlgItemMessage(m_hwnd, IDC_COMBO_ACTION, CB_ADDSTRING, 0, (LPARAM)TranslateT("Allow"));

 

 		SendDlgItemMessage(m_hwnd, IDC_COMBO_ACTION, CB_SETCURSEL, m_pRule->GetAction() ? 1 : 0, 0);

 

@@ -1038,7 +1038,7 @@ void CJabberDlgPrivacyLists::ShowAdvancedList(CPrivacyList *pList)
 

 	EnableWindow(GetDlgItem(m_hwnd, IDC_PL_RULES_LIST), !bListEmpty);

 	if (bListEmpty)

-		SendDlgItemMessage(m_hwnd, IDC_PL_RULES_LIST, LB_ADDSTRING, 0, (LPARAM)TranslateTS(_T("List has no rules, empty lists will be deleted then changes applied")));

+		SendDlgItemMessage(m_hwnd, IDC_PL_RULES_LIST, LB_ADDSTRING, 0, (LPARAM)TranslateT("List has no rules, empty lists will be deleted then changes applied"));

 	else

 		SendDlgItemMessage(m_hwnd, IDC_PL_RULES_LIST, LB_SETCURSEL, nLbSel, 0);

 

@@ -1706,7 +1706,7 @@ void CJabberDlgPrivacyLists::lbLists_OnSelChange(CCtrlListBox *)
 		else {

 			EnableWindow(GetDlgItem(m_hwnd, IDC_PL_RULES_LIST), FALSE);

 			SendDlgItemMessage(m_hwnd, IDC_PL_RULES_LIST, LB_RESETCONTENT, 0, 0);

-			SendDlgItemMessage(m_hwnd, IDC_PL_RULES_LIST, LB_ADDSTRING, 0, (LPARAM)TranslateTS(_T("No list selected")));

+			SendDlgItemMessage(m_hwnd, IDC_PL_RULES_LIST, LB_ADDSTRING, 0, (LPARAM)TranslateT("No list selected"));

 		}

 		EnableEditorControls();

 		return;

@@ -1869,7 +1869,7 @@ void CJabberDlgPrivacyLists::btnRemoveList_OnClick(CCtrlButton *)
 			 (m_proto->m_privacyListManager.GetDefaultListName() && !_tcscmp(szListName, m_proto->m_privacyListManager.GetDefaultListName())))

 		{

 			lck.unlock();

-			MessageBox(m_hwnd, TranslateTS(_T("Can't remove active or default list")), TranslateTS(_T("Sorry")), MB_OK | MB_ICONSTOP);

+			MessageBox(m_hwnd, TranslateT("Can't remove active or default list"), TranslateT("Sorry"), MB_OK | MB_ICONSTOP);

 			return;

 		}

 		pList->SetDeleted();

diff --git a/protocols/JabberG/src/jabber_svc.cpp b/protocols/JabberG/src/jabber_svc.cpp
index afa0db8b5a..c0e9b257e9 100644
--- a/protocols/JabberG/src/jabber_svc.cpp
+++ b/protocols/JabberG/src/jabber_svc.cpp
@@ -180,7 +180,7 @@ INT_PTR __cdecl CJabberProto::OnGetEventTextChatStates(WPARAM, LPARAM lParam)
 	if (pdbEvent->dbei->cbBlob > 0) {

 		if (pdbEvent->dbei->pBlob[0] == JABBER_DB_EVENT_CHATSTATES_GONE) {

 			if (pdbEvent->datatype == DBVT_WCHAR)

-				return (INT_PTR)mir_tstrdup(TranslateTS(_T("closed chat session")));

+				return (INT_PTR)mir_tstrdup(TranslateT("closed chat session"));

 			else if (pdbEvent->datatype == DBVT_ASCIIZ)

 				return (INT_PTR)mir_strdup(Translate("closed chat session"));

 		}

@@ -199,42 +199,42 @@ INT_PTR __cdecl CJabberProto::OnGetEventTextPresence(WPARAM, LPARAM lParam)
 		switch (pdbEvent->dbei->pBlob[0]) {

 		case JABBER_DB_EVENT_PRESENCE_SUBSCRIBE:

 			if (pdbEvent->datatype == DBVT_WCHAR)

-				return (INT_PTR)mir_tstrdup(TranslateTS(_T("sent subscription request")));

+				return (INT_PTR)mir_tstrdup(TranslateT("sent subscription request"));

 			else if (pdbEvent->datatype == DBVT_ASCIIZ)

 				return (INT_PTR)mir_strdup(Translate("sent subscription request"));

 			break;

 

 		case JABBER_DB_EVENT_PRESENCE_SUBSCRIBED:

 			if (pdbEvent->datatype == DBVT_WCHAR)

-				return (INT_PTR)mir_tstrdup(TranslateTS(_T("approved subscription request")));

+				return (INT_PTR)mir_tstrdup(TranslateT("approved subscription request"));

 			else if (pdbEvent->datatype == DBVT_ASCIIZ)

 				return (INT_PTR)mir_strdup(Translate("approved subscription request"));

 			break;

 

 		case JABBER_DB_EVENT_PRESENCE_UNSUBSCRIBE:

 			if (pdbEvent->datatype == DBVT_WCHAR)

-				return (INT_PTR)mir_tstrdup(TranslateTS(_T("declined subscription")));

+				return (INT_PTR)mir_tstrdup(TranslateT("declined subscription"));

 			else if (pdbEvent->datatype == DBVT_ASCIIZ)

 				return (INT_PTR)mir_strdup(Translate("declined subscription"));

 			break;

 

 		case JABBER_DB_EVENT_PRESENCE_UNSUBSCRIBED:

 			if (pdbEvent->datatype == DBVT_WCHAR)

-				return (INT_PTR)mir_tstrdup(TranslateTS(_T("declined subscription")));

+				return (INT_PTR)mir_tstrdup(TranslateT("declined subscription"));

 			else if (pdbEvent->datatype == DBVT_ASCIIZ)

 				return (INT_PTR)mir_strdup(Translate("declined subscription"));

 			break;

 

 		case JABBER_DB_EVENT_PRESENCE_ERROR:

 			if (pdbEvent->datatype == DBVT_WCHAR)

-				return (INT_PTR)mir_tstrdup(TranslateTS(_T("sent error presence")));

+				return (INT_PTR)mir_tstrdup(TranslateT("sent error presence"));

 			else if (pdbEvent->datatype == DBVT_ASCIIZ)

 				return (INT_PTR)mir_strdup(Translate("sent error presence"));

 			break;

 

 		default:

 			if (pdbEvent->datatype == DBVT_WCHAR)

-				return (INT_PTR)mir_tstrdup(TranslateTS(_T("sent unknown presence type")));

+				return (INT_PTR)mir_tstrdup(TranslateT("sent unknown presence type"));

 			else if (pdbEvent->datatype == DBVT_ASCIIZ)

 				return (INT_PTR)mir_strdup(Translate("sent unknown presence type"));

 			break;

@@ -334,8 +334,8 @@ INT_PTR __cdecl CJabberProto::ServiceSendXML(WPARAM, LPARAM lParam)
 /////////////////////////////////////////////////////////////////////////////////////////

 // "/GCGetToolTipText" - gets tooltip text

 

-static const TCHAR *JabberEnum2AffilationStr[] = { _T("None"), _T("Outcast"), _T("Member"), _T("Admin"), _T("Owner") };

-static const TCHAR *JabberEnum2RoleStr[] = { _T("None"), _T("Visitor"), _T("Participant"), _T("Moderator") };

+static const TCHAR *JabberEnum2AffilationStr[] = { LPGENT("None"), LPGENT("Outcast"), LPGENT("Member"), LPGENT("Admin"), LPGENT("Owner") },

+	*JabberEnum2RoleStr[] = { LPGENT("None"), LPGENT("Visitor"), LPGENT("Participant"), LPGENT("Moderator") };

 

 static void appendString(bool bIsTipper, const TCHAR *tszTitle, const TCHAR *tszValue, TCHAR* buf, size_t bufSize)

 {

@@ -349,7 +349,7 @@ static void appendString(bool bIsTipper, const TCHAR *tszTitle, const TCHAR *tsz
 	bufSize -= len;

 

 	if (bIsTipper)

-		mir_sntprintf(buf, bufSize, _T("%s%s%s%s"), _T("<b>"), TranslateTS(tszTitle), _T("</b>\t"), tszValue);

+		mir_sntprintf(buf, bufSize, _T("<b>%s</b>%s\t"), TranslateTS(tszTitle), tszValue);

 	else {

 		TCHAR *p = TranslateTS(tszTitle);

 		mir_sntprintf(buf, bufSize, _T("%s%s\t%s"), p, _tcslen(p)<=7 ? _T("\t") : _T(""), tszValue);

@@ -383,37 +383,35 @@ INT_PTR __cdecl CJabberProto::JabberGCGetToolTipText(WPARAM wParam, LPARAM lPara
 

 	//JID:

 	if (_tcschr(info->m_tszResourceName, _T('@')) != NULL)

-		appendString(bIsTipper, _T("JID:"), info->m_tszResourceName, outBuf, SIZEOF(outBuf));

+		appendString(bIsTipper, LPGENT("JID:"), info->m_tszResourceName, outBuf, SIZEOF(outBuf));

 	else if (lParam) //or simple nick

-		appendString(bIsTipper, _T("Nick:"), (TCHAR*)lParam, outBuf, SIZEOF(outBuf));

+		appendString(bIsTipper, LPGENT("Nick:"), (TCHAR*)lParam, outBuf, SIZEOF(outBuf));

 

 	// status

 	if (info->m_iStatus >= ID_STATUS_OFFLINE && info->m_iStatus <= ID_STATUS_IDLE )

-		appendString(bIsTipper, _T("Status:"), pcli->pfnGetStatusModeDescription(info->m_iStatus, 0), outBuf, SIZEOF(outBuf));

+		appendString(bIsTipper, LPGENT("Status:"), pcli->pfnGetStatusModeDescription(info->m_iStatus, 0), outBuf, SIZEOF(outBuf));

 

 	// status text

 	if (info->m_tszStatusMessage)

-		appendString(bIsTipper, _T("Status text:"), info->m_tszStatusMessage, outBuf, SIZEOF(outBuf));

+		appendString(bIsTipper, LPGENT("Status text:"), info->m_tszStatusMessage, outBuf, SIZEOF(outBuf));

 

 	// Role

-	appendString(bIsTipper, _T("Role:"), TranslateTS(JabberEnum2RoleStr[info->m_role]), outBuf, SIZEOF(outBuf));

+	appendString(bIsTipper, LPGENT("Role:"), TranslateTS(JabberEnum2RoleStr[info->m_role]), outBuf, SIZEOF(outBuf));

 

 	// Affiliation

-	appendString(bIsTipper, _T("Affiliation:"), TranslateTS(JabberEnum2AffilationStr[info->m_affiliation]), outBuf, SIZEOF(outBuf));

+	appendString(bIsTipper, LPGENT("Affiliation:"), TranslateTS(JabberEnum2AffilationStr[info->m_affiliation]), outBuf, SIZEOF(outBuf));

 

 	// real jid

 	if (info->m_tszRealJid)

-		appendString(bIsTipper, _T("Real JID:"), info->m_tszRealJid, outBuf, SIZEOF(outBuf));

+		appendString(bIsTipper, LPGENT("Real JID:"), info->m_tszRealJid, outBuf, SIZEOF(outBuf));

 

-	return (INT_PTR)(outBuf[0] == 0 ? NULL : mir_tstrdup(outBuf));

+	return (outBuf[0] == 0 ? NULL : (INT_PTR) mir_tstrdup(outBuf));

 }

 

 // File Association Manager plugin support

 

-INT_PTR __cdecl CJabberProto::JabberServiceParseXmppURI(WPARAM wParam, LPARAM lParam)

+INT_PTR __cdecl CJabberProto::JabberServiceParseXmppURI(WPARAM, LPARAM lParam)

 {

-	UNREFERENCED_PARAMETER(wParam);

-

 	TCHAR *arg = (TCHAR *)lParam;

 	if (arg == NULL)

 		return 1;