summaryrefslogtreecommitdiffstats
path: root/gui/dialogs
diff options
context:
space:
mode:
authorSky <git@bunnies.cc>2013-12-30 06:36:16 -0800
committerSky <git@bunnies.cc>2013-12-30 06:36:16 -0800
commitc44bcfab4bf4f25a7f39d6154fc366db4c0fcfbc (patch)
treea82dfbd673dbd9d1ea7d3ae848196fffb2c36368 /gui/dialogs
parent8f6d808090071ab3f1b1af1efba3464cc78185af (diff)
parent76892c284bcd0f55006edc9a1897a805bd99bae2 (diff)
downloadMultiMC-c44bcfab4bf4f25a7f39d6154fc366db4c0fcfbc.tar
MultiMC-c44bcfab4bf4f25a7f39d6154fc366db4c0fcfbc.tar.gz
MultiMC-c44bcfab4bf4f25a7f39d6154fc366db4c0fcfbc.tar.lz
MultiMC-c44bcfab4bf4f25a7f39d6154fc366db4c0fcfbc.tar.xz
MultiMC-c44bcfab4bf4f25a7f39d6154fc366db4c0fcfbc.zip
Merge pull request #29 from 02JanDal/java_browse_button
Make the java browse button look like the other browse buttons
Diffstat (limited to 'gui/dialogs')
-rw-r--r--gui/dialogs/SettingsDialog.ui66
1 files changed, 41 insertions, 25 deletions
diff --git a/gui/dialogs/SettingsDialog.ui b/gui/dialogs/SettingsDialog.ui
index 4c05b883..ec4d156e 100644
--- a/gui/dialogs/SettingsDialog.ui
+++ b/gui/dialogs/SettingsDialog.ui
@@ -155,6 +155,12 @@
<property name="enabled">
<bool>true</bool>
</property>
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
<property name="maximumSize">
<size>
<width>28</width>
@@ -485,25 +491,6 @@
</property>
</widget>
</item>
- <item row="3" 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>
- </widget>
- </item>
- <item row="0" column="1" colspan="5">
- <widget class="QLineEdit" name="javaPathTextBox"/>
- </item>
- <item row="3" column="1" colspan="5">
- <widget class="QLineEdit" name="jvmArgsTextBox"/>
- </item>
<item row="1" column="1">
<widget class="QPushButton" name="javaDetectBtn">
<property name="sizePolicy">
@@ -517,7 +504,7 @@
</property>
</widget>
</item>
- <item row="1" column="4" colspan="2">
+ <item row="1" column="2">
<widget class="QPushButton" name="javaTestBtn">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Fixed">
@@ -530,19 +517,48 @@
</property>
</widget>
</item>
- <item row="1" column="2" colspan="2">
- <widget class="QPushButton" name="javaBrowseBtn">
+ <item row="2" column="0">
+ <widget class="QLabel" name="labelJVMArgs">
<property name="sizePolicy">
- <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+ <sizepolicy hsizetype="Fixed" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
- <string>Browse...</string>
+ <string>JVM arguments:</string>
</property>
</widget>
</item>
+ <item row="0" column="1" colspan="2">
+ <layout class="QHBoxLayout" name="horizontalLayout">
+ <item>
+ <widget class="QLineEdit" name="javaPathTextBox"/>
+ </item>
+ <item>
+ <widget class="QPushButton" name="javaBrowseBtn">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="maximumSize">
+ <size>
+ <width>28</width>
+ <height>16777215</height>
+ </size>
+ </property>
+ <property name="text">
+ <string>...</string>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </item>
+ <item row="2" column="1" colspan="2">
+ <widget class="QLineEdit" name="jvmArgsTextBox"/>
+ </item>
</layout>
</widget>
</item>
@@ -611,7 +627,7 @@
</layout>
</widget>
<tabstops>
- <tabstop>settingsTabs</tabstop>
+ <tabstop>settingsTab</tabstop>
<tabstop>buttonBox</tabstop>
<tabstop>sortLastLaunchedBtn</tabstop>
<tabstop>sortByNameBtn</tabstop>