From bb3c1879b71635cb4dc60a86a8256e996dc51588 Mon Sep 17 00:00:00 2001 From: nordsoft Date: Fri, 26 Aug 2022 22:26:56 +0400 Subject: [PATCH] Final fixeds --- config/schemas/settings.json | 2 +- launcher/updatedialog_moc.cpp | 6 +++--- launcher/updatedialog_moc.ui | 9 +-------- 3 files changed, 5 insertions(+), 12 deletions(-) diff --git a/config/schemas/settings.json b/config/schemas/settings.json index 43874d2c6..d9c5fa7b6 100644 --- a/config/schemas/settings.json +++ b/config/schemas/settings.json @@ -388,7 +388,7 @@ }, "updateConfigUrl" : { "type" : "string", - "default" : "https://raw.githubusercontent.com/Nordsoft91/vcmi-autoupdate/main/autoUpdate.json" + "default" : "https://raw.githubusercontent.com/vcmi/vcmi-updates/master/vcmi-updates.json" } } } diff --git a/launcher/updatedialog_moc.cpp b/launcher/updatedialog_moc.cpp index ca862e36b..bb5eccbd5 100644 --- a/launcher/updatedialog_moc.cpp +++ b/launcher/updatedialog_moc.cpp @@ -55,7 +55,7 @@ UpdateDialog::UpdateDialog(bool calledManually, QWidget *parent): QNetworkReply *response = networkManager.get(QNetworkRequest(QUrl(url))); - QObject::connect(response, &QNetworkReply::finished, [&, response]{ + connect(response, &QNetworkReply::finished, [&, response]{ response->deleteLater(); if(response->error() != QNetworkReply::NoError) @@ -87,7 +87,7 @@ void UpdateDialog::showUpdateDialog(bool isManually) void UpdateDialog::on_checkOnStartup_stateChanged(int state) { Settings node = settings.write["launcher"]["updateOnStartup"]; - node->Bool() = (state == 2 ? true : false); + node->Bool() = ui->checkOnStartup->isChecked(); } void UpdateDialog::loadFromJson(const JsonNode & node) @@ -136,5 +136,5 @@ void UpdateDialog::loadFromJson(const JsonNode & node) if(node["downloadLinks"][platformParameter].getType() == JsonNode::JsonType::DATA_STRING) downloadLink = QString::fromStdString(node["downloadLinks"][platformParameter].String()); - ui->downloadLink->setText(QString{"link"}.arg(downloadLink)); + ui->downloadLink->setText(QString{"Download page"}.arg(downloadLink)); } diff --git a/launcher/updatedialog_moc.ui b/launcher/updatedialog_moc.ui index ad8937271..7693302f7 100644 --- a/launcher/updatedialog_moc.ui +++ b/launcher/updatedialog_moc.ui @@ -38,13 +38,6 @@ 12 - - - - Download: - - - @@ -118,7 +111,7 @@ - not available + true