send multi outputs, tooltip menu + delete row connected.

furszy · furszy · commit 4cec67e2f2d6 · 2019-08-28T02:49:05.000-03:00
diff --git a/src/qt/pivx/addresseswidget.h b/src/qt/pivx/addresseswidget.h
@@ -3,7 +3,7 @@
 
 #include "qt/pivx/pwidget.h"
 #include "addresstablemodel.h"
-#include "tooltipmenu.h"
+#include "qt/pivx/tooltipmenu.h"
 #include "furabstractlistitemdelegate.h"
 #include "qt/pivx/AddressFilterProxyModel.h"
 
diff --git a/src/qt/pivx/send.cpp b/src/qt/pivx/send.cpp
@@ -238,6 +238,7 @@ SendMultiRow* SendWidget::createEntry(){
     entries.append(sendMultiRow);
     ui->scrollAreaWidgetContents->layout()->addWidget(sendMultiRow);
     connect(sendMultiRow, &SendMultiRow::onContactsClicked, this, &SendWidget::onContactsClicked);
+    connect(sendMultiRow, &SendMultiRow::onMenuClicked, this, &SendWidget::onMenuClicked);
     return sendMultiRow;
 }
 
@@ -598,6 +599,9 @@ void SendWidget::onPIVSelected(bool _isPIV){
 
 void SendWidget::onContactsClicked(SendMultiRow* entry){
     focusedEntry = entry;
+    if(menu && menu->isVisible()){
+        menu->hide();
+    }
     int height = entry->getEditHeight() * 8;
     int width = entry->getEditWidth();
 
@@ -639,6 +643,55 @@ void SendWidget::onContactsClicked(SendMultiRow* entry){
     menuContacts->show();
 }
 
+void SendWidget::onMenuClicked(SendMultiRow* entry){
+    focusedEntry = entry;
+    if(menuContacts && menuContacts->isVisible()){
+        menuContacts->hide();
+    }
+    QPoint pos = entry->pos();
+    pos.setX(pos.x() + (entry->width() - entry->getMenuBtnWidth()));
+    pos.setY(pos.y() + entry->height() + (entry->getMenuBtnWidth()));
+
+    if(!this->menu){
+        this->menu = new TooltipMenu(window, this);
+        this->menu->setCopyBtnVisible(false);
+        this->menu->setEditBtnText(tr("Contacts"));
+        this->menu->adjustSize();
+        connect(this->menu, &TooltipMenu::message, this, &AddressesWidget::message);
+        connect(this->menu, SIGNAL(onEditClicked()), this, SLOT(onContactMultiClicked()));
+        connect(this->menu, SIGNAL(onDeleteClicked()), this, SLOT(onDeleteClicked()));
+    }else {
+        this->menu->hide();
+    }
+    menu->move(pos);
+    menu->show();
+}
+
+void SendWidget::onContactMultiClicked(){
+    // show the contacts dialog.
+}
+
+void SendWidget::onDeleteClicked(){
+    if (focusedEntry) {
+        focusedEntry->hide();
+        focusedEntry->deleteLater();
+        int entryNumber = focusedEntry->getNumber();
+
+        // Refresh amount total + rest of rows numbers.
+        QMutableListIterator<SendMultiRow*> it(entries);
+        while (it.hasNext()) {
+            SendMultiRow* entry = it.next();
+            if (focusedEntry == entry){
+                it.remove();
+            } else if (focusedEntry && entry->getNumber() > entryNumber){
+                entry->setNumber(entry->getNumber() - 1);
+            }
+        }
+
+        focusedEntry = nullptr;
+    }
+}
+
 void SendWidget::resizeMenu(){
     if(menuContacts && menuContacts->isVisible() && focusedEntry){
         int width = focusedEntry->getEditWidth();
diff --git a/src/qt/pivx/send.h b/src/qt/pivx/send.h
@@ -10,6 +10,7 @@
 #include "walletmodel.h"
 #include "coincontroldialog.h"
 #include "zpivcontroldialog.h"
+#include "qt/pivx/tooltipmenu.h"
 
 static const int MAX_SEND_POPUP_ENTRIES = 8;
 
@@ -54,10 +55,13 @@ private slots:
     void onSendClicked();
     void changeTheme(bool isLightTheme, QString& theme);
     void onContactsClicked(SendMultiRow* entry);
+    void onMenuClicked(SendMultiRow* entry);
     void onAddEntryClicked();
     void clearEntries();
     void clearAll();
     void refreshView();
+    void onContactMultiClicked();
+    void onDeleteClicked();
 private:
     Ui::send *ui;
     QPushButton *coinIcon;
@@ -67,7 +71,8 @@ private slots:
     CoinControlDialog *coinControlDialog = nullptr;
 
     ContactsDropdown *menuContacts = nullptr;
-    SendMultiRow *sendMultiRow;
+    TooltipMenu *menu = nullptr;
+    SendMultiRow *sendMultiRow = nullptr;
     // Current focus entry
     SendMultiRow* focusedEntry = nullptr;
 
diff --git a/src/qt/pivx/sendmultirow.cpp b/src/qt/pivx/sendmultirow.cpp
@@ -22,7 +22,7 @@ SendMultiRow::SendMultiRow(QWidget *parent) :
     ui->lineEditAddress->setAttribute(Qt::WA_MacShowFocusRect, 0);
     setShadow(ui->stackedAddress);
 
-    ui->lineEditAmount->setPlaceholderText("0.00 zPIV ");
+    ui->lineEditAmount->setPlaceholderText("0.00 PIV ");
     initCssEditLine(ui->lineEditAmount);
     ui->lineEditAmount->setValidator(new QDoubleValidator(0, 100000000000, 7, this) );
 
@@ -35,6 +35,7 @@ SendMultiRow::SendMultiRow(QWidget *parent) :
 
     // Button menu
     ui->btnMenu->setProperty("cssClass", "btn-menu");
+    ui->btnMenu->setVisible(false);
 
     // Button Contact
     btnContact = ui->lineEditAddress->addAction(QIcon("://ic-contact-arrow-down"), QLineEdit::TrailingPosition);
@@ -60,14 +61,13 @@ SendMultiRow::SendMultiRow(QWidget *parent) :
     connect(ui->lineEditAmount, SIGNAL(textChanged(const QString&)), this, SLOT(amountChanged(const QString&)));
     connect(ui->lineEditAddress, SIGNAL(textChanged(const QString&)), this, SLOT(addressChanged(const QString&)));
     connect(btnContact, &QAction::triggered, [this](){emit onContactsClicked(this);});
-
+    connect(ui->btnMenu, &QPushButton::clicked, [this](){emit onMenuClicked(this);});
 }
 
 void SendMultiRow::amountChanged(const QString& amount){
     if(!amount.isEmpty()) {
         CAmount value = getAmountValue(amount);
         if (value > 0) {
-            // BitcoinUnits::format(displayUnit, value, false, BitcoinUnits::separatorAlways);
             ui->lineEditAmount->setText(amount);
         }
     }
@@ -175,8 +175,6 @@ SendCoinsRecipient SendMultiRow::getValue() {
         // todo: Notificate user..
     }
     recipient.amount = value;
-    //recipient.message = ui->messageTextLabel->text();
-
     return recipient;
 }
 
@@ -233,6 +231,24 @@ void SendMultiRow::resizeEvent(QResizeEvent *event) {
     QWidget::resizeEvent(event);
 }
 
+void SendMultiRow::enterEvent(QEvent *) {
+    if(!this->isExpanded && iconNumber->isVisible()){
+        isExpanded = true;
+        ui->btnMenu->setVisible(isExpanded);
+    }
+}
+
+void SendMultiRow::leaveEvent(QEvent *) {
+    if(isExpanded){
+        isExpanded = false;
+        ui->btnMenu->setVisible(isExpanded);
+    }
+}
+
+int SendMultiRow::getMenuBtnWidth(){
+    return ui->btnMenu->width();
+}
+
 SendMultiRow::~SendMultiRow()
 {
     delete ui;
diff --git a/src/qt/pivx/sendmultirow.h b/src/qt/pivx/sendmultirow.h
@@ -43,17 +43,21 @@ class SendMultiRow : public QWidget
     QRect getEditLineRect();
     int getEditHeight();
     int getEditWidth();
+    int getMenuBtnWidth();
 
 public slots:
     void clear();
 
 signals:
     void removeEntry(SendMultiRow* entry);
     void onContactsClicked(SendMultiRow* entry);
+    void onMenuClicked(SendMultiRow* entry);
     //void payAmountChanged();
 
 protected:
     void resizeEvent(QResizeEvent *event) override;
+    virtual void enterEvent(QEvent *);
+    virtual void leaveEvent(QEvent *);
 
 private slots:
     void amountChanged(const QString&);
@@ -65,12 +69,12 @@ private slots:
 private:
     Ui::SendMultiRow *ui;
     QPushButton *iconNumber;
+    QAction *btnContact;
 
     WalletModel *model;
     int displayUnit;
     int number = 0;
-
-    QAction *btnContact;
+    bool isExpanded = false;
 
     SendCoinsRecipient recipient;
 
diff --git a/src/qt/pivx/tooltipmenu.cpp b/src/qt/pivx/tooltipmenu.cpp
@@ -25,6 +25,14 @@ TooltipMenu::TooltipMenu(PIVXGUI *_window, QWidget *parent) :
     connect(ui->btnEdit, SIGNAL(clicked()), this, SLOT(editClicked()));
 }
 
+void TooltipMenu::setEditBtnText(QString btnText){
+    ui->btnEdit->setText(btnText);
+}
+
+void TooltipMenu::setCopyBtnVisible(bool visible){
+    ui->btnCopy->setVisible(visible);
+}
+
 void TooltipMenu::deleteClicked(){
     hide();
     emit onDeleteClicked();
diff --git a/src/qt/pivx/tooltipmenu.h b/src/qt/pivx/tooltipmenu.h
@@ -27,6 +27,9 @@ class TooltipMenu : public PWidget
     void setIndex(const QModelIndex &index);
     virtual void showEvent(QShowEvent *event) override;
 
+    void setEditBtnText(QString btnText);
+    void setCopyBtnVisible(bool visible);
+
 signals:
     void onDeleteClicked();
     void onCopyClicked();
