diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2013-04-01 07:44:03 -0700 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2013-04-01 07:44:03 -0700 |
| commit | 300f747ec33181a5cbac0db1c2a07f122aba358a (patch) | |
| tree | 93c9d562fadc092ce908b5578655e39721900565 /src/qt/bitcoingui.cpp | |
| parent | 7706c63ddab9bfa8783be00d5aea8b39a0d5fdb7 (diff) | |
| parent | abf11f79ae2a9767778b36a2f9e0c4bc97624602 (diff) | |
| download | bitcoin-300f747ec33181a5cbac0db1c2a07f122aba358a.tar.xz | |
Merge pull request #2437 from Diapolo/Qt_fixes
fix "send coins" via context menu in address book
Diffstat (limited to 'src/qt/bitcoingui.cpp')
| -rw-r--r-- | src/qt/bitcoingui.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/qt/bitcoingui.cpp b/src/qt/bitcoingui.cpp index 7530128fd7..e41ce96082 100644 --- a/src/qt/bitcoingui.cpp +++ b/src/qt/bitcoingui.cpp @@ -205,7 +205,7 @@ void BitcoinGUI::createActions() connect(historyAction, SIGNAL(triggered()), this, SLOT(gotoHistoryPage())); connect(addressBookAction, SIGNAL(triggered()), this, SLOT(showNormalIfMinimized())); connect(addressBookAction, SIGNAL(triggered()), this, SLOT(gotoAddressBookPage())); - + quitAction = new QAction(QIcon(":/icons/quit"), tr("E&xit"), this); quitAction->setStatusTip(tr("Quit application")); quitAction->setShortcut(QKeySequence(Qt::CTRL + Qt::Key_Q)); @@ -476,9 +476,9 @@ void BitcoinGUI::gotoReceiveCoinsPage() if (walletFrame) walletFrame->gotoReceiveCoinsPage(); } -void BitcoinGUI::gotoSendCoinsPage() +void BitcoinGUI::gotoSendCoinsPage(QString addr) { - if (walletFrame) walletFrame->gotoSendCoinsPage(); + if (walletFrame) walletFrame->gotoSendCoinsPage(addr); } void BitcoinGUI::gotoSignMessageTab(QString addr) @@ -701,7 +701,7 @@ void BitcoinGUI::askFee(qint64 nFeeRequired, bool *payFee) void BitcoinGUI::incomingTransaction(const QString& date, int unit, qint64 amount, const QString& type, const QString& address) { - // On new transaction, make an info balloon + // On new transaction, make an info balloon message((amount)<0 ? tr("Sent transaction") : tr("Incoming transaction"), tr("Date: %1\n" "Amount: %2\n" |