#include "qt_helpers.h"
-#include "support/gettext.h"
-#include "support/lstrings.h"
-#include "support/lyxtime.h"
-
#include "Author.h"
#include "Buffer.h"
#include "BufferParams.h"
#include "BufferView.h"
#include "Changes.h"
+#include "Cursor.h"
#include "FuncRequest.h"
#include "LyXRC.h"
bc().setPolicy(ButtonPolicy::NoRepeatedApplyReadOnlyPolicy);
bc().setCancel(buttonBox->button(QDialogButtonBox::Cancel));
- bc().addReadOnly(acceptPB);
- bc().addReadOnly(rejectPB);
}
Change const & c = bufferview()->getCurrentChange();
bool const changePresent = c.type != Change::UNCHANGED;
- rejectPB->setEnabled(changePresent);
- acceptPB->setEnabled(changePresent);
+ rejectPB->setEnabled(changePresent && !isBufferReadonly());
+ acceptPB->setEnabled(changePresent && !isBufferReadonly());
+ 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);
+ QString const date =
+ QLocale().toString(QDateTime::fromTime_t(c.changetime),
+ QLocale::LongFormat);
if (!date.isEmpty()) {
if (!author.isEmpty())
- text += qt_(" on[[date]] %1\n").arg(date);
+ text += qt_(" on[[date]] %1").arg(date);
+ else
+ 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 += (c.type == Change::INSERTED) ? qt_("Inserted on %1\n").arg(date)
- : qt_("Deleted on %1\n").arg(date);
+ 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);
}
}
-Dialog * createGuiChanges(GuiView & lv) { return new GuiChanges(lv); }
-
-
} // namespace frontend
} // namespace lyx