hush
/
SilentDragon
9
1
Fork 7
Code Issues 76 Pull Requests 1 Projects Releases 8 Wiki Activity
Browse Source

Merge branch 'master' into recurring

recurring
adityapk00 5 years ago
parent
93ac8d11df c131cd62e8
commit
6348bc09bd
40 changed files with 2539 additions and 1004 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 5
      .gitignore
  2. 32
      README.md
  3. BIN
      res/icon.ico
  4. BIN
      res/logo.icns
  5. 255
      res/logo.svg
  6. 145
      res/logo2.svg
  7. BIN
      res/logobig.gif
  8. 20
      res/mkicns.sh
  9. 0
      res/resize.sh
  10. BIN
      res/zec_qt_wallet_de.qm
  11. 22
      res/zec_qt_wallet_de.ts
  12. BIN
      res/zec_qt_wallet_es.qm
  13. 36
      res/zec_qt_wallet_es.ts
  14. BIN
      res/zec_qt_wallet_fr.qm
  15. 40
      res/zec_qt_wallet_fr.ts
  16. BIN
      res/zec_qt_wallet_it.qm
  17. 34
      res/zec_qt_wallet_it.ts
  18. BIN
      res/zec_qt_wallet_pt.qm
  19. 36
      res/zec_qt_wallet_pt.ts
  20. 2739
      res/zecwallet.xpm
  21. 2
      src/about.ui
  22. 4
      src/connection.cpp
  23. 2
      src/connection.ui
  24. 2
      src/main.cpp
  25. 8
      src/mainwindow.cpp
  26. 2
      src/mainwindow.ui
  27. 2
      src/mobileappconnector.ui
  28. 27
      src/rpc.cpp
  29. 2
      src/rpc.h
  30. 4
      src/scripts/control
  31. 10
      src/scripts/desktopentry
  32. 20
      src/scripts/dounifiedbuild.ps1
  33. 19
      src/scripts/mkmacdmg.sh
  34. 53
      src/scripts/mkrelease.sh
  35. 8
      src/scripts/mkwininstaller.ps1
  36. 2
      src/scripts/signbinaries.sh
  37. 6
      src/scripts/zec-qt-wallet.wxs
  38. 2
      src/version.h
  39. 2
      src/websockets.cpp
  40. 2
      zec-qt-wallet.pro

5
.gitignore
View File

@ -12,17 +12,22 @@ src/ui_*.h
*.autosave *.autosave
src/precompiled.h.cpp src/precompiled.h.cpp
.qmake.stash .qmake.stash
zecwallet
zec-qt-wallet zec-qt-wallet
zec-qt-wallet.app zec-qt-wallet.app
ZecWallet.app
zec-qt-wallet-mingw* zec-qt-wallet-mingw*
zec-qt-wallet.vcxproj* zec-qt-wallet.vcxproj*
zecwallet.vcxproj*
zec-qt-wallet.sln zec-qt-wallet.sln
zec-qt-wallet.pro.user zec-qt-wallet.pro.user
Makefile Makefile
Makefile.* Makefile.*
qrc_application.cpp qrc_application.cpp
zec-qt-wallet_plugin_import.cpp zec-qt-wallet_plugin_import.cpp
zecwallet_plugin_import.cpp
zec-qt-wallet_resource* zec-qt-wallet_resource*
zecwallet_resource*
workspace.code-workspace workspace.code-workspace
*.zip *.zip
*.tar.gz *.tar.gz

32
README.md
View File

