LBRYCommunity/lbrycrd
1
0
Fork 0
Code Issues 29 Pull requests 1 Projects Releases 32 Packages Wiki Activity

Qt: use [default wallet] as name for wallet with no name

Browse source
This commit is contained in:
Jonas Schnelli 2018-05-18 14:34:53 +02:00
parent 1a8b12c69c
commit 2885c131b6
No known key found for this signature in database
GPG key ID: 1EB776BB03C7922D
3 changed files with 12 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/qt/bitcoingui.cpp
View file

@ -476,7 +476,7 @@ void BitcoinGUI::createToolBars()
toolbar->addWidget(spacer); toolbar->addWidget(spacer);
m_wallet_selector = new QComboBox(); m_wallet_selector = new QComboBox();
connect(m_wallet_selector, SIGNAL(currentIndexChanged(const QString&)), this, SLOT(setCurrentWallet(const QString&))); connect(m_wallet_selector, SIGNAL(currentIndexChanged(int)), this, SLOT(setCurrentWalletBySelectorIndex(int)));
#endif #endif
} }
} }
@ -552,8 +552,9 @@ bool BitcoinGUI::addWallet(WalletModel *walletModel)
if(!walletFrame) if(!walletFrame)
return false; return false;
const QString name = walletModel->getWalletName(); const QString name = walletModel->getWalletName();
QString display_name = name.isEmpty() ? "["+tr("default wallet")+"]" : name;
setWalletActionsEnabled(true); setWalletActionsEnabled(true);
m_wallet_selector->addItem(name); m_wallet_selector->addItem(display_name, name);
if (m_wallet_selector->count() == 2) { if (m_wallet_selector->count() == 2) {
m_wallet_selector_label = new QLabel(); m_wallet_selector_label = new QLabel();
m_wallet_selector_label->setText(tr("Wallet:") + " "); m_wallet_selector_label->setText(tr("Wallet:") + " ");
@ -572,6 +573,12 @@ bool BitcoinGUI::setCurrentWallet(const QString& name)
return walletFrame->setCurrentWallet(name); return walletFrame->setCurrentWallet(name);
} }
bool BitcoinGUI::setCurrentWalletBySelectorIndex(int index)
{
QString internal_name = m_wallet_selector->itemData(index).toString();
return setCurrentWallet(internal_name);
}
void BitcoinGUI::removeAllWallets() void BitcoinGUI::removeAllWallets()
{ {
if(!walletFrame) if(!walletFrame)

1
src/qt/bitcoingui.h
View file

@ -186,6 +186,7 @@ public Q_SLOTS:
#ifdef ENABLE_WALLET #ifdef ENABLE_WALLET
bool setCurrentWallet(const QString& name); bool setCurrentWallet(const QString& name);
bool setCurrentWalletBySelectorIndex(int index);
/** Set the UI status indicators based on the currently selected wallet. /** Set the UI status indicators based on the currently selected wallet.
*/ */
void updateWalletStatus(); void updateWalletStatus();

3
src/qt/rpcconsole.cpp
View file

@ -702,7 +702,8 @@ void RPCConsole::addWallet(WalletModel * const walletModel)
{ {
const QString name = walletModel->getWalletName(); const QString name = walletModel->getWalletName();
// use name for text and 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(name, name); QString display_name = name.isEmpty() ? "["+tr("default wallet")+"]" : name;
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);