games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2024-12-18 17:40:48 +02:00
Code Issues Releases Activity

Final fixeds

Browse Source
This commit is contained in:
nordsoft 2022-08-26 22:26:56 +04:00
parent 5cb1097053
commit bb3c1879b7
3 changed files with 5 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
config/schemas/settings.json
View File

@ -388,7 +388,7 @@
}, },
"updateConfigUrl" : { "updateConfigUrl" : {
"type" : "string", "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"
} }
} }
} }

6
launcher/updatedialog_moc.cpp
View File

@ -55,7 +55,7 @@ UpdateDialog::UpdateDialog(bool calledManually, QWidget *parent):
QNetworkReply *response = networkManager.get(QNetworkRequest(QUrl(url))); QNetworkReply *response = networkManager.get(QNetworkRequest(QUrl(url)));
QObject::connect(response, &QNetworkReply::finished, [&, response]{ connect(response, &QNetworkReply::finished, [&, response]{
response->deleteLater(); response->deleteLater();
if(response->error() != QNetworkReply::NoError) if(response->error() != QNetworkReply::NoError)
@ -87,7 +87,7 @@ void UpdateDialog::showUpdateDialog(bool isManually)
void UpdateDialog::on_checkOnStartup_stateChanged(int state) void UpdateDialog::on_checkOnStartup_stateChanged(int state)
{ {
Settings node = settings.write["launcher"]["updateOnStartup"]; Settings node = settings.write["launcher"]["updateOnStartup"];
node->Bool() = (state == 2 ? true : false); node->Bool() = ui->checkOnStartup->isChecked();
} }
void UpdateDialog::loadFromJson(const JsonNode & node) 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) if(node["downloadLinks"][platformParameter].getType() == JsonNode::JsonType::DATA_STRING)
downloadLink = QString::fromStdString(node["downloadLinks"][platformParameter].String()); downloadLink = QString::fromStdString(node["downloadLinks"][platformParameter].String());
ui->downloadLink->setText(QString{"<a href=\"%1\">link</a>"}.arg(downloadLink)); ui->downloadLink->setText(QString{"<a href=\"%1\">Download page</a>"}.arg(downloadLink));
} }

9
launcher/updatedialog_moc.ui
View File

@ -38,13 +38,6 @@
<property name="bottomMargin"> <property name="bottomMargin">
<number>12</number> <number>12</number>
</property> </property>
<item row="1" column="0">
<widget class="QLabel" name="downloadLabel">
<property name="text">
<string>Download:</string>
</property>
</widget>
</item>
<item row="0" column="0" colspan="5"> <item row="0" column="0" colspan="5">
<widget class="QLabel" name="versionLabel"> <widget class="QLabel" name="versionLabel">
<property name="sizePolicy"> <property name="sizePolicy">
@ -118,7 +111,7 @@
</sizepolicy> </sizepolicy>
</property> </property>
<property name="text"> <property name="text">
<string>not available</string> <string/>
</property> </property>
<property name="openExternalLinks"> <property name="openExternalLinks">
<bool>true</bool> <bool>true</bool>