diff --git a/coretk/coretk/appconfig.py b/coretk/coretk/appconfig.py index 74d52553..a85e5991 100644 --- a/coretk/coretk/appconfig.py +++ b/coretk/coretk/appconfig.py @@ -18,9 +18,10 @@ XML_PATH = HOME_PATH.joinpath("xml") CONFIG_PATH = HOME_PATH.joinpath("gui.yaml") # local paths -LOCAL_ICONS_PATH = Path(__file__).parent.joinpath("icons").absolute() -LOCAL_BACKGROUND_PATH = Path(__file__).parent.joinpath("backgrounds").absolute() -LOCAL_XMLS_PATH = Path(__file__).parent.joinpath("xmls").absolute() +DATA_PATH = Path(__file__).parent.joinpath("data") +LOCAL_ICONS_PATH = DATA_PATH.joinpath("icons").absolute() +LOCAL_BACKGROUND_PATH = DATA_PATH.joinpath("backgrounds").absolute() +LOCAL_XMLS_PATH = DATA_PATH.joinpath("xmls").absolute() # configuration data TERMINALS = [ diff --git a/coretk/coretk/backgrounds/sample1-bg.gif b/coretk/coretk/data/backgrounds/sample1-bg.gif similarity index 100% rename from coretk/coretk/backgrounds/sample1-bg.gif rename to coretk/coretk/data/backgrounds/sample1-bg.gif diff --git a/coretk/coretk/backgrounds/sample4-bg.jpg b/coretk/coretk/data/backgrounds/sample4-bg.jpg similarity index 100% rename from coretk/coretk/backgrounds/sample4-bg.jpg rename to coretk/coretk/data/backgrounds/sample4-bg.jpg diff --git a/coretk/coretk/icons/OVS.gif b/coretk/coretk/data/icons/OVS.gif similarity index 100% rename from coretk/coretk/icons/OVS.gif rename to coretk/coretk/data/icons/OVS.gif diff --git a/coretk/coretk/icons/antenna.gif b/coretk/coretk/data/icons/antenna.gif similarity index 100% rename from coretk/coretk/icons/antenna.gif rename to coretk/coretk/data/icons/antenna.gif diff --git a/coretk/coretk/icons/core-icon.png b/coretk/coretk/data/icons/core-icon.png similarity index 100% rename from coretk/coretk/icons/core-icon.png rename to coretk/coretk/data/icons/core-icon.png diff --git a/coretk/coretk/icons/docker.png b/coretk/coretk/data/icons/docker.png similarity index 100% rename from coretk/coretk/icons/docker.png rename to coretk/coretk/data/icons/docker.png diff --git a/coretk/coretk/icons/document-new.gif b/coretk/coretk/data/icons/document-new.gif similarity index 100% rename from coretk/coretk/icons/document-new.gif rename to coretk/coretk/data/icons/document-new.gif diff --git a/coretk/coretk/icons/document-properties.gif b/coretk/coretk/data/icons/document-properties.gif similarity index 100% rename from coretk/coretk/icons/document-properties.gif rename to coretk/coretk/data/icons/document-properties.gif diff --git a/coretk/coretk/icons/document-save.gif b/coretk/coretk/data/icons/document-save.gif similarity index 100% rename from coretk/coretk/icons/document-save.gif rename to coretk/coretk/data/icons/document-save.gif diff --git a/coretk/coretk/icons/edit-delete.gif b/coretk/coretk/data/icons/edit-delete.gif similarity index 100% rename from coretk/coretk/icons/edit-delete.gif rename to coretk/coretk/data/icons/edit-delete.gif diff --git a/coretk/coretk/icons/edit-node.png b/coretk/coretk/data/icons/edit-node.png similarity index 100% rename from coretk/coretk/icons/edit-node.png rename to coretk/coretk/data/icons/edit-node.png diff --git a/coretk/coretk/icons/emane.png b/coretk/coretk/data/icons/emane.png similarity index 100% rename from coretk/coretk/icons/emane.png rename to coretk/coretk/data/icons/emane.png diff --git a/coretk/coretk/icons/fileopen.gif b/coretk/coretk/data/icons/fileopen.gif similarity index 100% rename from coretk/coretk/icons/fileopen.gif rename to coretk/coretk/data/icons/fileopen.gif diff --git a/coretk/coretk/icons/host.png b/coretk/coretk/data/icons/host.png similarity index 100% rename from coretk/coretk/icons/host.png rename to coretk/coretk/data/icons/host.png diff --git a/coretk/coretk/icons/hub.png b/coretk/coretk/data/icons/hub.png similarity index 100% rename from coretk/coretk/icons/hub.png rename to coretk/coretk/data/icons/hub.png diff --git a/coretk/coretk/icons/lanswitch.png b/coretk/coretk/data/icons/lanswitch.png similarity index 100% rename from coretk/coretk/icons/lanswitch.png rename to coretk/coretk/data/icons/lanswitch.png diff --git a/coretk/coretk/icons/link.png b/coretk/coretk/data/icons/link.png similarity index 100% rename from coretk/coretk/icons/link.png rename to coretk/coretk/data/icons/link.png diff --git a/coretk/coretk/icons/lxc.png b/coretk/coretk/data/icons/lxc.png similarity index 100% rename from coretk/coretk/icons/lxc.png rename to coretk/coretk/data/icons/lxc.png diff --git a/coretk/coretk/icons/marker.png b/coretk/coretk/data/icons/marker.png similarity index 100% rename from coretk/coretk/icons/marker.png rename to coretk/coretk/data/icons/marker.png diff --git a/coretk/coretk/icons/mdr.png b/coretk/coretk/data/icons/mdr.png similarity index 100% rename from coretk/coretk/icons/mdr.png rename to coretk/coretk/data/icons/mdr.png diff --git a/coretk/coretk/icons/observe.gif b/coretk/coretk/data/icons/observe.gif similarity index 100% rename from coretk/coretk/icons/observe.gif rename to coretk/coretk/data/icons/observe.gif diff --git a/coretk/coretk/icons/oval.png b/coretk/coretk/data/icons/oval.png similarity index 100% rename from coretk/coretk/icons/oval.png rename to coretk/coretk/data/icons/oval.png diff --git a/coretk/coretk/icons/pause.png b/coretk/coretk/data/icons/pause.png similarity index 100% rename from coretk/coretk/icons/pause.png rename to coretk/coretk/data/icons/pause.png diff --git a/coretk/coretk/icons/pc.png b/coretk/coretk/data/icons/pc.png similarity index 100% rename from coretk/coretk/icons/pc.png rename to coretk/coretk/data/icons/pc.png diff --git a/coretk/coretk/icons/plot.gif b/coretk/coretk/data/icons/plot.gif similarity index 100% rename from coretk/coretk/icons/plot.gif rename to coretk/coretk/data/icons/plot.gif diff --git a/coretk/coretk/icons/prouter.png b/coretk/coretk/data/icons/prouter.png similarity index 100% rename from coretk/coretk/icons/prouter.png rename to coretk/coretk/data/icons/prouter.png diff --git a/coretk/coretk/icons/rectangle.png b/coretk/coretk/data/icons/rectangle.png similarity index 100% rename from coretk/coretk/icons/rectangle.png rename to coretk/coretk/data/icons/rectangle.png diff --git a/coretk/coretk/icons/rj45.png b/coretk/coretk/data/icons/rj45.png similarity index 100% rename from coretk/coretk/icons/rj45.png rename to coretk/coretk/data/icons/rj45.png diff --git a/coretk/coretk/icons/router.png b/coretk/coretk/data/icons/router.png similarity index 100% rename from coretk/coretk/icons/router.png rename to coretk/coretk/data/icons/router.png diff --git a/coretk/coretk/icons/run.png b/coretk/coretk/data/icons/run.png similarity index 100% rename from coretk/coretk/icons/run.png rename to coretk/coretk/data/icons/run.png diff --git a/coretk/coretk/icons/select.png b/coretk/coretk/data/icons/select.png similarity index 100% rename from coretk/coretk/icons/select.png rename to coretk/coretk/data/icons/select.png diff --git a/coretk/coretk/icons/start.png b/coretk/coretk/data/icons/start.png similarity index 100% rename from coretk/coretk/icons/start.png rename to coretk/coretk/data/icons/start.png diff --git a/coretk/coretk/icons/stop.png b/coretk/coretk/data/icons/stop.png similarity index 100% rename from coretk/coretk/icons/stop.png rename to coretk/coretk/data/icons/stop.png diff --git a/coretk/coretk/icons/text.png b/coretk/coretk/data/icons/text.png similarity index 100% rename from coretk/coretk/icons/text.png rename to coretk/coretk/data/icons/text.png diff --git a/coretk/coretk/icons/tunnel.gif b/coretk/coretk/data/icons/tunnel.gif similarity index 100% rename from coretk/coretk/icons/tunnel.gif rename to coretk/coretk/data/icons/tunnel.gif diff --git a/coretk/coretk/icons/twonode.png b/coretk/coretk/data/icons/twonode.png similarity index 100% rename from coretk/coretk/icons/twonode.png rename to coretk/coretk/data/icons/twonode.png diff --git a/coretk/coretk/icons/wlan.png b/coretk/coretk/data/icons/wlan.png similarity index 100% rename from coretk/coretk/icons/wlan.png rename to coretk/coretk/data/icons/wlan.png diff --git a/coretk/coretk/oldicons/docker.gif b/coretk/coretk/data/oldicons/docker.gif similarity index 100% rename from coretk/coretk/oldicons/docker.gif rename to coretk/coretk/data/oldicons/docker.gif diff --git a/coretk/coretk/oldicons/emane.gif b/coretk/coretk/data/oldicons/emane.gif similarity index 100% rename from coretk/coretk/oldicons/emane.gif rename to coretk/coretk/data/oldicons/emane.gif diff --git a/coretk/coretk/oldicons/host.gif b/coretk/coretk/data/oldicons/host.gif similarity index 100% rename from coretk/coretk/oldicons/host.gif rename to coretk/coretk/data/oldicons/host.gif diff --git a/coretk/coretk/oldicons/hub.gif b/coretk/coretk/data/oldicons/hub.gif similarity index 100% rename from coretk/coretk/oldicons/hub.gif rename to coretk/coretk/data/oldicons/hub.gif diff --git a/coretk/coretk/oldicons/lanswitch.gif b/coretk/coretk/data/oldicons/lanswitch.gif similarity index 100% rename from coretk/coretk/oldicons/lanswitch.gif rename to coretk/coretk/data/oldicons/lanswitch.gif diff --git a/coretk/coretk/oldicons/link.gif b/coretk/coretk/data/oldicons/link.gif similarity index 100% rename from coretk/coretk/oldicons/link.gif rename to coretk/coretk/data/oldicons/link.gif diff --git a/coretk/coretk/oldicons/lxc.gif b/coretk/coretk/data/oldicons/lxc.gif similarity index 100% rename from coretk/coretk/oldicons/lxc.gif rename to coretk/coretk/data/oldicons/lxc.gif diff --git a/coretk/coretk/oldicons/marker.gif b/coretk/coretk/data/oldicons/marker.gif similarity index 100% rename from coretk/coretk/oldicons/marker.gif rename to coretk/coretk/data/oldicons/marker.gif diff --git a/coretk/coretk/oldicons/mdr.gif b/coretk/coretk/data/oldicons/mdr.gif similarity index 100% rename from coretk/coretk/oldicons/mdr.gif rename to coretk/coretk/data/oldicons/mdr.gif diff --git a/coretk/coretk/oldicons/oval.gif b/coretk/coretk/data/oldicons/oval.gif similarity index 100% rename from coretk/coretk/oldicons/oval.gif rename to coretk/coretk/data/oldicons/oval.gif diff --git a/coretk/coretk/oldicons/pc.gif b/coretk/coretk/data/oldicons/pc.gif similarity index 100% rename from coretk/coretk/oldicons/pc.gif rename to coretk/coretk/data/oldicons/pc.gif diff --git a/coretk/coretk/oldicons/rectangle.gif b/coretk/coretk/data/oldicons/rectangle.gif similarity index 100% rename from coretk/coretk/oldicons/rectangle.gif rename to coretk/coretk/data/oldicons/rectangle.gif diff --git a/coretk/coretk/oldicons/rj45.gif b/coretk/coretk/data/oldicons/rj45.gif similarity index 100% rename from coretk/coretk/oldicons/rj45.gif rename to coretk/coretk/data/oldicons/rj45.gif diff --git a/coretk/coretk/oldicons/router.gif b/coretk/coretk/data/oldicons/router.gif similarity index 100% rename from coretk/coretk/oldicons/router.gif rename to coretk/coretk/data/oldicons/router.gif diff --git a/coretk/coretk/oldicons/router_green.gif b/coretk/coretk/data/oldicons/router_green.gif similarity index 100% rename from coretk/coretk/oldicons/router_green.gif rename to coretk/coretk/data/oldicons/router_green.gif diff --git a/coretk/coretk/oldicons/run.gif b/coretk/coretk/data/oldicons/run.gif similarity index 100% rename from coretk/coretk/oldicons/run.gif rename to coretk/coretk/data/oldicons/run.gif diff --git a/coretk/coretk/oldicons/select.gif b/coretk/coretk/data/oldicons/select.gif similarity index 100% rename from coretk/coretk/oldicons/select.gif rename to coretk/coretk/data/oldicons/select.gif diff --git a/coretk/coretk/oldicons/start.gif b/coretk/coretk/data/oldicons/start.gif similarity index 100% rename from coretk/coretk/oldicons/start.gif rename to coretk/coretk/data/oldicons/start.gif diff --git a/coretk/coretk/oldicons/stop.gif b/coretk/coretk/data/oldicons/stop.gif similarity index 100% rename from coretk/coretk/oldicons/stop.gif rename to coretk/coretk/data/oldicons/stop.gif diff --git a/coretk/coretk/oldicons/text.gif b/coretk/coretk/data/oldicons/text.gif similarity index 100% rename from coretk/coretk/oldicons/text.gif rename to coretk/coretk/data/oldicons/text.gif diff --git a/coretk/coretk/oldicons/twonode.gif b/coretk/coretk/data/oldicons/twonode.gif similarity index 100% rename from coretk/coretk/oldicons/twonode.gif rename to coretk/coretk/data/oldicons/twonode.gif diff --git a/coretk/coretk/oldicons/wlan.gif b/coretk/coretk/data/oldicons/wlan.gif similarity index 100% rename from coretk/coretk/oldicons/wlan.gif rename to coretk/coretk/data/oldicons/wlan.gif diff --git a/coretk/coretk/todelete/servicefileconfig.py b/coretk/coretk/data/todelete/servicefileconfig.py similarity index 100% rename from coretk/coretk/todelete/servicefileconfig.py rename to coretk/coretk/data/todelete/servicefileconfig.py diff --git a/coretk/coretk/todelete/servicenodeconfig.py b/coretk/coretk/data/todelete/servicenodeconfig.py similarity index 100% rename from coretk/coretk/todelete/servicenodeconfig.py rename to coretk/coretk/data/todelete/servicenodeconfig.py diff --git a/coretk/coretk/xmls/sample1.xml b/coretk/coretk/data/xmls/sample1.xml similarity index 100% rename from coretk/coretk/xmls/sample1.xml rename to coretk/coretk/data/xmls/sample1.xml diff --git a/coretk/coretk/nodedelete.py b/coretk/coretk/nodedelete.py index 92844aac..f52731e4 100644 --- a/coretk/coretk/nodedelete.py +++ b/coretk/coretk/nodedelete.py @@ -75,7 +75,8 @@ class CanvasComponentManagement: neighbor = self.app.canvas_nodes[neighbor_id] if neighbor.core_node.type != core_pb2.NodeType.WIRELESS_LAN: neighbor.antenna_draw.delete_antenna() - for link_tuple in node_to_wlink[canvas_node.core_node.id]: + + for link_tuple in node_to_wlink.get(canvas_node.core_node.id, []): nid_one, nid_two = link_tuple if link_tuple in self.canvas.wireless_draw.map: self.canvas.delete(self.canvas.wireless_draw.map[link_tuple])