Skip to content

Conversation

@CodeShark
Copy link
Contributor

This commit is a minimal restructuring necessary to support multiple wallets in the UI going forward. Please read https://github.com/CodeShark/bitcoin/blob/5bf2943a81e0937e4be0e8d2c6b4545b8d320cc4/multiwallet-qt.txt for details.

@BitcoinPullTester
Copy link

Automatic sanity-testing: PASSED, see http://jenkins.bluematt.me/pull-tester/4af611676b784df41a9771792e828d62756c448d for binaries and test log.

@CodeShark
Copy link
Contributor Author

#2184 already implements dynamic loading and unloading of wallets. But in the interest of incremental commits that are easier to verify, I decided to open this new pull request with the idea of having a discussion on the UI design and merging in these changes first before attempting to merge in #2124 and #2184.

@BitcoinPullTester
Copy link

Automatic sanity-testing: PASSED, see http://jenkins.bluematt.me/pull-tester/5bf2943a81e0937e4be0e8d2c6b4545b8d320cc4 for binaries and test log.

@BitcoinPullTester
Copy link

Automatic sanity-testing: PASSED, see http://jenkins.bluematt.me/pull-tester/ea02ca6e44b089ecdd5395d0255857a1023914e3 for binaries and test log.

@laanwj
Copy link
Member

laanwj commented Feb 24, 2013

Can you rebase this? Now that 0.8.0 final is out, I intend to test and merge it soon.

@laanwj
Copy link
Member

laanwj commented Mar 22, 2013

@CodeShark I still plan to merge this as one of the next things, can you rebase please?

@CodeShark
Copy link
Contributor Author

I'm on it...

@CodeShark
Copy link
Contributor Author

Let me fix up some whitespace issues before you merge.

@CodeShark
Copy link
Contributor Author

Allright, laanwj, it's all yours :)
Let me know if you need anything else.

@jgarzik
Copy link
Contributor

jgarzik commented Mar 22, 2013

Fix the commit message, please

…n bitcoin-qt

- This commit is a minimal restructuring necessary to support multiple wallets in the UI. Please see multiwallet-qt.txt for details.
@Diapolo
Copy link

Diapolo commented Mar 22, 2013

The last rebase includes all current changes, i.e. the header and cpp cleanup pull? Then I'm fine with starting the evolution ^^.

laanwj added a commit that referenced this pull request Mar 29, 2013
@laanwj laanwj merged commit 67155d9 into bitcoin:master Mar 29, 2013
@laanwj
Copy link
Member

laanwj commented Mar 29, 2013

Merged (manually due to slight #include conflict that I introduced by merging another pull)

@Diapolo
Copy link

Diapolo commented Apr 1, 2013

@CodeShark Is it intended that bitcoingui.cpp and walletview.cpp seem to have quite much duplicate code in them? It would also be nice, if you could take a look at #2436. I created pulls for some other stuff that was not working, but perhaps there is more. We need to be really careful with such pulls IMHO.

laudney pushed a commit to reddcoin-project/reddcoin-3.10 that referenced this pull request Mar 19, 2014
laudney pushed a commit to reddcoin-project/reddcoin-3.10 that referenced this pull request Mar 19, 2014
- the send coins context menu entry was not working anymore, because
  a non current version of bitcoin#2220 was merged onto current master
- also removes some unneeded spaces and adds a comment to
  WalletModel::getNumTransactions()
laudney pushed a commit to reddcoin-project/reddcoin-3.10 that referenced this pull request Mar 19, 2014
- fix debug window, by re-adding rpcConsole->setClientModel(clientModel);
  in BitcoinGUI::setClientModel(), which was removed by bitcoin#2220
@bitcoin bitcoin locked as resolved and limited conversation to collaborators Sep 8, 2021
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants