Added coincontrol darksend rounds colunm from v10

This commit is contained in:
Evan Duffield 2014-12-26 15:30:00 -07:00
parent 12e8fd0461
commit c94600a2c8
3 changed files with 19 additions and 2 deletions

View File

@ -16,6 +16,7 @@
#include "coincontrol.h" #include "coincontrol.h"
#include "main.h" #include "main.h"
#include "wallet.h" #include "wallet.h"
#include "darksend.h"
#include <QApplication> #include <QApplication>
#include <QCheckBox> #include <QCheckBox>
@ -117,8 +118,9 @@ CoinControlDialog::CoinControlDialog(QWidget *parent) :
ui->treeWidget->setColumnWidth(COLUMN_CHECKBOX, 84); ui->treeWidget->setColumnWidth(COLUMN_CHECKBOX, 84);
ui->treeWidget->setColumnWidth(COLUMN_AMOUNT, 100); ui->treeWidget->setColumnWidth(COLUMN_AMOUNT, 100);
ui->treeWidget->setColumnWidth(COLUMN_LABEL, 170); ui->treeWidget->setColumnWidth(COLUMN_LABEL, 170);
ui->treeWidget->setColumnWidth(COLUMN_ADDRESS, 290); ui->treeWidget->setColumnWidth(COLUMN_ADDRESS, 190);
ui->treeWidget->setColumnWidth(COLUMN_DATE, 110); ui->treeWidget->setColumnWidth(COLUMN_DARKSEND_ROUNDS, 120);
ui->treeWidget->setColumnWidth(COLUMN_DATE, 60);
ui->treeWidget->setColumnWidth(COLUMN_CONFIRMATIONS, 100); ui->treeWidget->setColumnWidth(COLUMN_CONFIRMATIONS, 100);
ui->treeWidget->setColumnWidth(COLUMN_PRIORITY, 100); ui->treeWidget->setColumnWidth(COLUMN_PRIORITY, 100);
ui->treeWidget->setColumnHidden(COLUMN_TXHASH, true); // store transacton hash in this column, but dont show it ui->treeWidget->setColumnHidden(COLUMN_TXHASH, true); // store transacton hash in this column, but dont show it
@ -738,6 +740,15 @@ void CoinControlDialog::updateView()
itemOutput->setText(COLUMN_DATE, GUIUtil::dateTimeStr(out.tx->GetTxTime())); itemOutput->setText(COLUMN_DATE, GUIUtil::dateTimeStr(out.tx->GetTxTime()));
itemOutput->setText(COLUMN_DATE_INT64, strPad(QString::number(out.tx->GetTxTime()), 20, " ")); itemOutput->setText(COLUMN_DATE_INT64, strPad(QString::number(out.tx->GetTxTime()), 20, " "));
// ds+ rounds
CTxIn vin = CTxIn(out.tx->GetHash(), out.i);
int rounds = GetInputDarksendRounds(vin);
if(rounds >= 0) itemOutput->setText(COLUMN_DARKSEND_ROUNDS, strPad(QString::number(rounds), 15, " "));
else itemOutput->setText(COLUMN_DARKSEND_ROUNDS, strPad(QString("n/a"), 15, " "));
// confirmations // confirmations
itemOutput->setText(COLUMN_CONFIRMATIONS, strPad(QString::number(out.nDepth), 8, " ")); itemOutput->setText(COLUMN_CONFIRMATIONS, strPad(QString::number(out.nDepth), 8, " "));

View File

@ -59,6 +59,7 @@ private:
COLUMN_AMOUNT, COLUMN_AMOUNT,
COLUMN_LABEL, COLUMN_LABEL,
COLUMN_ADDRESS, COLUMN_ADDRESS,
COLUMN_DARKSEND_ROUNDS,
COLUMN_DATE, COLUMN_DATE,
COLUMN_CONFIRMATIONS, COLUMN_CONFIRMATIONS,
COLUMN_PRIORITY, COLUMN_PRIORITY,

View File

@ -456,6 +456,11 @@
<string>Address</string> <string>Address</string>
</property> </property>
</column> </column>
<column>
<property name="text">
<string>Darksend Rounds</string>
</property>
</column>
<column> <column>
<property name="text"> <property name="text">
<string>Date</string> <string>Date</string>