From 7247d103ffc2772b6dd997b7aa4d7147a8044d73 Mon Sep 17 00:00:00 2001 From: Jonas Schnelli Date: Wed, 6 May 2015 15:20:11 +0200 Subject: [PATCH] [QT] use alert icon with tooltip insted of "(out of sync)" text # Conflicts: # src/qt/forms/overviewpage.ui # src/qt/overviewpage.cpp --- doc/assets-attribution.md | 1 + src/Makefile.qt.include | 1 + src/qt/bitcoin.qrc | 1 + src/qt/forms/overviewpage.ui | 64 +++++++++++++++++++++++++---------- src/qt/overviewpage.cpp | 4 --- src/qt/res/icons/warning.png | Bin 0 -> 3810 bytes 6 files changed, 49 insertions(+), 22 deletions(-) create mode 100644 src/qt/res/icons/warning.png 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 0000000000000000000000000000000000000000..723a30a658a17d22162a086e6babaf329f53d417 GIT binary patch literal 3810 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