[Qt] Clean up and fix coincontrol tree widget handling
- Do sorting for date, amount and confirmations column as longlong, not unsigned longlong. - Use `UserRole` to store our own data. This makes it treated as ancillary data prevents it from being displayed. - Get rid of `getMappedColumn` `strPad` - these are no longer necessary. - Get rid of hidden `_INT64` columns. - Start enumeration from 0 (otherwise values are undefined).
This commit is contained in:
parent
76af4eb876
commit
4231032bfc
|
@ -37,10 +37,8 @@ bool CoinControlDialog::fSubtractFeeFromAmount = false;
|
||||||
|
|
||||||
bool CCoinControlWidgetItem::operator<(const QTreeWidgetItem &other) const {
|
bool CCoinControlWidgetItem::operator<(const QTreeWidgetItem &other) const {
|
||||||
int column = treeWidget()->sortColumn();
|
int column = treeWidget()->sortColumn();
|
||||||
if (column == CoinControlDialog::COLUMN_AMOUNT_INT64 || column == CoinControlDialog::COLUMN_AMOUNT_INT64)
|
if (column == CoinControlDialog::COLUMN_AMOUNT || column == CoinControlDialog::COLUMN_DATE || column == CoinControlDialog::COLUMN_CONFIRMATIONS)
|
||||||
return data(CoinControlDialog::COLUMN_AMOUNT_INT64, Qt::DisplayRole).toULongLong() < other.data(CoinControlDialog::COLUMN_AMOUNT_INT64, Qt::DisplayRole).toULongLong();
|
return data(column, Qt::UserRole).toLongLong() < other.data(column, Qt::UserRole).toLongLong();
|
||||||
if (column == CoinControlDialog::COLUMN_DATE || column == CoinControlDialog::COLUMN_DATE_INT64)
|
|
||||||
return data(CoinControlDialog::COLUMN_DATE_INT64, Qt::DisplayRole).toULongLong() < other.data(CoinControlDialog::COLUMN_DATE_INT64, Qt::DisplayRole).toULongLong();
|
|
||||||
return QTreeWidgetItem::operator<(other);
|
return QTreeWidgetItem::operator<(other);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -137,11 +135,9 @@ CoinControlDialog::CoinControlDialog(const PlatformStyle *_platformStyle, QWidge
|
||||||
ui->treeWidget->setColumnWidth(COLUMN_CONFIRMATIONS, 110);
|
ui->treeWidget->setColumnWidth(COLUMN_CONFIRMATIONS, 110);
|
||||||
ui->treeWidget->setColumnHidden(COLUMN_TXHASH, true); // store transaction hash in this column, but don't show it
|
ui->treeWidget->setColumnHidden(COLUMN_TXHASH, true); // store transaction hash in this column, but don't show it
|
||||||
ui->treeWidget->setColumnHidden(COLUMN_VOUT_INDEX, true); // store vout index in this column, but don't show it
|
ui->treeWidget->setColumnHidden(COLUMN_VOUT_INDEX, true); // store vout index in this column, but don't show it
|
||||||
ui->treeWidget->setColumnHidden(COLUMN_AMOUNT_INT64, true); // store amount int64 in this column, but don't show it
|
|
||||||
ui->treeWidget->setColumnHidden(COLUMN_DATE_INT64, true); // store date int64 in this column, but don't show it
|
|
||||||
|
|
||||||
// default view is sorted by amount desc
|
// default view is sorted by amount desc
|
||||||
sortView(COLUMN_AMOUNT_INT64, Qt::DescendingOrder);
|
sortView(COLUMN_AMOUNT, Qt::DescendingOrder);
|
||||||
|
|
||||||
// restore list mode and sortorder as a convenience feature
|
// restore list mode and sortorder as a convenience feature
|
||||||
QSettings settings;
|
QSettings settings;
|
||||||
|
@ -173,15 +169,6 @@ void CoinControlDialog::setModel(WalletModel *_model)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// helper function str_pad
|
|
||||||
QString CoinControlDialog::strPad(QString s, int nPadLength, QString sPadding)
|
|
||||||
{
|
|
||||||
while (s.length() < nPadLength)
|
|
||||||
s = sPadding + s;
|
|
||||||
|
|
||||||
return s;
|
|
||||||
}
|
|
||||||
|
|
||||||
// ok button
|
// ok button
|
||||||
void CoinControlDialog::buttonBoxClicked(QAbstractButton* button)
|
void CoinControlDialog::buttonBoxClicked(QAbstractButton* button)
|
||||||
{
|
{
|
||||||
|
@ -347,7 +334,7 @@ void CoinControlDialog::sortView(int column, Qt::SortOrder order)
|
||||||
sortColumn = column;
|
sortColumn = column;
|
||||||
sortOrder = order;
|
sortOrder = order;
|
||||||
ui->treeWidget->sortItems(column, order);
|
ui->treeWidget->sortItems(column, order);
|
||||||
ui->treeWidget->header()->setSortIndicator(getMappedColumn(sortColumn), sortOrder);
|
ui->treeWidget->header()->setSortIndicator(sortColumn, sortOrder);
|
||||||
}
|
}
|
||||||
|
|
||||||
// treeview: clicked on header
|
// treeview: clicked on header
|
||||||
|
@ -355,12 +342,10 @@ void CoinControlDialog::headerSectionClicked(int logicalIndex)
|
||||||
{
|
{
|
||||||
if (logicalIndex == COLUMN_CHECKBOX) // click on most left column -> do nothing
|
if (logicalIndex == COLUMN_CHECKBOX) // click on most left column -> do nothing
|
||||||
{
|
{
|
||||||
ui->treeWidget->header()->setSortIndicator(getMappedColumn(sortColumn), sortOrder);
|
ui->treeWidget->header()->setSortIndicator(sortColumn, sortOrder);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
logicalIndex = getMappedColumn(logicalIndex, false);
|
|
||||||
|
|
||||||
if (sortColumn == logicalIndex)
|
if (sortColumn == logicalIndex)
|
||||||
sortOrder = ((sortOrder == Qt::AscendingOrder) ? Qt::DescendingOrder : Qt::AscendingOrder);
|
sortOrder = ((sortOrder == Qt::AscendingOrder) ? Qt::DescendingOrder : Qt::AscendingOrder);
|
||||||
else
|
else
|
||||||
|
@ -730,14 +715,15 @@ void CoinControlDialog::updateView()
|
||||||
|
|
||||||
// amount
|
// amount
|
||||||
itemOutput->setText(COLUMN_AMOUNT, BitcoinUnits::format(nDisplayUnit, out.tx->vout[out.i].nValue));
|
itemOutput->setText(COLUMN_AMOUNT, BitcoinUnits::format(nDisplayUnit, out.tx->vout[out.i].nValue));
|
||||||
itemOutput->setData(COLUMN_AMOUNT_INT64, Qt::DisplayRole, QVariant((qlonglong)out.tx->vout[out.i].nValue)); // padding so that sorting works correctly
|
itemOutput->setData(COLUMN_AMOUNT, Qt::UserRole, QVariant((qlonglong)out.tx->vout[out.i].nValue)); // padding so that sorting works correctly
|
||||||
|
|
||||||
// date
|
// date
|
||||||
itemOutput->setText(COLUMN_DATE, GUIUtil::dateTimeStr(out.tx->GetTxTime()));
|
itemOutput->setText(COLUMN_DATE, GUIUtil::dateTimeStr(out.tx->GetTxTime()));
|
||||||
itemOutput->setData(COLUMN_DATE_INT64, Qt::DisplayRole, QVariant((qlonglong)out.tx->GetTxTime()));
|
itemOutput->setData(COLUMN_DATE, Qt::UserRole, QVariant((qlonglong)out.tx->GetTxTime()));
|
||||||
|
|
||||||
// confirmations
|
// confirmations
|
||||||
itemOutput->setText(COLUMN_CONFIRMATIONS, strPad(QString::number(out.nDepth), 8, " "));
|
itemOutput->setText(COLUMN_CONFIRMATIONS, QString::number(out.nDepth));
|
||||||
|
itemOutput->setData(COLUMN_CONFIRMATIONS, Qt::UserRole, QVariant((qlonglong)out.nDepth));
|
||||||
|
|
||||||
// transaction hash
|
// transaction hash
|
||||||
uint256 txhash = out.tx->GetHash();
|
uint256 txhash = out.tx->GetHash();
|
||||||
|
@ -765,7 +751,7 @@ void CoinControlDialog::updateView()
|
||||||
{
|
{
|
||||||
itemWalletAddress->setText(COLUMN_CHECKBOX, "(" + QString::number(nChildren) + ")");
|
itemWalletAddress->setText(COLUMN_CHECKBOX, "(" + QString::number(nChildren) + ")");
|
||||||
itemWalletAddress->setText(COLUMN_AMOUNT, BitcoinUnits::format(nDisplayUnit, nSum));
|
itemWalletAddress->setText(COLUMN_AMOUNT, BitcoinUnits::format(nDisplayUnit, nSum));
|
||||||
itemWalletAddress->setText(COLUMN_AMOUNT_INT64, strPad(QString::number(nSum), 15, " "));
|
itemWalletAddress->setData(COLUMN_AMOUNT, Qt::UserRole, QVariant((qlonglong)nSum));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -70,13 +70,12 @@ private:
|
||||||
|
|
||||||
const PlatformStyle *platformStyle;
|
const PlatformStyle *platformStyle;
|
||||||
|
|
||||||
QString strPad(QString, int, QString);
|
|
||||||
void sortView(int, Qt::SortOrder);
|
void sortView(int, Qt::SortOrder);
|
||||||
void updateView();
|
void updateView();
|
||||||
|
|
||||||
enum
|
enum
|
||||||
{
|
{
|
||||||
COLUMN_CHECKBOX,
|
COLUMN_CHECKBOX = 0,
|
||||||
COLUMN_AMOUNT,
|
COLUMN_AMOUNT,
|
||||||
COLUMN_LABEL,
|
COLUMN_LABEL,
|
||||||
COLUMN_ADDRESS,
|
COLUMN_ADDRESS,
|
||||||
|
@ -84,32 +83,9 @@ private:
|
||||||
COLUMN_CONFIRMATIONS,
|
COLUMN_CONFIRMATIONS,
|
||||||
COLUMN_TXHASH,
|
COLUMN_TXHASH,
|
||||||
COLUMN_VOUT_INDEX,
|
COLUMN_VOUT_INDEX,
|
||||||
COLUMN_AMOUNT_INT64,
|
|
||||||
COLUMN_DATE_INT64
|
|
||||||
};
|
};
|
||||||
friend class CCoinControlWidgetItem;
|
friend class CCoinControlWidgetItem;
|
||||||
|
|
||||||
// some columns have a hidden column containing the value used for sorting
|
|
||||||
int getMappedColumn(int column, bool fVisibleColumn = true)
|
|
||||||
{
|
|
||||||
if (fVisibleColumn)
|
|
||||||
{
|
|
||||||
if (column == COLUMN_AMOUNT_INT64)
|
|
||||||
return COLUMN_AMOUNT;
|
|
||||||
else if (column == COLUMN_DATE_INT64)
|
|
||||||
return COLUMN_DATE;
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
if (column == COLUMN_AMOUNT)
|
|
||||||
return COLUMN_AMOUNT_INT64;
|
|
||||||
else if (column == COLUMN_DATE)
|
|
||||||
return COLUMN_DATE_INT64;
|
|
||||||
}
|
|
||||||
|
|
||||||
return column;
|
|
||||||
}
|
|
||||||
|
|
||||||
private Q_SLOTS:
|
private Q_SLOTS:
|
||||||
void showMenu(const QPoint &);
|
void showMenu(const QPoint &);
|
||||||
void copyAmount();
|
void copyAmount();
|
||||||
|
|
Loading…
Reference in New Issue