Skip to content

Commit 5645358

Browse files
furszyfurszy
committed
[GUI] Cold staking filtering.
1 parent e6fcfbc commit 5645358

File tree

3 files changed

+52
-43
lines changed

3 files changed

+52
-43
lines changed

‎src/qt/pivx/coldstakingwidget.cpp‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,6 +115,7 @@ void ColdStakingWidget::loadWalletModel(){
115115
filter->setFilterCaseSensitivity(Qt::CaseInsensitive);
116116
filter->setSortRole(Qt::EditRole);
117117
filter->setOnlyColdStakes(true);
118+
filter->setTypeFilter(TransactionFilterProxy::TYPE(TransactionRecord::P2CSDelegation));
118119
filter->setSourceModel(txModel);
119120
filter->sort(TransactionTableModel::Date, Qt::DescendingOrder);
120121
txHolder->setDisplayUnit(walletModel->getOptionsModel()->getDisplayUnit());
@@ -136,10 +137,15 @@ void ColdStakingWidget::onDelegateSelected(bool delegate){
136137
if(delegate){
137138
ui->btnCoinControl->setVisible(true);
138139
ui->containerSend->setVisible(true);
140+
ui->containerBtn->setVisible(true);
141+
ui->emptyContainer->setVisible(false);
142+
ui->listView->setVisible(false);
143+
ui->containerHistoryLabel->setVisible(false);
139144
}else{
140145
ui->btnCoinControl->setVisible(false);
141146
ui->containerSend->setVisible(false);
142-
// change list row for the whitelisted addresses
147+
ui->containerBtn->setVisible(false);
148+
showList(filter->rowCount() > 0);
143149
}
144150
}
145151

@@ -155,6 +161,7 @@ void ColdStakingWidget::updateDisplayUnit() {
155161
void ColdStakingWidget::showList(bool show){
156162
ui->emptyContainer->setVisible(!show);
157163
ui->listView->setVisible(show);
164+
ui->containerHistoryLabel->setVisible(show);
158165
}
159166

160167
void ColdStakingWidget::onSendClicked(){

‎src/qt/pivx/forms/coldstakingwidget.ui‎

Lines changed: 39 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -352,44 +352,6 @@ margin-left:20px;</string>
352352
</property>
353353
</widget>
354354
</item>
355-
<item>
356-
<widget class="QWidget" name="containerBtn" native="true">
357-
<property name="minimumSize">
358-
<size>
359-
<width>0</width>
360-
<height>50</height>
361-
</size>
362-
</property>
363-
<layout class="QHBoxLayout" name="horizontalLayout">
364-
<item>
365-
<spacer name="horizontalSpacer_2">
366-
<property name="orientation">
367-
<enum>Qt::Horizontal</enum>
368-
</property>
369-
<property name="sizeHint" stdset="0">
370-
<size>
371-
<width>200</width>
372-
<height>20</height>
373-
</size>
374-
</property>
375-
</spacer>
376-
</item>
377-
<item>
378-
<widget class="QPushButton" name="pushButtonSend">
379-
<property name="minimumSize">
380-
<size>
381-
<width>200</width>
382-
<height>50</height>
383-
</size>
384-
</property>
385-
<property name="text">
386-
<string>Delegate</string>
387-
</property>
388-
</widget>
389-
</item>
390-
</layout>
391-
</widget>
392-
</item>
393355
</layout>
394356
</widget>
395357
</item>
@@ -401,7 +363,7 @@ margin-left:20px;</string>
401363
<enum>Qt::Vertical</enum>
402364
</property>
403365
<property name="sizeType">
404-
<enum>QSizePolicy::Fixed</enum>
366+
<enum>QSizePolicy::Minimum</enum>
405367
</property>
406368
<property name="sizeHint" stdset="0">
407369
<size>
@@ -411,6 +373,44 @@ margin-left:20px;</string>
411373
</property>
412374
</spacer>
413375
</item>
376+
<item>
377+
<widget class="QWidget" name="containerBtn" native="true">
378+
<property name="minimumSize">
379+
<size>
380+
<width>0</width>
381+
<height>50</height>
382+
</size>
383+
</property>
384+
<layout class="QHBoxLayout" name="horizontalLayout">
385+
<item>
386+
<spacer name="horizontalSpacer_2">
387+
<property name="orientation">
388+
<enum>Qt::Horizontal</enum>
389+
</property>
390+
<property name="sizeHint" stdset="0">
391+
<size>
392+
<width>200</width>
393+
<height>20</height>
394+
</size>
395+
</property>
396+
</spacer>
397+
</item>
398+
<item>
399+
<widget class="QPushButton" name="pushButtonSend">
400+
<property name="minimumSize">
401+
<size>
402+
<width>200</width>
403+
<height>50</height>
404+
</size>
405+
</property>
406+
<property name="text">
407+
<string>Delegate</string>
408+
</property>
409+
</widget>
410+
</item>
411+
</layout>
412+
</widget>
413+
</item>
414414
<item>
415415
<widget class="QWidget" name="containerHistoryLabel" native="true">
416416
<layout class="QHBoxLayout" name="horizontalLayout_4">

‎src/qt/transactionfilterproxy.cpp‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ TransactionFilterProxy::TransactionFilterProxy(QObject* parent) : QSortFilterPro
2121
dateFrom(MIN_DATE),
2222
dateTo(MAX_DATE),
2323
addrPrefix(),
24-
typeFilter(COMMON_TYPES),
24+
typeFilter(ALL_TYPES),
2525
watchOnlyFilter(WatchOnlyFilter_All),
2626
minAmount(0),
2727
limitRows(-1),
@@ -54,8 +54,10 @@ bool TransactionFilterProxy::filterAcceptsRow(int sourceRow, const QModelIndex&
5454
return false;
5555
if (datetime < dateFrom || datetime > dateTo)
5656
return false;
57-
if (!address.contains(addrPrefix, Qt::CaseInsensitive) && !label.contains(addrPrefix, Qt::CaseInsensitive))
58-
return false;
57+
if (!addrPrefix.isEmpty()) {
58+
if (!address.contains(addrPrefix, Qt::CaseInsensitive) && !label.contains(addrPrefix, Qt::CaseInsensitive))
59+
return false;
60+
}
5961
if (amount < minAmount)
6062
return false;
6163
if (fOnlyZc && !isZcTx(type)){

0 commit comments

Comments
 (0)