diff --git a/src/connection.cpp b/src/connection.cpp index 01d7330..f8afba3 100644 --- a/src/connection.cpp +++ b/src/connection.cpp @@ -43,7 +43,7 @@ void ConnectionLoader::doAutoConnect() { auto config = std::shared_ptr(new ConnectionConfig()); config->dangerous = true; - config->server = QString("127.0.0.1:9069"); + config->server = QString("https://hush-lightwallet.de:439"); // Initialize the library main->logger->write(QObject::tr("Attempting to initialize")); @@ -134,6 +134,7 @@ void ConnectionLoader::showInformation(QString info, QString detail) { qDebug() << "Showing info " << info << ":" << detail; connD->status->setText(info); connD->statusDetail->setText(detail); + } /** diff --git a/src/controller.cpp b/src/controller.cpp index 9c319ec..07bb4a7 100644 --- a/src/controller.cpp +++ b/src/controller.cpp @@ -64,7 +64,7 @@ void Controller::setConnection(Connection* c) { this->zrpc->setConnection(c); - ui->statusBar->showMessage("Your hushd is connected"); + ui->statusBar->showMessage("Connectet with https://hush-lightwallet.de"); // See if we need to remove the reindex/rescan flags from the hush.conf file auto hushConfLocation = Settings::getInstance()->gethushdConfLocation(); @@ -174,16 +174,23 @@ void Controller::getInfoThenRefresh(bool force) { static int lastBlock = 0; int curBlock = reply["latest_block_height"].get(); model->setLatestBlock(curBlock); + ui->blockHeight->setText(QString::number(curBlock)); // Connected, so display checkmark. QIcon i(":/icons/res/connected.gif"); - main->statusLabel->setText(chainName + "(" + QString::number(curBlock) + ")"); + main->statusLabel->setText( "connected" "(" + QString::number(curBlock) + ")"); + main->statusLabel->setText(" HUSH/USD=$" + QString::number( (double) Settings::getInstance()->gethushPrice() )); main->statusIcon->setPixmap(i.pixmap(16, 16)); - - //int version = reply["version"].get(); + + //int version = reply["version"].get(); int version = 1; Settings::getInstance()->sethushdVersion(version); + ui->Version->setText(QString::fromStdString(reply["version"].get())); + ui->Vendor->setText(QString::fromStdString(reply["vendor"].get())); + + + // See if recurring payments needs anything Recurring::getInstance()->processPending(main); @@ -559,7 +566,7 @@ void Controller::refreshhushPrice() { //QString price = QString::fromStdString(hush["usd"].get()); qDebug() << "HUSH = $" << QString::number((double)hush["usd"]); Settings::getInstance()->sethushPrice( hush["usd"] ); - + return; } } catch (const std::exception& e) { // If anything at all goes wrong, just set the price to 0 and move on. diff --git a/src/controller.h b/src/controller.h index 6be3630..b66d2c0 100644 --- a/src/controller.h +++ b/src/controller.h @@ -40,7 +40,6 @@ public: Connection* getConnection() { return zrpc->getConnection(); } void setConnection(Connection* c); - void refresh(bool force = false); void refreshAddresses(); diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp index 0b44cd7..83e8045 100644 --- a/src/mainwindow.cpp +++ b/src/mainwindow.cpp @@ -39,7 +39,7 @@ MainWindow::MainWindow(QWidget *parent) : ui->setupUi(this); - logger = new Logger(this, QDir(QStandardPaths::writableLocation(QStandardPaths::AppDataLocation)).filePath("silentdragonlite-debug.log")); + logger = new Logger(this, QDir(QStandardPaths::writableLocation(QStandardPaths::AppDataLocation)).filePath("./komodo/HUSH3/silentdragonlite-debug.log")); // Status Bar setupStatusBar(); diff --git a/src/mainwindow.ui b/src/mainwindow.ui index d1af9c2..e0e905d 100644 --- a/src/mainwindow.ui +++ b/src/mainwindow.ui @@ -953,21 +953,21 @@ - + Loading... - + - Blockheight + blockHeight - + Loading... @@ -976,7 +976,7 @@ - Version hushd light + Version hushlightd