aboutsummaryrefslogtreecommitdiff
path: root/src/qt/walletview.cpp
diff options
context:
space:
mode:
authorPhilip Kaufmann <phil.kaufmann@t-online.de>2013-08-02 13:53:03 +0200
committerPhilip Kaufmann <phil.kaufmann@t-online.de>2013-08-23 09:10:31 +0200
commitdbc0a6aba2cf94aa1b167145a18e0b9c671aef5b (patch)
tree88a2ba112bc8c6fb3353327c5579c830f7868ff4 /src/qt/walletview.cpp
parente62f8d72f349aec0865268c089ae99fedd314af1 (diff)
downloadbitcoin-dbc0a6aba2cf94aa1b167145a18e0b9c671aef5b.tar.xz
Bitcoin-Qt: tweak Qt walletXXX.cpp/h code
WalletView: - add new signal showNormalIfMinimized() - emit the new signal in handleURI() to fix a bug, preventing the main window to show up when using bitcoin: URIs WalletStack: - connect the showNormalIfMinimized() signal from WalletView with the showNormalIfMinimized() slot in BitcoinGUI - rework setCurrentWallet() to return a bool - add check for valid walletModel in addWallet() - add missing gui attribute initialisation in constructor WalletFrame: - remove unused or unneded class attributes gui and clientModel - add a check for valid clientModel in setClientModel() General: - small code formatting changes
Diffstat (limited to 'src/qt/walletview.cpp')
-rw-r--r--src/qt/walletview.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/qt/walletview.cpp b/src/qt/walletview.cpp
index 0a6a4028a0..efb74efaa0 100644
--- a/src/qt/walletview.cpp
+++ b/src/qt/walletview.cpp
@@ -137,7 +137,7 @@ void WalletView::setWalletModel(WalletModel *walletModel)
void WalletView::incomingTransaction(const QModelIndex& parent, int start, int /*end*/)
{
// Prevent balloon-spam when initial block download is in progress
- if(!walletModel || !clientModel || clientModel->inInitialBlockDownload())
+ if (!walletModel || !clientModel || clientModel->inInitialBlockDownload())
return;
TransactionTableModel *ttm = walletModel->getTransactionTableModel();
@@ -207,6 +207,7 @@ bool WalletView::handlePaymentRequest(const SendCoinsRecipient& recipient)
if (sendCoinsPage->handlePaymentRequest(recipient))
{
gotoSendCoinsPage();
+ emit showNormalIfMinimized();
return true;
}
else