diff options
| author | Andrew <forkk@forkk.net> | 2013-03-28 11:37:12 -0500 |
|---|---|---|
| committer | Andrew <forkk@forkk.net> | 2013-03-28 11:37:12 -0500 |
| commit | ebb2c54975e3f0b7b891532e8e72d2ef760f96c4 (patch) | |
| tree | 973de7066457a1faddffd3834eb0c260d5191ec2 /gui/settingsdialog.ui | |
| parent | 168ed3e8e58a8e5065ffa720f8d45f4cee0f2069 (diff) | |
| parent | 1f13f0c665001a1a79f00cdad1e63e6c9802e55f (diff) | |
| download | MultiMC-ebb2c54975e3f0b7b891532e8e72d2ef760f96c4.tar MultiMC-ebb2c54975e3f0b7b891532e8e72d2ef760f96c4.tar.gz MultiMC-ebb2c54975e3f0b7b891532e8e72d2ef760f96c4.tar.lz MultiMC-ebb2c54975e3f0b7b891532e8e72d2ef760f96c4.tar.xz MultiMC-ebb2c54975e3f0b7b891532e8e72d2ef760f96c4.zip | |
Merge branch 'master' of git://github.com/peterix/MultiMC5
Conflicts:
CMakeLists.txt
gui/mainwindow.cpp
Diffstat (limited to 'gui/settingsdialog.ui')
| -rw-r--r-- | gui/settingsdialog.ui | 44 |
1 files changed, 23 insertions, 21 deletions
diff --git a/gui/settingsdialog.ui b/gui/settingsdialog.ui index d30f56bb..6e6d115f 100644 --- a/gui/settingsdialog.ui +++ b/gui/settingsdialog.ui @@ -6,10 +6,16 @@ <rect> <x>0</x> <y>0</y> - <width>400</width> - <height>420</height> + <width>453</width> + <height>563</height> </rect> </property> + <property name="sizePolicy"> + <sizepolicy hsizetype="MinimumExpanding" vsizetype="MinimumExpanding"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> <property name="windowTitle"> <string>Settings</string> </property> @@ -400,31 +406,27 @@ <item row="1" column="1"> <widget class="QLineEdit" name="postExitCmdTextBox"/> </item> - <item row="2" column="0" colspan="2"> - <widget class="QLabel" name="labelCustomCmdsDescription"> - <property name="text"> - <string>Pre-launch command runs before the instance launches and post-exit command runs after it exits. Both will be run in MultiMC's working directory with INST_ID, INST_DIR, and INST_NAME as environment variables.</string> - </property> - <property name="wordWrap"> - <bool>true</bool> - </property> - </widget> - </item> </layout> </widget> </item> <item> - <spacer name="verticalSpacerJava"> - <property name="orientation"> - <enum>Qt::Vertical</enum> + <widget class="QLabel" name="labelCustomCmdsDescription"> + <property name="sizePolicy"> + <sizepolicy hsizetype="MinimumExpanding" vsizetype="MinimumExpanding"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> </property> - <property name="sizeHint" stdset="0"> - <size> - <width>20</width> - <height>40</height> - </size> + <property name="text"> + <string>Pre-launch command runs before the instance launches and post-exit command runs after it exits. Both will be run in MultiMC's working directory with INST_ID, INST_DIR, and INST_NAME as environment variables.</string> </property> - </spacer> + <property name="alignment"> + <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set> + </property> + <property name="wordWrap"> + <bool>true</bool> + </property> + </widget> </item> </layout> </widget> |