anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-12-23 13:31:49 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

bug 993

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@6734 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
John Levon 2003-04-08 00:06:52 +00:00
parent f5bd8ba3cd
commit d28efb5543
2 changed files with 30 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/support/ChangeLog
View File

@ -1,3 +1,8 @@
2003-04-08 John Levon <levon@movementarian.org>
* filetools.C: fix MakeDisplayPath() to not
lie (bug 993)
2003-03-30 John Levon <levon@movementarian.org> 2003-03-30 John Levon <levon@movementarian.org>
* Makefile.am: * Makefile.am:

55
src/support/filetools.C
View File

@ -1121,54 +1121,39 @@ string const unzipFile(string const & zipped_file)
} }
// Creates a nice compact path for displaying string const MakeDisplayPath(string const & path, unsigned int threshold)
string const
MakeDisplayPath (string const & path, unsigned int threshold)
{ {
string::size_type const l1 = path.length(); string str = path;
// First, we try a relative path compared to home
string const home(GetEnvPath("HOME")); string const home(GetEnvPath("HOME"));
string relhome = MakeRelPath(path, home);
string::size_type l2 = relhome.length(); // replace /home/blah with ~/
if (prefixIs(str, home))
str = subst(str, home, "~");
string prefix; if (str.length() <= threshold)
return str;
// If we backup from home or don't have a relative path,
// this try is no good
if (prefixIs(relhome, "../") || os::is_absolute_path(relhome)) {
// relative path was no good, just use the original path
relhome = path;
l2 = l1;
} else {
prefix = "~/";
}
// Is the path too long?
if (l2 > threshold) {
// Yes, shortend it
prefix += ".../";
string const prefix = ".../";
string temp; string temp;
while (relhome.length() > threshold) while (str.length() > threshold)
relhome = split(relhome, temp, '/'); str = split(str, temp, '/');
// Did we shortend everything away? // Did we shorten everything away?
if (relhome.empty()) { if (str.empty()) {
// Yes, filename in 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.
relhome = OnlyFilename(path); str = OnlyFilename(path);
string const head = relhome.substr(0, threshold/2 - 3); string const head = str.substr(0, threshold / 2 - 3);
l2 = relhome.length(); string::size_type len = str.length();
string const tail = string const tail =
relhome.substr(l2 - threshold/2 - 2, l2 - 1); str.substr(len - threshold / 2 - 2, len - 1);
relhome = head + "..." + tail; str = head + "..." + tail;
} }
}
return prefix + relhome; return prefix + str;
} }