AstralTransRocketries/mcedit2
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Brush tool option layout has better flow now

Browse Source
This commit is contained in:
David Vierra 2016-02-08 17:15:51 -10:00
parent 114e3341ad
commit 0d3ebf10a8
2 changed files with 19 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/mcedit2/editortools/brush/modes.py
View File

@ -88,9 +88,7 @@ class Fill(BrushMode):
self.blockTypeButton.block = brushTool.editorSession.worldEditor.blocktypes['minecraft:stone'] self.blockTypeButton.block = brushTool.editorSession.worldEditor.blocktypes['minecraft:stone']
self.blockTypeButton.blocksChanged.connect(brushTool.updateCursor) self.blockTypeButton.blocksChanged.connect(brushTool.updateCursor)
self.optionsWidget.setLayout(Column( self.optionsWidget.setLayout(Row(label, self.blockTypeButton, margin=0))
Row(label, self.blockTypeButton, margin=0),
None, margin=0))
def getOptions(self): def getOptions(self):
return {'blockInfo': self.blockTypeButton.block} return {'blockInfo': self.blockTypeButton.block}
@ -138,7 +136,7 @@ class Biome(BrushMode):
self.biomeTypeBox.addItem(biome.name, biome.ID) self.biomeTypeBox.addItem(biome.name, biome.ID)
self.biomeTypeBox.activated.connect(brushTool.updateCursor) self.biomeTypeBox.activated.connect(brushTool.updateCursor)
self.optionsWidget.setLayout(Column(Row(label, self.biomeTypeBox, margin=0), None, margin=0)) self.optionsWidget.setLayout(Row(label, self.biomeTypeBox, margin=0))
def getOptions(self): def getOptions(self):
return {'biomeID': self.biomeTypeBox.itemData(self.biomeTypeBox.currentIndex())} return {'biomeID': self.biomeTypeBox.itemData(self.biomeTypeBox.currentIndex())}

18
src/mcedit2/ui/editortools/brush.ui
View File

@ -13,7 +13,7 @@
<property name="windowTitle"> <property name="windowTitle">
<string>Form</string> <string>Form</string>
</property> </property>
<layout class="QVBoxLayout" name="verticalLayout"> <layout class="QVBoxLayout" name="verticalLayout" stretch="0,0,1">
<item> <item>
<layout class="QGridLayout" name="gridLayout" rowstretch="0,0,0,0,0,0,0"> <layout class="QGridLayout" name="gridLayout" rowstretch="0,0,0,0,0,0,0">
<item row="6" column="1" colspan="2"> <item row="6" column="1" colspan="2">
@ -135,6 +135,22 @@
</property> </property>
</widget> </widget>
</item> </item>
<item>
<spacer name="verticalSpacer">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeType">
<enum>QSizePolicy::MinimumExpanding</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>0</height>
</size>
</property>
</spacer>
</item>
</layout> </layout>
</widget> </widget>
<customwidgets> <customwidgets>