afonso/core-extra
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

fix merge conflict

Browse source
This commit is contained in:
Huy Pham 2019-12-19 11:12:45 -08:00
commit f6c02973c1
11 changed files with 25 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

4
daemon/core/gui/graph/edges.py
View file

@ -3,7 +3,7 @@ import tkinter as tk
from tkinter.font import Font
from core.gui import themes
from core.gui.dialogs.linkconfig import LinkConfiguration
from core.gui.dialogs.linkconfig import LinkConfigurationDialog
from core.gui.graph import tags
from core.gui.nodeutils import NodeUtils
@ -177,5 +177,5 @@ class CanvasEdge:
def configure(self):
logging.debug("link configuration")
dialog = LinkConfiguration(self.canvas, self.canvas.app, self)
dialog = LinkConfigurationDialog(self.canvas, self.canvas.app, self)
dialog.show()

4
daemon/core/gui/graph/node.py
View file

@ -9,7 +9,7 @@ from core.gui import themes
from core.gui.dialogs.emaneconfig import EmaneConfigDialog
from core.gui.dialogs.mobilityconfig import MobilityConfigDialog
from core.gui.dialogs.nodeconfig import NodeConfigDialog
from core.gui.dialogs.nodeservice import NodeService
from core.gui.dialogs.nodeservice import NodeServiceDialog
from core.gui.dialogs.wlanconfig import WlanConfigDialog
from core.gui.errors import show_grpc_error
from core.gui.graph import tags
@ -243,7 +243,7 @@ class CanvasNode:
def show_services(self):
self.canvas.context = None
dialog = NodeService(self.app.master, self.app, self)
dialog = NodeServiceDialog(self.app.master, self.app, self)
dialog.show()
def has_emane_link(self, interface_id):