From c4ec6bc0f552fe7af693d52826c82f1e7db908de Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20Mr=C3=A1zek?= Date: Sat, 7 Jan 2017 06:52:09 +0100 Subject: NOISSUE polish the java setup wizard page * Added a button to check why Java failed * It will now avoid automatically scanning binaries that do not have 'java' in their filename * Fixed some crashes related to running too many Java checks (it only does one at a time now) * It can now distinguish between more Java failure states (not there at all, crashing, returning nonsense) * Changed '...' button to Browse button to match the wizard page subtitle * Changing minimum and maximum memory will no longer trigger a java check twice --- application/JavaCommon.h | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) (limited to 'application/JavaCommon.h') diff --git a/application/JavaCommon.h b/application/JavaCommon.h index b100c213..4e4cd633 100644 --- a/application/JavaCommon.h +++ b/application/JavaCommon.h @@ -10,6 +10,13 @@ namespace JavaCommon { bool checkJVMArgs(QString args, QWidget *parent); + // Show a dialog saying that the Java binary was not usable + void javaBinaryWasBad(QWidget *parent, JavaCheckResult result); + // Show a dialog saying that the Java binary was not usable because of bad options + void javaArgsWereBad(QWidget *parent, JavaCheckResult result); + // Show a dialog saying that the Java binary was usable + void javaWasOk(QWidget *parent, JavaCheckResult result); + class TestCheck : public QObject { Q_OBJECT @@ -25,11 +32,6 @@ namespace JavaCommon signals: void finished(); - private: - void javaBinaryWasBad(JavaCheckResult result); - void javaArgsWereBad(JavaCheckResult result); - void javaWasOk(JavaCheckResult result); - private slots: void checkFinished(JavaCheckResult result); void checkFinishedWithArgs(JavaCheckResult result); -- cgit v1.2.3