From bd5df383711637cb7f94b21bf033441d8f3409f2 Mon Sep 17 00:00:00 2001 From: Tobias Weimer Date: Tue, 28 Apr 2015 20:28:43 +0000 Subject: Jabber: Changed some text in headerbar (some text and jid was cut off) git-svn-id: http://svn.miranda-ng.org/main/trunk@13235 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- protocols/JabberG/res/jabber.rc | 19 ++++++++----------- protocols/JabberG/src/jabber_chat.cpp | 19 +++++++++---------- protocols/JabberG/src/jabber_groupchat.cpp | 4 ++-- 3 files changed, 19 insertions(+), 23 deletions(-) diff --git a/protocols/JabberG/res/jabber.rc b/protocols/JabberG/res/jabber.rc index a8ef782a86..234c9d25a5 100644 --- a/protocols/JabberG/res/jabber.rc +++ b/protocols/JabberG/res/jabber.rc @@ -403,11 +403,10 @@ END IDD_GROUPCHAT_INVITE DIALOGEX 0, 0, 215, 275 STYLE DS_SETFONT | DS_MODALFRAME | DS_SETFOREGROUND | DS_FIXEDSYS | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Invite Users to " +CAPTION "Send group chat invitation" FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN - CONTROL "Send group chat invitation.",IDC_HEADERBAR, - "MHeaderbarCtrl",0x0,0,0,215,25 + CONTROL "",IDC_HEADERBAR,"MHeaderbarCtrl",0x0,0,0,215,25 CONTROL "",IDC_CLIST,"CListControl",WS_TABSTOP | 0x1,7,40,201,116,WS_EX_CLIENTEDGE LTEXT "Other JID:",IDC_STATIC,7,162,46,8 EDITTEXT IDC_NEWJID,59,160,127,12,ES_AUTOHSCROLL @@ -421,11 +420,10 @@ END IDD_GROUPCHAT_INVITE_ACCEPT DIALOGEX 0, 0, 216, 174 STYLE DS_SETFONT | DS_MODALFRAME | DS_SETFOREGROUND | DS_FIXEDSYS | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Group chat invitation to " +CAPTION "Incoming group chat invitation" FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN - CONTROL "Incoming group chat invitation.",IDC_HEADERBAR, - "MHeaderbarCtrl",0x0,0,0,216,25 + CONTROL "",IDC_HEADERBAR,"MHeaderbarCtrl",0x0,0,0,216,25 LTEXT "You are invited to conference room by",IDC_STATIC,7,40,202,8 EDITTEXT IDC_FROM,17,51,192,12,ES_AUTOHSCROLL | ES_READONLY | NOT WS_BORDER LTEXT "with following reason:",IDC_STATIC,7,69,202,8 @@ -594,9 +592,8 @@ EXSTYLE WS_EX_CONTROLPARENT CAPTION "Member Information" FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN - CONTROL "",IDC_HEADERBAR, - "MHeaderbarCtrl",0x0,0,0,183,25 - ICON IDI_JABBER,IDC_ICO_STATUS,5,38,16,17,SS_CENTERIMAGE | SS_REALSIZEIMAGE + CONTROL "",IDC_HEADERBAR,"MHeaderbarCtrl",0x0,0,0,183,25 + ICON IDI_JABBER,IDC_ICO_STATUS,5,38,20,20,SS_CENTERIMAGE | SS_REALSIZEIMAGE EDITTEXT IDC_TXT_NICK,26,38,152,8,ES_AUTOHSCROLL | ES_READONLY | NOT WS_BORDER EDITTEXT IDC_TXT_JID,36,47,142,8,ES_AUTOHSCROLL | ES_READONLY | NOT WS_BORDER RTEXT "Role:",IDC_STATIC,5,59,36,12,SS_CENTERIMAGE @@ -616,7 +613,7 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN GROUPBOX "Chat options",IDC_STATIC,4,3,295,175 CONTROL "",IDC_OPTTREE,"SysTreeView32",TVS_DISABLEDRAGDROP | WS_BORDER | WS_HSCROLL | WS_TABSTOP,9,15,285,140 - LTEXT "Alternate nick:",IDC_STATIC,11,161,174,8 + RTEXT "Alternate nick:",IDC_STATIC,11,161,174,8 EDITTEXT IDC_TXT_ALTNICK,190,159,104,14,ES_AUTOHSCROLL GROUPBOX "Custom messages",IDC_STATIC,4,180,295,45 EDITTEXT IDC_TXT_QUIT,45,192,249,12,ES_AUTOHSCROLL @@ -696,7 +693,7 @@ EXSTYLE WS_EX_CONTROLPARENT CAPTION "XML Console" FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN - CONTROL "",IDC_CONSOLE,"RichEdit50W",ES_MULTILINE | ES_READONLY | WS_BORDER | WS_VSCROLL | WS_TABSTOP,5,5,343,137 + CONTROL "",IDC_CONSOLE,"RichEdit50W",WS_BORDER | WS_VSCROLL | WS_TABSTOP | 0x804,5,5,343,137 CONTROL "Custom1",IDC_BTN_MSG,"MButtonClass",WS_TABSTOP,5,147,16,14 CONTROL "Custom1",IDC_BTN_PRESENCE,"MButtonClass",WS_TABSTOP,21,147,16,14 CONTROL "Custom1",IDC_BTN_IQ,"MButtonClass",WS_TABSTOP,37,147,16,14 diff --git a/protocols/JabberG/src/jabber_chat.cpp b/protocols/JabberG/src/jabber_chat.cpp index adb925f570..f70003e9f8 100644 --- a/protocols/JabberG/src/jabber_chat.cpp +++ b/protocols/JabberG/src/jabber_chat.cpp @@ -513,8 +513,10 @@ int CJabberProto::JabberGcMenuHook(WPARAM, LPARAM lParam) pResourceStatus me(NULL), him(NULL); for (int i=0; i < item->arResources.getCount(); i++) { JABBER_RESOURCE_STATUS *p = item->arResources[i]; - if (!mir_tstrcmp(p->m_tszResourceName, item->nick)) me = p; - if (!mir_tstrcmp(p->m_tszResourceName, gcmi->pszUID)) him = p; + if (!mir_tstrcmp(p->m_tszResourceName, item->nick)) + me = p; + else if (!mir_tstrcmp(p->m_tszResourceName, gcmi->pszUID)) + him = p; } if (gcmi->Type == MENU_ON_LOG) { @@ -721,7 +723,7 @@ public: { CSuper::OnInitDialog(); - SetWindowText(m_hwnd, CMString(FORMAT, TranslateT("Invite Users to %s"), m_room)); + SetDlgItemText(m_hwnd, IDC_HEADERBAR,CMString(FORMAT, TranslateT("Invite Users to\n%s"), m_room)); WindowSetIcon(m_hwnd, m_proto, "group"); SetWindowLongPtr(GetDlgItem(m_hwnd, IDC_CLIST), GWL_STYLE, @@ -825,7 +827,7 @@ struct TUserInfoData static INT_PTR CALLBACK sttUserInfoDlgProc(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam) { TUserInfoData *dat = (TUserInfoData *)GetWindowLongPtr(hwndDlg, GWLP_USERDATA); - int value, i, idx; + int value, idx; switch (msg) { case WM_INITDIALOG: @@ -853,17 +855,14 @@ static INT_PTR CALLBACK sttUserInfoDlgProc(HWND hwndDlg, UINT msg, WPARAM wParam SendDlgItemMessage(hwndDlg, IDC_ICO_STATUS, STM_SETICON, (WPARAM)LoadSkinnedProtoIcon(dat->ppro->m_szModuleName, dat->him->m_iStatus), 0); TCHAR buf[256]; - mir_sntprintf(buf, SIZEOF(buf), TranslateT("Member Info: %s"), dat->him->m_tszResourceName); - SetWindowText(hwndDlg, buf); - - mir_sntprintf(buf, SIZEOF(buf), TranslateT("from %s"), dat->item->jid); + mir_sntprintf(buf, SIZEOF(buf), TranslateT("%s from\n%s"), dat->him->m_tszResourceName, dat->item->jid); SetDlgItemText(hwndDlg, IDC_HEADERBAR, buf); SetDlgItemText(hwndDlg, IDC_TXT_NICK, dat->him->m_tszResourceName); SetDlgItemText(hwndDlg, IDC_TXT_JID, dat->him->m_tszRealJid ? dat->him->m_tszRealJid : TranslateT("Real JID not available")); SetDlgItemText(hwndDlg, IDC_TXT_STATUS, dat->him->m_tszStatusMessage); - for (i = 0; i < SIZEOF(sttRoleItems); i++) { + for (int i = 0; i < SIZEOF(sttRoleItems); i++) { if ((sttRoleItems[i].value == dat->him->m_role) || sttRoleItems[i].check(dat->me, dat->him)) { SendDlgItemMessage(hwndDlg, IDC_TXT_ROLE, CB_SETITEMDATA, idx = SendDlgItemMessage(hwndDlg, IDC_TXT_ROLE, CB_ADDSTRING, 0, (LPARAM)sttRoleItems[i].title), @@ -872,7 +871,7 @@ static INT_PTR CALLBACK sttUserInfoDlgProc(HWND hwndDlg, UINT msg, WPARAM wParam SendDlgItemMessage(hwndDlg, IDC_TXT_ROLE, CB_SETCURSEL, idx, 0); } } - for (i = 0; i < SIZEOF(sttAffiliationItems); i++) { + for (int i = 0; i < SIZEOF(sttAffiliationItems); i++) { if ((sttAffiliationItems[i].value == dat->him->m_affiliation) || sttAffiliationItems[i].check(dat->me, dat->him)) { SendDlgItemMessage(hwndDlg, IDC_TXT_AFFILIATION, CB_SETITEMDATA, idx = SendDlgItemMessage(hwndDlg, IDC_TXT_AFFILIATION, CB_ADDSTRING, 0, (LPARAM)sttAffiliationItems[i].title), diff --git a/protocols/JabberG/src/jabber_groupchat.cpp b/protocols/JabberG/src/jabber_groupchat.cpp index cbba3eb47a..6eb131ddd9 100644 --- a/protocols/JabberG/src/jabber_groupchat.cpp +++ b/protocols/JabberG/src/jabber_groupchat.cpp @@ -1157,8 +1157,8 @@ public: CSuper::OnInitDialog(); TCHAR buf[256]; - mir_sntprintf(buf, SIZEOF(buf), TranslateT("Group chat invitation to %s"), m_info->roomJid); - SetWindowText(m_hwnd, buf); + mir_sntprintf(buf, SIZEOF(buf), TranslateT("Group chat invitation to\n%s"), m_info->roomJid); + SetDlgItemText(m_hwnd, IDC_HEADERBAR, buf); SetDlgItemText(m_hwnd, IDC_FROM, m_info->from); -- cgit v1.2.3