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

Merge branch 'websockets' of github.com:adityapk00/zec-qt-wallet into websockets

Browse Source
This commit is contained in:
adityapk00
2019-01-21 21:01:47 -08:00
parent ead5fd6cd7 95498259bd
commit 3f02c19159
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/mainwindow.cpp
View File

@@ -45,7 +45,7 @@ MainWindow::MainWindow(QWidget *parent) :
rpc->checkForUpdate(false); rpc->checkForUpdate(false);
}); });
// Pay zcash URI // Pay Zcash URI
QObject::connect(ui->actionPay_URI, &QAction::triggered, this, &MainWindow::payZcashURI); QObject::connect(ui->actionPay_URI, &QAction::triggered, this, &MainWindow::payZcashURI);
// Import Private Key // Import Private Key
@@ -854,7 +854,7 @@ void MainWindow::backupWalletDat() {
if (Settings::getInstance()->isTestnet()) { if (Settings::getInstance()->isTestnet()) {
zcashdir.cd("testnet3"); zcashdir.cd("testnet3");
backupDefaultName = "tesetnet-" + backupDefaultName; backupDefaultName = "testnet-" + backupDefaultName;
} }
QFile wallet(zcashdir.filePath("wallet.dat")); QFile wallet(zcashdir.filePath("wallet.dat"));
@@ -1107,7 +1107,7 @@ void MainWindow::setupTransactionsTab() {
}); });
} }
// If memo contains a reply to addess, add a "Reply to" menu item // If memo contains a reply to address, add a "Reply to" menu item
if (!memo.isEmpty()) { if (!memo.isEmpty()) {
int lastPost = memo.trimmed().lastIndexOf(QRegExp("[\r\n]+")); int lastPost = memo.trimmed().lastIndexOf(QRegExp("[\r\n]+"));
QString lastWord = memo.right(memo.length() - lastPost - 1); QString lastWord = memo.right(memo.length() - lastPost - 1);
@@ -1309,7 +1309,7 @@ void MainWindow::setupRecieveTab() {
}); });
// Recieve tab add/update label // Receive tab add/update label
QObject::connect(ui->rcvUpdateLabel, &QPushButton::clicked, [=]() { QObject::connect(ui->rcvUpdateLabel, &QPushButton::clicked, [=]() {
QString addr = ui->listRecieveAddresses->currentText(); QString addr = ui->listRecieveAddresses->currentText();
if (addr.isEmpty()) if (addr.isEmpty())

4
wsclient.html
View File

@@ -88,7 +88,7 @@
break; break;
} }
default: { default: {
stateStr = "UNKNOW"; stateStr = "UNKNOWN";
break; break;
} }
} }
@@ -99,4 +99,4 @@
} }
</script> </script>
</body> </body>
</html> </html>