Merge pull request #298 from carsenk/thefixes

Updated NVS UI for QT and Small Bugfix
metaspartan · Jan 31, 2021 · 6dac5a4 · 6dac5a4
2 parents d5ffe9f + f784f4b
commit 6dac5a4
Show file tree

Hide file tree

Showing 8 changed files with 285 additions and 209 deletions.
diff --git a/denarius-qt.pro b/denarius-qt.pro
@@ -762,6 +762,10 @@ isEmpty(BOOST_INCLUDE_PATH) {
     macx:BOOST_INCLUDE_PATH = /opt/local/include
 }
 
+macx:OPENSSL_LIB_PATH = /opt/local/lib/openssl-1.0
+macx:OPENSSL_INCLUDE_PATH = /opt/local/include/openssl-1.0
+
+
 windows:DEFINES += WIN32
 windows:RC_FILE = src/qt/res/bitcoin-qt.rc
 

diff --git a/src/namecoin.cpp b/src/namecoin.cpp
@@ -604,8 +604,8 @@ CHooks* InitHook()
 // version for connectInputs. Used when accepting blocks.
 bool IsNameFeeEnough(CTxDB& txdb, const CTransaction& tx, const NameTxInfo& nti, const CBlockIndex* pindexBlock, const map<uint256, CTxIndex>& mapTestPool, bool fBlock, bool fMiner)
 {
-// get tx fee
-// Note: if fBlock and fMiner equal false then FetchInputs will search mempool
+    // get tx fee
+    // Note: if fBlock and fMiner equal false then FetchInputs will search mempool
     int64_t txFee;
     MapPrevTx mapInputs;
     bool fInvalid = false;
@@ -2712,4 +2712,4 @@ bool CNameDB::DumpToTextFile()
 
     // myfile.close();
     // return true;
-}
+}
diff --git a/src/qt/bitcoin.qrc b/src/qt/bitcoin.qrc
@@ -51,7 +51,7 @@
         <file alias="tx_inout">res/icons/tx_inout.png</file>
         <file alias="lock_closed">res/icons/lock_closed.png</file>
         <file alias="lock_open">res/icons/lock_open.png</file>
-		<file alias="lock_staking">res/icons/lock_staking.png</file>
+        <file alias="lock_staking">res/icons/lock_staking.png</file>
         <file alias="key">res/icons/key.png</file>
         <file alias="filesave">res/icons/filesave.png</file>
         <file alias="qrcode">res/icons/qrcode.png</file>
@@ -66,6 +66,7 @@
         <file alias="data">res/icons/data.png</file>
         <file alias="jupiter">res/icons/jupiter.png</file>
         <file alias="trade">res/icons/trade.png</file>
+        <file alias="goldname">res/icons/goldnames.png</file>
     </qresource>
     <qresource prefix="/images">
         <file alias="about">res/images/about.png</file>

diff --git a/src/qt/bitcoingui.cpp b/src/qt/bitcoingui.cpp
@@ -356,7 +356,7 @@ void BitcoinGUI::createActions()
     marketAction->setCheckable(true);
     tabGroup->addAction(marketAction);
 
-    manageNamesAction = new QAction(QIcon(":/icons/names"), tr("&Manage NVS"), this);
+    manageNamesAction = new QAction(QIcon(":/icons/names"), tr("&NVS"), this);
     manageNamesAction->setToolTip(tr("Manage Denarius NVS"));
     manageNamesAction->setCheckable(true);
     manageNamesAction->setShortcut(QKeySequence(Qt::ALT + Qt::Key_0));