Browse Source

transaction details dialog on doubleclick

pull/1/head
Wladimir J. van der Laan 11 years ago
parent
commit
66d536ed07
  1. 6
      README.rst
  2. 11
      bitcoin.pro
  3. 67
      gui/forms/transactiondescdialog.ui
  4. 7
      gui/include/bitcoingui.h
  5. 15
      gui/include/transactiondesc.h
  6. 25
      gui/include/transactiondescdialog.h
  7. 3
      gui/include/transactiontablemodel.h
  8. 11
      gui/src/bitcoingui.cpp
  9. 310
      gui/src/transactiondesc.cpp
  10. 20
      gui/src/transactiondescdialog.cpp
  11. 24
      gui/src/transactiontablemodel.cpp

6
README.rst

@ -24,7 +24,9 @@ This has been implemented: @@ -24,7 +24,9 @@ This has been implemented:
- Sending coins (including ask for fee when needed)
- Show messages from core
- Show error messages from core
- Show details dialog for transactions (on double click)
This has to be done:
@ -34,6 +36,4 @@ This has to be done: @@ -34,6 +36,4 @@ This has to be done:
- Build on Windows
- Show details dialog for transactions (on double click)
- More thorough testing of the view with all the kinds of transactions (sendmany, generation)

11
bitcoin.pro

@ -63,7 +63,9 @@ HEADERS += gui/include/bitcoingui.h \ @@ -63,7 +63,9 @@ HEADERS += gui/include/bitcoingui.h \
gui/include/guiconstants.h \
gui/include/optionsmodel.h \
gui/include/monitoreddatamapper.h \
core/include/externui.h
core/include/externui.h \
gui/include/transactiondesc.h \
gui/include/transactiondescdialog.h
SOURCES += gui/src/bitcoin.cpp gui/src/bitcoingui.cpp \
gui/src/transactiontablemodel.cpp \
gui/src/addresstablemodel.cpp \
@ -90,7 +92,9 @@ SOURCES += gui/src/bitcoin.cpp gui/src/bitcoingui.cpp \ @@ -90,7 +92,9 @@ SOURCES += gui/src/bitcoin.cpp gui/src/bitcoingui.cpp \
gui/src/guiutil.cpp \
gui/src/transactionrecord.cpp \
gui/src/optionsmodel.cpp \
gui/src/monitoreddatamapper.cpp
gui/src/monitoreddatamapper.cpp \
gui/src/transactiondesc.cpp \
gui/src/transactiondescdialog.cpp
RESOURCES += \
gui/bitcoin.qrc
@ -99,4 +103,5 @@ FORMS += \ @@ -99,4 +103,5 @@ FORMS += \
gui/forms/sendcoinsdialog.ui \
gui/forms/addressbookdialog.ui \
gui/forms/aboutdialog.ui \
gui/forms/editaddressdialog.ui
gui/forms/editaddressdialog.ui \
gui/forms/transactiondescdialog.ui

67
gui/forms/transactiondescdialog.ui

@ -0,0 +1,67 @@ @@ -0,0 +1,67 @@
<?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0">
<class>TransactionDescDialog</class>
<widget class="QDialog" name="TransactionDescDialog">
<property name="geometry">
<rect>
<x>0</x>
<y>0</y>
<width>400</width>
<height>300</height>
</rect>
</property>
<property name="windowTitle">
<string>Transaction details</string>
</property>
<layout class="QVBoxLayout" name="verticalLayout">
<item>
<widget class="QTextEdit" name="detailText"/>
</item>
<item>
<widget class="QDialogButtonBox" name="buttonBox">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="standardButtons">
<set>QDialogButtonBox::Close</set>
</property>
</widget>
</item>
</layout>
</widget>
<resources/>
<connections>
<connection>
<sender>buttonBox</sender>
<signal>accepted()</signal>
<receiver>TransactionDescDialog</receiver>
<slot>accept()</slot>
<hints>
<hint type="sourcelabel">
<x>248</x>
<y>254</y>
</hint>
<hint type="destinationlabel">
<x>157</x>
<y>274</y>
</hint>
</hints>
</connection>
<connection>
<sender>buttonBox</sender>
<signal>rejected()</signal>
<receiver>TransactionDescDialog</receiver>
<slot>reject()</slot>
<hints>
<hint type="sourcelabel">
<x>316</x>
<y>260</y>
</hint>
<hint type="destinationlabel">
<x>286</x>
<y>274</y>
</hint>
</hints>
</connection>
</connections>
</ui>

