Qt: Rename confusingly-named "address prefix" to "search string"
This commit is contained in:
parent
0e707919f5
commit
b1f634242e
4 changed files with 15 additions and 15 deletions
|
@ -20,7 +20,7 @@ TransactionFilterProxy::TransactionFilterProxy(QObject *parent) :
|
|||
QSortFilterProxyModel(parent),
|
||||
dateFrom(MIN_DATE),
|
||||
dateTo(MAX_DATE),
|
||||
addrPrefix(),
|
||||
m_search_string(),
|
||||
typeFilter(ALL_TYPES),
|
||||
watchOnlyFilter(WatchOnlyFilter_All),
|
||||
minAmount(0),
|
||||
|
@ -51,7 +51,7 @@ bool TransactionFilterProxy::filterAcceptsRow(int sourceRow, const QModelIndex &
|
|||
return false;
|
||||
if(datetime < dateFrom || datetime > dateTo)
|
||||
return false;
|
||||
if (!address.contains(addrPrefix, Qt::CaseInsensitive) && !label.contains(addrPrefix, Qt::CaseInsensitive))
|
||||
if (!address.contains(m_search_string, Qt::CaseInsensitive) && !label.contains(m_search_string, Qt::CaseInsensitive))
|
||||
return false;
|
||||
if(amount < minAmount)
|
||||
return false;
|
||||
|
@ -66,9 +66,9 @@ void TransactionFilterProxy::setDateRange(const QDateTime &from, const QDateTime
|
|||
invalidateFilter();
|
||||
}
|
||||
|
||||
void TransactionFilterProxy::setAddressPrefix(const QString &_addrPrefix)
|
||||
void TransactionFilterProxy::setSearchString(const QString &search_string)
|
||||
{
|
||||
this->addrPrefix = _addrPrefix;
|
||||
m_search_string = search_string;
|
||||
invalidateFilter();
|
||||
}
|
||||
|
||||
|
|
|
@ -35,7 +35,7 @@ public:
|
|||
};
|
||||
|
||||
void setDateRange(const QDateTime &from, const QDateTime &to);
|
||||
void setAddressPrefix(const QString &addrPrefix);
|
||||
void setSearchString(const QString &);
|
||||
/**
|
||||
@note Type filter takes a bit field created with TYPE() or ALL_TYPES
|
||||
*/
|
||||
|
@ -57,7 +57,7 @@ protected:
|
|||
private:
|
||||
QDateTime dateFrom;
|
||||
QDateTime dateTo;
|
||||
QString addrPrefix;
|
||||
QString m_search_string;
|
||||
quint32 typeFilter;
|
||||
WatchOnlyFilter watchOnlyFilter;
|
||||
CAmount minAmount;
|
||||
|
|
|
@ -95,11 +95,11 @@ TransactionView::TransactionView(const PlatformStyle *platformStyle, QWidget *pa
|
|||
|
||||
hlayout->addWidget(typeWidget);
|
||||
|
||||
addressWidget = new QLineEdit(this);
|
||||
search_widget = new QLineEdit(this);
|
||||
#if QT_VERSION >= 0x040700
|
||||
addressWidget->setPlaceholderText(tr("Enter address or label to search"));
|
||||
search_widget->setPlaceholderText(tr("Enter address or label to search"));
|
||||
#endif
|
||||
hlayout->addWidget(addressWidget);
|
||||
hlayout->addWidget(search_widget);
|
||||
|
||||
amountWidget = new QLineEdit(this);
|
||||
#if QT_VERSION >= 0x040700
|
||||
|
@ -187,8 +187,8 @@ TransactionView::TransactionView(const PlatformStyle *platformStyle, QWidget *pa
|
|||
connect(watchOnlyWidget, SIGNAL(activated(int)), this, SLOT(chooseWatchonly(int)));
|
||||
connect(amountWidget, SIGNAL(textChanged(QString)), amount_typing_delay, SLOT(start()));
|
||||
connect(amount_typing_delay, SIGNAL(timeout()), this, SLOT(changedAmount()));
|
||||
connect(addressWidget, SIGNAL(textChanged(QString)), prefix_typing_delay, SLOT(start()));
|
||||
connect(prefix_typing_delay, SIGNAL(timeout()), this, SLOT(changedPrefix()));
|
||||
connect(search_widget, SIGNAL(textChanged(QString)), prefix_typing_delay, SLOT(start()));
|
||||
connect(prefix_typing_delay, SIGNAL(timeout()), this, SLOT(changedSearch()));
|
||||
|
||||
connect(view, SIGNAL(doubleClicked(QModelIndex)), this, SIGNAL(doubleClicked(QModelIndex)));
|
||||
connect(view, SIGNAL(customContextMenuRequested(QPoint)), this, SLOT(contextualMenu(QPoint)));
|
||||
|
@ -326,11 +326,11 @@ void TransactionView::chooseWatchonly(int idx)
|
|||
(TransactionFilterProxy::WatchOnlyFilter)watchOnlyWidget->itemData(idx).toInt());
|
||||
}
|
||||
|
||||
void TransactionView::changedPrefix()
|
||||
void TransactionView::changedSearch()
|
||||
{
|
||||
if(!transactionProxyModel)
|
||||
return;
|
||||
transactionProxyModel->setAddressPrefix(addressWidget->text());
|
||||
transactionProxyModel->setSearchString(search_widget->text());
|
||||
}
|
||||
|
||||
void TransactionView::changedAmount()
|
||||
|
|
|
@ -66,7 +66,7 @@ private:
|
|||
QComboBox *dateWidget;
|
||||
QComboBox *typeWidget;
|
||||
QComboBox *watchOnlyWidget;
|
||||
QLineEdit *addressWidget;
|
||||
QLineEdit *search_widget;
|
||||
QLineEdit *amountWidget;
|
||||
|
||||
QMenu *contextMenu;
|
||||
|
@ -113,7 +113,7 @@ public Q_SLOTS:
|
|||
void chooseType(int idx);
|
||||
void chooseWatchonly(int idx);
|
||||
void changedAmount();
|
||||
void changedPrefix();
|
||||
void changedSearch();
|
||||
void exportClicked();
|
||||
void focusTransaction(const QModelIndex&);
|
||||
|
||||
|
|
Loading…
Reference in a new issue