From bbf52e35497a596121befb4f7d9225ab99251732 Mon Sep 17 00:00:00 2001
From: Trial97 <alexandru.tripon97@gmail.com>
Date: Sun, 16 Jun 2024 01:59:50 +0300
Subject: [PATCH] renamed dialog and button action

Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
---
 launcher/ui/java/InstallJavaDialog.cpp     | 12 ++++++++----
 launcher/ui/pages/global/JavaPage.cpp      |  7 +------
 launcher/ui/pages/global/JavaPage.h        |  1 -
 launcher/ui/widgets/JavaSettingsWidget.cpp |  4 ++--
 launcher/ui/widgets/JavaSettingsWidget.h   |  2 +-
 5 files changed, 12 insertions(+), 14 deletions(-)

diff --git a/launcher/ui/java/InstallJavaDialog.cpp b/launcher/ui/java/InstallJavaDialog.cpp
index 78de3e20a..60e3a770c 100644
--- a/launcher/ui/java/InstallJavaDialog.cpp
+++ b/launcher/ui/java/InstallJavaDialog.cpp
@@ -184,18 +184,18 @@ InstallDialog::InstallDialog(const QString& uid, QWidget* parent)
 QList<BasePage*> InstallDialog::getPages()
 {
     return {
-        // NeoForge
+        // Mojang
         new InstallJavaPage("net.minecraft.java", "", tr("Mojang")),
-        // Forge
+        // Adoptium
         new InstallJavaPage("net.adoptium.java", "", tr("Adoptium")),
-        // Fabric
+        // Azul
         new InstallJavaPage("com.azul.java", "", tr("Azul")),
     };
 }
 
 QString InstallDialog::dialogTitle()
 {
-    return tr("Install Loader");
+    return tr("Install Java");
 }
 
 void InstallDialog::validate(BasePage* page)
@@ -230,7 +230,11 @@ void InstallDialog::done(int result)
                 ProgressDialog pg(this);
                 pg.setSkipButton(true, tr("Abort"));
                 pg.execWithTask(task.get());
+            } else {
+                return;
             }
+        } else {
+            return;
         }
     }
 
diff --git a/launcher/ui/pages/global/JavaPage.cpp b/launcher/ui/pages/global/JavaPage.cpp
index fda4f8705..c8bbf6361 100644
--- a/launcher/ui/pages/global/JavaPage.cpp
+++ b/launcher/ui/pages/global/JavaPage.cpp
@@ -199,7 +199,7 @@ void JavaPage::on_javaTestBtn_clicked()
     checker->run();
 }
 
-void JavaPage::on_javaDownloadBtn_clicked()
+void JavaPage::on_downloadJavaButton_clicked()
 {
     auto jdialog = new Java::InstallDialog({}, this);
     jdialog->exec();
@@ -251,11 +251,6 @@ void JavaPage::updateThresholds()
     }
 }
 
-void JavaPage::on_downloadJavaButton_clicked()
-{
-    on_javaDownloadBtn_clicked();
-}
-
 void JavaPage::on_removeJavaButton_clicked()
 {
     auto version = ui->managedJavaList->selectedVersion();
diff --git a/launcher/ui/pages/global/JavaPage.h b/launcher/ui/pages/global/JavaPage.h
index 48e557740..0a1c4a6be 100644
--- a/launcher/ui/pages/global/JavaPage.h
+++ b/launcher/ui/pages/global/JavaPage.h
@@ -72,7 +72,6 @@ class JavaPage : public QWidget, public BasePage {
     void on_javaDetectBtn_clicked();
     void on_javaTestBtn_clicked();
     void on_javaBrowseBtn_clicked();
-    void on_javaDownloadBtn_clicked();
     void on_downloadJavaButton_clicked();
     void on_removeJavaButton_clicked();
     void on_refreshJavaButton_clicked();
diff --git a/launcher/ui/widgets/JavaSettingsWidget.cpp b/launcher/ui/widgets/JavaSettingsWidget.cpp
index 34cd70f35..e16f650fc 100644
--- a/launcher/ui/widgets/JavaSettingsWidget.cpp
+++ b/launcher/ui/widgets/JavaSettingsWidget.cpp
@@ -44,7 +44,7 @@ JavaSettingsWidget::JavaSettingsWidget(QWidget* parent) : QWidget(parent)
     connect(m_javaPathTextBox, &QLineEdit::textEdited, this, &JavaSettingsWidget::javaPathEdited);
     connect(m_javaStatusBtn, &QToolButton::clicked, this, &JavaSettingsWidget::on_javaStatusBtn_clicked);
     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);
 }
 
-void JavaSettingsWidget::on_javaDownloadBtn_clicked()
+void JavaSettingsWidget::javaDownloadBtn_clicked()
 {
     auto jdialog = new Java::InstallDialog({}, this);
     jdialog->exec();
diff --git a/launcher/ui/widgets/JavaSettingsWidget.h b/launcher/ui/widgets/JavaSettingsWidget.h
index 877e60f46..622c473fe 100644
--- a/launcher/ui/widgets/JavaSettingsWidget.h
+++ b/launcher/ui/widgets/JavaSettingsWidget.h
@@ -53,7 +53,7 @@ class JavaSettingsWidget : public QWidget {
     void javaVersionSelected(BaseVersion::Ptr version);
     void on_javaBrowseBtn_clicked();
     void on_javaStatusBtn_clicked();
-    void on_javaDownloadBtn_clicked();
+    void javaDownloadBtn_clicked();
     void checkFinished(const JavaChecker::Result& result);
 
    protected: /* methods */