Skip to content
Bitcoin Roots

v31.1-roots.1 · Commit 6: [PATCH 06/17] feat(wallet): preserve Roots signing and spend controls on v31

src/qt/bitcoingui.cpp

Before: src/qt/bitcoingui.cpp · After: src/qt/bitcoingui.cpp

File metadata
index 96ea3f4a7060b7ce32e22cb3ff8e166ed8b6e5c5..7a34ed8254aeb2a5a1ddac132613577e56358bfa 100644

Download original patch · Release notes

Diff rows 1–30 of 30. Line numbers refer to the original before/after files.

+ Added− RemovedUnmarked lines are context.

Scroll the code area horizontally to read long lines. Before is on the left; after is on the right. Unified view fits narrow screens more easily.

src/qt/bitcoingui.cpp CHANGED
@@ -323,6 +323,8 @@ void BitcoinGUI::createActions()
323
  signMessageAction->setStatusTip(tr("Sign messages with your Bitcoin addresses to prove you own them"));
324
  verifyMessageAction = new QAction(tr("&Verify message…"), this);
325
  verifyMessageAction->setStatusTip(tr("Verify messages to ensure they were signed with specified Bitcoin addresses"));
 
 
326
  m_load_psbt_action = new QAction(tr("&Load PSBT from file…"), this);
327
  m_load_psbt_action->setStatusTip(tr("Load Partially Signed Bitcoin Transaction"));
328
  m_load_psbt_clipboard_action = new QAction(tr("Load PSBT from &clipboard…"), this);
@@ -398,6 +400,8 @@ void BitcoinGUI::createActions()
398
  connect(m_load_psbt_clipboard_action, &QAction::triggered, [this]{ gotoLoadPSBT(true); });
399
  connect(verifyMessageAction, &QAction::triggered, [this]{ showNormalIfMinimized(); });
400
  connect(verifyMessageAction, &QAction::triggered, [this]{ gotoVerifyMessageTab(); });
 
 
401
  connect(usedSendingAddressesAction, &QAction::triggered, walletFrame, &WalletFrame::usedSendingAddresses);
402
  connect(usedReceivingAddressesAction, &QAction::triggered, walletFrame, &WalletFrame::usedReceivingAddresses);
403
  connect(openAction, &QAction::triggered, this, &BitcoinGUI::openClicked);
@@ -551,6 +555,7 @@ void BitcoinGUI::createMenuBar()
551
  file->addAction(openAction);
552
  file->addAction(signMessageAction);
553
  file->addAction(verifyMessageAction);
 
554
  file->addAction(m_load_psbt_action);
555
  file->addAction(m_load_psbt_clipboard_action);
556
  file->addSeparator();
@@ -861,6 +866,7 @@ void BitcoinGUI::setWalletActionsEnabled(bool enabled)
861
  changePassphraseAction->setEnabled(enabled);
862
  signMessageAction->setEnabled(enabled);
863
  verifyMessageAction->setEnabled(enabled);
 
864
  usedSendingAddressesAction->setEnabled(enabled);
865
  usedReceivingAddressesAction->setEnabled(enabled);
866
  openAction->setEnabled(enabled);
 
323
  signMessageAction->setStatusTip(tr("Sign messages with your Bitcoin addresses to prove you own them"));
324
  verifyMessageAction = new QAction(tr("&Verify message…"), this);
325
  verifyMessageAction->setStatusTip(tr("Verify messages to ensure they were signed with specified Bitcoin addresses"));
326
+ sweepPrivateKeyAction = new QAction(tr("Sweep private &key…"), this);
327
+ sweepPrivateKeyAction->setStatusTip(tr("Sweep funds from a transient private key to this wallet"));
328
  m_load_psbt_action = new QAction(tr("&Load PSBT from file…"), this);
329
  m_load_psbt_action->setStatusTip(tr("Load Partially Signed Bitcoin Transaction"));
330
  m_load_psbt_clipboard_action = new QAction(tr("Load PSBT from &clipboard…"), this);
 
400
  connect(m_load_psbt_clipboard_action, &QAction::triggered, [this]{ gotoLoadPSBT(true); });
401
  connect(verifyMessageAction, &QAction::triggered, [this]{ showNormalIfMinimized(); });
402
  connect(verifyMessageAction, &QAction::triggered, [this]{ gotoVerifyMessageTab(); });
403
+ connect(sweepPrivateKeyAction, &QAction::triggered, [this]{ showNormalIfMinimized(); });
404
+ connect(sweepPrivateKeyAction, &QAction::triggered, walletFrame, &WalletFrame::sweepPrivateKey);
405
  connect(usedSendingAddressesAction, &QAction::triggered, walletFrame, &WalletFrame::usedSendingAddresses);
406
  connect(usedReceivingAddressesAction, &QAction::triggered, walletFrame, &WalletFrame::usedReceivingAddresses);
407
  connect(openAction, &QAction::triggered, this, &BitcoinGUI::openClicked);
 
555
  file->addAction(openAction);
556
  file->addAction(signMessageAction);
557
  file->addAction(verifyMessageAction);
558
+ file->addAction(sweepPrivateKeyAction);
559
  file->addAction(m_load_psbt_action);
560
  file->addAction(m_load_psbt_clipboard_action);
561
  file->addSeparator();
 
866
  changePassphraseAction->setEnabled(enabled);
867
  signMessageAction->setEnabled(enabled);
868
  verifyMessageAction->setEnabled(enabled);
869
+ sweepPrivateKeyAction->setEnabled(enabled);
870
  usedSendingAddressesAction->setEnabled(enabled);
871
  usedReceivingAddressesAction->setEnabled(enabled);
872
  openAction->setEnabled(enabled);