diff --git a/src/qt/forms/overviewpage.ui b/src/qt/forms/overviewpage.ui index b26f88b6b..a7925a373 100644 --- a/src/qt/forms/overviewpage.ui +++ b/src/qt/forms/overviewpage.ui @@ -426,7 +426,7 @@ QFormLayout::AllNonFixedFieldsGrow - 30 + 11 12 @@ -438,13 +438,6 @@ - - - - Enabled/Disabled - - - @@ -516,6 +509,13 @@ + + + + Enabled/Disabled + + + @@ -1059,7 +1059,7 @@ Reset - + 10 diff --git a/src/qt/overviewpage.cpp b/src/qt/overviewpage.cpp index 0695ece26..11da5599b 100644 --- a/src/qt/overviewpage.cpp +++ b/src/qt/overviewpage.cpp @@ -226,8 +226,15 @@ void OverviewPage::updateWatchOnlyLabels(bool showWatchOnly) ui->labelWatchPending->setVisible(showWatchOnly); // show watch-only pending balance ui->labelWatchTotal->setVisible(showWatchOnly); // show watch-only total balance - if (!showWatchOnly) + if (!showWatchOnly){ ui->labelWatchImmature->hide(); + } + else{ + ui->labelBalance->setIndent(20); + ui->labelUnconfirmed->setIndent(20); + ui->labelImmature->setIndent(20); + ui->labelTotal->setIndent(20); + } } void OverviewPage::setClientModel(ClientModel *model) diff --git a/src/qt/res/css/drkblue.css b/src/qt/res/css/drkblue.css index 127a580b7..fc3965f33 100644 --- a/src/qt/res/css/drkblue.css +++ b/src/qt/res/css/drkblue.css @@ -748,13 +748,13 @@ padding-right:5px; QWidget .QFrame#frame .QLabel#labelWalletStatus { /* Wallet Sync Status */ qproperty-alignment: 'AlignVCenter | AlignLeft'; -margin-left:20px; +margin-left:3px; } QWidget .QFrame#frame .QLabel#labelSpendable { /* Spendable Header */ qproperty-alignment: 'AlignVCenter | AlignLeft'; font-size:12px; -margin-left:32px; +margin-left:18px; } QWidget .QFrame#frame .QLabel#labelWatchonly { /* Watch-only Header */ @@ -780,7 +780,7 @@ qproperty-alignment: 'AlignVCenter | AlignLeft'; font-size:12px; font-weight:bold; color:#56ABD8; -margin-left:32px; +margin-left:0px; } QWidget .QFrame#frame .QLabel#labelWatchAvailable { /* Watch-only Balance */ @@ -801,7 +801,7 @@ padding-right:5px; QWidget .QFrame#frame .QLabel#labelUnconfirmed { /* Pending Balance */ qproperty-alignment: 'AlignVCenter | AlignLeft'; font-size:12px; -margin-left:32px; +margin-left:0px; } QWidget .QFrame#frame .QLabel#labelWatchPending { /* Watch-only Pending Balance */ @@ -822,7 +822,7 @@ padding-right:5px; QWidget .QFrame#frame .QLabel#labelImmature { /* Immature Balance */ qproperty-alignment: 'AlignVCenter | AlignLeft'; font-size:12px; -margin-left:32px; +margin-left:0px; } QWidget .QFrame#frame .QLabel#labelWatchImmature { /* Watch-only Immature Balance */ @@ -843,7 +843,7 @@ padding-right:5px; QWidget .QFrame#frame .QLabel#labelTotal { /* Total Balance */ qproperty-alignment: 'AlignVCenter | AlignLeft'; font-size:12px; -margin-left:32px; +margin-left:0px; } QWidget .QFrame#frame .QLabel#labelWatchTotal { /* Watch-only Total Balance */ @@ -877,7 +877,7 @@ min-height:35px; /******************************************************************/ QWidget .QFrame#frameDarksend .QLabel#labelDarksendSyncStatus { /* Darksend Sync Status */ qproperty-alignment: 'AlignVCenter | AlignLeft'; -margin-left:20px; +margin-left:2px; } QWidget .QFrame#frameDarksend #formLayoutWidget { @@ -890,12 +890,11 @@ font-weight:normal; min-height:25px; } - QWidget .QFrame#frameDarksend #formLayoutWidget .QLabel#label_6 { /* Darksend Status Label */ qproperty-alignment: 'AlignVCenter | AlignRight'; min-width:160px; background-color:#F8F6F6; -margin-right:5px; +margin-right:0px; padding-right:5px; }