diff options
author | Luke Dashjr <luke-jr+git@utopios.org> | 2012-08-12 17:22:59 +0000 |
---|---|---|
committer | Luke Dashjr <luke-jr+git@utopios.org> | 2012-08-12 17:22:59 +0000 |
commit | 92dfcea0e986e000e9f5ee8d7f6b847a5bd41d25 (patch) | |
tree | 16335bc5d2d0fc03dfb38154b49233ad9b35f93d /src/qt/bitcoingui.cpp | |
parent | 23cdae18f08f9435b33718ba2fb00c66dc130b80 (diff) | |
parent | 3171daef6c106023a5fcbc80e66c0e0a9552c4d8 (diff) | |
download | bitcoin-92dfcea0e986e000e9f5ee8d7f6b847a5bd41d25.tar.xz |
Merge branch '0.6.0.x' into 0.6.x
Diffstat (limited to 'src/qt/bitcoingui.cpp')
-rw-r--r-- | src/qt/bitcoingui.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/qt/bitcoingui.cpp b/src/qt/bitcoingui.cpp index a917bc3b69..3aa67bca5f 100644 --- a/src/qt/bitcoingui.cpp +++ b/src/qt/bitcoingui.cpp @@ -155,7 +155,7 @@ BitcoinGUI::BitcoinGUI(QWidget *parent): // Clicking on a transaction on the overview page simply sends you to transaction history page connect(overviewPage, SIGNAL(transactionClicked(QModelIndex)), this, SLOT(gotoHistoryPage())); - // Doubleclicking on a transaction on the transaction history page shows details + // Double-clicking on a transaction on the transaction history page shows details connect(transactionView, SIGNAL(doubleClicked(QModelIndex)), transactionView, SLOT(showDetails())); gotoOverviewPage(); @@ -362,7 +362,7 @@ void BitcoinGUI::setWalletModel(WalletModel *walletModel) setEncryptionStatus(walletModel->getEncryptionStatus()); connect(walletModel, SIGNAL(encryptionStatusChanged(int)), this, SLOT(setEncryptionStatus(int))); - // Balloon popup for new transaction + // Balloon pop-up for new transaction connect(walletModel->getTransactionTableModel(), SIGNAL(rowsInserted(QModelIndex,int,int)), this, SLOT(incomingTransaction(QModelIndex,int,int))); |