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

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

Browse source
This commit is contained in:
Huy Pham 2019-12-17 12:38:31 -08:00
commit 0b0ab08030
3 changed files with 26 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
coretk/coretk/dialogs/customnodes.py
View file

@ -41,14 +41,14 @@ class ServicesSelectDialog(Dialog):
self.groups.listbox.bind("<<ListboxSelect>>", self.handle_group_change) self.groups.listbox.bind("<<ListboxSelect>>", self.handle_group_change)
self.groups.listbox.selection_set(0) self.groups.listbox.selection_set(0)
label_frame = ttk.LabelFrame(frame, text="Services")
label_frame.grid(row=0, column=1, sticky="nsew")
label_frame.columnconfigure(0, weight=1)
label_frame.rowconfigure(0, weight=1)
self.services = CheckboxList( self.services = CheckboxList(
frame, label_frame, self.app, clicked=self.service_clicked, padding=FRAME_PAD
self.app,
text="Services",
clicked=self.service_clicked,
padding=FRAME_PAD,
) )
self.services.grid(row=0, column=1, sticky="nsew") self.services.grid(sticky="nsew")
label_frame = ttk.LabelFrame(frame, text="Selected", padding=FRAME_PAD) label_frame = ttk.LabelFrame(frame, text="Selected", padding=FRAME_PAD)
label_frame.grid(row=0, column=2, sticky="nsew") label_frame.grid(row=0, column=2, sticky="nsew")

12
coretk/coretk/dialogs/nodeservice.py
View file

@ -51,14 +51,14 @@ class NodeService(Dialog):
self.groups.listbox.bind("<<ListboxSelect>>", self.handle_group_change) self.groups.listbox.bind("<<ListboxSelect>>", self.handle_group_change)
self.groups.listbox.selection_set(0) self.groups.listbox.selection_set(0)
label_frame = ttk.LabelFrame(frame, text="Services")
label_frame.grid(row=0, column=1, sticky="nsew")
label_frame.columnconfigure(0, weight=1)
label_frame.rowconfigure(0, weight=1)
self.services = CheckboxList( self.services = CheckboxList(
frame, label_frame, self.app, clicked=self.service_clicked, padding=FRAME_PAD
self.app,
text="Services",
clicked=self.service_clicked,
padding=FRAME_PAD,
) )
self.services.grid(row=0, column=1, sticky="nsew") self.services.grid(sticky="nsew")
label_frame = ttk.LabelFrame(frame, text="Selected", padding=FRAME_PAD) label_frame = ttk.LabelFrame(frame, text="Selected", padding=FRAME_PAD)
label_frame.grid(row=0, column=2, sticky="nsew") label_frame.grid(row=0, column=2, sticky="nsew")

28
coretk/coretk/widgets.py
View file

