From 2a6b844427d097a27bd1d2de843fa8176c2d36b7 Mon Sep 17 00:00:00 2001 From: Jonas Schnelli Date: Tue, 5 May 2015 21:55:19 +0200 Subject: [QT] change transaction amount and height in overview page --- src/qt/overviewpage.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/qt/overviewpage.cpp b/src/qt/overviewpage.cpp index 4fa15db9c6..2a3a47ffe8 100644 --- a/src/qt/overviewpage.cpp +++ b/src/qt/overviewpage.cpp @@ -18,8 +18,8 @@ #include #include -#define DECORATION_SIZE 64 -#define NUM_ITEMS 3 +#define DECORATION_SIZE 54 +#define NUM_ITEMS 5 class TxViewDelegate : public QAbstractItemDelegate { -- cgit v1.2.3 From 51c7c7029ede4e92f00ad5bd9da816397ed3d495 Mon Sep 17 00:00:00 2001 From: Jonas Schnelli Date: Wed, 6 May 2015 13:54:28 +0200 Subject: [QT] remove frame to avoid double-frame situation in sendcoinsentry.ui --- src/qt/forms/sendcoinsentry.ui | 33 ++++++++++++++++++++------------- 1 file changed, 20 insertions(+), 13 deletions(-) diff --git a/src/qt/forms/sendcoinsentry.ui b/src/qt/forms/sendcoinsentry.ui index 48d0dd093c..df06f36833 100644 --- a/src/qt/forms/sendcoinsentry.ui +++ b/src/qt/forms/sendcoinsentry.ui @@ -21,15 +21,21 @@ This is a normal payment. - QFrame::StyledPanel - - - QFrame::Sunken + QFrame::NoFrame - + + 8 + + + 4 + + 12 + + 8 + @@ -193,6 +199,13 @@ + + + + Qt::Horizontal + + + @@ -618,10 +631,7 @@ true - QFrame::StyledPanel - - - QFrame::Sunken + QFrame::NoFrame @@ -1150,10 +1160,7 @@ true - QFrame::StyledPanel - - - QFrame::Sunken + QFrame::NoFrame -- cgit v1.2.3 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 --- 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 c860cdc534..ebba64a61a 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 31fe3a9f69..6b7c42285d 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 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 From ca5f6885470a04cf356459229bb2944a756b7db4 Mon Sep 17 00:00:00 2001 From: Jonas Schnelli Date: Wed, 6 May 2015 17:07:22 +0200 Subject: [QT] don't colorize icons on win and mac --- src/qt/scicon.cpp | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/src/qt/scicon.cpp b/src/qt/scicon.cpp index a0ffcd82a9..b2f2399b24 100644 --- a/src/qt/scicon.cpp +++ b/src/qt/scicon.cpp @@ -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) -- cgit v1.2.3