fixed header bar info

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

5 files changed, 7 insertions, 12 deletions

diff --git a/plugins/AddContactPlus/res/resource.rc b/plugins/AddContactPlus/res/resource.rc
index 96c9348a55..1b1bde6444 100644
--- a/plugins/AddContactPlus/res/resource.rc
+++ b/plugins/AddContactPlus/res/resource.rc
@@ -79,7 +79,7 @@ EXSTYLE WS_EX_CONTROLPARENT
 CAPTION "Add contact"

 FONT 8, "MS Shell Dlg", 0, 0, 0x1

 BEGIN

-    CONTROL         "Add contact\nAdd a contact to your contact list",IDC_HEADERBAR,"MHeaderbarCtrl",0x0,0,0,230,25

+    CONTROL         "Add a contact to your contact list",IDC_HEADERBAR,"MHeaderbarCtrl",0x0,0,0,230,25

     LTEXT           "Account:",IDC_STATIC,6,29,89,10

     CONTROL         "",IDC_PROTO,"ComboBoxEx32",CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP,6,41,90,80

     LTEXT           "Contact ID:",IDC_IDLABEL,112,29,108,10

diff --git a/plugins/SendScreenshotPlus/res/resource.rc b/plugins/SendScreenshotPlus/res/resource.rc
index fac296540f..6a1c8af638 100644
--- a/plugins/SendScreenshotPlus/res/resource.rc
+++ b/plugins/SendScreenshotPlus/res/resource.rc
@@ -55,7 +55,7 @@ EXSTYLE WS_EX_TOOLWINDOW | WS_EX_CONTROLPARENT | WS_EX_APPWINDOW
 CAPTION "Send screenshot"
 FONT 8, "MS Shell Dlg", 0, 0, 0x1
 BEGIN
-    CONTROL         "Send screenshot to\n<unknown>",IDC_HEADERBAR,
+    CONTROL         "<unknown>",IDC_HEADERBAR,
                     "MHeaderbarCtrl",0x0,0,0,231,25
     CONTROL         "",IDC_CAPTURETAB,"SysTabControl32",TCS_RAGGEDRIGHT | WS_TABSTOP,8,36,218,68
     CONTROL         "Ti&med capture",ID_chkTimed,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,8,106,85,10
diff --git a/plugins/SendScreenshotPlus/src/UMainForm.cpp b/plugins/SendScreenshotPlus/src/UMainForm.cpp
index 6214ba2763..7f37f1ee40 100644
--- a/plugins/SendScreenshotPlus/src/UMainForm.cpp
+++ b/plugins/SendScreenshotPlus/src/UMainForm.cpp
@@ -176,13 +176,8 @@ void TfrmMain::wmInitdialog(WPARAM wParam, LPARAM lParam) {
 
 	/// Headerbar
 	pt = mir_tstrdup((TCHAR*)CallService(MS_CLIST_GETCONTACTDISPLAYNAME, (WPARAM)m_hContact, (LPARAM)GCDNF_TCHAR));
-	if (pt && (m_hContact != 0)) {
-		TCHAR* lptString = NULL;
-		mir_tstradd(lptString , TranslateT("Send screenshot to\n"));
-		mir_tstradd(lptString , pt);
-		SetDlgItemText(m_hWnd, IDC_HEADERBAR, lptString);
-		mir_free(lptString);
-	}
+	if (pt && (m_hContact != 0))
+		SetDlgItemText(m_hWnd, IDC_HEADERBAR, pt);
 	mir_free(pt);
 
 	SendDlgItemMessage(m_hWnd, IDC_HEADERBAR, WM_SETICON, ICON_BIG, (LPARAM)GetIcon(ICO_MAIN));
diff --git a/plugins/UserInfoEx/res/resource.rc b/plugins/UserInfoEx/res/resource.rc
index a4a139ad5a..c2d72d0b71 100644
--- a/plugins/UserInfoEx/res/resource.rc
+++ b/plugins/UserInfoEx/res/resource.rc
@@ -29,7 +29,7 @@ EXSTYLE WS_EX_NOPARENTNOTIFY | WS_EX_CONTROLPARENT
 CAPTION "Edit contact information"

 FONT 8, "MS Shell Dlg", 0, 0, 0x1

 BEGIN

-    CONTROL         "Edit Contact Information\nThis list gives you some overview about all your contact's anniversaries.",IDC_HEADERBAR,

+    CONTROL         "This list gives you some overview about all your contact's anniversaries.",IDC_HEADERBAR,

                     "MHeaderbarCtrl",WS_TABSTOP,0,0,405,25

     CONTROL         "",IDC_PAGETITLEBG,"Static",SS_WHITERECT | NOT WS_VISIBLE,101,25,300,21

     CONTROL         "Origin",IDC_PAGETITLE,"Static",SS_SIMPLE | WS_GROUP,108,28,284,15

@@ -285,7 +285,7 @@ CAPTION "Anniversary editor"
 FONT 8, "MS Shell Dlg", 400, 0, 0x1

 BEGIN

     CONTROL         "",IDC_STATIC,"Static",SS_WHITERECT,0,25,185,39

-    CONTROL         "Anniversary Editor\nAdd/Edit your anniversary here.",IDC_HEADERBAR,

+    CONTROL         "Add/Edit your anniversary here.",IDC_HEADERBAR,

                     "MHeaderbarCtrl",0x0,0,0,185,25

     CONTROL         "Enter a name for the anniversary here please:",IDC_STATIC,

                     "Static",SS_SIMPLE | WS_GROUP,3,31,178,8

diff --git a/plugins/UserInfoEx/src/dlg_propsheet.cpp b/plugins/UserInfoEx/src/dlg_propsheet.cpp
index 265a885574..327545b488 100644
--- a/plugins/UserInfoEx/src/dlg_propsheet.cpp
+++ b/plugins/UserInfoEx/src/dlg_propsheet.cpp
@@ -1107,7 +1107,7 @@ static INT_PTR CALLBACK DlgProc(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lPar
 		HWND hName = GetDlgItem(hDlg, TXT_NAME);

 		SetWindowText(hName, pszName);

 		SetWindowText(hDlg, CMString(FORMAT, _T("%s - %s"), pszName, TranslateT("edit contact information")));

-		SetDlgItemText(hDlg, IDC_HEADERBAR, CMString(FORMAT, _T("%s\n%s"), TranslateT("Edit contact information"), pszName));

+		SetDlgItemText(hDlg, IDC_HEADERBAR, CMString(FORMAT, _T("%s"), pszName));

 

 		// redraw the name control

 		POINT pt = { 0, 0 };