DragonX/SilentDragonXLite
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Merge master

Browse Source
This commit is contained in:
Aditya Kulkarni
2019-02-04 13:42:51 -08:00
parent b68449495e 189e12c0fb
commit 2a4bdbf93e
9 changed files with 14 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@@ -4,6 +4,7 @@ release/
x64/ x64/
artifacts/ artifacts/
.vscode/ .vscode/
res/libsodium.a
res/libsodium/libsodium* res/libsodium/libsodium*
res/libsodium.a res/libsodium.a
src/ui_*.h src/ui_*.h

2
res/zec_qt_wallet_de.ts
View File

@@ -1405,7 +1405,7 @@ You either have unconfirmed funds or the balance is too low for an automatic mig
</message> </message>
<message> <message>
<location filename="../src/createzcashconfdialog.ui" line="109"/> <location filename="../src/createzcashconfdialog.ui" line="109"/>
<source>Please chose a directory to store your wallet.dat and blockchain</source> <source>Please choose a directory to store your wallet.dat and blockchain</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>

2
res/zec_qt_wallet_es.ts
View File

@@ -1421,7 +1421,7 @@ El saldo es insuficiente para una migración automática.
</message> </message>
<message> <message>
<location filename="../src/createzcashconfdialog.ui" line="109"/> <location filename="../src/createzcashconfdialog.ui" line="109"/>
<source>Please chose a directory to store your wallet.dat and blockchain</source> <source>Please choose a directory to store your wallet.dat and blockchain</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>

2
res/zec_qt_wallet_pt.ts
View File

@@ -1420,7 +1420,7 @@ Você possui fundos não confirmados ou o saldo é muito baixo para uma migraç
</message> </message>
<message> <message>
<location filename="../src/createzcashconfdialog.ui" line="109"/> <location filename="../src/createzcashconfdialog.ui" line="109"/>
<source>Please chose a directory to store your wallet.dat and blockchain</source> <source>Please choose a directory to store your wallet.dat and blockchain</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>

2
src/createzcashconfdialog.ui
View File

@@ -106,7 +106,7 @@
<item row="1" column="0"> <item row="1" column="0">
<widget class="QLabel" name="label_2"> <widget class="QLabel" name="label_2">
<property name="text"> <property name="text">
<string>Please chose a directory to store your wallet.dat and blockchain</string> <string>Please choose a directory to store your wallet.dat and blockchain</string>
</property> </property>
</widget> </widget>
</item> </item>

9
src/mainwindow.cpp
View File

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

2
src/rpc.cpp
View File

@@ -1088,7 +1088,7 @@ void RPC::refreshZECPrice() {
void RPC::shutdownZcashd() { void RPC::shutdownZcashd() {
// Shutdown embedded zcashd if it was started // 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 // No zcashd running internally, just return
return; return;
} }

1
src/scripts/control
View File

@@ -3,7 +3,6 @@ Version: RELEASE_VERSION
Section: base Section: base
Priority: optional Priority: optional
Architecture: amd64 Architecture: amd64
Depends: openssl (>= 1.0.0)
Maintainer: Aditya Kulkarni <zcash@adityapk.com> Maintainer: Aditya Kulkarni <zcash@adityapk.com>
Description: zec-qt-wallet is a full node and UI wallet for Zcash. 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 zec-qt-wallet is a full node and UI wallet for Zcash. It comes with

2
src/version.h
View File

@@ -1 +1 @@
#define APP_VERSION "0.5.7-androidbeta" #define APP_VERSION "0.5.9-androidbeta"