clean up

Author: jchanvfx

NodeGraphQt/widgets/actions.py

@@ -39,15 +39,13 @@ def get_action(self, name):
                 return action
 
 
-class NodeAction(QtWidgets.QAction):
+class NodeAction(GraphAction):
 
     executed = QtCore.Signal(object, object)
 
     def __init__(self, *args, **kwargs):
         super(NodeAction, self).__init__(*args, **kwargs)
-        self.graph = None
         self.node_id = None
-        self.triggered.connect(self._on_triggered)
 
     def _on_triggered(self):
         node = self.graph.get_node_by_id(self.node_id)

NodeGraphQt/widgets/viewer.py

@@ -83,10 +83,13 @@ def __init__(self, parent=None):
 
         self._ctx_menu = BaseMenu('NodeGraph', self)
         self._ctx_node_menu = BaseMenu('Nodes', self)
+        self._ctx_port_menu = BaseMenu('Ports', self)
         menu_bar.addMenu(self._ctx_menu)
         menu_bar.addMenu(self._ctx_node_menu)
+        menu_bar.addMenu(self._ctx_port_menu)
 
         self._ctx_node_menu.setDisabled(True)
+        self._ctx_port_menu.setDisabled(True)
 
         self.acyclic = True
         self.LMB_state = False
@@ -157,7 +160,7 @@ def resizeEvent(self, event):
 
     def contextMenuEvent(self, event):
         self.RMB_state = False
-        ctx_menu = self._ctx_menu
+        ctx_menu = None
 
         if self._ctx_node_menu.isEnabled():
             pos = self.mapToScene(self._previous_pos)
@@ -166,10 +169,13 @@ def contextMenuEvent(self, event):
             if nodes:
                 node = nodes[0]
                 ctx_menu = self._ctx_node_menu.get_menu(node.type_)
-                for action in ctx_menu.actions():
-                    if not action.menu():
-                        action.node_id = node.id
-        if ctx_menu and ctx_menu.isEnabled():
+                if ctx_menu:
+                    for action in ctx_menu.actions():
+                        if not action.menu():
+                            action.node_id = node.id
+
+        ctx_menu = ctx_menu or self._ctx_menu
+        if ctx_menu.isEnabled():
             ctx_menu.exec_(event.globalPos())
         else:
             return super(NodeViewer, self).contextMenuEvent(event)