Mirrors/PrismLauncher
1
0
Fork 0
mirror of https://github.com/PrismLauncher/PrismLauncher.git synced 2025-05-28 21:00:20 +02:00
Code Issues Packages Projects Releases Wiki Activity

Make requested changes

Browse Source 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
This commit is contained in:
TheKodeToad 2025-02-04 17:05:20 +00:00
parent 68bf409a98
commit 5a76d9b7e1
No known key found for this signature in database
GPG Key ID: 5E39D70B4C93C38E
7 changed files with 33 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -63,9 +63,6 @@ JavaPage::JavaPage(QWidget* parent) : QWidget(parent), ui(new Ui::JavaPage)
{
ui->setupUi(this);
m_javaSettings = new JavaSettingsWidget(nullptr, this);
ui->generalScrollArea->setWidget(m_javaSettings);
if (BuildConfig.JAVA_DOWNLOADER_ENABLED) {
ui->managedJavaList->initialize(new JavaInstallList(this, true));
ui->managedJavaList->setResizeOn(2);
@ -88,7 +85,7 @@ void JavaPage::retranslate()
bool JavaPage::apply()
{
m_javaSettings->saveSettings();
ui->javaSettings->saveSettings();
JavaCommon::checkJVMArgs(APPLICATION->settings()->get("JvmArgs").toString(), this);
return true;
}

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

@ -71,5 +71,4 @@ class JavaPage : public QWidget, public BasePage {
private:
Ui::JavaPage* ui;
JavaSettingsWidget* m_javaSettings;
};

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

@ -53,6 +53,11 @@
<height>610</height>
</rect>
</property>
<layout class="QVBoxLayout" name="verticalLayout_4">
<item>
<widget class="JavaSettingsWidget" name="javaSettings" native="true"/>
</item>
</layout>
</widget>
</widget>
</item>
@ -146,6 +151,12 @@
<header>ui/widgets/VersionSelectWidget.h</header>
<container>1</container>
</customwidget>
<customwidget>
<class>JavaSettingsWidget</class>
<extends>QWidget</extends>
<header>ui/widgets/JavaSettingsWidget.h</header>
<container>1</container>
</customwidget>
</customwidgets>
<resources/>
<connections/>

8
launcher/ui/pages/global/LauncherPage.ui
View File

@ -6,7 +6,7 @@
<rect>
<x>0</x>
<y>0</y>
<width>562</width>
<width>511</width>
<height>726</height>
</rect>
</property>
@ -38,7 +38,7 @@
<enum>QTabWidget::Rounded</enum>
</property>
<property name="currentIndex">
<number>2</number>
<number>0</number>
</property>
<widget class="QWidget" name="featuresTab">
<attribute name="title">
@ -58,8 +58,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>570</width>
<height>692</height>
<width>473</width>
<height>770</height>
</rect>
</property>
<layout class="QVBoxLayout" name="verticalLayout_8">

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

@ -36,21 +36,20 @@
*/
#include "JavaSettingsWidget.h"
#include <Application.h>
#include <BuildConfig.h>
#include <JavaCommon.h>
#include <settings/Setting.h>
#include <ui/java/InstallJavaDialog.h>
#include <FileSystem.h>
#include <java/JavaInstallList.h>
#include <java/JavaUtils.h>
#include <sys.h>
#include <ui/dialogs/CustomMessageBox.h>
#include <ui/dialogs/VersionSelectDialog.h>
#include <QFileDialog>
#include <QFileInfo>
#include <memory>
#include "Application.h"
#include "BuildConfig.h"
#include "FileSystem.h"
#include "JavaCommon.h"
#include "java/JavaInstallList.h"
#include "java/JavaUtils.h"
#include "settings/Setting.h"
#include "sys.h"
#include "ui/dialogs/CustomMessageBox.h"
#include "ui/dialogs/VersionSelectDialog.h"
#include "ui/java/InstallJavaDialog.h"
#include "ui_JavaSettingsWidget.h"

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

@ -36,9 +36,9 @@
#pragma once
#include <BaseInstance.h>
#include <JavaCommon.h>
#include <QWidget>
#include "BaseInstance.h"
#include "JavaCommon.h"
namespace Ui {
class JavaSettingsWidget;
@ -48,6 +48,7 @@ class JavaSettingsWidget : public QWidget {
Q_OBJECT
public:
explicit JavaSettingsWidget(QWidget* parent = nullptr) : JavaSettingsWidget(nullptr, nullptr) {}
explicit JavaSettingsWidget(InstancePtr instance, QWidget* parent = nullptr);
~JavaSettingsWidget() override;

6
launcher/ui/widgets/MinecraftSettingsWidget.cpp
View File

@ -50,13 +50,11 @@ MinecraftSettingsWidget::MinecraftSettingsWidget(MinecraftInstancePtr instance,
m_ui->setupUi(this);
if (m_instance == nullptr) {
for (int i = 0; i < m_ui->settingsTabs->count(); ++i) {
for (int i = m_ui->settingsTabs->count() - 1; i >= 0; --i) {
const QString name = m_ui->settingsTabs->widget(i)->objectName();
if (name == "javaPage" || name == "launchPage") {
if (name == "javaPage" || name == "launchPage")
m_ui->settingsTabs->removeTab(i);
--i;
}
}
m_ui->openGlobalSettingsButton->setVisible(false);