qml: Add remove button to multiple recipients

Author: johnny9

src/qml/models/sendrecipientslistmodel.cpp

@@ -4,10 +4,12 @@
 
 #include <qml/models/sendrecipient.h>
 #include <qml/models/sendrecipientslistmodel.h>
+#include <qobjectdefs.h>
 
 SendRecipientsListModel::SendRecipientsListModel(QObject* parent)
     : QAbstractListModel(parent)
 {
+    m_recipients.append(new SendRecipient(this));
 }
 
 int SendRecipientsListModel::rowCount(const QModelIndex&) const
@@ -48,5 +50,50 @@ void SendRecipientsListModel::add()
     m_recipients.append(new SendRecipient(this));
     endInsertRows();
     Q_EMIT  countChanged();
-    setCurrentIndex(row)
+    setCurrentIndex(row);
+}
+
+void SendRecipientsListModel::setCurrentIndex(int row)
+{
+    if (row < 0 || row >= m_recipients.size())
+        return;
+
+    if (row == m_current)
+        return;
+
+    m_current = row;
+
+    Q_EMIT currentIndexChanged();
+    Q_EMIT currentRecipientChanged();
+}
+
+void SendRecipientsListModel::next()
+{
+    setCurrentIndex(m_current + 1);
+}
+
+void SendRecipientsListModel::prev()
+{
+    setCurrentIndex(m_current - 1);
+}
+
+void SendRecipientsListModel::remove()
+{
+    if (m_recipients.size() == 1) {
+        return;
+    }
+    beginRemoveRows(QModelIndex(), m_current, m_current);
+    delete m_recipients.takeAt(m_current);
+    endRemoveRows();
+    Q_EMIT countChanged();
+
+    setCurrentIndex(m_current - 1);
+}
+
+SendRecipient* SendRecipientsListModel::currentRecipient() const
+{
+    if (m_current < 0 || m_current >= m_recipients.size())
+        return nullptr;
+
+    return m_recipients[m_current];
 }

src/qml/models/sendrecipientslistmodel.h

@@ -9,13 +9,14 @@
 
 #include <QAbstractListModel>
 #include <QList>
