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

jonasschnelli · 2018-05-18T12:39:20Z

Loading a wallet from a state where only the default wallet was active results in using an empty string for the initial/default wallet name.

This is a GUI only quick-fix that overrides wallet(s) with name "" to "[default wallet]". Does not affect getwalletinfo or listwallets.

Also, unsure if it should be fixed at a deeper level and if – instead of [default wallet] – it should use wallet.dat (the filename of the default wallet).

promag

Tested ACK 01356d5. Both wallet selectors work as expected.

I thought making the empty entry italic, but I guess [] also works.

Some nits for your consideration.

promag · 2018-05-18T13:36:03Z

src/qt/bitcoingui.cpp

@@ -552,8 +552,9 @@ bool BitcoinGUI::addWallet(WalletModel *walletModel)
    if(!walletFrame)
        return false;
    const QString name = walletModel->getWalletName();
+    QString display_name = (name == "") ? "["+tr("default wallet")+"]" : name;


name.isEmpty() ? ...

promag · 2018-05-18T13:39:37Z

src/qt/rpcconsole.cpp

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


name.isEmpty() ? ...

promag · 2018-05-18T13:42:56Z

src/qt/bitcoingui.cpp

@@ -572,6 +573,12 @@ bool BitcoinGUI::setCurrentWallet(const QString& name)
    return walletFrame->setCurrentWallet(name);
 }

