Fix some event voodoo

DrLuke · May 23, 2016 · 81b2425 · 81b2425
1 parent 97e286e
commit 81b2425
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 4 deletions.
diff --git a/main.py b/main.py
@@ -102,7 +102,8 @@ def loadAction(self):
     def keyPressEvent(self, event):
         if not self.workerHandler.keyPressEvent(event):
             if not self.sheethandler.keyPressEvent(event):
-                pass
+                if not self.sheetview.keyPressEvent(event):
+                    pass
 
 
 

diff --git a/sheetHandler.py b/sheetHandler.py
@@ -79,7 +79,7 @@ def itemClicked(self, treeItem, columnIndex):
 
     def keyPressEvent(self, event):
         if event.key() == Qt.Key_Delete:
-            event.accept()
+            #event.accept()
             if self.lastItemClicked is not None:
                 delsheet = None
                 for sheet in self.sheets:

diff --git a/sheetview.py b/sheetview.py
@@ -536,7 +536,7 @@ def mouseDoubleClickEvent(self, event):
 
 
     def keyPressEvent(self, event):
-        if not event.isAccepted():
+        if True:# not event.isAccepted():
             if event.key() == Qt.Key_Delete:
                 event.accept()
                 # Delete selection except for init and loop
@@ -545,3 +545,4 @@ def keyPressEvent(self, event):
                     if node.isSelected() and not node == self.initnode and not node == self.loopnode:
                         node.delete()
                         self.scene.removeItem(node)
+                        found = True
diff --git a/workerhandler.py b/workerhandler.py
@@ -276,7 +276,7 @@ def itemClicked(self, treeItem, columnIndex):
 
     def keyPressEvent(self, event):
         if event.key() == Qt.Key_Delete:
-            event.accept()
+            #event.accept()
             if self.lastItemClicked is not None:
                 delkey = None
                 for key in self.connections: