Merge pull request #62 from MyHush/dev

fix translation error,add taddr supply,zaddr supply and total supply,improvements to render the price,delete old light server
This commit is contained in:
Denio
2019-12-12 16:09:08 +01:00
committed by GitHub
14 changed files with 643 additions and 396 deletions

View File

@@ -1 +1 @@
[{"excluded":[],"includePaths":["/home/denio/silentdragon-lite/src/3rdparty","/home/denio/silentdragon-lite/src","/home/denio/silentdragon-lite/singleapplication","/home/denio/silentdragon-lite/res","/home/denio/Qt5.13.1/5.13.1/gcc_64/include","/home/denio/Qt5.13.1/5.13.1/gcc_64/include/QtWidgets","/home/denio/Qt5.13.1/5.13.1/gcc_64/include/QtGui","/home/denio/Qt5.13.1/5.13.1/gcc_64/include/QtWebSockets","/home/denio/Qt5.13.1/5.13.1/gcc_64/include/QtNetwork","/home/denio/Qt5.13.1/5.13.1/gcc_64/include/QtCore","/home/denio/silentdragon-lite/bin","/usr/include/libdrm","/home/denio/silentdragon-lite/src"],"projectFile":"/home/denio/silentdragon-lite/silentdragon-lite.pro","sources":["/home/denio/silentdragon-lite/lib/silentdragonlitelib.h","/home/denio/silentdragon-lite/singleapplication/singleapplication.cpp","/home/denio/silentdragon-lite/singleapplication/singleapplication.h","/home/denio/silentdragon-lite/singleapplication/singleapplication_p.cpp","/home/denio/silentdragon-lite/singleapplication/singleapplication_p.h","/home/denio/silentdragon-lite/src/3rdparty/json/json.hpp","/home/denio/silentdragon-lite/src/3rdparty/qrcode/BitBuffer.cpp","/home/denio/silentdragon-lite/src/3rdparty/qrcode/BitBuffer.hpp","/home/denio/silentdragon-lite/src/3rdparty/qrcode/QrCode.cpp","/home/denio/silentdragon-lite/src/3rdparty/qrcode/QrCode.hpp","/home/denio/silentdragon-lite/src/3rdparty/qrcode/QrSegment.cpp","/home/denio/silentdragon-lite/src/3rdparty/qrcode/QrSegment.hpp","/home/denio/silentdragon-lite/src/about.ui","/home/denio/silentdragon-lite/src/addressbook.cpp","/home/denio/silentdragon-lite/src/addressbook.h","/home/denio/silentdragon-lite/src/addressbook.ui","/home/denio/silentdragon-lite/src/addresscombo.cpp","/home/denio/silentdragon-lite/src/addresscombo.h","/home/denio/silentdragon-lite/src/balancestablemodel.cpp","/home/denio/silentdragon-lite/src/balancestablemodel.h","/home/denio/silentdragon-lite/src/confirm.ui","/home/denio/silentdragon-lite/src/connection.cpp","/home/denio/silentdragon-lite/src/connection.h","/home/denio/silentdragon-lite/src/connection.ui","/home/denio/silentdragon-lite/src/controller.cpp","/home/denio/silentdragon-lite/src/controller.h","/home/denio/silentdragon-lite/src/createhushconfdialog.ui","/home/denio/silentdragon-lite/src/datamodel.cpp","/home/denio/silentdragon-lite/src/datamodel.h","/home/denio/silentdragon-lite/src/fillediconlabel.cpp","/home/denio/silentdragon-lite/src/fillediconlabel.h","/home/denio/silentdragon-lite/src/liteinterface.cpp","/home/denio/silentdragon-lite/src/liteinterface.h","/home/denio/silentdragon-lite/src/logger.cpp","/home/denio/silentdragon-lite/src/logger.h","/home/denio/silentdragon-lite/src/main.cpp","/home/denio/silentdragon-lite/src/mainwindow.cpp","/home/denio/silentdragon-lite/src/mainwindow.h","/home/denio/silentdragon-lite/src/mainwindow.ui","/home/denio/silentdragon-lite/src/memodialog.ui","/home/denio/silentdragon-lite/src/memoedit.cpp","/home/denio/silentdragon-lite/src/memoedit.h","/home/denio/silentdragon-lite/src/migration.ui","/home/denio/silentdragon-lite/src/mobileappconnector.cpp","/home/denio/silentdragon-lite/src/mobileappconnector.h","/home/denio/silentdragon-lite/src/mobileappconnector.ui","/home/denio/silentdragon-lite/src/newrecurring.ui","/home/denio/silentdragon-lite/src/precompiled.h","/home/denio/silentdragon-lite/src/privkey.ui","/home/denio/silentdragon-lite/src/qrcodelabel.cpp","/home/denio/silentdragon-lite/src/qrcodelabel.h","/home/denio/silentdragon-lite/src/recurring.cpp","/home/denio/silentdragon-lite/src/recurring.h","/home/denio/silentdragon-lite/src/recurringdialog.ui","/home/denio/silentdragon-lite/src/recurringmultiple.ui","/home/denio/silentdragon-lite/src/recurringpayments.ui","/home/denio/silentdragon-lite/src/requestdialog.cpp","/home/denio/silentdragon-lite/src/requestdialog.h","/home/denio/silentdragon-lite/src/requestdialog.ui","/home/denio/silentdragon-lite/src/sendtab.cpp","/home/denio/silentdragon-lite/src/settings.cpp","/home/denio/silentdragon-lite/src/settings.h","/home/denio/silentdragon-lite/src/settings.ui","/home/denio/silentdragon-lite/src/txtablemodel.cpp","/home/denio/silentdragon-lite/src/txtablemodel.h","/home/denio/silentdragon-lite/src/viewalladdresses.cpp","/home/denio/silentdragon-lite/src/viewalladdresses.h","/home/denio/silentdragon-lite/src/viewalladdresses.ui","/home/denio/silentdragon-lite/src/websockets.cpp","/home/denio/silentdragon-lite/src/websockets.h"],"translations":["/home/denio/silentdragon-lite/res/zec_qt_wallet_es.ts","/home/denio/silentdragon-lite/res/zec_qt_wallet_fr.ts","/home/denio/silentdragon-lite/res/zec_qt_wallet_de.ts","/home/denio/silentdragon-lite/res/zec_qt_wallet_pt.ts","/home/denio/silentdragon-lite/res/zec_qt_wallet_it.ts","/home/denio/silentdragon-lite/res/zec_qt_wallet_zh.ts","/home/denio/silentdragon-lite/res/zec_qt_wallet_tr.ts","/home/denio/silentdragon-lite/res/zec_qt_wallet_template.ts"]}] [{"excluded":[],"includePaths":["/home/denio/silentdragon-lite/src/3rdparty","/home/denio/silentdragon-lite/src","/home/denio/silentdragon-lite/singleapplication","/home/denio/silentdragon-lite/res","/home/denio/Qt5.13.1/5.13.1/gcc_64/include","/home/denio/Qt5.13.1/5.13.1/gcc_64/include/QtWidgets","/home/denio/Qt5.13.1/5.13.1/gcc_64/include/QtGui","/home/denio/Qt5.13.1/5.13.1/gcc_64/include/QtWebSockets","/home/denio/Qt5.13.1/5.13.1/gcc_64/include/QtNetwork","/home/denio/Qt5.13.1/5.13.1/gcc_64/include/QtCore","/home/denio/silentdragon-lite/bin","/usr/include/libdrm","/home/denio/silentdragon-lite/src"],"projectFile":"/home/denio/silentdragon-lite/silentdragon-lite.pro","sources":["/home/denio/silentdragon-lite/lib/silentdragonlitelib.h","/home/denio/silentdragon-lite/singleapplication/singleapplication.cpp","/home/denio/silentdragon-lite/singleapplication/singleapplication.h","/home/denio/silentdragon-lite/singleapplication/singleapplication_p.cpp","/home/denio/silentdragon-lite/singleapplication/singleapplication_p.h","/home/denio/silentdragon-lite/src/3rdparty/json/json.hpp","/home/denio/silentdragon-lite/src/3rdparty/qrcode/BitBuffer.cpp","/home/denio/silentdragon-lite/src/3rdparty/qrcode/BitBuffer.hpp","/home/denio/silentdragon-lite/src/3rdparty/qrcode/QrCode.cpp","/home/denio/silentdragon-lite/src/3rdparty/qrcode/QrCode.hpp","/home/denio/silentdragon-lite/src/3rdparty/qrcode/QrSegment.cpp","/home/denio/silentdragon-lite/src/3rdparty/qrcode/QrSegment.hpp","/home/denio/silentdragon-lite/src/about.ui","/home/denio/silentdragon-lite/src/addressbook.cpp","/home/denio/silentdragon-lite/src/addressbook.h","/home/denio/silentdragon-lite/src/addressbook.ui","/home/denio/silentdragon-lite/src/addresscombo.cpp","/home/denio/silentdragon-lite/src/addresscombo.h","/home/denio/silentdragon-lite/src/balancestablemodel.cpp","/home/denio/silentdragon-lite/src/balancestablemodel.h","/home/denio/silentdragon-lite/src/confirm.ui","/home/denio/silentdragon-lite/src/connection.cpp","/home/denio/silentdragon-lite/src/connection.h","/home/denio/silentdragon-lite/src/connection.ui","/home/denio/silentdragon-lite/src/controller.cpp","/home/denio/silentdragon-lite/src/controller.h","/home/denio/silentdragon-lite/src/createhushconfdialog.ui","/home/denio/silentdragon-lite/src/datamodel.cpp","/home/denio/silentdragon-lite/src/datamodel.h","/home/denio/silentdragon-lite/src/fillediconlabel.cpp","/home/denio/silentdragon-lite/src/fillediconlabel.h","/home/denio/silentdragon-lite/src/liteinterface.cpp","/home/denio/silentdragon-lite/src/liteinterface.h","/home/denio/silentdragon-lite/src/logger.cpp","/home/denio/silentdragon-lite/src/logger.h","/home/denio/silentdragon-lite/src/main.cpp","/home/denio/silentdragon-lite/src/mainwindow.cpp","/home/denio/silentdragon-lite/src/mainwindow.h","/home/denio/silentdragon-lite/src/mainwindow.ui","/home/denio/silentdragon-lite/src/memodialog.ui","/home/denio/silentdragon-lite/src/memoedit.cpp","/home/denio/silentdragon-lite/src/memoedit.h","/home/denio/silentdragon-lite/src/migration.ui","/home/denio/silentdragon-lite/src/mobileappconnector.cpp","/home/denio/silentdragon-lite/src/mobileappconnector.h","/home/denio/silentdragon-lite/src/mobileappconnector.ui","/home/denio/silentdragon-lite/src/newrecurring.ui","/home/denio/silentdragon-lite/src/precompiled.h","/home/denio/silentdragon-lite/src/privkey.ui","/home/denio/silentdragon-lite/src/qrcodelabel.cpp","/home/denio/silentdragon-lite/src/qrcodelabel.h","/home/denio/silentdragon-lite/src/recurring.cpp","/home/denio/silentdragon-lite/src/recurring.h","/home/denio/silentdragon-lite/src/recurringdialog.ui","/home/denio/silentdragon-lite/src/recurringmultiple.ui","/home/denio/silentdragon-lite/src/recurringpayments.ui","/home/denio/silentdragon-lite/src/requestdialog.cpp","/home/denio/silentdragon-lite/src/requestdialog.h","/home/denio/silentdragon-lite/src/requestdialog.ui","/home/denio/silentdragon-lite/src/sendtab.cpp","/home/denio/silentdragon-lite/src/settings.cpp","/home/denio/silentdragon-lite/src/settings.h","/home/denio/silentdragon-lite/src/settings.ui","/home/denio/silentdragon-lite/src/txtablemodel.cpp","/home/denio/silentdragon-lite/src/txtablemodel.h","/home/denio/silentdragon-lite/src/viewalladdresses.cpp","/home/denio/silentdragon-lite/src/viewalladdresses.h","/home/denio/silentdragon-lite/src/viewalladdresses.ui","/home/denio/silentdragon-lite/src/websockets.cpp","/home/denio/silentdragon-lite/src/websockets.h"],"translations":["/home/denio/silentdragon-lite/res/silentdragonlite_es.ts","/home/denio/silentdragon-lite/res/silentdragonlite_fr.ts","/home/denio/silentdragon-lite/res/silentdragonlite_de.ts","/home/denio/silentdragon-lite/res/silentdragonlite_pt.ts","/home/denio/silentdragon-lite/res/silentdragonlite_it.ts","/home/denio/silentdragon-lite/res/silentdragonlite_zh.ts","/home/denio/silentdragon-lite/res/silentdragonlite_tr.ts","/home/denio/silentdragon-lite/res/silentdragonlite_template.ts"]}]