@ -25,7 +25,7 @@ def file_button_click(value):
value.set(file_path) value.set(file_path)
class FrameScroll(ttk.LabelFrame): class FrameScroll(ttk.Frame):
def __init__(self, master, app, _cls=ttk.Frame, **kw): def __init__(self, master, app, _cls=ttk.Frame, **kw):
super().__init__(master, **kw) super().__init__(master, **kw)
self.app = app self.app = app
@ -63,9 +63,9 @@ class FrameScroll(ttk.LabelFrame):
widget.destroy() widget.destroy()
class ConfigFrame(FrameScroll): class ConfigFrame(ttk.Notebook):
def __init__(self, master, app, config, **kw): def __init__(self, master, app, config, **kw):
super().__init__(master, app, ttk.Notebook, borderwidth=0, **kw) super().__init__(master, **kw)
self.app = app self.app = app
self.config = config self.config = config
self.values = {} self.values = {}
@ -79,17 +79,17 @@ class ConfigFrame(FrameScroll):
for group_name in sorted(group_mapping): for group_name in sorted(group_mapping):
group = group_mapping[group_name] group = group_mapping[group_name]
frame = ttk.Frame(self.frame, padding=FRAME_PAD) tab = FrameScroll(self, self.app, borderwidth=0, padding=FRAME_PAD)
frame.columnconfigure(1, weight=1) tab.frame.columnconfigure(1, weight=1)
self.frame.add(frame, text=group_name) self.add(tab, text=group_name)
for index, option in enumerate(sorted(group, key=lambda x: x.name)): for index, option in enumerate(sorted(group, key=lambda x: x.name)):
label = ttk.Label(frame, text=option.label) label = ttk.Label(tab.frame, text=option.label)
label.grid(row=index, pady=PADY, padx=PADX, sticky="w") label.grid(row=index, pady=PADY, padx=PADX, sticky="w")
value = tk.StringVar() value = tk.StringVar()
if option.type == core_pb2.ConfigOptionType.BOOL: if option.type == core_pb2.ConfigOptionType.BOOL:
select = tuple(option.select) select = tuple(option.select)
combobox = ttk.Combobox( combobox = ttk.Combobox(
frame, textvariable=value, values=select, state="readonly" tab.frame, textvariable=value, values=select, state="readonly"
) )
combobox.grid(row=index, column=1, sticky="ew") combobox.grid(row=index, column=1, sticky="ew")
if option.value == "1": if option.value == "1":
@ -100,13 +100,13 @@ class ConfigFrame(FrameScroll):
value.set(option.value) value.set(option.value)
select = tuple(option.select) select = tuple(option.select)
combobox = ttk.Combobox( combobox = ttk.Combobox(
frame, textvariable=value, values=select, state="readonly" tab.frame, textvariable=value, values=select, state="readonly"
) )
combobox.grid(row=index, column=1, sticky="ew") combobox.grid(row=index, column=1, sticky="ew")
elif option.type == core_pb2.ConfigOptionType.STRING: elif option.type == core_pb2.ConfigOptionType.STRING:
value.set(option.value) value.set(option.value)
if "file" in option.label: if "file" in option.label:
file_frame = ttk.Frame(frame) file_frame = ttk.Frame(tab.frame)
file_frame.grid(row=index, column=1, sticky="ew") file_frame.grid(row=index, column=1, sticky="ew")
file_frame.columnconfigure(0, weight=1) file_frame.columnconfigure(0, weight=1)
entry = ttk.Entry(file_frame, textvariable=value) entry = ttk.Entry(file_frame, textvariable=value)
@ -117,20 +117,20 @@ class ConfigFrame(FrameScroll):
else: else:
if "controlnet" in option.name and "script" not in option.name: if "controlnet" in option.name and "script" not in option.name:
entry = ttk.Entry( entry = ttk.Entry(
frame, tab.frame,
textvariable=value, textvariable=value,
validate="key", validate="key",
validatecommand=(self.app.validation.ip4, "%P"), validatecommand=(self.app.validation.ip4, "%P"),
) )
entry.grid(row=index, column=1, sticky="ew") entry.grid(row=index, column=1, sticky="ew")
else: else:
entry = ttk.Entry(frame, textvariable=value) entry = ttk.Entry(tab.frame, textvariable=value)
entry.grid(row=index, column=1, sticky="ew") entry.grid(row=index, column=1, sticky="ew")
elif option.type in INT_TYPES: elif option.type in INT_TYPES:
value.set(option.value) value.set(option.value)
entry = ttk.Entry( entry = ttk.Entry(
frame, tab.frame,
textvariable=value, textvariable=value,
validate="key", validate="key",
validatecommand=(self.app.validation.positive_int, "%P"), validatecommand=(self.app.validation.positive_int, "%P"),
@ -143,7 +143,7 @@ class ConfigFrame(FrameScroll):
elif option.type == core_pb2.ConfigOptionType.FLOAT: elif option.type == core_pb2.ConfigOptionType.FLOAT:
value.set(option.value) value.set(option.value)
entry = ttk.Entry( entry = ttk.Entry(
frame, tab.frame,
textvariable=value, textvariable=value,
validate="key", validate="key",
validatecommand=(self.app.validation.positive_float, "%P"), validatecommand=(self.app.validation.positive_float, "%P"),