From 6f75009a80e86a70e03cabe982d417aadbf9ee8d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20Mr=C3=A1zek?= Date: Wed, 9 Jul 2014 19:48:46 +0200 Subject: [PATCH] Show update channel in the update dialog, actually show changelog for the selected update channel. --- gui/dialogs/UpdateDialog.cpp | 8 ++++++-- gui/dialogs/UpdateDialog.ui | 2 +- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/gui/dialogs/UpdateDialog.cpp b/gui/dialogs/UpdateDialog.cpp index f48d3765..25cfa853 100644 --- a/gui/dialogs/UpdateDialog.cpp +++ b/gui/dialogs/UpdateDialog.cpp @@ -1,13 +1,16 @@ #include "UpdateDialog.h" #include "ui_UpdateDialog.h" #include "gui/Platform.h" -#include #include "logger/QsLog.h" +#include "MultiMC.h" +#include UpdateDialog::UpdateDialog(QWidget *parent) : QDialog(parent), ui(new Ui::UpdateDialog) { MultiMCPlatform::fixWM_CLASS(this); ui->setupUi(this); + auto channel = MMC->settings()->get("UpdateChannel").toString(); + ui->label->setText(tr("A new %1 update is available!").arg(channel)); loadChangelog(); } @@ -17,8 +20,9 @@ UpdateDialog::~UpdateDialog() void UpdateDialog::loadChangelog() { + auto channel = MMC->settings()->get("UpdateChannel").toString(); dljob.reset(new NetJob("Changelog")); - auto url = QString("https://raw.githubusercontent.com/MultiMC/MultiMC5/%1/changelog.md").arg(BuildConfig.VERSION_CHANNEL); + auto url = QString("https://raw.githubusercontent.com/MultiMC/MultiMC5/%1/changelog.md").arg(channel); changelogDownload = ByteArrayDownload::make(QUrl(url)); dljob->addNetAction(changelogDownload); connect(dljob.get(), &NetJob::succeeded, this, &UpdateDialog::changelogLoaded); diff --git a/gui/dialogs/UpdateDialog.ui b/gui/dialogs/UpdateDialog.ui index c77d70de..06f4f086 100644 --- a/gui/dialogs/UpdateDialog.ui +++ b/gui/dialogs/UpdateDialog.ui @@ -28,7 +28,7 @@ - A new MultiMC update is available! + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter