From 99ae01234d1dd3361a20b6fe759b26e51707115e Mon Sep 17 00:00:00 2001 From: Philip Kaufmann Date: Sun, 14 Apr 2013 19:42:15 +0200 Subject: [PATCH 1/4] aboutdialog: use just "The Bitcoin developers" as tr()-string - this ensures our new splash screen and this will share a translatable string an remove the need for an additional translation --- src/qt/aboutdialog.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/qt/aboutdialog.cpp b/src/qt/aboutdialog.cpp index 57818b8a27e..cea8e984259 100644 --- a/src/qt/aboutdialog.cpp +++ b/src/qt/aboutdialog.cpp @@ -11,7 +11,7 @@ AboutDialog::AboutDialog(QWidget *parent) : ui->setupUi(this); // Set current copyright year - ui->copyrightLabel->setText(tr("Copyright") + QString(" © ") + tr("2009-%1 The Bitcoin developers").arg(COPYRIGHT_YEAR)); + ui->copyrightLabel->setText(tr("Copyright") + QString(" © 2009-%1 ").arg(COPYRIGHT_YEAR) + tr("The Bitcoin developers")); } void AboutDialog::setModel(ClientModel *model) From e9abeac20434156e72aae6ff01d854c7d1c7479e Mon Sep 17 00:00:00 2001 From: Philip Kaufmann Date: Sun, 14 Apr 2013 19:45:27 +0200 Subject: [PATCH 2/4] bitcoin: use static QApplication:: instead of app. --- src/qt/bitcoin.cpp | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/src/qt/bitcoin.cpp b/src/qt/bitcoin.cpp index f079f3b0e94..9f0f6209f9c 100644 --- a/src/qt/bitcoin.cpp +++ b/src/qt/bitcoin.cpp @@ -140,12 +140,12 @@ int main(int argc, char *argv[]) // Application identification (must be set before OptionsModel is initialized, // as it is used to locate QSettings) - app.setOrganizationName("Bitcoin"); - app.setOrganizationDomain("bitcoin.org"); + QApplication::setOrganizationName("Bitcoin"); + QApplication::setOrganizationDomain("bitcoin.org"); if(GetBoolArg("-testnet")) // Separate UI settings for testnet - app.setApplicationName("Bitcoin-Qt-testnet"); + QApplication::setApplicationName("Bitcoin-Qt-testnet"); else - app.setApplicationName("Bitcoin-Qt"); + QApplication::setApplicationName("Bitcoin-Qt"); // ... then GUI settings: OptionsModel optionsModel; @@ -201,7 +201,6 @@ int main(int argc, char *argv[]) } app.processEvents(); - app.setQuitOnLastWindowClosed(false); try From d9d6c7d93653c0960e3d96e960f6f78b38ea3ea2 Mon Sep 17 00:00:00 2001 From: Philip Kaufmann Date: Sun, 14 Apr 2013 19:46:38 +0200 Subject: [PATCH 3/4] bitcoingui: remove 2 unneeded includes --- src/qt/bitcoingui.cpp | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/qt/bitcoingui.cpp b/src/qt/bitcoingui.cpp index 14d738d9dae..50a4f63db07 100644 --- a/src/qt/bitcoingui.cpp +++ b/src/qt/bitcoingui.cpp @@ -42,8 +42,6 @@ #include #include #include -#include -#include #include #include #include From 41fdc1cad1777aeb4569c49a72d28b6a3b099093 Mon Sep 17 00:00:00 2001 From: Philip Kaufmann Date: Sun, 14 Apr 2013 19:50:15 +0200 Subject: [PATCH 4/4] overviewpage: make some code Qt5 compatible - that changes will be fine for Qt4 also --- src/qt/overviewpage.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/qt/overviewpage.cpp b/src/qt/overviewpage.cpp index 528c93bdc1e..ad2d682b7bb 100644 --- a/src/qt/overviewpage.cpp +++ b/src/qt/overviewpage.cpp @@ -46,9 +46,10 @@ public: bool confirmed = index.data(TransactionTableModel::ConfirmedRole).toBool(); QVariant value = index.data(Qt::ForegroundRole); QColor foreground = option.palette.color(QPalette::Text); - if(qVariantCanConvert(value)) + if(value.canConvert()) { - foreground = qvariant_cast(value); + QBrush brush = qvariant_cast(value); + foreground = brush.color(); } painter->setPen(foreground);