Merge branch 'master' of github.com:laanwj/bitcoin-qt
This commit is contained in:
commit
4181184acf
|
@ -82,6 +82,7 @@ private slots:
|
|||
void copyClipboardClicked();
|
||||
void trayIconActivated(QSystemTrayIcon::ActivationReason reason);
|
||||
void transactionDetails(const QModelIndex& idx);
|
||||
void incomingTransaction(const QModelIndex & parent, int start, int end);
|
||||
};
|
||||
|
||||
#endif
|
||||
|
|
|
@ -82,7 +82,7 @@ void AddressBookDialog::on_copyToClipboard_clicked()
|
|||
|
||||
foreach (QModelIndex index, indexes)
|
||||
{
|
||||
QVariant address = table->model()->data(index);
|
||||
QVariant address = index.data();
|
||||
QApplication::clipboard()->setText(address.toString());
|
||||
}
|
||||
}
|
||||
|
@ -94,6 +94,9 @@ void AddressBookDialog::on_editButton_clicked()
|
|||
{
|
||||
return;
|
||||
}
|
||||
/* Map selected index to source address book model */
|
||||
QAbstractProxyModel *proxy_model = static_cast<QAbstractProxyModel*>(getCurrentTable()->model());
|
||||
QModelIndex selected = proxy_model->mapToSource(indexes.at(0));
|
||||
|
||||
/* Double click also triggers edit button */
|
||||
EditAddressDialog dlg(
|
||||
|
@ -101,7 +104,7 @@ void AddressBookDialog::on_editButton_clicked()
|
|||
EditAddressDialog::EditSendingAddress :
|
||||
EditAddressDialog::EditReceivingAddress);
|
||||
dlg.setModel(model);
|
||||
dlg.loadRow(indexes.at(0).row());
|
||||
dlg.loadRow(selected.row());
|
||||
if(dlg.exec())
|
||||
{
|
||||
dlg.saveCurrentRow();
|
||||
|
|
|
@ -214,7 +214,7 @@ QWidget *BitcoinGUI::createTabs()
|
|||
QTableView *view = new QTableView(this);
|
||||
tabs->addTab(view, tab_labels.at(i));
|
||||
|
||||
connect(view, SIGNAL(activated(const QModelIndex&)), this, SLOT(transactionDetails(const QModelIndex&)));
|
||||
connect(view, SIGNAL(doubleClicked(const QModelIndex&)), this, SLOT(transactionDetails(const QModelIndex&)));
|
||||
transactionViews.append(view);
|
||||
}
|
||||
|
||||
|
@ -257,6 +257,9 @@ void BitcoinGUI::setTabsModel(QAbstractItemModel *transaction_model)
|
|||
transaction_table->horizontalHeader()->resizeSection(
|
||||
TransactionTableModel::Credit, 79);
|
||||
}
|
||||
|
||||
connect(transaction_model, SIGNAL(rowsInserted(const QModelIndex &, int, int)),
|
||||
this, SLOT(incomingTransaction(const QModelIndex &, int, int)));
|
||||
}
|
||||
|
||||
void BitcoinGUI::sendcoinsClicked()
|
||||
|
@ -407,3 +410,25 @@ void BitcoinGUI::transactionDetails(const QModelIndex& idx)
|
|||
dlg.exec();
|
||||
}
|
||||
|
||||
void BitcoinGUI::incomingTransaction(const QModelIndex & parent, int start, int end)
|
||||
{
|
||||
TransactionTableModel *ttm = model->getTransactionTableModel();
|
||||
qint64 credit = ttm->index(start, TransactionTableModel::Credit, parent)
|
||||
.data(Qt::EditRole).toULongLong();
|
||||
qint64 debit = ttm->index(start, TransactionTableModel::Debit, parent)
|
||||
.data(Qt::EditRole).toULongLong();
|
||||
if((credit+debit)>0)
|
||||
{
|
||||
/* On incoming transaction, make an info balloon */
|
||||
QString date = ttm->index(start, TransactionTableModel::Date, parent)
|
||||
.data().toString();
|
||||
QString description = ttm->index(start, TransactionTableModel::Description, parent)
|
||||
.data().toString();
|
||||
|
||||
trayIcon->showMessage(tr("Incoming transaction"),
|
||||
"Date: " + date + "\n" +
|
||||
"Amount: " + QString::fromStdString(FormatMoney(credit+debit, true)) + "\n" +
|
||||
description,
|
||||
QSystemTrayIcon::Information);
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue