diff --git a/.gitignore b/.gitignore index 78f863e..92b60ce 100644 --- a/.gitignore +++ b/.gitignore @@ -1,37 +1,40 @@ +artifacts/ +*.autosave bin/ debug/ -release/ -x64/ -artifacts/ docs/website/public -.vscode/ +.DS_Store +hushd +IDEWorkspaceChecks.plist +komodo-cli +komodod +*.mak +Makefile +Makefile.* +.qmake.stash +qrc_application.cpp +release/ res/libsodium.a -res/libsodium/libsodium* res/libsodium.a -src/ui_*.h -*.autosave -src/precompiled.h.cpp -.qmake.stash +res/libsodium/libsodium* +silentdragon silentdragon -zec-qt-wallet-mingw* -zec-qt-wallet.vcxproj* -zecwallet.vcxproj* -zec-qt-wallet.sln silentdragon.pro.user -Makefile -Makefile.* -qrc_application.cpp +*.sln +src/precompiled.h.cpp +src/ui_*.h +*.sw? +*.tar.gz +.vscode/ +workspace.code-workspace +x64/ +*.xcsettings +zec-qt-wallet-mingw* zec-qt-wallet_plugin_import.cpp -zecwallet_plugin_import.cpp zec-qt-wallet_resource* +zec-qt-wallet.sln +zec-qt-wallet.vcxproj* +zecwallet_plugin_import.cpp zecwallet_resource* -workspace.code-workspace +zecwallet.vcxproj* *.zip -*.tar.gz -*.xcsettings -.DS_Store -*.mak -komodod -hushd -IDEWorkspaceChecks.plist -*.sln diff --git a/res/silentdragon_de.ts b/res/silentdragon_de.ts index 1a86134..c5adf1f 100644 --- a/res/silentdragon_de.ts +++ b/res/silentdragon_de.ts @@ -148,7 +148,7 @@ - + Memo Nachricht hinzufügen @@ -293,7 +293,7 @@ - + Export Private Key Privaten Key exportieren @@ -787,14 +787,14 @@ - + Copy address Adresse kopieren - - + + Copied to clipboard In die Zwischenablage kopiert @@ -810,7 +810,7 @@ - + View on block explorer Im Block explorer anzeigen @@ -829,42 +829,42 @@ Zu Sapling übertragen - + Copy txid Kopiere Transaktions ID - + View Payment Request Zahlungsaufforderung ansehen - + View Memo Nachricht ansehen - + Reply to Antworten an - + Created new t-Addr Neue transparente Adresse erstellen - + Copy Address Adresse kopieren - + Address has been previously used Diese Adresse wurde schon einmal benutzt - + Address is unused Adresse wird nicht genutzt diff --git a/res/silentdragon_es.ts b/res/silentdragon_es.ts index 93a197b..db65607 100644 --- a/res/silentdragon_es.ts +++ b/res/silentdragon_es.ts @@ -148,7 +148,7 @@ - + Memo Memo @@ -283,7 +283,7 @@ - + Export Private Key Exportar Clave Privada @@ -751,14 +751,14 @@ - + Copy address Copiar dirección - - + + Copied to clipboard Copiado al portapapeles @@ -774,7 +774,7 @@ - + View on block explorer Ver en el explorador de bloques @@ -793,42 +793,42 @@ Migrar a Sapling - + Copy txid Copiar txid - + View Payment Request Ver solicitud de pago - + View Memo Ver Memo - + Reply to Responder a - + Created new t-Addr Nuevo dirección t-Addr creada - + Copy Address Dirección de copia - + Address has been previously used La dirección ha sido utilizada previamente - + Address is unused Dirección no utilizada diff --git a/res/silentdragon_fi.ts b/res/silentdragon_fi.ts index 8f1fdd0..d82a41c 100644 --- a/res/silentdragon_fi.ts +++ b/res/silentdragon_fi.ts @@ -151,7 +151,7 @@ - + Memo Viesti @@ -307,7 +307,7 @@ - + Export Private Key Vie Salainen Avain @@ -759,14 +759,14 @@ - + Copy address Kopioi osoite - - + + Copied to clipboard Kopioitu leikepöydälle @@ -782,7 +782,7 @@ - + View on block explorer Näytä lohkoketjussa @@ -801,42 +801,42 @@ Siirrä Saplingiin - + Copy txid Kopioi Tapahtuman ID - + View Payment Request Näytä Maksu Pyyntö - + View Memo Näytä Viesti - + Reply to Vastaa - + Created new t-Addr Uusi Suojaamaton osoite luotu - + Copy Address Kopioi Osoite - + Address has been previously used Osoitetta on käytetty aiemmin - + Address is unused Osoite on käyttämätön diff --git a/res/silentdragon_fr.ts b/res/silentdragon_fr.ts index 0704e82..90f1d3a 100644 --- a/res/silentdragon_fr.ts +++ b/res/silentdragon_fr.ts @@ -148,7 +148,7 @@ - + Memo Mémo @@ -279,7 +279,7 @@ - + Export Private Key Exporter la clef privée @@ -776,14 +776,14 @@ - + Copy address Copier l'adresse - - + + Copied to clipboard Copié dans le presse-papier @@ -799,7 +799,7 @@ - + View on block explorer Voir dans l'explorateur de block @@ -818,42 +818,42 @@ Migrer vers Sapling - + Copy txid Copier l'ID de transaction - + View Payment Request Afficher la demande de paiement - + View Memo Voir le mémo - + Reply to Répondre à - + Created new t-Addr Créée une nouvelle t-Adresse - + Copy Address Copier l'adresse - + Address has been previously used L'adresse a été utilisée précédemment. - + Address is unused L'adresse est inutilisée. diff --git a/res/silentdragon_hr.qm b/res/silentdragon_hr.qm index 3f27b18..da6b496 100644 Binary files a/res/silentdragon_hr.qm and b/res/silentdragon_hr.qm differ diff --git a/res/silentdragon_hr.ts b/res/silentdragon_hr.ts index ccd9630..2ca4380 100644 --- a/res/silentdragon_hr.ts +++ b/res/silentdragon_hr.ts @@ -144,7 +144,7 @@ - + Memo Poruka (memo) @@ -237,7 +237,7 @@ - + Export Private Key Izvoz privatnog ključa @@ -531,12 +531,12 @@ You're using an external hushd. Please restart hushd with -rescan - Koristite vanjski hushd. Molim ponovo pokrenite hushd sa -rescan + Koristite vanjski hushd. Molimo ponovno pokrenite hushd sa -rescan You're using an external hushd. Please restart hushd with -reindex - Koristite vanjski hushd. Molim ponovo pokrenite hushd sa -reindex + Koristite vanjski hushd. Molimo ponovno pokrenite hushd sa -reindex @@ -561,7 +561,7 @@ SilentDragon needs to restart to rescan/reindex. SilentDragon will now close, please restart SilentDragon to continue - SilentDragon se mora ponovno pokrenuti za rescan/reindex. SilentDragon će se sada zatvoriti, molim ponovno pokrenite SilentDragon za nastavak + SilentDragon se mora ponovno pokrenuti za rescan/reindex. SilentDragon će se sada zatvoriti, molimo ponovno pokrenite SilentDragon za nastavak @@ -626,7 +626,7 @@ The keys were imported! It may take several minutes to rescan the blockchain. Until then, functionality may be limited - Ključevi su unešeni. Rescan blockchaina može pptrajati i do nekoliko minuta. Do tada su limitirane funkcionalnosti + Ključevi su unešeni. Rescan blockchaina može potrajati i do nekoliko minuta. Do tada su limitirane funkcionalnosti @@ -695,14 +695,14 @@ - + Copy address Kopirajte adresu - - + + Copied to clipboard Kopirano u mađuspremnik @@ -718,7 +718,7 @@ - + View on block explorer Pogledaj na blok exploreru @@ -733,42 +733,42 @@ Pretvorite adresu - + Copy txid Kopitajte txid - + View Payment Request Pogledajte zahtjev o plaćanju - + View Memo Pogledajte poruku (memo) - + Reply to Odgovorite - + Created new t-Addr Napravljena je nova transparentna adresa - + Copy Address Kopirajte adresu - + Address has been previously used Adresa je već korištena - + Address is unused Adresa nije korištena @@ -1163,7 +1163,7 @@ Ne pokrećem integrirani hushd jer --no-embedded nije prilagođen Please set the host/port and user/password in the Edit->Settings menu. Zatražena je ručna postavka veze, ali postavke nisu konfigurirane. -Molimo postavite host/port i korisnčko ime/lozinku u Edit->Settings meniju. +Molimo postavite host/port i korisnčko ime/lozinku u Uredi->Postavke meniju. @@ -1172,12 +1172,12 @@ Molimo postavite host/port i korisnčko ime/lozinku u Edit->Settings meniju.< Please set the host/port and user/password in the Edit->Settings menu. Nije moguće spojiti se na hushd konfiguriran u postavkama. -Molimo postavite host/port i korisnčko ime/lozinku u Edit->Settings meniju. +Molimo postavite host/port i korisnčko ime/lozinku u Uredi->Postavke meniju. Authentication failed. The username / password you specified was not accepted by hushd. Try changing it in the Edit->Settings menu - Autorizacija neuspješna. Hushd nije prihvatio korisničko ime / lozinku koju ste unijeli. Pokušajte to promijeniti u Edit->Settings meniju + Autorizacija neuspješna. Hushd nije prihvatio korisničko ime / lozinku koju ste unijeli. Pokušajte to promijeniti u Uredi->Postavke meniju @@ -1561,7 +1561,7 @@ Would you like to visit the releases page? Normally, change from t-Addresses goes to another t-Address. Checking this option will send the change to your shielded sapling address instead. Check this option to increase your privacy. - Uobičajeno, promjene se sa jedne t-adrese šalju na drugu t-adresu. Ako odaberete ovu opciju promjena će se poslati na vašu zaštićenu sapling adresu. Odaberite ovu opciju ako želite povećati privatnost. + Uobičajeno, razlike se sa jedne t-adrese šalju na drugu t-adresu. Ako odaberete ovu opciju razlika će se poslati na vašu zaštićenu sapling adresu. Odaberite ovu opciju ako želite povećati privatnost. @@ -1591,12 +1591,12 @@ Would you like to visit the releases page? Connect to the Tor network via SOCKS proxy running on 127.0.0.1:9050. Please note that you'll have to install and run the Tor service externally. - Spojite se na Tor mrežu putem SOCKS proxy na 127.0.0.1:9050. Molim vas uzmite u obzir ad ćete morati izvana instalirati Tor uslugu. + Spojite se na Tor mrežu putem SOCKS proxy na 127.0.0.1:9050. Molim vas uzmite u obzir da ćete morati izvana instalirati Tor uslugu. Connect to github on startup to check for updates - Prilikom pokretanja provjetite ažuriranja na githubu + Prilikom pokretanja provjerite ažuriranja na githubu @@ -1656,7 +1656,7 @@ Would you like to visit the releases page? Rebuild the entire blockchain from the genesis block, by rescanning all the block files. This may take several hours to days, depending on your hardware. You need to restart SilentDragon for this to take effect - Izgradite cijeli blockchain iz prvog (genesis) bloka sa rescanom svih datoteka. Ovo bi moglo potrajati nekoliko sati do nekoliko dana ovisno o jačini vašeg računala. Kako bi imalo učinka morate ponovno poktenuti SilentDragon + Izgradite cijeli blockchain iz prvog (genesis) bloka sa rescanom svih datoteka. Ovo bi moglo potrajati nekoliko sati do nekoliko dana ovisno o jačini vašeg računala. Kako bi imalo učinka morate ponovno pokrenuti SilentDragon @@ -1777,7 +1777,7 @@ Would you like to visit the releases page? hushd doesn't seem to have any peers. You might not be connected to the internet, so this Transaction might not work. - Čini se da hushd nema točaka na istoj razini. Možad niste spojeni na Internet, pa je ova transakcija nevaljala. + Čini se da hushd nema točaka na istoj razini. Možda niste spojeni na Internet, pa je ova transakcija nevaljala. diff --git a/res/silentdragon_it.ts b/res/silentdragon_it.ts index aa14691..5e5868f 100644 --- a/res/silentdragon_it.ts +++ b/res/silentdragon_it.ts @@ -152,7 +152,7 @@ - + Memo Memo @@ -292,7 +292,7 @@ - + Export Private Key Esporta la chiave privata @@ -759,14 +759,14 @@ - + Copy address Copia indirizzo - - + + Copied to clipboard Copiato negli appunti @@ -782,7 +782,7 @@ - + View on block explorer Guarda sul block-explorer @@ -801,42 +801,42 @@ Migra a Sapling - + Copy txid Copia txid - + View Payment Request Visualizza richiesta di pagamento - + View Memo Visualizza memo - + Reply to Rispondi a - + Created new t-Addr Crea nuovo t-Addr - + Copy Address Copia indirizzo - + Address has been previously used L'indirizzo è stato precedentemente utilizzato - + Address is unused L'indirizzo non è utilizzato diff --git a/res/silentdragon_nl.ts b/res/silentdragon_nl.ts index 16eef21..5ff64f7 100644 --- a/res/silentdragon_nl.ts +++ b/res/silentdragon_nl.ts @@ -148,7 +148,7 @@ - + Memo Memo @@ -282,7 +282,7 @@ - + Export Private Key Exporteer privé Sleutel @@ -759,14 +759,14 @@ - + Copy address Kopieer Adres - - + + Copied to clipboard Gekopieerd naar klemblok @@ -782,7 +782,7 @@ - + View on block explorer Geef block weer in de block explorer @@ -801,42 +801,42 @@ Migratie naar Sapling - + Copy txid Kopieer txid - + View Payment Request Bekijk Betalingsverzoek - + View Memo Memo Weergeven - + Reply to Antwoorden naar - + Created new t-Addr Creëer nieuw t-Adres - + Copy Address Kopieer Adres - + Address has been previously used Adres is vorige keer gebruikt - + Address is unused Adres is ongebruikt diff --git a/res/silentdragon_pt.ts b/res/silentdragon_pt.ts index c918719..6720b73 100644 --- a/res/silentdragon_pt.ts +++ b/res/silentdragon_pt.ts @@ -148,7 +148,7 @@ - + Memo Anexar recado @@ -283,7 +283,7 @@ - + Export Private Key Exportar Chave Privada @@ -751,14 +751,14 @@ - + Copy address Copiar endereço - - + + Copied to clipboard Copiado @@ -774,7 +774,7 @@ - + View on block explorer Ver no explorador de blocos @@ -793,42 +793,42 @@ Migrar para Sapling - + Copy txid Copiar txid - + View Payment Request Exibir solicitação de pagamento - + View Memo Ver Recado - + Reply to Responder a - + Created new t-Addr Criar novo t-Addr - + Copy Address Copiar endereço - + Address has been previously used O endereço foi usado anteriormente - + Address is unused Endereço não utilizado diff --git a/res/silentdragon_ru.ts b/res/silentdragon_ru.ts index 88bbdeb..a138e40 100644 --- a/res/silentdragon_ru.ts +++ b/res/silentdragon_ru.ts @@ -164,7 +164,7 @@ - + Memo Метка @@ -274,7 +274,7 @@ - + Export Private Key Экспорт приватного ключа @@ -729,14 +729,14 @@ - + Copy address Скопировать адрес - - + + Copied to clipboard Скопировано в буфер обмена @@ -752,7 +752,7 @@ - + View on block explorer Посмотреть в проводнике блоков @@ -771,7 +771,7 @@ Migrate to Sapling - + Copy txid Скопировать txid @@ -906,37 +906,37 @@ Это может занять несколько минут. Загрузка... - + View Payment Request Посмотреть запрос на оплату - + View Memo Посмотреть метку - + Reply to Ответить на - + Created new t-Addr Создать новый t-Addr (R) - + Copy Address Копировать адрес - + Address has been previously used Адрес был ранее использован - + Address is unused Адрес не используется diff --git a/res/silentdragon_sr.ts b/res/silentdragon_sr.ts index ba688c0..0a835a2 100644 --- a/res/silentdragon_sr.ts +++ b/res/silentdragon_sr.ts @@ -144,7 +144,7 @@ - + Memo Poruka (memo) @@ -237,7 +237,7 @@ - + Export Private Key Izvoz privatnog ključa @@ -695,14 +695,14 @@ - + Copy address Kopirajte adresu - - + + Copied to clipboard Kopirano u međuspremnik @@ -718,7 +718,7 @@ - + View on block explorer Pogledaj na blok exploreru @@ -733,42 +733,42 @@ Pretvorite adresu - + Copy txid Kopitajte txid - + View Payment Request Pogledajte zahtjev o plaćanju - + View Memo Pogledajte poruku (memo) - + Reply to Odgovorite - + Created new t-Addr Napravljena je nova transparentna adresa - + Copy Address Kopirajte adresu - + Address has been previously used Adresa je već korištena - + Address is unused Adresa nije korištena diff --git a/res/silentdragon_tr.ts b/res/silentdragon_tr.ts index 93bf9a6..db5e045 100644 --- a/res/silentdragon_tr.ts +++ b/res/silentdragon_tr.ts @@ -148,7 +148,7 @@ - + Memo Memo @@ -294,7 +294,7 @@ - + Export Private Key Özel Anahtarı Dışarı Aktar @@ -753,14 +753,14 @@ - + Copy address Adresi kopyala - - + + Copied to clipboard Panoya kopyalandı @@ -776,7 +776,7 @@ - + View on block explorer Blok gezgini üzerinde göster @@ -795,42 +795,42 @@ Sapling'e geç - + Copy txid txid'i kopyala - + View Payment Request Ödeme Talebini Görüntüle - + View Memo Memo'yu Görüntüle - + Reply to - + Created new t-Addr Yeni t-Addr oluşturuldu - + Copy Address Adresi Kopyala - + Address has been previously used Adres daha önce kullanılmış - + Address is unused Adres kullanılmamış diff --git a/res/silentdragon_uk.ts b/res/silentdragon_uk.ts index 38cce63..3b55a9f 100644 --- a/res/silentdragon_uk.ts +++ b/res/silentdragon_uk.ts @@ -164,7 +164,7 @@ - + Memo Мітка @@ -274,7 +274,7 @@ - + Export Private Key Експорт приватного ключа @@ -729,14 +729,14 @@ - + Copy address Копіювати адресу - - + + Copied to clipboard Скопійовано в буфер обміну @@ -752,7 +752,7 @@ - + View on block explorer Подивитися в провіднику блоків @@ -771,7 +771,7 @@ Migrate to Sapling - + Copy txid Скопіювати txid @@ -906,37 +906,37 @@ Це може зайняти кілька хвилин. Завантаження ... - + View Payment Request Подивитися запит на оплату - + View Memo Подивитися мітку - + Reply to Відповісти на - + Created new t-Addr Створити новий t-Addr (R) - + Copy Address Копіювати адресу - + Address has been previously used Адреса була раніше використана - + Address is unused Адреса не використовується diff --git a/res/silentdragon_zh.ts b/res/silentdragon_zh.ts index 2087bea..286a1f0 100644 --- a/res/silentdragon_zh.ts +++ b/res/silentdragon_zh.ts @@ -152,7 +152,7 @@ - + Memo 备注 @@ -243,7 +243,7 @@ - + Export Private Key 导出私钥 @@ -787,14 +787,14 @@ - + Copy address 复制成功 - - + + Copied to clipboard 复制到剪贴板 @@ -810,7 +810,7 @@ - + View on block explorer 从区块浏览器中查看 @@ -829,42 +829,42 @@ 迁移到Sapling地址 - + Copy txid 复制交易ID - + View Payment Request 查看付款申请 - + View Memo 查看备注 - + Reply to 回复给 - + Created new t-Addr 创建了新的t-Addr - + Copy Address - + Address has been previously used 该地址以前使用过 - + Address is unused 地址未使用 diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp index debd622..20534f0 100644 --- a/src/mainwindow.cpp +++ b/src/mainwindow.cpp @@ -442,7 +442,7 @@ void MainWindow::setupSettingsModal() { void MainWindow::addressBook() { // Check to see if there is a target. - QRegExp re("Address[0-9]+", Qt::CaseInsensitive); + QRegularExpression re("Address[0-9]+", QRegularExpression::CaseInsensitiveOption); for (auto target: ui->sendToWidgets->findChildren(re)) { if (target->hasFocus()) { AddressBook::open(this, target); @@ -926,6 +926,7 @@ void MainWindow::setupTransactionsTab() { if (!memo.isEmpty()) { QMessageBox mb(QMessageBox::Information, tr("Memo"), memo, QMessageBox::Ok, this); + mb.setTextFormat(Qt::PlainText); mb.setTextInteractionFlags(Qt::TextSelectableByMouse | Qt::TextSelectableByKeyboard); mb.exec(); } @@ -981,6 +982,7 @@ void MainWindow::setupTransactionsTab() { if (!memo.isEmpty()) { menu.addAction(tr("View Memo"), [=] () { QMessageBox mb(QMessageBox::Information, tr("Memo"), memo, QMessageBox::Ok, this); + mb.setTextFormat(Qt::PlainText); mb.setTextInteractionFlags(Qt::TextSelectableByMouse | Qt::TextSelectableByKeyboard); mb.exec(); }); diff --git a/src/sendtab.cpp b/src/sendtab.cpp index 450d34f..70ac8ca 100644 --- a/src/sendtab.cpp +++ b/src/sendtab.cpp @@ -132,7 +132,7 @@ void MainWindow::updateLabelsAutoComplete() { labelCompleter->setCaseSensitivity(Qt::CaseInsensitive); // Then, find all the address fields and update the completer. - QRegExp re("Address[0-9]+", Qt::CaseInsensitive); + QRegularExpression re("Address[0-9]+", QRegularExpression::CaseInsensitiveOption); for (auto target: ui->sendToWidgets->findChildren(re)) { target->setCompleter(labelCompleter); } diff --git a/src/settings.cpp b/src/settings.cpp index d35e5dd..55cde0e 100644 --- a/src/settings.cpp +++ b/src/settings.cpp @@ -167,7 +167,7 @@ unsigned int Settings::getBTCPrice() { bool Settings::getAutoShield() { // Load from Qt settings - return QSettings().value("options/autoshield", false).toBool(); + return QSettings().value("options/autoshield", true).toBool(); } void Settings::setAutoShield(bool allow) { @@ -176,7 +176,7 @@ void Settings::setAutoShield(bool allow) { bool Settings::getAllowCustomFees() { // Load from the QT Settings. - return QSettings().value("options/customfees", false).toBool(); + return QSettings().value("options/customfees", true).toBool(); } void Settings::setAllowCustomFees(bool allow) { diff --git a/src/txtablemodel.cpp b/src/txtablemodel.cpp index 0bcb1ed..a13b31e 100644 --- a/src/txtablemodel.cpp +++ b/src/txtablemodel.cpp @@ -143,7 +143,7 @@ void TxTableModel::updateAllData() { return Settings::paymentURIPretty(Settings::parseURI(dat.memo)); } else { return modeldata->at(index.row()).type + - (dat.memo.isEmpty() ? "" : " tx memo: \"" + dat.memo + "\""); + (dat.memo.isEmpty() ? "" : " tx memo: \"" + dat.memo.toHtmlEscaped() + "\""); } } case 1: {