diff options
| author | Sky <git@bunnies.cc> | 2013-10-05 01:08:13 +0100 |
|---|---|---|
| committer | Sky <git@bunnies.cc> | 2013-10-05 01:08:13 +0100 |
| commit | 1dee4bb60d08995f0fd4eb229f131f2ca546d24c (patch) | |
| tree | 0f08e6351388c60012dd6ab5caf55a8b92eea056 /gui/settingsdialog.cpp | |
| parent | eba9b3d759dbf6e402e91ab897059f1d274aef90 (diff) | |
| download | PrismLauncher-1dee4bb60d08995f0fd4eb229f131f2ca546d24c.tar.gz PrismLauncher-1dee4bb60d08995f0fd4eb229f131f2ca546d24c.tar.bz2 PrismLauncher-1dee4bb60d08995f0fd4eb229f131f2ca546d24c.zip | |
Add naive Windows Java detection - JavaUtils for finding it on other systems (incomplete)
Diffstat (limited to 'gui/settingsdialog.cpp')
| -rw-r--r-- | gui/settingsdialog.cpp | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/gui/settingsdialog.cpp b/gui/settingsdialog.cpp index 9736c1c7..b5ff8d56 100644 --- a/gui/settingsdialog.cpp +++ b/gui/settingsdialog.cpp @@ -13,10 +13,11 @@ * limitations under the License. */ +#include <MultiMC.h> #include "settingsdialog.h" #include "ui_settingsdialog.h" +#include "logic/JavaUtils.h" -#include <MultiMC.h> #include <settingsobject.h> #include <QFileDialog> #include <QMessageBox> @@ -180,3 +181,11 @@ void SettingsDialog::loadSettings(SettingsObject *s) ui->preLaunchCmdTextBox->setText(s->get("PreLaunchCommand").toString()); ui->postExitCmdTextBox->setText(s->get("PostExitCommand").toString()); } + +void SettingsDialog::on_pushButton_clicked() +{ + JavaUtils jut; + QStringList paths = jut.FindJavaPath(); + + ui->javaPathTextBox->setText(paths.at(0)); +} |