summaryrefslogtreecommitdiffstats
path: root/gui/dialogs/InstanceSettings.ui
diff options
context:
space:
mode:
authorPetr Mrázek <peterix@gmail.com>2013-11-25 01:14:30 +0100
committerPetr Mrázek <peterix@gmail.com>2013-11-25 01:14:30 +0100
commitd6b09f7c139c73379976a9d179dd05b66afe13a6 (patch)
treeab980425296d8f65bb52bdbad6f8af96b7d12f0c /gui/dialogs/InstanceSettings.ui
parent088b039cf7de6b217a289499a8efe5a47e861829 (diff)
downloadMultiMC-d6b09f7c139c73379976a9d179dd05b66afe13a6.tar
MultiMC-d6b09f7c139c73379976a9d179dd05b66afe13a6.tar.gz
MultiMC-d6b09f7c139c73379976a9d179dd05b66afe13a6.tar.lz
MultiMC-d6b09f7c139c73379976a9d179dd05b66afe13a6.tar.xz
MultiMC-d6b09f7c139c73379976a9d179dd05b66afe13a6.zip
Add java checker to the instance settings
Diffstat (limited to 'gui/dialogs/InstanceSettings.ui')
-rw-r--r--gui/dialogs/InstanceSettings.ui36
1 files changed, 24 insertions, 12 deletions
diff --git a/gui/dialogs/InstanceSettings.ui b/gui/dialogs/InstanceSettings.ui
index 27004ed8..04c32108 100644
--- a/gui/dialogs/InstanceSettings.ui
+++ b/gui/dialogs/InstanceSettings.ui
@@ -7,7 +7,7 @@
<x>0</x>
<y>0</y>
<width>526</width>
- <height>590</height>
+ <height>622</height>
</rect>
</property>
<property name="windowTitle">
@@ -278,6 +278,13 @@
<bool>false</bool>
</property>
<layout class="QGridLayout" name="gridLayout_3">
+ <item row="2" column="4">
+ <widget class="QPushButton" name="javaTestBtn">
+ <property name="text">
+ <string>Test</string>
+ </property>
+ </widget>
+ </item>
<item row="0" column="0">
<widget class="QLabel" name="labelJavaPath">
<property name="text">
@@ -285,25 +292,32 @@
</property>
</widget>
</item>
- <item row="0" column="1">
- <widget class="QLineEdit" name="javaPathTextBox"/>
- </item>
- <item row="1" column="0">
+ <item row="3" column="0">
<widget class="QLabel" name="labelJVMArgs">
<property name="text">
<string>JVM arguments:</string>
</property>
</widget>
</item>
- <item row="0" column="2">
- <widget class="QPushButton" name="pushButton">
+ <item row="3" column="2" colspan="3">
+ <widget class="QLineEdit" name="jvmArgsTextBox"/>
+ </item>
+ <item row="0" column="2" colspan="3">
+ <widget class="QLineEdit" name="javaPathTextBox"/>
+ </item>
+ <item row="2" column="3">
+ <widget class="QPushButton" name="javaBrowseBtn">
<property name="text">
- <string>Auto-detect</string>
+ <string>Browse...</string>
</property>
</widget>
</item>
- <item row="1" column="1" colspan="2">
- <widget class="QLineEdit" name="jvmArgsTextBox"/>
+ <item row="2" column="2">
+ <widget class="QPushButton" name="javaDetectBtn">
+ <property name="text">
+ <string>Auto-detect...</string>
+ </property>
+ </widget>
</item>
</layout>
</widget>
@@ -403,8 +417,6 @@
<tabstop>maxMemSpinBox</tabstop>
<tabstop>permGenSpinBox</tabstop>
<tabstop>javaSettingsGroupBox</tabstop>
- <tabstop>javaPathTextBox</tabstop>
- <tabstop>pushButton</tabstop>
<tabstop>jvmArgsTextBox</tabstop>
<tabstop>customCommandsGroupBox</tabstop>
<tabstop>preLaunchCmdTextBox</tabstop>