diff --git a/README.md b/README.md index eb315d7..d2080bc 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ SilentDragonXLite is a lightwallet for DRAGONX ($DRAGONX) runs on Linux and Windows which does not require you to download the full blockchain. This is experimental software under active development! - + ## PRIVACY NOTICE @@ -28,7 +28,7 @@ Go to the [releases page](https://git.hush.is/dragonx/SilentDragonXLite/releases ### Option 2: Compile Release Yourself -* SilentDragonLite is written in C++ 14, and can be compiled with g++/clang++/visual c++. +* SilentDragonXLite is written in C++ 14, and can be compiled with g++/clang++/visual c++. * It also depends on Qt5, which you can get from [here](https://www.qt.io/download) or we recommend installing using your Linux version's package manager (if available). * **You'll need Rust v1.49**, so install it via [Rustup in Linux](https://rustup.rs/). **If you use a version greater then 1.63, then it will not currently build** as seen in [Issue #89](https://git.hush.is/hush/SilentDragonLite/issues/89). @@ -86,7 +86,7 @@ NOTE: Tor server is currently under maintenance. ``` * Open SDL Edit->Settings->LightwalletServer->nope.onion:80 -* Open the folder of SDL in a Terminal -> Enter: TORSOCKS_LOG_LEVEL=1 torsocks -i ./SilentDragonLite +* Open the folder of SDL in a Terminal -> Enter: TORSOCKS_LOG_LEVEL=1 torsocks -i ./SilentDragonXLite ``` ### Note Management SilentDragonXLite does automatic note and utxo management, which means it doesn't allow you to manually select which address to send outgoing transactions from. It follows these principles: diff --git a/application.qrc b/application.qrc index 4ad3fc4..f114601 100644 --- a/application.qrc +++ b/application.qrc @@ -52,10 +52,10 @@ res/hushdlogo.png res/hushdlogo.gif - res/silentdragonlite-animated.gif - res/silentdragonlite-animated-dark.gif - res/silentdragonlite-animated-startup.gif - res/silentdragonlite-animated-startup-dark.gif + res/silentdragonxlite-animated.gif + res/silentdragonxlite-animated-dark.gif + res/silentdragonxlite-animated-startup.gif + res/silentdragonxlite-animated-startup-dark.gif res/loaderblack.gif res/loaderwhite.gif res/logobig.gif @@ -81,23 +81,23 @@ res/emoji/SD.png - res/silentdragonlite_ar.qm - res/silentdragonlite_be.qm - res/silentdragonlite_pl.qm - res/silentdragonlite_de.qm - res/silentdragonlite_es.qm - res/silentdragonlite_fa.qm - res/silentdragonlite_fr.qm - res/silentdragonlite_hr.qm - res/silentdragonlite_id.qm - res/silentdragonlite_it.qm - res/silentdragonlite_pt.qm - res/silentdragonlite_ro.qm - res/silentdragonlite_ru.qm - res/silentdragonlite_ud.qm - res/silentdragonlite_sr.qm - res/silentdragonlite_tr.qm - res/silentdragonlite_zh.qm + res/silentdragonxlite_ar.qm + res/silentdragonxlite_be.qm + res/silentdragonxlite_pl.qm + res/silentdragonxlite_de.qm + res/silentdragonxlite_es.qm + res/silentdragonxlite_fa.qm + res/silentdragonxlite_fr.qm + res/silentdragonxlite_hr.qm + res/silentdragonxlite_id.qm + res/silentdragonxlite_it.qm + res/silentdragonxlite_pt.qm + res/silentdragonxlite_ro.qm + res/silentdragonxlite_ru.qm + res/silentdragonxlite_ud.qm + res/silentdragonxlite_sr.qm + res/silentdragonxlite_tr.qm + res/silentdragonxlite_zh.qm res/css/Blue.css diff --git a/build.sh b/build.sh index 8abfeb7..656f6f3 100755 --- a/build.sh +++ b/build.sh @@ -44,8 +44,8 @@ if [ "$QT_SUB_VERSION" -lt "12" ]; then exit 1 fi -echo "Compiling SilentDragonLite $VERSION on $UNAME with QT $QTVERSION and args=$@" -CONF=silentdragon-lite.pro +echo "Compiling SilentDragonXLite $VERSION on $UNAME with QT $QTVERSION and args=$@" +CONF=silentdragonx-lite.pro set -e qbuild () { diff --git a/contrib/debian/changelog b/contrib/debian/changelog index 6292f8b..e69de29 100644 --- a/contrib/debian/changelog +++ b/contrib/debian/changelog @@ -1,5 +0,0 @@ -silentdragonlite (2.0.1) stable; urgency=medium - - * 2.0.1.1 release. - - -- onryo Sat, 06 Jan 2024 10:20:30 +0200 diff --git a/contrib/debian/control b/contrib/debian/control index c57d5c1..dd86976 100644 --- a/contrib/debian/control +++ b/contrib/debian/control @@ -1,13 +1,13 @@ -Source: silentdragonlite +Source: silentdragonxlite Section: utils Priority: optional Maintainer: onryo Standards-Version: 4.6.0 -Homepage: https://hush.is -Vcs-Browser: https://git.hush.is/hush/SilentDragonLite -Vcs-Git: https://git.hush.is/hush/SilentDragonLite.git +Homepage: https://dragonx.is +Vcs-Browser: https://git.hush.is/dragonx/SilentDragonXLite +Vcs-Git: https://git.hush.is/dragonx/SilentDragonXLite.git -Package: silentdragonlite +Package: silentdragonxlite Architecture: amd64 arm64 Depends: ${shlibs:Depends}, ${misc:Depends} -Description: SilentDragonLite is a lightwallet for HUSH which does not require you to download the full blockchain. \ No newline at end of file +Description: SilentDragonXLite is a lightwallet for DRAGONX which does not require you to download the full blockchain. \ No newline at end of file diff --git a/doc/release-process.md b/doc/release-process.md index bc5422c..13a8777 100644 --- a/doc/release-process.md +++ b/doc/release-process.md @@ -1,4 +1,4 @@ -# SilentDragonLite Release Process +# SilentDragonXLite Release Process ## High-Level Philosophy @@ -31,7 +31,7 @@ git push ## Adding Checkpoints Adding checkpoints make SDL sync much faster, especially for brand new wallets. If there are no recent checkpoints, -when a user makes a new wallet, it will sync from a block far in the past, which wastes time, bandwidth and CPU resources. To add a checkpoint , they are added to the file `lib/src/lightclient/checkpoints.rs` in the silentdragonlite-cli repo, and then the dependency on silentdragonlite-cli is updated in this SDL repo. Here is an example commit that updates checkpoints: +when a user makes a new wallet, it will sync from a block far in the past, which wastes time, bandwidth and CPU resources. To add a checkpoint , they are added to the file `lib/src/lightclient/checkpoints.rs` in the silentdragonxlite-cli repo, and then the dependency on silentdragonxlite-cli is updated in this SDL repo. Here is an example commit that updates checkpoints: https://git.hush.is/hush/silentdragonlite-cli/commit/ef477f152e1a8bb8a5f7883a99e2a74a6f9eeb0b diff --git a/issue_template.md b/issue_template.md index 6c087f9..0dd74b8 100644 --- a/issue_template.md +++ b/issue_template.md @@ -7,7 +7,7 @@ assignees: '' --- -Please make sure you have the latest SilentDragonLite and let us +Please make sure you have the latest SilentDragonXLite and let us know if you have any non-default settings. **Describe the bug** diff --git a/lib/Cargo.lock b/lib/Cargo.lock index e7c846e..cdc992b 100644 --- a/lib/Cargo.lock +++ b/lib/Cargo.lock @@ -1334,7 +1334,7 @@ dependencies = [ "blake3", "lazy_static", "libc", - "silentdragonlitelib", + "silentdragonxlitelib", ] [[package]] @@ -1847,7 +1847,7 @@ dependencies = [ ] [[package]] -name = "silentdragonlitelib" +name = "silentdragonxlitelib" version = "0.1.0" source = "git+https://git.hush.is/dragonx/silentdragonxlite-cli?rev=7a3d6e13a5542da27c539c68ec0db5a86d662f3a#7a3d6e13a5542da27c539c68ec0db5a86d662f3a" dependencies = [ diff --git a/lib/Cargo.toml b/lib/Cargo.toml index 647d2f8..9537059 100644 --- a/lib/Cargo.toml +++ b/lib/Cargo.toml @@ -5,11 +5,11 @@ authors = ["zecwallet", "The Hush Developers"] edition = "2018" [lib] -name = "silentdragonlite" +name = "silentdragonxlite" crate-type = ["staticlib"] [dependencies] libc = "0.2.58" lazy_static = "1.4.0" blake3 = "0.3.4" -silentdragonlitelib = { git = "https://git.hush.is/dragonx/silentdragonxlite-cli", rev = "7a3d6e13a5542da27c539c68ec0db5a86d662f3a" } +silentdragonxlitelib = { git = "https://git.hush.is/dragonx/silentdragonxlite-cli", rev = "7a3d6e13a5542da27c539c68ec0db5a86d662f3a" } diff --git a/lib/Makefile b/lib/Makefile index 9dbe82a..f621163 100644 --- a/lib/Makefile +++ b/lib/Makefile @@ -10,18 +10,18 @@ PWD := $(shell pwd) all: release -winrelease: target/x86_64-pc-windows-gnu/release/silentdragonlite.lib +winrelease: target/x86_64-pc-windows-gnu/release/silentdragonxlite.lib -target/x86_64-pc-windows-gnu/release/silentdragonlite.lib: src/lib.rs Cargo.toml +target/x86_64-pc-windows-gnu/release/silentdragonxlite.lib: src/lib.rs Cargo.toml SODIUM_LIB_DIR="$(PWD)/libsodium-mingw/" cargo build --lib --release --target x86_64-pc-windows-gnu -release: target/release/silentdragonlite.$(EXT) -debug: target/debug/silentdragonlite.$(EXT) +release: target/release/silentdragonxlite.$(EXT) +debug: target/debug/silentdragonxlite.$(EXT) -target/release/silentdragonlite.$(EXT): src/lib.rs Cargo.toml +target/release/silentdragonxlite.$(EXT): src/lib.rs Cargo.toml LIBS="" CFLAGS=$(CFLAGS) cargo build --lib --release -target/debug/silentdragonlite.$(EXT): src/lib.rs Cargo.toml +target/debug/silentdragonxlite.$(EXT): src/lib.rs Cargo.toml LIBS="" CFLAGS=$(CFLAGS) cargo build --lib clean: diff --git a/lib/src/lib.rs b/lib/src/lib.rs index 116fca3..be11199 100644 --- a/lib/src/lib.rs +++ b/lib/src/lib.rs @@ -8,7 +8,7 @@ use std::sync::{Mutex, Arc}; use std::cell::RefCell; use std::ptr; -use silentdragonlitelib::{commands, lightclient::{LightClient, LightClientConfig}}; +use silentdragonxlitelib::{commands, lightclient::{LightClient, LightClientConfig}}; // We'll use a MUTEX to store a global lightclient instance, // so we don't have to keep creating it. We need to store it here, in rust diff --git a/res/Info.plist b/res/Info.plist index 7291f01..31c02bd 100644 --- a/res/Info.plist +++ b/res/Info.plist @@ -3,13 +3,13 @@ CFBundleExecutable - silentdragonlite + silentdragonxlite CFBundleGetInfoString Created by Qt/QMake CFBundleIconFile logo.icns CFBundleIdentifier - com.MyHush.SilentDragonLite + is.dragonx.SilentDragonXLite CFBundlePackageType APPL CFBundleSignature diff --git a/res/SilentDragonLite.png b/res/SilentDragonXLite.png similarity index 100% rename from res/SilentDragonLite.png rename to res/SilentDragonXLite.png diff --git a/res/SilentDragonLite.xpm b/res/SilentDragonXLite.xpm similarity index 100% rename from res/SilentDragonLite.xpm rename to res/SilentDragonXLite.xpm diff --git a/res/silentdragonlite.desktop b/res/silentdragonlite.desktop deleted file mode 100644 index bf5b057..0000000 --- a/res/silentdragonlite.desktop +++ /dev/null @@ -1,13 +0,0 @@ -[Desktop Entry] -Name=SilentDragonLite -Comment=Lightclient UI wallet for Hush -GenericName=Wallet -Exec=SilentDragonLite %u -Icon=SilentDragonLite -Type=Application -StartupNotify=true -StartupWMClass=SilentDragonLite -Categories=Utility; -MimeType=x-scheme-handler/hush; -Keywords=SilentDragonLite; - diff --git a/res/silentdragonlite-animated-dark.gif b/res/silentdragonxlite-animated-dark.gif similarity index 100% rename from res/silentdragonlite-animated-dark.gif rename to res/silentdragonxlite-animated-dark.gif diff --git a/res/silentdragonlite-animated-startup-dark.gif b/res/silentdragonxlite-animated-startup-dark.gif similarity index 100% rename from res/silentdragonlite-animated-startup-dark.gif rename to res/silentdragonxlite-animated-startup-dark.gif diff --git a/res/silentdragonlite-animated-startup.gif b/res/silentdragonxlite-animated-startup.gif similarity index 100% rename from res/silentdragonlite-animated-startup.gif rename to res/silentdragonxlite-animated-startup.gif diff --git a/res/silentdragonlite-animated.gif b/res/silentdragonxlite-animated.gif similarity index 100% rename from res/silentdragonlite-animated.gif rename to res/silentdragonxlite-animated.gif diff --git a/res/silentdragonxlite.desktop b/res/silentdragonxlite.desktop new file mode 100644 index 0000000..ff6bf61 --- /dev/null +++ b/res/silentdragonxlite.desktop @@ -0,0 +1,13 @@ +[Desktop Entry] +Name=SilentDragonXLite +Comment=Lightclient UI wallet for DragonX +GenericName=Wallet +Exec=SilentDragonXLite %u +Icon=SilentDragonXLite +Type=Application +StartupNotify=true +StartupWMClass=SilentDragonXLite +Categories=Utility; +MimeType=x-scheme-handler/dragonx; +Keywords=SilentDragonXLite; + diff --git a/res/silentdragonlite_ar.qm b/res/silentdragonxlite_ar.qm similarity index 100% rename from res/silentdragonlite_ar.qm rename to res/silentdragonxlite_ar.qm diff --git a/res/silentdragonlite_ar.ts b/res/silentdragonxlite_ar.ts similarity index 100% rename from res/silentdragonlite_ar.ts rename to res/silentdragonxlite_ar.ts diff --git a/res/silentdragonlite_be.qm b/res/silentdragonxlite_be.qm similarity index 100% rename from res/silentdragonlite_be.qm rename to res/silentdragonxlite_be.qm diff --git a/res/silentdragonlite_be.ts b/res/silentdragonxlite_be.ts similarity index 100% rename from res/silentdragonlite_be.ts rename to res/silentdragonxlite_be.ts diff --git a/res/silentdragonlite_de.qm b/res/silentdragonxlite_de.qm similarity index 100% rename from res/silentdragonlite_de.qm rename to res/silentdragonxlite_de.qm diff --git a/res/silentdragonlite_de.ts b/res/silentdragonxlite_de.ts similarity index 100% rename from res/silentdragonlite_de.ts rename to res/silentdragonxlite_de.ts diff --git a/res/silentdragonlite_es.qm b/res/silentdragonxlite_es.qm similarity index 100% rename from res/silentdragonlite_es.qm rename to res/silentdragonxlite_es.qm diff --git a/res/silentdragonlite_es.ts b/res/silentdragonxlite_es.ts similarity index 100% rename from res/silentdragonlite_es.ts rename to res/silentdragonxlite_es.ts diff --git a/res/silentdragonlite_fa.qm b/res/silentdragonxlite_fa.qm similarity index 100% rename from res/silentdragonlite_fa.qm rename to res/silentdragonxlite_fa.qm diff --git a/res/silentdragonlite_fa.ts b/res/silentdragonxlite_fa.ts similarity index 100% rename from res/silentdragonlite_fa.ts rename to res/silentdragonxlite_fa.ts diff --git a/res/silentdragonlite_fr.qm b/res/silentdragonxlite_fr.qm similarity index 100% rename from res/silentdragonlite_fr.qm rename to res/silentdragonxlite_fr.qm diff --git a/res/silentdragonlite_fr.ts b/res/silentdragonxlite_fr.ts similarity index 100% rename from res/silentdragonlite_fr.ts rename to res/silentdragonxlite_fr.ts diff --git a/res/silentdragonlite_hr.qm b/res/silentdragonxlite_hr.qm similarity index 100% rename from res/silentdragonlite_hr.qm rename to res/silentdragonxlite_hr.qm diff --git a/res/silentdragonlite_hr.ts b/res/silentdragonxlite_hr.ts similarity index 100% rename from res/silentdragonlite_hr.ts rename to res/silentdragonxlite_hr.ts diff --git a/res/silentdragonlite_id.qm b/res/silentdragonxlite_id.qm similarity index 100% rename from res/silentdragonlite_id.qm rename to res/silentdragonxlite_id.qm diff --git a/res/silentdragonlite_id.ts b/res/silentdragonxlite_id.ts similarity index 100% rename from res/silentdragonlite_id.ts rename to res/silentdragonxlite_id.ts diff --git a/res/silentdragonlite_it.qm b/res/silentdragonxlite_it.qm similarity index 100% rename from res/silentdragonlite_it.qm rename to res/silentdragonxlite_it.qm diff --git a/res/silentdragonlite_it.ts b/res/silentdragonxlite_it.ts similarity index 100% rename from res/silentdragonlite_it.ts rename to res/silentdragonxlite_it.ts diff --git a/res/silentdragonlite_nl.qm b/res/silentdragonxlite_nl.qm similarity index 100% rename from res/silentdragonlite_nl.qm rename to res/silentdragonxlite_nl.qm diff --git a/res/silentdragonlite_nl.ts b/res/silentdragonxlite_nl.ts similarity index 100% rename from res/silentdragonlite_nl.ts rename to res/silentdragonxlite_nl.ts diff --git a/res/silentdragonlite_pl.qm b/res/silentdragonxlite_pl.qm similarity index 100% rename from res/silentdragonlite_pl.qm rename to res/silentdragonxlite_pl.qm diff --git a/res/silentdragonlite_pl.ts b/res/silentdragonxlite_pl.ts similarity index 100% rename from res/silentdragonlite_pl.ts rename to res/silentdragonxlite_pl.ts diff --git a/res/silentdragonlite_pot.ts b/res/silentdragonxlite_pot.ts similarity index 100% rename from res/silentdragonlite_pot.ts rename to res/silentdragonxlite_pot.ts diff --git a/res/silentdragonlite_pt.qm b/res/silentdragonxlite_pt.qm similarity index 100% rename from res/silentdragonlite_pt.qm rename to res/silentdragonxlite_pt.qm diff --git a/res/silentdragonlite_pt.ts b/res/silentdragonxlite_pt.ts similarity index 100% rename from res/silentdragonlite_pt.ts rename to res/silentdragonxlite_pt.ts diff --git a/res/silentdragonlite_ro.qm b/res/silentdragonxlite_ro.qm similarity index 100% rename from res/silentdragonlite_ro.qm rename to res/silentdragonxlite_ro.qm diff --git a/res/silentdragonlite_ro.ts b/res/silentdragonxlite_ro.ts similarity index 100% rename from res/silentdragonlite_ro.ts rename to res/silentdragonxlite_ro.ts diff --git a/res/silentdragonlite_ru.qm b/res/silentdragonxlite_ru.qm similarity index 100% rename from res/silentdragonlite_ru.qm rename to res/silentdragonxlite_ru.qm diff --git a/res/silentdragonlite_ru.ts b/res/silentdragonxlite_ru.ts similarity index 100% rename from res/silentdragonlite_ru.ts rename to res/silentdragonxlite_ru.ts diff --git a/res/silentdragonlite_sr.qm b/res/silentdragonxlite_sr.qm similarity index 100% rename from res/silentdragonlite_sr.qm rename to res/silentdragonxlite_sr.qm diff --git a/res/silentdragonlite_sr.ts b/res/silentdragonxlite_sr.ts similarity index 100% rename from res/silentdragonlite_sr.ts rename to res/silentdragonxlite_sr.ts diff --git a/res/silentdragonlite_template.qm b/res/silentdragonxlite_template.qm similarity index 100% rename from res/silentdragonlite_template.qm rename to res/silentdragonxlite_template.qm diff --git a/res/silentdragonlite_template.ts b/res/silentdragonxlite_template.ts similarity index 100% rename from res/silentdragonlite_template.ts rename to res/silentdragonxlite_template.ts diff --git a/res/silentdragonlite_tr.qm b/res/silentdragonxlite_tr.qm similarity index 100% rename from res/silentdragonlite_tr.qm rename to res/silentdragonxlite_tr.qm diff --git a/res/silentdragonlite_tr.ts b/res/silentdragonxlite_tr.ts similarity index 99% rename from res/silentdragonlite_tr.ts rename to res/silentdragonxlite_tr.ts index 8c27ed6..23dc0a5 100644 --- a/res/silentdragonlite_tr.ts +++ b/res/silentdragonxlite_tr.ts @@ -85,7 +85,7 @@ ConnectionDialog - silentdragonlite + silentdragonxlite silentdragon @@ -94,7 +94,7 @@ - SilentDragonLite + SilentDragonXLite @@ -294,7 +294,7 @@ p, li { white-space: pre-wrap; } MainWindow - silentdragonlite + silentdragonxlite silentdragon @@ -892,7 +892,7 @@ p, li { white-space: pre-wrap; } wallet.dat dosyasını yedekle - Thanks for supporting silentdragonlite! + Thanks for supporting silentdragonxlite! silentdragon'i desteklediğiniz için teşekkür ederiz! @@ -900,7 +900,7 @@ p, li { white-space: pre-wrap; } 0.01 Bağış yap - to support silentdragonlite + to support silentdragonxlite 0.01 Bağış yap yazısının devamı ve silentdragon'i destekle @@ -1733,11 +1733,11 @@ Note: Funds need 1 confirmations before they can be spent hushd bekleniyor - You have hushd set to start as a daemon, which can cause problems with silentdragonlite + You have hushd set to start as a daemon, which can cause problems with silentdragonxlite -.Please remove the following line from your hush.conf and restart silentdragonlite +.Please remove the following line from your hush.conf and restart silentdragonxlite daemon=1 - hushd, silentdragonlite ile sorunlara neden olan bir daemon olarak başlayacak şekilde ayarladınız. + hushd, silentdragonxlite ile sorunlara neden olan bir daemon olarak başlayacak şekilde ayarladınız. .Lütfen aşağıdaki satırı hush.conf dosyanızdan kaldırın ve silentdragon'i yeniden başlatın daemon=1 @@ -1783,7 +1783,7 @@ Not starting embedded hushd because --no-embedded was passed .Please remove the following line from your hush.conf and restart silentdragon daemon=1 - hushd'yi, silentdragonlite ile sorunlara neden olabilecek bir daemon olacak şekilde ayarladınız. + hushd'yi, silentdragonxlite ile sorunlara neden olabilecek bir daemon olacak şekilde ayarladınız. .Lütfen aşağıdaki satırı hush.conf dosyanızdan kaldırın ve silentdragon'i yeniden başlatın daemon=1 @@ -1975,7 +1975,7 @@ Yayınlanan sürümler sayfasını ziyaret etmek ister misiniz? tx hesaplanıyor. Bu birkaç dakika sürebilir. - Please wait for silentdragonlite to exit + Please wait for silentdragonxlite to exit Lütfen çıkmak için silentdragon'i bekleyin diff --git a/res/silentdragonlite_ud.qm b/res/silentdragonxlite_ud.qm similarity index 100% rename from res/silentdragonlite_ud.qm rename to res/silentdragonxlite_ud.qm diff --git a/res/silentdragonlite_ud.ts b/res/silentdragonxlite_ud.ts similarity index 100% rename from res/silentdragonlite_ud.ts rename to res/silentdragonxlite_ud.ts diff --git a/res/silentdragonlite_zh.qm b/res/silentdragonxlite_zh.qm similarity index 100% rename from res/silentdragonlite_zh.qm rename to res/silentdragonxlite_zh.qm diff --git a/res/silentdragonlite_zh.ts b/res/silentdragonxlite_zh.ts similarity index 100% rename from res/silentdragonlite_zh.ts rename to res/silentdragonxlite_zh.ts diff --git a/run-after-build.sh b/run-after-build.sh index f4147e4..aa8ff29 100755 --- a/run-after-build.sh +++ b/run-after-build.sh @@ -1,4 +1,4 @@ #!/bin/bash # Copyright 2019-2024 The Hush Developers -./build.sh && ./SilentDragonLite +./build.sh && ./SilentDragonXLite diff --git a/silentdragon-lite.pro b/silentdragonx-lite.pro similarity index 78% rename from silentdragon-lite.pro rename to silentdragonx-lite.pro index b1dcc2b..8bca207 100644 --- a/silentdragon-lite.pro +++ b/silentdragonx-lite.pro @@ -110,7 +110,7 @@ HEADERS += \ src/controller.h \ src/liteinterface.h \ src/camount.h \ - lib/silentdragonlitelib.h \ + lib/silentdragonxlitelib.h \ src/chatbubbleme.h \ src/chatbubblepartner.h \ src/chatmodel.h \ @@ -150,24 +150,24 @@ FORMS += \ src/chatbubblepartner.ui -TRANSLATIONS = res/silentdragonlite_ar.ts \ - res/silentdragonlite_be.ts \ - res/silentdragonlite_de.ts \ - res/silentdragonlite_es.ts \ - res/silentdragonlite_fa.ts \ - res/silentdragonlite_fr.ts \ - res/silentdragonlite_hr.ts \ - res/silentdragonlite_id.ts \ - res/silentdragonlite_it.ts \ - res/silentdragonlite_nl.ts \ - res/silentdragonlite_pt.ts \ - res/silentdragonlite_pl.ts \ - res/silentdragonlite_ro.ts \ - res/silentdragonlite_ru.ts \ - res/silentdragonlite_sr.ts \ - res/silentdragonlite_tr.ts \ - res/silentdragonlite_ud.ts \ - res/silentdragonlite_zh.ts +TRANSLATIONS = res/silentdragonxlite_ar.ts \ + res/silentdragonxlite_be.ts \ + res/silentdragonxlite_de.ts \ + res/silentdragonxlite_es.ts \ + res/silentdragonxlite_fa.ts \ + res/silentdragonxlite_fr.ts \ + res/silentdragonxlite_hr.ts \ + res/silentdragonxlite_id.ts \ + res/silentdragonxlite_it.ts \ + res/silentdragonxlite_nl.ts \ + res/silentdragonxlite_pt.ts \ + res/silentdragonxlite_pl.ts \ + res/silentdragonxlite_ro.ts \ + res/silentdragonxlite_ru.ts \ + res/silentdragonxlite_sr.ts \ + res/silentdragonxlite_tr.ts \ + res/silentdragonxlite_ud.ts \ + res/silentdragonxlite_zh.ts include(singleapplication/singleapplication.pri) DEFINES += QAPPLICATION_CLASS=QApplication _FORTIFY_SOURCE=2 @@ -186,8 +186,8 @@ else: unix:!android: target.path = /opt/$${TARGET}/bin libsodium.target = $$PWD/res/libsodium.a libsodium.commands = res/libsodium/buildlibsodium.sh "$@" -unix: librust.target = $$PWD/lib/target/release/libsilentdragonlite.a -else:win32: librust.target = $$PWD/lib/target/x86_64-pc-windows-gnu/release/silentdragonlite.lib +unix: librust.target = $$PWD/lib/target/release/libsilentdragonxlite.a +else:win32: librust.target = $$PWD/lib/target/x86_64-pc-windows-gnu/release/silentdragonxlite.lib unix: librust.commands = $(MAKE) -C $$PWD/lib else:win32: librust.commands = $(MAKE) -C $$PWD/lib winrelease @@ -199,14 +199,14 @@ distclean.depends += librustclean QMAKE_EXTRA_TARGETS += librust libsodium librustclean distclean -QMAKE_CLEAN += $$PWD/lib/target/release/libsilentdragonlite.a res/libsodium.a +QMAKE_CLEAN += $$PWD/lib/target/release/libsilentdragonxlite.a res/libsodium.a -win32: LIBS += -L$$PWD/lib/target/x86_64-pc-windows-gnu/release -lsilentdragonlite -L$$PWD/res/ -llibsodium -lsecur32 -lcrypt32 -lncrypt -else:macx: LIBS += -L$$PWD/lib/target/release -lsilentdragonlite -framework Security -framework Foundation -L$$PWD/res/ -lsodium -else:unix: LIBS += -L$$PWD/lib/target/release -lsilentdragonlite -ldl -L$$PWD/res/ -lsodium +win32: LIBS += -L$$PWD/lib/target/x86_64-pc-windows-gnu/release -lsilentdragonxlite -L$$PWD/res/ -llibsodium -lsecur32 -lcrypt32 -lncrypt +else:macx: LIBS += -L$$PWD/lib/target/release -lsilentdragonxlite -framework Security -framework Foundation -L$$PWD/res/ -lsodium +else:unix: LIBS += -L$$PWD/lib/target/release -lsilentdragonxlite -ldl -L$$PWD/res/ -lsodium -win32: PRE_TARGETDEPS += $$PWD/lib/target/x86_64-pc-windows-gnu/release/silentdragonlite.lib $$PWD/res/libsodium.a -else:unix::PRE_TARGETDEPS += $$PWD/lib/target/release/libsilentdragonlite.a $$PWD/res/libsodium.a +win32: PRE_TARGETDEPS += $$PWD/lib/target/x86_64-pc-windows-gnu/release/silentdragonxlite.lib $$PWD/res/libsodium.a +else:unix::PRE_TARGETDEPS += $$PWD/lib/target/release/libsilentdragonxlite.a $$PWD/res/libsodium.a INCLUDEPATH += $$PWD/res DEPENDPATH += $$PWD/res diff --git a/src/chatmodel.cpp b/src/chatmodel.cpp index f84b8de..99dfa5c 100644 --- a/src/chatmodel.cpp +++ b/src/chatmodel.cpp @@ -867,8 +867,8 @@ void MainWindow::ContactRequest() { auto d = new QDialog(this); auto connD = new Ui_ConnectionDialog(); connD->setupUi(d); - QMovie *movie1 = new QMovie(":/img/res/silentdragonlite-animated-startup-dark.gif"); - QMovie *movie2 = new QMovie(":/img/res/silentdragonlite-animated-startup-dark.gif"); + QMovie *movie1 = new QMovie(":/img/res/silentdragonxlite-animated-startup-dark.gif"); + QMovie *movie2 = new QMovie(":/img/res/silentdragonxlite-animated-startup-dark.gif"); auto theme = Settings::getInstance()->get_theme_name(); if (theme == "Dark" || theme == "Midnight") { movie2->setScaledSize(QSize(512,512)); diff --git a/src/connection.cpp b/src/connection.cpp index 5991951..d635c67 100644 --- a/src/connection.cpp +++ b/src/connection.cpp @@ -7,7 +7,7 @@ #include "firsttimewizard.h" #include "ui_createhushconfdialog.h" #include "controller.h" -#include "../lib/silentdragonlitelib.h" +#include "../lib/silentdragonxlitelib.h" #include "precompiled.h" #include #include "sdl.h" @@ -15,13 +15,13 @@ using json = nlohmann::json; #ifdef Q_OS_WIN -auto dirwalletconnection = QDir(QStandardPaths::writableLocation(QStandardPaths::AppDataLocation)).filePath("silentdragonlite/silentdragonlite-wallet.dat"); +auto dirwalletconnection = QDir(QStandardPaths::writableLocation(QStandardPaths::AppDataLocation)).filePath("silentdragonxlite/silentdragonxlite-wallet.dat"); #endif #ifdef Q_OS_MACOS -auto dirwalletconnection = QDir(QStandardPaths::writableLocation(QStandardPaths::AppDataLocation)).filePath("silentdragonlite/silentdragonlite-wallet.dat"); +auto dirwalletconnection = QDir(QStandardPaths::writableLocation(QStandardPaths::AppDataLocation)).filePath("silentdragonxlite/silentdragonxlite-wallet.dat"); #endif #ifdef Q_OS_LINUX -auto dirwalletconnection = QDir(QStandardPaths::writableLocation(QStandardPaths::HomeLocation)).filePath(".silentdragonlite/silentdragonlite-wallet.dat"); +auto dirwalletconnection = QDir(QStandardPaths::writableLocation(QStandardPaths::HomeLocation)).filePath(".silentdragonxlite/silentdragonxlite-wallet.dat"); #endif ConnectionLoader::ConnectionLoader(MainWindow* main, Controller* rpc) @@ -38,13 +38,13 @@ ConnectionLoader::ConnectionLoader(MainWindow* main, Controller* rpc) auto size = QSize(512,512); if (theme == "Dark" || theme == "Midnight") { - QMovie *movie2 = new QMovie(":/img/res/silentdragonlite-animated-startup-dark.gif");; + QMovie *movie2 = new QMovie(":/img/res/silentdragonxlite-animated-startup-dark.gif");; movie2->setScaledSize(size); qDebug() << "Animation dark loaded"; connD->topIcon->setMovie(movie2); movie2->start(); } else { - QMovie *movie1 = new QMovie(":/img/res/silentdragonlite-animated-startup-dark.gif");; + QMovie *movie1 = new QMovie(":/img/res/silentdragonxlite-animated-startup-dark.gif");; movie1->setScaledSize(size); qDebug() << "Animation light loaded"; connD->topIcon->setMovie(movie1); diff --git a/src/controller.cpp b/src/controller.cpp index e1d3348..bbb5104 100644 --- a/src/controller.cpp +++ b/src/controller.cpp @@ -1580,7 +1580,7 @@ void Controller::checkForUpdate(bool silent) if (!zrpc->haveConnection()) return noConnection(); - QUrl giteaURL("https://git.hush.is/repos/hush/SilentDragonLite/releases"); + QUrl giteaURL("https://git.hush.is/repos/dragonx/SilentDragonXLite/releases"); QNetworkRequest req; req.setUrl(giteaURL); @@ -1634,7 +1634,7 @@ void Controller::checkForUpdate(bool silent) QMessageBox::Yes, QMessageBox::Cancel); if (ans == QMessageBox::Yes) { - QDesktopServices::openUrl(QUrl("https://git.hush.is/hush/SilentDragonLite/releases")); + QDesktopServices::openUrl(QUrl("https://git.hush.is/dragonx/SilentDragonXLite/releases")); } else { @@ -2033,20 +2033,20 @@ void Controller::shutdownhushd() auto size = QSize(512,512); if (theme == "Dark" || theme == "Midnight") { - QMovie *movie2 = new QMovie(":/img/res/silentdragonlite-animated-startup-dark.gif");; + QMovie *movie2 = new QMovie(":/img/res/silentdragonxlite-animated-startup-dark.gif");; movie2->setScaledSize(size); qDebug() << "Animation dark loaded"; connD.topIcon->setMovie(movie2); movie2->start(); - connD.status->setText(QObject::tr("Please wait for SilentDragonLite to exit")); + connD.status->setText(QObject::tr("Please wait for SilentDragonXLite to exit")); connD.statusDetail->setText(QObject::tr("It may take several minutes")); } else { - QMovie *movie1 = new QMovie(":/img/res/silentdragonlite-animated-startup-dark.gif");; + QMovie *movie1 = new QMovie(":/img/res/silentdragonxlite-animated-startup-dark.gif");; movie1->setScaledSize(size); qDebug() << "Animation light loaded"; connD.topIcon->setMovie(movie1); movie1->start(); - connD.status->setText(QObject::tr("Please wait for SilentDragonLite to exit")); + connD.status->setText(QObject::tr("Please wait for SilentDragonXLite to exit")); connD.statusDetail->setText(QObject::tr("It may take several minutes")); } diff --git a/src/deposithush.ui b/src/deposithush.ui index 42ee333..ef32f99 100644 --- a/src/deposithush.ui +++ b/src/deposithush.ui @@ -87,7 +87,7 @@ hr { height: 1px; border-width: 0; } li.unchecked::marker { content: "\2610"; } li.checked::marker { content: "\2612"; } </style></head><body style=" font-family:'.AppleSystemUIFont'; font-size:13pt; font-weight:400; font-style:normal;"> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Ubuntu'; font-size:16pt;">Please use the following hush address to transfer funds to SilentDragonLite. You can either copy the address or use the QR Code. </span></p></body></html> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Ubuntu'; font-size:16pt;">Please use the following hush address to transfer funds to SilentDragonXLite. You can either copy the address or use the QR Code. </span></p></body></html> diff --git a/src/firsttimewizard.cpp b/src/firsttimewizard.cpp index e5d8dc7..701d717 100644 --- a/src/firsttimewizard.cpp +++ b/src/firsttimewizard.cpp @@ -7,22 +7,22 @@ #include "ui_newwallet.h" #include "mainwindow.h" #include "DataStore/DataStore.h" -#include "../lib/silentdragonlitelib.h" +#include "../lib/silentdragonxlitelib.h" #ifdef Q_OS_WIN -auto dirwalletfirst = QDir(QStandardPaths::writableLocation(QStandardPaths::AppDataLocation)).filePath("silentdragonlite/silentdragonlite-wallet.dat"); -auto dirwalletencfirst = QDir(QStandardPaths::writableLocation(QStandardPaths::AppDataLocation)).filePath("silentdragonlite/silentdragonlite-wallet-enc.dat"); -auto dirwalletbackupfirst = QDir(QStandardPaths::writableLocation(QStandardPaths::AppDataLocation)).filePath("silentdragonlite/silentdragonlite-wallet.datBackup"); +auto dirwalletfirst = QDir(QStandardPaths::writableLocation(QStandardPaths::AppDataLocation)).filePath("silentdragonxlite/silentdragonxlite-wallet.dat"); +auto dirwalletencfirst = QDir(QStandardPaths::writableLocation(QStandardPaths::AppDataLocation)).filePath("silentdragonxlite/silentdragonxlite-wallet-enc.dat"); +auto dirwalletbackupfirst = QDir(QStandardPaths::writableLocation(QStandardPaths::AppDataLocation)).filePath("silentdragonxlite/silentdragonxlite-wallet.datBackup"); #endif #ifdef Q_OS_MACOS -auto dirwalletfirst = QDir(QStandardPaths::writableLocation(QStandardPaths::AppDataLocation)).filePath("silentdragonlite/silentdragonlite-wallet.dat"); -auto dirwalletencfirst = QDir(QStandardPaths::writableLocation(QStandardPaths::AppDataLocation)).filePath("silentdragonlite/silentdragonlite-wallet-enc.dat"); -auto dirwalletbackupfirst = QDir(QStandardPaths::writableLocation(QStandardPaths::AppDataLocation)).filePath("silentdragonlite/silentdragonlite-wallet.datBackup"); +auto dirwalletfirst = QDir(QStandardPaths::writableLocation(QStandardPaths::AppDataLocation)).filePath("silentdragonxlite/silentdragonxlite-wallet.dat"); +auto dirwalletencfirst = QDir(QStandardPaths::writableLocation(QStandardPaths::AppDataLocation)).filePath("silentdragonxlite/silentdragonxlite-wallet-enc.dat"); +auto dirwalletbackupfirst = QDir(QStandardPaths::writableLocation(QStandardPaths::AppDataLocation)).filePath("silentdragonxlite/silentdragonxlite-wallet.datBackup"); #endif #ifdef Q_OS_LINUX -auto dirwalletfirst = QDir(QStandardPaths::writableLocation(QStandardPaths::HomeLocation)).filePath(".silentdragonlite/silentdragonlite-wallet.dat"); -auto dirwalletencfirst = QDir(QStandardPaths::writableLocation(QStandardPaths::HomeLocation)).filePath(".silentdragonlite/silentdragonlite-wallet-enc.dat"); -auto dirwalletbackupfirst = QDir(QStandardPaths::writableLocation(QStandardPaths::HomeLocation)).filePath(".silentdragonlite/silentdragonlite-wallet.datBackup"); +auto dirwalletfirst = QDir(QStandardPaths::writableLocation(QStandardPaths::HomeLocation)).filePath(".silentdragonxlite/silentdragonxlite-wallet.dat"); +auto dirwalletencfirst = QDir(QStandardPaths::writableLocation(QStandardPaths::HomeLocation)).filePath(".silentdragonxlite/silentdragonxlite-wallet-enc.dat"); +auto dirwalletbackupfirst = QDir(QStandardPaths::writableLocation(QStandardPaths::HomeLocation)).filePath(".silentdragonxlite/silentdragonxlite-wallet.datBackup"); #endif void FirstTimeWizard::slot_change_theme(const QString& theme_name) { @@ -707,7 +707,7 @@ bool RestoreSeedPage::validatePage() { qDebug() << __func__ << ": seed length=" << seedLength; if (seedLength != 24) { QMessageBox::warning(this, tr("Failed to restore wallet"), - tr("SilentDragonLite needs 24 words to restore wallet"), + tr("SilentDragonXLite needs 24 words to restore wallet"), QMessageBox::Ok); return false; } diff --git a/src/main.cpp b/src/main.cpp index 5b4ad6d..8bdc179 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -168,14 +168,14 @@ public: } QCoreApplication::setOrganizationName("Hush"); - QCoreApplication::setApplicationName("SilentDragonLite"); + QCoreApplication::setApplicationName("SilentDragonXLite"); QString locale = QLocale::system().name(); locale.truncate(locale.lastIndexOf('_')); // Get the language code qDebug() << "Loading locale " << locale; QTranslator translator; - translator.load(QString(":/translations/res/silentdragonlite_") + locale); + translator.load(QString(":/translations/res/silentdragonxlite_") + locale); a.installTranslator(&translator); QIcon icon(":/icons/res/icon.ico"); @@ -208,7 +208,7 @@ public: w = new MainWindow(); - w->setWindowTitle("SilentDragonLite v" + QString(APP_VERSION)); + w->setWindowTitle("SilentDragonXLite v" + QString(APP_VERSION)); // If there was a payment URI on the command line, pay it if (parser.positionalArguments().length() > 0) { diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp index fef2682..9bb377b 100644 --- a/src/mainwindow.cpp +++ b/src/mainwindow.cpp @@ -33,7 +33,7 @@ #include "Crypto/FileEncryption.h" #include "DataStore/DataStore.h" #include "firsttimewizard.h" -#include "../lib/silentdragonlitelib.h" +#include "../lib/silentdragonxlitelib.h" #include #include #include @@ -42,19 +42,19 @@ using json = nlohmann::json; #ifdef Q_OS_WIN -auto dirwallet = QDir(QStandardPaths::writableLocation(QStandardPaths::AppDataLocation)).filePath("silentdragonlite/silentdragonlite-wallet.dat"); -auto dirwalletenc = QDir(QStandardPaths::writableLocation(QStandardPaths::AppDataLocation)).filePath("silentdragonlite/silentdragonlite-wallet-enc.dat"); -auto dirwalletbackup = QDir(QStandardPaths::writableLocation(QStandardPaths::AppDataLocation)).filePath("silentdragonlite/silentdragonlite-wallet.datBackup"); +auto dirwallet = QDir(QStandardPaths::writableLocation(QStandardPaths::AppDataLocation)).filePath("silentdragonxlite/silentdragonxlite-wallet.dat"); +auto dirwalletenc = QDir(QStandardPaths::writableLocation(QStandardPaths::AppDataLocation)).filePath("silentdragonxlite/silentdragonxlite-wallet-enc.dat"); +auto dirwalletbackup = QDir(QStandardPaths::writableLocation(QStandardPaths::AppDataLocation)).filePath("silentdragonxlite/silentdragonxlite-wallet.datBackup"); #endif #ifdef Q_OS_MACOS -auto dirwallet = QDir(QStandardPaths::writableLocation(QStandardPaths::AppDataLocation)).filePath("silentdragonlite/silentdragonlite-wallet.dat"); -auto dirwalletenc = QDir(QStandardPaths::writableLocation(QStandardPaths::AppDataLocation)).filePath("silentdragonlite/silentdragonlite-wallet-enc.dat"); -auto dirwalletbackup = QDir(QStandardPaths::writableLocation(QStandardPaths::AppDataLocation)).filePath("silentdragonlite/silentdragonlite-wallet.datBackup"); +auto dirwallet = QDir(QStandardPaths::writableLocation(QStandardPaths::AppDataLocation)).filePath("silentdragonxlite/silentdragonxlite-wallet.dat"); +auto dirwalletenc = QDir(QStandardPaths::writableLocation(QStandardPaths::AppDataLocation)).filePath("silentdragonxlite/silentdragonxlite-wallet-enc.dat"); +auto dirwalletbackup = QDir(QStandardPaths::writableLocation(QStandardPaths::AppDataLocation)).filePath("silentdragonxlite/silentdragonxlite-wallet.datBackup"); #endif #ifdef Q_OS_LINUX -auto dirwallet = QDir(QStandardPaths::writableLocation(QStandardPaths::HomeLocation)).filePath(".silentdragonlite/silentdragonlite-wallet.dat"); -auto dirwalletenc = QDir(QStandardPaths::writableLocation(QStandardPaths::HomeLocation)).filePath(".silentdragonlite/silentdragonlite-wallet-enc.dat"); -auto dirwalletbackup = QDir(QStandardPaths::writableLocation(QStandardPaths::HomeLocation)).filePath(".silentdragonlite/silentdragonlite-wallet.datBackup"); +auto dirwallet = QDir(QStandardPaths::writableLocation(QStandardPaths::HomeLocation)).filePath(".silentdragonxlite/silentdragonxlite-wallet.dat"); +auto dirwalletenc = QDir(QStandardPaths::writableLocation(QStandardPaths::HomeLocation)).filePath(".silentdragonxlite/silentdragonxlite-wallet-enc.dat"); +auto dirwalletbackup = QDir(QStandardPaths::writableLocation(QStandardPaths::HomeLocation)).filePath(".silentdragonxlite/silentdragonxlite-wallet.datBackup"); #endif MainWindow::MainWindow(QWidget *parent) : @@ -84,7 +84,7 @@ MainWindow::MainWindow(QWidget *parent) : QDir().mkpath(dir.absolutePath()); }else{} - logger = new Logger(this, QDir(QStandardPaths::writableLocation(QStandardPaths::AppDataLocation)).filePath("silentdragonlite-wallet.log")); + logger = new Logger(this, QDir(QStandardPaths::writableLocation(QStandardPaths::AppDataLocation)).filePath("silentdragonxlite-wallet.log")); // Check for encryption if(fileExists(dirwalletenc)) @@ -184,7 +184,7 @@ MainWindow::MainWindow(QWidget *parent) : QString seed = restoreSeed.seed->toPlainText(); if (seed.trimmed().split(" ").length() != 24) { QMessageBox::warning(this, tr("Failed to restore wallet"), - tr("SilentDragonLite needs 24 words to restore wallet"), + tr("SilentDragonXLite needs 24 words to restore wallet"), QMessageBox::Ok); return false; } diff --git a/src/mainwindow.ui b/src/mainwindow.ui index 4a204dc..e5d592b 100644 --- a/src/mainwindow.ui +++ b/src/mainwindow.ui @@ -48,7 +48,7 @@ - SilentDragonLite + SilentDragonXLite diff --git a/src/scripts/SilentDragonLite.wxs b/src/scripts/SilentDragonLite.wxs index 7f5dc4b..ebe90ab 100644 --- a/src/scripts/SilentDragonLite.wxs +++ b/src/scripts/SilentDragonLite.wxs @@ -1,15 +1,15 @@ - + - - + + - + @@ -37,13 +37,13 @@ - + - + - @@ -55,9 +55,9 @@ - + + Name="SilentDragonXLite" WorkingDirectory="INSTALLFOLDER" Icon="SilentDragonXLite.exe" > @@ -66,10 +66,10 @@ - + - + diff --git a/src/scripts/control b/src/scripts/control index f6839b1..d2b17b4 100644 --- a/src/scripts/control +++ b/src/scripts/control @@ -1,8 +1,7 @@ -Package: SilentDragonLite +Package: SilentDragonXLite Version: RELEASE_VERSION Section: base Priority: optional Architecture: amd64 Maintainer: DenioD -Description: Silentdragonlite is a Lightwallet for hush. It comes with - full support for transparent and shielded addresses. +Description: SilentDragonXLite is a Lightwallet for Dragonx. diff --git a/src/scripts/desktopentry b/src/scripts/desktopentry index 200daee..6d78599 100644 --- a/src/scripts/desktopentry +++ b/src/scripts/desktopentry @@ -1,13 +1,13 @@ [Desktop Entry] -Name=SilentDragonLite -Comment=Lightclient UI wallet for Hush +Name=SilentDragonXLite +Comment=Lightclient UI wallet for DragonX GenericName=Wallet -Exec=/usr/local/bin/SilentDragonLite %u -Icon=SilentDragonLite.xpm +Exec=/usr/local/bin/SilentDragonXLite %u +Icon=SilentDragonXLite.xpm Type=Application StartupNotify=true -StartupWMClass=SilentDragonLite +StartupWMClass=SilentDragonXLite Categories=Utility; -MimeType=x-scheme-handler/hush; -Keywords=SilentDragonLite; +MimeType=x-scheme-handler/dragonx; +Keywords=SilentDragonXLite; diff --git a/src/scripts/dobuild.ps1 b/src/scripts/dobuild.ps1 index 7382819..71cd450 100644 --- a/src/scripts/dobuild.ps1 +++ b/src/scripts/dobuild.ps1 @@ -6,11 +6,11 @@ param ( ) Write-Host "[Initializing]" -Remove-Item -Force -ErrorAction Ignore ./artifacts/linux-binaries-silentdragonlite-v$version.tar.gz -Remove-Item -Force -ErrorAction Ignore ./artifacts/linux-deb-silentdragonlite-v$version.deb -Remove-Item -Force -ErrorAction Ignore ./artifacts/Windows-binaries-silentdragonlite-v$version.zip -Remove-Item -Force -ErrorAction Ignore ./artifacts/Windows-installer-silentdragonlite-v$version.msi -Remove-Item -Force -ErrorAction Ignore ./artifacts/macOS-silentdragonlite-v$version.dmg +Remove-Item -Force -ErrorAction Ignore ./artifacts/linux-binaries-silentdragonxlite-v$version.tar.gz +Remove-Item -Force -ErrorAction Ignore ./artifacts/linux-deb-silentdragonxlite-v$version.deb +Remove-Item -Force -ErrorAction Ignore ./artifacts/Windows-binaries-silentdragonxlite-v$version.zip +Remove-Item -Force -ErrorAction Ignore ./artifacts/Windows-installer-silentdragonxlite-v$version.msi +Remove-Item -Force -ErrorAction Ignore ./artifacts/macOS-silentdragonxlite-v$version.dmg Remove-Item -Recurse -Force -ErrorAction Ignore ./bin Remove-Item -Recurse -Force -ErrorAction Ignore ./debug @@ -26,7 +26,7 @@ Write-Host "[Building Linux + Windows]" Write-Host -NoNewline "Copying files.........." ssh $server "rm -rf /tmp/zqwbuild" ssh $server "mkdir /tmp/zqwbuild" -scp -r src/ res/ ./silentdragonlite.pro ./application.qrc ./LICENSE ./README.md ${server}:/tmp/zqwbuild/ | Out-Null +scp -r src/ res/ ./silentdragonxlite.pro ./application.qrc ./LICENSE ./README.md ${server}:/tmp/zqwbuild/ | Out-Null ssh $server "dos2unix -q /tmp/zqwbuild/src/scripts/mkrelease.sh" | Out-Null ssh $server "dos2unix -q /tmp/zqwbuild/src/version.h" Write-Host "[OK]" @@ -51,10 +51,10 @@ Write-Host "[OK]" # Finally, test to make sure all files exist Write-Host -NoNewline "Checking Build........." -if (! (Test-Path ./artifacts/linux-binaries-silentdragonlite-v$version.tar.gz) -or - ! (Test-Path ./artifacts/linux-deb-silentdragonlite-v$version.deb) -or - ! (Test-Path ./artifacts/Windows-binaries-silentdragonlite-v$version.zip) -or - ! (Test-Path ./artifacts/Windows-installer-silentdragonlite-v$version.msi) ) { +if (! (Test-Path ./artifacts/linux-binaries-silentdragonxlite-v$version.tar.gz) -or + ! (Test-Path ./artifacts/linux-deb-silentdragonxlite-v$version.deb) -or + ! (Test-Path ./artifacts/Windows-binaries-silentdragonxlite-v$version.zip) -or + ! (Test-Path ./artifacts/Windows-installer-silentdragonxlite-v$version.msi) ) { Write-Host "[Error]" exit 1; } diff --git a/src/scripts/dotranslations.sh b/src/scripts/dotranslations.sh index 5909023..ee4347f 100755 --- a/src/scripts/dotranslations.sh +++ b/src/scripts/dotranslations.sh @@ -11,7 +11,7 @@ $QT_STATIC/bin/lrelease silentdragon-lite.pro # Then update the qt base translations. First, get all languages ls res/*.qm | awk -F '[_.]' '{print $4}' | while read -r language ; do if [ -f $QT_STATIC/translations/qtbase_$language.qm ]; then - $QT_STATIC/bin/lconvert -o res/zec_$language.qm $QT_STATIC/translations/qtbase_$language.qm res/silentdragonlite_$language.qm - mv res/zec_$language.qm res/silentdragonlite_$language.qm + $QT_STATIC/bin/lconvert -o res/zec_$language.qm $QT_STATIC/translations/qtbase_$language.qm res/silentdragonxlite_$language.qm + mv res/zec_$language.qm res/silentdragonxlite_$language.qm fi done diff --git a/src/scripts/dounifiedbuild.ps1 b/src/scripts/dounifiedbuild.ps1 index 6d78db3..73675c5 100644 --- a/src/scripts/dounifiedbuild.ps1 +++ b/src/scripts/dounifiedbuild.ps1 @@ -8,11 +8,11 @@ param ( ) Write-Host "[Initializing]" -Remove-Item -Force -ErrorAction Ignore ./artifacts/linux-binaries-SilentDragonLite-v$version.tar.gz -Remove-Item -Force -ErrorAction Ignore ./artifacts/linux-deb-SilentDragonLite-v$version.deb -Remove-Item -Force -ErrorAction Ignore ./artifacts/Windows-binaries-SilentDragonLite-v$version.zip -Remove-Item -Force -ErrorAction Ignore ./artifacts/Windows-installer-SilentDragonLite-v$version.msi -Remove-Item -Force -ErrorAction Ignore ./artifacts/macOS-SilentDragonLite-v$version.dmg +Remove-Item -Force -ErrorAction Ignore ./artifacts/linux-binaries-SilentDragonXLite-v$version.tar.gz +Remove-Item -Force -ErrorAction Ignore ./artifacts/linux-deb-SilentDragonXLite-v$version.deb +Remove-Item -Force -ErrorAction Ignore ./artifacts/Windows-binaries-SilentDragonXLite-v$version.zip +Remove-Item -Force -ErrorAction Ignore ./artifacts/Windows-installer-SilentDragonXLite-v$version.msi +Remove-Item -Force -ErrorAction Ignore ./artifacts/macOS-SilentDragonXLite-v$version.dmg Remove-Item -Force -ErrorAction Ignore ./artifacts/signatures-v$version.tar.gz @@ -89,11 +89,11 @@ Write-Host "[OK]" # Finally, test to make sure all files exist Write-Host -NoNewline "Checking Build........." -if (! (Test-Path ./artifacts/linux-binaries-SilentDragonLite-v$version.tar.gz) -or - ! (Test-Path ./artifacts/linux-deb-SilentDragonLite-v$version.deb) -or - ! (Test-Path ./artifacts/Windows-binaries-SilentDragonLite-v$version.zip) -or - ! (Test-Path ./artifacts/macOS-SilentDragonLite-v$version.dmg) -or - ! (Test-Path ./artifacts/Windows-installer-SilentDragonLite-v$version.msi) ) { +if (! (Test-Path ./artifacts/linux-binaries-SilentDragonXLite-v$version.tar.gz) -or + ! (Test-Path ./artifacts/linux-deb-SilentDragonXLite-v$version.deb) -or + ! (Test-Path ./artifacts/Windows-binaries-SilentDragonXLite-v$version.zip) -or + ! (Test-Path ./artifacts/macOS-SilentDragonXLite-v$version.dmg) -or + ! (Test-Path ./artifacts/Windows-installer-SilentDragonXLite-v$version.msi) ) { Write-Host "[Error]" exit 1; } diff --git a/src/scripts/mkmacdmg.sh b/src/scripts/mkmacdmg.sh index 29c27ab..1b8e427 100755 --- a/src/scripts/mkmacdmg.sh +++ b/src/scripts/mkmacdmg.sh @@ -75,7 +75,7 @@ export PATH=$PATH:/usr/local/bin #Clean echo -n "Cleaning..............." make distclean >/dev/null 2>&1 -rm -f artifacts/macOS-SilentDragonLite-v$APP_VERSION.dmg +rm -f artifacts/macOS-SilentDragonXLite-v$APP_VERSION.dmg echo "[OK]" @@ -93,18 +93,18 @@ echo "[OK]" #Qt deploy echo -n "Deploying.............." mkdir artifacts >/dev/null 2>&1 -rm -f artifcats/SilentDragonLite.dmg >/dev/null 2>&1 +rm -f artifcats/SilentDragonXLite.dmg >/dev/null 2>&1 rm -f artifacts/rw* >/dev/null 2>&1 -$QT_PATH/bin/macdeployqt SilentDragonLite.app -codesign --deep --force --verify --verbose -s "$CERTIFICATE" --options runtime --timestamp SilentDragonLite.app +$QT_PATH/bin/macdeployqt SilentDragonXLite.app +codesign --deep --force --verify --verbose -s "$CERTIFICATE" --options runtime --timestamp SilentDragonXLite.app echo "[OK]" echo -n "Building dmg..........." -mv SilentDragonLite.app SilentDragonLite.app -create-dmg --volname "SilentDragonLite-v$APP_VERSION" --volicon "res/logo.icns" --window-pos 200 120 --icon "SilentDragonLite.app" 200 190 --icon-size 100 --app-drop-link 600 185 --hide-extension "SilentDragonLite.app" --window-size 800 400 --hdiutil-quiet --background res/dmgbg.png artifacts/macOS-SilentDragonLite-v$APP_VERSION.dmg SilentDragonLite.app >/dev/null 2>&1 +mv SilentDragonXLite.app SilentDragonXLite.app +create-dmg --volname "SilentDragonXLite-v$APP_VERSION" --volicon "res/logo.icns" --window-pos 200 120 --icon "SilentDragonXLite.app" 200 190 --icon-size 100 --app-drop-link 600 185 --hide-extension "SilentDragonXLite.app" --window-size 800 400 --hdiutil-quiet --background res/dmgbg.png artifacts/macOS-SilentDragonXLite-v$APP_VERSION.dmg SilentDragonXLite.app >/dev/null 2>&1 -if [ ! -f artifacts/macOS-SilentDragonLite-v$APP_VERSION.dmg ]; then +if [ ! -f artifacts/macOS-SilentDragonXLite-v$APP_VERSION.dmg ]; then echo "[ERROR]" exit 1 fi @@ -112,5 +112,5 @@ echo "[OK]" # Submit to Apple for notarization echo -n "Apple notarization....." -xcrun altool --notarize-app -t osx -f artifacts/macOS-SilentDragonLite-v$APP_VERSION.dmg --primary-bundle-id="com.MyHush.SilentDragonLite" -u "$APPLE_USERNAME" -p "$APPLE_PASSWORD" +xcrun altool --notarize-app -t osx -f artifacts/macOS-SilentDragonXLite-v$APP_VERSION.dmg --primary-bundle-id="com.MyHush.SilentDragonXLite" -u "$APPLE_USERNAME" -p "$APPLE_PASSWORD" echo "[OK]" diff --git a/src/scripts/mkrelease.sh b/src/scripts/mkrelease.sh index 1a965df..a23bb32 100755 --- a/src/scripts/mkrelease.sh +++ b/src/scripts/mkrelease.sh @@ -31,7 +31,7 @@ echo "[OK]" echo -n "Building..............." -rm -rf bin/SilentDragonLite* > /dev/null +rm -rf bin/SilentDragonXLite* > /dev/null # Build the lib first cd lib && make release && cd .. make -j$(nproc) > /dev/null @@ -49,7 +49,7 @@ echo "[OK]" # Test for Qt echo -n "Static link............" -if [[ $(ldd SilentDragonLite | grep -i "Qt") ]]; then +if [[ $(ldd SilentDragonXLite | grep -i "Qt") ]]; then echo "FOUND QT; ABORT"; exit 1 fi @@ -57,25 +57,25 @@ echo "[OK]" echo -n "Packaging.............." -mkdir bin/SilentDragonLite-v$APP_VERSION > /dev/null -strip SilentDragonLite +mkdir bin/SilentDragonXLite-v$APP_VERSION > /dev/null +strip SilentDragonXLite -cp SilentDragonLite bin/SilentDragonLite-v$APP_VERSION > /dev/null -cp README.md bin/SilentDragonLite-v$APP_VERSION > /dev/null -cp LICENSE bin/SilentDragonLite-v$APP_VERSION > /dev/null +cp SilentDragonXLite bin/SilentDragonXLite-v$APP_VERSION > /dev/null +cp README.md bin/SilentDragonXLite-v$APP_VERSION > /dev/null +cp LICENSE bin/SilentDragonXLite-v$APP_VERSION > /dev/null -cd bin && tar czf linux-SilentDragonLite-v$APP_VERSION.tar.gz SilentDragonLite-v$APP_VERSION/ > /dev/null +cd bin && tar czf linux-SilentDragonXLite-v$APP_VERSION.tar.gz SilentDragonXLite-v$APP_VERSION/ > /dev/null cd .. mkdir artifacts >/dev/null 2>&1 -cp bin/linux-SilentDragonLite-v$APP_VERSION.tar.gz ./artifacts/linux-binaries-SilentDragonLite-v$APP_VERSION.tar.gz +cp bin/linux-SilentDragonXLite-v$APP_VERSION.tar.gz ./artifacts/linux-binaries-SilentDragonXLite-v$APP_VERSION.tar.gz echo "[OK]" -if [ -f artifacts/linux-binaries-SilentDragonLite-v$APP_VERSION.tar.gz ] ; then +if [ -f artifacts/linux-binaries-SilentDragonXLite-v$APP_VERSION.tar.gz ] ; then echo -n "Package contents......." # Test if the package is built OK - if tar tf "artifacts/linux-binaries-SilentDragonLite-v$APP_VERSION.tar.gz" | wc -l | grep -q "4"; then + if tar tf "artifacts/linux-binaries-SilentDragonXLite-v$APP_VERSION.tar.gz" | wc -l | grep -q "4"; then echo "[OK]" else echo "[ERROR]" @@ -87,23 +87,23 @@ else fi echo -n "Building deb..........." -debdir=bin/deb/SilentDragonLite-v$APP_VERSION +debdir=bin/deb/SilentDragonXLite-v$APP_VERSION mkdir -p $debdir > /dev/null mkdir $debdir/DEBIAN mkdir -p $debdir/usr/local/bin cat src/scripts/control | sed "s/RELEASE_VERSION/$APP_VERSION/g" > $debdir/DEBIAN/control -cp SilentDragonLite $debdir/usr/local/bin/ +cp SilentDragonXLite $debdir/usr/local/bin/ mkdir -p $debdir/usr/share/pixmaps/ -cp res/SilentDragonLite.xpm $debdir/usr/share/pixmaps/ +cp res/SilentDragonXLite.xpm $debdir/usr/share/pixmaps/ mkdir -p $debdir/usr/share/applications -cp src/scripts/desktopentry $debdir/usr/share/applications/SilentDragonLite.desktop +cp src/scripts/desktopentry $debdir/usr/share/applications/SilentDragonXLite.desktop dpkg-deb --build $debdir >/dev/null -cp $debdir.deb artifacts/linux-deb-SilentDragonLite-v$APP_VERSION.deb +cp $debdir.deb artifacts/linux-deb-SilentDragonXLite-v$APP_VERSION.deb echo "[OK]" @@ -121,11 +121,11 @@ export PATH=$MXE_PATH:$PATH echo -n "Configuring............" make clean > /dev/null -#rm -f SilentDragonLite-mingw.pro +#rm -f SilentDragonXLite-mingw.pro rm -rf release/ cp src/precompiled.h release/ #Mingw seems to have trouble with precompiled headers, so strip that option from the .pro file -#cat silentdragon-lite.pro | sed "s/precompile_header/release/g" | sed "s/PRECOMPILED_HEADER.*//g" > SilentDragonLite-mingw.pro +#cat silentdragon-lite.pro | sed "s/precompile_header/release/g" | sed "s/PRECOMPILED_HEADER.*//g" > SilentDragonXLite-mingw.pro echo "[OK]" @@ -141,20 +141,20 @@ echo "[OK]" echo -n "Packaging.............." -mkdir release/SilentDragonLite-v$APP_VERSION -cp release/SilentDragonLite.exe release/SilentDragonLite-v$APP_VERSION -cp README.md release/SilentDragonLite-v$APP_VERSION -cp LICENSE release/SilentDragonLite-v$APP_VERSION -cd release && zip -r Windows-binaries-SilentDragonLite-v$APP_VERSION.zip SilentDragonLite-v$APP_VERSION/ > /dev/null +mkdir release/SilentDragonXLite-v$APP_VERSION +cp release/SilentDragonXLite.exe release/SilentDragonXLite-v$APP_VERSION +cp README.md release/SilentDragonXLite-v$APP_VERSION +cp LICENSE release/SilentDragonXLite-v$APP_VERSION +cd release && zip -r Windows-binaries-SilentDragonXLite-v$APP_VERSION.zip SilentDragonXLite-v$APP_VERSION/ > /dev/null cd .. mkdir artifacts >/dev/null 2>&1 -cp release/Windows-binaries-SilentDragonLite-v$APP_VERSION.zip ./artifacts/ +cp release/Windows-binaries-SilentDragonXLite-v$APP_VERSION.zip ./artifacts/ echo "[OK]" -if [ -f artifacts/Windows-binaries-SilentDragonLite-v$APP_VERSION.zip ] ; then +if [ -f artifacts/Windows-binaries-SilentDragonXLite-v$APP_VERSION.zip ] ; then echo -n "Package contents......." - if unzip -l "artifacts/Windows-binaries-SilentDragonLite-v$APP_VERSION.zip" | wc -l | grep -q "9"; then + if unzip -l "artifacts/Windows-binaries-SilentDragonXLite-v$APP_VERSION.zip" | wc -l | grep -q "9"; then echo "[OK]" else echo "[ERROR]" diff --git a/src/scripts/mkwininstaller.ps1 b/src/scripts/mkwininstaller.ps1 index fa4ef45..1bfd1fc 100644 --- a/src/scripts/mkwininstaller.ps1 +++ b/src/scripts/mkwininstaller.ps1 @@ -2,25 +2,25 @@ param ( [Parameter(Mandatory=$true)][string]$version ) -$target="SilentDragonLite-v$version" +$target="SilentDragonXLite-v$version" Remove-Item -Path release/wininstaller -Recurse -ErrorAction Ignore | Out-Null New-Item release/wininstaller -itemtype directory | Out-Null -Copy-Item release/$target/SilentDragonLite.exe release/wininstaller/ +Copy-Item release/$target/SilentDragonXLite.exe release/wininstaller/ Copy-Item release/$target/LICENSE release/wininstaller/ -Get-Content src/scripts/silentdragonlite.wxs | ForEach-Object { $_ -replace "RELEASE_VERSION", "$version" } | Out-File -Encoding utf8 release/wininstaller/silentdragonlite.wxs +Get-Content src/scripts/silentdragonxlite.wxs | ForEach-Object { $_ -replace "RELEASE_VERSION", "$version" } | Out-File -Encoding utf8 release/wininstaller/silentdragonxlite.wxs -candle.exe release/wininstaller/silentdragonlite.wxs -o release/wininstaller/silentdragonlite.wixobj +candle.exe release/wininstaller/silentdragonxlite.wxs -o release/wininstaller/silentdragonxlite.wixobj if (!$?) { exit 1; } -light.exe -ext WixUIExtension -cultures:en-us release/wininstaller/SilentDragonLite.wixobj -out release/wininstaller/SilentDragonLite.msi +light.exe -ext WixUIExtension -cultures:en-us release/wininstaller/SilentDragonXLite.wixobj -out release/wininstaller/SilentDragonXLite.msi if (!$?) { exit 1; } New-Item artifacts -itemtype directory -Force | Out-Null -Copy-Item release/wininstaller/SilentDragonLite.msi ./artifacts/Windows-installer-$target.msi +Copy-Item release/wininstaller/SilentDragonXLite.msi ./artifacts/Windows-installer-$target.msi diff --git a/src/scripts/signbinaries.sh b/src/scripts/signbinaries.sh index 027d100..e5a5036 100755 --- a/src/scripts/signbinaries.sh +++ b/src/scripts/signbinaries.sh @@ -27,7 +27,7 @@ rm -rf release/signatures mkdir -p release/signatures # Staple the notarization -xcrun stapler staple artifacts/macOS-SilentDragonLite-v$APP_VERSION.dmg +xcrun stapler staple artifacts/macOS-SilentDragonXLite-v$APP_VERSION.dmg cd artifacts @@ -38,7 +38,7 @@ rm -f signatures-v$APP_VERSION.tar.gz # sha256sum the binaries sha256sum *$APP_VERSION* > sha256sum-v$APP_VERSION.txt -for i in $( ls *SilentDragonLite-v$APP_VERSION* sha256sum-v$APP_VERSION* ); do +for i in $( ls *SilentDragonXLite-v$APP_VERSION* sha256sum-v$APP_VERSION* ); do echo "Signing" $i gpg --batch --output ../release/signatures/$i.sig --detach-sig $i done diff --git a/src/scripts/translation_analysis.sh b/src/scripts/translation_analysis.sh index 92ef7b1..3a0af60 100755 --- a/src/scripts/translation_analysis.sh +++ b/src/scripts/translation_analysis.sh @@ -1,19 +1,19 @@ #!/bin/bash -echo -n AR: ;grep unfinished silentdragonlite_ar.ts | wc -l -echo -n BE: ;grep unfinished silentdragonlite_be.ts | wc -l -echo -n DE: ;grep unfinished silentdragonlite_de.ts | wc -l -echo -n ES: ;grep unfinished silentdragonlite_es.ts | wc -l -echo -n FA: ;grep unfinished silentdragonlite_fa.ts | wc -l -echo -n FR: ;grep unfinished silentdragonlite_fr.ts | wc -l -echo -n HR: ;grep unfinished silentdragonlite_hr.ts | wc -l -echo -n ID: ;grep unfinished silentdragonlite_id.ts | wc -l -echo -n IT: ;grep unfinished silentdragonlite_it.ts | wc -l -echo -n NL: ;grep unfinished silentdragonlite_nl.ts | wc -l -echo -n PT: ;grep unfinished silentdragonlite_pt.ts | wc -l -echo -n RO: ;grep unfinished silentdragonlite_ro.ts | wc -l -echo -n RU: ;grep unfinished silentdragonlite_ru.ts | wc -l -echo -n SR: ;grep unfinished silentdragonlite_sr.ts | wc -l -echo -n TR: ;grep unfinished silentdragonlite_tr.ts | wc -l -echo -n UD: ;grep unfinished silentdragonlite_ud.ts | wc -l -echo -n ZH: ;grep unfinished silentdragonlite_zh.ts | wc -l +echo -n AR: ;grep unfinished silentdragonxlite_ar.ts | wc -l +echo -n BE: ;grep unfinished silentdragonxlite_be.ts | wc -l +echo -n DE: ;grep unfinished silentdragonxlite_de.ts | wc -l +echo -n ES: ;grep unfinished silentdragonxlite_es.ts | wc -l +echo -n FA: ;grep unfinished silentdragonxlite_fa.ts | wc -l +echo -n FR: ;grep unfinished silentdragonxlite_fr.ts | wc -l +echo -n HR: ;grep unfinished silentdragonxlite_hr.ts | wc -l +echo -n ID: ;grep unfinished silentdragonxlite_id.ts | wc -l +echo -n IT: ;grep unfinished silentdragonxlite_it.ts | wc -l +echo -n NL: ;grep unfinished silentdragonxlite_nl.ts | wc -l +echo -n PT: ;grep unfinished silentdragonxlite_pt.ts | wc -l +echo -n RO: ;grep unfinished silentdragonxlite_ro.ts | wc -l +echo -n RU: ;grep unfinished silentdragonxlite_ru.ts | wc -l +echo -n SR: ;grep unfinished silentdragonxlite_sr.ts | wc -l +echo -n TR: ;grep unfinished silentdragonxlite_tr.ts | wc -l +echo -n UD: ;grep unfinished silentdragonxlite_ud.ts | wc -l +echo -n ZH: ;grep unfinished silentdragonxlite_zh.ts | wc -l diff --git a/src/sendtab.cpp b/src/sendtab.cpp index 96153d8..db62db9 100644 --- a/src/sendtab.cpp +++ b/src/sendtab.cpp @@ -861,8 +861,8 @@ void MainWindow::sendButton() { auto d = new QDialog(this); auto connD = new Ui_ConnectionDialog(); connD->setupUi(d); - QMovie *movie1 = new QMovie(":/img/res/silentdragonlite-animated-startup-dark.gif");; - QMovie *movie2 = new QMovie(":/img/res/silentdragonlite-animated-startup-dark.gif");; + QMovie *movie1 = new QMovie(":/img/res/silentdragonxlite-animated-startup-dark.gif");; + QMovie *movie2 = new QMovie(":/img/res/silentdragonxlite-animated-startup-dark.gif");; auto theme = Settings::getInstance()->get_theme_name(); if (theme == "Dark" || theme == "Midnight") { movie2->setScaledSize(QSize(512,512)); diff --git a/src/settings.cpp b/src/settings.cpp index fde0471..ff545a6 100644 --- a/src/settings.cpp +++ b/src/settings.cpp @@ -3,7 +3,7 @@ #include "mainwindow.h" #include "settings.h" #include "camount.h" -#include "../lib/silentdragonlitelib.h" +#include "../lib/silentdragonxlitelib.h" #include Settings* Settings::instance = nullptr; diff --git a/util/SilentDragonLite.desktop b/util/SilentDragonLite.desktop index 24b5b3d..7606017 100644 --- a/util/SilentDragonLite.desktop +++ b/util/SilentDragonLite.desktop @@ -1,9 +1,9 @@ [Desktop Entry] Version=1.0 -Name=SilentDragonLite +Name=SilentDragonXLite Comment=Lite wallet for HUSH cryptocurrency -Exec=/home/user/SilentDragonLite/SilentDragonLite -Icon=/home/user/SilentDragonLite/res/SDLogo.png +Exec=/home/user/SilentDragonXLite/SilentDragonXLite +Icon=/home/user/SilentDragonXLite/res/SDLogo.png Terminal=false Type=Application Categories=Network; diff --git a/util/add-linux-icons.sh b/util/add-linux-icons.sh index 7fed756..75dd245 100755 --- a/util/add-linux-icons.sh +++ b/util/add-linux-icons.sh @@ -2,5 +2,5 @@ # Copyright 2019-2024 The Hush Developers username=$(id -un) -sed -i "s|\/home\/.*\/SilentDragonLite\/|\/home\/$username\/SilentDragonLite\/|g" SilentDragonLite.desktop -cp SilentDragonLite.desktop ~/.local/share/applications +sed -i "s|\/home\/.*\/SilentDragonXLite\/|\/home\/$username\/SilentDragonXLite\/|g" SilentDragonXLite.desktop +cp SilentDragonXLite.desktop ~/.local/share/applications diff --git a/util/install.sh b/util/install.sh index 8107b10..95c6ea0 100755 --- a/util/install.sh +++ b/util/install.sh @@ -5,6 +5,6 @@ cd ../ && ./build.sh linguist && ./build.sh username=$(id -un) -cd util/ && sed -i "s|\/home\/.*\/SilentDragonLite\/|\/home\/$username\/SilentDragonLite\/|g" SilentDragonLite.desktop +cd util/ && sed -i "s|\/home\/.*\/SilentDragonXLite\/|\/home\/$username\/SilentDragonXLite\/|g" SilentDragonXLite.desktop -cp SilentDragonLite.desktop ~/.local/share/applications +cp SilentDragonXLite.desktop ~/.local/share/applications diff --git a/win-static-build.sh b/win-static-build.sh index db587a3..16ff3de 100755 --- a/win-static-build.sh +++ b/win-static-build.sh @@ -2,7 +2,7 @@ # Copyright 2019-2024 The Hush Developers VERSION=$(cat src/version.h |cut -d\" -f2) -echo "Compiling SilentDragonLite $VERSION .exe with $JOBS threads..." +echo "Compiling SilentDragonXLite $VERSION .exe with $JOBS threads..." CONF=silentdragon-lite.pro set -e