7
gui/include/bitcoingui.h

@ -4,7 +4,6 @@ @@ -4,7 +4,6 @@
#include <QMainWindow>
#include <QSystemTrayIcon>
/* Forward declarations */
class TransactionTableModel;
class ClientModel;
@ -13,6 +12,7 @@ class QLabel; @@ -13,6 +12,7 @@ class QLabel;
class QLineEdit;
class QTableView;
class QAbstractItemModel;
class QModelIndex;
QT_END_NAMESPACE
class BitcoinGUI : public QMainWindow
@ -66,6 +66,10 @@ public slots: @@ -66,6 +66,10 @@ public slots:
void setNumBlocks(int count);
void setNumTransactions(int count);
void error(const QString &title, const QString &message);
/* It is currently not possible to pass a return value to another thread through
BlockingQueuedConnection, so use an indirected pointer.
http://bugreports.qt.nokia.com/browse/QTBUG-10440
*/
void askFee(qint64 nFeeRequired, bool *payFee);
private slots:
@ -77,6 +81,7 @@ private slots: @@ -77,6 +81,7 @@ private slots:
void newAddressClicked();
void copyClipboardClicked();
void trayIconActivated(QSystemTrayIcon::ActivationReason reason);
void transactionDetails(const QModelIndex& idx);
};
#endif

15
gui/include/transactiondesc.h

@ -0,0 +1,15 @@ @@ -0,0 +1,15 @@
#ifndef TRANSACTIONDESC_H
#define TRANSACTIONDESC_H
#include <string>
class CWalletTx;
class TransactionDesc
{
public:
/* Provide human-readable extended HTML description of a transaction */
static std::string toHTML(CWalletTx &wtx);
};
#endif // TRANSACTIONDESC_H

25
gui/include/transactiondescdialog.h

@ -0,0 +1,25 @@ @@ -0,0 +1,25 @@
#ifndef TRANSACTIONDESCDIALOG_H
#define TRANSACTIONDESCDIALOG_H
#include <QDialog>
namespace Ui {
class TransactionDescDialog;
}
QT_BEGIN_NAMESPACE
class QModelIndex;
QT_END_NAMESPACE
class TransactionDescDialog : public QDialog
{
Q_OBJECT
public:
explicit TransactionDescDialog(const QModelIndex &idx, QWidget *parent = 0);
~TransactionDescDialog();
private:
Ui::TransactionDescDialog *ui;
};
#endif // TRANSACTIONDESCDIALOG_H

3
gui/include/transactiontablemodel.h

@ -23,7 +23,8 @@ public: @@ -23,7 +23,8 @@ public:
} ColumnIndex;
enum {
TypeRole = Qt::UserRole
TypeRole = Qt::UserRole,
LongDescriptionRole = Qt::UserRole+1
} RoleIndex;
/* TypeRole values */

11
gui/src/bitcoingui.cpp

@ -13,6 +13,7 @@ @@ -13,6 +13,7 @@
#include "guiutil.h"
#include "editaddressdialog.h"
#include "optionsmodel.h"
#include "transactiondescdialog.h"
#include "main.h"
@ -212,6 +213,8 @@ QWidget *BitcoinGUI::createTabs() @@ -212,6 +213,8 @@ QWidget *BitcoinGUI::createTabs()
{
QTableView *view = new QTableView(this);
tabs->addTab(view, tab_labels.at(i));
connect(view, SIGNAL(activated(const QModelIndex&)), this, SLOT(transactionDetails(const QModelIndex&)));
transactionViews.append(view);
}
@ -396,3 +399,11 @@ void BitcoinGUI::askFee(qint64 nFeeRequired, bool *payFee) @@ -396,3 +399,11 @@ void BitcoinGUI::askFee(qint64 nFeeRequired, bool *payFee)
QMessageBox::Yes|QMessageBox::Cancel, QMessageBox::Yes);
*payFee = (retval == QMessageBox::Yes);
}
void BitcoinGUI::transactionDetails(const QModelIndex& idx)
{
/* A transaction is doubleclicked */
TransactionDescDialog dlg(idx);
dlg.exec();
}

