Skip to content

Commit a85ccb5

Browse files
furszyfurszy
committed
send screen + dependencies
1 parent 412185b commit a85ccb5

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

45 files changed

+4988
-20
lines changed

‎src/Makefile.qt.include‎

Lines changed: 58 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,19 @@ QT_FORMS_UI = \
7474
qt/pivx/forms/topbar.ui \
7575
qt/pivx/forms/txdetaildialog.ui \
7676
qt/pivx/forms/txrow.ui \
77-
qt/pivx/forms/dashboardwidget.ui
77+
qt/pivx/forms/dashboardwidget.ui \
78+
qt/pivx/forms/coincontrolpivwidget.ui \
79+
qt/pivx/forms/coincontrolzpivdialog.ui \
80+
qt/pivx/forms/addresslabelrow.ui \
81+
qt/pivx/forms/contactdropdownrow.ui \
82+
qt/pivx/forms/optionbutton.ui \
83+
qt/pivx/forms/myaddressrow.ui \
84+
qt/pivx/forms/sendchangeaddressdialog.ui \
85+
qt/pivx/forms/sendconfirmdialog.ui \
86+
qt/pivx/forms/sendcustomfeedialog.ui \
87+
qt/pivx/forms/sendchangeaddressdialog.ui \
88+
qt/pivx/forms/sendmultirow.ui \
89+
qt/pivx/forms/send.ui
7890

7991
QT_MOC_CPP = \
8092
qt/moc_addressbookpage.cpp \
@@ -140,7 +152,20 @@ QT_MOC_CPP = \
140152
qt/pivx/moc_topbar.cpp \
141153
qt/pivx/moc_txdetaildialog.cpp \
142154
qt/pivx/moc_txrow.cpp \
143-
qt/pivx/moc_dashboardwidget.cpp
155+
qt/pivx/moc_dashboardwidget.cpp \
156+
qt/pivx/moc_coincontrolpivwidget.cpp \
157+
qt/pivx/moc_coincontrolzpivdialog.cpp \
158+
qt/pivx/moc_addresslabelrow.cpp \
159+
qt/pivx/moc_contactdropdownrow.cpp \
160+
qt/pivx/moc_optionbutton.cpp \
161+
qt/pivx/moc_myaddressrow.cpp \
162+
qt/pivx/moc_contactsdropdown.cpp \
163+
qt/pivx/moc_sendchangeaddressdialog.cpp \
164+
qt/pivx/moc_sendconfirmdialog.cpp \
165+
qt/pivx/moc_sendcustomfeedialog.cpp \
166+
qt/pivx/moc_sendchangeaddressdialog.cpp \
167+
qt/pivx/moc_sendmultirow.cpp \
168+
qt/pivx/moc_send.cpp
144169

145170
BITCOIN_MM = \
146171
qt/macdockiconhandler.mm \
@@ -236,7 +261,20 @@ BITCOIN_QT_H = \
236261
qt/pivx/topbar.h \
237262
qt/pivx/txdetaildialog.h \
238263
qt/pivx/txrow.h \
239-
qt/pivx/dashboardwidget.h
264+
qt/pivx/dashboardwidget.h \
265+
qt/pivx/coincontrolpivwidget.h \
266+
qt/pivx/coincontrolzpivdialog.h \
267+
qt/pivx/addresslabelrow.h \
268+
qt/pivx/contactdropdownrow.h \
269+
qt/pivx/optionbutton.h \
270+
qt/pivx/myaddressrow.h \
271+
qt/pivx/contactsdropdown.h \
272+
qt/pivx/sendchangeaddressdialog.h \
273+
qt/pivx/sendconfirmdialog.h \
274+
qt/pivx/sendcustomfeedialog.h \
275+
qt/pivx/sendchangeaddressdialog.h \
276+
qt/pivx/sendmultirow.h \
277+
qt/pivx/send.h
240278

