Mirrors/PrismLauncher
1
0
Fork 0
mirror of https://github.com/PrismLauncher/PrismLauncher.git synced 2025-06-12 05:07:46 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix Java downloader bugs + Add a test button in JavaPage

Browse Source 
Signed-off-by: timoreo <contact@timoreo.fr>
This commit is contained in:
timoreo
2022-07-01 14:05:14 +02:00
parent 98a82cd484
commit 89ce80b279
4 changed files with 88 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
launcher/ui/pages/global/JavaPage.cpp
View File

@ -52,6 +52,9 @@
#include <FileSystem.h>
#include "Application.h"
#include <sys.h>
#include "SysInfo.h"
#include "JavaDownloader.h"
JavaPage::JavaPage(QWidget *parent) : QWidget(parent), ui(new Ui::JavaPage)
{
@ -177,6 +180,44 @@ void JavaPage::on_javaTestBtn_clicked()
checker->run();
}
void JavaPage::on_javaDownloadBtn_clicked(){
QString sys = SysInfo::currentSystem();
if(sys == "osx"){
sys = "mac-os";
}
QString arch = SysInfo::useQTForArch();
QString version;
if(sys == "windows"){
if(arch == "x86_64"){
version = "windows-x64";
}else if(arch == "i386"){
version = "windows-x86";
}else{
//Unknown, maybe arm, appending arch for downloader
version = "windows-"+arch;
}
}else if(sys == "mac-os"){
if(arch == "arm64"){
version = "mac-os-arm64";
}else{
version = "mac-os";
}
}else if(sys == "linux"){
if(arch == "x86_64"){
version = "linux";
}else {
// will work for i386, and arm(64)
version = "linux-" + arch;
}
}else{
// ? ? ? ? ? unknown os, at least it won't have a java version on mojang or azul, display warning
QMessageBox::warning(this, tr("Unknown OS"), tr("The OS you are running is not supported by Mojang or Azul. Please install Java manually."));
return;
}
//TODO display a selection for java 8 or 18
JavaDownloader::downloadJava(false, version);
}
void JavaPage::checkerFinished()
{
checker.reset();