diff --git a/src/controller.h b/src/controller.h index 7866c90..a90337a 100644 --- a/src/controller.h +++ b/src/controller.h @@ -47,6 +47,28 @@ public: void refreshINRPrice(); void refreshGBPPrice(); void refreshAUDPrice(); + void refreshUSDVolume(); + void refreshEURVolume(); + void refreshBTCVolume(); + void refreshCNYVolume(); + void refreshRUBVolume(); + void refreshCADVolume(); + void refreshSGDVolume(); + void refreshCHFVolume(); + void refreshINRVolume(); + void refreshGBPVolume(); + void refreshAUDVolume(); + void refreshUSDCAP(); + void refreshEURCAP(); + void refreshBTCCAP(); + void refreshCNYCAP(); + void refreshRUBCAP(); + void refreshCADCAP(); + void refreshSGDCAP(); + void refreshCHFCAP(); + void refreshINRCAP(); + void refreshGBPCAP(); + void refreshAUDCAP(); void executeStandardUITransaction(Tx tx); diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp index e8f4b82..06e7a88 100644 --- a/src/mainwindow.cpp +++ b/src/mainwindow.cpp @@ -1170,7 +1170,7 @@ void MainWindow::setupReceiveTab() { } else if (Settings::getInstance()->get_currency_name() == "AUD") { ui->rcvBal->setText(rpc->getModel()->getAllBalances().value(addr).toDecimalhushAUDString()); } - + ui->txtReceive->setPlainText(addr); ui->qrcodeDisplay->setQrcodeString(addr); if (rpc->getModel()->getUsedAddresses().value(addr, false)) { diff --git a/src/mainwindow.ui b/src/mainwindow.ui index aa06242..4d39930 100644 --- a/src/mainwindow.ui +++ b/src/mainwindow.ui @@ -22,7 +22,7 @@ - 0 + 4 @@ -399,8 +399,8 @@ 0 0 - 1162 - 344 + 1226 + 504 @@ -950,138 +950,242 @@ Hush Daemon - + - - - - - - 0 - 0 - - - - - - - false - - - - - - - - - - - - - This is a Lightwallet, you cant mine with it! - - - - - - - Qt::Vertical - - - - 20 - 40 - - - - - - - - Loading... - - - - - - - blockHeight - - - - - - - Loading... - - - - - - - Version hushlightd - - - - - - - Vendor - - - - - - - Loading... - - - - - - - Qt::Horizontal - - - - - - - Qt::Vertical - - - - 20 - 40 - - - - - - - - | - - - - - - - | - - - - - - - | - - - - - - - + + + + 0 + 0 + + + + + + + false + + + + + + + + + + + + + Qt::Vertical + + + + 20 + 40 + + + + + + + + + 15 + + + + <html><head/><body><p align="center"><span style=" font-weight:600;">Hush Blockchain Information</span></p></body></html> + + + + + + + Qt::Horizontal + + + + + + + BlockHeight + + + + + + + | + + + + + + + Loading... + + + + + + + Vendor + + + + + + + | + + + + + + + Loading... + + + + + + + Version hushlightd + + + + + + + | + + + + + + + Loading... + + + + + + + Next Halving + + + + + + + | + + + + + + + Loading... + + + + + + + Qt::Horizontal + + + + + + + + 15 + + + + <html><head/><body><p align="center"><span style=" font-weight:600;">Hush Market Information</span></p></body></html> + + + + + + + Qt::Horizontal + + + + + + + Market Cap + + + + + + + | + + + + + + + Loading... + + + + + + + Volume on Exchanges + + + + + + + | + + + + + + + Loading... + + + + + + + Qt::Horizontal + + + + + + + This is a Lightwallet, you cant mine with it! + + + + + + + Qt::Vertical + + + + 20 + 40 + + + + + + @@ -1095,7 +1199,7 @@ 0 0 1274 - 39 + 22 diff --git a/src/settings.cpp b/src/settings.cpp index fd53381..e9cd886 100644 --- a/src/settings.cpp +++ b/src/settings.cpp @@ -135,6 +135,73 @@ double Settings::getGBPPrice() { double Settings::getAUDPrice() { return AUDPrice; } +double Settings::getUSDVolume() { + return USDVolume; +} +double Settings::getEURVolume() { + return EURVolume; +} +double Settings::getBTCVolume() { + return BTCVolume; +} +double Settings::getCNYVolume() { + return CNYVolume; +} +double Settings::getRUBVolume() { + return RUBVolume; +} +double Settings::getCADVolume() { + return CADVolume; +} +double Settings::getSGDVolume() { + return SGDVolume; +} +double Settings::getCHFVolume() { + return CHFVolume; +} +double Settings::getINRVolume() { + return INRVolume; +} +double Settings::getGBPVolume() { + return GBPVolume; +} +double Settings::getAUDVolume() { + return AUDVolume; +} +double Settings::getUSDCAP() { + return USDCAP; +} +double Settings::getEURCAP() { + return EURCAP; +} +double Settings::getBTCCAP() { + return BTCCAP; +} +double Settings::getCNYCAP() { + return CNYCAP; +} +double Settings::getRUBCAP() { + return RUBCAP; +} +double Settings::getCADCAP() { + return CADCAP; +} +double Settings::getSGDCAP() { + return SGDCAP; +} +double Settings::getCHFCAP() { + return CHFCAP; +} +double Settings::getINRCAP() { + return INRCAP; +} +double Settings::getGBPCAP() { + return GBPCAP; +} +double Settings::getAUDCAP() { + return AUDCAP; +} + bool Settings::getCheckForUpdates() { return QSettings().value("options/allowcheckupdates", true).toBool(); diff --git a/src/settings.h b/src/settings.h index af16f90..a917d67 100644 --- a/src/settings.h +++ b/src/settings.h @@ -80,6 +80,28 @@ public: void setINRPrice(double p) { INRPrice = p; } void setGBPPrice(double p) { GBPPrice = p; } void setAUDPrice(double p) { AUDPrice = p; } + void setUSDVolume(double p) { USDVolume = p; } + void setEURVolume(double p) { EURVolume = p; } + void setBTCVolume(double p) { BTCVolume = p; } + void setCNYVolume(double p) { CNYVolume = p; } + void setRUBVolume(double p) { RUBVolume = p; } + void setCADVolume(double p) { CADVolume = p; } + void setSGDVolume(double p) { SGDVolume = p; } + void setCHFVolume(double p) { CHFVolume = p; } + void setINRVolume(double p) { INRVolume = p; } + void setGBPVolume(double p) { GBPVolume = p; } + void setAUDVolume(double p) { AUDVolume = p; } + void setUSDCAP(double p) { USDCAP = p; } + void setEURCAP(double p) { EURCAP = p; } + void setBTCCAP(double p) { BTCCAP = p; } + void setCNYCAP(double p) { CNYCAP = p; } + void setRUBCAP(double p) { RUBCAP = p; } + void setCADCAP(double p) { CADCAP = p; } + void setSGDCAP(double p) { SGDCAP = p; } + void setCHFCAP(double p) { CHFCAP = p; } + void setINRCAP(double p) { INRCAP = p; } + void setGBPCAP(double p) { GBPCAP = p; } + void setAUDCAP(double p) { AUDCAP = p; } double getZECPrice(); double getEURPrice(); double getBTCPrice(); @@ -91,6 +113,29 @@ public: double getINRPrice(); double getGBPPrice(); double getAUDPrice(); + double getUSDVolume(); + double getEURVolume(); + double getBTCVolume(); + double getCNYVolume(); + double getRUBVolume(); + double getCADVolume(); + double getSGDVolume(); + double getCHFVolume(); + double getINRVolume(); + double getGBPVolume(); + double getAUDVolume(); + double getUSDCAP(); + double getEURCAP(); + double getBTCCAP(); + double getCNYCAP(); + double getRUBCAP(); + double getCADCAP(); + double getSGDCAP(); + double getCHFCAP(); + double getINRCAP(); + double getGBPCAP(); + double getAUDCAP(); + // Static stuff static const QString txidStatusMessage; @@ -153,6 +198,28 @@ private: double INRPrice = 0.0; double GBPPrice = 0.0; double AUDPrice = 0.0; + double USDVolume = 0.0; + double EURVolume = 0.0; + double BTCVolume = 0.0; + double CNYVolume = 0.0; + double RUBVolume = 0.0; + double CADVolume = 0.0; + double SGDVolume = 0.0; + double CHFVolume = 0.0; + double INRVolume = 0.0; + double GBPVolume = 0.0; + double AUDVolume = 0.0; + double USDCAP = 0.0; + double EURCAP = 0.0; + double BTCCAP = 0.0; + double CNYCAP = 0.0; + double RUBCAP = 0.0; + double CADCAP = 0.0; + double SGDCAP = 0.0; + double CHFCAP = 0.0; + double INRCAP = 0.0; + double GBPCAP = 0.0; + double AUDCAP = 0.0; };