Merge pull request #2437 from Diapolo/Qt_fixes
fix "send coins" via context menu in address book
This commit is contained in:
@@ -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"
|
||||
|
||||
Reference in New Issue
Block a user