diff options
| author | Philip Kaufmann <[email protected]> | 2013-10-24 15:49:13 +0200 |
|---|---|---|
| committer | Philip Kaufmann <[email protected]> | 2013-10-25 14:24:30 +0200 |
| commit | 2384a2864b6a0b29eec6410057aefe1fd8e7e585 (patch) | |
| tree | 13442ace1c06ba82339e8daad62557abeb7ab7d3 /src/qt/bitcoingui.cpp | |
| parent | Merge pull request #3099 from laanwj/2013_10_new_receive_flow (diff) | |
| download | discoin-2384a2864b6a0b29eec6410057aefe1fd8e7e585.tar.xz discoin-2384a2864b6a0b29eec6410057aefe1fd8e7e585.zip | |
allow emit message() in sendcoinsdialog and walletview
- this allows us to use emit message() over MessageBox:: or gui->message()
calls in sendcoinsdialog and walletview
- move main handlePaymentRequest() functionality back to BitcoinGUI
- move a showNormalIfMinimized() before gotoSendCoinsPage()
Diffstat (limited to 'src/qt/bitcoingui.cpp')
| -rw-r--r-- | src/qt/bitcoingui.cpp | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/src/qt/bitcoingui.cpp b/src/qt/bitcoingui.cpp index b210e22b6..41191733e 100644 --- a/src/qt/bitcoingui.cpp +++ b/src/qt/bitcoingui.cpp @@ -752,9 +752,17 @@ bool BitcoinGUI::eventFilter(QObject *object, QEvent *event) return QMainWindow::eventFilter(object, event); } -void BitcoinGUI::handlePaymentRequest(const SendCoinsRecipient& recipient) +bool BitcoinGUI::handlePaymentRequest(const SendCoinsRecipient& recipient) { - walletFrame->handlePaymentRequest(recipient); + // URI has to be valid + if (walletFrame->handlePaymentRequest(recipient)) + { + showNormalIfMinimized(); + gotoSendCoinsPage(); + return true; + } + else + return false; } void BitcoinGUI::setEncryptionStatus(int status) |