diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2013-02-01 00:04:07 -0800 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2013-02-01 00:04:07 -0800 |
| commit | 9acaa73820a1a130f6e1f62b8210c14e2eaa92cb (patch) | |
| tree | ffd4532bded4db49f4994deab56c350b01a42441 | |
| parent | 5b989722be0e090e63608399468a902b76cc13dd (diff) | |
| parent | 8823b4ac3b585306bfdbfd2fc1f37f50552881ac (diff) | |
Merge pull request #2258 from Diapolo/Qt_copyright_about
Bitcoin-Qt: better copyright year handling in AboutDialog
| -rw-r--r-- | src/qt/aboutdialog.cpp | 8 | ||||
| -rw-r--r-- | src/qt/aboutdialog.h | 1 | ||||
| -rw-r--r-- | src/qt/forms/aboutdialog.ui | 5 |
3 files changed, 12 insertions, 2 deletions
diff --git a/src/qt/aboutdialog.cpp b/src/qt/aboutdialog.cpp index 0b98befe8d..755413b2bb 100644 --- a/src/qt/aboutdialog.cpp +++ b/src/qt/aboutdialog.cpp @@ -1,14 +1,20 @@ #include "aboutdialog.h" #include "ui_aboutdialog.h" + #include "clientmodel.h" -#include "version.h" +// Copyright year (2009-this) +// Todo: update this when changing our copyright comments in the source +const int ABOUTDIALOG_COPYRIGHT_YEAR = 2013; AboutDialog::AboutDialog(QWidget *parent) : QDialog(parent), ui(new Ui::AboutDialog) { ui->setupUi(this); + + // Set current copyright year + ui->copyrightLabel->setText(tr("Copyright") + QString(" © ") + tr("2009-%1 The Bitcoin developers").arg(ABOUTDIALOG_COPYRIGHT_YEAR)); } void AboutDialog::setModel(ClientModel *model) diff --git a/src/qt/aboutdialog.h b/src/qt/aboutdialog.h index 2ed9e9e7c4..33b1437674 100644 --- a/src/qt/aboutdialog.h +++ b/src/qt/aboutdialog.h @@ -18,6 +18,7 @@ public: ~AboutDialog(); void setModel(ClientModel *model); + private: Ui::AboutDialog *ui; diff --git a/src/qt/forms/aboutdialog.ui b/src/qt/forms/aboutdialog.ui index b59c2445de..80768f89b0 100644 --- a/src/qt/forms/aboutdialog.ui +++ b/src/qt/forms/aboutdialog.ui @@ -91,7 +91,10 @@ <cursorShape>IBeamCursor</cursorShape> </property> <property name="text"> - <string>Copyright © 2009-2012 The Bitcoin developers</string> + <string notr="true">Copyright &copy; 2009-YYYY The Bitcoin developers</string> + </property> + <property name="textFormat"> + <enum>Qt::RichText</enum> </property> <property name="textInteractionFlags"> <set>Qt::LinksAccessibleByMouse|Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse</set> |