d0s3t3ch/wowlet
1
0
Fork 0
mirror of https://git.wownero.com/wowlet/wowlet.git synced 2024-08-15 01:03:14 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request 'History: filter by subaddress label' (#321) from tobtoht/feather:history_filter_label into master

Browse source 
Reviewed-on: https://git.wownero.com/feather/feather/pulls/321
This commit is contained in:
tobtoht 2021-02-03 18:37:46 +00:00
commit 662d165beb
2 changed files with 10 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

15
src/model/TransactionHistoryProxyModel.cpp
View file

@ -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;
} }

2
src/model/TransactionHistoryProxyModel.h
View file

@ -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>
@ -24,6 +25,7 @@ public slots:
private: private:
Wallet *m_wallet; Wallet *m_wallet;
TransactionHistory *m_history;
QRegExp m_searchRegExp; QRegExp m_searchRegExp;
}; };