+bool BitcoinGUI::setCurrentWalletBySelectorIndex(int index)
+{
+    QString internal_name = m_wallet_selector->itemData(index).toString();


nit, explicitly select Qt::UserRole?

I don't think this is necessary,... or what would be the benefits of explicitly set it? I don't expect multiple roles in that dropdown.

jonasschnelli · 2018-05-19T09:27:29Z

Fixed points reported by @promag

promag · 2018-05-21T15:30:03Z

reutACK 2885c13.

laanwj · 2018-05-28T15:08:14Z

utACK 2885c13

2885c13 Qt: use [default wallet] as name for wallet with no name (Jonas Schnelli) Pull request description: Loading a wallet from a state where only the default wallet was active results in using an empty string for the initial/default wallet name. This is a GUI only quick-fix that overrides wallet(s) with name "" to "[default wallet]". Does not affect `getwalletinfo` or `listwallets`. Also, unsure if it should be fixed at a deeper level and if – instead of [default wallet] – it should use `wallet.dat` (the filename of the default wallet). Tree-SHA512: 1d50dbb200b23df5ac53ce15aeb6453af4da354d6e6e53fe33ff075b477493254d6028b6d3569a7804b1aa616cb9a988a53de818937e37cdcb19cb70a90e2a88

Summary: 2885c13 Qt: use [default wallet] as name for wallet with no name (Jonas Schnelli) Pull request description: Loading a wallet from a state where only the default wallet was active results in using an empty string for the initial/default wallet name. This is a GUI only quick-fix that overrides wallet(s) with name "" to "[default wallet]". Does not affect `getwalletinfo` or `listwallets`. Also, unsure if it should be fixed at a deeper level and if – instead of [default wallet] – it should use `wallet.dat` (the filename of the default wallet). Tree-SHA512: 1d50dbb200b23df5ac53ce15aeb6453af4da354d6e6e53fe33ff075b477493254d6028b6d3569a7804b1aa616cb9a988a53de818937e37cdcb19cb70a90e2a88 Backport of Core PR13275 bitcoin/bitcoin#13275 Depends on D4236 Test Plan: make check bitcoin-qt -> Help -> Debug -> Console createwallet "testwallet" In the upper left corner under the menu bar, the drop down menu should say `[default wallet]`. Close the console window. The main window should still be dispaying the information for the default wallet. Reviewers: deadalnix, Fabien, jasonbcox, O1 Bitcoin ABC, #bitcoin_abc Reviewed By: deadalnix, O1 Bitcoin ABC, #bitcoin_abc Differential Revision: https://reviews.bitcoinabc.org/D4244

Summary: 2885c131b6b8ec1140e02ed8f2933c2ffbf41fd1 Qt: use [default wallet] as name for wallet with no name (Jonas Schnelli) Pull request description: Loading a wallet from a state where only the default wallet was active results in using an empty string for the initial/default wallet name. This is a GUI only quick-fix that overrides wallet(s) with name "" to "[default wallet]". Does not affect `getwalletinfo` or `listwallets`. Also, unsure if it should be fixed at a deeper level and if – instead of [default wallet] – it should use `wallet.dat` (the filename of the default wallet). Tree-SHA512: 1d50dbb200b23df5ac53ce15aeb6453af4da354d6e6e53fe33ff075b477493254d6028b6d3569a7804b1aa616cb9a988a53de818937e37cdcb19cb70a90e2a88 Backport of Core PR13275 bitcoin/bitcoin#13275 Depends on D4236 Test Plan: make check bitcoin-qt -> Help -> Debug -> Console createwallet "testwallet" In the upper left corner under the menu bar, the drop down menu should say `[default wallet]`. Close the console window. The main window should still be dispaying the information for the default wallet. Reviewers: deadalnix, Fabien, jasonbcox, O1 Bitcoin ABC, #bitcoin_abc Reviewed By: deadalnix, O1 Bitcoin ABC, #bitcoin_abc Differential Revision: https://reviews.bitcoinabc.org/D4244

… no name 2885c13 Qt: use [default wallet] as name for wallet with no name (Jonas Schnelli) Pull request description: Loading a wallet from a state where only the default wallet was active results in using an empty string for the initial/default wallet name. This is a GUI only quick-fix that overrides wallet(s) with name "" to "[default wallet]". Does not affect `getwalletinfo` or `listwallets`. Also, unsure if it should be fixed at a deeper level and if – instead of [default wallet] – it should use `wallet.dat` (the filename of the default wallet). Tree-SHA512: 1d50dbb200b23df5ac53ce15aeb6453af4da354d6e6e53fe33ff075b477493254d6028b6d3569a7804b1aa616cb9a988a53de818937e37cdcb19cb70a90e2a88

jonasschnelli added the GUI label May 18, 2018

promag reviewed May 18, 2018

View reviewed changes

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

2885c13

jonasschnelli force-pushed the 2018/05/loadwallet_gui_name branch from 01356d5 to 2885c13 Compare May 19, 2018 09:25

laanwj merged commit 2885c13 into bitcoin:master May 28, 2018

Bushstar mentioned this pull request May 29, 2018

commits from bitcoin/master FeatherCoin/Feathercoin#337

Merged

kiminuo mentioned this pull request May 20, 2021

cli: Improve -getinfo return format #21832

Merged

bitcoin locked as resolved and limited conversation to collaborators Sep 8, 2021

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

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

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

jonasschnelli commented May 18, 2018

Uh oh!

promag left a comment •

edited

Loading

Uh oh!

promag May 18, 2018

Uh oh!

promag May 18, 2018

Uh oh!

promag May 18, 2018

Uh oh!

jonasschnelli May 19, 2018

Uh oh!

jonasschnelli commented May 19, 2018 •

edited

Loading

Uh oh!

promag commented May 21, 2018

Uh oh!

laanwj commented May 28, 2018

Uh oh!

Uh oh!

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

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

Conversation

jonasschnelli commented May 18, 2018

Uh oh!

promag left a comment • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

promag May 18, 2018

Choose a reason for hiding this comment

Uh oh!

promag May 18, 2018

Choose a reason for hiding this comment

Uh oh!

promag May 18, 2018

Choose a reason for hiding this comment

Uh oh!

jonasschnelli May 19, 2018

Choose a reason for hiding this comment

Uh oh!

jonasschnelli commented May 19, 2018 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

promag commented May 21, 2018

Uh oh!

laanwj commented May 28, 2018

Uh oh!

Uh oh!

promag left a comment •

edited

Loading

jonasschnelli commented May 19, 2018 •

edited

Loading