ONIMAI-SMP/ShatteredPrism
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

renamed dialog and button action

Browse Source 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
This commit is contained in:
Trial97 2024-06-16 01:59:50 +03:00
parent d0584684f2
commit bbf52e3549
No known key found for this signature in database
GPG Key ID: 55EF5DA53DB36318
5 changed files with 12 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
launcher/ui/java/InstallJavaDialog.cpp
View File

@ -184,18 +184,18 @@ InstallDialog::InstallDialog(const QString& uid, QWidget* parent)
QList<BasePage*> InstallDialog::getPages() QList<BasePage*> InstallDialog::getPages()
{ {
return { return {
// NeoForge // Mojang
new InstallJavaPage("net.minecraft.java", "", tr("Mojang")), new InstallJavaPage("net.minecraft.java", "", tr("Mojang")),
// Forge // Adoptium
new InstallJavaPage("net.adoptium.java", "", tr("Adoptium")), new InstallJavaPage("net.adoptium.java", "", tr("Adoptium")),
// Fabric // Azul
new InstallJavaPage("com.azul.java", "", tr("Azul")), new InstallJavaPage("com.azul.java", "", tr("Azul")),
}; };
} }
QString InstallDialog::dialogTitle() QString InstallDialog::dialogTitle()
{ {
return tr("Install Loader"); return tr("Install Java");
} }
void InstallDialog::validate(BasePage* page) void InstallDialog::validate(BasePage* page)
@ -230,7 +230,11 @@ void InstallDialog::done(int result)
ProgressDialog pg(this); ProgressDialog pg(this);
pg.setSkipButton(true, tr("Abort")); pg.setSkipButton(true, tr("Abort"));
pg.execWithTask(task.get()); pg.execWithTask(task.get());
} else {
return;
} }
} else {
return;
} }
} }

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

@ -199,7 +199,7 @@ void JavaPage::on_javaTestBtn_clicked()
checker->run(); checker->run();
} }
void JavaPage::on_javaDownloadBtn_clicked() void JavaPage::on_downloadJavaButton_clicked()
{ {
auto jdialog = new Java::InstallDialog({}, this); auto jdialog = new Java::InstallDialog({}, this);
jdialog->exec(); jdialog->exec();
@ -251,11 +251,6 @@ void JavaPage::updateThresholds()
} }
} }
void JavaPage::on_downloadJavaButton_clicked()
{
on_javaDownloadBtn_clicked();
}
void JavaPage::on_removeJavaButton_clicked() void JavaPage::on_removeJavaButton_clicked()
{ {
auto version = ui->managedJavaList->selectedVersion(); auto version = ui->managedJavaList->selectedVersion();

1
launcher/ui/pages/global/JavaPage.h
View File

@ -72,7 +72,6 @@ class JavaPage : public QWidget, public BasePage {
void on_javaDetectBtn_clicked(); void on_javaDetectBtn_clicked();
void on_javaTestBtn_clicked(); void on_javaTestBtn_clicked();
void on_javaBrowseBtn_clicked(); void on_javaBrowseBtn_clicked();
void on_javaDownloadBtn_clicked();
void on_downloadJavaButton_clicked(); void on_downloadJavaButton_clicked();
void on_removeJavaButton_clicked(); void on_removeJavaButton_clicked();
void on_refreshJavaButton_clicked(); void on_refreshJavaButton_clicked();

4
launcher/ui/widgets/JavaSettingsWidget.cpp
View File

@ -44,7 +44,7 @@ JavaSettingsWidget::JavaSettingsWidget(QWidget* parent) : QWidget(parent)
connect(m_javaPathTextBox, &QLineEdit::textEdited, this, &JavaSettingsWidget::javaPathEdited); connect(m_javaPathTextBox, &QLineEdit::textEdited, this, &JavaSettingsWidget::javaPathEdited);
connect(m_javaStatusBtn, &QToolButton::clicked, this, &JavaSettingsWidget::on_javaStatusBtn_clicked); connect(m_javaStatusBtn, &QToolButton::clicked, this, &JavaSettingsWidget::on_javaStatusBtn_clicked);
if (BuildConfig.JAVA_DOWNLOADER_ENABLED) { if (BuildConfig.JAVA_DOWNLOADER_ENABLED) {
connect(m_javaDownloadBtn, &QPushButton::clicked, this, &JavaSettingsWidget::on_javaDownloadBtn_clicked); connect(m_javaDownloadBtn, &QPushButton::clicked, this, &JavaSettingsWidget::javaDownloadBtn_clicked);
} }
} }
@ -354,7 +354,7 @@ void JavaSettingsWidget::on_javaBrowseBtn_clicked()
checkJavaPath(cooked_path); checkJavaPath(cooked_path);
} }
void JavaSettingsWidget::on_javaDownloadBtn_clicked() void JavaSettingsWidget::javaDownloadBtn_clicked()
{ {
auto jdialog = new Java::InstallDialog({}, this); auto jdialog = new Java::InstallDialog({}, this);
jdialog->exec(); jdialog->exec();

2
launcher/ui/widgets/JavaSettingsWidget.h
View File

@ -53,7 +53,7 @@ class JavaSettingsWidget : public QWidget {
void javaVersionSelected(BaseVersion::Ptr version); void javaVersionSelected(BaseVersion::Ptr version);
void on_javaBrowseBtn_clicked(); void on_javaBrowseBtn_clicked();
void on_javaStatusBtn_clicked(); void on_javaStatusBtn_clicked();
void on_javaDownloadBtn_clicked(); void javaDownloadBtn_clicked();
void checkFinished(const JavaChecker::Result& result); void checkFinished(const JavaChecker::Result& result);
protected: /* methods */ protected: /* methods */