310
gui/src/transactiondesc.cpp

@ -0,0 +1,310 @@ @@ -0,0 +1,310 @@
#include <transactiondesc.h>
#include "guiutil.h"
#include "main.h"
#include <QString>
/* Taken straight from ui.cpp
TODO: Convert to use QStrings, Qt::Escape and tr()
*/
using namespace std;
static string HtmlEscape(const char* psz, bool fMultiLine=false)
{
int len = 0;
for (const char* p = psz; *p; p++)
{
if (*p == '<') len += 4;
else if (*p == '>') len += 4;
else if (*p == '&') len += 5;
else if (*p == '"') len += 6;
else if (*p == ' ' && p > psz && p[-1] == ' ' && p[1] == ' ') len += 6;
else if (*p == '\n' && fMultiLine) len += 5;
else
len++;
}
string str;
str.reserve(len);
for (const char* p = psz; *p; p++)
{
if (*p == '<') str += "&lt;";
else if (*p == '>') str += "&gt;";
else if (*p == '&') str += "&amp;";
else if (*p == '"') str += "&quot;";
else if (*p == ' ' && p > psz && p[-1] == ' ' && p[1] == ' ') str += "&nbsp;";
else if (*p == '\n' && fMultiLine) str += "<br>\n";
else
str += *p;
}
return str;
}
static string HtmlEscape(const string& str, bool fMultiLine=false)
{
return HtmlEscape(str.c_str(), fMultiLine);
}
static string FormatTxStatus(const CWalletTx& wtx)
{
// Status
if (!wtx.IsFinal())
{
if (wtx.nLockTime < 500000000)
return strprintf(_("Open for %d blocks"), nBestHeight - wtx.nLockTime);
else
return strprintf(_("Open until %s"), GUIUtil::DateTimeStr(wtx.nLockTime).toStdString().c_str());
}
else
{
int nDepth = wtx.GetDepthInMainChain();
if (GetAdjustedTime() - wtx.nTimeReceived > 2 * 60 && wtx.GetRequestCount() == 0)
return strprintf(_("%d/offline?"), nDepth);
else if (nDepth < 6)
return strprintf(_("%d/unconfirmed"), nDepth);
else
return strprintf(_("%d confirmations"), nDepth);
}
}
string TransactionDesc::toHTML(CWalletTx &wtx)
{
string strHTML;
CRITICAL_BLOCK(cs_mapAddressBook)
{
strHTML.reserve(4000);
strHTML += "<html><font face='verdana, arial, helvetica, sans-serif'>";
int64 nTime = wtx.GetTxTime();
int64 nCredit = wtx.GetCredit();
int64 nDebit = wtx.GetDebit();
int64 nNet = nCredit - nDebit;
strHTML += _("<b>Status:</b> ") + FormatTxStatus(wtx);
int nRequests = wtx.GetRequestCount();
if (nRequests != -1)
{
if (nRequests == 0)
strHTML += _(", has not been successfully broadcast yet");
else if (nRequests == 1)
strHTML += strprintf(_(", broadcast through %d node"), nRequests);
else
strHTML += strprintf(_(", broadcast through %d nodes"), nRequests);
}
strHTML += "<br>";
strHTML += _("<b>Date:</b> ") + (nTime ? GUIUtil::DateTimeStr(nTime).toStdString() : "") + "<br>";
//
// From
//
if (wtx.IsCoinBase())
{
strHTML += _("<b>Source:</b> Generated<br>");
}
else if (!wtx.mapValue["from"].empty())
{
// Online transaction
if (!wtx.mapValue["from"].empty())
strHTML += _("<b>From:</b> ") + HtmlEscape(wtx.mapValue["from"]) + "<br>";
}
else
{
// Offline transaction
if (nNet > 0)
{
// Credit
BOOST_FOREACH(const CTxOut& txout, wtx.vout)
{
if (txout.IsMine())
{
vector<unsigned char> vchPubKey;
if (ExtractPubKey(txout.scriptPubKey, true, vchPubKey))
{
string strAddress = PubKeyToAddress(vchPubKey);
if (mapAddressBook.count(strAddress))
{
strHTML += string() + _("<b>From:</b> ") + _("unknown") + "<br>";
strHTML += _("<b>To:</b> ");
strHTML += HtmlEscape(strAddress);
if (!mapAddressBook[strAddress].empty())
strHTML += _(" (yours, label: ") + mapAddressBook[strAddress] + ")";
else
strHTML += _(" (yours)");
strHTML += "<br>";
}
}
break;
}
}
}
}
//
// To
//
string strAddress;
if (!wtx.mapValue["to"].empty())
{
// Online transaction
strAddress = wtx.mapValue["to"];
strHTML += _("<b>To:</b> ");
if (mapAddressBook.count(strAddress) && !mapAddressBook[strAddress].empty())
strHTML += mapAddressBook[strAddress] + " ";
strHTML += HtmlEscape(strAddress) + "<br>";
}
//
// Amount
//
if (wtx.IsCoinBase() && nCredit == 0)
{
//
// Coinbase
//
int64 nUnmatured = 0;
BOOST_FOREACH(const CTxOut& txout, wtx.vout)
nUnmatured += txout.GetCredit();
strHTML += _("<b>Credit:</b> ");
if (wtx.IsInMainChain())
strHTML += strprintf(_("(%s matures in %d more blocks)"), FormatMoney(nUnmatured).c_str(), wtx.GetBlocksToMaturity());
else
strHTML += _("(not accepted)");
strHTML += "<br>";
}
else if (nNet > 0)
{
//
// Credit
//
strHTML += _("<b>Credit:</b> ") + FormatMoney(nNet) + "<br>";
}
else
{
bool fAllFromMe = true;
BOOST_FOREACH(const CTxIn& txin, wtx.vin)
fAllFromMe = fAllFromMe && txin.IsMine();
bool fAllToMe = true;
BOOST_FOREACH(const CTxOut& txout, wtx.vout)
fAllToMe = fAllToMe && txout.IsMine();
if (fAllFromMe)
{
//
// Debit
//
BOOST_FOREACH(const CTxOut& txout, wtx.vout)
{
if (txout.IsMine())
continue;
if (wtx.mapValue["to"].empty())
{
// Offline transaction
uint160 hash160;
if (ExtractHash160(txout.scriptPubKey, hash160))
{
string strAddress = Hash160ToAddress(hash160);
strHTML += _("<b>To:</b> ");
if (mapAddressBook.count(strAddress) && !mapAddressBook[strAddress].empty())
strHTML += mapAddressBook[strAddress] + " ";
strHTML += strAddress;
strHTML += "<br>";
}
}
strHTML += _("<b>Debit:</b> ") + FormatMoney(-txout.nValue) + "<br>";
}
if (fAllToMe)
{
// Payment to self
int64 nChange = wtx.GetChange();
int64 nValue = nCredit - nChange;
strHTML += _("<b>Debit:</b> ") + FormatMoney(-nValue) + "<br>";
strHTML += _("<b>Credit:</b> ") + FormatMoney(nValue) + "<br>";
}
int64 nTxFee = nDebit - wtx.GetValueOut();
if (nTxFee > 0)
strHTML += _("<b>Transaction fee:</b> ") + FormatMoney(-nTxFee) + "<br>";
}
else
{
//
// Mixed debit transaction
//
BOOST_FOREACH(const CTxIn& txin, wtx.vin)
if (txin.IsMine())
strHTML += _("<b>Debit:</b> ") + FormatMoney(-txin.GetDebit()) + "<br>";
BOOST_FOREACH(const CTxOut& txout, wtx.vout)
if (txout.IsMine())
strHTML += _("<b>Credit:</b> ") + FormatMoney(txout.GetCredit()) + "<br>";
}
}
strHTML += _("<b>Net amount:</b> ") + FormatMoney(nNet, true) + "<br>";
//
// Message
//
if (!wtx.mapValue["message"].empty())
strHTML += string() + "<br><b>" + _("Message:") + "</b><br>" + HtmlEscape(wtx.mapValue["message"], true) + "<br>";
if (!wtx.mapValue["comment"].empty())
strHTML += string() + "<br><b>" + _("Comment:") + "</b><br>" + HtmlEscape(wtx.mapValue["comment"], true) + "<br>";
if (wtx.IsCoinBase())
strHTML += string() + "<br>" + _("Generated coins must wait 120 blocks before they can be spent. When you generated this block, it was broadcast to the network to be added to the block chain. If it fails to get into the chain, it will change to \"not accepted\" and not be spendable. This may occasionally happen if another node generates a block within a few seconds of yours.") + "<br>";
//
// Debug view
//
if (fDebug)
{
strHTML += "<hr><br>debug print<br><br>";
BOOST_FOREACH(const CTxIn& txin, wtx.vin)
if (txin.IsMine())
strHTML += "<b>Debit:</b> " + FormatMoney(-txin.GetDebit()) + "<br>";
BOOST_FOREACH(const CTxOut& txout, wtx.vout)
if (txout.IsMine())
strHTML += "<b>Credit:</b> " + FormatMoney(txout.GetCredit()) + "<br>";
strHTML += "<br><b>Transaction:</b><br>";
strHTML += HtmlEscape(wtx.ToString(), true);
strHTML += "<br><b>Inputs:</b><br>";
CRITICAL_BLOCK(cs_mapWallet)
{
BOOST_FOREACH(const CTxIn& txin, wtx.vin)
{
COutPoint prevout = txin.prevout;
map<uint256, CWalletTx>::iterator mi = mapWallet.find(prevout.hash);
if (mi != mapWallet.end())
{
const CWalletTx& prev = (*mi).second;
if (prevout.n < prev.vout.size())
{
strHTML += HtmlEscape(prev.ToString(), true);
strHTML += " &nbsp;&nbsp; " + FormatTxStatus(prev) + ", ";
strHTML = strHTML + "IsMine=" + (prev.vout[prevout.n].IsMine() ? "true" : "false") + "<br>";
}
}
}
}
}
strHTML += "</font></html>";
}
return strHTML;
}

