From 3298da6dc5af4e46b33293705e4de35dabf7bc98 Mon Sep 17 00:00:00 2001 From: Marius Stanciu Date: Wed, 30 May 2018 18:02:44 +0300 Subject: [PATCH] - solve the conflicted files (hopefully) without CLI commands --- ObjectCollection.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/ObjectCollection.py b/ObjectCollection.py index 377e88db..3b82b1f8 100644 --- a/ObjectCollection.py +++ b/ObjectCollection.py @@ -161,8 +161,12 @@ class ObjectCollection(): self.object_list.append(obj) # Create the model item to insert into the QListView - icon = QtGui.QIcon(self.icons[obj.kind]) #self.icons["gerber"]) - item = QtGui.QStandardItem(icon, str(name)) + icon = QtGui.QIcon(self.icons[obj.kind]) # self.icons["gerber"]) + item = QtGui.QStandardItem(icon, name) + # Item is not editable, so that double click + # does not allow cell value modification. + item.setEditable(False) + # The item is checkable, to add the checkbox. item.setCheckable(True) if obj.options["plot"] is True: item.setCheckState(2) #Qt.Checked)