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

pygui: small cleanup to node utils to simplify usage where possible

Browse source
This commit is contained in:
Blake Harnden 2021-01-15 11:33:00 -08:00
parent 0fee29754d
commit 097f248120
8 changed files with 42 additions and 42 deletions
Download patch file Download diff file Expand all files Collapse all files

8
daemon/core/gui/dialogs/nodeconfig.py
View file

@ -225,7 +225,7 @@ class NodeConfigDialog(Dialog):
row += 1
# node type field
if NodeUtils.is_model_node(self.node.type):
if NodeUtils.is_model_node(self.node):
label = ttk.Label(frame, text="Type")
label.grid(row=row, column=0, sticky=tk.EW, padx=PADX, pady=PADY)
combobox = ttk.Combobox(
@ -245,7 +245,7 @@ class NodeConfigDialog(Dialog):
entry.grid(row=row, column=1, sticky=tk.EW)
row += 1
if NodeUtils.is_container_node(self.node.type):
if NodeUtils.is_container_node(self.node):
# server
frame.grid(sticky=tk.EW)
frame.columnconfigure(1, weight=1)
@ -259,7 +259,7 @@ class NodeConfigDialog(Dialog):
combobox.grid(row=row, column=1, sticky=tk.EW)
row += 1
if NodeUtils.is_rj45_node(self.node.type):
if NodeUtils.is_rj45_node(self.node):
response = self.app.core.client.get_ifaces()
logging.debug("host machine available interfaces: %s", response)
ifaces = ListboxScroll(frame)
@ -383,7 +383,7 @@ class NodeConfigDialog(Dialog):
if NodeUtils.is_image_node(self.node.type):
self.node.image = self.container_image.get()
server = self.server.get()
if NodeUtils.is_container_node(self.node.type):
if NodeUtils.is_container_node(self.node):
if server == DEFAULT_SERVER:
self.node.server = None
else:

2
daemon/core/gui/dialogs/runtool.py
View file

@ -26,7 +26,7 @@ class RunToolDialog(Dialog):
store all CORE nodes (nodes that execute commands) from all existing nodes
"""
for node in self.app.core.session.nodes.values():
if NodeUtils.is_container_node(node.type):
if NodeUtils.is_container_node(node):
self.executable_nodes[node.name] = node.id
def draw(self) -> None: