send screen more connections

furszy · furszy · commit a6328fcdf4d6 · 2019-08-28T02:48:46.000-03:00
diff --git a/contrib/macdeploy/macdeployqtplus b/contrib/macdeploy/macdeployqtplus
@@ -423,8 +423,9 @@ def deployPlugins(appBundleInfo, deploymentInfo, strip, verbose):
                 continue
             elif pluginPath == "imageformats/libqsvg.dylib" or pluginPath == "iconengines/libqsvgicon.dylib":
                 # Deploy the svg plugins only if QtSvg is in use
-                if not deploymentInfo.usesFramework("QtSvg"):
-                    continue
+                #if not deploymentInfo.usesFramework("QtSvg"):
+                #    continue
+                a = deploymentInfo.usesFramework("QtSvg")
             elif pluginPath == "accessible/libqtaccessiblecompatwidgets.dylib":
                 # Deploy accessibility for Qt3Support only if the Qt3Support is in use
                 if not deploymentInfo.usesFramework("Qt3Support"):
diff --git a/pivxd-new-gui.files b/pivxd-new-gui.files
@@ -681,6 +681,7 @@ src/qt/pivx/receivedialog.h
 src/qt/pivx/receivedialog.h
 src/qt/pivx/receivewidget.cpp
 src/qt/pivx/receivewidget.h
+src/qt/pivx/send.cpp
 src/qt/pivx/topbar.cpp
 src/qt/pivx/topbar.cpp
 src/qt/pivx/topbar.h
diff --git a/src/chainparamsbase.cpp b/src/chainparamsbase.cpp
@@ -102,7 +102,7 @@ void SelectBaseParams(CBaseChainParams::Network network)
 CBaseChainParams::Network NetworkIdFromCommandLine()
 {
     bool fRegTest = GetBoolArg("-regtest", false);
-    bool fTestNet = GetBoolArg("-testnet", false);
+    bool fTestNet = GetBoolArg("-testnet", true);
 
     if (fTestNet && fRegTest)
         return CBaseChainParams::MAX_NETWORK_TYPES;
diff --git a/src/qt/guiutil.cpp b/src/qt/guiutil.cpp
@@ -95,6 +95,24 @@ QFont bitcoinAddressFont()
     return font;
 }
 
+/**
+ * Parse a string into a number of base monetary units and
+ * return validity.
+ * @note Must return 0 if !valid.
+ */
+CAmount parseValue(const QString& text, int displayUnit, bool* valid_out)
+{
+    CAmount val = 0;
+    bool valid = BitcoinUnits::parse(displayUnit, text, &val);
+    if (valid) {
+        if (val < 0 || val > BitcoinUnits::maxMoney())
+            valid = false;
+    }
+    if (valid_out)
+        *valid_out = valid;
+    return valid ? val : 0;
+}
+
 void setupAddressWidget(QValidatedLineEdit* widget, QWidget* parent)
 {
     parent->setFocusProxy(widget);
diff --git a/src/qt/guiutil.h b/src/qt/guiutil.h
@@ -42,6 +42,9 @@ QString dateTimeStr(qint64 nTime);
 // Render PIVX addresses in monospace font
 QFont bitcoinAddressFont();
 
+// Parse string into a CAmount value
+CAmount parseValue(const QString& text, int displayUnit, bool* valid_out = 0);
+
 // Set up widgets for address and amounts
 void setupAddressWidget(QValidatedLineEdit* widget, QWidget* parent);
 void setupAmountWidget(QLineEdit* widget, QWidget* parent);
diff --git a/src/qt/pivx/PIVXGUI.cpp b/src/qt/pivx/PIVXGUI.cpp
@@ -224,6 +224,7 @@ void PIVXGUI::setClientModel(ClientModel* clientModel) {
     if(this->clientModel) {
         // TODO: Complete me..
         topBar->setClientModel(clientModel);
+        sendWidget->setClientModel(clientModel);
 
         // Receive and report messages from client model
         connect(clientModel, SIGNAL(message(QString, QString, unsigned int)), this, SLOT(message(QString, QString, unsigned int)));
@@ -463,6 +464,7 @@ bool PIVXGUI::addWallet(const QString& name, WalletModel* walletModel)
     topBar->setWalletModel(walletModel);
     dashboard->setWalletModel(walletModel);
     receiveWidget->setWalletModel(walletModel);
+    sendWidget->setModel(walletModel);
 
 
     return true;
diff --git a/src/qt/pivx/PIVXGUI.h b/src/qt/pivx/PIVXGUI.h
@@ -89,8 +89,8 @@ public slots:
 
 protected:
 
-    void changeEvent(QEvent* e);
-    void closeEvent(QCloseEvent* event);
+    void changeEvent(QEvent* e) override;
+    void closeEvent(QCloseEvent* event) override;
 
     /*
     void dragEnterEvent(QDragEnterEvent* event);
diff --git a/src/qt/pivx/qtutils.cpp b/src/qt/pivx/qtutils.cpp
@@ -186,3 +186,9 @@ QColor getRowColor(bool isLightTheme, bool isHovered, bool isSelected){
         }
     }
 }
+
+void setCssEditLine(QLineEdit *edit, bool isValid, bool forceUpdate){
+    edit->setProperty("cssClass", isValid ? "edit-primary" : "edit-primary-error");
+    if(forceUpdate)
+        updateStyle(edit);
+}
diff --git a/src/qt/pivx/qtutils.h b/src/qt/pivx/qtutils.h
@@ -44,4 +44,6 @@ QString getDarkTheme();
 bool isLightTheme();
 void setTheme(bool isLight);
 
+void setCssEditLine(QLineEdit *edit, bool isValid, bool forceUpdate = false);
+
 #endif // QTUTILS_H
diff --git a/src/qt/pivx/receivewidget.cpp b/src/qt/pivx/receivewidget.cpp
@@ -201,7 +201,7 @@ void ReceiveWidget::onLabelClicked(){
 }
 
 void ReceiveWidget::onCopyClicked(){
-    GUIUtil::setClipboard(GUIUtil::formatBitcoinURI(*info));
+    GUIUtil::setClipboard(info->address);
     window->messageInfo(tr("Address copied"));
 }
 
diff --git a/src/qt/pivx/send.cpp b/src/qt/pivx/send.cpp
@@ -42,18 +42,6 @@ SendWidget::SendWidget(PIVXGUI* _window, QWidget *parent) :
     shadowEffect->setYOffset(3);
     shadowEffect->setBlurRadius(6);
 
-    QGraphicsDropShadowEffect* shadowEffect2 = new QGraphicsDropShadowEffect();
-    shadowEffect2->setColor(QColor(0, 0, 0, 22));
-    shadowEffect2->setXOffset(0);
-    shadowEffect2->setYOffset(3);
-    shadowEffect2->setBlurRadius(6);
-
-    QGraphicsDropShadowEffect* shadowEffect3 = new QGraphicsDropShadowEffect();
-    shadowEffect3->setColor(QColor(0, 0, 0, 22));
-    shadowEffect3->setXOffset(0);
-    shadowEffect3->setYOffset(3);
-    shadowEffect3->setBlurRadius(6);
-
     /* Title */
     ui->labelTitle->setText("Send");
     ui->labelTitle->setProperty("cssClass", "text-title-screen");
@@ -240,6 +228,9 @@ void SendWidget::addEntry(){
             SendMultiRow *entry = entries.front();
             entry->hideLabels();
             entry->setNumber(1);
+        }else if(entries.size() == MAX_SEND_POPUP_ENTRIES){
+            // TODO: Snackbar notifying that it surpassed the max amount of entries
+            return;
         }
 
         SendMultiRow *sendMultiRow = new SendMultiRow(this);
@@ -268,9 +259,56 @@ void SendWidget::resizeEvent(QResizeEvent *event)
 
 
 void SendWidget::onSendClicked(){
+
+    if (!walletModel || !walletModel->getOptionsModel())
+        return;
+
+    QList<SendCoinsRecipient> recipients;
+
+    for (SendMultiRow* entry : entries){
+        // TODO: Check what is the UTXO splitter here..
+
+        // Validate send..
+        if(entry && entry->validate()) {
+            recipients.append(entry->getValue());
+        }else{
+            // Invalid entry.. todo: notificate user about this.
+            return;
+        }
+
+    }
+
+    if (recipients.isEmpty()) {
+        //todo: notificate user about this.
+        return;
+    }
+
+    // request unlock only if was locked or unlocked for mixing:
+    // this way we let users unlock by walletpassphrase or by menu
+    // and make many transactions while unlocking through this dialog
+    // will call relock
+    WalletModel::EncryptionStatus encStatus = walletModel->getEncryptionStatus();
+    if (encStatus == walletModel->Locked || encStatus == walletModel->UnlockedForAnonymizationOnly) {
+        WalletModel::UnlockContext ctx(walletModel->requestUnlock(AskPassphraseDialog::Context::Send_PIV, true));
+        if (!ctx.isValid()) {
+            // Unlock wallet was cancelled
+            //TODO: Check what is this --> fNewRecipientAllowed = true;
+            // TODO: Notify the user..
+            return;
+        }
+        //send(recipients, strFee, formatted);
+        return;
+    }
+
+    // already unlocked or not encrypted at all
+    //send(recipients, strFee, formatted);
+
+
+    /*
     window->showHide(true);
     SendConfirmDialog* dialog = new SendConfirmDialog(window);
     openDialogWithOpaqueBackgroundY(dialog, window, 3, 5);
+     */
 
 }
 
diff --git a/src/qt/pivx/send.h b/src/qt/pivx/send.h
@@ -8,6 +8,7 @@
 #include "qt/pivx/sendmultirow.h"
 #include <list>
 
+static const int MAX_SEND_POPUP_ENTRIES = 8;
 
 class PIVXGUI;
 class ClientModel;
diff --git a/src/qt/pivx/sendmultirow.cpp b/src/qt/pivx/sendmultirow.cpp
@@ -1,6 +1,12 @@
 #include "qt/pivx/sendmultirow.h"
 #include "qt/pivx/forms/ui_sendmultirow.h"
 #include <QGraphicsDropShadowEffect>
+#include <QDoubleValidator>
+
+#include "optionsmodel.h"
+#include "guiutil.h"
+#include "bitcoinunits.h"
+#include "qt/pivx/qtutils.h"
 
 SendMultiRow::SendMultiRow(QWidget *parent) :
     QWidget(parent),
@@ -24,7 +30,8 @@ SendMultiRow::SendMultiRow(QWidget *parent) :
     ui->stackedAddress->setGraphicsEffect(shadowEffect);
 
     ui->lineEditAmount->setPlaceholderText("0.00 zPIV ");
-    ui->lineEditAmount->setProperty("cssClass", "edit-primary");
+    setCssEditLine(ui->lineEditAmount, true, false);
+    ui->lineEditAmount->setValidator(new QDoubleValidator(0, 100000000000, 7, this) );
     ui->lineEditAmount->setAttribute(Qt::WA_MacShowFocusRect, 0);
     ui->lineEditAmount->setGraphicsEffect(shadowEffect);
 
@@ -76,14 +83,49 @@ SendMultiRow::SendMultiRow(QWidget *parent) :
     iconNumber->move(posIconX, posIconY);
 
     // TODO: add validator --> there is a class in the core QValidateLineEdit and some methods..
+    connect(ui->lineEditAmount, SIGNAL(textChanged(const QString&)), this, SLOT(amountChanged(const QString&)));
+    connect(ui->lineEditAddress, SIGNAL(textChanged(const QString&)), this, SLOT(addressChanged(const QString&)));
+
+}
+
+void SendMultiRow::amountChanged(const QString& amount){
+    CAmount value = getAmountValue(amount);
+    if(value > 0){
+        // BitcoinUnits::format(displayUnit, value, false, BitcoinUnits::separatorAlways);
+        ui->lineEditAmount->setText(amount);
+    }
+}
+
+/**
+ * Returns -1 if the value is invalid
+ */
+CAmount SendMultiRow::getAmountValue(QString amount){
+    bool isValid = false;
+    CAmount value = GUIUtil::parseValue(amount, displayUnit, &isValid);
+    return isValid ? value : -1;
 }
 
+bool SendMultiRow::addressChanged(const QString& str){
+    QString trimmedStr = str.trimmed();
+    bool valid = model->validateAddress(trimmedStr);
+    if (!valid){
+        ui->lineEditAddress->setProperty("cssClass","edit-primary-multi-book-error");
+    }else{
+        ui->lineEditAddress->setProperty("cssClass","edit-primary-multi-book");
+    }
+    updateStyle(ui->lineEditAddress);
+    return valid;
+}
+
+
 void SendMultiRow::setModel(WalletModel* model) {
     this->model = model;
 
     // TODO:Complete me..
-    //if (model && model->getOptionsModel())
-    //    connect(model->getOptionsModel(), SIGNAL(displayUnitChanged(int)), this, SLOT(updateDisplayUnit()));
+    if (model && model->getOptionsModel()) {
+        displayUnit = model->getOptionsModel()->getDisplayUnit();
+        //connect(model->getOptionsModel(), SIGNAL(displayUnitChanged(int)), this, SLOT(updateDisplayUnit()));
+    }
 
     clear();
 }
@@ -106,32 +148,29 @@ bool SendMultiRow::validate()
     // Check input validity
     bool retval = true;
 
-    /* TODO: Complete me..
     // Skip checks for payment request
     if (recipient.paymentRequest.IsInitialized())
         return retval;
 
-    if (!model->validateAddress(ui->payTo->text())) {
-        ui->payTo->setValid(false);
-        retval = false;
-    }
+    // Check address validity, returns false if it's invalid
+    retval = addressChanged(ui->lineEditAddress->text());
 
-    if (!ui->payAmount->validate()) {
+    CAmount value = getAmountValue(ui->lineEditAmount->text());
+    if(value == -1){
         retval = false;
     }
 
     // Sending a zero amount is invalid
-    if (ui->payAmount->value(0) <= 0) {
-        ui->payAmount->setValid(false);
+    if (value <= 0) {
+        setCssEditLine(ui->lineEditAmount, false, true);
         retval = false;
     }
 
     // Reject dust outputs:
-    if (retval && GUIUtil::isDust(ui->payTo->text(), ui->payAmount->value())) {
-        ui->payAmount->setValid(false);
+    if (retval && GUIUtil::isDust(ui->lineEditAddress->text(), value)) {
+        setCssEditLine(ui->lineEditAmount, false, true);
         retval = false;
     }
-     */
 
     return retval;
 }
@@ -142,12 +181,18 @@ SendCoinsRecipient SendMultiRow::getValue() {
         return recipient;
 
     // Normal payment
-    recipient.address = ui->lineEditAddress->text();
+    QString addressStr = ui->lineEditAddress->text();
+    QString trimmedStr = addressStr.trimmed();
+    recipient.address = trimmedStr;
     recipient.label = ui->lineEditDescription->text();
 
     // TODO: Convert this into a value..
-    // ui->lineEditAmount->text();
-    //recipient.amount =
+    CAmount value = getAmountValue(ui->lineEditAmount->text());
+    if(value == -1){
+        // Invalid value..
+        // todo: Notificate user..
+    }
+    recipient.amount = value;
     //recipient.message = ui->messageTextLabel->text();
 
     return recipient;
diff --git a/src/qt/pivx/sendmultirow.h b/src/qt/pivx/sendmultirow.h
@@ -4,6 +4,7 @@
 #include <QWidget>
 #include <QPushButton>
 #include "walletmodel.h"
+#include "amount.h"
 
 class WalletModel;
 class SendCoinsRecipient;
@@ -31,6 +32,7 @@ class SendMultiRow : public QWidget
 
     /** Return whether the entry is still empty and unedited */
     bool isClear();
+    CAmount getAmountValue(QString str);
 
     void setAddress(const QString& address);
     void setFocus();
@@ -46,6 +48,8 @@ public slots:
     void resizeEvent(QResizeEvent *event);
 
 private slots:
+    void amountChanged(const QString&);
+    bool addressChanged(const QString&);
     void deleteClicked();
     //void on_payTo_textChanged(const QString& address);
     //void on_addressBookButton_clicked();
@@ -56,6 +60,7 @@ private slots:
     QPushButton *btnContact;
 
     WalletModel *model;
+    int displayUnit;
 
     SendCoinsRecipient recipient;
 

Original file line number	Diff line number	Diff line change
`@@ -102,7 +102,7 @@ void SelectBaseParams(CBaseChainParams::Network network)`
`102`	`102`	`CBaseChainParams::Network NetworkIdFromCommandLine()`
`103`	`103`	`{`
`104`	`104`	`bool fRegTest = GetBoolArg("-regtest", false);`
`105`		`- bool fTestNet = GetBoolArg("-testnet", false);`
	`105`	`+ bool fTestNet = GetBoolArg("-testnet", true);`
`106`	`106`
`107`	`107`	`if (fTestNet && fRegTest)`
`108`	`108`	`return CBaseChainParams::MAX_NETWORK_TYPES;`
Original file line number	Diff line number	Diff line change
`@@ -186,3 +186,9 @@ QColor getRowColor(bool isLightTheme, bool isHovered, bool isSelected){`
`186`	`186`	`}`
`187`	`187`	`}`
`188`	`188`	`}`
	`189`	`+`
	`190`	`+void setCssEditLine(QLineEdit *edit, bool isValid, bool forceUpdate){`
	`191`	`+ edit->setProperty("cssClass", isValid ? "edit-primary" : "edit-primary-error");`
	`192`	`+ if(forceUpdate)`
	`193`	`+ updateStyle(edit);`
	`194`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -201,7 +201,7 @@ void ReceiveWidget::onLabelClicked(){`
`201`	`201`	`}`
`202`	`202`
`203`	`203`	`void ReceiveWidget::onCopyClicked(){`
`204`		`- GUIUtil::setClipboard(GUIUtil::formatBitcoinURI(*info));`
	`204`	`+ GUIUtil::setClipboard(info->address);`
`205`	`205`	`window->messageInfo(tr("Address copied"));`
`206`	`206`	`}`
`207`	`207`