From ecd3dc1742670c5d08b63361a574a186a1f4444b Mon Sep 17 00:00:00 2001 From: Kimmo Varis Date: Sat, 14 Apr 2007 08:07:11 +0000 Subject: [PATCH] PATCH: [ 1700241 ] Add trailing slash for foldernames in Copy Confirm dialog --- Src/Changes.txt | 4 ++++ Src/DirActions.cpp | 16 ++++++++++++++-- 2 files changed, 18 insertions(+), 2 deletions(-) diff --git a/Src/Changes.txt b/Src/Changes.txt index 7739fe883..21347aa71 100644 --- a/Src/Changes.txt +++ b/Src/Changes.txt @@ -2,6 +2,10 @@ Src\Changes.txt Add new items to top. (This summarizes all changes to all files under Src, including Src\Languages.) +2007-04-14 Kimmo + PATCH: [ 1700241 ] Add trailing slash for foldernames in Copy Confirm dialog + Src: DirActions.cpp + 2007-04-13 Kimmo PATCH: [ 1699585 ] Fix copy confirmation dialog for CopyTo Src: ConfirmFolderCopyDlg.cpp DirActions.cpp FileActionScript.h Merge.rc resource.h diff --git a/Src/DirActions.cpp b/Src/DirActions.cpp index 54317c358..fdd04626c 100644 --- a/Src/DirActions.cpp +++ b/Src/DirActions.cpp @@ -90,12 +90,24 @@ static BOOL ConfirmCopy(int origin, int destination, int count, sDest = LoadResString(IDS_TO); } + CString strSrc(src); + if (paths_DoesPathExist(src) == IS_EXISTING_DIR) + { + if (!paths_EndsWithSlash(src)) + strSrc += _T("\\"); + } + CString strDest(dest); + if (paths_DoesPathExist(dest) == IS_EXISTING_DIR) + { + if (!paths_EndsWithSlash(dest)) + strDest += _T("\\"); + } dlg.m_question = strQuestion; dlg.m_fromText = sOrig; dlg.m_toText = sDest; - dlg.m_fromPath = src; - dlg.m_toPath = dest; + dlg.m_fromPath = strSrc; + dlg.m_toPath = strDest; int rtn = dlg.DoModal(); return (rtn==IDYES); -- 2.11.0