Browse Source
Merge pull request #30 from MyHush/dev
Change license, fix broken values in hushdaemon tab
pull/78/head
Denio
5 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with
5 additions and
3 deletions
-
src/about.ui
-
src/controller.cpp
|
|
|
@ -52,7 +52,7 @@ |
|
|
|
<html><head><meta name="qrichtext" content="1" /><style type="text/css"> |
|
|
|
p, li { white-space: pre-wrap; } |
|
|
|
</style></head><body style=" font-family:'Ubuntu'; font-size:11pt; 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';">Copyright (c) 2019-2020 DenioD (MIT License)</span></p> |
|
|
|
<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';">Copyright (c) 2019-2020 The Hush developers (MIT License)</span></p> |
|
|
|
<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';">Copyright (c) 2018-2019 Aditya Kulkarni (MIT License)</span></p> |
|
|
|
<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'Ubuntu';"><br /></p> |
|
|
|
<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';">Special thanks to:</span></p> |
|
|
|
|
|
|
|
@ -158,13 +158,15 @@ void Controller::getInfoThenRefresh(bool force) { |
|
|
|
|
|
|
|
static bool prevCallSucceeded = false; |
|
|
|
|
|
|
|
zrpc->fetchLatestBlock([=] (const json& reply) { |
|
|
|
zrpc->fetchInfo([=] (const json& reply) { |
|
|
|
prevCallSucceeded = true; |
|
|
|
|
|
|
|
int curBlock = reply["height"].get<json::number_integer_t>(); |
|
|
|
int curBlock = reply["latest_block_height"].get<json::number_integer_t>(); |
|
|
|
bool doUpdate = force || (model->getLatestBlock() != curBlock); |
|
|
|
model->setLatestBlock(curBlock); |
|
|
|
ui->blockHeight->setText(QString::number(curBlock)); |
|
|
|
ui->Version->setText(QString::fromStdString(reply["version"].get<json::string_t>())); |
|
|
|
ui->Vendor->setText(QString::fromStdString(reply["vendor"].get<json::string_t>())); |
|
|
|
|
|
|
|
main->logger->write(QString("Refresh. curblock ") % QString::number(curBlock) % ", update=" % (doUpdate ? "true" : "false") ); |
|
|
|
|
|
|
|
|
