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

more branding and updates

Browse Source
This commit is contained in:
DenioD
2019-10-24 02:25:58 +02:00
parent 748a4a63db
commit 97b7cad8fc
8 changed files with 56 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/controller.cpp
View File

@@ -434,7 +434,7 @@ void Controller::checkForUpdate(bool silent) {
if (!zrpc->haveConnection())
return noConnection();
QUrl cmcURL("https://api.github.com/repos/hushFoundation/silentdragon/releases");
QUrl cmcURL("https://api.github.com/repos/MyHush/silentdragon/releases");
QNetworkRequest req;
req.setUrl(cmcURL);
@@ -482,7 +482,7 @@ void Controller::checkForUpdate(bool silent) {
.arg(currentVersion.toString()),
QMessageBox::Yes, QMessageBox::Cancel);
if (ans == QMessageBox::Yes) {
QDesktopServices::openUrl(QUrl("https://github.com/hushFoundation/silentdragon/releases"));
QDesktopServices::openUrl(QUrl("https://github.com/MyHush/SilentDragonLite/releases"));
} else {
// If the user selects cancel, don't bother them again for this version
s.setValue("update/lastversion", maxVersion.toString());
@@ -508,7 +508,7 @@ void Controller::refreshhushPrice() {
if (!zrpc->haveConnection())
return noConnection();
QUrl cmcURL("https://api.coinmarketcap.com/v1/ticker/");
QUrl cmcURL("https://api.coingecko.com/api/v3/simple/price?ids=hush&vs_currencies=btc%2Cusd%2Ceur&include_market_cap=true&include_24hr_vol=true&include_24hr_change=true");
QNetworkRequest req;
req.setUrl(cmcURL);

4
src/mainwindow.cpp
View File

@@ -121,8 +121,8 @@ MainWindow::MainWindow(QWidget *parent) :
// The hushd tab is hidden by default, and only later added in if the embedded hushd is started
hushdtab = ui->tabWidget->widget(4);
ui->tabWidget->removeTab(4);
//hushdtab = ui->tabWidget->widget(4);
//ui->tabWidget->removeTab(4);
setupSendTab();
setupTransactionsTab();

2
src/recurring.cpp
View File

@@ -575,7 +575,7 @@ void Recurring::showRecurringDialog(MainWindow* parent) {
if (Settings::getInstance()->isTestnet()) {
url = "https://explorer.testnet.z.cash/tx/" + txid;
} else {
url = "https://explorer.zcha.in/transactions/" + txid;
url = "https://hush3.komodod.com/transactions/" + txid;
}
QDesktopServices::openUrl(QUrl(url));
});

3
src/settings.cpp
View File

@@ -107,8 +107,7 @@ void Settings::setBlockNumber(int number) {
}
bool Settings::isSaplingActive() {
return (isTestnet() && getBlockNumber() > 1) ||
(!isTestnet() && getBlockNumber() > 1);
return (isTestnet() && getBlockNumber() > 0) || (!isTestnet() && getBlockNumber() > 0);
}
double Settings::gethushPrice() {

6
src/settings.h
View File

@@ -121,9 +121,9 @@ public:
static const QString labelRegExp;
static const int updateSpeed = 10 * 1000; // 10 sec
static const int quickUpdateSpeed = 3 * 1000; // 3 sec
static const int priceRefreshSpeed = 15 * 60 * 1000; // 15 mins
static const int updateSpeed = 20 * 1000; // 10 sec
static const int quickUpdateSpeed = 5 * 1000; // 3 sec
static const int priceRefreshSpeed = 60 * 60 * 1000; // 15 mins
private:
// This class can only be accessed through Settings::getInstance()