Merge remote-tracking branch 'fork/recipients'

johnny9 · johnny9 · commit db30717af51e · 2025-06-07T22:39:29.000-04:00
diff --git a/src/qml/bitcoinamount.cpp b/src/qml/bitcoinamount.cpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2024 The Bitcoin Core developers
+// Copyright (c) 2024-2025 The Bitcoin Core developers
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
@@ -66,6 +66,7 @@ void BitcoinAmount::setUnit(const Unit unit)
 {
     m_unit = unit;
     Q_EMIT unitChanged();
+    Q_EMIT displayChanged();
 }
 
 QString BitcoinAmount::unitLabel() const
@@ -85,7 +86,7 @@ void BitcoinAmount::flipUnit()
         m_unit = Unit::BTC;
     }
     Q_EMIT unitChanged();
-    Q_EMIT amountChanged();
+    Q_EMIT displayChanged();
 }
 
 QString BitcoinAmount::satsToBtcString(qint64 sat)
@@ -151,3 +152,8 @@ void BitcoinAmount::fromDisplay(const QString& text)
     }
     setSatoshi(newSat);
 }
+
+void BitcoinAmount::format()
+{
+    Q_EMIT displayChanged();
+}
diff --git a/src/qml/bitcoinamount.h b/src/qml/bitcoinamount.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2024 The Bitcoin Core developers
+// Copyright (c) 2024-2025 The Bitcoin Core developers
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
@@ -15,7 +15,7 @@ class BitcoinAmount : public QObject
     Q_OBJECT
     Q_PROPERTY(Unit unit READ unit WRITE setUnit NOTIFY unitChanged)
     Q_PROPERTY(QString unitLabel READ unitLabel NOTIFY unitChanged)
-    Q_PROPERTY(QString display READ toDisplay WRITE fromDisplay NOTIFY amountChanged)
+    Q_PROPERTY(QString display READ toDisplay WRITE fromDisplay NOTIFY displayChanged)
     Q_PROPERTY(qint64 satoshi READ satoshi WRITE setSatoshi NOTIFY amountChanged)
 
 public:
@@ -38,6 +38,8 @@ class BitcoinAmount : public QObject
 
     bool isSet() const { return m_isSet; }
 
+    Q_INVOKABLE void format();
+
     static QString satsToBtcString(qint64 sat);
 
 public Q_SLOTS:
@@ -47,6 +49,7 @@ public Q_SLOTS:
 Q_SIGNALS:
     void unitChanged();
     void amountChanged();
+    void displayChanged();
 
 private:
     QString sanitize(const QString& text);
diff --git a/src/qml/controls/IconButton.qml b/src/qml/controls/IconButton.qml
@@ -65,7 +65,7 @@ Button {
         },
         State {
             name: "DISABLED"; when: !root.enabled
-            PropertyChanges { target: icon; color: Theme.color.neutral2 }
+            PropertyChanges { target: icon; color: Theme.color.neutral4 }
             PropertyChanges { target: bg; color: Theme.color.background }
         }
     ]
diff --git a/src/qml/models/sendrecipient.h b/src/qml/models/sendrecipient.h
@@ -38,6 +38,7 @@ class SendRecipient : public QObject
     BitcoinAmount* amount() const;
     QString amountError() const;
     void setAmountError(const QString& error);
+    void setAmount(const QString& amount);
 
     QString message() const;
     void setMessage(const QString& message);
diff --git a/src/qml/models/sendrecipientslistmodel.cpp b/src/qml/models/sendrecipientslistmodel.cpp
@@ -2,8 +2,9 @@
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-#include <qml/models/sendrecipient.h>
 #include <qml/models/sendrecipientslistmodel.h>
+
+#include <qml/models/sendrecipient.h>
 #include <qml/models/walletqmlmodel.h>
 
 SendRecipientsListModel::SendRecipientsListModel(QObject* parent)
@@ -54,9 +55,13 @@ void SendRecipientsListModel::add()
     auto* recipient = new SendRecipient(m_wallet, this);
     connect(recipient->amount(), &BitcoinAmount::amountChanged,
             this, &SendRecipientsListModel::updateTotalAmount);
+    if (m_recipients.size() > 0) {
+        recipient->amount()->setUnit(m_recipients[m_current]->amount()->unit());
+    }
     m_recipients.append(recipient);
+
     endInsertRows();
-    Q_EMIT  countChanged();
+    Q_EMIT countChanged();
     setCurrentIndex(row);
 }
 
@@ -94,7 +99,7 @@ void SendRecipientsListModel::remove()
     endRemoveRows();
     Q_EMIT countChanged();
 
-    if (m_current > 1) {
+    if (m_current > 0) {
         setCurrentIndex(m_current - 1);
     } else {
         Q_EMIT currentRecipientChanged();
@@ -144,4 +149,30 @@ void SendRecipientsListModel::clear()
     Q_EMIT totalAmountChanged();
     Q_EMIT currentRecipientChanged();
     Q_EMIT currentIndexChanged();
+    Q_EMIT listCleared();
+}
+
+void SendRecipientsListModel::clearToFront()
+{
+    bool count_changed = false;
+    while (m_recipients.size() > 1) {
+        delete m_recipients.at(1);
+        m_recipients.removeAt(1);
+        count_changed = true;
+    }
+
+    if (count_changed) {
+        Q_EMIT countChanged();
+    }
+
+    if (m_totalAmount != m_recipients[0]->amount()->satoshi()) {
+        m_totalAmount = m_recipients[0]->amount()->satoshi();
+        Q_EMIT totalAmountChanged();
+    }
+
+    if (m_current != 0) {
+        m_current = 0;
+        Q_EMIT currentRecipientChanged();
+        Q_EMIT currentIndexChanged();
+    }
 }
diff --git a/src/qml/models/sendrecipientslistmodel.h b/src/qml/models/sendrecipientslistmodel.h
@@ -5,10 +5,10 @@
 #ifndef BITCOIN_QML_MODELS_SENDRECIPIENTSLISTMODEL_H
 #define BITCOIN_QML_MODELS_SENDRECIPIENTSLISTMODEL_H
 
-#include <QAbstractListModel>
+#include <qml/models/sendrecipient.h>
 
-class SendRecipient;
-class WalletQmlModel;
+#include <QAbstractListModel>
+#include <QList>
 
 class SendRecipientsListModel : public QAbstractListModel
 {
@@ -37,8 +37,9 @@ class SendRecipientsListModel : public QAbstractListModel
     Q_INVOKABLE void prev();
     Q_INVOKABLE void remove();
     Q_INVOKABLE void clear();
+    Q_INVOKABLE void clearToFront();
 
-    int currentIndex() const { return m_current+1; }
+    int currentIndex() const { return m_current + 1; }
     void setCurrentIndex(int row);
     SendRecipient* currentRecipient() const;
     int count() const { return m_recipients.size(); }
@@ -51,6 +52,7 @@ class SendRecipientsListModel : public QAbstractListModel
     void currentRecipientChanged();
     void countChanged();
     void totalAmountChanged();
+    void listCleared();
 
 private:
     void updateTotalAmount();
diff --git a/src/qml/models/walletqmlmodel.cpp b/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.
@@ -144,7 +145,7 @@ bool WalletQmlModel::prepareTransaction()
 
     std::vector<wallet::CRecipient> vecSend;
     CAmount total = 0;
-    for (auto * recipient : m_send_recipients->recipients()) {
+    for (auto* recipient : m_send_recipients->recipients()) {
         CScript scriptPubKey = GetScriptForDestination(DecodeDestination(recipient->address().toStdString()));
         wallet::CRecipient c_recipient = {scriptPubKey, recipient->cAmount(), recipient->subtractFeeFromAmount()};
         m_coin_control.m_feerate = CFeeRate(1000);
diff --git a/src/qml/pages/node/NodeSettings.qml b/src/qml/pages/node/NodeSettings.qml
@@ -9,41 +9,35 @@ import "../../controls"
 import "../../components"
 import "../settings"
 
-Item {
+PageStack {
     signal doneClicked
 
     property alias showDoneButton: doneButton.visible
 
     id: root
 
-    PageStack {
-        id: nodeSettingsView
-        anchors.fill: parent
-
-        initialItem: Page {
-            id: node_settings
-            background: null
-            implicitWidth: 450
-            leftPadding: 20
-            rightPadding: 20
-            topPadding: 30
-
-            header: NavigationBar2 {
-                centerItem: Header {
-                    headerBold: true
-                    headerSize: 18
-                    header: "Settings"
-                }
-                rightItem: NavButton {
-                    id: doneButton
-                    text: qsTr("Done")
-                    onClicked: root.doneClicked()
-                }
+    initialItem: Page {
+        background: null
+        header: NavigationBar2 {
+            centerItem: Header {
+                headerBold: true
+                headerSize: 18
+                header: "Settings"
             }
+            rightItem: NavButton {
+                id: doneButton
+                text: qsTr("Done")
+                onClicked: root.doneClicked()
+            }
+        }
+        contentItem: RowLayout {
             ColumnLayout {
+                Layout.alignment: Qt.AlignHCenter | Qt.AlignTop
+                Layout.fillHeight: false
+                Layout.fillWidth: true
+                Layout.margins: 20
+                Layout.maximumWidth: 450
                 spacing: 4
-                width: Math.min(parent.width, 450)
-                anchors.horizontalCenter: parent.horizontalCenter
                 Setting {
                     id: gotoAbout
                     Layout.fillWidth: true
@@ -52,7 +46,7 @@ Item {
                         color: gotoAbout.stateColor
                     }
                     onClicked: {
-                        nodeSettingsView.push(about_page)
+                        root.push(about_page)
                     }
                 }
                 Separator { Layout.fillWidth: true }
@@ -64,7 +58,7 @@ Item {
                         color: gotoDisplay.stateColor
                     }
                     onClicked: {
-                        nodeSettingsView.push(display_page)
+                        root.push(display_page)
                     }
                 }
                 Separator { Layout.fillWidth: true }
@@ -76,7 +70,7 @@ Item {
                         color: gotoStorage.stateColor
                     }
                     onClicked: {
-                        nodeSettingsView.push(storage_page)
+                        root.push(storage_page)
                     }
                 }
                 Separator { Layout.fillWidth: true }
@@ -88,7 +82,7 @@ Item {
                         color: gotoConnection.stateColor
                     }
                     onClicked: {
-                        nodeSettingsView.push(connection_page)
+                        root.push(connection_page)
                     }
                 }
                 Separator { Layout.fillWidth: true }
@@ -101,7 +95,7 @@ Item {
                     }
                     onClicked: {
                         peerTableModel.startAutoRefresh();
-                        nodeSettingsView.push(peers_page)
+                        root.push(peers_page)
                     }
                 }
                 Separator { Layout.fillWidth: true }
@@ -113,63 +107,67 @@ Item {
                         color: gotoNetworkTraffic.stateColor
                     }
                     onClicked: {
-                        nodeSettingsView.push(networktraffic_page)
+                        root.push(networktraffic_page)
                     }
                 }
+                Item {
+                    Layout.fillHeight: true
+                }
             }
         }
     }
+
     Component {
         id: about_page
         SettingsAbout {
-            onBack: nodeSettingsView.pop()
+            onBack: root.pop()
         }
     }
     Component {
         id: display_page
         SettingsDisplay {
             onBack: {
-                nodeSettingsView.pop()
+                root.pop()
             }
         }
     }
     Component {
         id: storage_page
         SettingsStorage {
-            onBack: nodeSettingsView.pop()
+            onBack: root.pop()
         }
     }
     Component {
         id: connection_page
         SettingsConnection {
-            onBack: nodeSettingsView.pop()
+            onBack: root.pop()
         }
     }
     Component {
         id: peers_page
         Peers {
             onBack: {
-                nodeSettingsView.pop()
+                root.pop()
                 peerTableModel.stopAutoRefresh();
             }
             onPeerSelected: (peerDetails) => {
-                nodeSettingsView.push(peer_details, {"details": peerDetails})
+                root.push(peer_details, {"details": peerDetails})
             }
         }
     }
     Component {
         id: peer_details
         PeerDetails {
             onBack: {
-                nodeSettingsView.pop()
+                root.pop()
             }
         }
     }
     Component {
         id: networktraffic_page
         NetworkTraffic {
             showHeader: false
-            onBack: nodeSettingsView.pop()
+            onBack: root.pop()
         }
     }
 }
diff --git a/src/qml/pages/settings/SettingsAbout.qml b/src/qml/pages/settings/SettingsAbout.qml
diff --git a/src/qml/pages/wallet/Activity.qml b/src/qml/pages/wallet/Activity.qml
diff --git a/src/qml/pages/wallet/DesktopWallets.qml b/src/qml/pages/wallet/DesktopWallets.qml
diff --git a/src/qml/pages/wallet/Send.qml b/src/qml/pages/wallet/Send.qml

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-// Copyright (c) 2024 The Bitcoin Core developers`
	`1`	`+// Copyright (c) 2024-2025 The Bitcoin Core developers`
`2`	`2`	`// Distributed under the MIT software license, see the accompanying`
`3`	`3`	`// file COPYING or http://www.opensource.org/licenses/mit-license.php.`
`4`	`4`
`@@ -66,6 +66,7 @@ void BitcoinAmount::setUnit(const Unit unit)`
`66`	`66`	`{`
`67`	`67`	`m_unit = unit;`
`68`	`68`	`Q_EMIT unitChanged();`
	`69`	`+ Q_EMIT displayChanged();`
`69`	`70`	`}`
`70`	`71`
`71`	`72`	`QString BitcoinAmount::unitLabel() const`
`@@ -85,7 +86,7 @@ void BitcoinAmount::flipUnit()`
`85`	`86`	`m_unit = Unit::BTC;`
`86`	`87`	`}`
`87`	`88`	`Q_EMIT unitChanged();`
`88`		`- Q_EMIT amountChanged();`
	`89`	`+ Q_EMIT displayChanged();`
`89`	`90`	`}`
`90`	`91`
`91`	`92`	`QString BitcoinAmount::satsToBtcString(qint64 sat)`
`@@ -151,3 +152,8 @@ void BitcoinAmount::fromDisplay(const QString& text)`
`151`	`152`	`}`
`152`	`153`	`setSatoshi(newSat);`
`153`	`154`	`}`
	`155`	`+`
	`156`	`+void BitcoinAmount::format()`
	`157`	`+{`
	`158`	`+ Q_EMIT displayChanged();`
	`159`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -65,7 +65,7 @@ Button {`
`65`	`65`	`},`
`66`	`66`	`State {`
`67`	`67`	`name: "DISABLED"; when: !root.enabled`
`68`		`- PropertyChanges { target: icon; color: Theme.color.neutral2 }`
	`68`	`+ PropertyChanges { target: icon; color: Theme.color.neutral4 }`
`69`	`69`	`PropertyChanges { target: bg; color: Theme.color.background }`
`70`	`70`	`}`
`71`	`71`	`]`
Original file line number	Diff line number	Diff line change
`@@ -9,41 +9,35 @@ import "../../controls"`
`9`	`9`	`import "../../components"`
`10`	`10`	`import "../settings"`
`11`	`11`
`12`		`-Item {`
	`12`	`+PageStack {`
`13`	`13`	`signal doneClicked`
`14`	`14`
`15`	`15`	`property alias showDoneButton: doneButton.visible`
`16`	`16`
`17`	`17`	`id: root`
`18`	`18`
`19`		`- PageStack {`
`20`		`- id: nodeSettingsView`
`21`		`- anchors.fill: parent`
`22`		`-`
`23`		`- initialItem: Page {`
`24`		`- id: node_settings`
`25`		`- background: null`
`26`		`- implicitWidth: 450`
`27`		`- leftPadding: 20`
`28`		`- rightPadding: 20`
`29`		`- topPadding: 30`
`30`		`-`
`31`		`- header: NavigationBar2 {`
`32`		`- centerItem: Header {`
`33`		`- headerBold: true`
`34`		`- headerSize: 18`
`35`		`- header: "Settings"`
`36`		`- }`
`37`		`- rightItem: NavButton {`
`38`		`- id: doneButton`
`39`		`- text: qsTr("Done")`
`40`		`- onClicked: root.doneClicked()`
`41`		`- }`
	`19`	`+ initialItem: Page {`
	`20`	`+ background: null`
	`21`	`+ header: NavigationBar2 {`
	`22`	`+ centerItem: Header {`
	`23`	`+ headerBold: true`
	`24`	`+ headerSize: 18`
	`25`	`+ header: "Settings"`
`42`	`26`	`}`
	`27`	`+ rightItem: NavButton {`
	`28`	`+ id: doneButton`
	`29`	`+ text: qsTr("Done")`
	`30`	`+ onClicked: root.doneClicked()`
	`31`	`+ }`
	`32`	`+ }`
	`33`	`+ contentItem: RowLayout {`
`43`	`34`	`ColumnLayout {`
	`35`	`+ Layout.alignment: Qt.AlignHCenter \| Qt.AlignTop`
	`36`	`+ Layout.fillHeight: false`
	`37`	`+ Layout.fillWidth: true`
	`38`	`+ Layout.margins: 20`
	`39`	`+ Layout.maximumWidth: 450`
`44`	`40`	`spacing: 4`
`45`		`- width: Math.min(parent.width, 450)`
`46`		`- anchors.horizontalCenter: parent.horizontalCenter`
`47`	`41`	`Setting {`
`48`	`42`	`id: gotoAbout`
`49`	`43`	`Layout.fillWidth: true`
`@@ -52,7 +46,7 @@ Item {`
`52`	`46`	`color: gotoAbout.stateColor`
`53`	`47`	`}`
`54`	`48`	`onClicked: {`
`55`		`- nodeSettingsView.push(about_page)`
	`49`	`+ root.push(about_page)`
`56`	`50`	`}`
`57`	`51`	`}`
`58`	`52`	`Separator { Layout.fillWidth: true }`
`@@ -64,7 +58,7 @@ Item {`
`64`	`58`	`color: gotoDisplay.stateColor`
`65`	`59`	`}`
`66`	`60`	`onClicked: {`
`67`		`- nodeSettingsView.push(display_page)`
	`61`	`+ root.push(display_page)`
`68`	`62`	`}`
`69`	`63`	`}`
`70`	`64`	`Separator { Layout.fillWidth: true }`
`@@ -76,7 +70,7 @@ Item {`
`76`	`70`	`color: gotoStorage.stateColor`
`77`	`71`	`}`
`78`	`72`	`onClicked: {`
`79`		`- nodeSettingsView.push(storage_page)`
	`73`	`+ root.push(storage_page)`
`80`	`74`	`}`
`81`	`75`	`}`
`82`	`76`	`Separator { Layout.fillWidth: true }`
`@@ -88,7 +82,7 @@ Item {`
`88`	`82`	`color: gotoConnection.stateColor`
`89`	`83`	`}`
`90`	`84`	`onClicked: {`
`91`		`- nodeSettingsView.push(connection_page)`
	`85`	`+ root.push(connection_page)`
`92`	`86`	`}`
`93`	`87`	`}`
`94`	`88`	`Separator { Layout.fillWidth: true }`
`@@ -101,7 +95,7 @@ Item {`
`101`	`95`	`}`
`102`	`96`	`onClicked: {`
`103`	`97`	`peerTableModel.startAutoRefresh();`
`104`		`- nodeSettingsView.push(peers_page)`
	`98`	`+ root.push(peers_page)`
`105`	`99`	`}`
`106`	`100`	`}`
`107`	`101`	`Separator { Layout.fillWidth: true }`
`@@ -113,63 +107,67 @@ Item {`
`113`	`107`	`color: gotoNetworkTraffic.stateColor`
`114`	`108`	`}`
`115`	`109`	`onClicked: {`
`116`		`- nodeSettingsView.push(networktraffic_page)`
	`110`	`+ root.push(networktraffic_page)`
`117`	`111`	`}`
`118`	`112`	`}`
	`113`	`+ Item {`
	`114`	`+ Layout.fillHeight: true`
	`115`	`+ }`
`119`	`116`	`}`
`120`	`117`	`}`
`121`	`118`	`}`
	`119`	`+`
`122`	`120`	`Component {`
`123`	`121`	`id: about_page`
`124`	`122`	`SettingsAbout {`
`125`		`- onBack: nodeSettingsView.pop()`
	`123`	`+ onBack: root.pop()`
`126`	`124`	`}`
`127`	`125`	`}`
`128`	`126`	`Component {`
`129`	`127`	`id: display_page`
`130`	`128`	`SettingsDisplay {`
`131`	`129`	`onBack: {`
`132`		`- nodeSettingsView.pop()`
	`130`	`+ root.pop()`
`133`	`131`	`}`
`134`	`132`	`}`
`135`	`133`	`}`
`136`	`134`	`Component {`
`137`	`135`	`id: storage_page`
`138`	`136`	`SettingsStorage {`
`139`		`- onBack: nodeSettingsView.pop()`
	`137`	`+ onBack: root.pop()`
`140`	`138`	`}`
`141`	`139`	`}`
`142`	`140`	`Component {`
`143`	`141`	`id: connection_page`
`144`	`142`	`SettingsConnection {`
`145`		`- onBack: nodeSettingsView.pop()`
	`143`	`+ onBack: root.pop()`
`146`	`144`	`}`
`147`	`145`	`}`
`148`	`146`	`Component {`
`149`	`147`	`id: peers_page`
`150`	`148`	`Peers {`
`151`	`149`	`onBack: {`
`152`		`- nodeSettingsView.pop()`
	`150`	`+ root.pop()`
`153`	`151`	`peerTableModel.stopAutoRefresh();`
`154`	`152`	`}`
`155`	`153`	`onPeerSelected: (peerDetails) => {`
`156`		`- nodeSettingsView.push(peer_details, {"details": peerDetails})`
	`154`	`+ root.push(peer_details, {"details": peerDetails})`
`157`	`155`	`}`
`158`	`156`	`}`
`159`	`157`	`}`
`160`	`158`	`Component {`
`161`	`159`	`id: peer_details`
`162`	`160`	`PeerDetails {`
`163`	`161`	`onBack: {`
`164`		`- nodeSettingsView.pop()`
	`162`	`+ root.pop()`
`165`	`163`	`}`
`166`	`164`	`}`
`167`	`165`	`}`
`168`	`166`	`Component {`
`169`	`167`	`id: networktraffic_page`
`170`	`168`	`NetworkTraffic {`
`171`	`169`	`showHeader: false`
`172`		`- onBack: nodeSettingsView.pop()`
	`170`	`+ onBack: root.pop()`
`173`	`171`	`}`
`174`	`172`	`}`
`175`	`173`	`}`