changes to banner frame, nav frame and config frames.

only create a banner frame for potato version (since it hold info about submixes).

stick nav_frame eastwards.

change columnspan for bus config frame to 4 to match strip config frames.
This commit is contained in:
onyx-and-iris 2022-04-22 01:27:35 +01:00
parent d3464fc8aa
commit 76ca376bfc
3 changed files with 14 additions and 16 deletions

View File

@ -152,17 +152,18 @@ class App(tk.Tk):
self.channel_frame.grid(row=0, column=0, sticky=(tk.W)) self.channel_frame.grid(row=0, column=0, sticky=(tk.W))
# separator # separator
self.sep = ttk.Separator(self, orient="vertical") self.sep = ttk.Separator(self, orient="vertical")
self.sep.grid(row=0, column=1, sticky=(tk.S, tk.N)) self.sep.grid(row=0, column=1, sticky=(tk.N, tk.S))
self.columnconfigure(1, minsize=15) self.columnconfigure(1, minsize=15)
# navigation frame # navigation frame
self.nav_frame = Navigation(self) self.nav_frame = Navigation(self)
self.nav_frame.grid(row=0, column=3) self.nav_frame.grid(row=0, column=3, sticky=(tk.E))
if self.configuration["extends"]["extended"]: if self.configuration["extends"]["extended"]:
self.nav_frame.extend.set(True) self.nav_frame.extend.set(True)
self.nav_frame.extend_frame() self.nav_frame.extend_frame()
if self.kind.name == "Potato":
self.banner = Banner(self) self.banner = Banner(self)
self.banner.grid(row=4, column=0, columnspan=3) self.banner.grid(row=4, column=0, columnspan=3)

View File

@ -8,12 +8,9 @@ class Banner(ttk.Frame):
def __init__(self, parent): def __init__(self, parent):
super().__init__() super().__init__()
self._parent = parent self._parent = parent
self.web = "onyxandiris.online"
self.submix = tk.StringVar() self.submix = tk.StringVar()
if self._parent.kind.name == "Potato":
self.submix.set(self.target.bus[_base_vals.submixes].label) self.submix.set(self.target.bus[_base_vals.submixes].label)
if self._parent.kind.name == "Potato":
self.label = ttk.Label( self.label = ttk.Label(
self, self,
text=f"SUBMIX: {self.submix.get().upper()}", text=f"SUBMIX: {self.submix.get().upper()}",

View File

@ -276,9 +276,9 @@ class Bus(Channel):
self.identifier, self.identifier,
) )
if _base_vals.extends_horizontal: if _base_vals.extends_horizontal:
self.config_frame.grid(column=0, row=1, columnspan=3) self.config_frame.grid(column=0, row=1, columnspan=4)
else: else:
self.config_frame.grid(column=0, row=3, columnspan=3) self.config_frame.grid(column=0, row=3, columnspan=4)
self._parent._parent.channel_frame.reset_config_buttons(self) self._parent._parent.channel_frame.reset_config_buttons(self)
self._parent._parent.bus_frame.reset_config_buttons(self) self._parent._parent.bus_frame.reset_config_buttons(self)
else: else: