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

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

diff --git a/src/qt/addresstablemodel.cpp b/src/qt/addresstablemodel.cpp
index eece092..e375ff8 100644 (file)
--- a/src/qt/addresstablemodel.cpp
+++ b/src/qt/addresstablemodel.cpp
@@ -70,11 +70,6 @@ struct AddressTablePriv
             return 0;
         }
     }
-
-    bool isDefaultAddress(const AddressTableEntry *rec)
-    {
-        return rec->address == QString::fromStdString(wallet->GetDefaultAddress());
-    }
 };
 
 AddressTableModel::AddressTableModel(CWallet *wallet, QObject *parent) :
@@ -114,11 +109,16 @@ QVariant AddressTableModel::data(const QModelIndex &index, int role) const
         switch(index.column())
         {
         case Label:
-            return rec->label;
+            if(rec->label.isEmpty() && role == Qt::DisplayRole)
+            {
+                return tr("(no label)");
+            }
+            else
+            {
+                return rec->label;
+            }
         case Address:
             return rec->address;
-        case IsDefaultAddress:
-            return priv->isDefaultAddress(rec);
         }
     }
     else if (role == Qt::FontRole)
@@ -128,27 +128,8 @@ QVariant AddressTableModel::data(const QModelIndex &index, int role) const
         {
             font = GUIUtil::bitcoinAddressFont();
         }
-        if(priv->isDefaultAddress(rec))
-        {
-            font.setBold(true);
-        }
         return font;
     }
-    else if (role == Qt::ForegroundRole)
-    {
-        // Show default address in alternative color
-        if(priv->isDefaultAddress(rec))
-        {
-            return QColor(0,0,255);
-        }
-    }
-    else if (role == Qt::ToolTipRole)
-    {
-        if(priv->isDefaultAddress(rec))
-        {
-            return tr("Default receiving address");
-        }
-    }
     else if (role == TypeRole)
     {
         switch(rec->type)
@@ -178,6 +159,9 @@ bool AddressTableModel::setData(const QModelIndex & index, const QVariant & valu
             rec->label = value.toString();
             break;
         case Address:
+            // Refuse to set invalid address
+            if(!validateAddress(value.toString()))
+                return false;
             // Double-check that we're not overwriting receiving address
             if(rec->type == AddressTableEntry::Sending)
             {
@@ -189,12 +173,6 @@ bool AddressTableModel::setData(const QModelIndex & index, const QVariant & valu
                 rec->address = value.toString();
             }
             break;
-        case IsDefaultAddress:
-            if(value.toBool())
-            {
-                setDefaultAddress(rec->address);
-            }
-            break;
         }
         emit dataChanged(index, index);
 
@@ -215,6 +193,23 @@ QVariant AddressTableModel::headerData(int section, Qt::Orientation orientation,
     return QVariant();
 }
 
+Qt::ItemFlags AddressTableModel::flags(const QModelIndex & index) const
+{
+    if(!index.isValid())
+        return 0;
+    AddressTableEntry *rec = static_cast<AddressTableEntry*>(index.internalPointer());
+
+    Qt::ItemFlags retval = Qt::ItemIsSelectable | Qt::ItemIsEnabled;
+    // Can edit address and label for sending addresses,
+    // and only label for receiving addresses.
+    if(rec->type == AddressTableEntry::Sending ||
+      (rec->type == AddressTableEntry::Receiving && index.column()==Label))
+    {
+        retval |= Qt::ItemIsEditable;
+    }
+    return retval;
+}
+
 QModelIndex AddressTableModel::index(int row, int column, const QModelIndex & parent) const
 {
     Q_UNUSED(parent);
@@ -237,7 +232,7 @@ void AddressTableModel::updateList()
     endResetModel();
 }
 
-QString AddressTableModel::addRow(const QString &type, const QString &label, const QString &address, bool setAsDefault)
+QString AddressTableModel::addRow(const QString &type, const QString &label, const QString &address)
 {
     std::string strLabel = label.toStdString();
     std::string strAddress = address.toStdString();
@@ -258,10 +253,6 @@ QString AddressTableModel::addRow(const QString &type, const QString &label, con
         // Generate a new address to associate with given label, optionally
         // set as default receiving address.
         strAddress = PubKeyToAddress(wallet->GetKeyFromKeyPool());
-        if(setAsDefault)
-        {
-            setDefaultAddress(QString::fromStdString(strAddress));
-        }
     }
     else
     {
@@ -288,17 +279,14 @@ bool AddressTableModel::removeRows(int row, int count, const QModelIndex & paren
     return true;
 }
 
-QString AddressTableModel::getDefaultAddress() const
+void AddressTableModel::update()
 {
-    return QString::fromStdString(wallet->GetDefaultAddress());
-}
 
-void AddressTableModel::setDefaultAddress(const QString &defaultAddress)
-{
-    wallet->SetDefaultAddress(defaultAddress.toStdString());
 }
 
-void AddressTableModel::update()
+bool AddressTableModel::validateAddress(const QString &address)
 {
-    emit defaultAddressChanged(getDefaultAddress());
+    uint160 hash160 = 0;
+
+    return AddressToHash160(address.toStdString(), hash160);
 }