From 7247d103ffc2772b6dd997b7aa4d7147a8044d73 Mon Sep 17 00:00:00 2001 From: Jonas Schnelli Date: Wed, 6 May 2015 15:20:11 +0200 Subject: [QT] use alert icon with tooltip insted of "(out of sync)" text # Conflicts: # src/qt/forms/overviewpage.ui # src/qt/overviewpage.cpp --- 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 4 files changed, 47 insertions(+), 22 deletions(-) create mode 100644 src/qt/res/icons/warning.png (limited to 'src/qt') diff --git a/src/qt/bitcoin.qrc b/src/qt/bitcoin.qrc index 63af146fd0..c899e95506 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 53d416ef38..6d792d1475 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 2a3a47ffe8..a422ff9a71 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 0000000000..723a30a658 Binary files /dev/null and b/src/qt/res/icons/warning.png differ -- cgit v1.2.3