anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-22 18:08:10 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

* src/text.C: fix status information output (change tracking)

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@15482 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Michael Schmitt 2006-10-22 16:47:42 +00:00
parent eabb9a5996
commit 21e11e2495
1 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/text.C
View File

@ -331,7 +331,6 @@ void readParToken(Buffer const & buf, Paragraph & par, LyXLex & lex,
errorList.push_back(ErrorItem(_("Change tracking error"),
bformat(_("Unknown author index for insertion: %1$d\n"), aid),
par.id(), 0, par.size()));
change = Change(Change::UNCHANGED);
} else
change = Change(Change::INSERTED, bp.author_map[aid], ct);
@ -345,7 +344,6 @@ void readParToken(Buffer const & buf, Paragraph & par, LyXLex & lex,
errorList.push_back(ErrorItem(_("Change tracking error"),
bformat(_("Unknown author index for deletion: %1$d\n"), aid),
par.id(), 0, par.size()));
change = Change(Change::UNCHANGED);
} else
change = Change(Change::DELETED, bp.author_map[aid], ct);
@ -368,7 +366,6 @@ void readParagraph(Buffer const & buf, Paragraph & par, LyXLex & lex,
Change change(Change::UNCHANGED);
while (lex.isOK()) {
readParToken(buf, par, lex, token, font, change, errorList);
lex.nextToken();
@ -2357,14 +2354,12 @@ string LyXText::currentState(LCursor & cur)
Paragraph const & par = cur.paragraph();
std::ostringstream os;
// FIXME: change tracking (MG)
bool const show_change = par.lookupChange(cur.pos()) != Change(Change::UNCHANGED);
if (buf.params().trackChanges)
os << "[C] ";
if (show_change) {
Change change = par.lookupChange(cur.pos());
Change change = par.lookupChange(cur.pos());
if (change.type != Change::UNCHANGED) {
Author const & a = buf.params().authors().get(change.author);
os << to_utf8(_("Change: ")) << a.name();
if (!a.email().empty())