241279
RES_ICONS = \
242280
qt/res/icons/add.png \
@@ -525,7 +563,23 @@ BITCOIN_QT_WALLET_CPP = \
525563
qt/pivx/topbar.cpp \
526564
qt/pivx/txdetaildialog.cpp \
527565
qt/pivx/txrow.cpp \
528-
qt/pivx/dashboardwidget.cpp
566+
qt/pivx/dashboardwidget.cpp \
567+
qt/pivx/coincontrolpivwidget.cpp \
568+
qt/pivx/coincontrolzpivdialog.cpp \
569+
qt/pivx/addresslabelrow.cpp \
570+
qt/pivx/contactdropdownrow.cpp \
571+
qt/pivx/contactsdropdown.cpp \
572+
qt/pivx/optionbutton.cpp \
573+
qt/pivx/myaddressrow.cpp \
574+
qt/pivx/sendchangeaddressdialog.cpp \
575+
qt/pivx/sendconfirmdialog.cpp \
576+
qt/pivx/sendcustomfeedialog.cpp \
577+
qt/pivx/sendchangeaddressdialog.cpp \
578+
qt/pivx/sendmultirow.cpp \
579+
qt/pivx/send.cpp
580+
581+
582+
529583

530584
BITCOIN_QT_CPP = $(BITCOIN_QT_BASE_CPP)
531585
if TARGET_WINDOWS

‎src/qt/pivx/PIVXGUI.cpp‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -101,9 +101,11 @@ PIVXGUI::PIVXGUI(const NetworkStyle* networkStyle, QWidget* parent) :
101101

102102
// Init
103103
dashboard = new DashboardWidget(this, this);
104+
sendWidget = new SendWidget(this, this);
104105

105106
// Add to parent
106107
stackedContainer->addWidget(dashboard);
108+
stackedContainer->addWidget(sendWidget);
107109
stackedContainer->setCurrentWidget(dashboard);
108110

109111
} else
@@ -149,7 +151,11 @@ void PIVXGUI::setClientModel(ClientModel* clientModel) {
149151
}
150152

151153
void PIVXGUI::goToDashboard() {
154+
stackedContainer->setCurrentWidget(dashboard);
155+
}
152156

157+
void PIVXGUI::goToSend() {
158+
stackedContainer->setCurrentWidget(sendWidget);
153159
}
154160

155161

‎src/qt/pivx/PIVXGUI.h‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
#include "qt/pivx/navmenuwidget.h"
1717
#include "qt/pivx/topbar.h"
1818
#include "qt/pivx/dashboardwidget.h"
19+
#include "qt/pivx/send.h"
1920

2021

2122
class ClientModel;
@@ -45,6 +46,7 @@ class PIVXGUI : public QMainWindow
4546

4647
//
4748
void goToDashboard();
49+
void goToSend();
4850

4951
#ifdef ENABLE_WALLET
5052
/** Set the wallet model.
@@ -86,6 +88,7 @@ class PIVXGUI : public QMainWindow
8688
QStackedWidget *stackedContainer;
8789

8890
DashboardWidget *dashboard;
91+
SendWidget *sendWidget;
8992

9093

9194
//
@@ -99,7 +102,6 @@ class PIVXGUI : public QMainWindow
99102
void receivedURI(const QString& uri);
100103
/** Restart handling */
101104
void requestedRestart(QStringList args);
102-
103105
};
104106

105107

‎src/qt/pivx/addresslabelrow.cpp‎

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
#include "qt/pivx/addresslabelrow.h"
2+
#include "qt/pivx/forms/ui_addresslabelrow.h"
3+
#include "QFile"
4+
5+
AddressLabelRow::AddressLabelRow(bool isLightTheme, bool isHover , QWidget *parent) :
6+
QWidget(parent),
7+
ui(new Ui::AddressLabelRow)
8+
{
9+
ui->setupUi(this);
10+
11+
ui->lblAddress->setProperty("cssClass", "text-list-body1");
12+
ui->lblLabel->setProperty("cssClass", "text-list-title1");
13+
14+
if(isLightTheme)
15+
ui->lblDivisory->setStyleSheet("background-color:#bababa");
16+
else
17+
ui->lblDivisory->setStyleSheet("background-color:#40ffffff");
18+
19+
ui->btnMenu->setVisible(isHover);
20+
}
21+
22+
void AddressLabelRow::enterEvent(QEvent *) {
23+
ui->btnMenu->setVisible(true);
24+
update();
25+
}
26+
27+
void AddressLabelRow::leaveEvent(QEvent *) {
28+
ui->btnMenu->setVisible(false);
29+
update();
30+
}
31+
32+
AddressLabelRow::~AddressLabelRow()
33+
{
34+
delete ui;
35+
}

‎src/qt/pivx/addresslabelrow.h‎

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
#ifndef ADDRESSLABELROW_H
2+
#define ADDRESSLABELROW_H
3+
4+
#include <QWidget>
5+
6+
namespace Ui {
7+
class AddressLabelRow;
8+
}
9+
10+
class AddressLabelRow : public QWidget
11+
{
12+
Q_OBJECT
13+
14+
public:
15+
explicit AddressLabelRow(bool isLightTheme, bool isHover , QWidget *parent = nullptr);
16+
~AddressLabelRow();
17+
18+
protected:
19+
virtual void enterEvent(QEvent *);
20+
virtual void leaveEvent(QEvent *);
21+
22+
private:
23+
Ui::AddressLabelRow *ui;
24+
};
25+
26+
#endif // ADDRESSLABELROW_H

‎src/qt/pivx/coincontrolpivwidget.cpp‎

Lines changed: 85 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,85 @@
1+
#include "qt/pivx/coincontrolpivwidget.h"
2+
#include "qt/pivx/forms/ui_coincontrolpivwidget.h"
3+
4+
CoinControlPivWidget::CoinControlPivWidget(QWidget *parent) :
5+
QDialog(parent),
6+
ui(new Ui::CoinControlPivWidget)
7+
{
8+
ui->setupUi(this);
9+
10+
// Stylesheet
11+
this->setStyleSheet(parent->styleSheet());
12+
13+
// Container
14+
15+
ui->frameContainer->setProperty("cssClass", "container-dialog");
16+
ui->layoutAmount->setProperty("cssClass", "container-border-purple");
17+
ui->layoutAfter->setProperty("cssClass", "container-border-purple");
18+
ui->layoutBytes->setProperty("cssClass", "container-border-purple");
19+
ui->layoutChange->setProperty("cssClass", "container-border-purple");
20+
ui->layoutDust->setProperty("cssClass", "container-border-purple");
21+
ui->layoutFee->setProperty("cssClass", "container-border-purple");
22+
ui->layoutQuantity->setProperty("cssClass", "container-border-purple");
23+
24+
// Title
25+
26+
ui->labelTitle->setText("Select PIV Denominations to Spend");
27+
ui->labelTitle->setProperty("cssClass", "text-title-dialog");
28+
29+
// Label Style
30+
31+
ui->labelTitleAfter->setProperty("cssClass", "text-main-purple");
32+
ui->labelTitleAmount->setProperty("cssClass", "text-main-purple");
33+
ui->labelTitleAmount->setText("PIV");
34+
ui->labelTitleBytes->setProperty("cssClass", "text-main-purple");
35+
ui->labelTitleBytes->setProperty("cssClass", "text-main-purple");
36+
ui->labelTitleChange->setProperty("cssClass", "text-main-purple");
37+
ui->labelTitleType->setProperty("cssClass", "text-main-purple");
38+
ui->labelTitleConfirmations->setProperty("cssClass", "text-main-purple");
39+
ui->labelTitleDenom->setProperty("cssClass", "text-main-purple");
40+
ui->labelTitleDust->setProperty("cssClass", "text-main-purple");
41+
ui->labelTitleFee->setProperty("cssClass", "text-main-purple");
42+
ui->labelTitleId->setProperty("cssClass", "text-main-purple");
43+
ui->labelTitleQuantity->setProperty("cssClass", "text-main-purple");
44+
ui->labelTitleQuantity->setText("Quantity");
45+
ui->labelTitleSpen->setProperty("cssClass", "text-main-purple");
46+
ui->labelTitleVersion->setProperty("cssClass", "text-main-purple");
47+
48+
ui->labelValueAfter->setProperty("cssClass", "text-main-purple");
49+
ui->labelValueAmount->setProperty("cssClass", "text-main-purple");
50+
ui->labelValueBytes->setProperty("cssClass", "text-main-purple");
51+
ui->labelValueDust->setProperty("cssClass", "text-main-purple");
52+
ui->labelValueChange->setProperty("cssClass", "text-main-purple");
53+
ui->labelValueFee->setProperty("cssClass", "text-main-purple");
54+
ui->labelValueQuantity->setProperty("cssClass", "text-main-purple");
55+
56+
57+
// Values
58+
59+
ui->labelValueAfter->setText("0.00 PIV");
60+
ui->labelValueAmount->setText("0");
61+
ui->labelValueBytes->setText("0");
62+
ui->labelValueDust->setText("No");
63+
ui->labelValueChange->setText("0.00 PIV");
64+
ui->labelValueFee->setText("0.00 PIV");
65+
ui->labelValueQuantity->setText("0");
66+
67+
// Buttons
68+
69+
70+
ui->btnEsc->setText("");
71+
ui->btnEsc->setProperty("cssClass", "ic-close");
72+
73+
ui->btnCancel->setProperty("cssClass", "btn-dialog-cancel");
74+
ui->btnSave->setText("SAVE");
75+
ui->btnSave->setProperty("cssClass", "btn-primary");
76+
77+
connect(ui->btnEsc, SIGNAL(clicked()), this, SLOT(close()));
78+
connect(ui->btnCancel, SIGNAL(clicked()), this, SLOT(close()));
79+
80+
}
81+
82+
CoinControlPivWidget::~CoinControlPivWidget()
83+
{
84+
delete ui;
85+
}

