diff options
| author | Petr Mrázek <peterix@gmail.com> | 2014-02-01 19:37:16 +0100 |
|---|---|---|
| committer | Petr Mrázek <peterix@gmail.com> | 2014-02-01 19:37:16 +0100 |
| commit | 1936bd181f57a554ce0dd757ffe9419100eb47f4 (patch) | |
| tree | a22660979335746b930c88f353b4e29f1bbe9a2a /gui/dialogs/OneSixModEditDialog.ui | |
| parent | b4b6091372310f4a811180cffde3ea5611881e6c (diff) | |
| parent | 8637cce4333aaf56a231d5fab866b0e770436783 (diff) | |
| download | MultiMC-1936bd181f57a554ce0dd757ffe9419100eb47f4.tar MultiMC-1936bd181f57a554ce0dd757ffe9419100eb47f4.tar.gz MultiMC-1936bd181f57a554ce0dd757ffe9419100eb47f4.tar.lz MultiMC-1936bd181f57a554ce0dd757ffe9419100eb47f4.tar.xz MultiMC-1936bd181f57a554ce0dd757ffe9419100eb47f4.zip | |
Merge branch 'feature_derpstances' of https://github.com/02JanDal/MultiMC5 into feature_derpstances
Conflicts:
gui/dialogs/OneSixModEditDialog.cpp
logic/OneSixUpdate.cpp
Diffstat (limited to 'gui/dialogs/OneSixModEditDialog.ui')
| -rw-r--r-- | gui/dialogs/OneSixModEditDialog.ui | 53 |
1 files changed, 9 insertions, 44 deletions
diff --git a/gui/dialogs/OneSixModEditDialog.ui b/gui/dialogs/OneSixModEditDialog.ui index 899e0cbf..d90c6d93 100644 --- a/gui/dialogs/OneSixModEditDialog.ui +++ b/gui/dialogs/OneSixModEditDialog.ui @@ -26,7 +26,7 @@ </size> </property> <property name="currentIndex"> - <number>1</number> + <number>0</number> </property> <widget class="QWidget" name="libTab"> <attribute name="title"> @@ -43,6 +43,9 @@ <property name="horizontalScrollBarPolicy"> <enum>Qt::ScrollBarAlwaysOff</enum> </property> + <attribute name="headerVisible"> + <bool>true</bool> + </attribute> </widget> </item> <item> @@ -85,61 +88,23 @@ </widget> </item> <item> - <widget class="QPushButton" name="customizeBtn"> - <property name="toolTip"> - <string>Create an customized copy of the base version</string> - </property> - <property name="text"> - <string>Customize</string> - </property> - </widget> - </item> - <item> - <widget class="QPushButton" name="revertBtn"> - <property name="enabled"> - <bool>false</bool> - </property> - <property name="toolTip"> - <string>Revert to original base version</string> - </property> - <property name="text"> - <string>Revert</string> - </property> - </widget> - </item> - <item> <widget class="Line" name="line"> - <property name="frameShadow"> - <enum>QFrame::Sunken</enum> - </property> <property name="orientation"> <enum>Qt::Horizontal</enum> </property> </widget> </item> <item> - <widget class="QPushButton" name="addLibraryBtn"> - <property name="enabled"> - <bool>false</bool> - </property> - <property name="toolTip"> - <string>Add new libraries</string> - </property> + <widget class="QPushButton" name="reloadLibrariesBtn"> <property name="text"> - <string>&Add</string> + <string>Reload</string> </property> </widget> </item> <item> <widget class="QPushButton" name="removeLibraryBtn"> - <property name="enabled"> - <bool>false</bool> - </property> - <property name="toolTip"> - <string>Remove selected libraries</string> - </property> <property name="text"> - <string>&Remove</string> + <string>Remove</string> </property> </widget> </item> @@ -151,9 +116,9 @@ </widget> </item> <item> - <widget class="QPushButton" name="customEditorBtn"> + <widget class="QPushButton" name="userEditorBtn"> <property name="text"> - <string>Open custom.json</string> + <string>Open user.json</string> </property> </widget> </item> |