summaryrefslogtreecommitdiffstats
path: root/application
diff options
context:
space:
mode:
authorSpencer Burris <whitephoenix0@users.noreply.github.com>2016-03-15 09:19:16 -0700
committerSpencer Burris <whitephoenix0@users.noreply.github.com>2016-03-15 09:19:16 -0700
commitf96d20b6f7f8853323af747b2e40383daae77fc1 (patch)
treef538ced080bbefc6c0f6d1750e335228dd060f1c /application
parentead4c17d0abd25e61e23a9324a29f2ef9bbd222e (diff)
downloadMultiMC-f96d20b6f7f8853323af747b2e40383daae77fc1.tar
MultiMC-f96d20b6f7f8853323af747b2e40383daae77fc1.tar.gz
MultiMC-f96d20b6f7f8853323af747b2e40383daae77fc1.tar.lz
MultiMC-f96d20b6f7f8853323af747b2e40383daae77fc1.tar.xz
MultiMC-f96d20b6f7f8853323af747b2e40383daae77fc1.zip
NOISSUE: Add note about Java 8 settings permgen automatically
Diffstat (limited to 'application')
-rw-r--r--application/pages/InstanceSettingsPage.ui35
1 files changed, 21 insertions, 14 deletions
diff --git a/application/pages/InstanceSettingsPage.ui b/application/pages/InstanceSettingsPage.ui
index 19a6aa26..f874bf09 100644
--- a/application/pages/InstanceSettingsPage.ui
+++ b/application/pages/InstanceSettingsPage.ui
@@ -93,6 +93,13 @@
<bool>false</bool>
</property>
<layout class="QGridLayout" name="gridLayout_2">
+ <item row="0" column="0">
+ <widget class="QLabel" name="labelMinMem">
+ <property name="text">
+ <string>Minimum memory allocation:</string>
+ </property>
+ </widget>
+ </item>
<item row="1" column="1">
<widget class="QSpinBox" name="maxMemSpinBox">
<property name="toolTip">
@@ -115,20 +122,6 @@
</property>
</widget>
</item>
- <item row="0" column="0">
- <widget class="QLabel" name="labelMinMem">
- <property name="text">
- <string>Minimum memory allocation:</string>
- </property>
- </widget>
- </item>
- <item row="1" column="0">
- <widget class="QLabel" name="labelMaxMem">
- <property name="text">
- <string>Maximum memory allocation:</string>
- </property>
- </widget>
- </item>
<item row="0" column="1">
<widget class="QSpinBox" name="minMemSpinBox">
<property name="toolTip">
@@ -180,6 +173,20 @@
</property>
</widget>
</item>
+ <item row="1" column="0">
+ <widget class="QLabel" name="labelMaxMem">
+ <property name="text">
+ <string>Maximum memory allocation:</string>
+ </property>
+ </widget>
+ </item>
+ <item row="3" column="0" colspan="2">
+ <widget class="QLabel" name="labelPermgenNote">
+ <property name="text">
+ <string>Note: Permgen is set automatically by Java 8</string>
+ </property>
+ </widget>
+ </item>
</layout>
</widget>
</item>