Browse Source

Merge pull request #55 from rex4539/fix-typos

Fix typos and cleanup
import_zecw
adityapk00 6 years ago
committed by GitHub
parent
commit
dc11bd2f75
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
  1. 6
      src/connection.cpp
  2. 4
      src/rpc.cpp
  3. 6
      src/scripts/control
  4. 2
      src/scripts/desktopentry
  5. 4
      src/scripts/dobuild.ps1
  6. 4
      src/scripts/mkrelease.sh
  7. 2
      src/settings.ui

6
src/connection.cpp

@ -98,7 +98,7 @@ QString randomPassword() {
} }
/** /**
* This will create a new zcash.conf, download zcash parameters. * This will create a new zcash.conf, download Zcash parameters.
*/ */
void ConnectionLoader::createZcashConf() { void ConnectionLoader::createZcashConf() {
// Fetch params. After params are fetched, create the zcash.conf file and // Fetch params. After params are fetched, create the zcash.conf file and
@ -232,7 +232,7 @@ bool ConnectionLoader::startEmbeddedZcashd() {
if (!Settings::getInstance()->useEmbedded()) if (!Settings::getInstance()->useEmbedded())
return false; return false;
// Static because it needs to survice even after this method returns. // Static because it needs to survive even after this method returns.
static QString processStdErrOutput; static QString processStdErrOutput;
if (ezcashd != nullptr) { if (ezcashd != nullptr) {
@ -455,7 +455,7 @@ std::shared_ptr<ConnectionConfig> ConnectionLoader::autoDetectZcashConf() {
auto confLocation = locateZcashConfFile(); auto confLocation = locateZcashConfFile();
if (confLocation.isNull()) { if (confLocation.isNull()) {
// No zcash file, just return with nothing // No Zcash file, just return with nothing
return nullptr; return nullptr;
} }

4
src/rpc.cpp

@ -618,7 +618,7 @@ void RPC::refreshAddresses() {
zaddresses->push_back(addr); zaddresses->push_back(addr);
} }
// Refresh the sent and received txs from all these zaddresses // Refresh the sent and received txs from all these z-addresses
refreshSentZTrans(); refreshSentZTrans();
refreshReceivedZTrans(*zaddresses); refreshReceivedZTrans(*zaddresses);
}); });
@ -1020,4 +1020,4 @@ QString RPC::getDefaultSaplingAddress() {
} }
return QString(); return QString();
} }

6
src/scripts/control

@ -5,6 +5,6 @@ Priority: optional
Architecture: all Architecture: all
Depends: openssl (>= 1.0.0) 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
full support for shielded addresses and many apps for zcash. full support for shielded addresses and many apps for Zcash.

2
src/scripts/desktopentry

@ -1,6 +1,6 @@
[Desktop Entry] [Desktop Entry]
Name=zec-qt-wallet Name=zec-qt-wallet
Comment=Full node and wallet for zcash Comment=Full node and wallet for Zcash
GenericName=Wallet GenericName=Wallet
Exec=/usr/local/bin/zec-qt-wallet Exec=/usr/local/bin/zec-qt-wallet
Icon=zec-qt-wallet.xpm Icon=zec-qt-wallet.xpm

4
src/scripts/dobuild.ps1

@ -1,4 +1,4 @@
# Unified build script for windows, linux and mac builder. Run on a windows machine inside powershell. # Unified build script for Windows, Linux and Mac builder. Run on a Windows machine inside powershell.
param ( param (
[Parameter(Mandatory=$true)][string]$version, [Parameter(Mandatory=$true)][string]$version,
[Parameter(Mandatory=$true)][string]$prev, [Parameter(Mandatory=$true)][string]$prev,
@ -49,4 +49,4 @@ if (! (Test-Path ./artifacts/linux-zec-qt-wallet-v$version.tar.gz) -or
Write-Host "[Error]" Write-Host "[Error]"
exit 1; exit 1;
} }
Write-Host "[OK]" Write-Host "[OK]"

4
src/scripts/mkrelease.sh

@ -8,7 +8,7 @@ if [ -z $APP_VERSION ]; then echo "APP_VERSION is not set"; exit 1; fi
if [ -z $PREV_VERSION ]; then echo "PREV_VERSION is not set"; exit 1; fi if [ -z $PREV_VERSION ]; then echo "PREV_VERSION is not set"; exit 1; fi
if [ -z $ZCASH_DIR ]; then if [ -z $ZCASH_DIR ]; then
echo "ZCASH_DIR is not set. Please set it to the base directory of a zcash project with built zcash binaries." echo "ZCASH_DIR is not set. Please set it to the base directory of a Zcash project with built Zcash binaries."
exit 1; exit 1;
fi fi
@ -157,7 +157,7 @@ echo -n "Configuring............"
make clean > /dev/null make clean > /dev/null
rm -f zec-qt-wallet-mingw.pro rm -f zec-qt-wallet-mingw.pro
rm -rf release/ rm -rf release/
#Mingw seems to have trouble with precompiled heades, so strip that option from the .pro file #Mingw seems to have trouble with precompiled headers, so strip that option from the .pro file
cat zec-qt-wallet.pro | sed "s/precompile_header/release/g" | sed "s/PRECOMPILED_HEADER.*//g" > zec-qt-wallet-mingw.pro cat zec-qt-wallet.pro | sed "s/precompile_header/release/g" | sed "s/PRECOMPILED_HEADER.*//g" > zec-qt-wallet-mingw.pro
echo "[OK]" echo "[OK]"

2
src/settings.ui

@ -206,7 +206,7 @@
<item row="4" column="0" colspan="2"> <item row="4" column="0" colspan="2">
<widget class="QLabel" name="label_6"> <widget class="QLabel" name="label_6">
<property name="text"> <property name="text">
<string>Allow overriding the default fees when sending transactions. Enabling this option may comprimise your privacy since fees are transparent. </string> <string>Allow overriding the default fees when sending transactions. Enabling this option may compromise your privacy since fees are transparent. </string>
</property> </property>
<property name="wordWrap"> <property name="wordWrap">
<bool>true</bool> <bool>true</bool>

Loading…
Cancel
Save