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

pygui: fixed configuring node back to default server after switching to a distributed server

Browse source
This commit is contained in:
Blake Harnden 2020-12-09 21:22:19 -08:00
parent 02d8a32a50
commit d1c2b1bdb9
1 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -22,6 +22,7 @@ if TYPE_CHECKING:
from core.gui.graph.node import CanvasNode from core.gui.graph.node import CanvasNode
IFACE_NAME_LEN: int = 15 IFACE_NAME_LEN: int = 15
DEFAULT_SERVER: str = "localhost"
def check_ip6(parent: tk.BaseWidget, name: str, value: str) -> bool: def check_ip6(parent: tk.BaseWidget, name: str, value: str) -> bool:
@ -183,7 +184,7 @@ class NodeConfigDialog(Dialog):
self.name: tk.StringVar = tk.StringVar(value=self.node.name) self.name: tk.StringVar = tk.StringVar(value=self.node.name)
self.type: tk.StringVar = tk.StringVar(value=self.node.model) self.type: tk.StringVar = tk.StringVar(value=self.node.model)
self.container_image: tk.StringVar = tk.StringVar(value=self.node.image) self.container_image: tk.StringVar = tk.StringVar(value=self.node.image)
server = "localhost" server = DEFAULT_SERVER
if self.node.server: if self.node.server:
server = self.node.server server = self.node.server
self.server: tk.StringVar = tk.StringVar(value=server) self.server: tk.StringVar = tk.StringVar(value=server)
@ -250,7 +251,7 @@ class NodeConfigDialog(Dialog):
frame.columnconfigure(1, weight=1) frame.columnconfigure(1, weight=1)
label = ttk.Label(frame, text="Server") label = ttk.Label(frame, text="Server")
label.grid(row=row, column=0, sticky=tk.EW, padx=PADX, pady=PADY) label.grid(row=row, column=0, sticky=tk.EW, padx=PADX, pady=PADY)
servers = ["localhost"] servers = [DEFAULT_SERVER]
servers.extend(list(sorted(self.app.core.servers.keys()))) servers.extend(list(sorted(self.app.core.servers.keys())))
combobox = ttk.Combobox( combobox = ttk.Combobox(
frame, textvariable=self.server, values=servers, state=combo_state frame, textvariable=self.server, values=servers, state=combo_state
@ -382,8 +383,11 @@ class NodeConfigDialog(Dialog):
if NodeUtils.is_image_node(self.node.type): if NodeUtils.is_image_node(self.node.type):
self.node.image = self.container_image.get() self.node.image = self.container_image.get()
server = self.server.get() server = self.server.get()
if NodeUtils.is_container_node(self.node.type) and server != "localhost": if NodeUtils.is_container_node(self.node.type):
self.node.server = server if server == DEFAULT_SERVER:
self.node.server = None
else:
self.node.server = server
# set custom icon # set custom icon
if self.image_file: if self.image_file: