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

Block picker allows ID:meta input

Browse Source
This commit is contained in:
David Vierra 2015-02-04 23:05:55 -10:00
parent c82507d397
commit 34d1e30273
1 changed files with 35 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
src/mcedit2/widgets/blockpicker.py
View File

@ -164,9 +164,12 @@ class BlockTypesItemWidget(QtGui.QWidget):
parentTypeLabel = QtGui.QLabel("") parentTypeLabel = QtGui.QLabel("")
if block.meta != 0: if block.meta != 0:
parentBlock = block.blocktypeSet[block.internalName] try:
if parentBlock.displayName != block.displayName: parentBlock = block.blocktypeSet[block.internalName]
parentTypeLabel.setText("<font color='blue'>%s</font>" % parentBlock.displayName) if parentBlock.displayName != block.displayName:
parentTypeLabel.setText("<font color='blue'>%s</font>" % parentBlock.displayName)
except KeyError: # no parent block; parent block is not meta=0; block was ID:meta typed in
pass
labelsColumn = Column(Row(nameLabel, None, parentTypeLabel), labelsColumn = Column(Row(nameLabel, None, parentTypeLabel),
internalNameLabel) internalNameLabel)
@ -213,6 +216,7 @@ class BlockTypeListWidget(QtGui.QListWidget):
def __init__(self, *args, **kwargs): def __init__(self, *args, **kwargs):
super(BlockTypeListWidget, self).__init__(*args, **kwargs) super(BlockTypeListWidget, self).__init__(*args, **kwargs)
self.setVerticalScrollBarPolicy(Qt.ScrollBarAlwaysOn) self.setVerticalScrollBarPolicy(Qt.ScrollBarAlwaysOn)
self.specifiedItem = None
_textureAtlas = None _textureAtlas = None
@ -246,6 +250,32 @@ class BlockTypeListWidget(QtGui.QListWidget):
self._searchValue = val self._searchValue = val
for item in self.findItems("", Qt.MatchContains): for item in self.findItems("", Qt.MatchContains):
item.setHidden(val.lower() not in item.block.displayName.lower()) item.setHidden(val.lower() not in item.block.displayName.lower())
try:
if ":" in val:
ID, meta = val.split(":")
else:
ID = val
meta = 0
ID = int(ID)
meta = int(meta)
if self.specifiedItem:
self.removeItemWidget(self.specifiedItem)
self.takeItem(self.row(self.specifiedItem))
self.specifiedItem = QtGui.QListWidgetItem()
block = self.blocktypes[ID, meta]
itemWidget = BlockTypesItemWidget([block], self.textureAtlas)
self.specifiedItem.setSizeHint(itemWidget.sizeHint())
self.specifiedItem.block = block
self.specifiedItem.widget = itemWidget
self.addItem(self.specifiedItem)
self.setItemWidget(self.specifiedItem, itemWidget)
except ValueError:
pass
def updateList(self): def updateList(self):
if self.textureAtlas is None: if self.textureAtlas is None:
@ -254,6 +284,7 @@ class BlockTypeListWidget(QtGui.QListWidget):
return return
self.clear() self.clear()
self.specifiedItem = None
for block in self.blocktypes: for block in self.blocktypes:
if self._searchValue: if self._searchValue:
@ -331,6 +362,7 @@ class BlockTypePicker(QtGui.QDialog):
if self.editorSession: if self.editorSession:
self.listWidget.textureAtlas = self.editorSession.textureAtlas self.listWidget.textureAtlas = self.editorSession.textureAtlas
self.listWidget.blocktypes = self.editorSession.worldEditor.blocktypes self.listWidget.blocktypes = self.editorSession.worldEditor.blocktypes
self.searchField.clearEditText()
@property @property
def selectedBlocks(self): def selectedBlocks(self):