# # # patch "res/forms/panels/nodeinfo.ui" # from [f13c52f4935ad1133da050b5f31944468608bcde] # to [cb07f4a4f705c97e84cf542d9d245a2202e80d33] # # patch "src/view/panels/NodeInfo.cpp" # from [3f755b797d508093646290c093c6307dfdbd57b1] # to [42a281f64f26502909ada22e46f271daf5010482] # # patch "src/vocab.h" # from [4c28eb2a0b3707b2b0423d19a2de14b23ada9646] # to [60909265688bb1ba31d7b6cf6f3277a458fb654f] # ============================================================ --- res/forms/panels/nodeinfo.ui f13c52f4935ad1133da050b5f31944468608bcde +++ res/forms/panels/nodeinfo.ui cb07f4a4f705c97e84cf542d9d245a2202e80d33 @@ -1,7 +1,8 @@ - + + NodeInfo - - + + 0 0 @@ -9,344 +10,323 @@ 420 - - + + 0 0 - + 250 420 - + Node information - - + + 0 - - - QToolBox::tab { + + + QToolBox::tab { background: qlineargradient(x1:0,y1:0,x2:0,y2:1, stop: 0.1 palette(button),stop: 1 palette(mid)); color: palette(text-button); } - + 0 - + 0 - - + + 0 0 - 240 - 329 + 250 + 348 - + Last Change - - - - + + + + Author: - - - + + + Date: - - - + + + Changelog: - - - + + + Revision: - - - - + + + + 0 0 - + %1 - - - - + + + + 0 0 - + %1 - - - - + + + + 0 0 - - 50 - - - Qt::LinksAccessibleByKeyboard|Qt::LinksAccessibleByMouse|Qt::TextBrowserInteraction|Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse - - - - - - - - 0 - 0 - - - + %1 + + + - label - label_2 - label_6 - label_4 - lastChangeDate - lastChangeRevision - lastChangeLog - lastChangeAuthor - - + + 0 0 - 240 - 329 + 250 + 348 - + Record Information - - - - + + + + Old Path: - - - + + + New Path: - - - - + + + + 0 0 - + %1 - - - + + + Old Node Type: - - - - + + + + 0 0 - + %1 - - - + + + New Node Type: - - - - + + + + 0 0 - + %1 - - - - + + + + 0 0 - + %1 - - - + + + %1 - - - + + + Qt::Horizontal - - - + + + Qt::Horizontal - - - + + + Added in: - - - + + + %1 - + true - - - + + + Status: - - - + + + Qt::Horizontal - - - + + + Qt::Horizontal - - - + + + Path: - - - - + + + + 0 0 - + %1 - - - - + + + + 0 0 - + %1 - - - + + + Type: - - - + + + Qt::Vertical - + 20 40 @@ -356,149 +336,149 @@ - - + + 0 0 - 142 - 160 + 250 + 348 - + Filesystem Information - - - - + + + + Qt::Horizontal - - - + + + Qt::Horizontal - - - + + + Symlink target: - - - + + + Permissions: - - - + + + Group: - - - + + + Owner: - - - + + + Qt::Horizontal - - - + + + Qt::Horizontal - - - + + + %1 - - - + + + %1 - - - + + + %1 - - - + + + %1 - - - + + + Size: - - - + + + Last modified: - - - - + + + + 0 0 - + %1 - - - - + + + + 0 0 - + %1 - - - + + + Qt::Vertical - + 20 40 @@ -516,7 +496,7 @@ ToolBox QToolBox -

ToolBox.h

1 ============================================================ --- src/view/panels/NodeInfo.cpp 3f755b797d508093646290c093c6307dfdbd57b1 +++ src/view/panels/NodeInfo.cpp 42a281f64f26502909ada22e46f271daf5010482 @@ -103,10 +103,17 @@ void NodeInfo::readAndSetInfo() CertList certs = MonotoneUtil::getCerts(db, revs.at(0)); strLastChangeAuthor = certs.findValues("author").join(", "); - strLastChangelog = certs.findValues("changelog").join("\n---\n"); + + QList changelogCerts = certs.find("changelog"); + QStringList changelogs; + foreach (const Cert & cert, changelogCerts) + { + changelogs.push_back(cert.htmlValue()); + } + strLastChangelog = changelogs.join("\n

\n"); + QList dateCerts = certs.find("date"); QStringList dates; - foreach (const Cert & cert, dateCerts) { dates.push_back( @@ -119,7 +126,7 @@ void NodeInfo::readAndSetInfo() lastChangeRevision->setText(strLastChangeRevision); lastChangeAuthor->setText(strLastChangeAuthor); lastChangeDate->setText(strLastChangeDate); - lastChangeLog->setPlainText(strLastChangelog); + lastChangeLog->setHtml(strLastChangelog); QString strFileSize("-"), strFileLastModified("-"), ============================================================ --- src/vocab.h 4c28eb2a0b3707b2b0423d19a2de14b23ada9646 +++ src/vocab.h 60909265688bb1ba31d7b6cf6f3277a458fb654f @@ -150,7 +150,13 @@ struct Cert { htmlValue += "\n\n"; } - return htmlValue + + QString style = + ""; + + return style + htmlValue .replace(QRegExp("(\\b)([_])(\\w+)\\2"), "\\1\\2\\3\\2") .replace(QRegExp("(\\b)([*])(\\w+)\\2"), "\\1\\2\\3\\2") .replace(QRegExp("(https?://[^() ]+)"), "\\1")