Rename "History" tab to more logical "Transactions", move "Number of transactions...

[novacoin.git] / src / qt / clientmodel.cpp

diff --git a/src/qt/clientmodel.cpp b/src/qt/clientmodel.cpp
index 822c03d..06ad5ad 100644 (file)
--- a/src/qt/clientmodel.cpp
+++ b/src/qt/clientmodel.cpp
@@ -1,15 +1,15 @@
 #include "clientmodel.h"
-#include "main.h"
 #include "guiconstants.h"
 #include "optionsmodel.h"
 #include "addresstablemodel.h"
 #include "transactiontablemodel.h"
 
+#include "headers.h"
+
 #include <QTimer>
 
-ClientModel::ClientModel(QObject *parent) :
-    QObject(parent), optionsModel(0), addressTableModel(0),
-    transactionTableModel(0)
+ClientModel::ClientModel(CWallet *wallet, QObject *parent) :
+    QObject(parent), wallet(wallet), optionsModel(0)
 {
     // Until signal notifications is built into the bitcoin core,
     //  simply update everything after polling using a timer.
@@ -17,27 +17,7 @@ ClientModel::ClientModel(QObject *parent) :
     connect(timer, SIGNAL(timeout()), this, SLOT(update()));
     timer->start(MODEL_UPDATE_DELAY);
 
-    optionsModel = new OptionsModel(this);
-    addressTableModel = new AddressTableModel(this);
-    transactionTableModel = new TransactionTableModel(this);
-}
-
-qint64 ClientModel::getBalance() const
-{
-    return GetBalance();
-}
-
-QString ClientModel::getAddress() const
-{
-    std::vector<unsigned char> vchPubKey;
-    if (CWalletDB("r").ReadDefaultKey(vchPubKey))
-    {
-        return QString::fromStdString(PubKeyToAddress(vchPubKey));
-    }
-    else
-    {
-        return QString();
-    }
+    optionsModel = new OptionsModel(wallet, this);
 }
 
 int ClientModel::getNumConnections() const
@@ -50,92 +30,18 @@ int ClientModel::getNumBlocks() const
     return nBestHeight;
 }
 
-int ClientModel::getNumTransactions() const
-{
-    int numTransactions = 0;
-    CRITICAL_BLOCK(cs_mapWallet)
-    {
-        numTransactions = mapWallet.size();
-    }
-    return numTransactions;
-}
-
 void ClientModel::update()
 {
     // Plainly emit all signals for now. To be more efficient this should check
-    //   whether the values actually changed first.
-    emit balanceChanged(getBalance());
-    emit addressChanged(getAddress());
+    //   whether the values actually changed first, although it'd be even better if these
+    //   were events coming in from the bitcoin core.
     emit numConnectionsChanged(getNumConnections());
     emit numBlocksChanged(getNumBlocks());
-    emit numTransactionsChanged(getNumTransactions());
-}
-
-void ClientModel::setAddress(const QString &defaultAddress)
-{
-    uint160 hash160;
-    std::string strAddress = defaultAddress.toStdString();
-    if (!AddressToHash160(strAddress, hash160))
-        return;
-    if (!mapPubKeys.count(hash160))
-        return;
-    CWalletDB().WriteDefaultKey(mapPubKeys[hash160]);
 }
 
-ClientModel::StatusCode ClientModel::sendCoins(const QString &payTo, qint64 payAmount)
+bool ClientModel::isTestNet() const
 {
-    uint160 hash160 = 0;
-    bool valid = false;
-
-    if(!AddressToHash160(payTo.toUtf8().constData(), hash160))
-    {
-        return InvalidAddress;
-    }
-
-    if(payAmount <= 0)
-    {
-        return InvalidAmount;
-    }
-
-    if(payAmount > getBalance())
-    {
-        return AmountExceedsBalance;
-    }
-
-    if((payAmount + nTransactionFee) > getBalance())
-    {
-        return AmountWithFeeExceedsBalance;
-    }
-
-    CRITICAL_BLOCK(cs_main)
-    {
-        // Send to bitcoin address
-        CWalletTx wtx;
-        CScript scriptPubKey;
-        scriptPubKey << OP_DUP << OP_HASH160 << hash160 << OP_EQUALVERIFY << OP_CHECKSIG;
-
-        std::string strError = SendMoney(scriptPubKey, payAmount, wtx, true);
-        if (strError == "")
-        {
-            return OK;
-        }
-        else if (strError == "ABORTED")
-        {
-            return Aborted;
-        }
-        else
-        {
-            emit error(tr("Sending..."), QString::fromStdString(strError));
-            return MiscError;
-        }
-    }
-    // Add addresses that we've sent to to the address book
-    std::string strAddress = payTo.toStdString();
-    CRITICAL_BLOCK(cs_mapAddressBook)
-        if (!mapAddressBook.count(strAddress))
-            SetAddressBookName(strAddress, "");
-
-    return OK;
+    return fTestNet;
 }
 
 bool ClientModel::inInitialBlockDownload() const
@@ -143,17 +49,17 @@ bool ClientModel::inInitialBlockDownload() const
     return IsInitialBlockDownload();
 }
 
-OptionsModel *ClientModel::getOptionsModel()
+int ClientModel::getTotalBlocksEstimate() const
 {
-    return optionsModel;
+    return GetTotalBlocksEstimate();
 }
 
-AddressTableModel *ClientModel::getAddressTableModel()
+OptionsModel *ClientModel::getOptionsModel()
 {
-    return addressTableModel;
+    return optionsModel;
 }
 
-TransactionTableModel *ClientModel::getTransactionTableModel()
+QString ClientModel::formatFullVersion() const
 {
-    return transactionTableModel;
+    return QString::fromStdString(FormatFullVersion());
 }