From f632783f27da5dd0ed3513bbee6182ea8af30afe Mon Sep 17 00:00:00 2001 From: Mataes Date: Sat, 17 Mar 2018 21:41:50 +0300 Subject: FTPFile: replace mir_strcpy and mir_wstrcpy --- plugins/FTPFileYM/src/dialog.cpp | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) (limited to 'plugins/FTPFileYM/src/dialog.cpp') diff --git a/plugins/FTPFileYM/src/dialog.cpp b/plugins/FTPFileYM/src/dialog.cpp index 2096f0bb60..bed6074e26 100644 --- a/plugins/FTPFileYM/src/dialog.cpp +++ b/plugins/FTPFileYM/src/dialog.cpp @@ -79,10 +79,14 @@ UploadDialog::Tab::Tab(GenericJob *Job) : m_stzComplet[0] = 0; m_stzRemain[0] = 0; - wchar_t buff[256]; + CMStringW buff = m_job->m_tszFileName; TCITEM tab = { 0 }; tab.mask = TCIF_TEXT; - tab.pszText = Utils::getTextFragment(m_job->m_tszFileName, 20, buff); + if (mir_wstrlen(buff) > 20) { + buff = buff.Left(20); + buff.Append(L"..."); + } + tab.pszText = buff.GetBuffer(); TabCtrl_InsertItem(uDlg->m_hwndTabs, uDlg->m_tabs.size(), &tab); { mir_cslock lock(mutexTabs); @@ -130,12 +134,15 @@ void UploadDialog::Tab::select() void UploadDialog::Tab::labelCompleted() { - wchar_t buff[64], buff2[256]; - mir_snwprintf(buff2, L"* %s", Utils::getTextFragment(m_job->m_tszFileName, 20, buff)); + CMStringW buff(FORMAT, L"* %s", m_job->m_tszFileName); + if (mir_wstrlen(buff) > 20) { + buff = buff.Left(22); + buff.Append(L"..."); + } TCITEM tab = { 0 }; tab.mask = TCIF_TEXT; - tab.pszText = buff2; + tab.pszText = buff.GetBuffer(); TabCtrl_SetItem(uDlg->m_hwndTabs, index(), &tab); } -- cgit v1.2.3