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

Stuff

Browse Source
This commit is contained in:
Duke Leto
2021-01-02 12:27:34 -05:00
parent bfac16dd11
commit 3b75b37b81
10 changed files with 39 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/controller.cpp
View File

@@ -89,9 +89,10 @@ void Controller::setConnection(Connection* c)
ui->statusBar->showMessage("");
// If we're allowed to get the Hush Price, get the prices
if (Settings::getInstance()->getAllowFetchPrices())
if (Settings::getInstance()->getAllowFetchPrices()) {
refreshZECPrice();
supplyUpdate();
}
// If we're allowed to check for updates, check for a new release
if (Settings::getInstance()->getCheckForUpdates())
@@ -688,23 +689,21 @@ void Controller::supplyUpdate() {
// Get the total supply and render it with thousand decimal
zrpc->fetchSupply([=] (const json& reply) {
int supply = reply["supply"].get<json::number_integer_t>();
int zfunds = reply["zfunds"].get<json::number_integer_t>();
int total = reply["total"].get<json::number_integer_t>();;
int zfunds = reply["zfunds"].get<json::number_integer_t>();
int total = reply["total"].get<json::number_integer_t>();;
if (
Settings::getInstance()->get_currency_name() == "EUR" ||
Settings::getInstance()->get_currency_name() == "CHF" ||
Settings::getInstance()->get_currency_name() == "RUB"
)
{
ui->supply_taddr->setText((QLocale(QLocale::German).toString(supply)+ " Hush"));
ui->supply_zaddr->setText((QLocale(QLocale::German).toString(zfunds)+ " Hush"));
ui->supply_total->setText((QLocale(QLocale::German).toString(total)+ " Hush"));
}
else
{
ui->supply_taddr->setText("Hush " + (QLocale(QLocale::English).toString(supply)));
ui->supply_zaddr->setText("Hush " +(QLocale(QLocale::English).toString(zfunds)));
ui->supply_total->setText("Hush " +(QLocale(QLocale::English).toString(total)));
ui->supply_taddr->setText((QLocale(QLocale::German).toString(supply)+ " HUSH"));
ui->supply_zaddr->setText((QLocale(QLocale::German).toString(zfunds)+ " HUSH"));
ui->supply_total->setText((QLocale(QLocale::German).toString(total)+ " HUSH"));
} else {
ui->supply_taddr->setText("HUSH " + (QLocale(QLocale::English).toString(supply)));
ui->supply_zaddr->setText("HUSH " +(QLocale(QLocale::English).toString(zfunds)));
ui->supply_total->setText("HUSH " +(QLocale(QLocale::English).toString(total)));
}
});

14
src/mainwindow.cpp
View File

@@ -111,7 +111,7 @@ MainWindow::MainWindow(QWidget *parent) :
// Set up Feedback action
QObject::connect(ui->actionDonate, &QAction::triggered, this, &MainWindow::donate);
QObject::connect(ui->actionDiscord, &QAction::triggered, this, &MainWindow::discord);
QObject::connect(ui->actionDiscord, &QAction::triggered, this, &MainWindow::telegram);
QObject::connect(ui->actionWebsite, &QAction::triggered, this, &MainWindow::website);
@@ -780,7 +780,7 @@ void MainWindow::setupStatusBar() {
});
menu.addAction(tr("Copy block explorer link"), [=]() {
// auto explorer = Settings::getInstance()->getExplorer();
QGuiApplication::clipboard()->setText("https://explorer.myhush.org/tx/" + txid);
QGuiApplication::clipboard()->setText("https://explorer.hush.is/tx/" + txid);
});
menu.addAction(tr("View tx on block explorer"), [=]() {
@@ -852,7 +852,7 @@ void MainWindow::setupSettingsModal() {
settings.chkFetchPrices->setChecked(Settings::getInstance()->getAllowFetchPrices());
// List of default servers
settings.cmbServer->addItem("https://lite.myhush.org");
settings.cmbServer->addItem("https://lite.hush.is");
settings.cmbServer->addItem("6onaaujm4ozaokzu.onion:80");
@@ -906,13 +906,13 @@ void MainWindow::addressBook() {
AddressBook::open(this);
}
void MainWindow::discord() {
QString url = "https://myhush.org/discord/";
void MainWindow::telegram() {
QString url = "https://hush.is/telegram/";
QDesktopServices::openUrl(QUrl(url));
}
void MainWindow::website() {
QString url = "https://myhush.org";
QString url = "https://hush.is";
QDesktopServices::openUrl(QUrl(url));
}
@@ -1429,7 +1429,7 @@ void MainWindow::setupTransactionsTab() {
}
menu.addAction(tr("Copy block explorer link"), [=]() {
// auto explorer = Settings::getInstance()->getExplorer();
QGuiApplication::clipboard()->setText("https://explorer.myhush.org/tx/" + txid);
QGuiApplication::clipboard()->setText("https://explorer.hush.is/tx/" + txid);
});
menu.addAction(tr("View on block explorer"), [=] () {

2
src/mainwindow.h
View File

@@ -180,7 +180,7 @@ private:
void setMemoEnabled(int number, bool enabled);
void donate();
void discord();
void telegram();
void website();
void addressBook();
void importPrivKey();

17
src/settings.cpp
View File

@@ -264,27 +264,16 @@ void Settings::saveRestoreTableHeader(QTableView* table, QDialog* d, QString tab
}
QString Settings::getDefaultServer() {
return "https://lite.myhush.org";
return "https://lite.hush.is";
}
void Settings::openAddressInExplorer(QString address) {
QString url;
if (Settings::getInstance()->isTestnet()) {
url = "https://chain.so/address/hushTEST/" + address;
} else {
url = "https://explorer.myhush.org/address/" + address;
}
QString url = "https://explorer.hush.is/address/" + address;
QDesktopServices::openUrl(QUrl(url));
}
void Settings::openTxInExplorer(QString txid) {
QString url;
if (Settings::getInstance()->isTestnet()) {
url = "https://chain.so/tx/hushTEST/" + txid;
}
else {
url = "https://explorer.myhush.org/tx/" + txid;
}
QString url = "https://explorer.hush.is/tx/" + txid;
QDesktopServices::openUrl(QUrl(url));
}

2
src/version.h
View File

@@ -1,3 +1,3 @@
// Copyright 2019-2021 The Hush developers
// Released under the GPLv3
#define APP_VERSION "1.3.11"
#define APP_VERSION "1.3.12"

2
src/websockets.cpp
View File

@@ -127,7 +127,7 @@ void WormholeClient::connect() {
qDebug() << "Invalid websocket object!";
}
m_webSocket->open(QUrl("wss://wormhole.myhush.org:443"));
m_webSocket->open(QUrl("wss://wormhole.hush.is:443"));
//m_webSocket->open(QUrl("ws://127.0.0.1:7070"));
}