Skip to content

Commit 6006eff

Browse files
furszyfurszy
committed
update from remote
1 parent 54ca539 commit 6006eff

File tree

5 files changed

+309
-134
lines changed

5 files changed

+309
-134
lines changed

‎src/qt/pivx/dashboardwidget.cpp‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -103,6 +103,12 @@ DashboardWidget::DashboardWidget(PIVXGUI* _window, QWidget *parent) :
103103
// Sort Transactions
104104

105105
ui->comboBoxSort->setProperty("cssClass", "btn-combo");
106+
ui->comboBoxSort->setEditable(true);
107+
SortEdit* lineEdit = new SortEdit(ui->comboBoxSort);
108+
lineEdit->setReadOnly(true);
109+
lineEdit->setAlignment(Qt::AlignRight);
110+
ui->comboBoxSort->setLineEdit(lineEdit);
111+
connect(lineEdit, SIGNAL(Mouse_Pressed()), this, SLOT(onSortTxPressed()));
106112

107113
QListView * listView = new QListView();
108114

@@ -248,6 +254,10 @@ void DashboardWidget::setWalletModel(WalletModel* model){
248254
ui->listTransactions->setModel(this->txModel);
249255
}
250256

257+
void DashboardWidget::onSortTxPressed(){
258+
ui->comboBoxSort->showPopup();
259+
}
260+
251261
void DashboardWidget::changeTheme(bool isLightTheme, QString& theme){
252262
// Change theme in all of the childs here..
253263
this->setStyleSheet(theme);

‎src/qt/pivx/dashboardwidget.h‎

Lines changed: 18 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
#include "qt/pivx/txrow.h"
88

99
#include <QWidget>
10-
10+
#include <QLineEdit>
1111
/*
1212
#include <QBarCategoryAxis>
1313
#include <QBarSet>
@@ -24,6 +24,22 @@ namespace Ui {
2424
class DashboardWidget;
2525
}
2626

27+
class SortEdit : public QLineEdit{
28+
Q_OBJECT
29+
public:
30+
explicit SortEdit(QWidget* parent = nullptr) : QLineEdit(parent){}
31+
32+
inline void mousePressEvent(QMouseEvent *) override{
33+
emit Mouse_Pressed();
34+
}
35+
36+
~SortEdit() override{}
37+
38+
signals:
39+
void Mouse_Pressed();
40+
41+
};
42+
2743
QT_BEGIN_NAMESPACE
2844
class QModelIndex;
2945
QT_END_NAMESPACE
@@ -43,6 +59,7 @@ private slots:
4359

4460
void changeTheme(bool isLightTheme, QString &theme);
4561
void changeChartColors();
62+
void onSortTxPressed();
4663
private:
4764
Ui::DashboardWidget *ui;
4865
PIVXGUI* window;

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

Lines changed: 115 additions & 109 deletions
Original file line numberDiff line numberDiff line change
@@ -119,8 +119,15 @@
119119
</property>
120120
</spacer>
121121
</item>
122-
<item alignment="Qt::AlignTop">
123-
<widget class="QComboBox" name="comboBoxSort"/>
122+
<item>
123+
<widget class="QComboBox" name="comboBoxSort">
124+
<property name="minimumSize">
125+
<size>
126+
<width>150</width>
127+
<height>0</height>
128+
</size>
129+
</property>
130+
</widget>
124131
</item>
125132
</layout>
126133
</widget>
@@ -156,124 +163,123 @@
156163
</property>
157164
</widget>
158165
</item>
159-
160166
<item>
161-
<widget class="QFrame" name="emptyContainer">
162-
<property name="minimumSize">
163-
<size>
164-
<width>0</width>
165-
<height>100</height>
166-
</size>
167-
</property>
168-
<property name="frameShape">
169-
<enum>QFrame::StyledPanel</enum>
170-
</property>
171-
<property name="frameShadow">
172-
<enum>QFrame::Raised</enum>
173-
</property>
174-
<layout class="QVBoxLayout" name="verticalLayout_7" stretch="1,8">
175-
<property name="spacing">
176-
<number>0</number>
167+
<widget class="QFrame" name="emptyContainer">
168+
<property name="minimumSize">
169+
<size>
170+
<width>0</width>
171+
<height>100</height>
172+
</size>
173+
</property>
174+
<property name="frameShape">
175+
<enum>QFrame::StyledPanel</enum>
176+
</property>
177+
<property name="frameShadow">
178+
<enum>QFrame::Raised</enum>
179+
</property>
180+
<layout class="QVBoxLayout" name="verticalLayout_7" stretch="1,8">
181+
<property name="spacing">
182+
<number>0</number>
183+
</property>
184+
<property name="leftMargin">
185+
<number>0</number>
186+
</property>
187+
<property name="topMargin">
188+
<number>0</number>
189+
</property>
190+
<property name="rightMargin">
191+
<number>0</number>
192+
</property>
193+
<property name="bottomMargin">
194+
<number>0</number>
195+
</property>
196+
<item>
197+
<spacer name="verticalSpacer">
198+
<property name="orientation">
199+
<enum>Qt::Vertical</enum>
177200
</property>
178-
<property name="leftMargin">
179-
<number>0</number>
201+
<property name="sizeHint" stdset="0">
202+
<size>
203+
<width>20</width>
204+
<height>20</height>
205+
</size>
180206
</property>
181-
<property name="topMargin">
182-
<number>0</number>
207+
</spacer>
208+
</item>
209+
<item alignment="Qt::AlignHCenter|Qt::AlignVCenter">
210+
<widget class="QFrame" name="emptyScreen">
211+
<property name="sizePolicy">
212+
<sizepolicy hsizetype="Expanding" vsizetype="Expanding">
213+
<horstretch>0</horstretch>
214+
<verstretch>0</verstretch>
215+
</sizepolicy>
183216
</property>
184-
<property name="rightMargin">
185-
<number>0</number>
217+
<property name="frameShape">
218+
<enum>QFrame::StyledPanel</enum>
186219
</property>
187-
<property name="bottomMargin">
188-
<number>0</number>
220+
<property name="frameShadow">
221+
<enum>QFrame::Raised</enum>
189222
</property>
190-
<item>
191-
<spacer name="verticalSpacer">
192-
<property name="orientation">
193-
<enum>Qt::Vertical</enum>
194-
</property>
195-
<property name="sizeHint" stdset="0">
196-
<size>
197-
<width>20</width>
198-
<height>20</height>
199-
</size>
200-
</property>
201-
</spacer>
202-
</item>
203-
<item alignment="Qt::AlignHCenter|Qt::AlignVCenter">
204-
<widget class="QFrame" name="emptyScreen">
205-
<property name="sizePolicy">
206-
<sizepolicy hsizetype="Expanding" vsizetype="Expanding">
207-
<horstretch>0</horstretch>
208-
<verstretch>0</verstretch>
209-
</sizepolicy>
210-
</property>
211-
<property name="frameShape">
212-
<enum>QFrame::StyledPanel</enum>
213-
</property>
214-
<property name="frameShadow">
215-
<enum>QFrame::Raised</enum>
216-
</property>
217-
<layout class="QVBoxLayout" name="verticalLayout">
218-
<property name="spacing">
219-
<number>30</number>
223+
<layout class="QVBoxLayout" name="verticalLayout">
224+
<property name="spacing">
225+
<number>30</number>
226+
</property>
227+
<property name="leftMargin">
228+
<number>0</number>
229+
</property>
230+
<property name="topMargin">
231+
<number>0</number>
232+
</property>
233+
<property name="rightMargin">
234+
<number>0</number>
235+
</property>
236+
<property name="bottomMargin">
237+
<number>0</number>
238+
</property>
239+
<item alignment="Qt::AlignHCenter|Qt::AlignVCenter">
240+
<widget class="QPushButton" name="pushImgEmpty">
241+
<property name="minimumSize">
242+
<size>
243+
<width>100</width>
244+
<height>100</height>
245+
</size>
220246
</property>
221-
<property name="leftMargin">
222-
<number>0</number>
247+
<property name="maximumSize">
248+
<size>
249+
<width>100</width>
250+
<height>100</height>
251+
</size>
223252
</property>
224-
<property name="topMargin">
225-
<number>0</number>
253+
<property name="text">
254+
<string/>
226255
</property>
227-
<property name="rightMargin">
228-
<number>0</number>
256+
<property name="iconSize">
257+
<size>
258+
<width>100</width>
259+
<height>100</height>
260+
</size>
229261
</property>
230-
<property name="bottomMargin">
231-
<number>0</number>
262+
</widget>
263+
</item>
264+
<item alignment="Qt::AlignHCenter|Qt::AlignVCenter">
265+
<widget class="QLabel" name="labelEmpty">
266+
<property name="styleSheet">
267+
<string notr="true"/>
232268
</property>
233-
<item alignment="Qt::AlignHCenter|Qt::AlignVCenter">
234-
<widget class="QPushButton" name="pushImgEmpty">
235-
<property name="minimumSize">
236-
<size>
237-
<width>100</width>
238-
<height>100</height>
239-
</size>
240-
</property>
241-
<property name="maximumSize">
242-
<size>
243-
<width>100</width>
244-
<height>100</height>
245-
</size>
246-
</property>
247-
<property name="text">
248-
<string/>
249-
</property>
250-
<property name="iconSize">
251-
<size>
252-
<width>100</width>
253-
<height>100</height>
254-
</size>
255-
</property>
256-
</widget>
257-
</item>
258-
<item alignment="Qt::AlignHCenter|Qt::AlignVCenter">
259-
<widget class="QLabel" name="labelEmpty">
260-
<property name="styleSheet">
261-
<string notr="true"/>
262-
</property>
263-
<property name="text">
264-
<string>No active Master Node yet</string>
265-
</property>
266-
<property name="alignment">
267-
<set>Qt::AlignCenter</set>
268-
</property>
269-
</widget>
270-
</item>
271-
</layout>
272-
</widget>
273-
</item>
274-
</layout>
275-
</widget>
276-
</item>
269+
<property name="text">
270+
<string>No active Master Node yet</string>
271+
</property>
272+
<property name="alignment">
273+
<set>Qt::AlignCenter</set>
274+
</property>
275+
</widget>
276+
</item>
277+
</layout>
278+
</widget>
279+
</item>
280+
</layout>
281+
</widget>
282+
</item>
277283
</layout>
278284
</widget>
279285
</item>

0 commit comments

Comments
 (0)