Merge pull request #853 from laanwj/2012_02_altminimizetray
authorWladimir J. van der Laan <laanwj@gmail.com>
Mon, 27 Feb 2012 06:27:25 +0000 (22:27 -0800)
committerWladimir J. van der Laan <laanwj@gmail.com>
Mon, 27 Feb 2012 06:27:25 +0000 (22:27 -0800)
Yet another alternative "minimize to tray" implementation

Fixes problems with window positioning.

1  2 
src/qt/bitcoingui.cpp
src/qt/bitcoingui.h

@@@ -256,9 -245,8 +251,9 @@@ void BitcoinGUI::createActions(
      connect(optionsAction, SIGNAL(triggered()), this, SLOT(optionsClicked()));
      connect(aboutAction, SIGNAL(triggered()), this, SLOT(aboutClicked()));
      connect(aboutQtAction, SIGNAL(triggered()), qApp, SLOT(aboutQt()));
-     connect(openBitcoinAction, SIGNAL(triggered()), this, SLOT(showNormal()));
+     connect(openBitcoinAction, SIGNAL(triggered()), this, SLOT(showNormalIfMinimized()));
      connect(encryptWalletAction, SIGNAL(triggered(bool)), this, SLOT(encryptWallet(bool)));
 +    connect(backupWalletAction, SIGNAL(triggered()), this, SLOT(backupWallet()));
      connect(changePassphraseAction, SIGNAL(triggered()), this, SLOT(changePassphrase()));
  }
  
Simple merge