Streamline misc (#1007)

* fix typo and streamline a little

* streamline togglehorde

* oops
This commit is contained in:
BBC-Esq 2024-07-18 10:25:38 -04:00 committed by GitHub
parent 8b0a9f7e56
commit 621801da0e
No known key found for this signature in database
GPG key ID: B5690EEEBB952194

View file

@ -2281,14 +2281,10 @@ def show_gui():
def makelabelentry(parent, text, var, row=0, width=50, padx=8, singleline=False, tooltip=""):
label = makelabel(parent, text, row, 0, tooltip)
entry = ctk.CTkEntry(parent, width=width, textvariable=var) #you cannot set placeholder text for SHARED variables
if singleline:
entry.grid(row=row, column=0, padx=padx, stick="nw")
else:
entry.grid(row=row, column=1, padx=padx, stick="nw")
entry = ctk.CTkEntry(parent, width=width, textvariable=var)
entry.grid(row=row, column=(0 if singleline else 1), padx=padx, sticky="nw")
return entry, label
def makefileentry(parent, text, searchtext, var, row=0, width=200, filetypes=[], onchoosefile=None, singlerow=False, singlecol=True, tooltiptxt=""):
label = makelabel(parent, text, row,0,tooltiptxt,columnspan=3)
def getfilename(var, text):
@ -2656,15 +2652,18 @@ def show_gui():
horde_workername_entry, horde_workername_label = makelabelentry(horde_tab, "Horde Worker Name:",horde_workername_var, 24, 180,tooltip="Your worker's name to be displayed.")
def togglehorde(a,b,c):
labels = [horde_name_label, horde_gen_label, horde_context_label, horde_apikey_label, horde_workername_label]
for idx, item in enumerate([horde_name_entry, horde_gen_entry, horde_context_entry, horde_apikey_entry, horde_workername_entry]):
horde_items = zip([horde_name_entry, horde_gen_entry, horde_context_entry, horde_apikey_entry, horde_workername_entry],
[horde_name_label, horde_gen_label, horde_context_label, horde_apikey_label, horde_workername_label])
for item, label in horde_items:
if usehorde_var.get() == 1:
item.grid()
labels[idx].grid()
label.grid()
else:
item.grid_remove()
labels[idx].grid_remove()
if usehorde_var.get()==1 and (horde_name_var.get()=="koboldcpp" or horde_name_var.get()=="") and model_var.get()!="":
label.grid_remove()
if usehorde_var.get()==1 and not horde_name_var.get() and model_var.get():
basefile = os.path.basename(model_var.get())
horde_name_var.set(sanitize_string(os.path.splitext(basefile)[0]))