From 5d3549a5e900cc65cecfccd49da10e28765311e4 Mon Sep 17 00:00:00 2001
From: Trial97 <alexandru.tripon97@gmail.com>
Date: Mon, 22 Jul 2024 09:18:20 +0300
Subject: [PATCH] Add tooltips and fix archive download task

Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
---
 launcher/java/download/ArchiveDownloadTask.cpp | 1 +
 launcher/ui/pages/global/JavaPage.cpp          | 2 +-
 launcher/ui/pages/global/JavaPage.ui           | 6 ++++++
 3 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/launcher/java/download/ArchiveDownloadTask.cpp b/launcher/java/download/ArchiveDownloadTask.cpp
index af5381dfc..ba1c96faf 100644
--- a/launcher/java/download/ArchiveDownloadTask.cpp
+++ b/launcher/java/download/ArchiveDownloadTask.cpp
@@ -124,6 +124,7 @@ void ArchiveDownloadTask::extractJava(QString input)
             stepProgress(*progressStep);
         });
         m_task->start();
+        return;
     }
 
     emitFailed(tr("Could not determine archive type!"));
diff --git a/launcher/ui/pages/global/JavaPage.cpp b/launcher/ui/pages/global/JavaPage.cpp
index ad37fa740..97ffa5d4d 100644
--- a/launcher/ui/pages/global/JavaPage.cpp
+++ b/launcher/ui/pages/global/JavaPage.cpp
@@ -264,7 +264,7 @@ void JavaPage::on_removeJavaButton_clicked()
     for (auto& entry : entries) {
         if (dcast->path.startsWith(entry.canonicalFilePath())) {
             auto response = CustomMessageBox::selectable(this, tr("Confirm Deletion"),
-                                                         tr("You are about to remove \"%1\" java version.\n"
+                                                         tr("You are about to remove  the Java installation named \"%1\".\n"
                                                             "Are you sure?")
                                                              .arg(entry.fileName()),
                                                          QMessageBox::Warning, QMessageBox::Yes | QMessageBox::No, QMessageBox::No)
diff --git a/launcher/ui/pages/global/JavaPage.ui b/launcher/ui/pages/global/JavaPage.ui
index c8f62e075..e6bbeb15a 100644
--- a/launcher/ui/pages/global/JavaPage.ui
+++ b/launcher/ui/pages/global/JavaPage.ui
@@ -253,6 +253,9 @@
           </item>
           <item row="6" column="0">
            <widget class="QCheckBox" name="autodetectJavaCheckBox">
+            <property name="toolTip">
+             <string>Automatically selects the Java version that is compatible with the current Minecraft instance, based on the major version required.</string>
+            </property>
             <property name="text">
              <string>Autodetect Java version</string>
             </property>
@@ -299,6 +302,9 @@
             <property name="enabled">
              <bool>false</bool>
             </property>
+            <property name="toolTip">
+             <string>Automatically downloads and selects the Java version recommended by Mojang.</string>
+            </property>
             <property name="text">
              <string>Auto-download Mojang Java</string>
             </property>