From 0a3303bcbdabbc2e5e1338dabfb3b8cf518d29e4 Mon Sep 17 00:00:00 2001
From: Trial97 <alexandru.tripon97@gmail.com>
Date: Fri, 9 Feb 2024 21:07:12 +0200
Subject: [PATCH] Added button to add extra java path to the Java Wizzard

Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
---
 launcher/ui/dialogs/VersionSelectDialog.h  |  4 ----
 launcher/ui/widgets/JavaSettingsWidget.cpp | 27 ++++++++++++++++++++--
 launcher/ui/widgets/JavaSettingsWidget.h   |  5 +++-
 3 files changed, 29 insertions(+), 7 deletions(-)

diff --git a/launcher/ui/dialogs/VersionSelectDialog.h b/launcher/ui/dialogs/VersionSelectDialog.h
index 0ccd45e74..17efc1b93 100644
--- a/launcher/ui/dialogs/VersionSelectDialog.h
+++ b/launcher/ui/dialogs/VersionSelectDialog.h
@@ -26,10 +26,6 @@ class QDialogButtonBox;
 class VersionSelectWidget;
 class QPushButton;
 
-namespace Ui {
-class VersionSelectDialog;
-}
-
 class VersionProxyModel;
 
 class VersionSelectDialog : public QDialog {
diff --git a/launcher/ui/widgets/JavaSettingsWidget.cpp b/launcher/ui/widgets/JavaSettingsWidget.cpp
index 3f4fe08ea..bb57e5da7 100644
--- a/launcher/ui/widgets/JavaSettingsWidget.cpp
+++ b/launcher/ui/widgets/JavaSettingsWidget.cpp
@@ -42,6 +42,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);
     connect(m_javaDownloadBtn, &QPushButton::clicked, this, &JavaSettingsWidget::on_javaDownloadBtn_clicked);
+    connect(m_addJavaPathBtn, &QPushButton::clicked, this, &JavaSettingsWidget::on_addJavaPathBtn_clicked);
 }
 
 void JavaSettingsWidget::setupUi()
@@ -124,9 +125,16 @@ void JavaSettingsWidget::setupUi()
 
     m_verticalLayout->addWidget(m_memoryGroupBox);
 
-    m_javaDownloadBtn = new QPushButton(tr("Download Java"), this);
+    m_horizontalBtnLayout = new QHBoxLayout();
+    m_horizontalBtnLayout->setObjectName(QStringLiteral("horizontalBtnLayout"));
 
-    m_verticalLayout->addWidget(m_javaDownloadBtn);
+    m_javaDownloadBtn = new QPushButton(tr("Download Java"), this);
+    m_horizontalBtnLayout->addWidget(m_javaDownloadBtn);
+
+    m_addJavaPathBtn = new QPushButton(tr("Add extra Java path"), this);
+    m_horizontalBtnLayout->addWidget(m_addJavaPathBtn);
+
+    m_verticalLayout->addLayout(m_horizontalBtnLayout);
 
     retranslate();
 }
@@ -437,3 +445,18 @@ void JavaSettingsWidget::updateThresholds()
         m_labelMaxMemIcon->setPixmap(pix);
     }
 }
+
+void JavaSettingsWidget::on_addJavaPathBtn_clicked()
+{
+    QString raw_dir = QFileDialog::getExistingDirectory(this, tr("Add Extra Java Folder"));
+
+    auto currentList = APPLICATION->settings()->get("JavaExtraSearchPaths").toStringList();
+    if (!raw_dir.isEmpty() && QDir(raw_dir).exists()) {
+        QString cooked_dir = FS::NormalizePath(raw_dir);
+        if (!currentList.contains(cooked_dir)) {
+            currentList << cooked_dir;
+        }
+    }
+    APPLICATION->settings()->set("JavaExtraSearchPaths", currentList);
+    refresh();
+}
diff --git a/launcher/ui/widgets/JavaSettingsWidget.h b/launcher/ui/widgets/JavaSettingsWidget.h
index b7db955a4..385a9256a 100644
--- a/launcher/ui/widgets/JavaSettingsWidget.h
+++ b/launcher/ui/widgets/JavaSettingsWidget.h
@@ -25,7 +25,7 @@ class JavaSettingsWidget : public QWidget {
 
    public:
     explicit JavaSettingsWidget(QWidget* parent);
-    virtual ~JavaSettingsWidget(){};
+    virtual ~JavaSettingsWidget() = default;
 
     enum class JavaStatus { NotSet, Pending, Good, DoesNotExist, DoesNotStart, ReturnedInvalidData } javaStatus = JavaStatus::NotSet;
 
@@ -51,6 +51,7 @@ class JavaSettingsWidget : public QWidget {
     void on_javaBrowseBtn_clicked();
     void on_javaStatusBtn_clicked();
     void on_javaDownloadBtn_clicked();
+    void on_addJavaPathBtn_clicked();
     void checkFinished(const JavaChecker::Result& result);
 
    protected: /* methods */
@@ -78,7 +79,9 @@ class JavaSettingsWidget : public QWidget {
     QLabel* m_labelPermGen = nullptr;
     QSpinBox* m_permGenSpinBox = nullptr;
 
+    QHBoxLayout* m_horizontalBtnLayout = nullptr;
     QPushButton* m_javaDownloadBtn = nullptr;
+    QPushButton* m_addJavaPathBtn = nullptr;
     QIcon goodIcon;
     QIcon yellowIcon;
     QIcon badIcon;