diff --git a/.gitignore b/.gitignore index 7705e94..6e542ec 100644 --- a/.gitignore +++ b/.gitignore @@ -4,6 +4,7 @@ release/ x64/ artifacts/ .vscode/ +res/libsodium.a res/libsodium/libsodium* res/libsodium.a src/ui_*.h diff --git a/res/zec_qt_wallet_de.ts b/res/zec_qt_wallet_de.ts index e12c1fc..b086065 100644 --- a/res/zec_qt_wallet_de.ts +++ b/res/zec_qt_wallet_de.ts @@ -1405,7 +1405,7 @@ You either have unconfirmed funds or the balance is too low for an automatic mig - Please chose a directory to store your wallet.dat and blockchain + Please choose a directory to store your wallet.dat and blockchain diff --git a/res/zec_qt_wallet_es.ts b/res/zec_qt_wallet_es.ts index dbcaa7b..23cbf78 100644 --- a/res/zec_qt_wallet_es.ts +++ b/res/zec_qt_wallet_es.ts @@ -1421,7 +1421,7 @@ El saldo es insuficiente para una migración automática. - Please chose a directory to store your wallet.dat and blockchain + Please choose a directory to store your wallet.dat and blockchain diff --git a/res/zec_qt_wallet_pt.ts b/res/zec_qt_wallet_pt.ts index 464a70f..4157443 100644 --- a/res/zec_qt_wallet_pt.ts +++ b/res/zec_qt_wallet_pt.ts @@ -1420,7 +1420,7 @@ Você possui fundos não confirmados ou o saldo é muito baixo para uma migraç - Please chose a directory to store your wallet.dat and blockchain + Please choose a directory to store your wallet.dat and blockchain diff --git a/src/createzcashconfdialog.ui b/src/createzcashconfdialog.ui index 4da75b2..a8c5d50 100644 --- a/src/createzcashconfdialog.ui +++ b/src/createzcashconfdialog.ui @@ -106,7 +106,7 @@ - Please chose a directory to store your wallet.dat and blockchain + Please choose a directory to store your wallet.dat and blockchain diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp index eb3e8b4..d309747 100644 --- a/src/mainwindow.cpp +++ b/src/mainwindow.cpp @@ -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(); }); } diff --git a/src/rpc.cpp b/src/rpc.cpp index 3dd7bf5..afd4fe0 100644 --- a/src/rpc.cpp +++ b/src/rpc.cpp @@ -1088,7 +1088,7 @@ void RPC::refreshZECPrice() { void RPC::shutdownZcashd() { // Shutdown embedded zcashd if it was started - if (ezcashd == nullptr || conn == nullptr) { + if (ezcashd == nullptr || ezcashd->processId() == 0 || conn == nullptr) { // No zcashd running internally, just return return; } diff --git a/src/scripts/control b/src/scripts/control index c2147d4..d8b025b 100644 --- a/src/scripts/control +++ b/src/scripts/control @@ -3,7 +3,6 @@ Version: RELEASE_VERSION Section: base Priority: optional Architecture: amd64 -Depends: openssl (>= 1.0.0) Maintainer: Aditya Kulkarni Description: zec-qt-wallet is a full node and UI wallet for Zcash. zec-qt-wallet is a full node and UI wallet for Zcash. It comes with diff --git a/src/version.h b/src/version.h index edfe526..7b3c8fa 100644 --- a/src/version.h +++ b/src/version.h @@ -1 +1 @@ -#define APP_VERSION "0.5.7-androidbeta" +#define APP_VERSION "0.5.9-androidbeta"