Merge branch 'coretk' of https://github.com/coreemu/core into coretk

2019-11-21 12:45:59 -08:00 · 2019-11-21 12:45:59 -08:00 · 471c5eb7e1
commit 471c5eb7e1
parent 059b0cc316 a4055f84bd
33 changed files with 2 additions and 2 deletions
--- a/coretk/coretk/icons/docker.png
+++ b/coretk/coretk/icons/docker.png
--- a/coretk/coretk/icons/edit-node.png
+++ b/coretk/coretk/icons/edit-node.png
--- a/coretk/coretk/icons/emane.png
+++ b/coretk/coretk/icons/emane.png
--- a/coretk/coretk/icons/hub.png
+++ b/coretk/coretk/icons/hub.png
--- a/coretk/coretk/icons/lanswitch.png
+++ b/coretk/coretk/icons/lanswitch.png
--- a/coretk/coretk/icons/link.png
+++ b/coretk/coretk/icons/link.png
--- a/coretk/coretk/icons/lxc.png
+++ b/coretk/coretk/icons/lxc.png
--- a/coretk/coretk/icons/marker.png
+++ b/coretk/coretk/icons/marker.png
--- a/coretk/coretk/icons/mdr.png
+++ b/coretk/coretk/icons/mdr.png
--- a/coretk/coretk/icons/oval.png
+++ b/coretk/coretk/icons/oval.png
--- a/coretk/coretk/icons/pc.png
+++ b/coretk/coretk/icons/pc.png
--- a/coretk/coretk/icons/prouter.png
+++ b/coretk/coretk/icons/prouter.png
--- a/coretk/coretk/icons/rectangle.png
+++ b/coretk/coretk/icons/rectangle.png
--- a/coretk/coretk/icons/rj45.png
+++ b/coretk/coretk/icons/rj45.png
--- a/coretk/coretk/icons/router.png
+++ b/coretk/coretk/icons/router.png
--- a/coretk/coretk/icons/run.png
+++ b/coretk/coretk/icons/run.png
--- a/coretk/coretk/icons/select.png
+++ b/coretk/coretk/icons/select.png
--- a/coretk/coretk/icons/start.png
+++ b/coretk/coretk/icons/start.png
--- a/coretk/coretk/icons/stop.png
+++ b/coretk/coretk/icons/stop.png
--- a/coretk/coretk/icons/text.png
+++ b/coretk/coretk/icons/text.png
--- a/coretk/coretk/icons/twonode.png
+++ b/coretk/coretk/icons/twonode.png
--- a/coretk/coretk/icons/wlan.png
+++ b/coretk/coretk/icons/wlan.png
--- a/coretk/coretk/images.py
+++ b/coretk/coretk/images.py
@ -53,9 +53,9 @@ class ImageEnum(Enum):
    HOST = "host"
    PC = "pc"
    MDR = "mdr"
-    PROUTER = "router_green"
+    PROUTER = "prouter"
    OVS = "OVS"
-    EDITNODE = "document-properties"
+    EDITNODE = "edit-node"
    PLOT = "plot"
    TWONODE = "twonode"
    STOP = "stop"
--- a/coretk/coretk/oldicons/docker.gif
+++ b/coretk/coretk/oldicons/docker.gif
--- a/coretk/coretk/oldicons/emane.gif
+++ b/coretk/coretk/oldicons/emane.gif
--- a/coretk/coretk/oldicons/link.gif
+++ b/coretk/coretk/oldicons/link.gif
--- a/coretk/coretk/oldicons/lxc.gif
+++ b/coretk/coretk/oldicons/lxc.gif
--- a/coretk/coretk/oldicons/marker.gif
+++ b/coretk/coretk/oldicons/marker.gif
--- a/coretk/coretk/oldicons/mdr.gif
+++ b/coretk/coretk/oldicons/mdr.gif
--- a/coretk/coretk/oldicons/router_green.gif
+++ b/coretk/coretk/oldicons/router_green.gif
--- a/coretk/coretk/oldicons/run.gif
+++ b/coretk/coretk/oldicons/run.gif
--- a/coretk/coretk/oldicons/twonode.gif
+++ b/coretk/coretk/oldicons/twonode.gif
--- a/coretk/coretk/oldicons/wlan.gif
+++ b/coretk/coretk/oldicons/wlan.gif