diff --git a/README.md b/README.md index b92e09f2..edf22555 100644 --- a/README.md +++ b/README.md @@ -77,7 +77,7 @@ cd ~; wget http://download.oracle.com/berkeley-db/db-6.2.32.NC.tar.gz; tar zxf d ### GitHub pull (Source Download) ``` -cd ~; git clone https://github.com/CryptoCoderz/DigitalNote +cd ~; git clone https://github.com/DigitalNoteXDN/DigitalNote-1 DigitalNote ``` ### Build DigitalNote daemon diff --git a/src/main.cpp b/src/main.cpp index cf6b3313..44facfd7 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -2535,7 +2535,7 @@ bool CBlock::CheckBlock(bool fCheckPOW, bool fCheckMerkleRoot, bool fCheckSig) c CBitcoinAddress devopaddress; CScript devpayee; if (Params().NetworkID() == CChainParams::MAIN) - devopaddress = CBitcoinAddress("dPxigPi3gY3Za2crBUV2Sn2BDCrpX9eweo"); + devopaddress = CBitcoinAddress("dSCXLHTZJJqTej8ZRszZxbLrS6dDGVJhw7 "); int64_t devopsPayment = GetDevOpsPayment(pindexBest->nHeight+1, nPoSageReward); bool foundDevOpspayment = false; diff --git a/src/qt/bitcoingui.cpp b/src/qt/bitcoingui.cpp index 47fe006a..55bc4504 100644 --- a/src/qt/bitcoingui.cpp +++ b/src/qt/bitcoingui.cpp @@ -443,7 +443,7 @@ void DigitalNoteGUI::createToolBars() toolbar->setToolButtonStyle(Qt::ToolButtonTextBesideIcon); toolbar->setContextMenuPolicy(Qt::PreventContextMenu); toolbar->setObjectName("tabs"); - toolbar->setStyleSheet("QToolButton { color: #ffffff; font-weight:bold; background-color: #1d1f22;} QToolButton:hover { background-color: #3098c6; } QToolButton:checked { background-color: #3bb2e7 } QToolButton:pressed { background-color: #25779c; } #tabs { color: #ffffff; background-color: #1d1f22; }"); + toolbar->setStyleSheet("QToolButton { color: #ffffff; font-weight:bold; background-color: #121418;} QToolButton:hover { background-color: #2f1d4b; } QToolButton:checked { background-color: #2f1d4b } QToolButton:pressed { background-color: #2f1d4b; } #tabs { color: #ffffff; background-color: #121418; }"); toolbar->setIconSize(QSize(24,24)); if(!fUseDarkTheme) diff --git a/src/qt/guiutil.cpp b/src/qt/guiutil.cpp index 06c28bf0..53920bcf 100644 --- a/src/qt/guiutil.cpp +++ b/src/qt/guiutil.cpp @@ -754,6 +754,8 @@ void SetDarkThemeQSS(QApplication& app) "QTreeView::item { background: rgb(41,44,48); color: rgb(212,213,213); }" "QTreeView::item:selected { background-color: rgb(18,19,20); }" "QTableView { background: rgb(18,19,20); color: rgb(212,213,213); gridline-color: rgb(157,160,165); }" + "QTableWidget { background: rgb(41,44,48); color: rgb(212,213,213); }"// TODO: Finish theme + "QTabWidget { background: rgb(41,44,48); color: rgb(212,213,213); }"// TODO: Finish theme "QHeaderView::section { background: rgb(29,34,39); color: rgb(255,255,255); }" "QToolBar { background: rgb(30,32,36); border: none; }"); } diff --git a/src/qt/res/icons/dark/connect0_16.png b/src/qt/res/icons/dark/connect0_16.png index e6e14f92..b4f32227 100644 Binary files a/src/qt/res/icons/dark/connect0_16.png and b/src/qt/res/icons/dark/connect0_16.png differ diff --git a/src/qt/res/icons/dark/connect1_16.png b/src/qt/res/icons/dark/connect1_16.png index dbcee9a3..07a0e554 100644 Binary files a/src/qt/res/icons/dark/connect1_16.png and b/src/qt/res/icons/dark/connect1_16.png differ diff --git a/src/qt/res/icons/dark/connect2_16.png b/src/qt/res/icons/dark/connect2_16.png index 4610877d..cda5aec1 100644 Binary files a/src/qt/res/icons/dark/connect2_16.png and b/src/qt/res/icons/dark/connect2_16.png differ diff --git a/src/qt/res/icons/dark/connect3_16.png b/src/qt/res/icons/dark/connect3_16.png index 3f6eae39..7fddd129 100644 Binary files a/src/qt/res/icons/dark/connect3_16.png and b/src/qt/res/icons/dark/connect3_16.png differ diff --git a/src/qt/res/icons/dark/connect4_16.png b/src/qt/res/icons/dark/connect4_16.png index 2cb462fb..622cfdd1 100644 Binary files a/src/qt/res/icons/dark/connect4_16.png and b/src/qt/res/icons/dark/connect4_16.png differ diff --git a/src/qt/res/icons/dark/digitalnote_dark-128.png b/src/qt/res/icons/dark/digitalnote_dark-128.png index 77f1e4f7..031e2439 100644 Binary files a/src/qt/res/icons/dark/digitalnote_dark-128.png and b/src/qt/res/icons/dark/digitalnote_dark-128.png differ diff --git a/src/qt/res/icons/dark/digitalnote_dark-16.png b/src/qt/res/icons/dark/digitalnote_dark-16.png index 07f25813..eb047b5d 100644 Binary files a/src/qt/res/icons/dark/digitalnote_dark-16.png and b/src/qt/res/icons/dark/digitalnote_dark-16.png differ diff --git a/src/qt/res/icons/dark/digitalnote_dark-16_testnet.png b/src/qt/res/icons/dark/digitalnote_dark-16_testnet.png index 07f25813..d92a2a9d 100644 Binary files a/src/qt/res/icons/dark/digitalnote_dark-16_testnet.png and b/src/qt/res/icons/dark/digitalnote_dark-16_testnet.png differ diff --git a/src/qt/res/icons/dark/digitalnote_dark-256.png b/src/qt/res/icons/dark/digitalnote_dark-256.png index 8a3c6b38..3eff28ea 100644 Binary files a/src/qt/res/icons/dark/digitalnote_dark-256.png and b/src/qt/res/icons/dark/digitalnote_dark-256.png differ diff --git a/src/qt/res/icons/dark/digitalnote_dark-80.png b/src/qt/res/icons/dark/digitalnote_dark-80.png index b69a3f95..0f962cd0 100644 Binary files a/src/qt/res/icons/dark/digitalnote_dark-80.png and b/src/qt/res/icons/dark/digitalnote_dark-80.png differ diff --git a/src/qt/res/icons/dark/digitalnote_dark.icns b/src/qt/res/icons/dark/digitalnote_dark.icns index 3b0f9677..af5d37c9 100644 Binary files a/src/qt/res/icons/dark/digitalnote_dark.icns and b/src/qt/res/icons/dark/digitalnote_dark.icns differ diff --git a/src/qt/res/icons/dark/digitalnote_dark.ico b/src/qt/res/icons/dark/digitalnote_dark.ico index 7acaf597..2f2a6f88 100644 Binary files a/src/qt/res/icons/dark/digitalnote_dark.ico and b/src/qt/res/icons/dark/digitalnote_dark.ico differ diff --git a/src/qt/res/icons/dark/digitalnote_dark.png b/src/qt/res/icons/dark/digitalnote_dark.png index 8a3c6b38..18146f46 100644 Binary files a/src/qt/res/icons/dark/digitalnote_dark.png and b/src/qt/res/icons/dark/digitalnote_dark.png differ diff --git a/src/qt/res/icons/dark/digitalnote_dark_testnet.png b/src/qt/res/icons/dark/digitalnote_dark_testnet.png index 8a3c6b38..a2fc20dc 100644 Binary files a/src/qt/res/icons/dark/digitalnote_dark_testnet.png and b/src/qt/res/icons/dark/digitalnote_dark_testnet.png differ diff --git a/src/qt/res/icons/dark/lock_closed.png b/src/qt/res/icons/dark/lock_closed.png index e827c229..de0e4bf2 100644 Binary files a/src/qt/res/icons/dark/lock_closed.png and b/src/qt/res/icons/dark/lock_closed.png differ diff --git a/src/qt/res/icons/dark/lock_open.png b/src/qt/res/icons/dark/lock_open.png index b61c6a1a..fd7e934f 100644 Binary files a/src/qt/res/icons/dark/lock_open.png and b/src/qt/res/icons/dark/lock_open.png differ diff --git a/src/qt/res/icons/dark/notsynced.png b/src/qt/res/icons/dark/notsynced.png index 1f3bd172..26eddc03 100644 Binary files a/src/qt/res/icons/dark/notsynced.png and b/src/qt/res/icons/dark/notsynced.png differ diff --git a/src/qt/res/icons/dark/staking_off.png b/src/qt/res/icons/dark/staking_off.png index c50aed66..a72e4306 100644 Binary files a/src/qt/res/icons/dark/staking_off.png and b/src/qt/res/icons/dark/staking_off.png differ diff --git a/src/qt/res/icons/dark/staking_on.png b/src/qt/res/icons/dark/staking_on.png index 6326668c..81f81241 100644 Binary files a/src/qt/res/icons/dark/staking_on.png and b/src/qt/res/icons/dark/staking_on.png differ diff --git a/src/qt/res/icons/dark/synced.png b/src/qt/res/icons/dark/synced.png index 9d780a0b..26d64fda 100644 Binary files a/src/qt/res/icons/dark/synced.png and b/src/qt/res/icons/dark/synced.png differ diff --git a/src/qt/res/icons/dark/tx_inout.png b/src/qt/res/icons/dark/tx_inout.png index 46eea277..aafb1431 100644 Binary files a/src/qt/res/icons/dark/tx_inout.png and b/src/qt/res/icons/dark/tx_inout.png differ diff --git a/src/qt/res/icons/dark/tx_input.png b/src/qt/res/icons/dark/tx_input.png index 4a480ae6..2ed5631f 100644 Binary files a/src/qt/res/icons/dark/tx_input.png and b/src/qt/res/icons/dark/tx_input.png differ diff --git a/src/qt/res/icons/dark/tx_mined.png b/src/qt/res/icons/dark/tx_mined.png index d0deec0b..83f85184 100644 Binary files a/src/qt/res/icons/dark/tx_mined.png and b/src/qt/res/icons/dark/tx_mined.png differ diff --git a/src/qt/res/icons/dark/tx_output.png b/src/qt/res/icons/dark/tx_output.png index f9f704dc..518a9add 100644 Binary files a/src/qt/res/icons/dark/tx_output.png and b/src/qt/res/icons/dark/tx_output.png differ diff --git a/src/qt/res/images/about_dark.png b/src/qt/res/images/about_dark.png index c7865272..3eff28ea 100644 Binary files a/src/qt/res/images/about_dark.png and b/src/qt/res/images/about_dark.png differ diff --git a/src/qt/res/images/header_dark.png b/src/qt/res/images/header_dark.png index 36a7e0dc..5f23aa38 100644 Binary files a/src/qt/res/images/header_dark.png and b/src/qt/res/images/header_dark.png differ diff --git a/src/qt/res/images/splash_dark.png b/src/qt/res/images/splash_dark.png index c9721fa5..e3ff7110 100644 Binary files a/src/qt/res/images/splash_dark.png and b/src/qt/res/images/splash_dark.png differ diff --git a/src/wallet.cpp b/src/wallet.cpp index 87baa67b..cfe6ff61 100644 --- a/src/wallet.cpp +++ b/src/wallet.cpp @@ -3129,7 +3129,7 @@ bool CWallet::CreateCoinStake(const CKeyStore& keystore, unsigned int nBits, int // define address CBitcoinAddress devopaddress; if (Params().NetworkID() == CChainParams::MAIN) - devopaddress = CBitcoinAddress("dPxigPi3gY3Za2crBUV2Sn2BDCrpX9eweo"); // TODO: nothing, already set to a valid DigitalNote address + devopaddress = CBitcoinAddress("dSCXLHTZJJqTej8ZRszZxbLrS6dDGVJhw7"); // TODO: nothing, already set to a valid DigitalNote address // else if (Params().NetworkIDString() == CBaseChainParams::TESTNET) // address = CBitcoinAddress(" "); // else if (Params().NetworkIDString() == CBaseChainParams::REGTEST)