Browse Source

[QT] use alert icon with tooltip insted of "(out of sync)" text

# Conflicts:
#	src/qt/forms/overviewpage.ui
#	src/qt/overviewpage.cpp
0.13
Jonas Schnelli 10 years ago
parent
commit
7247d103ff
  1. 1
      doc/assets-attribution.md
  2. 1
      src/Makefile.qt.include
  3. 1
      src/qt/bitcoin.qrc
  4. 64
      src/qt/forms/overviewpage.ui
  5. 4
      src/qt/overviewpage.cpp
  6. BIN
      src/qt/res/icons/warning.png

1
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/receive.png, src/qt/res/icons/remove.png,
src/qt/res/icons/send.png, src/qt/res/icons/synced.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/transaction*.png, src/qt/res/icons/tx_output.png,
src/qt/res/icons/warning.png
Jonas Schnelli Jonas Schnelli
----------------------- -----------------------

1
src/Makefile.qt.include

@ -256,6 +256,7 @@ RES_ICONS = \
qt/res/icons/tx_input.png \ qt/res/icons/tx_input.png \
qt/res/icons/tx_output.png \ qt/res/icons/tx_output.png \
qt/res/icons/tx_mined.png \ qt/res/icons/tx_mined.png \
qt/res/icons/warning.png \
qt/res/icons/verify.png qt/res/icons/verify.png
BITCOIN_QT_CPP = \ BITCOIN_QT_CPP = \

1
src/qt/bitcoin.qrc

@ -45,6 +45,7 @@
<file alias="about">res/icons/about.png</file> <file alias="about">res/icons/about.png</file>
<file alias="about_qt">res/icons/about_qt.png</file> <file alias="about_qt">res/icons/about_qt.png</file>
<file alias="verify">res/icons/verify.png</file> <file alias="verify">res/icons/verify.png</file>
<file alias="warning">res/icons/warning.png</file>
</qresource> </qresource>
<qresource prefix="/movies"> <qresource prefix="/movies">
<file alias="spinner-000">res/movies/spinner-000.png</file> <file alias="spinner-000">res/movies/spinner-000.png</file>

64
src/qt/forms/overviewpage.ui

@ -59,21 +59,35 @@
</widget> </widget>
</item> </item>
<item> <item>
<widget class="QLabel" name="labelWalletStatus"> <widget class="QPushButton" name="labelWalletStatus">
<property name="cursor"> <property name="enabled">
<cursorShape>WhatsThisCursor</cursorShape> <bool>false</bool>
</property>
<property name="maximumSize">
<size>
<width>30</width>
<height>16777215</height>
</size>
</property> </property>
<property name="toolTip"> <property name="toolTip">
<string>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.</string> <string>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.</string>
</property> </property>
<property name="styleSheet">
<string notr="true">QLabel { color: red; }</string>
</property>
<property name="text"> <property name="text">
<string notr="true">(out of sync)</string> <string/>
</property> </property>
<property name="alignment"> <property name="icon">
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set> <iconset resource="../bitcoin.qrc">
<normaloff>:/icons/warning</normaloff>
<disabledoff>:/icons/warning</disabledoff>:/icons/warning</iconset>
</property>
<property name="iconSize">
<size>
<width>24</width>
<height>24</height>
</size>
</property>
<property name="flat">
<bool>true</bool>
</property> </property>
</widget> </widget>
</item> </item>
@ -431,21 +445,35 @@
</widget> </widget>
</item> </item>
<item> <item>
<widget class="QLabel" name="labelTransactionsStatus"> <widget class="QPushButton" name="labelTransactionsStatus">
<property name="cursor"> <property name="enabled">
<cursorShape>WhatsThisCursor</cursorShape> <bool>false</bool>
</property>
<property name="maximumSize">
<size>
<width>30</width>
<height>16777215</height>
</size>
</property> </property>
<property name="toolTip"> <property name="toolTip">
<string>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.</string> <string>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.</string>
</property> </property>
<property name="styleSheet">
<string notr="true">QLabel { color: red; }</string>
</property>
<property name="text"> <property name="text">
<string notr="true">(out of sync)</string> <string/>
</property> </property>
<property name="alignment"> <property name="icon">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set> <iconset resource="../bitcoin.qrc">
<normaloff>:/icons/warning</normaloff>
<disabledoff>:/icons/warning</disabledoff>:/icons/warning</iconset>
</property>
<property name="iconSize">
<size>
<width>24</width>
<height>24</height>
</size>
</property>
<property name="flat">
<bool>true</bool>
</property> </property>
</widget> </widget>
</item> </item>

4
src/qt/overviewpage.cpp

@ -129,10 +129,6 @@ OverviewPage::OverviewPage(QWidget *parent) :
connect(ui->listTransactions, SIGNAL(clicked(QModelIndex)), this, SLOT(handleTransactionClicked(QModelIndex))); 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 // start with displaying the "out of sync" warnings
showOutOfSyncWarning(true); showOutOfSyncWarning(true);
} }

BIN
src/qt/res/icons/warning.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.7 KiB

Loading…
Cancel
Save