From 51510cb684622c896487e78651e2252ccc6060ab Mon Sep 17 00:00:00 2001 From: Kirill Volinsky Date: Sun, 19 Apr 2015 17:28:55 +0000 Subject: fixed header bar info git-svn-id: http://svn.miranda-ng.org/main/trunk@12938 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- protocols/Gadu-Gadu/res/resource.rc | 14 +++++++------- protocols/Gadu-Gadu/src/sessions.cpp | 4 ++-- protocols/JabberG/res/jabber.rc | 26 +++++++++++++------------- protocols/JabberG/src/jabber_chat.cpp | 4 ++-- protocols/JabberG/src/jabber_groupchat.cpp | 4 ++-- 5 files changed, 26 insertions(+), 26 deletions(-) diff --git a/protocols/Gadu-Gadu/res/resource.rc b/protocols/Gadu-Gadu/res/resource.rc index 5330896c24..750a05dd52 100644 --- a/protocols/Gadu-Gadu/res/resource.rc +++ b/protocols/Gadu-Gadu/res/resource.rc @@ -195,7 +195,7 @@ STYLE DS_SETFONT | DS_MODALFRAME | DS_SETFOREGROUND | DS_3DLOOK | DS_FIXEDSYS | CAPTION "Create Gadu-Gadu account" FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN - CONTROL "Create Gadu-Gadu account\nThis will create new Gadu-Gadu account",IDC_HEADERBAR, + CONTROL "This will create new Gadu-Gadu account",IDC_HEADERBAR, "MHeaderbarCtrl",0x0,0,0,238,25 RTEXT "New password:",IDC_STATIC,7,33,81,8 EDITTEXT IDC_PASSWORD,95,32,79,12,ES_PASSWORD | ES_AUTOHSCROLL @@ -212,7 +212,7 @@ STYLE DS_SETFONT | DS_MODALFRAME | DS_SETFOREGROUND | DS_3DLOOK | DS_FIXEDSYS | CAPTION "Remove Gadu-Gadu account" FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN - CONTROL "Remove Gadu-Gadu account\nThis will remove your Gadu-Gadu account",IDC_HEADERBAR, + CONTROL "This will remove your Gadu-Gadu account",IDC_HEADERBAR, "MHeaderbarCtrl",0x0,0,0,238,25 RTEXT "Password:",IDC_STATIC,7,32,81,8 EDITTEXT IDC_PASSWORD,95,31,79,12,ES_PASSWORD | ES_AUTOHSCROLL @@ -228,7 +228,7 @@ STYLE DS_SETFONT | DS_MODALFRAME | DS_SETFOREGROUND | DS_3DLOOK | DS_FIXEDSYS | CAPTION "Change Gadu-Gadu password" FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN - CONTROL "Change Gadu-Gadu password\nChanges current Gadu-Gadu user password",IDC_HEADERBAR, + CONTROL "Changes current Gadu-Gadu user password",IDC_HEADERBAR, "MHeaderbarCtrl",0x0,0,0,238,25 RTEXT "New password:",IDC_STATIC,7,42,81,8 EDITTEXT IDC_PASSWORD,95,41,79,12,ES_PASSWORD | ES_AUTOHSCROLL @@ -243,7 +243,7 @@ STYLE DS_SETFONT | DS_MODALFRAME | DS_SETFOREGROUND | DS_3DLOOK | DS_FIXEDSYS | CAPTION "Change Gadu-Gadu e-mail" FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN - CONTROL "Change Gadu-Gadu e-mail\nChanges current Gadu-Gadu user e-mail",IDC_HEADERBAR, + CONTROL "Changes current Gadu-Gadu user e-mail",IDC_HEADERBAR, "MHeaderbarCtrl",0x0,0,0,238,25 RTEXT "New e-mail:",IDC_STATIC,7,47,81,8 EDITTEXT IDC_EMAIL,95,46,79,12,ES_AUTOHSCROLL @@ -310,7 +310,7 @@ STYLE DS_SETFONT | DS_MODALFRAME | DS_SETFOREGROUND | DS_3DLOOK | DS_FIXEDSYS | CAPTION "Open new conference" FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN - CONTROL "Open new conference\nSelect conference participants",IDC_HEADERBAR, + CONTROL "Select conference participants",IDC_HEADERBAR, "MHeaderbarCtrl",0x0,0,0,162,25 CONTROL "",IDC_CLIST,"CListControl",WS_TABSTOP | 0x2c8,7,32,148,140,WS_EX_CLIENTEDGE PUSHBUTTON "Open",IDOK,50,177,50,14,WS_DISABLED @@ -334,10 +334,10 @@ END IDD_SESSIONS DIALOGEX 0, 0, 414, 136 STYLE DS_SETFONT | DS_3DLOOK | DS_FIXEDSYS | DS_CENTER | WS_MINIMIZEBOX | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_THICKFRAME EXSTYLE WS_EX_CONTROLPARENT -CAPTION "Concurrent Sessions" +CAPTION "Concurrent %s Login Sessions" FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN - CONTROL "Concurrent %s Login Sessions\nView information on active concurrent sessions",IDC_HEADERBAR,"MHeaderbarCtrl",0x0,0,0,414,25 + CONTROL "View information on active concurrent sessions",IDC_HEADERBAR,"MHeaderbarCtrl",0x0,0,0,414,25 CONTROL "",IDC_SESSIONS,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_SORTASCENDING | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP,5,30,403,81 PUSHBUTTON "Sign out all sessions",IDC_SIGNOUTALL,317,116,91,15,WS_DISABLED END diff --git a/protocols/Gadu-Gadu/src/sessions.cpp b/protocols/Gadu-Gadu/src/sessions.cpp index e9e0205201..8218acdf79 100644 --- a/protocols/Gadu-Gadu/src/sessions.cpp +++ b/protocols/Gadu-Gadu/src/sessions.cpp @@ -167,9 +167,9 @@ static INT_PTR CALLBACK gg_sessions_viewdlg(HWND hwndDlg, UINT message, WPARAM w TCHAR oldTitle[256], newTitle[256]; HANDLE hProtoAckEvent; - GetDlgItemText(hwndDlg, IDC_HEADERBAR, oldTitle, SIZEOF(oldTitle)); + GetWindowText(hwndDlg, oldTitle, SIZEOF(oldTitle)); mir_sntprintf(newTitle, SIZEOF(newTitle), oldTitle, gg->m_tszUserName); - SetDlgItemText(hwndDlg, IDC_HEADERBAR, newTitle); + SetWindowText(hwndDlg, newTitle); WindowSetIcon(hwndDlg, "sessions"); if (hHandCursor == NULL) diff --git a/protocols/JabberG/res/jabber.rc b/protocols/JabberG/res/jabber.rc index 6afc1ce9f9..a8ef782a86 100644 --- a/protocols/JabberG/res/jabber.rc +++ b/protocols/JabberG/res/jabber.rc @@ -82,7 +82,7 @@ EXSTYLE WS_EX_CONTROLPARENT CAPTION "Roster Editor" FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN - CONTROL "Roster editor\nView and modify your server-side contact list.",IDC_HEADERBAR, + CONTROL "View and modify your server-side contact list.",IDC_HEADERBAR, "MHeaderbarCtrl",0x0,0,0,428,25 CONTROL "",IDC_ROSTER,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_SORTASCENDING | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP,5,38,413,225 PUSHBUTTON "Download",IDC_DOWNLOAD,5,268,60,15,WS_DISABLED @@ -365,10 +365,10 @@ END IDD_GROUPCHAT_JOIN DIALOGEX 0, 0, 258, 211 STYLE DS_SETFONT | DS_MODALFRAME | DS_3DLOOK | DS_FIXEDSYS | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU EXSTYLE WS_EX_CONTROLPARENT -CAPTION "Create or Join group chat" +CAPTION "Jabber Multi-User Conference" FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN - CONTROL "Jabber Multi-User Conference\nCreate or join existing conference room.",IDC_HEADERBAR, + CONTROL "Create or join existing conference room.",IDC_HEADERBAR, "MHeaderbarCtrl",0x0,0,0,428,25 LTEXT "Conference server:",IDC_STATIC,7,38,63,12,SS_CENTERIMAGE,WS_EX_RIGHT COMBOBOX IDC_SERVER,75,38,176,100,CBS_DROPDOWN | CBS_AUTOHSCROLL | CBS_SORT | WS_VSCROLL | WS_TABSTOP @@ -403,10 +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" +CAPTION "Invite Users to " FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN - CONTROL "\nSend group chat invitation.",IDC_HEADERBAR, + CONTROL "Send group chat invitation.",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 @@ -421,10 +421,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" +CAPTION "Group chat invitation to " FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN - CONTROL "\nIncoming group chat invitation.",IDC_HEADERBAR, + CONTROL "Incoming group chat invitation.",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 @@ -440,10 +440,10 @@ END IDD_BOOKMARKS DIALOGEX 0, 0, 295, 261 STYLE DS_SETFONT | DS_3DLOOK | DS_FIXEDSYS | DS_CENTER | WS_MINIMIZEBOX | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_THICKFRAME EXSTYLE WS_EX_CONTROLPARENT -CAPTION "Jabber Bookmarks" +CAPTION "Server side bookmarks" FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN - CONTROL "Server side bookmarks\nStore conference rooms and web links on server.",IDC_HEADERBAR, + CONTROL "Store conference rooms and web links on server.",IDC_HEADERBAR, "MHeaderbarCtrl",0x0,0,0,428,25 CONTROL "List1",IDC_BM_LIST,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP,5,38,285,187 CONTROL "Remove",IDC_REMOVE,"MButtonClass",WS_TABSTOP,37,229,16,14 @@ -482,7 +482,7 @@ EXSTYLE WS_EX_CONTROLPARENT CAPTION "Privacy Lists" FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN - CONTROL "Privacy Lists\nFlexible way to configure visibility and more.",IDC_HEADERBAR, + CONTROL "Flexible way to configure visibility and more.",IDC_HEADERBAR, "MHeaderbarCtrl",0x0,0,0,428,25 LTEXT "Lists:",IDC_TXT_LISTS,5,38,121,14,SS_CENTERIMAGE LISTBOX IDC_LB_LISTS,5,55,122,196,LBS_SORT | LBS_OWNERDRAWVARIABLE | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_TABSTOP @@ -594,7 +594,7 @@ EXSTYLE WS_EX_CONTROLPARENT CAPTION "Member Information" FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN - CONTROL "Member Information\n",IDC_HEADERBAR, + CONTROL "",IDC_HEADERBAR, "MHeaderbarCtrl",0x0,0,0,183,25 ICON IDI_JABBER,IDC_ICO_STATUS,5,38,16,17,SS_CENTERIMAGE | SS_REALSIZEIMAGE EDITTEXT IDC_TXT_NICK,26,38,152,8,ES_AUTOHSCROLL | ES_READONLY | NOT WS_BORDER @@ -630,7 +630,7 @@ STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_CENTER | WS_POPUP | WS_CAPTI CAPTION "Authorization request" FONT 8, "MS Shell Dlg", 400, 0, 0x1 BEGIN - CONTROL "HTTP Authorization\nAccept or reject incoming request",IDC_HEADERBAR, + CONTROL "Accept or reject incoming request",IDC_HEADERBAR, "MHeaderbarCtrl",0x0,0,0,428,25 LTEXT "Someone (maybe you) has requested the following file:",IDC_STATIC,7,38,203,8 EDITTEXT IDC_TXT_URL,27,49,183,12,ES_AUTOHSCROLL | ES_READONLY | NOT WS_BORDER @@ -663,7 +663,7 @@ EXSTYLE WS_EX_CONTROLPARENT CAPTION "Jabber Notebook" FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN - CONTROL "Jabber notebook\nStore notes on server and access them from anywhere.",IDC_HEADERBAR, + CONTROL "Store notes on server and access them from anywhere.",IDC_HEADERBAR, "MHeaderbarCtrl",0x0,0,0,428,25 CONTROL "Remove",IDC_REMOVE,"MButtonClass",WS_TABSTOP,37,229,16,14 CONTROL "Edit",IDC_EDIT,"MButtonClass",WS_TABSTOP,21,229,16,14 diff --git a/protocols/JabberG/src/jabber_chat.cpp b/protocols/JabberG/src/jabber_chat.cpp index cf3aa9cb95..adb925f570 100644 --- a/protocols/JabberG/src/jabber_chat.cpp +++ b/protocols/JabberG/src/jabber_chat.cpp @@ -721,7 +721,7 @@ public: { CSuper::OnInitDialog(); - SetDlgItemText(m_hwnd, IDC_HEADERBAR, CMString(FORMAT, TranslateT("%s\nSend group chat invitation."), m_room)); + SetWindowText(m_hwnd, CMString(FORMAT, TranslateT("Invite Users to %s"), m_room)); WindowSetIcon(m_hwnd, m_proto, "group"); SetWindowLongPtr(GetDlgItem(m_hwnd, IDC_CLIST), GWL_STYLE, @@ -856,7 +856,7 @@ static INT_PTR CALLBACK sttUserInfoDlgProc(HWND hwndDlg, UINT msg, WPARAM wParam mir_sntprintf(buf, SIZEOF(buf), TranslateT("Member Info: %s"), dat->him->m_tszResourceName); SetWindowText(hwndDlg, buf); - mir_sntprintf(buf, SIZEOF(buf), TranslateT("Member Information\n%s from %s"), dat->him->m_tszResourceName, dat->item->jid); + mir_sntprintf(buf, SIZEOF(buf), TranslateT("from %s"), dat->item->jid); SetDlgItemText(hwndDlg, IDC_HEADERBAR, buf); SetDlgItemText(hwndDlg, IDC_TXT_NICK, dat->him->m_tszResourceName); diff --git a/protocols/JabberG/src/jabber_groupchat.cpp b/protocols/JabberG/src/jabber_groupchat.cpp index 8b57f93873..cbba3eb47a 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("%s\nIncoming group chat invitation."), m_info->roomJid); - SetDlgItemText(m_hwnd, IDC_HEADERBAR, buf); + mir_sntprintf(buf, SIZEOF(buf), TranslateT("Group chat invitation to %s"), m_info->roomJid); + SetWindowText(m_hwnd, buf); SetDlgItemText(m_hwnd, IDC_FROM, m_info->from); -- cgit v1.2.3