summaryrefslogtreecommitdiffstats
path: root/gui
diff options
context:
space:
mode:
Diffstat (limited to 'gui')
-rw-r--r--gui/settingsdialog.cpp4
-rw-r--r--gui/settingsdialog.ui18
2 files changed, 17 insertions, 5 deletions
diff --git a/gui/settingsdialog.cpp b/gui/settingsdialog.cpp
index c6fe893d..011925b7 100644
--- a/gui/settingsdialog.cpp
+++ b/gui/settingsdialog.cpp
@@ -185,9 +185,9 @@ void SettingsDialog::loadSettings(SettingsObject *s)
void SettingsDialog::on_pushButton_clicked()
{
JavaUtils jut;
- QStringList paths = jut.FindJavaPath();
+ auto javas = jut.FindJavaPaths();
- ui->javaPathTextBox->setText(paths.at(0));
+ ui->javaPathTextBox->setText(std::get<JI_PATH>(javas.at(0)));
}
void SettingsDialog::on_btnBrowse_clicked()
diff --git a/gui/settingsdialog.ui b/gui/settingsdialog.ui
index d7a134fb..8fa5e96e 100644
--- a/gui/settingsdialog.ui
+++ b/gui/settingsdialog.ui
@@ -374,6 +374,12 @@
<layout class="QGridLayout" name="gridLayout_3">
<item row="0" column="0">
<widget class="QLabel" name="labelJavaPath">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Fixed" vsizetype="Preferred">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
<property name="text">
<string>Java path:</string>
</property>
@@ -381,6 +387,12 @@
</item>
<item row="2" column="0">
<widget class="QLabel" name="labelJVMArgs">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Fixed" vsizetype="Preferred">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
<property name="text">
<string>JVM arguments:</string>
</property>
@@ -402,9 +414,6 @@
<item row="0" column="1" colspan="3">
<widget class="QLineEdit" name="javaPathTextBox"/>
</item>
- <item row="2" column="1" colspan="3">
- <widget class="QLineEdit" name="jvmArgsTextBox"/>
- </item>
<item row="1" column="2">
<widget class="QPushButton" name="pushButton">
<property name="sizePolicy">
@@ -418,6 +427,9 @@
</property>
</widget>
</item>
+ <item row="2" column="1" colspan="3">
+ <widget class="QLineEdit" name="jvmArgsTextBox"/>
+ </item>
</layout>
</widget>
</item>