forked from qt-creator/qt-creator
Git: InstantBlame: Improve tooltip appearance
* Improve commit/author/date layout * Use the same colors as in diff description Change-Id: Icc7b7c21cefa7aaca5c8a40a6d85cda30147afba Reviewed-by: Orgad Shaneh <orgads@gmail.com>
This commit is contained in:
committed by
André Hartmann
parent
eeac3b4851
commit
269bb4a3ea
@@ -111,24 +111,26 @@ bool BlameMark::addToolTipContent(QLayout *target) const
|
|||||||
|
|
||||||
QString BlameMark::toolTipText(const CommitInfo &info) const
|
QString BlameMark::toolTipText(const CommitInfo &info) const
|
||||||
{
|
{
|
||||||
|
const ColorNames colors = GitClient::colorNames();
|
||||||
|
|
||||||
QString result = QString(
|
QString result = QString(
|
||||||
"<table cellspacing=\"10\"><tr>"
|
"<table cellspacing=\"10\"><tr>"
|
||||||
" <td><a href=\"blame\">Blame %1</a></td>"
|
" <td><a href=\"blame\">Blame %2</a></td>"
|
||||||
" <td><a href=\"blameParent\">Blame Parent</a></td>"
|
" <td><a href=\"blameParent\">Blame Parent</a></td>"
|
||||||
" <td><a href=\"showFile\">File at %1</a></td>"
|
" <td><a href=\"showFile\">File at %2</a></td>"
|
||||||
" <td><a href=\"logLine\">Log for line %2</a></td>"
|
" <td><a href=\"logLine\">Log for line %4</a></td>"
|
||||||
"</tr></table>"
|
"</tr></table>"
|
||||||
"<p></p>"
|
"<p></p>"
|
||||||
"<table>"
|
"<table>"
|
||||||
" <tr><td>commit</td><td><a href=\"show\">%1</a></td></tr>"
|
" <tr><td>commit</td><td><a style=\"color: %1;\" href=\"show\">%3</a></td></tr>"
|
||||||
" <tr><td>Author:</td><td>%3 <%4></td></tr>"
|
" <tr><td>Author:</td><td style=\"color: %5;\">%6 <%7></td></tr>"
|
||||||
" <tr><td>Date:</td><td>%5</td></tr>"
|
" <tr><td>Date:</td><td style=\"color: %8;\">%9</td></tr>"
|
||||||
" <tr></tr>"
|
"</table>"
|
||||||
" <tr><td colspan='2' align='left'>%6</td></tr>"
|
"<p style=\"color: %10;\">%11</p>")
|
||||||
"</table>")
|
.arg(colors.hash, info.sha1.left(8), info.sha1, QString::number(info.line),
|
||||||
.arg(info.sha1.left(8), QString::number(info.line),
|
colors.author, info.author, info.authorMail,
|
||||||
info.author, info.authorMail,
|
colors.date, info.authorTime.toString("yyyy-MM-dd hh:mm:ss"),
|
||||||
info.authorTime.toString("yyyy-MM-dd hh:mm:ss"), info.summary);
|
colors.subject, info.summary);
|
||||||
|
|
||||||
if (settings().instantBlameIgnoreSpaceChanges()
|
if (settings().instantBlameIgnoreSpaceChanges()
|
||||||
|| settings().instantBlameIgnoreLineMoves()) {
|
|| settings().instantBlameIgnoreLineMoves()) {
|
||||||
|
Reference in New Issue
Block a user