aboutsummaryrefslogtreecommitdiff
path: root/src/qt/utilitydialog.cpp
diff options
context:
space:
mode:
authorWladimir J. van der Laan <laanwj@gmail.com>2014-06-10 16:02:46 +0200
committerWladimir J. van der Laan <laanwj@gmail.com>2014-06-12 16:11:56 +0200
commit45615af26fe374fa996c116984a05f0a632a0e79 (patch)
tree8d291f3ddb4b0781e47bdf63e145640bad3b5592 /src/qt/utilitydialog.cpp
parent97789d374c40f4f7fc8feb19c1235ca09ad2e06e (diff)
Add 'about' information to `-version` output
Adds a copyright and attribution message to the `-version` output (the same as shown in the About dialog in the GUI). Move the message to a function LicenseInfo in init.cpp.
Diffstat (limited to 'src/qt/utilitydialog.cpp')
-rw-r--r--src/qt/utilitydialog.cpp20
1 files changed, 14 insertions, 6 deletions
diff --git a/src/qt/utilitydialog.cpp b/src/qt/utilitydialog.cpp
index 435c6a4368..a34ebd3a37 100644
--- a/src/qt/utilitydialog.cpp
+++ b/src/qt/utilitydialog.cpp
@@ -16,6 +16,7 @@
#include "util.h"
#include <QLabel>
+#include <QRegExp>
#include <QVBoxLayout>
/** "About" dialog box */
@@ -24,16 +25,13 @@ AboutDialog::AboutDialog(QWidget *parent) :
ui(new Ui::AboutDialog)
{
ui->setupUi(this);
-
- // Set current copyright year
- ui->copyrightLabel->setText(tr("Copyright") + QString(" &copy; 2009-%1 ").arg(COPYRIGHT_YEAR) + tr("The Bitcoin Core developers"));
}
void AboutDialog::setModel(ClientModel *model)
{
if(model)
{
- QString version = model->formatFullVersion();
+ QString version = tr("Bitcoin Core") + " " + tr("version") + " " + model->formatFullVersion();
/* On x86 add a bit specifier to the version so that users can distinguish between
* 32 and 64 bit builds. On other architectures, 32/64 bit may be more ambigious.
*/
@@ -42,7 +40,17 @@ void AboutDialog::setModel(ClientModel *model)
#elif defined(__i386__ )
version += " " + tr("(%1-bit)").arg(32);
#endif
- ui->versionLabel->setText(version);
+
+ /// HTML-format the license message from the core
+ QString licenseInfo = QString::fromStdString(LicenseInfo());
+ // Make URLs clickable
+ QRegExp uri("<(.*)>", Qt::CaseSensitive, QRegExp::RegExp2);
+ uri.setMinimal(true); // use non-greedy matching
+ licenseInfo = licenseInfo.replace(uri, "<a href=\"\\1\">\\1</a>");
+ // Replace newlines with HTML breaks
+ licenseInfo = licenseInfo.replace("\n\n", "<br><br>");
+
+ ui->versionLabel->setText(version + "<br><br>" + licenseInfo);
}
}
@@ -81,7 +89,7 @@ HelpMessageDialog::HelpMessageDialog(QWidget *parent, bool versionOnly) :
// Set help message text
if(versionOnly)
- ui->helpMessageLabel->setText(version);
+ ui->helpMessageLabel->setText(version + "\n" + QString::fromStdString(LicenseInfo()));
else
ui->helpMessageLabel->setText(version + "\n" + header + "\n" + coreOptions + "\n" + uiOptions);
}