summaryrefslogtreecommitdiffstats
path: root/gui/dialogs/SettingsDialog.ui
diff options
context:
space:
mode:
authorJan Dalheimer <jan@dalheimer.de>2013-12-29 17:51:16 +0100
committerJan Dalheimer <jan@dalheimer.de>2013-12-29 17:51:16 +0100
commit3380bc75633c63e8569b76981ac29528c58943ce (patch)
tree50df3e448edcb6ecfc68702698b318609327f360 /gui/dialogs/SettingsDialog.ui
parent654f444f55de58f5cf0477e3b08b8f18e8d60831 (diff)
downloadMultiMC-3380bc75633c63e8569b76981ac29528c58943ce.tar
MultiMC-3380bc75633c63e8569b76981ac29528c58943ce.tar.gz
MultiMC-3380bc75633c63e8569b76981ac29528c58943ce.tar.lz
MultiMC-3380bc75633c63e8569b76981ac29528c58943ce.tar.xz
MultiMC-3380bc75633c63e8569b76981ac29528c58943ce.zip
Launch an editor for the custom.json file. Also allow overriding of the system default editor
Diffstat (limited to 'gui/dialogs/SettingsDialog.ui')
-rw-r--r--gui/dialogs/SettingsDialog.ui34
1 files changed, 32 insertions, 2 deletions
diff --git a/gui/dialogs/SettingsDialog.ui b/gui/dialogs/SettingsDialog.ui
index 4d06d1f8..ca8c7391 100644
--- a/gui/dialogs/SettingsDialog.ui
+++ b/gui/dialogs/SettingsDialog.ui
@@ -7,7 +7,7 @@
<x>0</x>
<y>0</y>
<width>526</width>
- <height>599</height>
+ <height>628</height>
</rect>
</property>
<property name="sizePolicy">
@@ -39,7 +39,7 @@
<attribute name="title">
<string>General</string>
</attribute>
- <layout class="QVBoxLayout" name="generalTabLayout">
+ <layout class="QVBoxLayout" name="verticalLayout">
<item>
<widget class="QGroupBox" name="sortingModeBox">
<property name="enabled">
@@ -237,6 +237,36 @@
</widget>
</item>
<item>
+ <widget class="QGroupBox" name="editorsBox">
+ <property name="title">
+ <string>External Editors (leave empty for system default)</string>
+ </property>
+ <layout class="QGridLayout" name="foldersBoxLayout_2">
+ <item row="0" column="1">
+ <widget class="QLineEdit" name="jsonEditorTextBox">
+ <property name="clearButtonEnabled">
+ <bool>true</bool>
+ </property>
+ </widget>
+ </item>
+ <item row="0" column="0">
+ <widget class="QLabel" name="labelJsonEditor">
+ <property name="text">
+ <string>JSON Editor:</string>
+ </property>
+ </widget>
+ </item>
+ <item row="0" column="2">
+ <widget class="QToolButton" name="jsonEditorBrowseBtn">
+ <property name="text">
+ <string>...</string>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </widget>
+ </item>
+ <item>
<spacer name="generalTabSpacer">
<property name="orientation">
<enum>Qt::Vertical</enum>