@ -1,4 +1,4 @@
zec-qt-wallet is a z-Addr first, Sapling compatible wallet and full node for zcashd that runs on Linux, Windows and macOS. ZecWallet is a z-Addr first, Sapling compatible wallet and full node for zcashd that runs on Linux, Windows and macOS.
![Screenshot](docs/screenshot-main.png?raw=true) ![Screenshot](docs/screenshot-main.png?raw=true)
![Screenshots](docs/screenshot-sub.png?raw=true) ![Screenshots](docs/screenshot-sub.png?raw=true)
@ -10,33 +10,33 @@ Head over to the releases page and grab the latest installers or binary. https:/
If you are on Debian/Ubuntu, please download the `.deb` package and install it. If you are on Debian/Ubuntu, please download the `.deb` package and install it.
``` ```
sudo dpkg -i linux-deb-zec-qt-wallet-v0.6.1.deb sudo dpkg -i linux-deb-zecwallet-v0.6.2.deb
sudo apt install -f sudo apt install -f
``` ```
Or you can download and run the binaries directly. Or you can download and run the binaries directly.
``` ```
tar -xvf zec-qt-wallet-v0.6.1.tar.gz tar -xvf zecwallet-v0.6.2.tar.gz
./zec-qt-wallet-v0.6.1/zec-qt-wallet ./zec-qt-wallet-v0.6.2/zecwallet
``` ```
### Windows ### Windows
Download and run the .msi installer and follow the prompts. Alternately, you can download the release binary, unzip it and double click on zec-qt-wallet to start. Download and run the `.msi` installer and follow the prompts. Alternately, you can download the release binary, unzip it and double click on `zecwallet.exe` to start.
### macOS ### macOS
Double-click on the .dmg file to open it, and drag zec-qt-wallet on to the Applications link to install. Double-click on the `.dmg` file to open it, and drag `zecwallet` on to the Applications link to install.
## zcashd ## zcashd
zec-qt-wallet needs a Zcash node running zcashd. If you already have a zcashd node running, zec-qt-wallet will connect to it. ZecWallet needs a Zcash node running zcashd. If you already have a zcashd node running, ZecWallet will connect to it.
If you don't have one, zec-qt-wallet will start its embedded zcashd node. If you don't have one, ZecWallet will start its embedded zcashd node.
Additionally, if this is the first time you're running zec-qt-wallet or a zcashd daemon, zec-qt-wallet will download the zcash params (~1.7 GB) and configure `zcash.conf` for you. Additionally, if this is the first time you're running ZecWallet or a zcashd daemon, ZecWallet will download the zcash params (~1.7 GB) and configure `zcash.conf` for you.
Pass `--no-embedded` to disable the embedded zcashd and force zec-qt-wallet to connect to an external node. Pass `--no-embedded` to disable the embedded zcashd and force ZecWallet to connect to an external node.
## Compiling from source ## Compiling from source
zec-qt-wallet is written in C++ 14, and can be compiled with g++/clang++/visual c++. It also depends on Qt5, which you can get from [here](https://www.qt.io/download). Note that if you are compiling from source, you won't get the embedded zcashd by default. You can either run an external zcashd, or compile zcashd as well. ZecWallet is written in C++ 14, and can be compiled with g++/clang++/visual c++. It also depends on Qt5, which you can get from [here](https://www.qt.io/download). Note that if you are compiling from source, you won't get the embedded zcashd by default. You can either run an external zcashd, or compile zcashd as well.
See detailed build instructions [on the wiki](https://github.com/ZcashFoundation/zec-qt-wallet/wiki/Compiling-from-source-code) See detailed build instructions [on the wiki](https://github.com/ZcashFoundation/zec-qt-wallet/wiki/Compiling-from-source-code)
@ -48,7 +48,7 @@ cd zec-qt-wallet
/path/to/qt5/bin/qmake zec-qt-wallet.pro CONFIG+=debug /path/to/qt5/bin/qmake zec-qt-wallet.pro CONFIG+=debug
make -j$(nproc) make -j$(nproc)
./zec-qt-wallet ./zecwallet
``` ```
### Building on Windows ### Building on Windows
@ -61,7 +61,7 @@ cd zec-qt-wallet
c:\Qt5\bin\qmake.exe zec-qt-wallet.pro -spec win32-msvc CONFIG+=debug c:\Qt5\bin\qmake.exe zec-qt-wallet.pro -spec win32-msvc CONFIG+=debug
nmake nmake
debug\zec-qt-wallet.exe debug\zecwallet.exe
``` ```
To create the Visual Studio project files so you can compile and run from Visual Studio: To create the Visual Studio project files so you can compile and run from Visual Studio:
@ -78,11 +78,11 @@ cd zec-qt-wallet
/path/to/qt5/bin/qmake zec-qt-wallet.pro CONFIG+=debug /path/to/qt5/bin/qmake zec-qt-wallet.pro CONFIG+=debug
make make
./zec-qt-wallet.app/Contents/MacOS/zec-qt-wallet ./zecwallet.app/Contents/MacOS/zecwallet
``` ```
### [Troubleshooting Guide & FAQ](https://github.com/ZcashFoundation/zec-qt-wallet/wiki/Troubleshooting-&-FAQ) ### [Troubleshooting Guide & FAQ](https://github.com/ZcashFoundation/zec-qt-wallet/wiki/Troubleshooting-&-FAQ)
Please read the [troubleshooting guide](https://github.com/ZcashFoundation/zec-qt-wallet/wiki/Troubleshooting-&-FAQ) for common problems and solutions. Please read the [troubleshooting guide](https://github.com/ZcashFoundation/zec-qt-wallet/wiki/Troubleshooting-&-FAQ) for common problems and solutions.
For support or other questions, tweet at [@zecqtwallet](https://twitter.com/zecqtwallet) or [file an issue](https://github.com/ZcashFoundation/zec-qt-wallet/issues). For support or other questions, tweet at [@zecwallet](https://twitter.com/zecqtwallet) or [file an issue](https://github.com/ZcashFoundation/zec-qt-wallet/issues).
_PS: zec-qt-wallet is NOT an official wallet, and is not affiliated with the Zerocoin Electric Coin Company in any way._ _PS: ZecWallet is NOT an official wallet, and is not affiliated with the Zerocoin Electric Coin Company in any way._

BIN
res/icon.ico
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 34 KiB

After

Width:  |  Height:  |  Size: 32 KiB

BIN
res/logo.icns
View File

Binary file not shown.

255
res/logo.svg
View File

File diff suppressed because one or more lines are too long
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 21 KiB

After

Width:  |  Height:  |  Size: 5.8 KiB

145
res/logo2.svg
View File

@ -0,0 +1,145 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
width="7in"
height="7in"
viewBox="0 0 672.00001 672.00003"
version="1.1"
xml:space="preserve"
style="clip-rule:evenodd;fill-rule:evenodd;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:1.5"
id="svg947"
sodipodi:docname="logo2.svg"
inkscape:version="0.92.3 (2405546, 2018-03-11)"><metadata
id="metadata953"><rdf:RDF><cc:Work
rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title></dc:title></cc:Work></rdf:RDF></metadata><defs
id="defs951" /><sodipodi:namedview
pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1"
objecttolerance="10"
gridtolerance="10"
guidetolerance="10"
inkscape:pageopacity="0"
inkscape:pageshadow="2"
inkscape:window-width="2493"
inkscape:window-height="1385"
id="namedview949"
showgrid="false"
inkscape:zoom="1.204"
inkscape:cx="69.774919"
inkscape:cy="327.00515"
inkscape:window-x="67"
inkscape:window-y="27"
inkscape:window-maximized="1"
inkscape:current-layer="svg947"
units="in" />
<g
id="Layer1"
transform="matrix(0.36813642,0,0,0.36813642,312.34626,301.46667)">
<g
transform="matrix(21.7676,-1.67174,1.56756,20.411,-1459.09,-1317.23)"
id="g906">
<path
d="m 101.667,55.665 c 0,-4.644 -3.536,-8.415 -7.891,-8.415 H 34.391 c -4.355,0 -7.891,3.771 -7.891,8.415 v 32.67 c 0,4.644 3.536,8.415 7.891,8.415 h 59.385 c 4.355,0 7.891,-3.771 7.891,-8.415 z"
style="fill:#403c3c;stroke:#676767;stroke-width:1.55999994px"
id="path904"
inkscape:connector-curvature="0" />
</g>
<g
transform="matrix(10.4324,-0.762793,0.788494,10.7839,-910.913,-519.817)"
id="g910">
<rect
x="30.333"
y="15.958"
width="123.333"
height="10.333"
style="fill:#989898"
id="rect908" />
</g>
<g
transform="matrix(10.4426,-0.607527,0.590589,10.1515,-857.477,-497.419)"
id="g914">
<rect
x="30.333"
y="15.958"
width="123.333"
height="10.333"
style="fill:#d4d4d4"
id="rect912" />
</g>
<g
transform="matrix(22.5859,0,0,20.3805,-1392.73,-1333.51)"
id="g918">
<path
d="m 101.667,55.665 c 0,-4.644 -3.403,-8.415 -7.594,-8.415 h -59.98 c -4.191,0 -7.593,3.771 -7.593,8.415 v 32.67 c 0,4.644 3.402,8.415 7.593,8.415 h 59.98 c 4.191,0 7.594,-3.771 7.594,-8.415 z"
style="fill:#545454;stroke:#676767;stroke-width:1.54999995px"
id="path916"
inkscape:connector-curvature="0" />
</g>
<g
transform="matrix(22.0427,0,0,22.0427,-1356.84,-1529.77)"
id="g940">
<g
transform="matrix(0.0166278,0,0,0.0169216,38.2584,49.3588)"
id="g930">
<path
d="m 408.79,544.347 c -4.781,393.34 11.42,829.733 222.972,1280.253 233.27,496.77 562.438,768.91 880.738,902.9 400.43,-203.47 700.25,-512.61 875.74,-926.93 C 2565.08,1390.14 2623.25,986.361 2613.93,546.64 2401.04,668.826 2190.35,711.166 1980.91,665.398 1800.1,625.888 1619.67,480.693 1504.39,342.5 1342.48,544.925 1094.45,674.584 905.24,674.128 603.662,673.4 408.79,544.347 408.79,544.347 Z"
style="fill:#535050;stroke:#231f20;stroke-width:113.56999969px;stroke-linecap:butt;stroke-miterlimit:1.41420996"
id="path928"
inkscape:connector-curvature="0" />
</g>
<g
transform="matrix(0.0156112,0,0,0.01624605,39.675272,50.611315)"
id="g934">
<path
d="m 395.114,579.927 c -4.781,393.341 25.096,794.153 236.648,1244.673 233.27,496.77 562.438,768.91 880.738,902.9 400.43,-203.47 677.91,-509.43 866.26,-919.86 157.91,-344.09 267.28,-776.03 257.97,-1215.749 -212.9,122.186 -446.38,119.275 -655.82,73.507 C 1800.1,625.888 1626.34,498.787 1511.05,360.594 1349.14,563.019 1067.1,686.858 877.887,686.402 576.309,685.674 395.114,579.927 395.114,579.927 Z"
style="fill:#f4b728"
id="path932"
inkscape:connector-curvature="0" />
</g>
<g
transform="matrix(0.0863573,0,0,0.0863573,43.8769,56.212)"
id="g938">
<path
d="M 305.776,155.342 V 120.964 H 244.28 V 83.228 h -37.768 v 37.736 h -61.496 v 45.532 h 95.333 l -77.956,107.298 -17.377,22.075 v 34.377 h 61.496 v 37.616 h 4.529 v 0.153 h 28.709 v -0.153 h 4.53 v -37.616 h 61.496 V 284.714 H 210.443 L 288.4,177.416 Z"
style="fill:#231f20;fill-rule:nonzero"
id="path936"
inkscape:connector-curvature="0" />
</g>
</g>
</g><g
inkscape:groupmode="layer"
id="layer1"
inkscape:label="Belt"
style="display:inline"
transform="translate(0,547.00007)"><g
style="clip-rule:evenodd;fill-rule:evenodd;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:1.5"
transform="matrix(3.6074755,0,0,3.1676851,24.481313,-551.22181)"
id="g922">
<path
d="m 174.197,108.212 c 0,-3.207 -2.286,-5.81 -5.101,-5.81 h -31.213 c -2.816,0 -5.102,2.603 -5.102,5.81 v 13.64 c 0,3.206 2.286,5.809 5.102,5.809 h 31.213 c 2.815,0 5.101,-2.603 5.101,-5.809 z"
style="fill:#545454;stroke:#676767;stroke-width:5.17999983px"
id="path920"
inkscape:connector-curvature="0" />
</g><g
style="clip-rule:evenodd;fill-rule:evenodd;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:1.5"
transform="matrix(4.2945691,0,0,4.3255294,-62.20745,-679.73088)"
id="g926">
<circle
cx="140.291"
cy="113.78"
r="5.006"
style="fill:#ffffff"
id="circle924" />
</g></g>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 5.8 KiB

BIN
res/logobig.gif
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 12 KiB

After

Width:  |  Height:  |  Size: 15 KiB

20
res/mkicns.sh
View File

@ -23,16 +23,16 @@ output_name=$3
set -e set -e
mkdir $output_name.iconset mkdir $output_name.iconset
$inkscape -z -e "$PWD/$output_name.iconset/icon_16x16.png" -w 16 -h 16 "$PWD/$svg_file" $inkscape -z -e "$PWD/$output_name.iconset/icon_16x16.png" -w 16 -h 16 -y 0 "$PWD/$svg_file"
$inkscape -z -e "$PWD/$output_name.iconset/icon_16x16@2x.png" -w 32 -h 32 "$PWD/$svg_file" $inkscape -z -e "$PWD/$output_name.iconset/icon_16x16@2x.png" -w 32 -h 32 -y 0 "$PWD/$svg_file"
$inkscape -z -e "$PWD/$output_name.iconset/icon_32x32.png" -w 32 -h 32 "$PWD/$svg_file" $inkscape -z -e "$PWD/$output_name.iconset/icon_32x32.png" -w 32 -h 32 -y 0 "$PWD/$svg_file"
$inkscape -z -e "$PWD/$output_name.iconset/icon_32x32@2x.png" -w 64 -h 64 "$PWD/$svg_file" $inkscape -z -e "$PWD/$output_name.iconset/icon_32x32@2x.png" -w 64 -h 64 -y 0 "$PWD/$svg_file"
$inkscape -z -e "$PWD/$output_name.iconset/icon_128x128.png" -w 128 -h 128 "$PWD/$svg_file" $inkscape -z -e "$PWD/$output_name.iconset/icon_128x128.png" -w 128 -h 128 -y 0 "$PWD/$svg_file"
$inkscape -z -e "$PWD/$output_name.iconset/icon_128x128@2x.png" -w 256 -h 256 "$PWD/$svg_file" $inkscape -z -e "$PWD/$output_name.iconset/icon_128x128@2x.png" -w 256 -h 256 -y 0 "$PWD/$svg_file"
$inkscape -z -e "$PWD/$output_name.iconset/icon_256x256.png" -w 256 -h 256 "$PWD/$svg_file" $inkscape -z -e "$PWD/$output_name.iconset/icon_256x256.png" -w 256 -h 256 -y 0 "$PWD/$svg_file"
$inkscape -z -e "$PWD/$output_name.iconset/icon_256x256@2x.png" -w 512 -h 512 "$PWD/$svg_file" $inkscape -z -e "$PWD/$output_name.iconset/icon_256x256@2x.png" -w 512 -h 512 -y 0 "$PWD/$svg_file"
$inkscape -z -e "$PWD/$output_name.iconset/icon_512x512.png" -w 512 -h 512 "$PWD/$svg_file" $inkscape -z -e "$PWD/$output_name.iconset/icon_512x512.png" -w 512 -h 512 -y 0 "$PWD/$svg_file"
$inkscape -z -e "$PWD/$output_name.iconset/icon_512x512@2x.png" -w 1024 -h 1024 "$PWD/$svg_file" $inkscape -z -e "$PWD/$output_name.iconset/icon_512x512@2x.png" -w 1024 -h 1024 -y 0 "$PWD/$svg_file"
iconutil -c icns "$output_name.iconset" iconutil -c icns "$output_name.iconset"
rm -R "$output_name.iconset" rm -R "$output_name.iconset"

0
res/resize.sh
View File

BIN
res/zec_qt_wallet_de.qm
View File

Binary file not shown.

22
res/zec_qt_wallet_de.ts
View File

@ -31,7 +31,7 @@
<name>ConnectionDialog</name> <name>ConnectionDialog</name>
<message> <message>
<location filename="../src/connection.ui" line="17"/> <location filename="../src/connection.ui" line="17"/>
<source>zec-qt-wallet</source> <source>ZecWallet</source>
<translation type="unfinished">YOUR_TRANSLATION_HERE</translation> <translation type="unfinished">YOUR_TRANSLATION_HERE</translation>
</message> </message>
<message> <message>
@ -44,7 +44,7 @@
<name>MainWindow</name> <name>MainWindow</name>
<message> <message>
<location filename="../src/mainwindow.ui" line="14"/> <location filename="../src/mainwindow.ui" line="14"/>
<source>zec-qt-wallet</source> <source>ZecWallet</source>
<translation type="unfinished">YOUR_TRANSLATION_HERE</translation> <translation type="unfinished">YOUR_TRANSLATION_HERE</translation>
</message> </message>
<message> <message>
@ -416,7 +416,7 @@
</message> </message>
<message> <message>
<location filename="../src/mainwindow.cpp" line="524"/> <location filename="../src/mainwindow.cpp" line="524"/>
<source>Connection over Tor has been enabled. To use this feature, you need to restart zec-qt-wallet.</source> <source>Connection over Tor has been enabled. To use this feature, you need to restart ZecWallet.</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
@ -426,12 +426,12 @@
</message> </message>
<message> <message>
<location filename="../src/mainwindow.cpp" line="533"/> <location filename="../src/mainwindow.cpp" line="533"/>
<source>Connection over Tor has been disabled. To fully disconnect from Tor, you need to restart zec-qt-wallet.</source> <source>Connection over Tor has been disabled. To fully disconnect from Tor, you need to restart ZecWallet.</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../src/mainwindow.cpp" line="575"/> <location filename="../src/mainwindow.cpp" line="575"/>
<source>Thanks for supporting zec-qt-wallet!</source> <source>Thanks for supporting ZecWallet!</source>
<translation type="unfinished">YOUR_TRANSLATION_HERE</translation> <translation type="unfinished">YOUR_TRANSLATION_HERE</translation>
</message> </message>
<message> <message>
@ -441,7 +441,7 @@
</message> </message>
<message> <message>
<location filename="../src/mainwindow.cpp" line="577"/> <location filename="../src/mainwindow.cpp" line="577"/>
<source> to support zec-qt-wallet</source> <source> to support ZecWallet</source>
<translation type="unfinished">YOUR_TRANSLATION_HERE</translation> <translation type="unfinished">YOUR_TRANSLATION_HERE</translation>
</message> </message>
<message> <message>
@ -750,7 +750,7 @@ doesn&apos;t look like a z-address</source>
</message> </message>
<message> <message>
<location filename="../src/mobileappconnector.ui" line="84"/> <location filename="../src/mobileappconnector.ui" line="84"/>
<source>Allow connections over the internet via zec-qt-wallet wormhole</source> <source>Allow connections over the internet via ZecWallet wormhole</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
@ -812,9 +812,9 @@ doesn&apos;t look like a z-address</source>
</message> </message>
<message> <message>
<location filename="../src/connection.cpp" line="77"/> <location filename="../src/connection.cpp" line="77"/>
<source>You have zcashd set to start as a daemon, which can cause problems with zec-qt-wallet <source>You have zcashd set to start as a daemon, which can cause problems with ZecWallet
.Please remove the following line from your zcash.conf and restart zec-qt-wallet .Please remove the following line from your zcash.conf and restart ZecWallet
daemon=1</source> daemon=1</source>
<translation type="unfinished">YOUR_TRANSLATION_HERE</translation> <translation type="unfinished">YOUR_TRANSLATION_HERE</translation>
</message> </message>
@ -984,7 +984,7 @@ Would you like to visit the releases page?</source>
</message> </message>
<message> <message>
<location filename="../src/rpc.cpp" line="1096"/> <location filename="../src/rpc.cpp" line="1096"/>
<source>Please wait for zec-qt-wallet to exit</source> <source>Please wait for ZecWallet to exit</source>
<translation type="unfinished">YOUR_TRANSLATION_HERE</translation> <translation type="unfinished">YOUR_TRANSLATION_HERE</translation>
</message> </message>
<message> <message>
@ -1149,7 +1149,7 @@ You either have unconfirmed funds or the balance is too low for an automatic mig
</message> </message>
<message> <message>
<location filename="../src/websockets.cpp" line="345"/> <location filename="../src/websockets.cpp" line="345"/>
<source>Connected over the internet via zec-qt-wallet wormhole service</source> <source>Connected over the internet via ZecWallet wormhole service</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>

BIN
res/zec_qt_wallet_es.qm
View File

Binary file not shown.

36
res/zec_qt_wallet_es.ts
View File

@ -31,8 +31,8 @@
<name>ConnectionDialog</name> <name>ConnectionDialog</name>
<message> <message>
<location filename="../src/connection.ui" line="17"/> <location filename="../src/connection.ui" line="17"/>
<source>zec-qt-wallet</source> <source>ZecWallet</source>
<translation>zec-qt-wallet</translation> <translation>ZecWallet</translation>
</message> </message>
<message> <message>
<location filename="../src/connection.ui" line="58"/> <location filename="../src/connection.ui" line="58"/>
@ -44,8 +44,8 @@
<name>MainWindow</name> <name>MainWindow</name>
<message> <message>
<location filename="../src/mainwindow.ui" line="14"/> <location filename="../src/mainwindow.ui" line="14"/>
<source>zec-qt-wallet</source> <source>ZecWallet</source>
<translation>zec-qt-wallet</translation> <translation>ZecWallet</translation>
</message> </message>
<message> <message>
<location filename="../src/mainwindow.ui" line="29"/> <location filename="../src/mainwindow.ui" line="29"/>
@ -416,7 +416,7 @@
</message> </message>
<message> <message>
<location filename="../src/mainwindow.cpp" line="524"/> <location filename="../src/mainwindow.cpp" line="524"/>
<source>Connection over Tor has been enabled. To use this feature, you need to restart zec-qt-wallet.</source> <source>Connection over Tor has been enabled. To use this feature, you need to restart ZecWallet.</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
@ -426,13 +426,13 @@
</message> </message>
<message> <message>
<location filename="../src/mainwindow.cpp" line="533"/> <location filename="../src/mainwindow.cpp" line="533"/>
<source>Connection over Tor has been disabled. To fully disconnect from Tor, you need to restart zec-qt-wallet.</source> <source>Connection over Tor has been disabled. To fully disconnect from Tor, you need to restart ZecWallet.</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../src/mainwindow.cpp" line="575"/> <location filename="../src/mainwindow.cpp" line="575"/>
<source>Thanks for supporting zec-qt-wallet!</source> <source>Thanks for supporting ZecWallet!</source>
<translation>Gracias por apoyar zec-qt-wallet!</translation> <translation>Gracias por apoyar ZecWallet!</translation>
</message> </message>
<message> <message>
<location filename="../src/mainwindow.cpp" line="577"/> <location filename="../src/mainwindow.cpp" line="577"/>
@ -441,8 +441,8 @@
</message> </message>
<message> <message>
<location filename="../src/mainwindow.cpp" line="577"/> <location filename="../src/mainwindow.cpp" line="577"/>
<source> to support zec-qt-wallet</source> <source> to support ZecWallet</source>
<translation> para apoyar zec-qt-wallet</translation> <translation> para apoyar ZecWallet</translation>
</message> </message>
<message> <message>
<location filename="../src/mainwindow.cpp" line="614"/> <location filename="../src/mainwindow.cpp" line="614"/>
@ -750,7 +750,7 @@ doesn&apos;t look like a z-address</source>
</message> </message>
<message> <message>
<location filename="../src/mobileappconnector.ui" line="84"/> <location filename="../src/mobileappconnector.ui" line="84"/>
<source>Allow connections over the internet via zec-qt-wallet wormhole</source> <source>Allow connections over the internet via ZecWallet wormhole</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
@ -893,8 +893,8 @@ Would you like to visit the releases page?</source>
</message> </message>
<message> <message>
<location filename="../src/rpc.cpp" line="1096"/> <location filename="../src/rpc.cpp" line="1096"/>
<source>Please wait for zec-qt-wallet to exit</source> <source>Please wait for ZecWallet to exit</source>
<translation>Por favor, espere que zec-qt-wallet salga</translation> <translation>Por favor, espere que ZecWallet salga</translation>
</message> </message>
<message> <message>
<location filename="../src/rpc.cpp" line="1097"/> <location filename="../src/rpc.cpp" line="1097"/>
@ -1001,12 +1001,12 @@ Por favor, especificar el host/puerta y usario/contraseña en el menú Editar-&g
</message> </message>
<message> <message>
<location filename="../src/connection.cpp" line="77"/> <location filename="../src/connection.cpp" line="77"/>
<source>You have zcashd set to start as a daemon, which can cause problems with zec-qt-wallet <source>You have zcashd set to start as a daemon, which can cause problems with ZecWallet
.Please remove the following line from your zcash.conf and restart zec-qt-wallet .Please remove the following line from your zcash.conf and restart ZecWallet
daemon=1</source> daemon=1</source>
<translation>Has configurado zcashd para ejecutar como demonio, lo que puede causar problemas con zec-qt-wallet. <translation>Has configurado zcashd para ejecutar como demonio, lo que puede causar problemas con ZecWallet.
Por favor, eliminar la siguente linea de zcashd.conf y reinicia zec-qt-wallet Por favor, eliminar la siguente linea de zcashd.conf y reinicia ZecWallet
daemon=1</translation> daemon=1</translation>
</message> </message>
<message> <message>
@ -1165,7 +1165,7 @@ El saldo es insuficiente para una migración automática.
</message> </message>
<message> <message>
<location filename="../src/websockets.cpp" line="345"/> <location filename="../src/websockets.cpp" line="345"/>
<source>Connected over the internet via zec-qt-wallet wormhole service</source> <source>Connected over the internet via ZecWallet wormhole service</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>

BIN
res/zec_qt_wallet_fr.qm
View File

Binary file not shown.

40
res/zec_qt_wallet_fr.ts
View File

@ -31,8 +31,8 @@
<name>ConnectionDialog</name> <name>ConnectionDialog</name>
<message> <message>
<location filename="../src/connection.ui" line="17"/> <location filename="../src/connection.ui" line="17"/>
<source>zec-qt-wallet</source> <source>ZecWallet</source>
<translation>zec-qt-wallet</translation> <translation>ZecWallet</translation>
</message> </message>
<message> <message>
<location filename="../src/connection.ui" line="58"/> <location filename="../src/connection.ui" line="58"/>
@ -44,8 +44,8 @@
<name>MainWindow</name> <name>MainWindow</name>
<message> <message>
<location filename="../src/mainwindow.ui" line="14"/> <location filename="../src/mainwindow.ui" line="14"/>
<source>zec-qt-wallet</source> <source>ZecWallet</source>
<translation>zec-qt-wallet</translation> <translation>ZecWallet</translation>
</message> </message>
<message> <message>
<location filename="../src/mainwindow.ui" line="29"/> <location filename="../src/mainwindow.ui" line="29"/>
@ -421,8 +421,8 @@
</message> </message>
<message> <message>
<location filename="../src/mainwindow.cpp" line="524"/> <location filename="../src/mainwindow.cpp" line="524"/>
<source>Connection over Tor has been enabled. To use this feature, you need to restart zec-qt-wallet.</source> <source>Connection over Tor has been enabled. To use this feature, you need to restart ZecWallet.</source>
<translation>La connection via Tor est activée. Afin d&apos;utiliser cette fonctionnalité, veuillez redémarer zec-qt-wallet.</translation> <translation>La connection via Tor est activée. Afin d&apos;utiliser cette fonctionnalité, veuillez redémarer ZecWallet.</translation>
</message> </message>
<message> <message>
<location filename="../src/mainwindow.cpp" line="532"/> <location filename="../src/mainwindow.cpp" line="532"/>
@ -431,13 +431,13 @@
</message> </message>
<message> <message>
<location filename="../src/mainwindow.cpp" line="533"/> <location filename="../src/mainwindow.cpp" line="533"/>
<source>Connection over Tor has been disabled. To fully disconnect from Tor, you need to restart zec-qt-wallet.</source> <source>Connection over Tor has been disabled. To fully disconnect from Tor, you need to restart ZecWallet.</source>
<translation>La connection via Tor a été désactivée. Afin de complètement se déconnecter de Tor, vous devez redémarrer zec-qt-wallet.</translation> <translation>La connection via Tor a été désactivée. Afin de complètement se déconnecter de Tor, vous devez redémarrer ZecWallet.</translation>
</message> </message>
<message> <message>
<location filename="../src/mainwindow.cpp" line="575"/> <location filename="../src/mainwindow.cpp" line="575"/>
<source>Thanks for supporting zec-qt-wallet!</source> <source>Thanks for supporting ZecWallet!</source>
<translation>Merci de supporter zec-qt-wallet !</translation> <translation>Merci de supporter ZecWallet !</translation>
</message> </message>
<message> <message>
<location filename="../src/mainwindow.cpp" line="577"/> <location filename="../src/mainwindow.cpp" line="577"/>
@ -446,8 +446,8 @@
</message> </message>
<message> <message>
<location filename="../src/mainwindow.cpp" line="577"/> <location filename="../src/mainwindow.cpp" line="577"/>
<source> to support zec-qt-wallet</source> <source> to support ZecWallet</source>
<translation> pour supporter zec-qt-wallet</translation> <translation> pour supporter ZecWallet</translation>
</message> </message>
<message> <message>
<location filename="../src/mainwindow.cpp" line="614"/> <location filename="../src/mainwindow.cpp" line="614"/>
@ -757,7 +757,7 @@ Cette adresse ne semble pas être de type adresse-z</translation>
</message> </message>
<message> <message>
<location filename="../src/mobileappconnector.ui" line="84"/> <location filename="../src/mobileappconnector.ui" line="84"/>
<source>Allow connections over the internet via zec-qt-wallet wormhole</source> <source>Allow connections over the internet via ZecWallet wormhole</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
@ -819,13 +819,13 @@ Cette adresse ne semble pas être de type adresse-z</translation>
</message> </message>
<message> <message>
<location filename="../src/connection.cpp" line="77"/> <location filename="../src/connection.cpp" line="77"/>
<source>You have zcashd set to start as a daemon, which can cause problems with zec-qt-wallet <source>You have zcashd set to start as a daemon, which can cause problems with ZecWallet
.Please remove the following line from your zcash.conf and restart zec-qt-wallet .Please remove the following line from your zcash.conf and restart ZecWallet
daemon=1</source> daemon=1</source>
<translation>vous avez zcashd configuré pour démarrer en tant que démon ce qui peut causer des problèmes avec zec-qt-wallet <translation>vous avez zcashd configuré pour démarrer en tant que démon ce qui peut causer des problèmes avec ZecWallet
Veuillez enlever la ligne suivante de votre fichier &quot;zcash.conf&quot; et redémarrer zec-qt-wallet: Veuillez enlever la ligne suivante de votre fichier &quot;zcash.conf&quot; et redémarrer ZecWallet:
daemon=1</translation> daemon=1</translation>
</message> </message>
<message> <message>
@ -1000,8 +1000,8 @@ Would you like to visit the releases page?</source>
</message> </message>
<message> <message>
<location filename="../src/rpc.cpp" line="1096"/> <location filename="../src/rpc.cpp" line="1096"/>
<source>Please wait for zec-qt-wallet to exit</source> <source>Please wait for ZecWallet to exit</source>
<translation>Veuillez patienter. Fermeture de zec-qt-wallet en cours</translation> <translation>Veuillez patienter. Fermeture de ZecWallet en cours</translation>
</message> </message>
<message> <message>
<location filename="../src/rpc.cpp" line="1097"/> <location filename="../src/rpc.cpp" line="1097"/>
@ -1170,7 +1170,7 @@ Vous avez soit des fonds non confirmés soit le solde est trop petit pour une mi
</message> </message>
<message> <message>
<location filename="../src/websockets.cpp" line="345"/> <location filename="../src/websockets.cpp" line="345"/>
<source>Connected over the internet via zec-qt-wallet wormhole service</source> <source>Connected over the internet via ZecWallet wormhole service</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>

BIN
res/zec_qt_wallet_it.qm
View File

Binary file not shown.

34
res/zec_qt_wallet_it.ts
View File

@ -31,8 +31,8 @@
<name>ConnectionDialog</name> <name>ConnectionDialog</name>
<message> <message>
<location filename="../src/connection.ui" line="17"/> <location filename="../src/connection.ui" line="17"/>
<source>zec-qt-wallet</source> <source>ZecWallet</source>
<translation>zec-qt-wallet</translation> <translation>ZecWallet</translation>
</message> </message>
<message> <message>
<location filename="../src/connection.ui" line="58"/> <location filename="../src/connection.ui" line="58"/>
@ -44,8 +44,8 @@
<name>MainWindow</name> <name>MainWindow</name>
<message> <message>
<location filename="../src/mainwindow.ui" line="14"/> <location filename="../src/mainwindow.ui" line="14"/>
<source>zec-qt-wallet</source> <source>ZecWallet</source>
<translation>zec-qt-wallet</translation> <translation>ZecWallet</translation>
</message> </message>
<message> <message>
<location filename="../src/mainwindow.ui" line="29"/> <location filename="../src/mainwindow.ui" line="29"/>
@ -413,8 +413,8 @@
</message> </message>
<message> <message>
<location filename="../src/mainwindow.cpp" line="575"/> <location filename="../src/mainwindow.cpp" line="575"/>
<source>Thanks for supporting zec-qt-wallet!</source> <source>Thanks for supporting ZecWallet!</source>
<translation>Grazie per il tuo supporto a zec-qt-wallet!</translation> <translation>Grazie per il tuo supporto a ZecWallet!</translation>
</message> </message>
<message> <message>
<location filename="../src/mainwindow.cpp" line="577"/> <location filename="../src/mainwindow.cpp" line="577"/>
@ -423,8 +423,8 @@
</message> </message>
<message> <message>
<location filename="../src/mainwindow.cpp" line="577"/> <location filename="../src/mainwindow.cpp" line="577"/>
<source> to support zec-qt-wallet</source> <source> to support ZecWallet</source>
<translation> per supportare zec-qt-wallet</translation> <translation> per supportare ZecWallet</translation>
</message> </message>
<message> <message>
<location filename="../src/mainwindow.cpp" line="614"/> <location filename="../src/mainwindow.cpp" line="614"/>
@ -464,7 +464,7 @@
</message> </message>
<message> <message>
<location filename="../src/mainwindow.cpp" line="524"/> <location filename="../src/mainwindow.cpp" line="524"/>
<source>Connection over Tor has been enabled. To use this feature, you need to restart zec-qt-wallet.</source> <source>Connection over Tor has been enabled. To use this feature, you need to restart ZecWallet.</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
@ -474,7 +474,7 @@
</message> </message>
<message> <message>
<location filename="../src/mainwindow.cpp" line="533"/> <location filename="../src/mainwindow.cpp" line="533"/>
<source>Connection over Tor has been disabled. To fully disconnect from Tor, you need to restart zec-qt-wallet.</source> <source>Connection over Tor has been disabled. To fully disconnect from Tor, you need to restart ZecWallet.</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
@ -760,7 +760,7 @@ doesn&apos;t look like a z-address</source>
</message> </message>
<message> <message>
<location filename="../src/mobileappconnector.ui" line="84"/> <location filename="../src/mobileappconnector.ui" line="84"/>
<source>Allow connections over the internet via zec-qt-wallet wormhole</source> <source>Allow connections over the internet via ZecWallet wormhole</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
@ -823,11 +823,11 @@ doesn&apos;t look like a z-address</source>
</message> </message>
<message> <message>
<location filename="../src/connection.cpp" line="77"/> <location filename="../src/connection.cpp" line="77"/>
<source>You have zcashd set to start as a daemon, which can cause problems with zec-qt-wallet <source>You have zcashd set to start as a daemon, which can cause problems with ZecWallet
.Please remove the following line from your zcash.conf and restart zec-qt-wallet .Please remove the following line from your zcash.conf and restart ZecWallet
daemon=1</source> daemon=1</source>
<translatorcomment>Hai zcashd impostato per l&apos;avvio come daemon, che può causare problemi con zec-qt-wallet</translatorcomment> <translatorcomment>Hai zcashd impostato per l&apos;avvio come daemon, che può causare problemi con ZecWallet</translatorcomment>
<translation>YOUR_TRANSLATION_HERE</translation> <translation>YOUR_TRANSLATION_HERE</translation>
</message> </message>
<message> <message>
@ -1003,9 +1003,9 @@ Would you like to visit the releases page?</source>
</message> </message>
<message> <message>
<location filename="../src/rpc.cpp" line="1096"/> <location filename="../src/rpc.cpp" line="1096"/>
<source>Please wait for zec-qt-wallet to exit</source> <source>Please wait for ZecWallet to exit</source>
<translatorcomment>controllare, senza contesto potrebbe voler dire &quot;attendere zec qt wallet per uscire&quot; o altro, non ho contesto</translatorcomment> <translatorcomment>controllare, senza contesto potrebbe voler dire &quot;attendere zec qt wallet per uscire&quot; o altro, non ho contesto</translatorcomment>
<translation>Si prega di attendere che zec-qt-wallet finisca la procedura di uscita</translation> <translation>Si prega di attendere che ZecWallet finisca la procedura di uscita</translation>
</message> </message>
<message> <message>
<location filename="../src/rpc.cpp" line="1097"/> <location filename="../src/rpc.cpp" line="1097"/>
@ -1174,7 +1174,7 @@ Avete fondi non confermati o il saldo è troppo basso per una migrazione automat
</message> </message>
<message> <message>
<location filename="../src/websockets.cpp" line="345"/> <location filename="../src/websockets.cpp" line="345"/>
<source>Connected over the internet via zec-qt-wallet wormhole service</source> <source>Connected over the internet via ZecWallet wormhole service</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>

BIN
res/zec_qt_wallet_pt.qm
View File

Binary file not shown.

36
res/zec_qt_wallet_pt.ts
View File

@ -31,8 +31,8 @@
<name>ConnectionDialog</name> <name>ConnectionDialog</name>
<message> <message>
<location filename="../src/connection.ui" line="17"/> <location filename="../src/connection.ui" line="17"/>
<source>zec-qt-wallet</source> <source>ZecWallet</source>
<translation>zec-qt-wallet</translation> <translation>ZecWallet</translation>
</message> </message>
<message> <message>
<location filename="../src/connection.ui" line="58"/> <location filename="../src/connection.ui" line="58"/>
@ -44,8 +44,8 @@
<name>MainWindow</name> <name>MainWindow</name>
<message> <message>
<location filename="../src/mainwindow.ui" line="14"/> <location filename="../src/mainwindow.ui" line="14"/>
<source>zec-qt-wallet</source> <source>ZecWallet</source>
<translation>zec-qt-wallet</translation> <translation>ZecWallet</translation>
</message> </message>
<message> <message>
<location filename="../src/mainwindow.ui" line="29"/> <location filename="../src/mainwindow.ui" line="29"/>
@ -416,7 +416,7 @@
</message> </message>
<message> <message>
<location filename="../src/mainwindow.cpp" line="524"/> <location filename="../src/mainwindow.cpp" line="524"/>
<source>Connection over Tor has been enabled. To use this feature, you need to restart zec-qt-wallet.</source> <source>Connection over Tor has been enabled. To use this feature, you need to restart ZecWallet.</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
@ -426,13 +426,13 @@
</message> </message>
<message> <message>
<location filename="../src/mainwindow.cpp" line="533"/> <location filename="../src/mainwindow.cpp" line="533"/>
<source>Connection over Tor has been disabled. To fully disconnect from Tor, you need to restart zec-qt-wallet.</source> <source>Connection over Tor has been disabled. To fully disconnect from Tor, you need to restart ZecWallet.</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../src/mainwindow.cpp" line="575"/> <location filename="../src/mainwindow.cpp" line="575"/>
<source>Thanks for supporting zec-qt-wallet!</source> <source>Thanks for supporting ZecWallet!</source>
<translation>Obrigado por apoiar a zec-qt-wallet!</translation> <translation>Obrigado por apoiar a ZecWallet!</translation>
</message> </message>
<message> <message>
<location filename="../src/mainwindow.cpp" line="577"/> <location filename="../src/mainwindow.cpp" line="577"/>
@ -441,8 +441,8 @@
</message> </message>
<message> <message>
<location filename="../src/mainwindow.cpp" line="577"/> <location filename="../src/mainwindow.cpp" line="577"/>
<source> to support zec-qt-wallet</source> <source> to support ZecWallet</source>
<translation> para apoiar zec-qt-wallet</translation> <translation> para apoiar ZecWallet</translation>
</message> </message>
<message> <message>
<location filename="../src/mainwindow.cpp" line="614"/> <location filename="../src/mainwindow.cpp" line="614"/>
@ -752,7 +752,7 @@ não se parece com um z-Address</translation>
</message> </message>
<message> <message>
<location filename="../src/mobileappconnector.ui" line="84"/> <location filename="../src/mobileappconnector.ui" line="84"/>
<source>Allow connections over the internet via zec-qt-wallet wormhole</source> <source>Allow connections over the internet via ZecWallet wormhole</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
@ -814,12 +814,12 @@ não se parece com um z-Address</translation>
</message> </message>
<message> <message>
<location filename="../src/connection.cpp" line="77"/> <location filename="../src/connection.cpp" line="77"/>
<source>You have zcashd set to start as a daemon, which can cause problems with zec-qt-wallet <source>You have zcashd set to start as a daemon, which can cause problems with ZecWallet
.Please remove the following line from your zcash.conf and restart zec-qt-wallet .Please remove the following line from your zcash.conf and restart ZecWallet
daemon=1</source> daemon=1</source>
<translation>Você tem zcashd configurado como daemon, o que pode causar problemas com a zec-qt-wallet <translation>Você tem zcashd configurado como daemon, o que pode causar problemas com a ZecWallet
Por favor, remova a seguinte linha do seu zcash.conf e reinicie a zec-qt-wallet: Por favor, remova a seguinte linha do seu zcash.conf e reinicie a ZecWallet:
daemon=1</translation> daemon=1</translation>
</message> </message>
<message> <message>
@ -994,8 +994,8 @@ Would you like to visit the releases page?</source>
</message> </message>
<message> <message>
<location filename="../src/rpc.cpp" line="1096"/> <location filename="../src/rpc.cpp" line="1096"/>
<source>Please wait for zec-qt-wallet to exit</source> <source>Please wait for ZecWallet to exit</source>
<translation>Por favor, espera zec-qt-wallet finalizar</translation> <translation>Por favor, espera ZecWallet finalizar</translation>
</message> </message>
<message> <message>
<location filename="../src/rpc.cpp" line="1097"/> <location filename="../src/rpc.cpp" line="1097"/>
@ -1164,7 +1164,7 @@ Você possui fundos não confirmados ou o saldo é muito baixo para uma migraç
</message> </message>
<message> <message>
<location filename="../src/websockets.cpp" line="345"/> <location filename="../src/websockets.cpp" line="345"/>
<source>Connected over the internet via zec-qt-wallet wormhole service</source> <source>Connected over the internet via ZecWallet wormhole service</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>

2739
res/zec-qt-wallet.xpm → res/zecwallet.xpm
View File

File diff suppressed because it is too large

2
src/about.ui
View File

@ -17,7 +17,7 @@
<item> <item>
<widget class="QGroupBox" name="groupBox"> <widget class="QGroupBox" name="groupBox">
<property name="title"> <property name="title">
<string notr="true">zec-qt-wallet</string> <string notr="true">ZecWallet</string>
</property> </property>
<layout class="QVBoxLayout" name="verticalLayout_2"> <layout class="QVBoxLayout" name="verticalLayout_2">
<item> <item>

4
src/connection.cpp
View File

@ -75,8 +75,8 @@ void ConnectionLoader::doAutoConnect(bool tryEzcashdStart) {
QString explanation; QString explanation;
if (config->zcashDaemon) { if (config->zcashDaemon) {
explanation = QString() % QObject::tr("You have zcashd set to start as a daemon, which can cause problems " explanation = QString() % QObject::tr("You have zcashd set to start as a daemon, which can cause problems "
"with zec-qt-wallet\n\n." "with ZecWallet\n\n."
"Please remove the following line from your zcash.conf and restart zec-qt-wallet\n" "Please remove the following line from your zcash.conf and restart ZecWallet\n"
"daemon=1"); "daemon=1");
} else { } else {
explanation = QString() % QObject::tr("Couldn't start the embedded zcashd.\n\n" explanation = QString() % QObject::tr("Couldn't start the embedded zcashd.\n\n"

2
src/connection.ui
View File

@ -14,7 +14,7 @@
</rect> </rect>
</property> </property>
<property name="windowTitle"> <property name="windowTitle">
<string>zec-qt-wallet</string> <string>ZecWallet</string>
</property> </property>
<property name="modal"> <property name="modal">
<bool>true</bool> <bool>true</bool>

2
src/main.cpp
View File

@ -214,7 +214,7 @@ public:
} }
w = new MainWindow(); w = new MainWindow();
w->setWindowTitle("zec-qt-wallet v" + QString(APP_VERSION)); w->setWindowTitle("ZecWallet v" + QString(APP_VERSION));
if (parser.isSet(headlessOption)) { if (parser.isSet(headlessOption)) {
Settings::getInstance()->setHeadless(true); Settings::getInstance()->setHeadless(true);

8
src/mainwindow.cpp
View File

@ -525,7 +525,7 @@ void MainWindow::setupSettingsModal() {
rpc->getConnection()->config->proxy = "proxy=127.0.0.1:9050"; rpc->getConnection()->config->proxy = "proxy=127.0.0.1:9050";
QMessageBox::information(this, tr("Enable Tor"), QMessageBox::information(this, tr("Enable Tor"),
tr("Connection over Tor has been enabled. To use this feature, you need to restart zec-qt-wallet."), tr("Connection over Tor has been enabled. To use this feature, you need to restart ZecWallet."),
QMessageBox::Ok); QMessageBox::Ok);
} }
if (isUsingTor && !settings.chkTor->isChecked()) { if (isUsingTor && !settings.chkTor->isChecked()) {
@ -534,7 +534,7 @@ void MainWindow::setupSettingsModal() {
rpc->getConnection()->config->proxy.clear(); rpc->getConnection()->config->proxy.clear();
QMessageBox::information(this, tr("Disable Tor"), QMessageBox::information(this, tr("Disable Tor"),
tr("Connection over Tor has been disabled. To fully disconnect from Tor, you need to restart zec-qt-wallet."), tr("Connection over Tor has been disabled. To fully disconnect from Tor, you need to restart ZecWallet."),
QMessageBox::Ok); QMessageBox::Ok);
} }
@ -576,9 +576,9 @@ void MainWindow::donate() {
Settings::getInstance()->isSaplingAddress(ui->inputsCombo->currentText()))); Settings::getInstance()->isSaplingAddress(ui->inputsCombo->currentText())));
ui->Address1->setCursorPosition(0); ui->Address1->setCursorPosition(0);
ui->Amount1->setText("0.01"); ui->Amount1->setText("0.01");
ui->MemoTxt1->setText(tr("Thanks for supporting zec-qt-wallet!")); ui->MemoTxt1->setText(tr("Thanks for supporting ZecWallet!"));
ui->statusBar->showMessage(tr("Donate 0.01 ") % Settings::getTokenName() % tr(" to support zec-qt-wallet")); ui->statusBar->showMessage(tr("Donate 0.01 ") % Settings::getTokenName() % tr(" to support ZecWallet"));
// And switch to the send tab. // And switch to the send tab.
ui->tabWidget->setCurrentIndex(1); ui->tabWidget->setCurrentIndex(1);

2
src/mainwindow.ui
View File

@ -11,7 +11,7 @@
</rect> </rect>
</property> </property>
<property name="windowTitle"> <property name="windowTitle">
<string>zec-qt-wallet</string> <string>ZecWallet</string>
</property> </property>
<property name="windowIcon"> <property name="windowIcon">
<iconset resource="../application.qrc"> <iconset resource="../application.qrc">

2
src/mobileappconnector.ui
View File

@ -81,7 +81,7 @@
<item row="3" column="0"> <item row="3" column="0">
<widget class="QCheckBox" name="chkInternetConn"> <widget class="QCheckBox" name="chkInternetConn">
<property name="text"> <property name="text">
<string>Allow connections over the internet via zec-qt-wallet wormhole</string> <string>Allow connections over the internet via ZecWallet wormhole</string>
</property> </property>
</widget> </widget>
</item> </item>

27
src/rpc.cpp
View File

@ -713,7 +713,7 @@ void RPC::updateUI(bool anyUnconfirmed) {
}; };
// Function to process reply of the listunspent and z_listunspent API calls, used below. // Function to process reply of the listunspent and z_listunspent API calls, used below.
bool RPC::processUnspent(const json& reply) { bool RPC::processUnspent(const json& reply, QMap<QString, double>* balancesMap, QList<UnspentOutput>* newUtxos) {
bool anyUnconfirmed = false; bool anyUnconfirmed = false;
for (auto& it : reply.get<json::array_t>()) { for (auto& it : reply.get<json::array_t>()) {
QString qsAddr = QString::fromStdString(it["address"]); QString qsAddr = QString::fromStdString(it["address"]);
@ -722,12 +722,12 @@ bool RPC::processUnspent(const json& reply) {
anyUnconfirmed = true; anyUnconfirmed = true;
} }
utxos->push_back( newUtxos->push_back(
UnspentOutput{ qsAddr, QString::fromStdString(it["txid"]), UnspentOutput{ qsAddr, QString::fromStdString(it["txid"]),
Settings::getDecimalString(it["amount"].get<json::number_float_t>()), Settings::getDecimalString(it["amount"].get<json::number_float_t>()),
(int)confirmations, it["spendable"].get<json::boolean_t>() }); (int)confirmations, it["spendable"].get<json::boolean_t>() });
(*allBalances)[qsAddr] = (*allBalances)[qsAddr] + it["amount"].get<json::number_float_t>(); (*balancesMap)[qsAddr] = (*balancesMap)[qsAddr] + it["amount"].get<json::number_float_t>();
} }
return anyUnconfirmed; return anyUnconfirmed;
}; };
@ -755,18 +755,23 @@ void RPC::refreshBalances() {
}); });
// 2. Get the UTXOs // 2. Get the UTXOs
// First, create a new UTXO list, deleting the old one; // First, create a new UTXO list. It will be replacing the existing list when everything is processed.
delete utxos; auto newUtxos = new QList<UnspentOutput>();
utxos = new QList<UnspentOutput>(); auto newBalances = new QMap<QString, double>();
delete allBalances;
allBalances = new QMap<QString, double>();
// Call the Transparent and Z unspent APIs serially and then, once they're done, update the UI // Call the Transparent and Z unspent APIs serially and then, once they're done, update the UI
getTransparentUnspent([=] (json reply) { getTransparentUnspent([=] (json reply) {
auto anyTUnconfirmed = processUnspent(reply); auto anyTUnconfirmed = processUnspent(reply, newBalances, newUtxos);
getZUnspent([=] (json reply) { getZUnspent([=] (json reply) {
auto anyZUnconfirmed = processUnspent(reply); auto anyZUnconfirmed = processUnspent(reply, newBalances, newUtxos);
// Swap out the balances and UTXOs
delete allBalances;
delete utxos;
allBalances = newBalances;
utxos = newUtxos;
updateUI(anyTUnconfirmed || anyZUnconfirmed); updateUI(anyTUnconfirmed || anyZUnconfirmed);
}); });
@ -1094,7 +1099,7 @@ void RPC::shutdownZcashd() {
Ui_ConnectionDialog connD; Ui_ConnectionDialog connD;
connD.setupUi(&d); connD.setupUi(&d);
connD.topIcon->setBasePixmap(QIcon(":/icons/res/icon.ico").pixmap(256, 256)); connD.topIcon->setBasePixmap(QIcon(":/icons/res/icon.ico").pixmap(256, 256));
connD.status->setText(QObject::tr("Please wait for zec-qt-wallet to exit")); connD.status->setText(QObject::tr("Please wait for ZecWallet to exit"));
connD.statusDetail->setText(QObject::tr("Waiting for zcashd to exit")); connD.statusDetail->setText(QObject::tr("Waiting for zcashd to exit"));
QTimer waiter(main); QTimer waiter(main);

2
src/rpc.h
View File

@ -94,7 +94,7 @@ private:
void refreshSentZTrans(); void refreshSentZTrans();
void refreshReceivedZTrans(QList<QString> zaddresses); void refreshReceivedZTrans(QList<QString> zaddresses);
bool processUnspent (const json& reply); bool processUnspent (const json& reply, QMap<QString, double>* newBalances, QList<UnspentOutput>* newUtxos);
void updateUI (bool anyUnconfirmed); void updateUI (bool anyUnconfirmed);
void getInfoThenRefresh(bool force); void getInfoThenRefresh(bool force);

4
src/scripts/control
View File

@ -4,6 +4,6 @@ Section: base
Priority: optional Priority: optional
Architecture: amd64 Architecture: amd64
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: ZecWallet is a full node and UI wallet for Zcash.
zec-qt-wallet is a full node and UI wallet for Zcash. It comes with ZecWallet 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.

10
src/scripts/desktopentry
View File

@ -1,13 +1,13 @@
[Desktop Entry] [Desktop Entry]
Name=zec-qt-wallet Name=ZecWallet
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/zecwallet
Icon=zec-qt-wallet.xpm Icon=zecwallet.xpm
Type=Application Type=Application
StartupNotify=true StartupNotify=true
StartupWMClass=zecqtwallet StartupWMClass=zecwallet
Categories=Utility; Categories=Utility;
MimeType=text/plain;inode/directory; MimeType=text/plain;inode/directory;
Keywords=zec-qt-wallet; Keywords=zecwallet;

20
src/scripts/dounifiedbuild.ps1
View File

@ -7,11 +7,11 @@ param (
) )
Write-Host "[Initializing]" Write-Host "[Initializing]"
Remove-Item -Force -ErrorAction Ignore ./artifacts/linux-binaries-zec-qt-wallet-v$version.tar.gz Remove-Item -Force -ErrorAction Ignore ./artifacts/linux-binaries-zecwallet-v$version.tar.gz
Remove-Item -Force -ErrorAction Ignore ./artifacts/linux-deb-zec-qt-wallet-v$version.deb Remove-Item -Force -ErrorAction Ignore ./artifacts/linux-deb-zecwallet-v$version.deb
Remove-Item -Force -ErrorAction Ignore ./artifacts/Windows-binaries-zec-qt-wallet-v$version.zip Remove-Item -Force -ErrorAction Ignore ./artifacts/Windows-binaries-zecwallet-v$version.zip
Remove-Item -Force -ErrorAction Ignore ./artifacts/Windows-installer-zec-qt-wallet-v$version.msi Remove-Item -Force -ErrorAction Ignore ./artifacts/Windows-installer-zecwallet-v$version.msi
Remove-Item -Force -ErrorAction Ignore ./artifacts/macOS-zec-qt-wallet-v$version.dmg Remove-Item -Force -ErrorAction Ignore ./artifacts/macOS-zecwallet-v$version.dmg
Remove-Item -Recurse -Force -ErrorAction Ignore ./bin Remove-Item -Recurse -Force -ErrorAction Ignore ./bin
Remove-Item -Recurse -Force -ErrorAction Ignore ./debug Remove-Item -Recurse -Force -ErrorAction Ignore ./debug
@ -84,11 +84,11 @@ Write-Host "[OK]"
# Finally, test to make sure all files exist # Finally, test to make sure all files exist
Write-Host -NoNewline "Checking Build........." Write-Host -NoNewline "Checking Build........."
if (! (Test-Path ./artifacts/linux-binaries-zec-qt-wallet-v$version.tar.gz) -or if (! (Test-Path ./artifacts/linux-binaries-zecwallet-v$version.tar.gz) -or
! (Test-Path ./artifacts/linux-deb-zec-qt-wallet-v$version.deb) -or ! (Test-Path ./artifacts/linux-deb-zecwallet-v$version.deb) -or
! (Test-Path ./artifacts/Windows-binaries-zec-qt-wallet-v$version.zip) -or ! (Test-Path ./artifacts/Windows-binaries-zecwallet-v$version.zip) -or
! (Test-Path ./artifacts/macOS-zec-qt-wallet-v$version.dmg) -or ! (Test-Path ./artifacts/macOS-zecwallet-v$version.dmg) -or
! (Test-Path ./artifacts/Windows-installer-zec-qt-wallet-v$version.msi) ) { ! (Test-Path ./artifacts/Windows-installer-zecwallet-v$version.msi) ) {
Write-Host "[Error]" Write-Host "[Error]"
exit 1; exit 1;
} }

19
src/scripts/mkmacdmg.sh
View File

@ -60,7 +60,7 @@ export PATH=$PATH:/usr/local/bin
#Clean #Clean
echo -n "Cleaning..............." echo -n "Cleaning..............."
make distclean >/dev/null 2>&1 make distclean >/dev/null 2>&1
rm -f artifacts/macOS-zec-qt-wallet-v$APP_VERSION.dmg rm -f artifacts/macOS-zecwallet-v$APP_VERSION.dmg
echo "[OK]" echo "[OK]"
@ -78,26 +78,27 @@ echo "[OK]"
#Qt deploy #Qt deploy
echo -n "Deploying.............." echo -n "Deploying.............."
mkdir artifacts >/dev/null 2>&1 mkdir artifacts >/dev/null 2>&1
rm -f artifcats/zec-qt-wallet.dmg >/dev/null 2>&1 rm -f artifcats/zecwallet.dmg >/dev/null 2>&1
rm -f artifacts/rw* >/dev/null 2>&1 rm -f artifacts/rw* >/dev/null 2>&1
cp $ZCASH_DIR/src/zcashd zec-qt-wallet.app/Contents/MacOS/ cp $ZCASH_DIR/src/zcashd zecwallet.app/Contents/MacOS/
cp $ZCASH_DIR/src/zcash-cli zec-qt-wallet.app/Contents/MacOS/ cp $ZCASH_DIR/src/zcash-cli zecwallet.app/Contents/MacOS/
$QT_PATH/bin/macdeployqt zec-qt-wallet.app $QT_PATH/bin/macdeployqt zecwallet.app
echo "[OK]" echo "[OK]"
echo -n "Building dmg..........." echo -n "Building dmg..........."
create-dmg --volname "zec-qt-wallet-v$APP_VERSION" --volicon "res/logo.icns" --window-pos 200 120 --icon "zec-qt-wallet.app" 200 190 --app-drop-link 600 185 --hide-extension "zec-qt-wallet.app" --window-size 800 400 --hdiutil-quiet --background res/dmgbg.png artifacts/macOS-zec-qt-wallet-v$APP_VERSION.dmg zec-qt-wallet.app >/dev/null 2>&1 mv zecwallet.app ZecWallet.app
create-dmg --volname "ZecWallet-v$APP_VERSION" --volicon "res/logo.icns" --window-pos 200 120 --icon "ZecWallet.app" 200 190 --app-drop-link 600 185 --hide-extension "ZecWallet.app" --window-size 800 400 --hdiutil-quiet --background res/dmgbg.png artifacts/macOS-zecwallet-v$APP_VERSION.dmg ZecWallet.app >/dev/null 2>&1
#mkdir bin/dmgbuild >/dev/null 2>&1 #mkdir bin/dmgbuild >/dev/null 2>&1
#sed "s/RELEASE_VERSION/${APP_VERSION}/g" res/appdmg.json > bin/dmgbuild/appdmg.json #sed "s/RELEASE_VERSION/${APP_VERSION}/g" res/appdmg.json > bin/dmgbuild/appdmg.json
#cp res/logo.icns bin/dmgbuild/ #cp res/logo.icns bin/dmgbuild/
#cp res/dmgbg.png bin/dmgbuild/ #cp res/dmgbg.png bin/dmgbuild/
#cp -r zec-qt-wallet.app bin/dmgbuild/ #cp -r zecwallet.app bin/dmgbuild/
#appdmg --quiet bin/dmgbuild/appdmg.json artifacts/macOS-zec-qt-wallet-v$APP_VERSION.dmg >/dev/null #appdmg --quiet bin/dmgbuild/appdmg.json artifacts/macOS-zecwallet-v$APP_VERSION.dmg >/dev/null
if [ ! -f artifacts/macOS-zec-qt-wallet-v$APP_VERSION.dmg ]; then if [ ! -f artifacts/macOS-zecwallet-v$APP_VERSION.dmg ]; then
echo "[ERROR]" echo "[ERROR]"
exit 1 exit 1
fi fi

53
src/scripts/mkrelease.sh
View File

@ -66,6 +66,7 @@ echo "[OK]"
echo -n "Building..............." echo -n "Building..............."
rm -rf bin/zec-qt-wallet* > /dev/null rm -rf bin/zec-qt-wallet* > /dev/null
rm -rf bin/zecwallet* > /dev/null
make clean > /dev/null make clean > /dev/null
make -j$(nproc) > /dev/null make -j$(nproc) > /dev/null
echo "[OK]" echo "[OK]"
@ -73,7 +74,7 @@ echo "[OK]"
# Test for Qt # Test for Qt
echo -n "Static link............" echo -n "Static link............"
if [[ $(ldd zec-qt-wallet | grep -i "Qt") ]]; then if [[ $(ldd zecwallet | grep -i "Qt") ]]; then
echo "FOUND QT; ABORT"; echo "FOUND QT; ABORT";
exit 1 exit 1
fi fi
@ -81,27 +82,27 @@ echo "[OK]"
echo -n "Packaging.............." echo -n "Packaging.............."
mkdir bin/zec-qt-wallet-v$APP_VERSION > /dev/null mkdir bin/zecwallet-v$APP_VERSION > /dev/null
strip zec-qt-wallet strip zecwallet
cp zec-qt-wallet bin/zec-qt-wallet-v$APP_VERSION > /dev/null cp zecwallet bin/zecwallet-v$APP_VERSION > /dev/null
cp $ZCASH_DIR/artifacts/zcashd bin/zec-qt-wallet-v$APP_VERSION > /dev/null cp $ZCASH_DIR/artifacts/zcashd bin/zecwallet-v$APP_VERSION > /dev/null
cp $ZCASH_DIR/artifacts/zcash-cli bin/zec-qt-wallet-v$APP_VERSION > /dev/null cp $ZCASH_DIR/artifacts/zcash-cli bin/zecwallet-v$APP_VERSION > /dev/null
cp README.md bin/zec-qt-wallet-v$APP_VERSION > /dev/null cp README.md bin/zecwallet-v$APP_VERSION > /dev/null
cp LICENSE bin/zec-qt-wallet-v$APP_VERSION > /dev/null cp LICENSE bin/zecwallet-v$APP_VERSION > /dev/null
cd bin && tar czf linux-zec-qt-wallet-v$APP_VERSION.tar.gz zec-qt-wallet-v$APP_VERSION/ > /dev/null cd bin && tar czf linux-zecwallet-v$APP_VERSION.tar.gz zecwallet-v$APP_VERSION/ > /dev/null
cd .. cd ..
mkdir artifacts >/dev/null 2>&1 mkdir artifacts >/dev/null 2>&1
cp bin/linux-zec-qt-wallet-v$APP_VERSION.tar.gz ./artifacts/linux-binaries-zec-qt-wallet-v$APP_VERSION.tar.gz cp bin/linux-zecwallet-v$APP_VERSION.tar.gz ./artifacts/linux-binaries-zecwallet-v$APP_VERSION.tar.gz
echo "[OK]" echo "[OK]"
if [ -f artifacts/linux-binaries-zec-qt-wallet-v$APP_VERSION.tar.gz ] ; then if [ -f artifacts/linux-binaries-zecwallet-v$APP_VERSION.tar.gz ] ; then
echo -n "Package contents......." echo -n "Package contents......."
# Test if the package is built OK # Test if the package is built OK
if tar tf "artifacts/linux-binaries-zec-qt-wallet-v$APP_VERSION.tar.gz" | wc -l | grep -q "6"; then if tar tf "artifacts/linux-binaries-zecwallet-v$APP_VERSION.tar.gz" | wc -l | grep -q "6"; then
echo "[OK]" echo "[OK]"
else else
echo "[ERROR]" echo "[ERROR]"
@ -113,24 +114,24 @@ else
fi fi
echo -n "Building deb..........." echo -n "Building deb..........."
debdir=bin/deb/zec-qt-wallet-v$APP_VERSION debdir=bin/deb/zecwallet-v$APP_VERSION
mkdir -p $debdir > /dev/null mkdir -p $debdir > /dev/null
mkdir $debdir/DEBIAN mkdir $debdir/DEBIAN
mkdir -p $debdir/usr/local/bin mkdir -p $debdir/usr/local/bin
cat src/scripts/control | sed "s/RELEASE_VERSION/$APP_VERSION/g" > $debdir/DEBIAN/control cat src/scripts/control | sed "s/RELEASE_VERSION/$APP_VERSION/g" > $debdir/DEBIAN/control
cp zec-qt-wallet $debdir/usr/local/bin/ cp zecwallet $debdir/usr/local/bin/
cp $ZCASH_DIR/artifacts/zcashd $debdir/usr/local/bin/zqw-zcashd cp $ZCASH_DIR/artifacts/zcashd $debdir/usr/local/bin/zqw-zcashd
mkdir -p $debdir/usr/share/pixmaps/ mkdir -p $debdir/usr/share/pixmaps/
cp res/zec-qt-wallet.xpm $debdir/usr/share/pixmaps/ cp res/zecwallet.xpm $debdir/usr/share/pixmaps/
mkdir -p $debdir/usr/share/applications mkdir -p $debdir/usr/share/applications
cp src/scripts/desktopentry $debdir/usr/share/applications/zec-qt-wallet.desktop cp src/scripts/desktopentry $debdir/usr/share/applications/zec-qt-wallet.desktop
dpkg-deb --build $debdir >/dev/null dpkg-deb --build $debdir >/dev/null
cp $debdir.deb artifacts/linux-deb-zec-qt-wallet-v$APP_VERSION.deb cp $debdir.deb artifacts/linux-deb-zecwallet-v$APP_VERSION.deb
echo "[OK]" echo "[OK]"
@ -173,22 +174,22 @@ echo "[OK]"
echo -n "Packaging.............." echo -n "Packaging.............."
mkdir release/zec-qt-wallet-v$APP_VERSION mkdir release/zecwallet-v$APP_VERSION
cp release/zec-qt-wallet.exe release/zec-qt-wallet-v$APP_VERSION cp release/zecwallet.exe release/zecwallet-v$APP_VERSION
cp $ZCASH_DIR/artifacts/zcashd.exe release/zec-qt-wallet-v$APP_VERSION > /dev/null cp $ZCASH_DIR/artifacts/zcashd.exe release/zecwallet-v$APP_VERSION > /dev/null
cp $ZCASH_DIR/artifacts/zcash-cli.exe release/zec-qt-wallet-v$APP_VERSION > /dev/null cp $ZCASH_DIR/artifacts/zcash-cli.exe release/zecwallet-v$APP_VERSION > /dev/null
cp README.md release/zec-qt-wallet-v$APP_VERSION cp README.md release/zecwallet-v$APP_VERSION
cp LICENSE release/zec-qt-wallet-v$APP_VERSION cp LICENSE release/zecwallet-v$APP_VERSION
cd release && zip -r Windows-binaries-zec-qt-wallet-v$APP_VERSION.zip zec-qt-wallet-v$APP_VERSION/ > /dev/null cd release && zip -r Windows-binaries-zecwallet-v$APP_VERSION.zip zecwallet-v$APP_VERSION/ > /dev/null
cd .. cd ..
mkdir artifacts >/dev/null 2>&1 mkdir artifacts >/dev/null 2>&1
cp release/Windows-binaries-zec-qt-wallet-v$APP_VERSION.zip ./artifacts/ cp release/Windows-binaries-zecwallet-v$APP_VERSION.zip ./artifacts/
echo "[OK]" echo "[OK]"
if [ -f artifacts/Windows-binaries-zec-qt-wallet-v$APP_VERSION.zip ] ; then if [ -f artifacts/Windows-binaries-zecwallet-v$APP_VERSION.zip ] ; then
echo -n "Package contents......." echo -n "Package contents......."
if unzip -l "artifacts/Windows-binaries-zec-qt-wallet-v$APP_VERSION.zip" | wc -l | grep -q "11"; then if unzip -l "artifacts/Windows-binaries-zecwallet-v$APP_VERSION.zip" | wc -l | grep -q "11"; then
echo "[OK]" echo "[OK]"
else else
echo "[ERROR]" echo "[ERROR]"

8
src/scripts/mkwininstaller.ps1
View File

@ -2,12 +2,12 @@ param (
[Parameter(Mandatory=$true)][string]$version [Parameter(Mandatory=$true)][string]$version
) )
$target="zec-qt-wallet-v$version" $target="zecwallet-v$version"
Remove-Item -Path release/wininstaller -Recurse -ErrorAction Ignore | Out-Null Remove-Item -Path release/wininstaller -Recurse -ErrorAction Ignore | Out-Null
New-Item release/wininstaller -itemtype directory | Out-Null New-Item release/wininstaller -itemtype directory | Out-Null
Copy-Item release/$target/zec-qt-wallet.exe release/wininstaller/ Copy-Item release/$target/zecwallet.exe release/wininstaller/
Copy-Item release/$target/LICENSE release/wininstaller/ Copy-Item release/$target/LICENSE release/wininstaller/
Copy-Item release/$target/README.md release/wininstaller/ Copy-Item release/$target/README.md release/wininstaller/
Copy-Item release/$target/zcashd.exe release/wininstaller/ Copy-Item release/$target/zcashd.exe release/wininstaller/
@ -20,10 +20,10 @@ if (!$?) {
exit 1; exit 1;
} }
light.exe -ext WixUIExtension -cultures:en-us release/wininstaller/zec-qt-wallet.wixobj -out release/wininstaller/zec-qt-wallet.msi light.exe -ext WixUIExtension -cultures:en-us release/wininstaller/zec-qt-wallet.wixobj -out release/wininstaller/zecwallet.msi
if (!$?) { if (!$?) {
exit 1; exit 1;
} }
New-Item artifacts -itemtype directory -Force | Out-Null New-Item artifacts -itemtype directory -Force | Out-Null
Copy-Item release/wininstaller/zec-qt-wallet.msi ./artifacts/Windows-installer-$target.msi Copy-Item release/wininstaller/zecwallet.msi ./artifacts/Windows-installer-$target.msi

2
src/scripts/signbinaries.sh
View File

@ -35,7 +35,7 @@ rm -f signatures-v$APP_VERSION.tar.gz
# sha256sum the binaries # sha256sum the binaries
gsha256sum *$APP_VERSION* > sha256sum-v$APP_VERSION.txt gsha256sum *$APP_VERSION* > sha256sum-v$APP_VERSION.txt
for i in $( ls *zec-qt-wallet-v$APP_VERSION* sha256sum-v$APP_VERSION* ); do for i in $( ls *zecwallet-v$APP_VERSION* sha256sum-v$APP_VERSION* ); do
echo "Signing" $i echo "Signing" $i
gpg --batch --output ../release/signatures/$i.sig --detach-sig $i gpg --batch --output ../release/signatures/$i.sig --detach-sig $i
done done

6
src/scripts/zec-qt-wallet.wxs
View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi"> <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
<Product Id="*" Name="zec-qt-wallet vRELEASE_VERSION" Language="1033" Version="RELEASE_VERSION" Manufacturer="zec-qt-wallet-org" UpgradeCode="fb9bf166-b55f-46b5-a990-9189bdf64533"> <Product Id="*" Name="ZecWallet vRELEASE_VERSION" Language="1033" Version="RELEASE_VERSION" Manufacturer="zec-qt-wallet-org" UpgradeCode="fb9bf166-b55f-46b5-a990-9189bdf64533">
<Package InstallerVersion="200" Compressed="yes" InstallScope="perMachine" /> <Package InstallerVersion="200" Compressed="yes" InstallScope="perMachine" />
<MajorUpgrade DowngradeErrorMessage="A newer version of [ProductName] is already installed." /> <MajorUpgrade DowngradeErrorMessage="A newer version of [ProductName] is already installed." />
@ -55,9 +55,9 @@
<Fragment> <Fragment>
<ComponentGroup Id="ProductComponents" Directory="INSTALLFOLDER"> <ComponentGroup Id="ProductComponents" Directory="INSTALLFOLDER">
<Component Id="ProductComponent" Guid="0D210F5A-53E0-4E7E-CAAD-15A26995505E"> <Component Id="ProductComponent" Guid="0D210F5A-53E0-4E7E-CAAD-15A26995505E">
<File Source="zec-qt-wallet.exe" KeyPath="yes"> <File Source="zecwallet.exe" KeyPath="yes">
<Shortcut Id="startMenuShotcut" Advertise="yes" Directory="ApplicationProgramsFolder" <Shortcut Id="startMenuShotcut" Advertise="yes" Directory="ApplicationProgramsFolder"
Name="zec-qt-wallet" WorkingDirectory="INSTALLFOLDER" Icon="zecqtwalleticon.exe" > Name="ZecWallet" WorkingDirectory="INSTALLFOLDER" Icon="zecqtwalleticon.exe" >
</Shortcut> </Shortcut>
</File> </File>
<File Source="LICENSE" /> <File Source="LICENSE" />

2
src/version.h
View File

@ -1 +1 @@
#define APP_VERSION "0.6.1" #define APP_VERSION "0.6.2"

2
src/websockets.cpp
View File

@ -342,7 +342,7 @@ QString AppDataServer::connDesc(AppConnectionType t) {
return QObject::tr("Connected directly"); return QObject::tr("Connected directly");
} }
else { else {
return QObject::tr("Connected over the internet via zec-qt-wallet wormhole service"); return QObject::tr("Connected over the internet via ZecWallet wormhole service");
} }
} }

2
zec-qt-wallet.pro
View File

@ -13,7 +13,7 @@ PRECOMPILED_HEADER = src/precompiled.h
QT += widgets QT += widgets
QT += websockets QT += websockets
TARGET = zec-qt-wallet TARGET = zecwallet
TEMPLATE = app TEMPLATE = app

Write Preview
Loading…
Cancel
Save