anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-29 21:05:12 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix shortenng of file names in MakeDisplayPath: it is not a good idea to slice an utf8 string at arbitrary offsets, we have to work on a docstring instead. We need unfortunately to switch back and orth between utf8 and docstring.

Browse Source 
This is a candidate for branch too, although the bug is minor.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@40149 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Jean-Marc Lasgouttes 2011-11-06 22:36:14 +00:00
parent a3360ac3c6
commit d7320ad89b
1 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/support/filetools.cpp
View File

@ -802,25 +802,26 @@ docstring const makeDisplayPath(string const & path, unsigned int threshold)
return from_utf8(os::external_path(str)); return from_utf8(os::external_path(str));
string const prefix = ".../"; string const prefix = ".../";
string temp; docstring dstr = from_utf8(str);
docstring temp;
while (str.length() > threshold) while (dstr.length() > threshold)
str = split(str, temp, '/'); dstr = split(dstr, temp, '/');
// Did we shorten everything away? // Did we shorten everything away?
if (str.empty()) { if (dstr.empty()) {
// Yes, filename itself is too long. // Yes, filename itself is too long.
// Pick the start and the end of the filename. // Pick the start and the end of the filename.
str = onlyFileName(path); dstr = from_utf8(onlyFileName(path));
string const head = str.substr(0, threshold / 2 - 3); docstring const head = dstr.substr(0, threshold / 2 - 3);
string::size_type len = str.length(); docstring::size_type len = dstr.length();
string const tail = docstring const tail =
str.substr(len - threshold / 2 - 2, len - 1); dstr.substr(len - threshold / 2 - 2, len - 1);
str = head + "..." + tail; dstr = head + from_ascii("...") + tail;
} }
return from_utf8(os::external_path(prefix + str)); return from_utf8(os::external_path(prefix + to_utf8(dstr)));
} }