diff options
author | René Schümann <white06tiger@gmail.com> | 2015-04-21 12:06:08 +0000 |
---|---|---|
committer | René Schümann <white06tiger@gmail.com> | 2015-04-21 12:06:08 +0000 |
commit | 0bc1bd3f2a77e48286c436518292c58e2e788282 (patch) | |
tree | 5598354c85600134c0220d04a973d137556465a7 /plugins | |
parent | 8e0c5ae195e5af8d8e371b02cbe0e0f99f4a9e29 (diff) |
SendSS: yet once again reverted r12961 which reverted my r12957 (partial revert of r12937. Yep he didn't name the revision he reverted, nor did he explain it)
So, in case I understood him right, r12937 tried to fix some redundant information in the window's title and headerbar control. Yet this doesn't actually apply to SendSS+ and we've lost that information instead.
Personally I also preferred the old look of UInfoEx which got also messed with in r12937 but I'm not the one responsible to change it.
@all: please properly comment your commits. Keep it short, but not just "fixed headerbar" if you could say "removed redundant information from headerbars which was already present in window title" instead. Could have spared me about 20 minutes to figure out what's fixed... (and that revert madness)
git-svn-id: http://svn.miranda-ng.org/main/trunk@13005 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'plugins')
-rw-r--r-- | plugins/SendScreenshotPlus/res/resource.rc | 4 | ||||
-rw-r--r-- | plugins/SendScreenshotPlus/src/UMainForm.cpp | 9 |
2 files changed, 9 insertions, 4 deletions
diff --git a/plugins/SendScreenshotPlus/res/resource.rc b/plugins/SendScreenshotPlus/res/resource.rc index 5c3043e68a..fac296540f 100644 --- a/plugins/SendScreenshotPlus/res/resource.rc +++ b/plugins/SendScreenshotPlus/res/resource.rc @@ -52,10 +52,10 @@ END IDD_UMainForm DIALOGEX 0, 0, 231, 164 STYLE DS_3DLOOK | DS_CENTER | DS_SHELLFONT | WS_CAPTION | WS_POPUP | WS_SYSMENU EXSTYLE WS_EX_TOOLWINDOW | WS_EX_CONTROLPARENT | WS_EX_APPWINDOW -CAPTION "Send screenshot to" +CAPTION "Send screenshot" FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN - CONTROL "<unknown>",IDC_HEADERBAR, + CONTROL "Send screenshot to\n<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 7f37f1ee40..6214ba2763 100644 --- a/plugins/SendScreenshotPlus/src/UMainForm.cpp +++ b/plugins/SendScreenshotPlus/src/UMainForm.cpp @@ -176,8 +176,13 @@ 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)) - SetDlgItemText(m_hWnd, IDC_HEADERBAR, pt); + 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); + } mir_free(pt); SendDlgItemMessage(m_hWnd, IDC_HEADERBAR, WM_SETICON, ICON_BIG, (LPARAM)GetIcon(ICO_MAIN)); |