summaryrefslogtreecommitdiff
path: root/src/ui.py
diff options
context:
space:
mode:
Diffstat (limited to 'src/ui.py')
-rw-r--r--src/ui.py13
1 files changed, 6 insertions, 7 deletions
diff --git a/src/ui.py b/src/ui.py
index f933457..06a6902 100644
--- a/src/ui.py
+++ b/src/ui.py
@@ -38,14 +38,11 @@ class KPLayerList(QtGui.QWidget):
def selectedLayer(self):
return KP.map.layers[self.listView.selectionModel().currentIndex().row()]
- selectedLayerChanged = QtCore.pyqtSignal(KPLayer, KPLayer)
+ selectedLayerChanged = QtCore.pyqtSignal(KPLayer)
@QtCore.pyqtSlot(QtCore.QModelIndex, QtCore.QModelIndex)
def handleRowChanged(self, current, previous):
- self.selectedLayerChanged.emit(
- KP.map.layers[current.row()],
- ((previous.row() >= 0) and KP.map.layers[previous.row()]) or None
- )
+ self.selectedLayerChanged.emit(KP.map.layers[current.row()])
def addLayer(self):
@@ -146,6 +143,8 @@ class KPObjectSelector(QtGui.QListView):
QtGui.QListView.setModel(self, model)
+ model.view = self
+
menuList = model.groupItem().getGroupList()
string = QtCore.QString(QtCore.QChar(0x25BE))
@@ -234,6 +233,8 @@ class KPMainWindow(QtGui.QMainWindow):
self.layerListDock = QtGui.QDockWidget('Layers')
self.layerListDock.setWidget(self.layerList)
+ self.layerList.selectedLayerChanged.connect(self.scene.setCurrentLayer)
+
self.objectSelector = KPObjectSelector()
self.updateObjectSelector()
self.objectSelectorDock = QtGui.QDockWidget('Objects')
@@ -252,8 +253,6 @@ class KPMainWindow(QtGui.QMainWindow):
tileset = KPTileset.loadFromArc('/home/me/Dropbox/NEWERsmbw/Test3.arc')
self.objectSelector.setModel(tileset.getModel())
- tileset.getModel().view = self.objectSelector
-