‎src/qt/pivx/coincontrolpivwidget.h‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
#ifndef COINCONTROLPIVWIDGET_H
2+
#define COINCONTROLPIVWIDGET_H
3+
4+
#include <QDialog>
5+
6+
namespace Ui {
7+
class CoinControlPivWidget;
8+
}
9+
10+
class CoinControlPivWidget : public QDialog
11+
{
12+
Q_OBJECT
13+
14+
public:
15+
explicit CoinControlPivWidget(QWidget *parent = nullptr);
16+
~CoinControlPivWidget();
17+
18+
private:
19+
Ui::CoinControlPivWidget *ui;
20+
};
21+
22+
#endif // COINCONTROLPIVWIDGET_H

‎src/qt/pivx/coincontrolzpivdialog.cpp‎

Lines changed: 60 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,60 @@
1+
#include "qt/pivx/coincontrolzpivdialog.h"
2+
#include "qt/pivx/forms/ui_coincontrolzpivdialog.h"
3+
4+
CoinControlZpivDialog::CoinControlZpivDialog(QWidget *parent) :
5+
QDialog(parent),
6+
ui(new Ui::CoinControlZpivDialog)
7+
{
8+
ui->setupUi(this);
9+
10+
// Stylesheet
11+
this->setStyleSheet(parent->styleSheet());
12+
13+
// Container
14+
15+
ui->frameContainer->setProperty("cssClass", "container-dialog");
16+
ui->layoutAmount->setProperty("cssClass", "container-border-purple");
17+
ui->layoutQuantity->setProperty("cssClass", "container-border-purple");
18+
19+
// Title
20+
21+
ui->labelTitle->setText("Select PIV Denominations to Spend");
22+
ui->labelTitle->setProperty("cssClass", "text-title-dialog");
23+
24+
// Label Style
25+
26+
ui->labelTitleAmount->setProperty("cssClass", "text-main-purple");
27+
ui->labelTitleConfirmations->setProperty("cssClass", "text-main-purple");
28+
ui->labelTitleDenom->setProperty("cssClass", "text-main-purple");
29+
ui->labelTitleId->setProperty("cssClass", "text-main-purple");
30+
ui->labelTitleQuantity->setProperty("cssClass", "text-main-purple");
31+
ui->labelTitleSpen->setProperty("cssClass", "text-main-purple");
32+
ui->labelTitleVersion->setProperty("cssClass", "text-main-purple");
33+
34+
ui->labelValueAmount->setProperty("cssClass", "text-main-purple");
35+
ui->labelValueQuantity->setProperty("cssClass", "text-main-purple");
36+
37+
38+
// Values
39+
40+
ui->labelValueAmount->setText("0");
41+
ui->labelValueQuantity->setText("0");
42+
43+
// Buttons
44+
45+
46+
ui->btnEsc->setText("");
47+
ui->btnEsc->setProperty("cssClass", "ic-close");
48+
49+
ui->btnCancel->setProperty("cssClass", "btn-dialog-cancel");
50+
ui->btnSave->setText("SAVE");
51+
ui->btnSave->setProperty("cssClass", "btn-primary");
52+
53+
connect(ui->btnEsc, SIGNAL(clicked()), this, SLOT(close()));
54+
connect(ui->btnCancel, SIGNAL(clicked()), this, SLOT(close()));
55+
}
56+
57+
CoinControlZpivDialog::~CoinControlZpivDialog()
58+
{
59+
delete ui;
60+
}

0 commit comments

Comments
 (0)