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

Show modified text in merge changes dialog as far as possible

Browse Source 
Fixes #1362
This commit is contained in:
Juergen Spitzmueller 2019-12-26 11:17:09 +01:00
parent d914142969
commit 90ae998287
1 changed files with 22 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/frontends/qt/GuiChanges.cpp
View File

@ -24,8 +24,10 @@
#include "BufferParams.h"
#include "BufferView.h"
#include "Changes.h"
#include "Cursor.h"
#include "FuncRequest.h"
#include "LyXRC.h"
#include "Text.h"
#include <QDateTime>
#include <QTextBrowser>
@ -65,26 +67,40 @@ void GuiChanges::updateContents()
bool const changePresent = c.type != Change::UNCHANGED;
rejectPB->setEnabled(changePresent);
acceptPB->setEnabled(changePresent);
bool const inserted = c.type == Change::INSERTED;
QString text;
if (changePresent) {
QString const author =
toqstr(buffer().params().authors().get(c.author).nameAndEmail());
if (!author.isEmpty())
text += (c.type == Change::INSERTED) ? qt_("Inserted by %1").arg(author)
: qt_("Deleted by %1").arg(author);
text += inserted ? qt_("Inserted by %1").arg(author)
: qt_("Deleted by %1").arg(author);
QString const date = QDateTime::fromTime_t(c.changetime)
.toString(Qt::DefaultLocaleLongDate);
if (!date.isEmpty()) {
if (!author.isEmpty())
text += qt_(" on[[date]] %1\n").arg(date);
text += qt_(" on[[date]] %1").arg(date);
else
text += (c.type == Change::INSERTED) ? qt_("Inserted on %1\n").arg(date)
: qt_("Deleted on %1\n").arg(date);
text += inserted ? qt_("Inserted on %1").arg(date)
: qt_("Deleted on %1").arg(date);
}
QString changedcontent = toqstr(bufferview()->cursor().selectionAsString(false));
if (!changedcontent.isEmpty()) {
text += ":<br><br><b>";
if (inserted)
text += "<u><span style=\"color:blue\">";
else
text += "<s><span style=\"color:red\">";
text += changedcontent;
if (inserted)
text += "</u></span></b>";
else
text += "</s></span></b>";
}
}
changeTB->setPlainText(text);
changeTB->setHtml(text);
}