diff --git a/src/qt/forms/overviewpage.ui b/src/qt/forms/overviewpage.ui index 872bbacf..0bb15e27 100644 --- a/src/qt/forms/overviewpage.ui +++ b/src/qt/forms/overviewpage.ui @@ -700,33 +700,6 @@ font-size: 11px; - - - - - -1 - - - - IBeamCursor - - - Total of transactions that have yet to be confirmed, and do not yet count toward the spendable balance - - - font-size: 15px - - - 0.000 000 00 - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - Qt::LinksAccessibleByMouse|Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse - - - @@ -740,40 +713,6 @@ font-size: 11px; - - - - - -1 - - - - IBeamCursor - - - Unconfirmed transactions to watch-only addresses - - - font-size: 15px - - - 0.000 000 00 - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - Qt::LinksAccessibleByMouse|Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse - - - - - - - Pending: - - - diff --git a/src/qt/forms/sendcoinsentry.ui b/src/qt/forms/sendcoinsentry.ui index 951e11df..b0755d55 100644 --- a/src/qt/forms/sendcoinsentry.ui +++ b/src/qt/forms/sendcoinsentry.ui @@ -16,6 +16,9 @@ false + + font-color: #ff0000; + This is a normal payment. @@ -36,7 +39,7 @@ 8 - + @@ -167,20 +170,20 @@ font-size: 11px; - - + + - Pay &To: + A&mount: Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - payTo + payAmount - + Donate: @@ -193,59 +196,16 @@ font-size: 11px; - - + + - &Label: + Pay &To: Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - addAsLabel - - - - - - - - - - - - The fee will be deducted from the amount being sent. The recipient will receive a lower amount of HTH than you enter in the amount field. If multiple recipients are selected, the fee is split equally. - - - S&ubtract fee from amount - - - - - - - - - Qt::Vertical - - - QSizePolicy::Fixed - - - - 20 - 40 - - - - - - - - A message that was attached to the HTH: URI which will be stored with the transaction for your reference. Note: This message will not be sent over the HelpTheHomeless network. - - - Qt::PlainText + payTo @@ -317,16 +277,46 @@ font-size: 11px; - - - - A&mount: + + + + Qt::Vertical - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + QSizePolicy::Fixed - - payAmount + + + 20 + 40 + + + + + + + + + + + + + The fee will be deducted from the amount being sent. The recipient will receive a lower amount of HTH than you enter in the amount field. If multiple recipients are selected, the fee is split equally. + + + S&ubtract fee from amount + + + + + + + + + A message that was attached to the HTH: URI which will be stored with the transaction for your reference. Note: This message will not be sent over the HelpTheHomeless network. + + + Qt::PlainText @@ -341,11 +331,18 @@ font-size: 11px; 20 - 85 + 40 + + + + Qt::Horizontal + + + @@ -353,7 +350,20 @@ font-size: 11px; - + + + + &Label: + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + addAsLabel + + + + Message: @@ -363,10 +373,28 @@ font-size: 11px; - - - - Qt::Horizontal + + + + + 0 + 0 + + + + color: red; + + + WARNING!!!! DOUBLE CHECK YOUR ADDRESS BEFORE SENDING ANY TRANSACTIONS!!!!! + + + Qt::RichText + + + Qt::AlignCenter + + + true diff --git a/src/qt/overviewpage.cpp b/src/qt/overviewpage.cpp index 9325ea93..1c003baa 100644 --- a/src/qt/overviewpage.cpp +++ b/src/qt/overviewpage.cpp @@ -150,12 +150,11 @@ void OverviewPage::setBalance(const CAmount& balance, const CAmount& unconfirmed currentWatchUnconfBalance = watchUnconfBalance; currentWatchImmatureBalance = watchImmatureBalance; ui->labelBalance->setText(BitcoinUnits::floorHtmlWithUnit(nDisplayUnit, balance, false, BitcoinUnits::separatorAlways)); - ui->labelUnconfirmed->setText(BitcoinUnits::floorHtmlWithUnit(nDisplayUnit, unconfirmedBalance, false, BitcoinUnits::separatorAlways)); ui->labelImmature->setText(BitcoinUnits::floorHtmlWithUnit(nDisplayUnit, immatureBalance, false, BitcoinUnits::separatorAlways)); - ui->labelUnconfirmed->setText(BitcoinUnits::floorHtmlWithUnit(nDisplayUnit, anonymizedBalance, false, BitcoinUnits::separatorAlways)); + /* ui->labelUnconfirmed->setText(BitcoinUnits::floorHtmlWithUnit(nDisplayUnit, anonymizedBalance, false, BitcoinUnits::separatorAlways)); */ ui->labelTotal->setText(BitcoinUnits::floorHtmlWithUnit(nDisplayUnit, balance + unconfirmedBalance + immatureBalance, false, BitcoinUnits::separatorAlways)); ui->labelWatchAvailable->setText(BitcoinUnits::floorHtmlWithUnit(nDisplayUnit, watchOnlyBalance, false, BitcoinUnits::separatorAlways)); - ui->labelWatchPending->setText(BitcoinUnits::floorHtmlWithUnit(nDisplayUnit, watchUnconfBalance, false, BitcoinUnits::separatorAlways)); + /* ui->labelWatchPending->setText(BitcoinUnits::floorHtmlWithUnit(nDisplayUnit, watchUnconfBalance, false, BitcoinUnits::separatorAlways)); */ ui->labelWatchImmature->setText(BitcoinUnits::floorHtmlWithUnit(nDisplayUnit, watchImmatureBalance, false, BitcoinUnits::separatorAlways)); ui->labelWatchTotal->setText(BitcoinUnits::floorHtmlWithUnit(nDisplayUnit, watchOnlyBalance + watchUnconfBalance + watchImmatureBalance, false, BitcoinUnits::separatorAlways)); @@ -177,7 +176,7 @@ void OverviewPage::updateWatchOnlyLabels(bool showWatchOnly) ui->labelWatchonly->setVisible(showWatchOnly); // show watch-only label ui->lineWatchBalance->setVisible(showWatchOnly); // show watch-only balance separator line ui->labelWatchAvailable->setVisible(showWatchOnly); // show watch-only available balance - ui->labelWatchPending->setVisible(showWatchOnly); // show watch-only pending balance + /* ui->labelWatchPending->setVisible(showWatchOnly); */ // show watch-only pending balance ui->labelWatchTotal->setVisible(showWatchOnly); // show watch-only total balance if (!showWatchOnly){ @@ -185,7 +184,7 @@ void OverviewPage::updateWatchOnlyLabels(bool showWatchOnly) } else{ ui->labelBalance->setIndent(20); - ui->labelUnconfirmed->setIndent(20); + /* ui->labelUnconfirmed->setIndent(20); */ ui->labelImmatureText->setIndent(20); ui->labelTotal->setIndent(20); } @@ -313,7 +312,7 @@ void OverviewPage::on_pushButton_Website_2_clicked() { // HTH Exchanges void OverviewPage::on_pushButton_Website_3_clicked() { // HTH Explorer - QDesktopServices::openUrl(QUrl("https://chainz.cryptoid.info/hth", QUrl::TolerantMode)); + QDesktopServices::openUrl(QUrl("https://openchains.info/coin/hth/blocks", QUrl::TolerantMode)); } diff --git a/src/qt/res/css/drkblue.css b/src/qt/res/css/drkblue.css index 10b737e4..91fe7407 100644 --- a/src/qt/res/css/drkblue.css +++ b/src/qt/res/css/drkblue.css @@ -84,7 +84,6 @@ font-weight: bold; } - /* Global Push Button Style */ QPushButton {