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

Removed JavaExtraSearchPaths

Browse Source 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
This commit is contained in:
Trial97 2024-02-18 21:38:31 +02:00
parent a288779790
commit 889f604a41
No known key found for this signature in database
GPG Key ID: 55EF5DA53DB36318
8 changed files with 0 additions and 133 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
launcher/Application.cpp
View File

@ -632,7 +632,6 @@ Application::Application(int& argc, char** argv) : QApplication(argc, argv)
m_settings->registerSetting("JvmArgs", "");
m_settings->registerSetting("IgnoreJavaCompatibility", false);
m_settings->registerSetting("IgnoreJavaWizard", false);
m_settings->registerSetting("JavaExtraSearchPaths", QStringList());
m_settings->registerSetting("AutomaticJavaSwitch", false);
m_settings->registerSetting("AutomaticJavaDownload", false);

37
launcher/java/JavaUtils.cpp
View File

@ -338,7 +338,6 @@ QList<QString> JavaUtils::FindJavaPaths()
candidates.append(getMinecraftJavaBundle());
candidates.append(getPrismJavaBundle());
candidates.append(getPrismExtraJavaPaths());
candidates = addJavasFromEnv(candidates);
candidates.removeDuplicates();
return candidates;
@ -366,7 +365,6 @@ QList<QString> JavaUtils::FindJavaPaths()
}
javas.append(getMinecraftJavaBundle());
javas.append(getPrismJavaBundle());
javas.append(getPrismExtraJavaPaths());
javas = addJavasFromEnv(javas);
javas.removeDuplicates();
return javas;
@ -420,7 +418,6 @@ QList<QString> JavaUtils::FindJavaPaths()
javas.append(getMinecraftJavaBundle());
javas.append(getPrismJavaBundle());
javas.append(getPrismExtraJavaPaths());
javas = addJavasFromEnv(javas);
javas.removeDuplicates();
return javas;
@ -435,7 +432,6 @@ QList<QString> JavaUtils::FindJavaPaths()
javas.append(getMinecraftJavaBundle());
javas.append(getPrismJavaBundle());
javas.append(getPrismExtraJavaPaths());
javas.removeDuplicates();
return addJavasFromEnv(javas);
}
@ -521,36 +517,3 @@ QStringList getPrismJavaBundle()
return javas;
}
QStringList getPrismExtraJavaPaths()
{
QList<QString> javas;
QString executable = "java";
#if defined(Q_OS_WIN32)
executable += "w.exe";
#endif
auto scanDir = [&](QString prefix) {
javas.append(FS::PathCombine(prefix, "jre", "bin", executable));
javas.append(FS::PathCombine(prefix, "bin", executable));
javas.append(FS::PathCombine(prefix, executable));
};
auto scanJavaDir = [&](const QString& dirPath) {
QDir dir(dirPath);
if (!dir.exists())
return;
auto entries = dir.entryInfoList(QDir::Dirs | QDir::NoDotAndDotDot);
for (auto& entry : entries) {
scanDir(entry.canonicalFilePath());
}
};
auto extra_paths = APPLICATION->settings()->get("JavaExtraSearchPaths").toStringList();
for (auto& entry : extra_paths) {
scanDir(entry);
scanJavaDir(entry);
}
return javas;
}

1
launcher/java/JavaUtils.h
View File

