qml: Add remove button to multiple recipients

Author: johnny9

src/qml/models/sendrecipientslistmodel.cpp

@@ -3,6 +3,7 @@
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
 #include <qml/models/sendrecipientslistmodel.h>
+#include <qobjectdefs.h>
 
 #include <qml/models/sendrecipient.h>
 

src/qml/models/sendrecipientslistmodel.h

@@ -9,6 +9,7 @@
 
 #include <QAbstractListModel>
 #include <QList>
+#include <qobjectdefs.h>
 
 class SendRecipientsListModel : public QAbstractListModel
 {

src/qml/models/walletqmlmodel.cpp

@@ -1,3 +1,4 @@
+
 // 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.
@@ -6,6 +7,7 @@
 
 #include <qml/models/activitylistmodel.h>
 #include <qml/models/sendrecipient.h>
+#include <qml/models/sendrecipientslistmodel.h>
 #include <qml/models/walletqmlmodeltransaction.h>
 
 #include <consensus/amount.h>
@@ -208,13 +210,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

@@ -30,8 +30,6 @@ class WalletQmlModel : public QObject
     Q_PROPERTY(SendRecipient* sendRecipient READ sendRecipient 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);
@@ -68,15 +66,10 @@ 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;

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()
 
@@ -97,6 +97,9 @@ PageStack {
                         iconWidth: 30
                         iconHeight: 30
                         iconSource: "image://images/caret-left"
+                        onClicked: {
+                            wallet.recipients.prev()
+                        }
                     }
 
                     NavButton {
@@ -105,14 +108,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 {