20
gui/src/transactiondescdialog.cpp

@ -0,0 +1,20 @@ @@ -0,0 +1,20 @@
#include "transactiondescdialog.h"
#include "ui_transactiondescdialog.h"
#include "transactiontablemodel.h"
#include <QModelIndex>
TransactionDescDialog::TransactionDescDialog(const QModelIndex &idx, QWidget *parent) :
QDialog(parent),
ui(new Ui::TransactionDescDialog)
{
ui->setupUi(this);
QString desc = idx.data(TransactionTableModel::LongDescriptionRole).toString();
ui->detailText->setHtml(desc);
}
TransactionDescDialog::~TransactionDescDialog()
{
delete ui;
}

24
gui/src/transactiontablemodel.cpp

@ -3,6 +3,7 @@ @@ -3,6 +3,7 @@
#include "transactionrecord.h"
#include "guiconstants.h"
#include "main.h"
#include "transactiondesc.h"
#include <QLocale>
#include <QDebug>
@ -131,14 +132,10 @@ struct TransactionTablePriv @@ -131,14 +132,10 @@ struct TransactionTablePriv
}
else if(inWallet && inModel)
{
/* Updated */
/* Updated -- nothing to do, status update will take care of this */
}
}
}
/* TODO: invalidate status for all transactions
Use counter. Emit dataChanged for column.
*/
}
int size()
@ -176,6 +173,19 @@ struct TransactionTablePriv @@ -176,6 +173,19 @@ struct TransactionTablePriv
}
}
QString describe(TransactionRecord *rec)
{
CRITICAL_BLOCK(cs_mapWallet)
{
std::map<uint256, CWalletTx>::iterator mi = mapWallet.find(rec->hash);
if(mi != mapWallet.end())
{
return QString::fromStdString(TransactionDesc::toHTML(mi->second));
}
}
return QString("");
}
};
/* Credit and Debit columns are right-aligned as they contain numbers */
@ -458,6 +468,10 @@ QVariant TransactionTableModel::data(const QModelIndex &index, int role) const @@ -458,6 +468,10 @@ QVariant TransactionTableModel::data(const QModelIndex &index, int role) const
return TransactionTableModel::Other;
}
}
else if (role == LongDescriptionRole)
{
return priv->describe(rec);
}
return QVariant();
}

Loading…
Cancel
Save