+#include <qobjectdefs.h>
 
 class SendRecipientsListModel : public QAbstractListModel
 {
     Q_OBJECT
-    Q_PROPERTY(int recipientIndex READ recipientIndex NOTIFY recipientIndexChanged)
+    Q_PROPERTY(int currentIndex READ currentIndex NOTIFY currentIndexChanged)
     Q_PROPERTY(int count READ count NOTIFY countChanged)
-    Q_PROPERTY(SendRecipient* currentRecipient READ currentRecipient NOTIFY currentRecipientChanged)
+    Q_PROPERTY(SendRecipient* current READ currentRecipient NOTIFY currentRecipientChanged)
 
 public:
     enum Roles {
@@ -34,9 +35,9 @@ class SendRecipientsListModel : public QAbstractListModel
     Q_INVOKABLE void add();
     Q_INVOKABLE void next();
     Q_INVOKABLE void prev();
-    Q_INVOKABLE void clearAll();
+    Q_INVOKABLE void remove();
 
-    int currentIndex() const { return m_current; }
+    int currentIndex() const { return m_current+1; }
     void setCurrentIndex(int row);
     SendRecipient* currentRecipient() const;
     int count() const { return m_recipients.size(); }

src/qml/models/walletqmlmodel.cpp

@@ -1,9 +1,16 @@
+
 // Copyright (c) 2024 The Bitcoin Core developers
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
 #include <qml/models/walletqmlmodel.h>
 
+#include <qml/models/activitylistmodel.h>
+#include <qml/models/paymentrequest.h>
+#include <qml/models/sendrecipient.h>
+#include <qml/models/sendrecipientslistmodel.h>
+#include <qml/models/walletqmlmodeltransaction.h>
+
 #include <consensus/amount.h>
 #include <interfaces/wallet.h>
 #include <key_io.h>
@@ -24,6 +31,7 @@ WalletQmlModel::WalletQmlModel(std::unique_ptr<interfaces::Wallet> wallet, QObje
     m_activity_list_model = new ActivityListModel(this);
     m_coins_list_model = new CoinsListModel(this);
     m_current_recipient = new SendRecipient(this);
+    m_send_recipients = new SendRecipientsListModel(this);
 }
 
 WalletQmlModel::WalletQmlModel(QObject* parent)
@@ -32,6 +40,7 @@ WalletQmlModel::WalletQmlModel(QObject* parent)
     m_activity_list_model = new ActivityListModel(this);
     m_coins_list_model = new CoinsListModel(this);
     m_current_recipient = new SendRecipient(this);
+    m_send_recipients = new SendRecipientsListModel(this);
 }
 
 WalletQmlModel::~WalletQmlModel()
@@ -204,13 +213,3 @@ std::vector<COutPoint> WalletQmlModel::listSelectedCoins() const
 {
     return m_coin_control.ListSelected();
 }
-
-int WalletQmlModel::recipientIndex() const
-{
-    return 1;
-}
-
-int WalletQmlModel::recipientsCount() const
-{
-    return 1;
-}

src/qml/models/walletqmlmodel.h

@@ -10,6 +10,7 @@
 #include <qml/models/activitylistmodel.h>
 #include <qml/models/coinslistmodel.h>
 #include <qml/models/sendrecipient.h>
+#include <qml/models/sendrecipientslistmodel.h>
 #include <qml/models/walletqmlmodeltransaction.h>
 #include <wallet/coincontrol.h>
 
@@ -27,10 +28,8 @@ class WalletQmlModel : public QObject
     Q_PROPERTY(ActivityListModel* activityListModel READ activityListModel CONSTANT)
     Q_PROPERTY(CoinsListModel* coinsListModel READ coinsListModel CONSTANT)
     Q_PROPERTY(SendRecipient* sendRecipient READ sendRecipient CONSTANT)
-    Q_PROPERTY(SendRecipientsListModel* sendRecipientList READ sendRecipientList CONSTANT)
+    Q_PROPERTY(SendRecipientsListModel* recipients READ sendRecipientList CONSTANT)
     Q_PROPERTY(WalletQmlModelTransaction* currentTransaction READ currentTransaction NOTIFY currentTransactionChanged)
-    Q_PROPERTY(int recipientIndex READ recipientIndex NOTIFY recipientIndexChanged)
-    Q_PROPERTY(int recipientsCount READ recipientsCount NOTIFY recipientsCountChanged)
 
 public:
     WalletQmlModel(std::unique_ptr<interfaces::Wallet> wallet, QObject* parent = nullptr);
@@ -41,8 +40,8 @@ class WalletQmlModel : public QObject
     QString balance() const;
     ActivityListModel* activityListModel() const { return m_activity_list_model; }
     CoinsListModel* coinsListModel() const { return m_coins_list_model; }
-    SendRecipient* sendRecipient() const { return m_current_recipient; }
-    SendRecipientList* sendRecipientList() const { return m_current_recipient; }
+    SendRecipient* sendRecipient() const { return m_send_recipients->currentRecipient(); }
+    SendRecipientsListModel* sendRecipientList() const { return m_send_recipients; }
     WalletQmlModelTransaction* currentTransaction() const { return m_current_transaction; }
     Q_INVOKABLE bool prepareTransaction();
     Q_INVOKABLE void sendTransaction();
@@ -72,20 +71,16 @@ class WalletQmlModel : public QObject
     bool isSelectedCoin(const COutPoint& output);
     std::vector<COutPoint> listSelectedCoins() const;
 
-    int recipientIndex() const;
-    int recipientsCount() const;
-
 Q_SIGNALS:
     void nameChanged();
     void balanceChanged();
     void currentTransactionChanged();
-    void recipientIndexChanged();
-    void recipientsCountChanged();
 
 private:
     std::unique_ptr<interfaces::Wallet> m_wallet;
     ActivityListModel* m_activity_list_model{nullptr};
     CoinsListModel* m_coins_list_model{nullptr};
+    SendRecipientsListModel* m_send_recipients{nullptr};
     SendRecipient* m_current_recipient{nullptr};
     WalletQmlModelTransaction* m_current_transaction{nullptr};
     wallet::CCoinControl m_coin_control;

src/qml/pages/wallet/Send.qml

@@ -16,7 +16,7 @@ PageStack {
     vertical: true
 
     property WalletQmlModel wallet: walletController.selectedWallet
-    property SendRecipient recipient: wallet.sendRecipient
+    property SendRecipient recipient: wallet.recipients.current
 
     signal transactionPrepared()
 
@@ -94,6 +94,9 @@ PageStack {
                         iconWidth: 30
                         iconHeight: 30
                         iconSource: "image://images/caret-left"
+                        onClicked: {
+                            wallet.recipients.prev()
+                        }
                     }
 
                     NavButton {
@@ -102,14 +105,41 @@ PageStack {
                         iconWidth: 30
                         iconHeight: 30
                         iconSource: "image://images/caret-right"
+                        onClicked: {
+                            wallet.recipients.next()
+                        }
                     }
 
                     CoreText {
+                        Layout.fillWidth: true
+                        Layout.alignment: Qt.AlignLeft
                         id: selectAndAddRecipientsLabel
-                        text: qsTr("Recipient %1 of %2").arg(wallet.recipientIndex).arg(wallet.recipientsCount)
+                        text: qsTr("Recipient %1 of %2").arg(wallet.recipients.currentIndex).arg(wallet.recipients.count)
                         font.pixelSize: 18
                         color: Theme.color.neutral9
                     }
+
+                    NavButton {
+                        Layout.preferredWidth: 30
+                        Layout.preferredHeight: 30
+                        iconWidth: 20
+                        iconHeight: 20
+                        iconSource: "image://images/plus"
+                        onClicked: {
+                            wallet.recipients.add()
+                        }
+                    }
+                    NavButton {
+                        Layout.preferredWidth: 30
+                        Layout.preferredHeight: 30
+                        iconWidth: 20
+                        iconHeight: 20
+                        iconSource: "image://images/minus"
+                        visible: wallet.recipients.count > 1
+                        onClicked: {
+                            wallet.recipients.remove()
+                        }
+                    }
                 }
 
                 Separator {