@ -27,7 +27,6 @@ QString stripVariableEntries(QString name, QString target, QString remove);
QProcessEnvironment CleanEnviroment();
QStringList getMinecraftJavaBundle();
QStringList getPrismJavaBundle();
QStringList getPrismExtraJavaPaths();
class JavaUtils : public QObject {
Q_OBJECT

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

@ -110,7 +110,6 @@ void JavaPage::applySettings()
s->set("IgnoreJavaWizard", ui->skipJavaWizardCheckbox->isChecked());
s->set("AutomaticJavaSwitch", ui->autodetectJavaCheckBox->isChecked());
s->set("AutomaticJavaDownload", ui->autodownloadCheckBox->isChecked());
s->set("JavaExtraSearchPaths", m_extra_paths->stringList());
JavaCommon::checkJVMArgs(s->get("JvmArgs").toString(), this->parentWidget());
}
void JavaPage::loadSettings()
@ -135,8 +134,6 @@ void JavaPage::loadSettings()
ui->skipJavaWizardCheckbox->setChecked(s->get("IgnoreJavaWizard").toBool());
ui->autodetectJavaCheckBox->setChecked(s->get("AutomaticJavaSwitch").toBool());
ui->autodownloadCheckBox->setChecked(s->get("AutomaticJavaSwitch").toBool() && s->get("AutomaticJavaDownload").toBool());
m_extra_paths = new QStringListModel(s->get("JavaExtraSearchPaths").toStringList(), this);
ui->extraJavaPathsList->setModel(m_extra_paths);
}
void JavaPage::on_javaDetectBtn_clicked()
@ -247,30 +244,6 @@ void JavaPage::updateThresholds()
}
}
void JavaPage::on_addExtraPathButton_clicked()
{
QString raw_dir = QFileDialog::getExistingDirectory(this, tr("Add Extra Java Folder"));
if (!raw_dir.isEmpty() && QDir(raw_dir).exists()) {
QString cooked_dir = FS::NormalizePath(raw_dir);
auto currentList = m_extra_paths->stringList();
if (!currentList.contains(cooked_dir)) {
currentList << cooked_dir;
m_extra_paths->setStringList(currentList);
}
}
APPLICATION->settings()->set("JavaExtraSearchPaths", m_extra_paths->stringList());
}
void JavaPage::on_removeExtraPathButton_clicked()
{
auto indexes = ui->extraJavaPathsList->selectionModel()->selectedIndexes();
if (indexes.size()) {
m_extra_paths->removeRow(indexes.first().row());
}
APPLICATION->settings()->set("JavaExtraSearchPaths", m_extra_paths->stringList());
}
void JavaPage::on_downloadJavaButton_clicked()
{
on_javaDownloadBtn_clicked();

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

@ -73,8 +73,6 @@ class JavaPage : public QWidget, public BasePage {
void on_javaTestBtn_clicked();
void on_javaBrowseBtn_clicked();
void on_javaDownloadBtn_clicked();
void on_addExtraPathButton_clicked();
void on_removeExtraPathButton_clicked();
void on_downloadJavaButton_clicked();
void on_removeJavaButton_clicked();
void on_refreshJavaButton_clicked();
@ -84,5 +82,4 @@ class JavaPage : public QWidget, public BasePage {
private:
Ui::JavaPage* ui;
unique_qobject_ptr<JavaCommon::TestCheck> checker;
QStringListModel* m_extra_paths;
};

43
launcher/ui/pages/global/JavaPage.ui
View File

@ -391,49 +391,6 @@
</layout>
</widget>
</item>
<item>
<widget class="QGroupBox" name="extraJavaPathsGroupBox">
<property name="title">
<string>Java extra paths</string>
</property>
<layout class="QHBoxLayout" name="horizontalLayout_3">
<item>
<widget class="QListView" name="extraJavaPathsList"/>
</item>
<item>
<layout class="QVBoxLayout" name="extraJavaPathsButtonsLayout">
<item>
<widget class="QPushButton" name="addExtraPathButton">
<property name="text">
<string>Add</string>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="removeExtraPathButton">
<property name="text">
<string>Remove</string>
</property>
</widget>
</item>
<item>
<spacer name="extraPathSpacer">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>40</height>
</size>
</property>
</spacer>
</item>
</layout>
</item>
</layout>
</widget>
</item>
<item>
<spacer name="managementSpacer">
<property name="orientation">

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

@ -44,7 +44,6 @@ 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()
@ -133,9 +132,6 @@ void JavaSettingsWidget::setupUi()
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);
m_autoJavaGroupBox = new QGroupBox(this);
@ -523,21 +519,6 @@ void JavaSettingsWidget::updateThresholds()
}
}
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();
}
bool JavaSettingsWidget::autodownloadJava() const
{
return m_autodetectJavaCheckBox->isChecked();

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

@ -54,7 +54,6 @@ 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 */
@ -84,7 +83,6 @@ class JavaSettingsWidget : public QWidget {
QHBoxLayout* m_horizontalBtnLayout = nullptr;
QPushButton* m_javaDownloadBtn = nullptr;
QPushButton* m_addJavaPathBtn = nullptr;
QIcon goodIcon;
QIcon yellowIcon;
QIcon badIcon;