christofsteel/syng
christofsteel/syng
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity Actions

small steps towards readable gui code

Browse source
This commit is contained in:
Christoph Stahl 2023-11-07 23:31:11 +01:00
parent e3a30d5f2b
commit 7a65785a9e
1 changed files with 54 additions and 60 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

114
syng/gui.py
View file

@ -81,73 +81,60 @@ class SourceTab(customtkinter.CTkFrame):
class GeneralConfig(customtkinter.CTkFrame): class GeneralConfig(customtkinter.CTkFrame):
def add_option_label(self, text):
customtkinter.CTkLabel(self, text=text, justify="left").grid(
column=0, row=self.number_of_options, padx=5, pady=5
)
def add_string_option(self, name, description, callback=None):
self.add_option_label(description)
self.string_options[name] = customtkinter.CTkTextbox(
self, wrap="none", height=1
)
self.string_options[name].grid(column=1, row=self.number_of_options)
if callback is not None:
self.string_options[name].bind("<KeyRelease>", callback)
self.number_of_options += 1
def add_choose_option(self, name, description, values):
self.add_option_label(description)
self.choose_options[name] = customtkinter.CTkOptionMenu(self, values=values)
self.choose_options[name].grid(column=1, row=self.number_of_options)
self.number_of_options += 1
def __init__(self, parent, config, callback): def __init__(self, parent, config, callback):
super().__init__(parent) super().__init__(parent)
customtkinter.CTkLabel(self, text="Server", justify="left").grid( self.number_of_options = 0
column=0, row=0, padx=5, pady=5 self.string_options = {}
) self.choose_options = {}
self.serverTextbox = customtkinter.CTkTextbox(self, wrap="none", height=1)
self.serverTextbox.grid(column=1, row=0)
self.serverTextbox.bind("<KeyRelease>", callback)
customtkinter.CTkLabel(self, text="Room", justify="left").grid(column=0, row=1) self.add_string_option("server", "Server", callback)
self.roomTextbox = customtkinter.CTkTextbox(self, wrap="none", height=1) self.add_string_option("room", "Room", callback)
self.roomTextbox.grid(column=1, row=1) self.add_string_option("secret", "Secret")
self.roomTextbox.bind("<KeyRelease>", callback) self.add_choose_option(
"waiting_room_policy", "Waiting room policy", ["forced", "optional", "none"]
customtkinter.CTkLabel(self, text="Secret", justify="left").grid(
column=0, row=3
) )
self.secretTextbox = customtkinter.CTkTextbox(self, wrap="none", height=1) self.add_string_option("last_song", "Time of last song")
self.add_string_option("preview_duration", "Preview Duration")
secret = "".join( for name, textbox in self.string_options.items():
secrets.choice(string.ascii_letters + string.digits) for _ in range(8) if config[name]:
) textbox.insert("0.0", config[name])
self.secretTextbox.grid(column=1, row=3) for name, optionmenu in self.choose_options.items():
optionmenu.set(str(config[name]).lower())
customtkinter.CTkLabel(self, text="Waiting room policy", justify="left").grid(
column=0, row=4
)
self.waitingRoomPolicy = customtkinter.CTkOptionMenu(
self, values=["forced", "optional", "none"]
)
self.waitingRoomPolicy.set("none")
self.waitingRoomPolicy.grid(column=1, row=4)
customtkinter.CTkLabel(self, text="Time of last Song", justify="left").grid(
column=0, row=5
)
self.last_song = customtkinter.CTkTextbox(self, wrap="none", height=1)
self.last_song.grid(column=1, row=5)
customtkinter.CTkLabel(self, text="Preview Duration", justify="left").grid(
column=0, row=6
)
self.preview_duration = customtkinter.CTkTextbox(self, wrap="none", height=1)
self.preview_duration.grid(column=1, row=6)
self.serverTextbox.insert("0.0", config["server"])
self.roomTextbox.insert("0.0", config["room"])
self.secretTextbox.insert(
"0.0", config["secret"] if "secret" in config else secret
)
self.waitingRoomPolicy.set(str(config["waiting_room_policy"]).lower())
if config["last_song"]:
self.last_song.insert("0.0", config["last_song"])
self.preview_duration.insert("0.0", config["preview_duration"])
def get_config(self): def get_config(self):
config = {} config = {}
config["server"] = self.serverTextbox.get("0.0", "end").strip() for name, textbox in self.string_options.items():
config["room"] = self.roomTextbox.get("0.0", "end").strip() config[name] = textbox.get("0.0", "end").strip()
config["secret"] = self.secretTextbox.get("0.0", "end").strip()
config["waiting_room_policy"] = self.waitingRoomPolicy.get().strip() for name, optionmenu in self.choose_options.items():
config["last_song"] = self.last_song.get("0.0", "end").strip() config[name] = optionmenu.get().strip()
try: try:
config["preview_duration"] = int( config["preview_duration"] = int(config["preview_duration"])
self.preview_duration.get("0.0", "end").strip()
)
except ValueError: except ValueError:
config["preview_duration"] = 0 config["preview_duration"] = 0
return config return config
@ -162,9 +149,14 @@ class SyngGui(customtkinter.CTk):
with open("syng-client.json") as cfile: with open("syng-client.json") as cfile:
loaded_config = load(cfile) loaded_config = load(cfile)
config = {"sources": {}, "config": {}} config = {"sources": {}, "config": default_config()}
if "config" in loaded_config: if "config" in loaded_config:
config["config"] = default_config() | loaded_config["config"] config["config"] |= loaded_config["config"]
if not config["config"]["secret"]:
config["config"]["secret"] = "".join(
secrets.choice(string.ascii_letters + string.digits) for _ in range(8)
)
self.wm_title("Syng") self.wm_title("Syng")
tabview = customtkinter.CTkTabview(self) tabview = customtkinter.CTkTabview(self)
@ -185,7 +177,9 @@ class SyngGui(customtkinter.CTk):
) )
loadbutton.pack(side="left") loadbutton.pack(side="left")
startbutton = customtkinter.CTkButton(self, text="Start", command=self.start) startbutton = customtkinter.CTkButton(
fileframe, text="Start", command=self.start
)
startbutton.pack(side="right") startbutton.pack(side="right")
frm = customtkinter.CTkFrame(tabview.tab("General")) frm = customtkinter.CTkFrame(tabview.tab("General"))