Merge pull request #7 from silence48/master

new wallet gui
Quoxent · Mar 18, 2019 · 56ee808 · 56ee808
2 parents 35138a7 + 7f11883
commit 56ee808
Show file tree

Hide file tree

Showing 38 changed files with 493 additions and 2 deletions.
diff --git a/doc/staticbuilds-release.md b/doc/staticbuilds-release.md
diff --git a/share/pixmaps/bitcoin.ico b/share/pixmaps/bitcoin.ico
diff --git a/src/qt/bitcoingui.cpp b/src/qt/bitcoingui.cpp
@@ -1209,7 +1209,7 @@ void BitcoinGUI::setStakingStatus()
 		else
 			tooltip.append("false\n");
 		tooltip.append("mintablecoins: ");
-		if (!pwalletMain->MintableCoins())
+		if (pwalletMain->MintableCoins())
 			tooltip.append("true\n");
 		else
 			tooltip.append("false\n");

diff --git a/src/qt/res/css/default.css b/src/qt/res/css/default.css
@@ -12,6 +12,7 @@ background-color: #333333;
 }
 QStatusBar {
 	background-color: transparent;
+	text-color: #fff;
 }
 QFrame {
 	background-color: transparent;
@@ -183,7 +184,7 @@ QtMaterialFlatButton {
 	border-radius: 4px;
 	color: rgba(250, 121, 27, 100);
 	font-size: 12px;
-	font-weight: 700;
+	font-weight: 900;
 	padding-left: 25px;
 	padding-right: 25px;
 	padding-top: 1px;
@@ -569,6 +570,12 @@ QDialog#OptionsDialog QCheckBox#displayAddresses {
 QDialog#OptionsDialog QLabel#labelStakeSplitThresholdText {
 	font-size: 16px
 }
+QDialog#MultiSendDialog .QScrollArea * {
+	background-color: #272727
+}
+QDialog#MultiSendConfigDialog .QScrollArea * {
+	background-color: #272727
+}
 QDialog#RPCConsole QWidget#tab_info QLabel#label_11,
 QDialog#RPCConsole QWidget#tab_info QLabel#label_10 {
 	qproperty-alignment: 'AlignBottom';

diff --git a/src/qt/res/icons/about.png b/src/qt/res/icons/about.png
diff --git a/src/qt/res/icons/add.png b/src/qt/res/icons/add.png
diff --git a/src/qt/res/icons/address-book.png b/src/qt/res/icons/address-book.png
diff --git a/src/qt/res/icons/bitcoin.ico b/src/qt/res/icons/bitcoin.ico
diff --git a/src/qt/res/icons/bitcoin.png b/src/qt/res/icons/bitcoin.png
diff --git a/src/qt/res/icons/bitcoin_testnet.ico b/src/qt/res/icons/bitcoin_testnet.ico
diff --git a/src/qt/res/icons/bitcoin_testnet.png b/src/qt/res/icons/bitcoin_testnet.png
diff --git a/src/qt/res/icons/editpaste.png b/src/qt/res/icons/editpaste.png
diff --git a/src/qt/res/icons/history.png b/src/qt/res/icons/history.png
diff --git a/src/qt/res/icons/history_m.png b/src/qt/res/icons/history_m.png
diff --git a/src/qt/res/icons/masternodes.png b/src/qt/res/icons/masternodes.png
diff --git a/src/qt/res/icons/masternodes_m.png b/src/qt/res/icons/masternodes_m.png
diff --git a/src/qt/res/icons/overview.png b/src/qt/res/icons/overview.png
diff --git a/src/qt/res/icons/overview_m.png b/src/qt/res/icons/overview_m.png
diff --git a/src/qt/res/icons/proposal.png b/src/qt/res/icons/proposal.png
diff --git a/src/qt/res/icons/proposal_m.png b/src/qt/res/icons/proposal_m.png
diff --git a/src/qt/res/icons/receive.png b/src/qt/res/icons/receive.png
diff --git a/src/qt/res/icons/receive_m.png b/src/qt/res/icons/receive_m.png
diff --git a/src/qt/res/icons/remove.png b/src/qt/res/icons/remove.png
diff --git a/src/qt/res/icons/send.png b/src/qt/res/icons/send.png
diff --git a/src/qt/res/icons/send_m.png b/src/qt/res/icons/send_m.png
diff --git a/src/qt/res/icons/staking_active.png b/src/qt/res/icons/staking_active.png
diff --git a/src/qt/res/icons/staking_inactive.png b/src/qt/res/icons/staking_inactive.png
diff --git a/src/qt/res/icons/tx_inout.png b/src/qt/res/icons/tx_inout.png
diff --git a/src/qt/res/icons/tx_input.png b/src/qt/res/icons/tx_input.png
diff --git a/src/qt/res/icons/tx_mined.png b/src/qt/res/icons/tx_mined.png
diff --git a/src/qt/res/icons/tx_output.png b/src/qt/res/icons/tx_output.png
diff --git a/src/qt/res/images/about.png b/src/qt/res/images/about.png
diff --git a/src/qt/res/images/splash.png b/src/qt/res/images/splash.png
diff --git a/src/qt/res/images/splash_testnet.png b/src/qt/res/images/splash_testnet.png
diff --git a/src/qt/res/images/walletFrame.png b/src/qt/res/images/walletFrame.png
diff --git a/src/qt/res/images/walletFrame_.png b/src/qt/res/images/walletFrame_.png
diff --git a/src/qt/res/images/walletFrame_bg.png b/src/qt/res/images/walletFrame_bg.png
diff --git a/src/qt/transactiontablemodel.cpp b/src/qt/transactiontablemodel.cpp
@@ -366,6 +366,7 @@ QVariant TransactionTableModel::txAddressDecoration(const TransactionRecord* wtx
     switch (wtx->type) {
     case TransactionRecord::Generated:
     case TransactionRecord::StakeMint:
+        return QIcon(":/icons/tx_mined");
     case TransactionRecord::MNReward:
         return QIcon(":/icons/masternodes");
     case TransactionRecord::RecvWithObfuscation: