diff options
| author | Colin Noga <Tempus@chronometry.ca> | 2012-01-01 14:43:12 -0600 |
|---|---|---|
| committer | Colin Noga <Tempus@chronometry.ca> | 2012-01-01 14:43:12 -0600 |
| commit | 041d6458b6f0040b78b28e4a8b1d2e7f7194b246 (patch) | |
| tree | fea836cdbbf3015bae15c43aa66b98f0e34d734d /src/editorui | |
| parent | 4c15f9319aa3ba2831e6fc1729079e0fda159b6b (diff) | |
| download | koopatlas-041d6458b6f0040b78b28e4a8b1d2e7f7194b246.tar.gz koopatlas-041d6458b6f0040b78b28e4a8b1d2e7f7194b246.zip | |
partial saving fixes, path node widget populating
Diffstat (limited to 'src/editorui')
| -rw-r--r-- | src/editorui/paths.py | 31 |
1 files changed, 26 insertions, 5 deletions
diff --git a/src/editorui/paths.py b/src/editorui/paths.py index b240b22..e402eb8 100644 --- a/src/editorui/paths.py +++ b/src/editorui/paths.py @@ -129,6 +129,10 @@ class KPEditorNode(KPEditorItem): self.stageProxy = self.HiddenProxy(self.stage, self, 6, 24) self.stage.valueChanged.connect(self.stageChange) + if node.level != None: + self.world.setValue(node.level[0]) + self.stage.setValue(node.level[1]) + self.foreignID = self.LevelSlotSpinner() self.foreignIDProxy = self.HiddenProxy(self.foreignID, self, 60, 24) @@ -142,6 +146,15 @@ class KPEditorNode(KPEditorItem): self.transitionProxy = self.HiddenProxy(self.transition, self, -102, 24) self.transition.currentIndexChanged.connect(self.transitionChange) + if node.foreignID != None: + self.foreignID.setValue(node.foreignID) + + if node.mapChange != None: + self.mapChange.setText(node.mapChange) + + self.transition.setCurrentIndex(node.transition) + + self._updatePosition() @@ -439,10 +452,10 @@ class KPEditorPath(QtGui.QGraphicsLineItem): # Layer Combo Box - self.linkedLayer = QtGui.QComboBox(self) - self.linkedLayer.setModel(KP.map.layerModel) + # self.linkedLayer = QtGui.QComboBox(self) + # self.linkedLayer.setModel(KP.map.layerModel) - TopLayout.addWidget(self.linkedLayer, 1, 1, 1, 3) + # TopLayout.addWidget(self.linkedLayer, 1, 1, 1, 3) # Connections @@ -455,7 +468,7 @@ class KPEditorPath(QtGui.QGraphicsLineItem): self.updatePathAnim) self.moveSpeedSpinner.valueChanged.connect(self.updateMoveSpeed) - self.linkedLayer.currentIndexChanged.connect(self.updateLinkLayer) + # self.linkedLayer.currentIndexChanged.connect(self.updateLinkLayer) # Layout TopLayout.addWidget(QtGui.QLabel("Speed:"), 0, 0) @@ -494,7 +507,8 @@ class KPEditorPath(QtGui.QGraphicsLineItem): self.menu = QtGui.QMenu(self) layout = QtGui.QVBoxLayout() - layout.addWidget(self.PathOptionsWidget(pathRef)) + self.bgroupWidget = self.PathOptionsWidget(pathRef) + layout.addWidget(self.bgroupWidget) self.menu.setLayout(layout) @@ -640,9 +654,15 @@ class KPEditorPath(QtGui.QGraphicsLineItem): self.unlock = self.UnlockButton(self._pathRef) self.unlockProxy = self.HiddenProxy(self.unlock, self, -24, -24) + self.unlock.secret = path.secret + self.unlock.path = path.unlocks + self.options = self.PathOptionsMenuButton(self._pathRef) self.optionsProxy = self.HiddenProxy(self.options, self, -54, +24) + self.options.bgroupWidget.ExclusiveButtons.button(path.animation).setChecked(True) + self.options.bgroupWidget.moveSpeedSpinner.setValue(path.movementSpeed) + self.updatePosition() @@ -709,3 +729,4 @@ class KPEditorPath(QtGui.QGraphicsLineItem): self.scene().removeItem(self) +
\ No newline at end of file |