DragonX/SilentDragonXLite
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Search/replace for dragonx

Browse Source
This commit is contained in:
fekt
2024-04-10 21:10:50 -04:00
parent 9ec9c8a68f
commit e1e0ac79cb
86 changed files with 253 additions and 259 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/chatmodel.cpp
View File

@@ -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));

12
src/connection.cpp
View File

@@ -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 <QThreadPool>
#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);

12
src/controller.cpp
View File

@@ -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"));
}

2
src/deposithush.ui
View File

@@ -87,7 +87,7 @@ hr { height: 1px; border-width: 0; }
li.unchecked::marker { content: &quot;\2610&quot;; }
li.checked::marker { content: &quot;\2612&quot;; }
&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'.AppleSystemUIFont'; font-size:13pt; font-weight:400; font-style:normal;&quot;&gt;
&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:16pt;&quot;&gt;Please use the following hush address to transfer funds to SilentDragonLite. You can either copy the address or use the QR Code. &lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:16pt;&quot;&gt;Please use the following hush address to transfer funds to SilentDragonXLite. You can either copy the address or use the QR Code. &lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
</widget>
</item>

22
src/firsttimewizard.cpp
View File

@@ -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;
}

6
src/main.cpp
View File

@@ -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) {

24
src/mainwindow.cpp
View File

@@ -33,7 +33,7 @@
#include "Crypto/FileEncryption.h"
#include "DataStore/DataStore.h"
#include "firsttimewizard.h"
#include "../lib/silentdragonlitelib.h"
#include "../lib/silentdragonxlitelib.h"
#include <QCoreApplication>
#include <QGuiApplication>
#include <QKeyEvent>
@@ -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;
}

2
src/mainwindow.ui
View File

@@ -48,7 +48,7 @@
</palette>
</property>
<property name="windowTitle">
<string>SilentDragonLite</string>
<string>SilentDragonXLite</string>
</property>
<property name="windowIcon">
<iconset resource="../application.qrc">

22
src/scripts/SilentDragonLite.wxs
View File

