summaryrefslogtreecommitdiffstats
path: root/application/JavaCommon.h
diff options
context:
space:
mode:
authorPetr Mrázek <peterix@gmail.com>2017-01-07 06:52:09 +0100
committerPetr Mrázek <peterix@gmail.com>2017-01-07 06:52:09 +0100
commitc4ec6bc0f552fe7af693d52826c82f1e7db908de (patch)
tree9495ce54fb743bbeba188198b3cf00ec978c4603 /application/JavaCommon.h
parent705a658fefb3f5fe4fba9b621df70ae551272864 (diff)
downloadMultiMC-c4ec6bc0f552fe7af693d52826c82f1e7db908de.tar
MultiMC-c4ec6bc0f552fe7af693d52826c82f1e7db908de.tar.gz
MultiMC-c4ec6bc0f552fe7af693d52826c82f1e7db908de.tar.lz
MultiMC-c4ec6bc0f552fe7af693d52826c82f1e7db908de.tar.xz
MultiMC-c4ec6bc0f552fe7af693d52826c82f1e7db908de.zip
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
Diffstat (limited to 'application/JavaCommon.h')
-rw-r--r--application/JavaCommon.h12
1 files changed, 7 insertions, 5 deletions
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);