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 2020-02-12 14:16:17 -08:00
commit 9cd756f2dc
18 changed files with 126 additions and 56 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -163,7 +163,7 @@ class CanvasNode:
output = self.app.core.run(self.core_node.id)
self.tooltip.text.set(output)
except grpc.RpcError as e:
show_grpc_error(e)
show_grpc_error(e, self.app, self.app)
def on_leave(self, event: tk.Event):
self.tooltip.on_leave(event)
@ -238,12 +238,14 @@ class CanvasNode:
def show_wlan_config(self):
self.canvas.context = None
dialog = WlanConfigDialog(self.app, self.app, self)
dialog.show()
if not dialog.has_error:
dialog.show()
def show_mobility_config(self):
self.canvas.context = None
dialog = MobilityConfigDialog(self.app, self.app, self)
dialog.show()
if not dialog.has_error:
dialog.show()
def show_mobility_player(self):
self.canvas.context = None