@@ -1,15 +1,15 @@
<?xml version="1.0" encoding="utf-8"?>
<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
<Product Id="*" Name="SilentDragonLite vRELEASE_VERSION" Language="1033" Version="RELEASE_VERSION" Manufacturer="silentdragonlite-org" UpgradeCode="fb9bf166-b55f-46b5-a990-9189bdf64533">
<Product Id="*" Name="SilentDragonXLite vRELEASE_VERSION" Language="1033" Version="RELEASE_VERSION" Manufacturer="silentdragonxlite-org" UpgradeCode="fb9bf166-b55f-46b5-a990-9189bdf64533">
<Package InstallerVersion="200" Compressed="yes" InstallScope="perMachine" />
<MajorUpgrade DowngradeErrorMessage="A newer version of [ProductName] is already installed." />
<MediaTemplate EmbedCab="yes"/>
<Icon Id="SilentDragonLite.exe" SourceFile="res/icon.ico"/>
<Property Id="ARPPRODUCTICON" Value="SilentDragonLite.exe" />
<Icon Id="SilentDragonXLite.exe" SourceFile="res/icon.ico"/>
<Property Id="ARPPRODUCTICON" Value="SilentDragonXLite.exe" />
<Feature Id="ProductFeature" Title="silentdragonlite" Level="1">
<Feature Id="ProductFeature" Title="silentdragonxlite" Level="1">
<ComponentGroupRef Id="ProductComponents" />
<ComponentRef Id="ProgramMenuDir"/>
</Feature>
@@ -37,13 +37,13 @@
<Fragment>
<Directory Id="TARGETDIR" Name="SourceDir">
<Directory Id="ProgramFilesFolder">
<Directory Id="INSTALLFOLDER" Name="silentdragonlite" />
<Directory Id="INSTALLFOLDER" Name="silentdragonxlite" />
</Directory>
<Directory Id="ProgramMenuFolder" Name="Programs">
<Directory Id="ApplicationProgramsFolder" Name="silentdragonlite">
<Directory Id="ApplicationProgramsFolder" Name="silentdragonxlite">
<Component Id="ProgramMenuDir" Guid="0D560F5A-53E0-4E7E-ADDA-15A26995505E">
<RemoveFolder Id="ProgramMenuDir" On="uninstall"/>
<RegistryValue Root="HKCU" Key="Software\[Manufacturer]\silentdragonlite\WixSetup"
<RegistryValue Root="HKCU" Key="Software\[Manufacturer]\silentdragonxlite\WixSetup"
Type="integer" Value="1" Name="installed" KeyPath="yes" />
</Component>
</Directory>
@@ -55,9 +55,9 @@
<Fragment>
<ComponentGroup Id="ProductComponents" Directory="INSTALLFOLDER">
<Component Id="ProductComponent" Guid="0D210F5A-53E0-4E7E-CAAD-15A26995505E">
<File Source="SilentDragonLite.exe" KeyPath="yes">
<File Source="SilentDragonXLite.exe" KeyPath="yes">
<Shortcut Id="startMenuShotcut" Advertise="yes" Directory="ApplicationProgramsFolder"
Name="SilentDragonLite" WorkingDirectory="INSTALLFOLDER" Icon="SilentDragonLite.exe" >
Name="SilentDragonXLite" WorkingDirectory="INSTALLFOLDER" Icon="SilentDragonXLite.exe" >
</Shortcut>
</File>
<File Source="LICENSE" />
@@ -66,10 +66,10 @@
<RegistryValue Type="string" Name="URL Protocol" Value=""/>
<RegistryValue Type="string" Value="URL:hush URI protocol"/>
<RegistryKey Key="DefaultIcon">
<RegistryValue Type="string" Value="SilentDragonLite.exe" />
<RegistryValue Type="string" Value="SilentDragonXLite.exe" />
</RegistryKey>
<RegistryKey Key="shell\open\command">
<RegistryValue Type="string" Value="&quot;[INSTALLFOLDER]SilentDragonLite.exe&quot; &quot;%1&quot;" />
<RegistryValue Type="string" Value="&quot;[INSTALLFOLDER]SilentDragonXLite.exe&quot; &quot;%1&quot;" />
</RegistryKey>
</RegistryKey>
</Component>

5
src/scripts/control
View File

@@ -1,8 +1,7 @@
Package: SilentDragonLite
Package: SilentDragonXLite
Version: RELEASE_VERSION
Section: base
Priority: optional
Architecture: amd64
Maintainer: DenioD <admin@hush-lightwallet.de>
Description: Silentdragonlite is a Lightwallet for hush. It comes with
full support for transparent and shielded addresses.
Description: SilentDragonXLite is a Lightwallet for Dragonx.

14
src/scripts/desktopentry
View File

@@ -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;

20
src/scripts/dobuild.ps1
View File

@@ -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;
}

4
src/scripts/dotranslations.sh
View File

@@ -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

20
src/scripts/dounifiedbuild.ps1
View File

@@ -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;
}

16
src/scripts/mkmacdmg.sh
View File

@@ -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]"

52
src/scripts/mkrelease.sh
View File

@@ -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]"

12
src/scripts/mkwininstaller.ps1
View File

@@ -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

4
src/scripts/signbinaries.sh
View File

@@ -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

34
src/scripts/translation_analysis.sh
View File

@@ -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

4
src/sendtab.cpp
View File

@@ -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));

2
src/settings.cpp
View File

@@ -3,7 +3,7 @@
#include "mainwindow.h"
#include "settings.h"
#include "camount.h"
#include "../lib/silentdragonlitelib.h"
#include "../lib/silentdragonxlitelib.h"
#include <QUrlQuery>
Settings* Settings::instance = nullptr;