Include vout when copying transaction ID from coin selection

meshcollider · meshcollider · commit 949e700149a7 · 2021-09-28T13:31:20.000+13:00
diff --git a/src/qt/coincontroldialog.cpp b/src/qt/coincontroldialog.cpp
@@ -55,7 +55,7 @@ CoinControlDialog::CoinControlDialog(CCoinControl& coin_control, WalletModel* _m
     contextMenu->addAction(tr("&Copy address"), this, &CoinControlDialog::copyAddress);
     contextMenu->addAction(tr("Copy &label"), this, &CoinControlDialog::copyLabel);
     contextMenu->addAction(tr("Copy &amount"), this, &CoinControlDialog::copyAmount);
-    copyTransactionHashAction = contextMenu->addAction(tr("Copy transaction &ID"), this, &CoinControlDialog::copyTransactionHash);
+    copyTransactionOutpointAction = contextMenu->addAction(tr("Copy transaction &ID and output index"), this, &CoinControlDialog::copyTransactionOutpoint);
     contextMenu->addSeparator();
     lockAction = contextMenu->addAction(tr("L&ock unspent"), this, &CoinControlDialog::lockCoin);
     unlockAction = contextMenu->addAction(tr("&Unlock unspent"), this, &CoinControlDialog::unlockCoin);
@@ -180,7 +180,7 @@ void CoinControlDialog::showMenu(const QPoint &point)
         // disable some items (like Copy Transaction ID, lock, unlock) for tree roots in context menu
         if (item->data(COLUMN_ADDRESS, TxHashRole).toString().length() == 64) // transaction hash is 64 characters (this means it is a child node, so it is not a parent node in tree mode)
         {
-            copyTransactionHashAction->setEnabled(true);
+            copyTransactionOutpointAction->setEnabled(true);
             if (model->wallet().isLockedCoin(COutPoint(uint256S(item->data(COLUMN_ADDRESS, TxHashRole).toString().toStdString()), item->data(COLUMN_ADDRESS, VOutRole).toUInt())))
             {
                 lockAction->setEnabled(false);
@@ -194,7 +194,7 @@ void CoinControlDialog::showMenu(const QPoint &point)
         }
         else // this means click on parent node in tree mode -> disable all
         {
-            copyTransactionHashAction->setEnabled(false);
+            copyTransactionOutpointAction->setEnabled(false);
             lockAction->setEnabled(false);
             unlockAction->setEnabled(false);
         }
@@ -229,9 +229,10 @@ void CoinControlDialog::copyAddress()
 }
 
 // context menu action: copy transaction id
-void CoinControlDialog::copyTransactionHash()
+void CoinControlDialog::copyTransactionOutpoint()
 {
-    GUIUtil::setClipboard(contextMenuItem->data(COLUMN_ADDRESS, TxHashRole).toString());
+    const QString outpoint = contextMenuItem->data(COLUMN_ADDRESS, TxHashRole).toString() + ":" + contextMenuItem->data(COLUMN_ADDRESS, VOutRole).toString();
+    GUIUtil::setClipboard(outpoint);
 }
 
 // context menu action: lock coin
diff --git a/src/qt/coincontroldialog.h b/src/qt/coincontroldialog.h
@@ -63,7 +63,7 @@ class CoinControlDialog : public QDialog
 
     QMenu *contextMenu;
     QTreeWidgetItem *contextMenuItem;
-    QAction *copyTransactionHashAction;
+    QAction *copyTransactionOutpointAction;
     QAction *lockAction;
     QAction *unlockAction;
 
@@ -95,7 +95,7 @@ private Q_SLOTS:
     void copyAmount();
     void copyLabel();
     void copyAddress();
-    void copyTransactionHash();
+    void copyTransactionOutpoint();
     void lockCoin();
     void unlockCoin();
     void clipboardQuantity();

Original file line number	Diff line number	Diff line change
`@@ -55,7 +55,7 @@ CoinControlDialog::CoinControlDialog(CCoinControl& coin_control, WalletModel* _m`
`55`	`55`	`contextMenu->addAction(tr("&Copy address"), this, &CoinControlDialog::copyAddress);`
`56`	`56`	`contextMenu->addAction(tr("Copy &label"), this, &CoinControlDialog::copyLabel);`
`57`	`57`	`contextMenu->addAction(tr("Copy &amount"), this, &CoinControlDialog::copyAmount);`
`58`		`- copyTransactionHashAction = contextMenu->addAction(tr("Copy transaction &ID"), this, &CoinControlDialog::copyTransactionHash);`
	`58`	`+ copyTransactionOutpointAction = contextMenu->addAction(tr("Copy transaction &ID and output index"), this, &CoinControlDialog::copyTransactionOutpoint);`
`59`	`59`	`contextMenu->addSeparator();`
`60`	`60`	`lockAction = contextMenu->addAction(tr("L&ock unspent"), this, &CoinControlDialog::lockCoin);`
`61`	`61`	`unlockAction = contextMenu->addAction(tr("&Unlock unspent"), this, &CoinControlDialog::unlockCoin);`
`@@ -180,7 +180,7 @@ void CoinControlDialog::showMenu(const QPoint &point)`
`180`	`180`	`// disable some items (like Copy Transaction ID, lock, unlock) for tree roots in context menu`
`181`	`181`	`if (item->data(COLUMN_ADDRESS, TxHashRole).toString().length() == 64) // transaction hash is 64 characters (this means it is a child node, so it is not a parent node in tree mode)`
`182`	`182`	`{`
`183`		`- copyTransactionHashAction->setEnabled(true);`
	`183`	`+ copyTransactionOutpointAction->setEnabled(true);`
`184`	`184`	`if (model->wallet().isLockedCoin(COutPoint(uint256S(item->data(COLUMN_ADDRESS, TxHashRole).toString().toStdString()), item->data(COLUMN_ADDRESS, VOutRole).toUInt())))`
`185`	`185`	`{`
`186`	`186`	`lockAction->setEnabled(false);`
`@@ -194,7 +194,7 @@ void CoinControlDialog::showMenu(const QPoint &point)`
`194`	`194`	`}`
`195`	`195`	`else // this means click on parent node in tree mode -> disable all`
`196`	`196`	`{`
`197`		`- copyTransactionHashAction->setEnabled(false);`
	`197`	`+ copyTransactionOutpointAction->setEnabled(false);`
`198`	`198`	`lockAction->setEnabled(false);`
`199`	`199`	`unlockAction->setEnabled(false);`
`200`	`200`	`}`
`@@ -229,9 +229,10 @@ void CoinControlDialog::copyAddress()`
`229`	`229`	`}`
`230`	`230`
`231`	`231`	`// context menu action: copy transaction id`
`232`		`-void CoinControlDialog::copyTransactionHash()`
	`232`	`+void CoinControlDialog::copyTransactionOutpoint()`
`233`	`233`	`{`
`234`		`- GUIUtil::setClipboard(contextMenuItem->data(COLUMN_ADDRESS, TxHashRole).toString());`
	`234`	`+ const QString outpoint = contextMenuItem->data(COLUMN_ADDRESS, TxHashRole).toString() + ":" + contextMenuItem->data(COLUMN_ADDRESS, VOutRole).toString();`
	`235`	`+ GUIUtil::setClipboard(outpoint);`
`235`	`236`	`}`
`236`	`237`
`237`	`238`	`// context menu action: lock coin`