summaryrefslogtreecommitdiff
path: root/file_hierarchy.cpp
diff options
context:
space:
mode:
authorDaniel Wilhelm <daniel@wili.li>2014-04-18 17:19:49 +0200
committerDaniel Wilhelm <daniel@wili.li>2014-04-18 17:19:49 +0200
commitc8e0e909b4a8d18319fc65434a10dc446434817c (patch)
treeeee91e7d2ce229dd043811eae8f1e2bd78061916 /file_hierarchy.cpp
parent5.2 (diff)
downloadFreeFileSync-c8e0e909b4a8d18319fc65434a10dc446434817c.tar.gz
FreeFileSync-c8e0e909b4a8d18319fc65434a10dc446434817c.tar.bz2
FreeFileSync-c8e0e909b4a8d18319fc65434a10dc446434817c.zip
5.3
Diffstat (limited to 'file_hierarchy.cpp')
-rw-r--r--file_hierarchy.cpp9
1 files changed, 5 insertions, 4 deletions
diff --git a/file_hierarchy.cpp b/file_hierarchy.cpp
index f1bb7385..5a18ddbe 100644
--- a/file_hierarchy.cpp
+++ b/file_hierarchy.cpp
@@ -7,6 +7,7 @@
#include "file_hierarchy.h"
#include <zen/i18n.h>
#include <zen/utf8.h>
+#include <zen/file_error.h>
using namespace zen;
@@ -373,11 +374,11 @@ std::wstring zen::getSyncOpDescription(const FileSystemObject& fsObj)
return getSyncOpDescription(op) + L"\n" +
(EqualFilename()(beforeLast(relSource, FILE_NAME_SEPARATOR), beforeLast(relTarget, FILE_NAME_SEPARATOR)) ? //returns empty string if ch not found
//detected pure "rename"
- L"\"" + utf8CvrtTo<std::wstring>(afterLast(relSource, FILE_NAME_SEPARATOR)) + L"\"" + L" ->\n" + //show short name only
- L"\"" + utf8CvrtTo<std::wstring>(afterLast(relTarget, FILE_NAME_SEPARATOR)) + L"\"" :
+ fmtFileName(afterLast(relSource, FILE_NAME_SEPARATOR)) + L" ->\n" + //show short name only
+ fmtFileName(afterLast(relTarget, FILE_NAME_SEPARATOR)) :
//"move" or "move + rename"
- L"\"" + utf8CvrtTo<std::wstring>(relSource) + L"\"" + L" ->\n" +
- L"\"" + utf8CvrtTo<std::wstring>(relTarget) + L"\"");
+ fmtFileName(relSource) + L" ->\n" +
+ fmtFileName(relTarget));
//attention: ::SetWindowText() doesn't handle tab characters correctly in combination with certain file names, so don't use them
}
break;
bgstack15