phantom/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2025-01-12 04:42:36 -03:00
Code Issues Projects Releases Packages Wiki Activity Actions

qt: Use WalletModel* instead of wallet name in console window

Browse source
This commit is contained in:
João Barbosa 2019-01-04 12:17:53 +00:00
parent b2ce86c3ad
commit 91b0c5b096
2 changed files with 24 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

41
src/qt/rpcconsole.cpp
View file

@ -1,4 +1,4 @@
// Copyright (c) 2011-2018 The Bitcoin Core developers // Copyright (c) 2011-2019 The Bitcoin Core developers
// Distributed under the MIT software license, see the accompanying // Distributed under the MIT software license, see the accompanying
// file COPYING or http://www.opensource.org/licenses/mit-license.php. // file COPYING or http://www.opensource.org/licenses/mit-license.php.
@ -85,7 +85,7 @@ public:
explicit RPCExecutor(interfaces::Node& node) : m_node(node) {} explicit RPCExecutor(interfaces::Node& node) : m_node(node) {}
public Q_SLOTS: public Q_SLOTS:
void request(const QString &command, const QString &walletID); void request(const QString &command, const WalletModel* wallet_model);
Q_SIGNALS: Q_SIGNALS:
void reply(int category, const QString &command); void reply(int category, const QString &command);
@ -148,7 +148,7 @@ public:
* @param[out] pstrFilteredOut Command line, filtered to remove any sensitive data * @param[out] pstrFilteredOut Command line, filtered to remove any sensitive data
*/ */
bool RPCConsole::RPCParseCommandLine(interfaces::Node* node, std::string &strResult, const std::string &strCommand, const bool fExecute, std::string * const pstrFilteredOut, const std::string *walletID) bool RPCConsole::RPCParseCommandLine(interfaces::Node* node, std::string &strResult, const std::string &strCommand, const bool fExecute, std::string * const pstrFilteredOut, const WalletModel* wallet_model)
{ {
std::vector< std::vector<std::string> > stack; std::vector< std::vector<std::string> > stack;
stack.push_back(std::vector<std::string>()); stack.push_back(std::vector<std::string>());
@ -306,8 +306,8 @@ bool RPCConsole::RPCParseCommandLine(interfaces::Node* node, std::string &strRes
std::string method = stack.back()[0]; std::string method = stack.back()[0];
std::string uri; std::string uri;
#ifdef ENABLE_WALLET #ifdef ENABLE_WALLET
if (walletID) { if (wallet_model) {
QByteArray encodedName = QUrl::toPercentEncoding(QString::fromStdString(*walletID)); QByteArray encodedName = QUrl::toPercentEncoding(wallet_model->getWalletName());
uri = "/wallet/"+std::string(encodedName.constData(), encodedName.length()); uri = "/wallet/"+std::string(encodedName.constData(), encodedName.length());
} }
#endif #endif
@ -387,7 +387,7 @@ bool RPCConsole::RPCParseCommandLine(interfaces::Node* node, std::string &strRes
} }
} }
void RPCExecutor::request(const QString &command, const QString &walletID) void RPCExecutor::request(const QString &command, const WalletModel* wallet_model)
{ {
try try
{ {
@ -418,9 +418,7 @@ void RPCExecutor::request(const QString &command, const QString &walletID)
" example: getblock(getblockhash(0),true)[tx][0]\n\n"))); " example: getblock(getblockhash(0),true)[tx][0]\n\n")));
return; return;
} }
std::string wallet_id = walletID.toStdString(); if (!RPCConsole::RPCExecuteCommandLine(m_node, result, executableCommand, nullptr, wallet_model)) {
if (!RPCConsole::RPCExecuteCommandLine(m_node, result, executableCommand, nullptr, walletID.isNull() ? nullptr : &wallet_id))
{
Q_EMIT reply(RPCConsole::CMD_ERROR, QString("Parse error: unbalanced ' or \"")); Q_EMIT reply(RPCConsole::CMD_ERROR, QString("Parse error: unbalanced ' or \""));
return; return;
} }
@ -698,10 +696,8 @@ void RPCConsole::setClientModel(ClientModel *model)
#ifdef ENABLE_WALLET #ifdef ENABLE_WALLET
void RPCConsole::addWallet(WalletModel * const walletModel) void RPCConsole::addWallet(WalletModel * const walletModel)
{ {
const QString name = walletModel->getWalletName(); // use name for text and wallet model for internal data object (to allow to move to a wallet id later)
// use name for text and internal data object (to allow to move to a wallet id later) ui->WalletSelector->addItem(walletModel->getDisplayName(), QVariant::fromValue(walletModel));
const QString display_name = walletModel->getDisplayName();
ui->WalletSelector->addItem(display_name, name);
if (ui->WalletSelector->count() == 2 && !isVisible()) { if (ui->WalletSelector->count() == 2 && !isVisible()) {
// First wallet added, set to default so long as the window isn't presently visible (and potentially in use) // First wallet added, set to default so long as the window isn't presently visible (and potentially in use)
ui->WalletSelector->setCurrentIndex(1); ui->WalletSelector->setCurrentIndex(1);
@ -714,8 +710,7 @@ void RPCConsole::addWallet(WalletModel * const walletModel)
void RPCConsole::removeWallet(WalletModel * const walletModel) void RPCConsole::removeWallet(WalletModel * const walletModel)
{ {
const QString name = walletModel->getWalletName(); ui->WalletSelector->removeItem(ui->WalletSelector->findData(QVariant::fromValue(walletModel)));
ui->WalletSelector->removeItem(ui->WalletSelector->findData(name));
if (ui->WalletSelector->count() == 2) { if (ui->WalletSelector->count() == 2) {
ui->WalletSelector->setVisible(false); ui->WalletSelector->setVisible(false);
ui->WalletSelectorLabel->setVisible(false); ui->WalletSelectorLabel->setVisible(false);
@ -910,25 +905,25 @@ void RPCConsole::on_lineEdit_returnPressed()
cmdBeforeBrowsing = QString(); cmdBeforeBrowsing = QString();
QString walletID; WalletModel* wallet_model{nullptr};
#ifdef ENABLE_WALLET #ifdef ENABLE_WALLET
const int wallet_index = ui->WalletSelector->currentIndex(); const int wallet_index = ui->WalletSelector->currentIndex();
if (wallet_index > 0) { if (wallet_index > 0) {
walletID = (QString)ui->WalletSelector->itemData(wallet_index).value<QString>(); wallet_model = ui->WalletSelector->itemData(wallet_index).value<WalletModel*>();
} }
if (m_last_wallet_id != walletID) { if (m_last_wallet_model != wallet_model) {
if (walletID.isNull()) { if (wallet_model) {
message(CMD_REQUEST, tr("Executing command without any wallet")); message(CMD_REQUEST, tr("Executing command using \"%1\" wallet").arg(wallet_model->getWalletName()));
} else { } else {
message(CMD_REQUEST, tr("Executing command using \"%1\" wallet").arg(walletID)); message(CMD_REQUEST, tr("Executing command without any wallet"));
} }
m_last_wallet_id = walletID; m_last_wallet_model = wallet_model;
} }
#endif #endif
message(CMD_REQUEST, QString::fromStdString(strFilteredCmd)); message(CMD_REQUEST, QString::fromStdString(strFilteredCmd));
Q_EMIT cmdRequest(cmd, walletID); Q_EMIT cmdRequest(cmd, m_last_wallet_model);
cmd = QString::fromStdString(strFilteredCmd); cmd = QString::fromStdString(strFilteredCmd);

12
src/qt/rpcconsole.h
View file

@ -1,4 +1,4 @@
// Copyright (c) 2011-2018 The Bitcoin Core developers // Copyright (c) 2011-2019 The Bitcoin Core developers
// Distributed under the MIT software license, see the accompanying // Distributed under the MIT software license, see the accompanying
// file COPYING or http://www.opensource.org/licenses/mit-license.php. // file COPYING or http://www.opensource.org/licenses/mit-license.php.
@ -41,9 +41,9 @@ public:
explicit RPCConsole(interfaces::Node& node, const PlatformStyle *platformStyle, QWidget *parent); explicit RPCConsole(interfaces::Node& node, const PlatformStyle *platformStyle, QWidget *parent);
~RPCConsole(); ~RPCConsole();
static bool RPCParseCommandLine(interfaces::Node* node, std::string &strResult, const std::string &strCommand, bool fExecute, std::string * const pstrFilteredOut = nullptr, const std::string *walletID = nullptr); static bool RPCParseCommandLine(interfaces::Node* node, std::string &strResult, const std::string &strCommand, bool fExecute, std::string * const pstrFilteredOut = nullptr, const WalletModel* wallet_model = nullptr);
static bool RPCExecuteCommandLine(interfaces::Node& node, std::string &strResult, const std::string &strCommand, std::string * const pstrFilteredOut = nullptr, const std::string *walletID = nullptr) { static bool RPCExecuteCommandLine(interfaces::Node& node, std::string &strResult, const std::string &strCommand, std::string * const pstrFilteredOut = nullptr, const WalletModel* wallet_model = nullptr) {
return RPCParseCommandLine(&node, strResult, strCommand, true, pstrFilteredOut, walletID); return RPCParseCommandLine(&node, strResult, strCommand, true, pstrFilteredOut, wallet_model);
} }
void setClientModel(ClientModel *model); void setClientModel(ClientModel *model);
@ -133,7 +133,7 @@ public Q_SLOTS:
Q_SIGNALS: Q_SIGNALS:
// For RPC command executor // For RPC command executor
void stopExecutor(); void stopExecutor();
void cmdRequest(const QString &command, const QString &walletID); void cmdRequest(const QString &command, const WalletModel* wallet_model);
private: private:
void startExecutor(); void startExecutor();
@ -165,7 +165,7 @@ private:
int consoleFontSize = 0; int consoleFontSize = 0;
QCompleter *autoCompleter = nullptr; QCompleter *autoCompleter = nullptr;
QThread thread; QThread thread;
QString m_last_wallet_id; WalletModel* m_last_wallet_model{nullptr};
/** Update UI with latest network info from model. */ /** Update UI with latest network info from model. */
void updateNetworkState(); void updateNetworkState();