qt: merge walletstack and walletframe #3109

pull laanwj wants to merge 2 commits into bitcoin:master from laanwj:2013_10_remove_walletstack changing 10 files +133 −349

laanwj commented at 4:08 PM on October 18, 2013: member

There were too many levels of indirection here, and the functionality of walletframe and walletstack can easily be merged. This commit merges the two which cuts a lot of lines of boilerplate code.

qt: merge walletstack and walletframe

There were too many levels of indirection here, and the functionality of
walletframe and walletstack can easily be merged. This commit
merges the two which cuts a lot of lines of boilerplate code.

26702e6930

Diapolo commented at 2:29 PM on October 19, 2013: none

I think this is the right thing to do, I didn't yet check the code though.
in src/qt/walletstack.cpp:None in 1871b8dd2b outdated
```
  41 | -	connect(walletView, SIGNAL(showNormalIfMinimized()), gui, SLOT(showNormalIfMinimized()));
  42 | -
  43 | -    return true;
  44 | -}
  45 | -
  46 | -bool WalletStack::removeWallet(const QString& name)
```
Diapolo commented at 2:33 PM on October 19, 2013:

This is gone in favor of just removeAllWallets()?

laanwj commented at 3:36 PM on October 19, 2013:

Huh, seems that it was never called at all from WalletFrame. I'll bring the function back there.

in src/qt/walletframe.cpp:None in 1871b8dd2b outdated

  45 | +    walletView->setBitcoinGUI(gui);
  46 | +    walletView->setClientModel(clientModel);
  47 | +    walletView->setWalletModel(walletModel);
  48 | +    walletView->showOutOfSyncWarning(bOutOfSync);
  49 | +
  50 | +    walletView->gotoOverviewPage(); /* XXX we should go to the currently selected page */

Diapolo commented at 2:34 PM on October 19, 2013:

Perhaps make this a Todo instead of XXX?

Diapolo commented at 2:36 PM on October 19, 2013: none

If I remember we have a file in doc, which needs to get a small update after this merge also?

qt: remove awkward way of setting GUI pages

Selecting the button for a pages was going through bitcoingui->walletframe->walletview->bitcoingui.
Because of this, the actions for the pages had to be exposed on the BitcoinGUI object.

163145938c

laanwj commented at 3:52 PM on October 19, 2013: member

Ok, updated for your comments
BitcoinPullTester commented at 4:04 PM on October 19, 2013: none

Automatic sanity-testing: PASSED, see http://jenkins.bluematt.me/pull-tester/163145938ca2ff52e633136ca49e89f880f8e89b for binaries and test log. This test script verifies pulls every time they are updated. It, however, dies sometimes and fails to test properly. If you are waiting on a test, please check timestamps to verify that the test.log is moving at http://jenkins.bluematt.me/pull-tester/current/ Contact BlueMatt on freenode if something looks broken.
gavinandresen commented at 7:10 AM on October 20, 2013: contributor

ACK, compiles and runs nicely on OSX.
laanwj referenced this in commit 00f198c9a5 on Oct 20, 2013
laanwj merged this on Oct 20, 2013
laanwj closed this on Oct 20, 2013
laanwj deleted the branch on Apr 9, 2014
Bushstar referenced this in commit 43b7c31d96 on Apr 8, 2020
DrahtBot locked this on Sep 8, 2021

Contributors