summaryrefslogtreecommitdiffstats
path: root/application/setupwizard
diff options
context:
space:
mode:
authorPetr Mrázek <peterix@gmail.com>2017-01-07 18:11:41 +0100
committerPetr Mrázek <peterix@gmail.com>2017-01-07 18:11:41 +0100
commit8421ef622dc8e51503bad3bc0fbee0aa63ff1b8b (patch)
tree9824a83704eca844d98cf35b0f1f3f543b493f8f /application/setupwizard
parentc4ec6bc0f552fe7af693d52826c82f1e7db908de (diff)
downloadMultiMC-8421ef622dc8e51503bad3bc0fbee0aa63ff1b8b.tar
MultiMC-8421ef622dc8e51503bad3bc0fbee0aa63ff1b8b.tar.gz
MultiMC-8421ef622dc8e51503bad3bc0fbee0aa63ff1b8b.tar.lz
MultiMC-8421ef622dc8e51503bad3bc0fbee0aa63ff1b8b.tar.xz
MultiMC-8421ef622dc8e51503bad3bc0fbee0aa63ff1b8b.zip
NOISSUE even more java polishing
* Memory minimums lowered to 128M in all Java settings UIs * Changing the memory sizes on the wizard page does not automatically trigger checks if the executable doesn't have 'java' in the name * Java detection on linux now scans some common JRE locations, not just /usr/bin/java
Diffstat (limited to 'application/setupwizard')
-rw-r--r--application/setupwizard/JavaWizardPage.cpp12
-rw-r--r--application/setupwizard/JavaWizardPage.h1
2 files changed, 9 insertions, 4 deletions
diff --git a/application/setupwizard/JavaWizardPage.cpp b/application/setupwizard/JavaWizardPage.cpp
index a56fdffc..f2b5dd92 100644
--- a/application/setupwizard/JavaWizardPage.cpp
+++ b/application/setupwizard/JavaWizardPage.cpp
@@ -85,7 +85,7 @@ void JavaWizardPage::setupUi()
m_minMemSpinBox = new QSpinBox(m_memoryGroupBox);
m_minMemSpinBox->setObjectName(QStringLiteral("minMemSpinBox"));
m_minMemSpinBox->setSuffix(QStringLiteral(" MB"));
- m_minMemSpinBox->setMinimum(256);
+ m_minMemSpinBox->setMinimum(128);
m_minMemSpinBox->setMaximum(m_availableMemory);
m_minMemSpinBox->setSingleStep(128);
m_labelMinMem->setBuddy(m_minMemSpinBox);
@@ -98,7 +98,7 @@ void JavaWizardPage::setupUi()
m_maxMemSpinBox = new QSpinBox(m_memoryGroupBox);
m_maxMemSpinBox->setObjectName(QStringLiteral("maxMemSpinBox"));
m_maxMemSpinBox->setSuffix(QStringLiteral(" MB"));
- m_maxMemSpinBox->setMinimum(512);
+ m_maxMemSpinBox->setMinimum(128);
m_maxMemSpinBox->setMaximum(m_availableMemory);
m_maxMemSpinBox->setSingleStep(128);
m_labelMaxMem->setBuddy(m_maxMemSpinBox);
@@ -254,7 +254,7 @@ void JavaWizardPage::memoryValueChanged(int)
}
if(actuallyChanged)
{
- checkJavaPath(m_javaPathTextBox->text());
+ checkJavaPathOnEdit(m_javaPathTextBox->text());
}
}
@@ -363,7 +363,11 @@ void JavaWizardPage::setJavaStatus(JavaWizardPage::JavaStatus status)
void JavaWizardPage::javaPathEdited(const QString& path)
{
- // only autocheck
+ checkJavaPathOnEdit(path);
+}
+
+void JavaWizardPage::checkJavaPathOnEdit(const QString& path)
+{
auto realPath = FS::ResolveExecutable(path);
QFileInfo pathInfo(realPath);
if (pathInfo.baseName().toLower().contains("java"))
diff --git a/application/setupwizard/JavaWizardPage.h b/application/setupwizard/JavaWizardPage.h
index 56a40453..7b0d8830 100644
--- a/application/setupwizard/JavaWizardPage.h
+++ b/application/setupwizard/JavaWizardPage.h
@@ -52,6 +52,7 @@ protected slots:
void checkFinished(JavaCheckResult result);
protected: /* methods */
+ void checkJavaPathOnEdit(const QString &path);
void checkJavaPath(const QString &path);
void setJavaStatus(JavaStatus status);
void setupUi();