mirror of
https://git.wownero.com/wowlet/wowlet.git
synced 2024-08-15 01:03:14 +00:00
History: filter by subaddress label
This commit is contained in:
parent
e0f7473ed4
commit
ffd7879096
2 changed files with 10 additions and 9 deletions
|
@ -13,20 +13,19 @@ TransactionHistoryProxyModel::TransactionHistoryProxyModel(Wallet *wallet, QObje
|
||||||
{
|
{
|
||||||
m_searchRegExp.setCaseSensitivity(Qt::CaseInsensitive);
|
m_searchRegExp.setCaseSensitivity(Qt::CaseInsensitive);
|
||||||
m_searchRegExp.setPatternSyntax(QRegExp::RegExp);
|
m_searchRegExp.setPatternSyntax(QRegExp::RegExp);
|
||||||
|
m_history = m_wallet->history();
|
||||||
}
|
}
|
||||||
|
|
||||||
bool TransactionHistoryProxyModel::filterAcceptsRow(int sourceRow, const QModelIndex &sourceParent) const
|
bool TransactionHistoryProxyModel::filterAcceptsRow(int sourceRow, const QModelIndex &sourceParent) const
|
||||||
{
|
{
|
||||||
QModelIndex descriptionIndex = sourceModel()->index(sourceRow, TransactionHistoryModel::Description, sourceParent);
|
QString description, txid, subaddrlabel;
|
||||||
QModelIndex txidIndex = sourceModel()->index(sourceRow, TransactionHistoryModel::TxID, sourceParent);
|
|
||||||
|
|
||||||
QString descriptionData = sourceModel()->data(descriptionIndex).toString();
|
|
||||||
QString txidData = sourceModel()->data(txidIndex).toString();
|
|
||||||
|
|
||||||
quint32 subaddrAcount;
|
quint32 subaddrAcount;
|
||||||
QSet<quint32> subaddrIndex;
|
QSet<quint32> subaddrIndex;
|
||||||
|
|
||||||
m_wallet->history()->transaction(sourceRow, [&subaddrAcount, &subaddrIndex](TransactionInfo &tInfo){
|
m_history->transaction(sourceRow, [&description, &txid, &subaddrlabel, &subaddrAcount, &subaddrIndex](TransactionInfo &tInfo){
|
||||||
|
description = tInfo.description();
|
||||||
|
txid = tInfo.hash();
|
||||||
|
subaddrlabel = tInfo.label();
|
||||||
subaddrAcount = tInfo.subaddrAccount();
|
subaddrAcount = tInfo.subaddrAccount();
|
||||||
subaddrIndex = tInfo.subaddrIndex();
|
subaddrIndex = tInfo.subaddrIndex();
|
||||||
});
|
});
|
||||||
|
@ -38,5 +37,5 @@ bool TransactionHistoryProxyModel::filterAcceptsRow(int sourceRow, const QModelI
|
||||||
if (addressFound) break;
|
if (addressFound) break;
|
||||||
}
|
}
|
||||||
|
|
||||||
return (descriptionData.contains(m_searchRegExp) || txidData.contains(m_searchRegExp)) || addressFound;
|
return (description.contains(m_searchRegExp) || txid.contains(m_searchRegExp) || subaddrlabel.contains(m_searchRegExp)) || addressFound;
|
||||||
}
|
}
|
|
@ -6,6 +6,7 @@
|
||||||
|
|
||||||
#include "libwalletqt/TransactionHistory.h"
|
#include "libwalletqt/TransactionHistory.h"
|
||||||
#include "libwalletqt/Wallet.h"
|
#include "libwalletqt/Wallet.h"
|
||||||
|
#include "libwalletqt/TransactionHistory.h"
|
||||||
|
|
||||||
#include <QSortFilterProxyModel>
|
#include <QSortFilterProxyModel>
|
||||||
|
|
||||||
|
@ -23,7 +24,8 @@ public slots:
|
||||||
}
|
}
|
||||||
|
|
||||||
private:
|
private:
|
||||||
Wallet * m_wallet;
|
Wallet *m_wallet;
|
||||||
|
TransactionHistory *m_history;
|
||||||
|
|
||||||
QRegExp m_searchRegExp;
|
QRegExp m_searchRegExp;
|
||||||
};
|
};
|
||||||
|
|
Loading…
Reference in a new issue