From ca297fca79a7b1b96e41ba5abed4956af9383c16 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20Mr=C3=A1zek?= Date: Sun, 24 Nov 2013 06:36:16 +0100 Subject: Prepare for rework of instance launch/update Added missing licenses Added a Java functionality checker (detects 32/64bit java) Refactor of *Update - no longer based on BaseUpdate, but Task directly Fixed runner script to not derp up on 32bit linux. Could add more detection and error reporting there. Resources are now split into graphics and generated. Generated resources are placed in the build tree and included from there. Used the Java checker in the main settings dialog (TODO: instance settings). Partial support for ${arch}-using libraries - both 32 and 64 variants of ${arch} are downloaded. --- gui/dialogs/SettingsDialog.h | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) (limited to 'gui/dialogs/SettingsDialog.h') diff --git a/gui/dialogs/SettingsDialog.h b/gui/dialogs/SettingsDialog.h index e24047c3..0cb8fa38 100644 --- a/gui/dialogs/SettingsDialog.h +++ b/gui/dialogs/SettingsDialog.h @@ -15,8 +15,11 @@ #pragma once +#include #include +#include "logic/JavaChecker.h" + class SettingsObject; namespace Ui @@ -48,16 +51,18 @@ slots: void on_lwjglDirBrowseBtn_clicked(); - void on_compatModeCheckBox_clicked(bool checked); - void on_maximizedCheckBox_clicked(bool checked); void on_buttonBox_accepted(); - void on_pushButton_clicked(); + void on_javaDetectBtn_clicked(); + + void on_javaTestBtn_clicked(); - void on_btnBrowse_clicked(); + void on_javaBrowseBtn_clicked(); + void checkFinished(JavaCheckResult result); private: Ui::SettingsDialog *ui; + std::shared_ptr checker; }; -- cgit v1.2.3