From 8421ef622dc8e51503bad3bc0fbee0aa63ff1b8b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Petr=20Mr=C3=A1zek?= <peterix@gmail.com>
Date: Sat, 7 Jan 2017 18:11:41 +0100
Subject: 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
---
 application/pages/InstanceSettingsPage.ui  |  4 ++--
 application/pages/global/JavaPage.ui       |  6 +++---
 application/setupwizard/JavaWizardPage.cpp | 12 ++++++++----
 application/setupwizard/JavaWizardPage.h   |  1 +
 4 files changed, 14 insertions(+), 9 deletions(-)

(limited to 'application')

diff --git a/application/pages/InstanceSettingsPage.ui b/application/pages/InstanceSettingsPage.ui
index d1ad0c60..4a17aa78 100644
--- a/application/pages/InstanceSettingsPage.ui
+++ b/application/pages/InstanceSettingsPage.ui
@@ -109,7 +109,7 @@
              <string notr="true"> MB</string>
             </property>
             <property name="minimum">
-             <number>512</number>
+             <number>128</number>
             </property>
             <property name="maximum">
              <number>65536</number>
@@ -131,7 +131,7 @@
              <string notr="true"> MB</string>
             </property>
             <property name="minimum">
-             <number>256</number>
+             <number>128</number>
             </property>
             <property name="maximum">
              <number>65536</number>
diff --git a/application/pages/global/JavaPage.ui b/application/pages/global/JavaPage.ui
index 9a3bee2f..ba873d34 100644
--- a/application/pages/global/JavaPage.ui
+++ b/application/pages/global/JavaPage.ui
@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>545</width>
-    <height>559</height>
+    <height>760</height>
    </rect>
   </property>
   <property name="sizePolicy">
@@ -54,7 +54,7 @@
              <string notr="true"> MB</string>
             </property>
             <property name="minimum">
-             <number>512</number>
+             <number>128</number>
             </property>
             <property name="maximum">
              <number>65536</number>
@@ -90,7 +90,7 @@
              <string notr="true"> MB</string>
             </property>
             <property name="minimum">
-             <number>256</number>
+             <number>128</number>
             </property>
             <property name="maximum">
              <number>65536</number>
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();
-- 
cgit v1.2.3