6
lib/Cargo.lock generated
View File

@@ -1051,7 +1051,7 @@ version = "0.1.0"
dependencies = [ dependencies = [
"lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
"libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)",
"silentdragonlitelib 0.1.0 (git+https://github.com/MyHush/silentdragonlite-cli?rev=473d476274077d88104392dc6ad384a06b5d2554)", "silentdragonlitelib 0.1.0 (git+https://github.com/MyHush/silentdragonlite-cli?rev=b5534d6f830b9af2e6a2992d67c99fea2ef5f21a)",
] ]
[[package]] [[package]]
@@ -1467,7 +1467,7 @@ dependencies = [
[[package]] [[package]]
name = "silentdragonlitelib" name = "silentdragonlitelib"
version = "0.1.0" version = "0.1.0"
source = "git+https://github.com/MyHush/silentdragonlite-cli?rev=473d476274077d88104392dc6ad384a06b5d2554#473d476274077d88104392dc6ad384a06b5d2554" source = "git+https://github.com/MyHush/silentdragonlite-cli?rev=b5534d6f830b9af2e6a2992d67c99fea2ef5f21a#b5534d6f830b9af2e6a2992d67c99fea2ef5f21a"
dependencies = [ dependencies = [
"base58 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "base58 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
"bellman 0.1.0 (git+https://github.com/DenioD/librustzcash.git?rev=caaee693c47c2ee9ecd1e1546b8fe3c714f342bc)", "bellman 0.1.0 (git+https://github.com/DenioD/librustzcash.git?rev=caaee693c47c2ee9ecd1e1546b8fe3c714f342bc)",
@@ -2481,7 +2481,7 @@ dependencies = [
"checksum serde_json 1.0.41 (registry+https://github.com/rust-lang/crates.io-index)" = "2f72eb2a68a7dc3f9a691bfda9305a1c017a6215e5a4545c258500d2099a37c2" "checksum serde_json 1.0.41 (registry+https://github.com/rust-lang/crates.io-index)" = "2f72eb2a68a7dc3f9a691bfda9305a1c017a6215e5a4545c258500d2099a37c2"
"checksum serde_yaml 0.8.11 (registry+https://github.com/rust-lang/crates.io-index)" = "691b17f19fc1ec9d94ec0b5864859290dff279dbd7b03f017afda54eb36c3c35" "checksum serde_yaml 0.8.11 (registry+https://github.com/rust-lang/crates.io-index)" = "691b17f19fc1ec9d94ec0b5864859290dff279dbd7b03f017afda54eb36c3c35"
"checksum sha2 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)" = "7b4d8bfd0e469f417657573d8451fb33d16cfe0989359b93baf3a1ffc639543d" "checksum sha2 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)" = "7b4d8bfd0e469f417657573d8451fb33d16cfe0989359b93baf3a1ffc639543d"
"checksum silentdragonlitelib 0.1.0 (git+https://github.com/MyHush/silentdragonlite-cli?rev=473d476274077d88104392dc6ad384a06b5d2554)" = "<none>" "checksum silentdragonlitelib 0.1.0 (git+https://github.com/MyHush/silentdragonlite-cli?rev=b5534d6f830b9af2e6a2992d67c99fea2ef5f21a)" = "<none>"
"checksum slab 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)" = "c111b5bd5695e56cffe5129854aa230b39c93a305372fdbb2668ca2394eea9f8" "checksum slab 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)" = "c111b5bd5695e56cffe5129854aa230b39c93a305372fdbb2668ca2394eea9f8"
"checksum smallvec 0.6.10 (registry+https://github.com/rust-lang/crates.io-index)" = "ab606a9c5e214920bb66c458cd7be8ef094f813f20fe77a54cc7dbfff220d4b7" "checksum smallvec 0.6.10 (registry+https://github.com/rust-lang/crates.io-index)" = "ab606a9c5e214920bb66c458cd7be8ef094f813f20fe77a54cc7dbfff220d4b7"
"checksum sodiumoxide 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)" = "585232e78a4fc18133eef9946d3080befdf68b906c51b621531c37e91787fa2b" "checksum sodiumoxide 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)" = "585232e78a4fc18133eef9946d3080befdf68b906c51b621531c37e91787fa2b"

View File

@@ -11,4 +11,4 @@ crate-type = ["staticlib"]
[dependencies] [dependencies]
libc = "0.2.58" libc = "0.2.58"
lazy_static = "1.4.0" lazy_static = "1.4.0"
silentdragonlitelib = { git = "https://github.com/MyHush/silentdragonlite-cli", rev = "473d476274077d88104392dc6ad384a06b5d2554" } silentdragonlitelib = { git = "https://github.com/MyHush/silentdragonlite-cli", rev = "b5534d6f830b9af2e6a2992d67c99fea2ef5f21a" }

Binary file not shown.

View File

@@ -17,12 +17,12 @@
<context> <context>
<name>BalancesTableModel</name> <name>BalancesTableModel</name>
<message> <message>
<location filename="../src/balancestablemodel.cpp" line="136"/> <location filename="../src/balancestablemodel.cpp" line="141"/>
<source>Address</source> <source>Address</source>
<translation>Adresse</translation> <translation>Adresse</translation>
</message> </message>
<message> <message>
<location filename="../src/balancestablemodel.cpp" line="137"/> <location filename="../src/balancestablemodel.cpp" line="142"/>
<source>Amount</source> <source>Amount</source>
<translation>Betrag</translation> <translation>Betrag</translation>
</message> </message>
@@ -47,29 +47,29 @@
<context> <context>
<name>Controller</name> <name>Controller</name>
<message> <message>
<location filename="../src/controller.cpp" line="577"/> <location filename="../src/controller.cpp" line="626"/>
<source>Wallet Password</source> <source>Wallet Password</source>
<translation>Wallet Passwort</translation> <translation>Wallet Passwort</translation>
</message> </message>
<message> <message>
<location filename="../src/controller.cpp" line="578"/> <location filename="../src/controller.cpp" line="627"/>
<source>Your wallet is encrypted. <source>Your wallet is encrypted.
Please enter your wallet password</source> Please enter your wallet password</source>
<translation>Ihr Wallet ist verschlüsselt. Bitte geben Sie das Passwort ein</translation> <translation>Ihr Wallet ist verschlüsselt. Bitte geben Sie das Passwort ein</translation>
</message> </message>
<message> <message>
<location filename="../src/controller.cpp" line="581"/> <location filename="../src/controller.cpp" line="630"/>
<location filename="../src/controller.cpp" line="596"/> <location filename="../src/controller.cpp" line="645"/>
<source>Wallet Decryption Failed</source> <source>Wallet Decryption Failed</source>
<translation>Entschlüsslung gescheitert</translation> <translation>Entschlüsslung gescheitert</translation>
</message> </message>
<message> <message>
<location filename="../src/controller.cpp" line="582"/> <location filename="../src/controller.cpp" line="631"/>
<source>Please enter a valid password</source> <source>Please enter a valid password</source>
<translation>Bitte geben Sie ein gültiges Passwort ein</translation> <translation>Bitte geben Sie ein gültiges Passwort ein</translation>
</message> </message>
<message> <message>
<location filename="../src/controller.cpp" line="652"/> <location filename="../src/controller.cpp" line="701"/>
<source>Failed to unlock wallet</source> <source>Failed to unlock wallet</source>
<translation>Konnte das Wallet nicht entsperren</translation> <translation>Konnte das Wallet nicht entsperren</translation>
</message> </message>
@@ -217,8 +217,8 @@ Please enter your wallet password</source>
</message> </message>
<message> <message>
<location filename="../src/mainwindow.ui" line="499"/> <location filename="../src/mainwindow.ui" line="499"/>
<location filename="../src/mainwindow.cpp" line="885"/> <location filename="../src/mainwindow.cpp" line="888"/>
<location filename="../src/mainwindow.cpp" line="933"/> <location filename="../src/mainwindow.cpp" line="937"/>
<location filename="../src/sendtab.cpp" line="291"/> <location filename="../src/sendtab.cpp" line="291"/>
<source>Memo</source> <source>Memo</source>
<translation>Nachricht hinzufügen</translation> <translation>Nachricht hinzufügen</translation>
@@ -280,9 +280,8 @@ Please enter your wallet password</source>
<translation>Sichtbare Adresse</translation> <translation>Sichtbare Adresse</translation>
</message> </message>
<message> <message>
<location filename="../src/mainwindow.ui" line="773"/>
<source>New Address</source> <source>New Address</source>
<translation>Neue Adresse</translation> <translation type="vanished">Neue Adresse</translation>
</message> </message>
<message> <message>
<location filename="../src/mainwindow.ui" line="780"/> <location filename="../src/mainwindow.ui" line="780"/>
@@ -311,7 +310,7 @@ Please enter your wallet password</source>
</message> </message>
<message> <message>
<location filename="../src/mainwindow.ui" line="851"/> <location filename="../src/mainwindow.ui" line="851"/>
<location filename="../src/mainwindow.cpp" line="1077"/> <location filename="../src/mainwindow.cpp" line="1088"/>
<source>Export Private Key</source> <source>Export Private Key</source>
<translation>Private Key exportieren</translation> <translation>Private Key exportieren</translation>
</message> </message>
@@ -321,47 +320,45 @@ Please enter your wallet password</source>
<translation>Transaktionen</translation> <translation>Transaktionen</translation>
</message> </message>
<message> <message>
<location filename="../src/mainwindow.ui" line="951"/>
<source>Hush Daemon</source> <source>Hush Daemon</source>
<translation>Hush Daemon</translation> <translation type="vanished">Hush Daemon</translation>
</message> </message>
<message> <message>
<location filename="../src/mainwindow.ui" line="1008"/>
<source>blockHeight</source> <source>blockHeight</source>
<translation>Blockhöhe</translation> <translation type="vanished">Blockhöhe</translation>
</message> </message>
<message> <message>
<location filename="../src/mainwindow.ui" line="1022"/> <location filename="../src/mainwindow.ui" line="1174"/>
<source>Version hushlightd</source> <source>Version hushlightd</source>
<translation>Hushdlight Version</translation> <translation>Hushdlight Version</translation>
</message> </message>
<message> <message>
<location filename="../src/mainwindow.ui" line="1171"/> <location filename="../src/mainwindow.ui" line="1409"/>
<source>&amp;Send DenioD Feedback</source> <source>&amp;Send DenioD Feedback</source>
<translation>Sende DenioD Feedback</translation> <translation>Sende DenioD Feedback</translation>
</message> </message>
<message> <message>
<location filename="../src/mainwindow.ui" line="1204"/> <location filename="../src/mainwindow.ui" line="1442"/>
<source>&amp;Export seed phrase</source> <source>&amp;Export seed phrase</source>
<translation>Seed exportieren</translation> <translation>Seed exportieren</translation>
</message> </message>
<message> <message>
<location filename="../src/mainwindow.ui" line="1242"/> <location filename="../src/mainwindow.ui" line="1480"/>
<source>Encrypt Wallet</source> <source>Encrypt Wallet</source>
<translation>Wallet verschlüsseln</translation> <translation>Wallet verschlüsseln</translation>
</message> </message>
<message> <message>
<location filename="../src/mainwindow.ui" line="1247"/> <location filename="../src/mainwindow.ui" line="1485"/>
<source>Remove Wallet Encryption</source> <source>Remove Wallet Encryption</source>
<translation>Verschlüsslung entfernen</translation> <translation>Verschlüsslung entfernen</translation>
</message> </message>
<message> <message>
<location filename="../src/mainwindow.ui" line="1252"/> <location filename="../src/mainwindow.ui" line="1490"/>
<source>Rescan</source> <source>Rescan</source>
<translation type="unfinished">Neu Scannen</translation> <translation type="unfinished">Neu Scannen</translation>
</message> </message>
<message> <message>
<location filename="../src/mainwindow.ui" line="981"/> <location filename="../src/mainwindow.ui" line="1304"/>
<source>This is a Lightwallet, you cant mine with it!</source> <source>This is a Lightwallet, you cant mine with it!</source>
<translation>Dies ist ein Lightwallet, sie können damit nicht Minen!</translation> <translation>Dies ist ein Lightwallet, sie können damit nicht Minen!</translation>
</message> </message>
@@ -371,9 +368,18 @@ Please enter your wallet password</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../src/mainwindow.ui" line="1001"/> <location filename="../src/mainwindow.ui" line="1020"/>
<location filename="../src/mainwindow.ui" line="1015"/> <location filename="../src/mainwindow.ui" line="1041"/>
<location filename="../src/mainwindow.ui" line="1036"/> <location filename="../src/mainwindow.ui" line="1055"/>
<location filename="../src/mainwindow.ui" line="1069"/>
<location filename="../src/mainwindow.ui" line="1076"/>
<location filename="../src/mainwindow.ui" line="1083"/>
<location filename="../src/mainwindow.ui" line="1090"/>
<location filename="../src/mainwindow.ui" line="1132"/>
<location filename="../src/mainwindow.ui" line="1202"/>
<location filename="../src/mainwindow.ui" line="1209"/>
<location filename="../src/mainwindow.ui" line="1253"/>
<location filename="../src/mainwindow.ui" line="1274"/>
<source>Loading...</source> <source>Loading...</source>
<translation>Lade...</translation> <translation>Lade...</translation>
</message> </message>
@@ -386,126 +392,205 @@ Please enter your wallet password</source>
<translation type="vanished">Version hushd light</translation> <translation type="vanished">Version hushd light</translation>
</message> </message>
<message> <message>
<location filename="../src/mainwindow.ui" line="1029"/> <location filename="../src/mainwindow.ui" line="1062"/>
<source>Vendor</source> <source>Vendor</source>
<translation>Vendor</translation> <translation>Vendor</translation>
</message> </message>
<message> <message>
<location filename="../src/mainwindow.ui" line="1063"/> <location filename="../src/mainwindow.ui" line="1013"/>
<location filename="../src/mainwindow.ui" line="1070"/> <location filename="../src/mainwindow.ui" line="1027"/>
<location filename="../src/mainwindow.ui" line="1077"/> <location filename="../src/mainwindow.ui" line="1048"/>
<location filename="../src/mainwindow.ui" line="1097"/>
<location filename="../src/mainwindow.ui" line="1104"/>
<location filename="../src/mainwindow.ui" line="1118"/>
<location filename="../src/mainwindow.ui" line="1139"/>
<location filename="../src/mainwindow.ui" line="1153"/>
<location filename="../src/mainwindow.ui" line="1167"/>
<location filename="../src/mainwindow.ui" line="1195"/>
<location filename="../src/mainwindow.ui" line="1267"/>
<location filename="../src/mainwindow.ui" line="1288"/>
<source>|</source> <source>|</source>
<translation></translation> <translation></translation>
</message> </message>
<message> <message>
<location filename="../src/mainwindow.ui" line="1103"/> <location filename="../src/mainwindow.ui" line="773"/>
<source>Next Address</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/mainwindow.ui" line="951"/>
<source>Information about Hush</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/mainwindow.ui" line="997"/>
<source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p align=&quot;center&quot;&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Hush Blockchain Information&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/mainwindow.ui" line="1034"/>
<source>Next Halving</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/mainwindow.ui" line="1111"/>
<source>Difficulty</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/mainwindow.ui" line="1125"/>
<source>Last Notarized Block</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/mainwindow.ui" line="1146"/>
<source>Total Supply</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/mainwindow.ui" line="1160"/>
<source>Longestchain</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/mainwindow.ui" line="1181"/>
<source>BlockHeight</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/mainwindow.ui" line="1188"/>
<source>Supply zAddr</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/mainwindow.ui" line="1216"/>
<source>Supply tAddr</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/mainwindow.ui" line="1237"/>
<source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p align=&quot;center&quot;&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Hush Market Information&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/mainwindow.ui" line="1260"/>
<source>Market Cap</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/mainwindow.ui" line="1281"/>
<source>Volume on Exchanges</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/mainwindow.ui" line="1341"/>
<source>&amp;File</source> <source>&amp;File</source>
<translation>Datei</translation> <translation>Datei</translation>
</message> </message>
<message> <message>
<location filename="../src/mainwindow.ui" line="1117"/> <location filename="../src/mainwindow.ui" line="1355"/>
<source>&amp;Help</source> <source>&amp;Help</source>
<translation>Hilfe</translation> <translation>Hilfe</translation>
</message> </message>
<message> <message>
<location filename="../src/mainwindow.ui" line="1128"/> <location filename="../src/mainwindow.ui" line="1366"/>
<source>&amp;Apps</source> <source>&amp;Apps</source>
<translation>Smartphone</translation> <translation>Smartphone</translation>
</message> </message>
<message> <message>
<location filename="../src/mainwindow.ui" line="1134"/> <location filename="../src/mainwindow.ui" line="1372"/>
<source>&amp;Edit</source> <source>&amp;Edit</source>
<translation>Bearbeiten</translation> <translation>Bearbeiten</translation>
</message> </message>
<message> <message>
<location filename="../src/mainwindow.ui" line="1153"/> <location filename="../src/mainwindow.ui" line="1391"/>
<source>E&amp;xit</source> <source>E&amp;xit</source>
<translation>Beenden</translation> <translation>Beenden</translation>
</message> </message>
<message> <message>
<location filename="../src/mainwindow.ui" line="1158"/> <location filename="../src/mainwindow.ui" line="1396"/>
<source>&amp;About</source> <source>&amp;About</source>
<translation>Über</translation> <translation>Über</translation>
</message> </message>
<message> <message>
<location filename="../src/mainwindow.ui" line="1163"/> <location filename="../src/mainwindow.ui" line="1401"/>
<source>&amp;Settings</source> <source>&amp;Settings</source>
<translation>Einstellungen</translation> <translation>Einstellungen</translation>
</message> </message>
<message> <message>
<location filename="../src/mainwindow.ui" line="1166"/> <location filename="../src/mainwindow.ui" line="1404"/>
<source>Ctrl+P</source> <source>Ctrl+P</source>
<translation>Ctrl+P</translation> <translation>Ctrl+P</translation>
</message> </message>
<message> <message>
<location filename="../src/mainwindow.ui" line="1176"/> <location filename="../src/mainwindow.ui" line="1414"/>
<source>&amp;Hush Discord</source> <source>&amp;Hush Discord</source>
<translation>&amp;Hush Discord</translation> <translation>&amp;Hush Discord</translation>
</message> </message>
<message> <message>
<location filename="../src/mainwindow.ui" line="1181"/> <location filename="../src/mainwindow.ui" line="1419"/>
<source>&amp;Hush Website</source> <source>&amp;Hush Website</source>
<translation>&amp;Hush Website</translation> <translation>&amp;Hush Website</translation>
</message> </message>
<message> <message>
<location filename="../src/mainwindow.ui" line="1186"/> <location filename="../src/mainwindow.ui" line="1424"/>
<source>Check github.com for &amp;updates</source> <source>Check github.com for &amp;updates</source>
<translation>Überprüfe Github für Updates</translation> <translation>Überprüfe Github für Updates</translation>
</message> </message>
<message> <message>
<location filename="../src/mainwindow.ui" line="1191"/> <location filename="../src/mainwindow.ui" line="1429"/>
<source>&amp;Export all private keys</source> <source>&amp;Export all private keys</source>
<translation>Alle private Keys exportieren</translation> <translation>Alle private Keys exportieren</translation>
</message> </message>
<message> <message>
<location filename="../src/mainwindow.ui" line="1196"/> <location filename="../src/mainwindow.ui" line="1434"/>
<source>Address &amp;book</source> <source>Address &amp;book</source>
<translation>Adressbuch</translation> <translation>Adressbuch</translation>
</message> </message>
<message> <message>
<location filename="../src/mainwindow.ui" line="1199"/> <location filename="../src/mainwindow.ui" line="1437"/>
<source>Ctrl+B</source> <source>Ctrl+B</source>
<translation>Ctrl+B</translation> <translation>Ctrl+B</translation>
</message> </message>
<message> <message>
<location filename="../src/mainwindow.ui" line="1209"/> <location filename="../src/mainwindow.ui" line="1447"/>
<location filename="../src/mainwindow.cpp" line="700"/> <location filename="../src/mainwindow.cpp" line="703"/>
<source>Export transactions</source> <source>Export transactions</source>
<translation>Transaktionen exportieren</translation> <translation>Transaktionen exportieren</translation>
</message> </message>
<message> <message>
<location filename="../src/mainwindow.ui" line="1214"/> <location filename="../src/mainwindow.ui" line="1452"/>
<source>Pay hush &amp;URI...</source> <source>Pay hush &amp;URI...</source>
<translation>Zahlungs Hush &amp;URI...</translation> <translation>Zahlungs Hush &amp;URI...</translation>
</message> </message>
<message> <message>
<location filename="../src/mainwindow.ui" line="1219"/> <location filename="../src/mainwindow.ui" line="1457"/>
<source>Connect mobile &amp;app</source> <source>Connect mobile &amp;app</source>
<translation>Smartphone verbinden</translation> <translation>Smartphone verbinden</translation>
</message> </message>
<message> <message>
<location filename="../src/mainwindow.ui" line="1222"/> <location filename="../src/mainwindow.ui" line="1460"/>
<source>Ctrl+M</source> <source>Ctrl+M</source>
<translation>Ctrl+M</translation> <translation>Ctrl+M</translation>
</message> </message>
<message> <message>
<location filename="../src/mainwindow.ui" line="1227"/> <location filename="../src/mainwindow.ui" line="1465"/>
<source>&amp;Recurring Payments</source> <source>&amp;Recurring Payments</source>
<translation>Wiederkehrende Zahlung</translation> <translation>Wiederkehrende Zahlung</translation>
</message> </message>
<message> <message>
<location filename="../src/mainwindow.ui" line="1232"/> <location filename="../src/mainwindow.ui" line="1470"/>
<source>Request hush...</source> <source>Request hush...</source>
<translation>Hush anfordern...</translation> <translation>Hush anfordern...</translation>
</message> </message>
<message> <message>
<location filename="../src/mainwindow.ui" line="1237"/> <location filename="../src/mainwindow.ui" line="1475"/>
<source>File a bug...</source> <source>File a bug...</source>
<translation>Fehler melden...</translation> <translation>Fehler melden...</translation>
</message> </message>
<message> <message>
<location filename="../src/mainwindow.cpp" line="383"/> <location filename="../src/mainwindow.cpp" line="383"/>
<location filename="../src/mainwindow.cpp" line="907"/> <location filename="../src/mainwindow.cpp" line="911"/>
<source>Copy txid</source> <source>Copy txid</source>
<translation>Transaktions ID kopieren</translation> <translation>Transaktions ID kopieren</translation>
</message> </message>
@@ -520,12 +605,12 @@ Please enter your wallet password</source>
<translation>Aktualisieren</translation> <translation>Aktualisieren</translation>
</message> </message>
<message> <message>
<location filename="../src/mainwindow.cpp" line="435"/> <location filename="../src/mainwindow.cpp" line="437"/>
<source>Restart</source> <source>Restart</source>
<translation>Neustart</translation> <translation>Neustart</translation>
</message> </message>
<message> <message>
<location filename="../src/mainwindow.cpp" line="435"/> <location filename="../src/mainwindow.cpp" line="437"/>
<source>Please restart Silentdragonlite to have the theme apply</source> <source>Please restart Silentdragonlite to have the theme apply</source>
<translation>Bitte starten sie SilentDragonLite neu</translation> <translation>Bitte starten sie SilentDragonLite neu</translation>
</message> </message>
@@ -534,68 +619,72 @@ Please enter your wallet password</source>
<translation type="vanished">Starte SilentDragonLite neu</translation> <translation type="vanished">Starte SilentDragonLite neu</translation>
</message> </message>
<message> <message>
<location filename="../src/mainwindow.cpp" line="527"/> <location filename="../src/mainwindow.cpp" line="530"/>
<source>Some feedback about SilentDragonlite or Hush...</source> <source>Some feedback about SilentDragonlite or Hush...</source>
<translation>Etwas Feedback über SilentDragonLite...</translation> <translation>Etwas Feedback über SilentDragonLite...</translation>
</message> </message>
<message> <message>
<location filename="../src/mainwindow.cpp" line="529"/>
<source>Send Duke some private and shielded feedback about</source> <source>Send Duke some private and shielded feedback about</source>
<translation>Sende DenioD anonym Feedback über</translation> <translation type="vanished">Sende DenioD anonym Feedback über</translation>
</message> </message>
<message> <message>
<location filename="../src/mainwindow.cpp" line="529"/> <location filename="../src/mainwindow.cpp" line="532"/>
<source> or SilentDragonLite</source> <source> or SilentDragonLite</source>
<translation> oder SilentDragonLite</translation> <translation> oder SilentDragonLite</translation>
</message> </message>
<message> <message>
<location filename="../src/mainwindow.cpp" line="610"/> <location filename="../src/mainwindow.cpp" line="532"/>
<source>Send DenioD some private and shielded feedback about</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/mainwindow.cpp" line="613"/>
<source>Paste HUSH URI</source> <source>Paste HUSH URI</source>
<translation>Hush URI einfügen</translation> <translation>Hush URI einfügen</translation>
</message> </message>
<message> <message>
<location filename="../src/mainwindow.cpp" line="622"/> <location filename="../src/mainwindow.cpp" line="625"/>
<source>Error paying HUSH URI</source> <source>Error paying HUSH URI</source>
<translation>Fehler bei HUSH URI</translation> <translation>Fehler bei HUSH URI</translation>
</message> </message>
<message> <message>
<location filename="../src/mainwindow.cpp" line="623"/> <location filename="../src/mainwindow.cpp" line="626"/>
<source>URI should be of the form &apos;hush:&lt;addr&gt;?amt=x&amp;memo=y</source> <source>URI should be of the form &apos;hush:&lt;addr&gt;?amt=x&amp;memo=y</source>
<translation>Die URI sollte folgendemaßen aussehen &apos;hush:&lt;addr&gt;?amt=x&amp;memo=y</translation> <translation>Die URI sollte folgendemaßen aussehen &apos;hush:&lt;addr&gt;?amt=x&amp;memo=y</translation>
</message> </message>
<message> <message>
<location filename="../src/mainwindow.cpp" line="706"/> <location filename="../src/mainwindow.cpp" line="709"/>
<source>Error</source> <source>Error</source>
<translation>Fehler</translation> <translation>Fehler</translation>
</message> </message>
<message> <message>
<location filename="../src/mainwindow.cpp" line="707"/> <location filename="../src/mainwindow.cpp" line="710"/>
<source>Error exporting transactions, file was not saved</source> <source>Error exporting transactions, file was not saved</source>
<translation>Fehler beim exportieren der Transaktionen. Die Datei wurde nicht gespeichert</translation> <translation>Fehler beim exportieren der Transaktionen. Die Datei wurde nicht gespeichert</translation>
</message> </message>
<message> <message>
<location filename="../src/mainwindow.cpp" line="777"/> <location filename="../src/mainwindow.cpp" line="780"/>
<source>Error getting private keys</source> <source>Error getting private keys</source>
<translation>Fehler beim empfangen der private Keys</translation> <translation>Fehler beim empfangen der private Keys</translation>
</message> </message>
<message> <message>
<location filename="../src/mainwindow.cpp" line="778"/> <location filename="../src/mainwindow.cpp" line="781"/>
<source>Error loading private keys: </source> <source>Error loading private keys: </source>
<translation>Fehler beim laden der private Keys: </translation> <translation>Fehler beim laden der private Keys: </translation>
</message> </message>
<message> <message>
<location filename="../src/mainwindow.cpp" line="798"/> <location filename="../src/mainwindow.cpp" line="801"/>
<source>These are all the private keys for all the addresses in your wallet</source> <source>These are all the private keys for all the addresses in your wallet</source>
<translation>Dies sind alle private Keys für ihr Wallet</translation> <translation>Dies sind alle private Keys für ihr Wallet</translation>
</message> </message>
<message> <message>
<location filename="../src/mainwindow.cpp" line="800"/> <location filename="../src/mainwindow.cpp" line="803"/>
<source>Private key for </source> <source>Private key for </source>
<translation>Private Key für </translation> <translation>Private Key für </translation>
</message> </message>
<message> <message>
<location filename="../src/mainwindow.cpp" line="744"/> <location filename="../src/mainwindow.cpp" line="747"/>
<location filename="../src/mainwindow.cpp" line="805"/> <location filename="../src/mainwindow.cpp" line="808"/>
<source>Save File</source> <source>Save File</source>
<translation>Datei sichern</translation> <translation>Datei sichern</translation>
</message> </message>
@@ -681,82 +770,86 @@ Please use &apos;Remove Wallet Encryption&apos; if you want to remove the wallet
<translation>SilentDragonLite wurde erfolgreich entschlüsselt. Sie benötigen Ihr Passwort nicht mehr.</translation> <translation>SilentDragonLite wurde erfolgreich entschlüsselt. Sie benötigen Ihr Passwort nicht mehr.</translation>
</message> </message>
<message> <message>
<location filename="../src/mainwindow.cpp" line="447"/> <location filename="../src/mainwindow.cpp" line="450"/>
<source>Currency Change</source> <source>Currency Change</source>
<translation>Währungszeichen wechseln</translation> <translation>Währungszeichen wechseln</translation>
</message> </message>
<message> <message>
<location filename="../src/mainwindow.cpp" line="447"/> <location filename="../src/mainwindow.cpp" line="450"/>
<source>Please restart SilentDragonLite to have new currencies apply</source> <source>This change can take a few seconds.</source>
<translation>Bitte starten sie SilentDragonLite neu</translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../src/mainwindow.cpp" line="740"/> <source>Please restart SilentDragonLite to have new currencies apply</source>
<translation type="vanished">Bitte starten sie SilentDragonLite neu</translation>
</message>
<message>
<location filename="../src/mainwindow.cpp" line="743"/>
<source>This is your wallet seed. Please back it up carefully and safely.</source> <source>This is your wallet seed. Please back it up carefully and safely.</source>
<translation>Dies ist Ihr SilentDragonLite Seed. Bitte sichern Sie ihn sorgfältig.</translation> <translation>Dies ist Ihr SilentDragonLite Seed. Bitte sichern Sie ihn sorgfältig.</translation>
</message> </message>
<message> <message>
<location filename="../src/mainwindow.cpp" line="748"/> <location filename="../src/mainwindow.cpp" line="751"/>
<location filename="../src/mainwindow.cpp" line="809"/> <location filename="../src/mainwindow.cpp" line="812"/>
<source>Unable to open file</source> <source>Unable to open file</source>
<translation>Konnte die Datei nicht öffnen</translation> <translation>Konnte die Datei nicht öffnen</translation>
</message> </message>
<message> <message>
<location filename="../src/mainwindow.cpp" line="853"/> <location filename="../src/mainwindow.cpp" line="856"/>
<location filename="../src/mainwindow.cpp" line="913"/> <location filename="../src/mainwindow.cpp" line="917"/>
<source>Copy address</source> <source>Copy address</source>
<translation>Adresse kopieren</translation> <translation>Adresse kopieren</translation>
</message> </message>
<message> <message>
<location filename="../src/mainwindow.cpp" line="856"/> <location filename="../src/mainwindow.cpp" line="859"/>
<location filename="../src/mainwindow.cpp" line="909"/> <location filename="../src/mainwindow.cpp" line="913"/>
<location filename="../src/mainwindow.cpp" line="915"/> <location filename="../src/mainwindow.cpp" line="919"/>
<source>Copied to clipboard</source> <source>Copied to clipboard</source>
<translation>In die Zwischenablage kopiert</translation> <translation>In die Zwischenablage kopiert</translation>
</message> </message>
<message> <message>
<location filename="../src/mainwindow.cpp" line="859"/> <location filename="../src/mainwindow.cpp" line="862"/>
<source>Get private key</source> <source>Get private key</source>
<translation>Private Key erhalten</translation> <translation>Private Key erhalten</translation>
</message> </message>
<message> <message>
<location filename="../src/mainwindow.cpp" line="865"/> <location filename="../src/mainwindow.cpp" line="868"/>
<location filename="../src/mainwindow.cpp" line="919"/> <location filename="../src/mainwindow.cpp" line="923"/>
<source>View on block explorer</source> <source>View on block explorer</source>
<translation>Auf dem Blockexplorer anschauen</translation> <translation>Auf dem Blockexplorer anschauen</translation>
</message> </message>
<message> <message>
<location filename="../src/mainwindow.cpp" line="925"/> <location filename="../src/mainwindow.cpp" line="929"/>
<source>View Payment Request</source> <source>View Payment Request</source>
<translation>Zahlungsanforderung ansehen</translation> <translation>Zahlungsanforderung ansehen</translation>
</message> </message>
<message> <message>
<location filename="../src/mainwindow.cpp" line="932"/> <location filename="../src/mainwindow.cpp" line="936"/>
<source>View Memo</source> <source>View Memo</source>
<translation>Nachricht ansehen</translation> <translation>Nachricht ansehen</translation>
</message> </message>
<message> <message>
<location filename="../src/mainwindow.cpp" line="946"/> <location filename="../src/mainwindow.cpp" line="951"/>
<source>Reply to </source> <source>Reply to </source>
<translation>Antworten an </translation> <translation>Antworten an </translation>
</message> </message>
<message> <message>
<location filename="../src/mainwindow.cpp" line="1033"/> <location filename="../src/mainwindow.cpp" line="1038"/>
<source>Created new t-Addr</source> <source>Created new t-Addr</source>
<translation>Neue sichtbare Adresse erstellen</translation> <translation>Neue sichtbare Adresse erstellen</translation>
</message> </message>
<message> <message>
<location filename="../src/mainwindow.cpp" line="1083"/> <location filename="../src/mainwindow.cpp" line="1094"/>
<source>Copy Address</source> <source>Copy Address</source>
<translation>Adresse kopieren</translation> <translation>Adresse kopieren</translation>
</message> </message>
<message> <message>
<location filename="../src/mainwindow.cpp" line="1172"/> <location filename="../src/mainwindow.cpp" line="1197"/>
<source>Address has been previously used</source> <source>Address has been previously used</source>
<translation>Diese Adresse wurde schon einmal benutzt</translation> <translation>Diese Adresse wurde schon einmal benutzt</translation>
</message> </message>
<message> <message>
<location filename="../src/mainwindow.cpp" line="1174"/> <location filename="../src/mainwindow.cpp" line="1199"/>
<source>Address is unused</source> <source>Address is unused</source>
<translation>Adresse ist unbenutzt</translation> <translation>Adresse ist unbenutzt</translation>
</message> </message>
@@ -1092,13 +1185,13 @@ Anmerkung: Sie bnötigen 2 Bestätigungen</translation>
</message> </message>
<message> <message>
<location filename="../src/connection.cpp" line="153"/> <location filename="../src/connection.cpp" line="153"/>
<location filename="../src/controller.cpp" line="236"/> <location filename="../src/controller.cpp" line="281"/>
<source>Connection Error</source> <source>Connection Error</source>
<translation>Verbsindungsfehler</translation> <translation>Verbsindungsfehler</translation>
</message> </message>
<message> <message>
<location filename="../src/connection.cpp" line="251"/> <location filename="../src/connection.cpp" line="251"/>
<location filename="../src/controller.cpp" line="624"/> <location filename="../src/controller.cpp" line="673"/>
<location filename="../src/sendtab.cpp" line="888"/> <location filename="../src/sendtab.cpp" line="888"/>
<source>Transaction Error</source> <source>Transaction Error</source>
<translation>Transaktionsfehler</translation> <translation>Transaktionsfehler</translation>
@@ -1115,43 +1208,43 @@ Anmerkung: Sie bnötigen 2 Bestätigungen</translation>
<translation>keine Verbindung</translation> <translation>keine Verbindung</translation>
</message> </message>
<message> <message>
<location filename="../src/controller.cpp" line="236"/> <location filename="../src/controller.cpp" line="281"/>
<source>There was an error connecting to hushd. The error was</source> <source>There was an error connecting to hushd. The error was</source>
<translation>Es gab einen Fehler zum server zu verbinden</translation> <translation>Es gab einen Fehler zum server zu verbinden</translation>
</message> </message>
<message> <message>
<location filename="../src/controller.cpp" line="619"/> <location filename="../src/controller.cpp" line="668"/>
<location filename="../src/recurring.cpp" line="598"/> <location filename="../src/recurring.cpp" line="598"/>
<location filename="../src/sendtab.cpp" line="871"/> <location filename="../src/sendtab.cpp" line="871"/>
<source> Tx </source> <source> Tx </source>
<translation> Transaktion </translation> <translation> Transaktion </translation>
</message> </message>
<message> <message>
<location filename="../src/controller.cpp" line="619"/> <location filename="../src/controller.cpp" line="668"/>
<location filename="../src/recurring.cpp" line="598"/> <location filename="../src/recurring.cpp" line="598"/>
<location filename="../src/sendtab.cpp" line="871"/> <location filename="../src/sendtab.cpp" line="871"/>
<source> failed</source> <source> failed</source>
<translation> gescheitert</translation> <translation> gescheitert</translation>
</message> </message>
<message> <message>
<location filename="../src/controller.cpp" line="622"/> <location filename="../src/controller.cpp" line="671"/>
<location filename="../src/sendtab.cpp" line="879"/> <location filename="../src/sendtab.cpp" line="879"/>
<source>The transaction with id </source> <source>The transaction with id </source>
<translation>Die Transaktion mit der ID </translation> <translation>Die Transaktion mit der ID </translation>
</message> </message>
<message> <message>
<location filename="../src/controller.cpp" line="622"/> <location filename="../src/controller.cpp" line="671"/>
<location filename="../src/sendtab.cpp" line="879"/> <location filename="../src/sendtab.cpp" line="879"/>
<source> failed. The error was</source> <source> failed. The error was</source>
<translation> ist gescheitert</translation> <translation> ist gescheitert</translation>
</message> </message>
<message> <message>
<location filename="../src/controller.cpp" line="703"/> <location filename="../src/controller.cpp" line="752"/>
<source>Update Available</source> <source>Update Available</source>
<translation>Update verfügbar</translation> <translation>Update verfügbar</translation>
</message> </message>
<message> <message>
<location filename="../src/controller.cpp" line="704"/> <location filename="../src/controller.cpp" line="753"/>
<source>A new release v%1 is available! You have v%2. <source>A new release v%1 is available! You have v%2.
Would you like to visit the releases page?</source> Would you like to visit the releases page?</source>
@@ -1160,22 +1253,22 @@ Would you like to visit the releases page?</source>
Möchten Sie die Release Seite besuchen?</translation> Möchten Sie die Release Seite besuchen?</translation>
</message> </message>
<message> <message>
<location filename="../src/controller.cpp" line="716"/> <location filename="../src/controller.cpp" line="765"/>
<source>No updates available</source> <source>No updates available</source>
<translation>keine Updates verfügbar</translation> <translation>keine Updates verfügbar</translation>
</message> </message>
<message> <message>
<location filename="../src/controller.cpp" line="717"/> <location filename="../src/controller.cpp" line="766"/>
<source>You already have the latest release v%1</source> <source>You already have the latest release v%1</source>
<translation>Sie haben bereits die neueste Version v%1</translation> <translation>Sie haben bereits die neueste Version v%1</translation>
</message> </message>
<message> <message>
<location filename="../src/controller.cpp" line="891"/> <location filename="../src/controller.cpp" line="1137"/>
<source>Please wait for SilentDragonLite to exit</source> <source>Please wait for SilentDragonLite to exit</source>
<translation>Bitte warten Sie bis SilentDragonLite beendet ist</translation> <translation>Bitte warten Sie bis SilentDragonLite beendet ist</translation>
</message> </message>
<message> <message>
<location filename="../src/controller.cpp" line="892"/> <location filename="../src/controller.cpp" line="1138"/>
<source>Waiting for hushd to exit</source> <source>Waiting for hushd to exit</source>
<translation>Warten auf beendigung der Serververbindung</translation> <translation>Warten auf beendigung der Serververbindung</translation>
</message> </message>
@@ -1211,7 +1304,7 @@ Möchten Sie die Release Seite besuchen?</translation>
<translation>Alle geplanten zukünftigen Zahlungen werden nicht durchgeführt.</translation> <translation>Alle geplanten zukünftigen Zahlungen werden nicht durchgeführt.</translation>
</message> </message>
<message> <message>
<location filename="../src/settings.cpp" line="225"/> <location filename="../src/settings.cpp" line="292"/>
<source>Tx submitted (right click to copy) txid:</source> <source>Tx submitted (right click to copy) txid:</source>
<translation>Transaktions ID übermittelt (Rechtsklick zum anschauen) :</translation> <translation>Transaktions ID übermittelt (Rechtsklick zum anschauen) :</translation>
</message> </message>
@@ -1241,22 +1334,22 @@ Möchten Sie die Release Seite besuchen?</translation>
<translation>Betrag</translation> <translation>Betrag</translation>
</message> </message>
<message> <message>
<location filename="../src/websockets.cpp" line="355"/> <location filename="../src/websockets.cpp" line="387"/>
<source>Connected directly</source> <source>Connected directly</source>
<translation>Direkt verbunden</translation> <translation>Direkt verbunden</translation>
</message> </message>
<message> <message>
<location filename="../src/websockets.cpp" line="358"/> <location filename="../src/websockets.cpp" line="390"/>
<source>Connected over the internet via silentdragon wormhole service</source> <source>Connected over the internet via silentdragon wormhole service</source>
<translation>Über das Internet verbunden</translation> <translation>Über das Internet verbunden</translation>
</message> </message>
<message> <message>
<location filename="../src/websockets.cpp" line="651"/> <location filename="../src/websockets.cpp" line="688"/>
<source>Node is still syncing.</source> <source>Node is still syncing.</source>
<translation>SilentDragonLite synchronisiert noch.</translation> <translation>SilentDragonLite synchronisiert noch.</translation>
</message> </message>
<message> <message>
<location filename="../src/websockets.cpp" line="675"/> <location filename="../src/websockets.cpp" line="712"/>
<source>No sapling or transparent addresses with enough balance to spend.</source> <source>No sapling or transparent addresses with enough balance to spend.</source>
<translation>Nicht genügend Guthaben verfügbar.</translation> <translation>Nicht genügend Guthaben verfügbar.</translation>
</message> </message>
@@ -1646,7 +1739,7 @@ Möchten Sie die Release Seite besuchen?</translation>
<message> <message>
<location filename="../src/settings.ui" line="100"/> <location filename="../src/settings.ui" line="100"/>
<source>default</source> <source>default</source>
<translation>Normal</translation> <translation type="unfinished">default</translation>
</message> </message>
<message> <message>
<location filename="../src/settings.ui" line="27"/> <location filename="../src/settings.ui" line="27"/>
@@ -1660,17 +1753,17 @@ Möchten Sie die Release Seite besuchen?</translation>
<message> <message>
<location filename="../src/settings.ui" line="105"/> <location filename="../src/settings.ui" line="105"/>
<source>blue</source> <source>blue</source>
<translation>Blau</translation> <translation type="unfinished">blue</translation>
</message> </message>
<message> <message>
<location filename="../src/settings.ui" line="110"/> <location filename="../src/settings.ui" line="110"/>
<source>light</source> <source>light</source>
<translation>Hell</translation> <translation type="unfinished">light</translation>
</message> </message>
<message> <message>
<location filename="../src/settings.ui" line="115"/> <location filename="../src/settings.ui" line="115"/>
<source>dark</source> <source>dark</source>
<translation>Dark</translation> <translation type="unfinished">dark</translation>
</message> </message>
<message> <message>
<location filename="../src/settings.ui" line="129"/> <location filename="../src/settings.ui" line="129"/>
@@ -1843,17 +1936,16 @@ Möchten Sie die Release Seite besuchen?</translation>
<translation>Konfiguriere HUSH3.conf</translation> <translation>Konfiguriere HUSH3.conf</translation>
</message> </message>
<message> <message>
<location filename="../src/createhushconfdialog.ui" line="20"/> <location filename="../src/createhushconfdialog.ui" line="146"/>
<source>Your hush node will be configured for you automatically</source> <source>Your hush node will be configured for you automatically</source>
<translation>Ihr Hush Node wird automatisch für Sie konfiguriert</translation> <translation>Ihr Hush Node wird automatisch für Sie konfiguriert</translation>
</message> </message>
<message> <message>
<location filename="../src/createhushconfdialog.ui" line="30"/>
<source>Enable Fast Sync</source> <source>Enable Fast Sync</source>
<translation>Schneller synchronisieren</translation> <translation type="vanished">Schneller synchronisieren</translation>
</message> </message>
<message> <message>
<location filename="../src/createhushconfdialog.ui" line="42"/> <location filename="../src/createhushconfdialog.ui" line="22"/>
<source>Show Advanced Configuration</source> <source>Show Advanced Configuration</source>
<translation>Erweiterte Einstellungen anzeigen</translation> <translation>Erweiterte Einstellungen anzeigen</translation>
</message> </message>
@@ -1862,44 +1954,43 @@ Möchten Sie die Release Seite besuchen?</translation>
<translation type="vanished">Hush Preise abrufen (dies kann Ihre Privatssphäre einschränken)...</translation> <translation type="vanished">Hush Preise abrufen (dies kann Ihre Privatssphäre einschränken)...</translation>
</message> </message>
<message> <message>
<location filename="../src/createhushconfdialog.ui" line="112"/> <location filename="../src/createhushconfdialog.ui" line="60"/>
<source>Allow connections to the internet to check for updates, get hush prices etc...</source> <source>Allow connections to the internet to check for updates, get hush prices etc...</source>
<translation>Hush Preise abrufen (dies kann Ihre Privatssphäre einschränken)...</translation> <translation>Hush Preise abrufen (dies kann Ihre Privatssphäre einschränken)...</translation>
</message> </message>
<message> <message>
<location filename="../src/createhushconfdialog.ui" line="119"/> <location filename="../src/createhushconfdialog.ui" line="67"/>
<source>Use custom datadir</source> <source>Use custom datadir</source>
<translation>Benutzerdefinierten Datei Pfad benutzen</translation> <translation>Benutzerdefinierten Datei Pfad benutzen</translation>
</message> </message>
<message> <message>
<location filename="../src/createhushconfdialog.ui" line="128"/> <location filename="../src/createhushconfdialog.ui" line="76"/>
<source>Choose directory</source> <source>Choose directory</source>
<translation>Wählen Sie einen Ordner</translation> <translation>Wählen Sie einen Ordner</translation>
</message> </message>
<message> <message>
<location filename="../src/createhushconfdialog.ui" line="157"/> <location filename="../src/createhushconfdialog.ui" line="105"/>
<source>Please note that you&apos;ll need to already have a Tor service configured on port 9050</source> <source>Please note that you&apos;ll need to already have a Tor service configured on port 9050</source>
<translation>Stellen Sie sicher, dass der Tor Service bereits für den Port 9050 konfiguriert ist</translation> <translation>Stellen Sie sicher, dass der Tor Service bereits für den Port 9050 konfiguriert ist</translation>
</message> </message>
<message> <message>
<location filename="../src/createhushconfdialog.ui" line="164"/> <location filename="../src/createhushconfdialog.ui" line="112"/>
<source>Connect to the internet for updates and price feeds</source> <source>Connect to the internet for updates and price feeds</source>
<translation>Hush Preise abrufen (dies kann Ihre Privatssphäre einschränken)</translation> <translation>Hush Preise abrufen (dies kann Ihre Privatssphäre einschränken)</translation>
</message> </message>
<message> <message>
<location filename="../src/createhushconfdialog.ui" line="174"/> <location filename="../src/createhushconfdialog.ui" line="122"/>
<source>Please choose a directory to store your wallet.dat and blockchain</source> <source>Please choose a directory to store your wallet.dat and blockchain</source>
<translation>Wählen Sie einen Ordner aus, wo Ihre wallet.dat und Blockhain gespeichert wird</translation> <translation>Wählen Sie einen Ordner aus, wo Ihre wallet.dat und Blockhain gespeichert wird</translation>
</message> </message>
<message> <message>
<location filename="../src/createhushconfdialog.ui" line="181"/> <location filename="../src/createhushconfdialog.ui" line="129"/>
<source>Connect over Tor</source> <source>Connect over Tor</source>
<translation>Verbinden über Tor</translation> <translation>Verbinden über Tor</translation>
</message> </message>
<message> <message>
<location filename="../src/createhushconfdialog.ui" line="205"/>
<source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Skips the most expensive checks during the initial block download. &lt;a href=&quot;https://docs.silentdragon.co/using-silentdragon/#fastsync&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0000ff;&quot;&gt;Learn More&lt;/span&gt;&lt;/a&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source> <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Skips the most expensive checks during the initial block download. &lt;a href=&quot;https://docs.silentdragon.co/using-silentdragon/#fastsync&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0000ff;&quot;&gt;Learn More&lt;/span&gt;&lt;/a&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
<translation>Überspringt die meisten Checks beim Start</translation> <translation type="vanished">Überspringt die meisten Checks beim Start</translation>
</message> </message>
</context> </context>
<context> <context>

View File

@@ -44,7 +44,7 @@ QString CAmount::toDecimalEURString() const {
double dblAmount = static_cast<double>(this->amount) / COIN; double dblAmount = static_cast<double>(this->amount) / COIN;
double price = Settings::getInstance()->getEURPrice(); double price = Settings::getInstance()->getEURPrice();
return QLocale(QLocale::English).toString(dblAmount*price, 'f', 2) + ""; return QLocale(QLocale::German).toString(dblAmount*price, 'f', 2) + "";
} }
QString CAmount::toDecimalBTCString() const { QString CAmount::toDecimalBTCString() const {
double dblAmount = static_cast<double>(this->amount) / COIN; double dblAmount = static_cast<double>(this->amount) / COIN;
@@ -80,7 +80,7 @@ QString CAmount::toDecimalCHFString() const {
double dblAmount = static_cast<double>(this->amount) / COIN; double dblAmount = static_cast<double>(this->amount) / COIN;
double price = Settings::getInstance()->getCHFPrice(); double price = Settings::getInstance()->getCHFPrice();
return "CHF " + QLocale(QLocale::English).toString(dblAmount*price, 'f', 2); return "CHF " + QLocale(QLocale::German).toString(dblAmount*price, 'f', 2);
} }
QString CAmount::toDecimalINRString() const { QString CAmount::toDecimalINRString() const {
double dblAmount = static_cast<double>(this->amount) / COIN; double dblAmount = static_cast<double>(this->amount) / COIN;

View File

@@ -166,18 +166,31 @@ void Controller::getInfoThenRefresh(bool force) {
int notarized = reply["notarized"].get<json::number_integer_t>(); int notarized = reply["notarized"].get<json::number_integer_t>();
int difficulty = reply["difficulty"].get<json::number_integer_t>(); int difficulty = reply["difficulty"].get<json::number_integer_t>();
int blocks_until_halving= 340000 - curBlock; int blocks_until_halving= 340000 - curBlock;
char halving_days[8]; int halving_days =
sprintf(halving_days, "%.2f", (double) (blocks_until_halving * 150) / (60*60*24) ); (blocks_until_halving * 150) / (60*60*24) ;
bool doUpdate = force || (model->getLatestBlock() != curBlock); bool doUpdate = force || (model->getLatestBlock() != curBlock);
model->setLatestBlock(curBlock); model->setLatestBlock(curBlock);
ui->blockHeight->setText(QString::number(curBlock));
ui->last_notarized->setText(QString::number(notarized)); if (Settings::getInstance()->get_currency_name() == "EUR" || Settings::getInstance()->get_currency_name() == "CHF" || Settings::getInstance()->get_currency_name() == "RUB") {
ui->longestchain->setText(QString::number(longestchain)); ui->blockHeight->setText("Block: " + QLocale(QLocale::German).toString(curBlock));
ui->difficulty->setText(QString::number(difficulty)); ui->last_notarized->setText("Block: " + QLocale(QLocale::German).toString(notarized));
ui->halvingTime->setText( QString::number(blocks_until_halving) % " blocks, " % QString::fromStdString(halving_days) % " days" ); ui->longestchain->setText("Block: " + QLocale(QLocale::German).toString(longestchain));
ui->difficulty->setText(QLocale(QLocale::German).toString(difficulty));
ui->halvingTime->setText((QLocale(QLocale::German).toString(blocks_until_halving)) + " Blocks or , " + (QLocale(QLocale::German).toString(halving_days) + " days" ));
}
else {
ui->blockHeight->setText("Block: " + QLocale(QLocale::English).toString(curBlock));
ui->last_notarized->setText("Block: " + QLocale(QLocale::English).toString(notarized));
ui->longestchain->setText("Block: " + QLocale(QLocale::English).toString(longestchain));
ui->difficulty->setText(QLocale(QLocale::English).toString(difficulty));
ui->halvingTime->setText((QLocale(QLocale::English).toString(blocks_until_halving)) + " Blocks or , " + (QLocale(QLocale::English).toString(halving_days) + " days" ));
}
ui->Version->setText(QString::fromStdString(reply["version"].get<json::string_t>())); ui->Version->setText(QString::fromStdString(reply["version"].get<json::string_t>()));
ui->Vendor->setText(QString::fromStdString(reply["vendor"].get<json::string_t>())); ui->Vendor->setText(QString::fromStdString(reply["vendor"].get<json::string_t>()));
ui->volumeExchange->setText(" BTC " + QString::number((double) Settings::getInstance()->getBTCVolume() ,'f',8));
main->logger->write(QString("Refresh. curblock ") % QString::number(curBlock) % ", update=" % (doUpdate ? "true" : "false") ); main->logger->write(QString("Refresh. curblock ") % QString::number(curBlock) % ", update=" % (doUpdate ? "true" : "false") );
@@ -191,49 +204,92 @@ void Controller::getInfoThenRefresh(bool force) {
// use currency ComboBox as input // use currency ComboBox as input
if (Settings::getInstance()->get_currency_name() == "USD") { if (Settings::getInstance()->get_currency_name() == "USD") {
main->statusLabel->setText(" HUSH/USD=$ " + QString::number( (double) Settings::getInstance()->getZECPrice() ,'f',2)); double price = Settings::getInstance()->getZECPrice();
ui->volumeExchange->setText(" $ " + QString::number((double) Settings::getInstance()->getUSDVolume() ,'f',2)); double volume = Settings::getInstance()->getUSDVolume();
ui->marketcapTab->setText(" $ " + QString::number((double) Settings::getInstance()->getUSDCAP() ,'f',2)); double cap = Settings::getInstance()->getUSDCAP();
main->statusLabel->setText(" HUSH/USD=$ " + (QLocale(QLocale::English).toString(price,'f', 2)));
ui->volumeExchange->setText(" $ " + (QLocale(QLocale::English).toString(volume,'f', 2)));
ui->marketcapTab->setText(" $ " + (QLocale(QLocale::English).toString(cap,'f', 2)));
} else if (Settings::getInstance()->get_currency_name() == "EUR") { } else if (Settings::getInstance()->get_currency_name() == "EUR") {
main->statusLabel->setText(" HUSH/EUR= " + QString::number( (double) Settings::getInstance()->getEURPrice() ,'f',2) + ""); double price = Settings::getInstance()->getEURPrice();
ui->volumeExchange->setText(QString::number((double) Settings::getInstance()->getEURVolume() ,'f',2) + ""); double volume = Settings::getInstance()->getEURVolume();
ui->marketcapTab->setText(QString::number((double) Settings::getInstance()->getEURCAP() ,'f',2)+ ""); double cap = Settings::getInstance()->getEURCAP();
main->statusLabel->setText("HUSH/EUR "+(QLocale(QLocale::German).toString(price,'f', 2))+ "");
ui->volumeExchange->setText(QLocale(QLocale::German).toString(volume,'f', 2)+ "");
ui->marketcapTab->setText(QLocale(QLocale::German).toString(cap,'f', 2)+ "");
} else if (Settings::getInstance()->get_currency_name() == "BTC") { } else if (Settings::getInstance()->get_currency_name() == "BTC") {
main->statusLabel->setText(" HUSH/BTC=BTC " + QString::number((double) Settings::getInstance()->getBTCPrice() ,'f',8)); double price = Settings::getInstance()->getBTCPrice();
ui->volumeExchange->setText(" BTC " + QString::number((double) Settings::getInstance()->getBTCVolume() ,'f',8)); double volume = Settings::getInstance()->getBTCVolume();
ui->marketcapTab->setText(" BTC " + QString::number((double) Settings::getInstance()->getBTCCAP() ,'f',8)); double cap = Settings::getInstance()->getBTCCAP();
main->statusLabel->setText(" HUSH/BTC=BTC " + (QLocale(QLocale::English).toString(price, 'f',8)));
ui->volumeExchange->setText(" BTC " + (QLocale(QLocale::English).toString(volume, 'f',8)));
ui->marketcapTab->setText(" BTC " + (QLocale(QLocale::English).toString(cap, 'f',8)));
} else if (Settings::getInstance()->get_currency_name() == "CNY") { } else if (Settings::getInstance()->get_currency_name() == "CNY") {
main->statusLabel->setText(" HUSH/CNY=¥ /元 " + QString::number( (double) Settings::getInstance()->getCNYPrice() ,'f',2)); double price = Settings::getInstance()->getCNYPrice();
ui->volumeExchange->setText(" ¥ /元 " + QString::number((double) Settings::getInstance()->getCNYVolume() ,'f',2)); double volume = Settings::getInstance()->getCNYVolume();
ui->marketcapTab->setText(" ¥ /元 " + QString::number((double) Settings::getInstance()->getCNYCAP() ,'f',2)); double cap = Settings::getInstance()->getCNYCAP();
main->statusLabel->setText(" HUSH/CNY=¥ /元 " + (QLocale(QLocale::Chinese).toString(price,'f', 2)));
ui->volumeExchange->setText(" ¥ /元 " + (QLocale(QLocale::Chinese).toString(volume,'f', 2)));
ui->marketcapTab->setText(" ¥ /元 " + (QLocale(QLocale::Chinese).toString(cap,'f', 2)));
} else if (Settings::getInstance()->get_currency_name() == "RUB") { } else if (Settings::getInstance()->get_currency_name() == "RUB") {
main->statusLabel->setText(" HUSH/RUB=₽ " + QString::number((double) Settings::getInstance()->getRUBPrice() ,'f',2)); double price = Settings::getInstance()->getRUBPrice();
ui->volumeExchange->setText("" + QString::number((double) Settings::getInstance()->getRUBVolume() ,'f',2)); double volume = Settings::getInstance()->getRUBVolume();
ui->marketcapTab->setText("" + QString::number((double) Settings::getInstance()->getRUBCAP() ,'f',2)); double cap = Settings::getInstance()->getRUBCAP();
main->statusLabel->setText(" HUSH/RUB=₽ " + (QLocale(QLocale::German).toString(price,'f', 2)));
ui->volumeExchange->setText("" + (QLocale(QLocale::German).toString(volume,'f', 2)));
ui->marketcapTab->setText("" + (QLocale(QLocale::German).toString(cap,'f', 2)));
} else if (Settings::getInstance()->get_currency_name() == "CAD") { } else if (Settings::getInstance()->get_currency_name() == "CAD") {
main->statusLabel->setText(" HUSH/CAD=$ " + QString::number( (double) Settings::getInstance()->getCADPrice() ,'f',2)); double price = Settings::getInstance()->getCADPrice();
ui->volumeExchange->setText(" $ " + QString::number((double) Settings::getInstance()->getCADVolume() ,'f',2)); double volume = Settings::getInstance()->getCADVolume();
ui->marketcapTab->setText(" $ " + QString::number((double) Settings::getInstance()->getCADCAP() ,'f',2)); double cap = Settings::getInstance()->getCADCAP();
main->statusLabel->setText(" HUSH/CAD=$ " + (QLocale(QLocale::English).toString(price,'f', 2)));
ui->volumeExchange->setText(" $ " + (QLocale(QLocale::English).toString(volume,'f', 2)));
ui->marketcapTab->setText(" $ " + (QLocale(QLocale::English).toString(cap,'f', 2)));
} else if (Settings::getInstance()->get_currency_name() == "SGD") { } else if (Settings::getInstance()->get_currency_name() == "SGD") {
main->statusLabel->setText(" HUSH/SGD=$ " + QString::number((double) Settings::getInstance()->getSGDPrice() ,'f',2)); double price = Settings::getInstance()->getSGDPrice();
ui->volumeExchange->setText(" $ " + QString::number((double) Settings::getInstance()->getSGDVolume() ,'f',2)); double volume = Settings::getInstance()->getSGDVolume();
ui->marketcapTab->setText(" $ " + QString::number((double) Settings::getInstance()->getSGDCAP() ,'f',2)); double cap = Settings::getInstance()->getSGDCAP();
main->statusLabel->setText(" HUSH/SGD=$ " + (QLocale(QLocale::English).toString(price,'f', 2)));
ui->volumeExchange->setText(" $ " + (QLocale(QLocale::English).toString(volume,'f', 2)));
ui->marketcapTab->setText(" $ " + (QLocale(QLocale::English).toString(cap,'f', 2)));
} else if (Settings::getInstance()->get_currency_name() == "CHF") { } else if (Settings::getInstance()->get_currency_name() == "CHF") {
main->statusLabel->setText(" HUSH/CHF=CHF " + QString::number((double) Settings::getInstance()->getCHFPrice() ,'f',2)); double price = Settings::getInstance()->getCHFPrice();
ui->volumeExchange->setText(" CHF " + QString::number((double) Settings::getInstance()->getCHFVolume() ,'f',2)); double volume = Settings::getInstance()->getCHFVolume();
ui->marketcapTab->setText(" CHF " + QString::number((double) Settings::getInstance()->getCHFCAP() ,'f',2)); double cap = Settings::getInstance()->getCHFCAP();
main->statusLabel->setText(" HUSH/CHF= " + (QLocale(QLocale::German).toString(price,'f', 2))+ " CHF");
ui->volumeExchange->setText(QLocale(QLocale::German).toString(volume,'f', 2)+ " CHF");
ui->marketcapTab->setText(QLocale(QLocale::German).toString(cap,'f', 2)+ " CHF");
} else if (Settings::getInstance()->get_currency_name() == "INR") { } else if (Settings::getInstance()->get_currency_name() == "INR") {
main->statusLabel->setText(" HUSH/INR=₹ " + QString::number( (double) Settings::getInstance()->getINRPrice() ,'f',2)); double price = Settings::getInstance()->getINRPrice();
ui->volumeExchange->setText("" + QString::number((double) Settings::getInstance()->getINRVolume() ,'f',2)); double volume = Settings::getInstance()->getINRVolume();
ui->marketcapTab->setText("" + QString::number((double) Settings::getInstance()->getINRCAP() ,'f',2)); double cap = Settings::getInstance()->getINRCAP();
main->statusLabel->setText(" HUSH/INR=₹ " + (QLocale(QLocale::English).toString(price,'f', 2)));
ui->volumeExchange->setText("" + (QLocale(QLocale::English).toString(volume,'f', 2)));
ui->marketcapTab->setText("" + (QLocale(QLocale::English).toString(cap,'f', 2)));
} else if (Settings::getInstance()->get_currency_name() == "GBP") { } else if (Settings::getInstance()->get_currency_name() == "GBP") {
main->statusLabel->setText(" HUSH/GBP=£ " + QString::number((double) Settings::getInstance()->getGBPPrice() ,'f',2)); double price = Settings::getInstance()->getGBPPrice();
ui->volumeExchange->setText(" £ " + QString::number((double) Settings::getInstance()->getGBPVolume() ,'f',2)); double volume = Settings::getInstance()->getGBPVolume();
ui->marketcapTab->setText(" £ " + QString::number((double) Settings::getInstance()->getRUBCAP() ,'f',2)); double cap = Settings::getInstance()->getGBPCAP();
main->statusLabel->setText(" HUSH/GBP=£ " + (QLocale(QLocale::English).toString(price,'f', 2)));
ui->volumeExchange->setText(" £ " + (QLocale(QLocale::English).toString(volume,'f', 2)));
ui->marketcapTab->setText(" £ " + (QLocale(QLocale::English).toString(cap,'f', 2)));
}else if (Settings::getInstance()->get_currency_name() == "AUD") { }else if (Settings::getInstance()->get_currency_name() == "AUD") {
main->statusLabel->setText(" HUSH/AUD=$ " + QString::number((double) Settings::getInstance()->getAUDPrice() ,'f',2)); double price = Settings::getInstance()->getAUDPrice();
ui->volumeExchange->setText(" $ " + QString::number((double) Settings::getInstance()->getAUDVolume() ,'f',2)); double volume = Settings::getInstance()->getAUDVolume();
ui->marketcapTab->setText(" $ " + QString::number((double) Settings::getInstance()->getAUDCAP() ,'f',2)); double cap = Settings::getInstance()->getAUDCAP();
main->statusLabel->setText(" HUSH/AUD=$ " + (QLocale(QLocale::English).toString(price,'f', 2)));
ui->volumeExchange->setText(" $ " + (QLocale(QLocale::English).toString(volume,'f', 2)));
ui->marketcapTab->setText(" $ " + (QLocale(QLocale::English).toString(cap,'f', 2)));
} else { } else {
main->statusLabel->setText(" HUSH/USD=$" + QString::number(Settings::getInstance()->getZECPrice(),'f',2 )); main->statusLabel->setText(" HUSH/USD=$" + QString::number(Settings::getInstance()->getZECPrice(),'f',2 ));
@@ -253,6 +309,24 @@ void Controller::getInfoThenRefresh(bool force) {
model->setEncryptionStatus(isEncrypted, isLocked); model->setEncryptionStatus(isEncrypted, isLocked);
}); });
// Get the total supply and render it with thousand decimal
zrpc->fetchSupply([=] (const json& reply) {
int supply = reply["supply"].get<json::number_integer_t>();
int zfunds = reply["zfunds"].get<json::number_integer_t>();
int total = reply["total"].get<json::number_integer_t>();
if (Settings::getInstance()->get_currency_name() == "EUR" || Settings::getInstance()->get_currency_name() == "CHF" || Settings::getInstance()->get_currency_name() == "RUB") {
ui->supply_taddr->setText((QLocale(QLocale::German).toString(supply)+ " Hush"));
ui->supply_zaddr->setText((QLocale(QLocale::German).toString(zfunds)+ " Hush"));
ui->supply_total->setText((QLocale(QLocale::German).toString(total)+ " Hush"));}
else{
ui->supply_taddr->setText("Hush " + (QLocale(QLocale::English).toString(supply)));
ui->supply_zaddr->setText("Hush " +(QLocale(QLocale::English).toString(zfunds)));
ui->supply_total->setText("Hush " +(QLocale(QLocale::English).toString(total)));}
});
if ( doUpdate ) { if ( doUpdate ) {
// Something changed, so refresh everything. // Something changed, so refresh everything.

View File

@@ -137,6 +137,13 @@ void LiteInterface::fetchInfo(const std::function<void(json)>& cb,
conn->doRPC("info", "", cb, err); conn->doRPC("info", "", cb, err);
} }
void LiteInterface::fetchSupply(const std::function<void(json)>& cb) {
if (conn == nullptr)
return;
conn->doRPCWithDefaultErrorHandling("coinsupply", "", cb);
}
void LiteInterface::fetchLatestBlock(const std::function<void(json)>& cb, void LiteInterface::fetchLatestBlock(const std::function<void(json)>& cb,
const std::function<void(QString)>& err) { const std::function<void(QString)>& err) {

View File

@@ -45,6 +45,8 @@ public:
void fetchInfo(const std::function<void(json)>& cb, void fetchInfo(const std::function<void(json)>& cb,
const std::function<void(QString)>& err); const std::function<void(QString)>& err);
void fetchLatestBlock(const std::function<void(json)>& cb, void fetchLatestBlock(const std::function<void(json)>& cb,
const std::function<void(QString)>& err); const std::function<void(QString)>& err);
@@ -62,6 +64,7 @@ public:
void clearWallet(const std::function<void(json)>& cb); void clearWallet(const std::function<void(json)>& cb);
void fetchWalletEncryptionStatus(const std::function<void(json)>& cb); void fetchWalletEncryptionStatus(const std::function<void(json)>& cb);
void fetchSupply(const std::function<void(json)>& cb);
void encryptWallet(QString password, const std::function<void(json)>& cb); void encryptWallet(QString password, const std::function<void(json)>& cb);
void unlockWallet(QString password, const std::function<void(json)>& cb); void unlockWallet(QString password, const std::function<void(json)>& cb);
void removeWalletEncryption(QString password, const std::function<void(json)>& cb); void removeWalletEncryption(QString password, const std::function<void(json)>& cb);

View File

@@ -172,7 +172,7 @@ public:
qDebug() << "Loading locale " << locale; qDebug() << "Loading locale " << locale;
QTranslator translator; QTranslator translator;
translator.load(QString(":/translations/res/zec_qt_wallet_") + locale); translator.load(QString(":/translations/res/silentdragonlite_") + locale);
a.installTranslator(&translator); a.installTranslator(&translator);
QIcon icon(":/icons/res/icon.ico"); QIcon icon(":/icons/res/icon.ico");

View File

@@ -458,7 +458,7 @@ void MainWindow::setupSettingsModal() {
// List of default servers // List of default servers
settings.cmbServer->addItem("https://lite.myhush.org"); settings.cmbServer->addItem("https://lite.myhush.org");
settings.cmbServer->addItem("https://hush-lightwallet.de:443");
// Load current values into the dialog // Load current values into the dialog
auto conf = Settings::getInstance()->getSettings(); auto conf = Settings::getInstance()->getSettings();

View File

@@ -18,11 +18,11 @@
<normaloff>:/icons/res/icon.ico</normaloff>:/icons/res/icon.ico</iconset> <normaloff>:/icons/res/icon.ico</normaloff>:/icons/res/icon.ico</iconset>
</property> </property>
<widget class="QWidget" name="centralWidget"> <widget class="QWidget" name="centralWidget">
<layout class="QGridLayout" name="gridLayout_3"> <layout class="QHBoxLayout" name="horizontalLayout_18">
<item row="0" column="0"> <item>
<widget class="QTabWidget" name="tabWidget"> <widget class="QTabWidget" name="tabWidget">
<property name="currentIndex"> <property name="currentIndex">
<number>2</number> <number>4</number>
</property> </property>
<widget class="QWidget" name="tab"> <widget class="QWidget" name="tab">
<attribute name="title"> <attribute name="title">
@@ -400,7 +400,7 @@
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>1226</width> <width>1226</width>
<height>493</height> <height>504</height>
</rect> </rect>
</property> </property>
<layout class="QVBoxLayout" name="sendToLayout"> <layout class="QVBoxLayout" name="sendToLayout">
@@ -948,7 +948,7 @@
</widget> </widget>
<widget class="QWidget" name="tab_5"> <widget class="QWidget" name="tab_5">
<attribute name="title"> <attribute name="title">
<string>Hush Daemon</string> <string>Information about Hush</string>
</attribute> </attribute>
<layout class="QHBoxLayout" name="horizontalLayout_14"> <layout class="QHBoxLayout" name="horizontalLayout_14">
<item> <item>
@@ -969,11 +969,23 @@
</item> </item>
<item> <item>
<widget class="QGroupBox" name="groupBox_5"> <widget class="QGroupBox" name="groupBox_5">
<property name="minimumSize">
<size>
<width>650</width>
<height>650</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>16777215</width>
<height>16777215</height>
</size>
</property>
<property name="title"> <property name="title">
<string/> <string/>
</property> </property>
<layout class="QGridLayout" name="gridLayout_5"> <layout class="QVBoxLayout" name="verticalLayout_5">
<item row="0" column="0"> <item>
<spacer name="verticalSpacer_3"> <spacer name="verticalSpacer_3">
<property name="orientation"> <property name="orientation">
<enum>Qt::Vertical</enum> <enum>Qt::Vertical</enum>
@@ -986,7 +998,7 @@
</property> </property>
</spacer> </spacer>
</item> </item>
<item row="1" column="0" colspan="3"> <item>
<widget class="QLabel" name="label_16"> <widget class="QLabel" name="label_16">
<property name="font"> <property name="font">
<font> <font>
@@ -998,168 +1010,235 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="2" column="0" colspan="3"> <item>
<widget class="Line" name="line_3"> <widget class="Line" name="line_3">
<property name="orientation"> <property name="orientation">
<enum>Qt::Horizontal</enum> <enum>Qt::Horizontal</enum>
</property> </property>
</widget> </widget>
</item> </item>
<item row="3" column="0"> <item>
<widget class="QLabel" name="label_30"> <layout class="QGridLayout" name="gridLayout_5">
<property name="text"> <item row="2" column="1">
<string>BlockHeight</string> <widget class="QLabel" name="label_20">
</property> <property name="text">
</widget> <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p align=&quot;center&quot;&gt;|&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
</widget>
</item>
<item row="9" column="2">
<widget class="QLabel" name="supply_total">
<property name="text">
<string>Loading...</string>
</property>
</widget>
</item>
<item row="9" column="1">
<widget class="QLabel" name="label_38">
<property name="text">
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p align=&quot;center&quot;&gt;|&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
</widget>
</item>
<item row="3" column="0">
<widget class="QLabel" name="label_32">
<property name="text">
<string>Next Halving</string>
</property>
</widget>
</item>
<item row="7" column="2">
<widget class="QLabel" name="supply_taddr">
<property name="text">
<string>Loading...</string>
</property>
</widget>
</item>
<item row="6" column="1">
<widget class="QLabel" name="label_18">
<property name="text">
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p align=&quot;center&quot;&gt;|&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
</widget>
</item>
<item row="0" column="2">
<widget class="QLabel" name="blockHeight">
<property name="text">
<string>Loading...</string>
</property>
</widget>
</item>
<item row="1" column="0">
<widget class="QLabel" name="label_8">
<property name="text">
<string>Vendor</string>
</property>
</widget>
</item>
<item row="3" column="2">
<widget class="QLabel" name="halvingTime">
<property name="text">
<string>Loading...</string>
</property>
</widget>
</item>
<item row="1" column="2">
<widget class="QLabel" name="Vendor">
<property name="text">
<string>Loading...</string>
</property>
</widget>
</item>
<item row="4" column="2">
<widget class="QLabel" name="last_notarized">
<property name="text">
<string>Loading...</string>
</property>
</widget>
</item>
<item row="6" column="2">
<widget class="QLabel" name="difficulty">
<property name="text">
<string>Loading...</string>
</property>
</widget>
</item>
<item row="5" column="1">
<widget class="QLabel" name="label_28">
<property name="text">
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p align=&quot;center&quot;&gt;|&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
</widget>
</item>
<item row="8" column="1">
<widget class="QLabel" name="label_34">
<property name="text">
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p align=&quot;center&quot;&gt;|&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
</widget>
</item>
<item row="6" column="0">
<widget class="QLabel" name="label_33">
<property name="text">
<string>Difficulty</string>
</property>
</widget>
</item>
<item row="0" column="1">
<widget class="QLabel" name="label_23">
<property name="text">
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p align=&quot;center&quot;&gt;|&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
</widget>
</item>
<item row="4" column="0">
<widget class="QLabel" name="label_27">
<property name="text">
<string>Last Notarized Block</string>
</property>
</widget>
</item>
<item row="2" column="2">
<widget class="QLabel" name="Version">
<property name="text">
<string>Loading...</string>
</property>
</widget>
</item>
<item row="4" column="1">
<widget class="QLabel" name="label_26">
<property name="text">
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p align=&quot;center&quot;&gt;|&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
</widget>
</item>
<item row="9" column="0">
<widget class="QLabel" name="label_37">
<property name="text">
<string>Total Supply</string>
</property>
</widget>
</item>
<item row="3" column="1">
<widget class="QLabel" name="label_13">
<property name="text">
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p align=&quot;center&quot;&gt;|&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
</widget>
</item>
<item row="5" column="0">
<widget class="QLabel" name="label_25">
<property name="text">
<string>Longestchain</string>
</property>
</widget>
</item>
<item row="7" column="1">
<widget class="QLabel" name="label_29">
<property name="text">
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p align=&quot;center&quot;&gt;|&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
</widget>
</item>
<item row="2" column="0">
<widget class="QLabel" name="label_19">
<property name="text">
<string>Version hushlightd</string>
</property>
</widget>
</item>
<item row="0" column="0">
<widget class="QLabel" name="label_30">
<property name="text">
<string>BlockHeight</string>
</property>
</widget>
</item>
<item row="8" column="0">
<widget class="QLabel" name="label_35">
<property name="text">
<string>Supply zAddr</string>
</property>
</widget>
</item>
<item row="1" column="1">
<widget class="QLabel" name="label_22">
<property name="text">
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p align=&quot;center&quot;&gt;|&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
</widget>
</item>
<item row="8" column="2">
<widget class="QLabel" name="supply_zaddr">
<property name="text">
<string>Loading...</string>
</property>
</widget>
</item>
<item row="5" column="2">
<widget class="QLabel" name="longestchain">
<property name="text">
<string>Loading...</string>
</property>
</widget>
</item>
<item row="7" column="0">
<widget class="QLabel" name="label_36">
<property name="text">
<string>Supply tAddr</string>
</property>
</widget>
</item>
</layout>
</item> </item>
<item row="3" column="1"> <item>
<widget class="QLabel" name="label_23">
<property name="text">
<string>|</string>
</property>
</widget>
</item>
<item row="3" column="2">
<widget class="QLabel" name="blockHeight">
<property name="text">
<string>Loading...</string>
</property>
</widget>
</item>
<item row="4" column="0">
<widget class="QLabel" name="label_8">
<property name="text">
<string>Vendor</string>
</property>
</widget>
</item>
<item row="4" column="1">
<widget class="QLabel" name="label_22">
<property name="text">
<string>|</string>
</property>
</widget>
</item>
<item row="4" column="2">
<widget class="QLabel" name="Vendor">
<property name="text">
<string>Loading...</string>
</property>
</widget>
</item>
<item row="5" column="0">
<widget class="QLabel" name="label_19">
<property name="text">
<string>Version hushlightd</string>
</property>
</widget>
</item>
<item row="5" column="1">
<widget class="QLabel" name="label_20">
<property name="text">
<string>|</string>
</property>
</widget>
</item>
<item row="5" column="2">
<widget class="QLabel" name="Version">
<property name="text">
<string>Loading...</string>
</property>
</widget>
</item>
<item row="6" column="0">
<widget class="QLabel" name="label_32">
<property name="text">
<string>Next Halving</string>
</property>
</widget>
</item>
<item row="6" column="1">
<widget class="QLabel" name="label_13">
<property name="text">
<string>|</string>
</property>
</widget>
</item>
<item row="6" column="2">
<widget class="QLabel" name="halvingTime">
<property name="text">
<string>Loading...</string>
</property>
</widget>
</item>
<item row="7" column="0">
<widget class="QLabel" name="label_27">
<property name="text">
<string>Last Notarized Block</string>
</property>
</widget>
</item>
<item row="7" column="1">
<widget class="QLabel" name="label_26">
<property name="text">
<string>|</string>
</property>
</widget>
</item>
<item row="7" column="2">
<widget class="QLabel" name="last_notarized">
<property name="text">
<string>Loading...</string>
</property>
</widget>
</item>
<item row="8" column="0">
<widget class="QLabel" name="label_25">
<property name="text">
<string>Longestchain</string>
</property>
</widget>
</item>
<item row="8" column="1">
<widget class="QLabel" name="label_28">
<property name="text">
<string>|</string>
</property>
</widget>
</item>
<item row="8" column="2">
<widget class="QLabel" name="longestchain">
<property name="text">
<string>Loading...</string>
</property>
</widget>
</item>
<item row="9" column="0">
<widget class="QLabel" name="label_33">
<property name="text">
<string>Difficulty</string>
</property>
</widget>
</item>
<item row="9" column="1">
<widget class="QLabel" name="label_18">
<property name="text">
<string>|</string>
</property>
</widget>
</item>
<item row="9" column="2">
<widget class="QLabel" name="difficulty">
<property name="text">
<string>Loading...</string>
</property>
</widget>
</item>
<item row="10" column="0" colspan="3">
<widget class="Line" name="line_2"> <widget class="Line" name="line_2">
<property name="orientation"> <property name="orientation">
<enum>Qt::Horizontal</enum> <enum>Qt::Horizontal</enum>
</property> </property>
</widget> </widget>
</item> </item>
<item row="11" column="0" colspan="3"> <item>
<widget class="QLabel" name="label_24"> <widget class="QLabel" name="label_24">
<property name="font"> <property name="font">
<font> <font>
@@ -1171,70 +1250,74 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="12" column="0" colspan="3"> <item>
<widget class="Line" name="line_5"> <widget class="Line" name="line_5">
<property name="orientation"> <property name="orientation">
<enum>Qt::Horizontal</enum> <enum>Qt::Horizontal</enum>
</property> </property>
</widget> </widget>
</item> </item>
<item row="13" column="0"> <item>
<widget class="QLabel" name="label_31"> <layout class="QGridLayout" name="gridLayout_6">
<property name="text"> <item row="0" column="2">
<string>Market Cap</string> <widget class="QLabel" name="marketcapTab">
</property> <property name="text">
</widget> <string>Loading...</string>
</property>
</widget>
</item>
<item row="0" column="0">
<widget class="QLabel" name="label_31">
<property name="text">
<string>Market Cap</string>
</property>
</widget>
</item>
<item row="1" column="1">
<widget class="QLabel" name="label_9">
<property name="text">
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p align=&quot;center&quot;&gt;|&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
</widget>
</item>
<item row="1" column="2">
<widget class="QLabel" name="volumeExchange">
<property name="text">
<string>Loading...</string>
</property>
</widget>
</item>
<item row="1" column="0">
<widget class="QLabel" name="label_12">
<property name="text">
<string>Volume on Exchanges</string>
</property>
</widget>
</item>
<item row="0" column="1">
<widget class="QLabel" name="label_11">
<property name="text">
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p align=&quot;center&quot;&gt;|&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
</widget>
</item>
</layout>
</item> </item>
<item row="13" column="1"> <item>
<widget class="QLabel" name="label_11">
<property name="text">
<string>|</string>
</property>
</widget>
</item>
<item row="13" column="2">
<widget class="QLabel" name="marketcapTab">
<property name="text">
<string>Loading...</string>
</property>
</widget>
</item>
<item row="14" column="0">
<widget class="QLabel" name="label_12">
<property name="text">
<string>Volume on Exchanges</string>
</property>
</widget>
</item>
<item row="14" column="1">
<widget class="QLabel" name="label_9">
<property name="text">
<string>|</string>
</property>
</widget>
</item>
<item row="14" column="2">
<widget class="QLabel" name="volumeExchange">
<property name="text">
<string>Loading...</string>
</property>
</widget>
</item>
<item row="15" column="0" colspan="3">
<widget class="Line" name="line_4"> <widget class="Line" name="line_4">
<property name="orientation"> <property name="orientation">
<enum>Qt::Horizontal</enum> <enum>Qt::Horizontal</enum>
</property> </property>
</widget> </widget>
</item> </item>
<item row="16" column="0" colspan="3"> <item>
<widget class="QLabel" name="label_14"> <widget class="QLabel" name="label_14">
<property name="text"> <property name="text">
<string>This is a Lightwallet, you cant mine with it!</string> <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p align=&quot;center&quot;&gt;This is a Lightwallet, you cant mine with it!&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="17" column="0"> <item>
<spacer name="verticalSpacer_4"> <spacer name="verticalSpacer_4">
<property name="orientation"> <property name="orientation">
<enum>Qt::Vertical</enum> <enum>Qt::Vertical</enum>
@@ -1315,17 +1398,6 @@
<addaction name="menuHelp"/> <addaction name="menuHelp"/>
</widget> </widget>
<widget class="QStatusBar" name="statusBar"/> <widget class="QStatusBar" name="statusBar"/>
<widget class="QToolBar" name="toolBar">
<property name="windowTitle">
<string>toolBar</string>
</property>
<attribute name="toolBarArea">
<enum>TopToolBarArea</enum>
</attribute>
<attribute name="toolBarBreak">
<bool>false</bool>
</attribute>
</widget>
<action name="actionExit"> <action name="actionExit">
<property name="text"> <property name="text">
<string>E&amp;xit</string> <string>E&amp;xit</string>

View File

@@ -11,7 +11,7 @@ $QT_STATIC/bin/lrelease silentdragon-lite.pro
# Then update the qt base translations. First, get all languages # Then update the qt base translations. First, get all languages
ls res/*.qm | awk -F '[_.]' '{print $4}' | while read -r language ; do ls res/*.qm | awk -F '[_.]' '{print $4}' | while read -r language ; do
if [ -f $QT_STATIC/translations/qtbase_$language.qm ]; then if [ -f $QT_STATIC/translations/qtbase_$language.qm ]; then
$QT_STATIC/bin/lconvert -o res/silentdragonlite_$language.qm $QT_STATIC/translations/qtbase_$language.qm res/silentdragonlite_$language.qm $QT_STATIC/bin/lconvert -o res/zec_$language.qm $QT_STATIC/translations/qtbase_$language.qm res/silentdragonlite_$language.qm
mv res/silentdragonlite_$language.qm res/silentdragonlite_$language.qm mv res/zec_$language.qm res/silentdragonlite_$language.qm
fi fi
done done

View File

@@ -182,7 +182,7 @@
<rect> <rect>
<x>10</x> <x>10</x>
<y>180</y> <y>180</y>
<width>500</width> <width>691</width>
<height>16</height> <height>16</height>
</rect> </rect>
</property> </property>
@@ -201,7 +201,7 @@
<rect> <rect>
<x>9</x> <x>9</x>
<y>90</y> <y>90</y>
<width>297</width> <width>601</width>
<height>17</height> <height>17</height>
</rect> </rect>
</property> </property>