Merge pull request #6110
ca5f688
[QT] don't colorize icons on win and mac (Jonas Schnelli)7247d10
[QT] use alert icon with tooltip insted of "(out of sync)" text (Jonas Schnelli)51c7c70
[QT] remove frame to avoid double-frame situation in sendcoinsentry.ui (Jonas Schnelli)2a6b844
[QT] change transaction amount and height in overview page (Jonas Schnelli)
This commit is contained in:
commit
a538126a8c
@ -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
|
||||
-----------------------
|
||||
|
@ -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 = \
|
||||
|
@ -45,6 +45,7 @@
|
||||
<file alias="about">res/icons/about.png</file>
|
||||
<file alias="about_qt">res/icons/about_qt.png</file>
|
||||
<file alias="verify">res/icons/verify.png</file>
|
||||
<file alias="warning">res/icons/warning.png</file>
|
||||
</qresource>
|
||||
<qresource prefix="/movies">
|
||||
<file alias="spinner-000">res/movies/spinner-000.png</file>
|
||||
|
@ -59,21 +59,35 @@
|
||||
</widget>
|
||||
</item>
|
||||
<item>
|
||||
<widget class="QLabel" name="labelWalletStatus">
|
||||
<property name="cursor">
|
||||
<cursorShape>WhatsThisCursor</cursorShape>
|
||||
<widget class="QPushButton" name="labelWalletStatus">
|
||||
<property name="enabled">
|
||||
<bool>false</bool>
|
||||
</property>
|
||||
<property name="maximumSize">
|
||||
<size>
|
||||
<width>30</width>
|
||||
<height>16777215</height>
|
||||
</size>
|
||||
</property>
|
||||
<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>
|
||||
</property>
|
||||
<property name="styleSheet">
|
||||
<string notr="true">QLabel { color: red; }</string>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string notr="true">(out of sync)</string>
|
||||
<string/>
|
||||
</property>
|
||||
<property name="alignment">
|
||||
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
|
||||
<property name="icon">
|
||||
<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>
|
||||
</widget>
|
||||
</item>
|
||||
@ -431,21 +445,35 @@
|
||||
</widget>
|
||||
</item>
|
||||
<item>
|
||||
<widget class="QLabel" name="labelTransactionsStatus">
|
||||
<property name="cursor">
|
||||
<cursorShape>WhatsThisCursor</cursorShape>
|
||||
<widget class="QPushButton" name="labelTransactionsStatus">
|
||||
<property name="enabled">
|
||||
<bool>false</bool>
|
||||
</property>
|
||||
<property name="maximumSize">
|
||||
<size>
|
||||
<width>30</width>
|
||||
<height>16777215</height>
|
||||
</size>
|
||||
</property>
|
||||
<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>
|
||||
</property>
|
||||
<property name="styleSheet">
|
||||
<string notr="true">QLabel { color: red; }</string>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string notr="true">(out of sync)</string>
|
||||
<string/>
|
||||
</property>
|
||||
<property name="alignment">
|
||||
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
|
||||
<property name="icon">
|
||||
<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>
|
||||
</widget>
|
||||
</item>
|
||||
|
@ -21,15 +21,21 @@
|
||||
<string>This is a normal payment.</string>
|
||||
</property>
|
||||
<property name="frameShape">
|
||||
<enum>QFrame::StyledPanel</enum>
|
||||
</property>
|
||||
<property name="frameShadow">
|
||||
<enum>QFrame::Sunken</enum>
|
||||
<enum>QFrame::NoFrame</enum>
|
||||
</property>
|
||||
<layout class="QGridLayout" name="gridLayout">
|
||||
<property name="spacing">
|
||||
<property name="topMargin">
|
||||
<number>8</number>
|
||||
</property>
|
||||
<property name="bottomMargin">
|
||||
<number>4</number>
|
||||
</property>
|
||||
<property name="horizontalSpacing">
|
||||
<number>12</number>
|
||||
</property>
|
||||
<property name="verticalSpacing">
|
||||
<number>8</number>
|
||||
</property>
|
||||
<item row="0" column="0">
|
||||
<widget class="QLabel" name="payToLabel">
|
||||
<property name="text">
|
||||
@ -193,6 +199,13 @@
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="4" column="0" colspan="2">
|
||||
<widget class="Line" name="line">
|
||||
<property name="orientation">
|
||||
<enum>Qt::Horizontal</enum>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
</layout>
|
||||
</widget>
|
||||
<widget class="QFrame" name="SendCoins_UnauthenticatedPaymentRequest">
|
||||
@ -618,10 +631,7 @@
|
||||
<bool>true</bool>
|
||||
</property>
|
||||
<property name="frameShape">
|
||||
<enum>QFrame::StyledPanel</enum>
|
||||
</property>
|
||||
<property name="frameShadow">
|
||||
<enum>QFrame::Sunken</enum>
|
||||
<enum>QFrame::NoFrame</enum>
|
||||
</property>
|
||||
<layout class="QGridLayout" name="gridLayout_is">
|
||||
<property name="spacing">
|
||||
@ -1150,10 +1160,7 @@
|
||||
<bool>true</bool>
|
||||
</property>
|
||||
<property name="frameShape">
|
||||
<enum>QFrame::StyledPanel</enum>
|
||||
</property>
|
||||
<property name="frameShadow">
|
||||
<enum>QFrame::Sunken</enum>
|
||||
<enum>QFrame::NoFrame</enum>
|
||||
</property>
|
||||
<layout class="QGridLayout" name="gridLayout_s">
|
||||
<property name="spacing">
|
||||
|
@ -18,8 +18,8 @@
|
||||
#include <QAbstractItemDelegate>
|
||||
#include <QPainter>
|
||||
|
||||
#define DECORATION_SIZE 64
|
||||
#define NUM_ITEMS 3
|
||||
#define DECORATION_SIZE 54
|
||||
#define NUM_ITEMS 5
|
||||
|
||||
class TxViewDelegate : public QAbstractItemDelegate
|
||||
{
|
||||
@ -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);
|
||||
}
|
||||
|
BIN
src/qt/res/icons/warning.png
Normal file
BIN
src/qt/res/icons/warning.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 3.7 KiB |
@ -27,12 +27,17 @@ static void MakeSingleColorImage(QImage& img, const QColor& colorbase)
|
||||
QImage SingleColorImage(const QString& filename, const QColor& colorbase)
|
||||
{
|
||||
QImage img(filename);
|
||||
#if !defined(WIN32) && !defined(MAC_OSX)
|
||||
MakeSingleColorImage(img, colorbase);
|
||||
#endif
|
||||
return img;
|
||||
}
|
||||
|
||||
QIcon SingleColorIcon(const QIcon& ico, const QColor& colorbase)
|
||||
{
|
||||
#if defined(WIN32) || defined(MAC_OSX)
|
||||
return ico;
|
||||
#else
|
||||
QIcon new_ico;
|
||||
QSize sz;
|
||||
Q_FOREACH(sz, ico.availableSizes())
|
||||
@ -42,6 +47,7 @@ QIcon SingleColorIcon(const QIcon& ico, const QColor& colorbase)
|
||||
new_ico.addPixmap(QPixmap::fromImage(img));
|
||||
}
|
||||
return new_ico;
|
||||
#endif
|
||||
}
|
||||
|
||||
QIcon SingleColorIcon(const QString& filename, const QColor& colorbase)
|
||||
@ -51,6 +57,9 @@ QIcon SingleColorIcon(const QString& filename, const QColor& colorbase)
|
||||
|
||||
QColor SingleColor()
|
||||
{
|
||||
#if defined(WIN32) || defined(MAC_OSX)
|
||||
return QColor(0,0,0);
|
||||
#else
|
||||
const QColor colorHighlightBg(QApplication::palette().color(QPalette::Highlight));
|
||||
const QColor colorHighlightFg(QApplication::palette().color(QPalette::HighlightedText));
|
||||
const QColor colorText(QApplication::palette().color(QPalette::WindowText));
|
||||
@ -61,6 +70,7 @@ QColor SingleColor()
|
||||
else
|
||||
colorbase = colorHighlightFg;
|
||||
return colorbase;
|
||||
#endif
|
||||
}
|
||||
|
||||
QIcon SingleColorIcon(const QString& filename)
|
||||
|
Loading…
Reference in New Issue
Block a user