diff options
| author | Petr Mrázek <peterix@gmail.com> | 2013-10-06 02:22:18 +0200 |
|---|---|---|
| committer | Petr Mrázek <peterix@gmail.com> | 2013-10-06 02:22:18 +0200 |
| commit | 9cef16a47d8e6085baec08c4b2823631ef8f1b30 (patch) | |
| tree | 319d22c472b8d502deecd96bc587ce1e07545262 /gui/settingsdialog.cpp | |
| parent | f83119ce7ec3d11a903901b8eff762d2b0a9f635 (diff) | |
| parent | b5816f976eca1b2220fff284c5dbceeb5e211bde (diff) | |
| download | MultiMC-9cef16a47d8e6085baec08c4b2823631ef8f1b30.tar MultiMC-9cef16a47d8e6085baec08c4b2823631ef8f1b30.tar.gz MultiMC-9cef16a47d8e6085baec08c4b2823631ef8f1b30.tar.lz MultiMC-9cef16a47d8e6085baec08c4b2823631ef8f1b30.tar.xz MultiMC-9cef16a47d8e6085baec08c4b2823631ef8f1b30.zip | |
Merge branch 'develop' of https://github.com/Drayshak/MultiMC5 into develop
Diffstat (limited to 'gui/settingsdialog.cpp')
| -rw-r--r-- | gui/settingsdialog.cpp | 20 |
1 files changed, 19 insertions, 1 deletions
diff --git a/gui/settingsdialog.cpp b/gui/settingsdialog.cpp index 31fe2d96..c6fe893d 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,20 @@ 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)); +} + +void SettingsDialog::on_btnBrowse_clicked() +{ + QString dir = QFileDialog::getOpenFileName(this, tr("Find Java executable")); + if(!dir.isNull()) + { + ui->javaPathTextBox->setText(dir); + } +} |