DolphinQt: Update AboutDialog to include number of commits ahead of master.
This commit is contained in:
parent
02f57a4778
commit
38117ef066
|
@ -17,6 +17,16 @@ AboutDialog::AboutDialog(QWidget* parent) : QDialog(parent)
|
||||||
setWindowTitle(tr("About Dolphin"));
|
setWindowTitle(tr("About Dolphin"));
|
||||||
setWindowFlags(windowFlags() & ~Qt::WindowContextHelpButtonHint);
|
setWindowFlags(windowFlags() & ~Qt::WindowContextHelpButtonHint);
|
||||||
|
|
||||||
|
QString branch_str = QString::fromStdString(Common::GetScmBranchStr());
|
||||||
|
const int commits_ahead = Common::GetScmCommitsAheadMaster();
|
||||||
|
if (commits_ahead > 0)
|
||||||
|
{
|
||||||
|
branch_str = tr("%1 (%2)").arg(
|
||||||
|
branch_str,
|
||||||
|
// i18n: A positive number of version control commits made compared to some named branch
|
||||||
|
tr("%1 commit(s) ahead of %2").arg(commits_ahead).arg(QStringLiteral("master")));
|
||||||
|
}
|
||||||
|
|
||||||
const QString text =
|
const QString text =
|
||||||
QStringLiteral(R"(
|
QStringLiteral(R"(
|
||||||
<p style='font-size:38pt; font-weight:400;'>Dolphin</p>
|
<p style='font-size:38pt; font-weight:400;'>Dolphin</p>
|
||||||
|
@ -50,7 +60,7 @@ AboutDialog::AboutDialog(QWidget* parent) : QDialog(parent)
|
||||||
QString::fromUtf8(Common::GetScmDescStr().c_str()))
|
QString::fromUtf8(Common::GetScmDescStr().c_str()))
|
||||||
.replace(QStringLiteral("%BRANCH%"),
|
.replace(QStringLiteral("%BRANCH%"),
|
||||||
// i18n: "Branch" means the version control term, not a literal tree branch.
|
// i18n: "Branch" means the version control term, not a literal tree branch.
|
||||||
tr("Branch: %1").arg(QString::fromUtf8(Common::GetScmBranchStr().c_str())))
|
tr("Branch: %1").arg(branch_str))
|
||||||
.replace(QStringLiteral("%REVISION%"),
|
.replace(QStringLiteral("%REVISION%"),
|
||||||
tr("Revision: %1").arg(QString::fromUtf8(Common::GetScmRevGitStr().c_str())))
|
tr("Revision: %1").arg(QString::fromUtf8(Common::GetScmRevGitStr().c_str())))
|
||||||
.replace(QStringLiteral("%QT_VERSION%"),
|
.replace(QStringLiteral("%QT_VERSION%"),
|
||||||
|
|
Loading…
Reference in New Issue