Merge master

This commit is contained in:
Aditya Kulkarni
2019-02-04 13:42:51 -08:00
9 changed files with 14 additions and 9 deletions

View File

@@ -1044,12 +1044,15 @@ void MainWindow::setupTransactionsTab() {
QString memo = txModel->getMemo(index.row());
if (!memo.isEmpty()) {
QMessageBox::information(this, tr("Memo"), memo, QMessageBox::Ok);
QMessageBox mb(QMessageBox::Information, tr("Memo"), memo, QMessageBox::Ok, this);
mb.setTextInteractionFlags(Qt::TextSelectableByMouse | Qt::TextSelectableByKeyboard);
mb.exec();
}
});
// Set up context menu on transactions tab
ui->transactionsTable->setContextMenuPolicy(Qt::CustomContextMenu);
// Table right click
QObject::connect(ui->transactionsTable, &QTableView::customContextMenuRequested, [=] (QPoint pos) {
QModelIndex index = ui->transactionsTable->indexAt(pos);
@@ -1087,7 +1090,9 @@ void MainWindow::setupTransactionsTab() {
if (!memo.isEmpty()) {
menu.addAction(tr("View Memo"), [=] () {
QMessageBox::information(this, tr("Memo"), memo, QMessageBox::Ok);
QMessageBox mb(QMessageBox::Information, tr("Memo"), memo, QMessageBox::Ok, this);
mb.setTextInteractionFlags(Qt::TextSelectableByMouse | Qt::TextSelectableByKeyboard);
mb.exec();
});
}