diff options
| author | Kirill Volinsky <mataes2007@gmail.com> | 2015-04-21 13:57:06 +0000 |
|---|---|---|
| committer | Kirill Volinsky <mataes2007@gmail.com> | 2015-04-21 13:57:06 +0000 |
| commit | 0312ed9ab8fa1fbdae202dc1efe1a36c02861818 (patch) | |
| tree | 10fba4dc7e661ec59502f8e34958450a90ca6130 | |
| parent | c0c9165efc0c69952509187328306b047fde4b6c (diff) | |
i think it is final version.
Stop revert my commit
git-svn-id: http://svn.miranda-ng.org/main/trunk@13010 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
| -rw-r--r-- | plugins/SendScreenshotPlus/res/resource.rc | 4 | ||||
| -rw-r--r-- | plugins/SendScreenshotPlus/src/UMainForm.cpp | 16 | ||||
| -rw-r--r-- | plugins/SendScreenshotPlus/src/global.h | 1 |
3 files changed, 8 insertions, 13 deletions
diff --git a/plugins/SendScreenshotPlus/res/resource.rc b/plugins/SendScreenshotPlus/res/resource.rc index fac296540f..57cf69cf43 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" +CAPTION "Send screenshot to <unknown>" FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN - CONTROL "Send screenshot to\n<unknown>",IDC_HEADERBAR, + CONTROL "Take a screenshot and send it to a contact",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..7125537002 100644 --- a/plugins/SendScreenshotPlus/src/UMainForm.cpp +++ b/plugins/SendScreenshotPlus/src/UMainForm.cpp @@ -170,21 +170,15 @@ void TfrmMain::wmInitdialog(WPARAM wParam, LPARAM lParam) { /// Taskbar and Window icon SendMessage(m_hWnd, WM_SETICON, ICON_BIG, (LPARAM)GetIcon(ICO_MAIN)); SendMessage(m_hWnd, WM_SETICON, ICON_SMALL, (LPARAM)GetIcon(ICO_MAINXS)); - TCHAR* pt = mir_a2t(__PLUGIN_NAME); - SetWindowText(m_hWnd, pt); - mir_free(pt); - - /// Headerbar - pt = mir_tstrdup((TCHAR*)CallService(MS_CLIST_GETCONTACTDISPLAYNAME, (WPARAM)m_hContact, (LPARAM)GCDNF_TCHAR)); + TCHAR *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); + CMString string; + string.AppendFormat(_T("Send screenshot to %s"), pt); + SetWindowText(m_hWnd, string); } mir_free(pt); + /// Headerbar SendDlgItemMessage(m_hWnd, IDC_HEADERBAR, WM_SETICON, ICON_BIG, (LPARAM)GetIcon(ICO_MAIN)); /// Timed controls diff --git a/plugins/SendScreenshotPlus/src/global.h b/plugins/SendScreenshotPlus/src/global.h index 44f1047da7..41e4fec0dd 100644 --- a/plugins/SendScreenshotPlus/src/global.h +++ b/plugins/SendScreenshotPlus/src/global.h @@ -70,6 +70,7 @@ using namespace std; #include <m_skin.h> #include <m_popup.h> #include <m_icolib.h> +#include <m_string.h> #include <m_folders.h> #include <m_HTTPServer.h> |