From 320fe1015a35f14d946555baa10434287c5490a0 Mon Sep 17 00:00:00 2001 From: "Wladimir J. van der Laan" Date: Thu, 17 May 2012 23:24:17 +0200 Subject: [PATCH] Restore overviewpage (put transactions back within frame) - Also, change "(out of sync)" to only red, instead of red and bold, which a bit more subtle - Move label stylesheets to xml --- src/qt/forms/overviewpage.ui | 332 +++++++++++++++++++---------------- src/qt/overviewpage.cpp | 2 - 2 files changed, 185 insertions(+), 149 deletions(-) diff --git a/src/qt/forms/overviewpage.ui b/src/qt/forms/overviewpage.ui index c7143f3670..6573517b24 100644 --- a/src/qt/forms/overviewpage.ui +++ b/src/qt/forms/overviewpage.ui @@ -24,120 +24,141 @@ QFrame::Raised - - - QFormLayout::AllNonFixedFieldsGrow - - - 12 - - - 12 - - - - - - 11 - 75 - true - - - - Wallet - - - - - - - - 75 - true - - - - 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. - - - (out of sync) - - - - - - - Balance: - - - - - - - - 75 - true - - - - IBeamCursor - - - Your current balance - - - 123.456 BTC - - - Qt::LinksAccessibleByMouse|Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse - - - - - - - Unconfirmed: - - - - - - - - 75 - true - - - - IBeamCursor - - - Total of transactions that have yet to be confirmed, and do not yet count toward the current balance - - - 0 BTC - - - Qt::LinksAccessibleByMouse|Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse - - + + + + + + + + 11 + 75 + true + + + + Wallet + + + + + + + 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 + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + - - - - Number of transactions: + + + + QFormLayout::AllNonFixedFieldsGrow - - - - - - Total number of transactions in wallet + + 12 - - 0 + + 12 - + + + + Balance: + + + + + + + + 75 + true + + + + IBeamCursor + + + Your current balance + + + 123.456 BTC + + + Qt::LinksAccessibleByMouse|Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse + + + + + + + Unconfirmed: + + + + + + + + 75 + true + + + + IBeamCursor + + + Total of transactions that have yet to be confirmed, and do not yet count toward the current balance + + + 0 BTC + + + Qt::LinksAccessibleByMouse|Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse + + + + + + + Number of transactions: + + + + + + + Total number of transactions in wallet + + + 0 + + + + @@ -167,52 +188,69 @@ QFrame::Raised - - - - - <b>Recent transactions</b> - - + + + + + + + <b>Recent transactions</b> + + + + + + + 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 + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + - - - - - 75 - true - + + + + QListView { background: transparent; } - - 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. + + QFrame::NoFrame - - (out of sync) + + Qt::ScrollBarAlwaysOff + + + Qt::ScrollBarAlwaysOff + + + QAbstractItemView::NoSelection - - - - QListView { background: transparent; } - - - QFrame::NoFrame - - - Qt::ScrollBarAlwaysOff - - - Qt::ScrollBarAlwaysOff - - - QAbstractItemView::NoSelection - - - diff --git a/src/qt/overviewpage.cpp b/src/qt/overviewpage.cpp index e4c742262f..d7bcc6f45e 100644 --- a/src/qt/overviewpage.cpp +++ b/src/qt/overviewpage.cpp @@ -108,9 +108,7 @@ OverviewPage::OverviewPage(QWidget *parent) : // init "out of sync" warning labels ui->labelWalletStatus->setText("(" + tr("out of sync") + ")"); - ui->labelWalletStatus->setStyleSheet("QLabel { color: red; }"); ui->labelTransactionsStatus->setText("(" + tr("out of sync") + ")"); - ui->labelTransactionsStatus->setStyleSheet("QLabel { color: red; }"); // start with displaying the "out of sync" warnings showOutOfSyncWarning(true);