diff --git a/doc/assets-attribution.md b/doc/assets-attribution.md index c860cdc53..ebba64a61 100644 --- a/doc/assets-attribution.md +++ b/doc/assets-attribution.md @@ -22,6 +22,7 @@ The following is a list of assets used in the bitcoin source and their proper at src/qt/res/icons/receive.png, src/qt/res/icons/remove.png, src/qt/res/icons/send.png, src/qt/res/icons/synced.png, src/qt/res/icons/transaction*.png, src/qt/res/icons/tx_output.png, + src/qt/res/icons/warning.png Jonas Schnelli ----------------------- diff --git a/src/Makefile.qt.include b/src/Makefile.qt.include index 31fe3a9f6..6b7c42285 100644 --- a/src/Makefile.qt.include +++ b/src/Makefile.qt.include @@ -256,6 +256,7 @@ RES_ICONS = \ qt/res/icons/tx_input.png \ qt/res/icons/tx_output.png \ qt/res/icons/tx_mined.png \ + qt/res/icons/warning.png \ qt/res/icons/verify.png BITCOIN_QT_CPP = \ diff --git a/src/qt/bitcoin.qrc b/src/qt/bitcoin.qrc index 63af146fd..c899e9550 100644 --- a/src/qt/bitcoin.qrc +++ b/src/qt/bitcoin.qrc @@ -45,6 +45,7 @@ res/icons/about.png res/icons/about_qt.png res/icons/verify.png + res/icons/warning.png res/movies/spinner-000.png diff --git a/src/qt/forms/overviewpage.ui b/src/qt/forms/overviewpage.ui index 53d416ef3..6d792d147 100644 --- a/src/qt/forms/overviewpage.ui +++ b/src/qt/forms/overviewpage.ui @@ -59,21 +59,35 @@ - - - WhatsThisCursor + + + false + + + + 30 + 16777215 + The displayed information may be out of date. Your wallet automatically synchronizes with the Bitcoin network after a connection is established, but this process has not completed yet. - - QLabel { color: red; } - - (out of sync) + - - Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter + + + :/icons/warning + :/icons/warning:/icons/warning + + + + 24 + 24 + + + + true @@ -431,21 +445,35 @@ - - - WhatsThisCursor + + + false + + + + 30 + 16777215 + The displayed information may be out of date. Your wallet automatically synchronizes with the Bitcoin network after a connection is established, but this process has not completed yet. - - QLabel { color: red; } - - (out of sync) + - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + :/icons/warning + :/icons/warning:/icons/warning + + + + 24 + 24 + + + + true diff --git a/src/qt/overviewpage.cpp b/src/qt/overviewpage.cpp index 2a3a47ffe..a422ff9a7 100644 --- a/src/qt/overviewpage.cpp +++ b/src/qt/overviewpage.cpp @@ -129,10 +129,6 @@ OverviewPage::OverviewPage(QWidget *parent) : connect(ui->listTransactions, SIGNAL(clicked(QModelIndex)), this, SLOT(handleTransactionClicked(QModelIndex))); - // init "out of sync" warning labels - ui->labelWalletStatus->setText("(" + tr("out of sync") + ")"); - ui->labelTransactionsStatus->setText("(" + tr("out of sync") + ")"); - // start with displaying the "out of sync" warnings showOutOfSyncWarning(true); } diff --git a/src/qt/res/icons/warning.png b/src/qt/res/icons/warning.png new file mode 100644 index 000000000..723a30a65 Binary files /dev/null and b/src/qt/res/icons/warning.png differ