diff options
| author | Thomas Groman <tgroman@nuegia.net> | 2019-09-19 00:41:48 -0700 |
|---|---|---|
| committer | Thomas Groman <tgroman@nuegia.net> | 2019-09-19 00:41:48 -0700 |
| commit | 32b3ed0a1362a4b0798ad71fac3450fb77cb7e41 (patch) | |
| tree | 7be7a2f602e6a5af7bc2db86bef9cf2a659c3d3d /application/pages/instance/InstanceSettingsPage.ui | |
| parent | 5fb2c6334e7d5237db11695b4c0ec0f2d1e47c88 (diff) | |
| download | MultiMC-32b3ed0a1362a4b0798ad71fac3450fb77cb7e41.tar MultiMC-32b3ed0a1362a4b0798ad71fac3450fb77cb7e41.tar.gz MultiMC-32b3ed0a1362a4b0798ad71fac3450fb77cb7e41.tar.lz MultiMC-32b3ed0a1362a4b0798ad71fac3450fb77cb7e41.tar.xz MultiMC-32b3ed0a1362a4b0798ad71fac3450fb77cb7e41.zip | |
merged from 0.6.7 codebase
Diffstat (limited to 'application/pages/instance/InstanceSettingsPage.ui')
| -rw-r--r-- | application/pages/instance/InstanceSettingsPage.ui | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/application/pages/instance/InstanceSettingsPage.ui b/application/pages/instance/InstanceSettingsPage.ui index 0c180df3..d6de53ee 100644 --- a/application/pages/instance/InstanceSettingsPage.ui +++ b/application/pages/instance/InstanceSettingsPage.ui @@ -6,8 +6,8 @@ <rect> <x>0</x> <y>0</y> - <width>553</width> - <height>522</height> + <width>738</width> + <height>804</height> </rect> </property> <layout class="QVBoxLayout" name="verticalLayout"> @@ -24,6 +24,16 @@ <number>0</number> </property> <item> + <widget class="QCommandLinkButton" name="openGlobalJavaSettingsButton"> + <property name="text"> + <string>Open Global Settings</string> + </property> + <property name="description"> + <string>The settings here are overrides for global settings.</string> + </property> + </widget> + </item> + <item> <widget class="QTabWidget" name="settingsTabs"> <property name="tabShape"> <enum>QTabWidget::Rounded</enum> @@ -367,6 +377,7 @@ </customwidget> </customwidgets> <tabstops> + <tabstop>openGlobalJavaSettingsButton</tabstop> <tabstop>settingsTabs</tabstop> <tabstop>javaSettingsGroupBox</tabstop> <tabstop>javaPathTextBox</tabstop> |