From 371aef9de065ce7d85f796f8ee4b557c43aa2c0a Mon Sep 17 00:00:00 2001 From: tobtoht Date: Tue, 7 Mar 2023 21:36:15 +0100 Subject: [PATCH] Receive: show address index --- src/ReceiveWidget.cpp | 6 +++--- src/model/SubaddressModel.cpp | 6 ++++++ src/model/SubaddressModel.h | 3 ++- 3 files changed, 11 insertions(+), 4 deletions(-) diff --git a/src/ReceiveWidget.cpp b/src/ReceiveWidget.cpp index 0bc180d4..a48323a4 100644 --- a/src/ReceiveWidget.cpp +++ b/src/ReceiveWidget.cpp @@ -26,9 +26,9 @@ ReceiveWidget::ReceiveWidget(Wallet *wallet, QWidget *parent) ui->addresses->setModel(m_proxyModel); ui->addresses->setColumnHidden(SubaddressModel::isUsed, true); - ui->addresses->header()->setSectionResizeMode(SubaddressModel::Address, QHeaderView::Stretch); - ui->addresses->header()->setSectionResizeMode(SubaddressModel::Label, QHeaderView::ResizeToContents); - ui->addresses->header()->setMinimumSectionSize(200); + ui->addresses->header()->setSectionResizeMode(SubaddressModel::Index, QHeaderView::ResizeToContents); + ui->addresses->header()->setSectionResizeMode(SubaddressModel::Address, QHeaderView::ResizeToContents); + ui->addresses->header()->setSectionResizeMode(SubaddressModel::Label, QHeaderView::Stretch); connect(ui->addresses->selectionModel(), &QItemSelectionModel::currentChanged, [=](QModelIndex current, QModelIndex prev){ this->updateQrCode(); diff --git a/src/model/SubaddressModel.cpp b/src/model/SubaddressModel.cpp index ec2c9e6a..d4ea0bf6 100644 --- a/src/model/SubaddressModel.cpp +++ b/src/model/SubaddressModel.cpp @@ -96,6 +96,10 @@ QVariant SubaddressModel::data(const QModelIndex &index, int role) const QVariant SubaddressModel::parseSubaddressRow(const Monero::SubaddressRow &subaddress, const QModelIndex &index, int role) const { switch (index.column()) { + case Index: + { + return "#" + QString::number(subaddress.getRowId()); + } case Address: { QString address = QString::fromStdString(subaddress.getAddress()); @@ -123,6 +127,8 @@ QVariant SubaddressModel::headerData(int section, Qt::Orientation orientation, i if (orientation == Qt::Horizontal) { switch(section) { + case Index: + return QString("#"); case Address: return QString("Address"); case Label: diff --git a/src/model/SubaddressModel.h b/src/model/SubaddressModel.h index 85bec341..4c8d0da4 100644 --- a/src/model/SubaddressModel.h +++ b/src/model/SubaddressModel.h @@ -19,7 +19,8 @@ class SubaddressModel : public QAbstractTableModel public: enum ModelColumn { - Address = 0, + Index = 0, + Address, Label, isUsed, COUNT -- 2.52.0