diff --git a/VRCT.py b/VRCT.py index d6e24c28..ef6674ae 100644 --- a/VRCT.py +++ b/VRCT.py @@ -20,6 +20,8 @@ TRANSLATOR = None MESSAGE_FORMAT = "[message]([translation])" FONT_FAMILY = "Yu Gothic UI" TRANSPARENCY = 100 +APPEARANCE_THEME = "System" +UI_SCALING = "100%" # load config if os.path.isfile(PATH_CONFIG) is not False: @@ -45,6 +47,10 @@ if os.path.isfile(PATH_CONFIG) is not False: FONT_FAMILY = config["FONT_FAMILY"] if "TRANSPARENCY" in config.keys(): TRANSPARENCY = config["TRANSPARENCY"] + if "APPEARANCE_THEME" in config.keys(): + APPEARANCE_THEME = config["APPEARANCE_THEME"] + if "UI_SCALING" in config.keys(): + UI_SCALING = config["UI_SCALING"] with open(PATH_CONFIG, 'w') as fp: config = { @@ -58,6 +64,8 @@ with open(PATH_CONFIG, 'w') as fp: "MESSAGE_FORMAT": MESSAGE_FORMAT, "FONT_FAMILY": FONT_FAMILY, "TRANSPARENCY": TRANSPARENCY, + "APPEARANCE_THEME": APPEARANCE_THEME, + "UI_SCALING": UI_SCALING, } json.dump(config, fp, indent=4) @@ -70,12 +78,12 @@ if AUTH_KEY is not None: TRANSLATOR = None # GUI -customtkinter.set_appearance_mode("System") +customtkinter.set_appearance_mode(APPEARANCE_THEME) customtkinter.set_default_color_theme("blue") -class ToplevelWindow_information(customtkinter.CTkToplevel): +class ToplevelWindowInformation(customtkinter.CTkToplevel): def __init__(self, parent, *args, **kwargs): - super().__init__(*args, **kwargs) + super().__init__(parent, *args, **kwargs) self.parent = parent self.grid_columnconfigure(0, weight=1) self.grid_rowconfigure(0, weight=1) @@ -85,7 +93,10 @@ class ToplevelWindow_information(customtkinter.CTkToplevel): self.after(200, lambda: self.iconbitmap(os.path.join(os.path.dirname(__file__), "img", "app.ico"))) self.title("Information") # create textbox information - self.textbox_information = customtkinter.CTkTextbox(self, font=customtkinter.CTkFont(family=FONT_FAMILY)) + self.textbox_information = customtkinter.CTkTextbox( + self, + font=customtkinter.CTkFont(family=FONT_FAMILY) + ) self.textbox_information.grid(row=0, column=0, padx=(10, 10), pady=(10, 10), sticky="nsew") textbox_information_message = """VRCT(v0.2b) @@ -139,53 +150,225 @@ https://twitter.com/misya_ai self.textbox_information.insert("0.0", textbox_information_message) self.textbox_information.configure(state='disabled') -class ToplevelWindow_config(customtkinter.CTkToplevel): +class ToplevelWindowConfig(customtkinter.CTkToplevel): def __init__(self, parent, *args, **kwargs): super().__init__(parent, *args, **kwargs) self.parent = parent - # self.geometry(f"{450}x{200}") - self.resizable(False, False) + # self.geometry(f"{350}x{270}") + # self.resizable(False, False) + self.grid_columnconfigure(0, weight=1) + self.grid_rowconfigure(0, weight=1) self.after(200, lambda: self.iconbitmap(os.path.join(os.path.dirname(__file__), "img", "app.ico"))) self.title("Config") - self.label_ip_address = customtkinter.CTkLabel(self, text="OSC IP address:", fg_color="transparent", font=customtkinter.CTkFont(family=FONT_FAMILY)) + + # tabwiew config + self.tabview_config = customtkinter.CTkTabview(self) + self.tabview_config.grid(row=0, column=0, padx=5, pady=5, sticky="nsew") + self.tabview_config.add("GUI") + self.tabview_config.add("Parameter") + self.tabview_config.tab("GUI").grid_columnconfigure(0, weight=1) + self.tabview_config.tab("Parameter").grid_columnconfigure(0, weight=1) + self.tabview_config._segmented_button.configure(font=customtkinter.CTkFont(family=FONT_FAMILY)) + + # optionmenu translator + self.label_translator = customtkinter.CTkLabel( + self.tabview_config.tab("GUI"), + text="Select Translator:", + fg_color="transparent", + font=customtkinter.CTkFont(family=FONT_FAMILY) + ) + self.label_translator.grid(row=0, column=0, columnspan=1, padx=5, pady=5, sticky="nsew") + self.optionmenu_translator = customtkinter.CTkOptionMenu( + self.tabview_config.tab("GUI"), + values=["DeepL"], + command=self.optionmenu_translator_callback, + font=customtkinter.CTkFont(family=FONT_FAMILY) + ) + self.optionmenu_translator.grid(row=0, column=1, columnspan=2 ,padx=(0, 5), pady=5, sticky="nsew") + self.optionmenu_translator.set(CHOICE_TRANSLATOR) + + # optionmenu language + self.label_language = customtkinter.CTkLabel( + self.tabview_config.tab("GUI"), + text="Select Language:", + fg_color="transparent", + font=customtkinter.CTkFont(family=FONT_FAMILY) + ) + self.label_language.grid(row=1, column=0, columnspan=1, padx=5, pady=5, sticky="nsew") + self.optionmenu_language = customtkinter.CTkOptionMenu( + self.tabview_config.tab("GUI"), + command=self.optionmenu_language_callback, + font=customtkinter.CTkFont(family=FONT_FAMILY) + ) + self.optionmenu_language.grid(row=1, column=1, columnspan=2, padx=(0, 5), pady=5, sticky="nsew") + self.optionmenu_language.configure( + values=[ + "JA","BG","CS","DA","DE","EL","EN","EN-US","EN-GB","ES","ET","FI","FR","HU", + "ID","IT","KO","LT","LV","NB","NL","PL","PT","PT-BR","PT-PT","RO","RU","SK", + "SL","SV","TR","UK","ZH", + ] + ) + self.optionmenu_language.set(TARGET_LANG) + + # slider transparency + self.label_transparency = customtkinter.CTkLabel( + self.tabview_config.tab("GUI"), + text="Transparency:", + fg_color="transparent", + font=customtkinter.CTkFont(family=FONT_FAMILY) + ) + self.label_transparency.grid(row=2, column=0, columnspan=1, padx=(0, 5), pady=5, sticky="nsew") + self.slider_transparency = customtkinter.CTkSlider( + self.tabview_config.tab("GUI"), + from_=50, + to=100, + command=self.slider_transparency_callback + ) + self.slider_transparency.grid(row=2, column=1, columnspan=2, padx=5, pady=10, sticky="nsew") + self.slider_transparency.set(TRANSPARENCY) + + # optionmenu theme + self.label_appearance_theme = customtkinter.CTkLabel( + self.tabview_config.tab("GUI"), + text="Appearance Theme:", + fg_color="transparent", + font=customtkinter.CTkFont(family=FONT_FAMILY) + ) + self.label_appearance_theme.grid(row=3, column=0, columnspan=1, padx=(0, 5), pady=5, sticky="nsew") + self.optionmenu_appearance_theme = customtkinter.CTkOptionMenu( + self.tabview_config.tab("GUI"), + values=["Light", "Dark", "System"], + command=self.optionmenu_theme_callback + ) + self.optionmenu_appearance_theme.grid(row=3, column=1, columnspan=2, padx=(0, 5), pady=5, sticky="nsew") + self.optionmenu_appearance_theme.set(APPEARANCE_THEME) + + # optionmenu UI scaling + self.label_ui_scaling = customtkinter.CTkLabel( + self.tabview_config.tab("GUI"), + text="UI Scaling:", + fg_color="transparent", + font=customtkinter.CTkFont(family=FONT_FAMILY) + ) + self.label_ui_scaling.grid(row=4, column=0, columnspan=1, padx=(0, 5), pady=5, sticky="nsew") + self.optionmenu_ui_scaling = customtkinter.CTkOptionMenu( + self.tabview_config.tab("GUI"), + values=["80%", "90%", "100%", "110%", "120%"], + command=self.optionmenu_ui_scaling_callback + ) + self.optionmenu_ui_scaling.grid(row=4, column=1, columnspan=2, padx=(0, 5), pady=5, sticky="nsew") + self.optionmenu_ui_scaling.set(UI_SCALING) + + # optionmenu font family + self.label_font_family = customtkinter.CTkLabel( + self.tabview_config.tab("GUI"), + text="Font Family:", + fg_color="transparent", + font=customtkinter.CTkFont(family=FONT_FAMILY) + ) + self.label_font_family.grid(row=5, column=0, columnspan=1, padx=(0, 5), pady=5, sticky="nsew") + font_families = list(tk.font.families()) + self.optionmenu_font_family = customtkinter.CTkOptionMenu( + self.tabview_config.tab("GUI"), + values=font_families, + command=self.optionmenu_font_family_callback + ) + self.optionmenu_font_family.grid(row=5, column=1, columnspan=2, padx=(0, 5), pady=5, sticky="nsew") + self.optionmenu_font_family.set(FONT_FAMILY) + + # entry ip address + self.label_ip_address = customtkinter.CTkLabel( + self.tabview_config.tab("Parameter"), + text="OSC IP address:", + fg_color="transparent", + font=customtkinter.CTkFont(family=FONT_FAMILY) + ) self.label_ip_address.grid(row=0, column=0, columnspan=1, padx=5, pady=5, sticky="nsew") - self.entry_ip_address = customtkinter.CTkEntry(self, width=300, placeholder_text=OSC_IP_ADDRESS, font=customtkinter.CTkFont(family=FONT_FAMILY)) + self.entry_ip_address = customtkinter.CTkEntry( + self.tabview_config.tab("Parameter"), + placeholder_text=OSC_IP_ADDRESS, + font=customtkinter.CTkFont(family=FONT_FAMILY) + ) self.entry_ip_address.grid(row=0, column=1, columnspan=1, padx=1, pady=5, sticky="nsew") - self.button_ip_address = customtkinter.CTkButton(self, text="", width=1, command=self.update_ip_address, - image=customtkinter.CTkImage(Image.open(os.path.join(os.path.dirname(__file__), "img", "save-icon.png"))),) + self.button_ip_address = customtkinter.CTkButton( + self.tabview_config.tab("Parameter"), + text="", + width=1, + command=self.update_ip_address, + image=customtkinter.CTkImage(Image.open(os.path.join(os.path.dirname(__file__), "img", "save-icon.png"))) + ) self.button_ip_address.grid(row=0, column=2, columnspan=1, padx=5, pady=5, sticky="nsew") - self.label_port = customtkinter.CTkLabel(self, text="OSC Port:", fg_color="transparent", font=customtkinter.CTkFont(family=FONT_FAMILY)) + # entry port + self.label_port = customtkinter.CTkLabel( + self.tabview_config.tab("Parameter"), + text="OSC Port:", + fg_color="transparent", + font=customtkinter.CTkFont(family=FONT_FAMILY) + ) self.label_port.grid(row=1, column=0, columnspan=1, padx=5, pady=5, sticky="nsew") - self.entry_port = customtkinter.CTkEntry(self, placeholder_text=OSC_PORT, font=customtkinter.CTkFont(family=FONT_FAMILY)) + self.entry_port = customtkinter.CTkEntry( + self.tabview_config.tab("Parameter"), + placeholder_text=OSC_PORT, + font=customtkinter.CTkFont(family=FONT_FAMILY) + ) self.entry_port.grid(row=1, column=1, columnspan=1, padx=1, pady=5, sticky="nsew") - self.button_port = customtkinter.CTkButton(self, text="", width=1, command=self.update_port, - image=customtkinter.CTkImage(Image.open(os.path.join(os.path.dirname(__file__), "img", "save-icon.png")))) + self.button_port = customtkinter.CTkButton( + self.tabview_config.tab("Parameter"), + text="", + width=1, + command=self.update_port, + image=customtkinter.CTkImage(Image.open(os.path.join(os.path.dirname(__file__), "img", "save-icon.png"))) + ) self.button_port.grid(row=1, column=2, columnspan=1, padx=5, pady=5, sticky="nsew") - self.label_authkey = customtkinter.CTkLabel(self, text="DeepL Auth Key:", fg_color="transparent", font=customtkinter.CTkFont(family=FONT_FAMILY)) + # entry authkey + self.label_authkey = customtkinter.CTkLabel( + self.tabview_config.tab("Parameter"), + text="DeepL Auth Key:", + fg_color="transparent", + font=customtkinter.CTkFont(family=FONT_FAMILY) + ) self.label_authkey.grid(row=2, column=0, columnspan=1, padx=5, pady=5, sticky="nsew") - self.entry_authkey = customtkinter.CTkEntry(self, placeholder_text=AUTH_KEY, font=customtkinter.CTkFont(family=FONT_FAMILY)) + self.entry_authkey = customtkinter.CTkEntry( + self.tabview_config.tab("Parameter"), + placeholder_text=AUTH_KEY, + font=customtkinter.CTkFont(family=FONT_FAMILY) + ) self.entry_authkey.grid(row=2, column=1, columnspan=1, padx=1, pady=5, sticky="nsew") - self.button_authkey = customtkinter.CTkButton(self, text="", width=1, command=self.update_authkey, - image=customtkinter.CTkImage(Image.open(os.path.join(os.path.dirname(__file__), "img", "save-icon.png")))) + self.button_authkey = customtkinter.CTkButton( + self.tabview_config.tab("Parameter"), + text="", + width=1, + command=self.update_authkey, + image=customtkinter.CTkImage(Image.open(os.path.join(os.path.dirname(__file__), "img", "save-icon.png"))) + ) self.button_authkey.grid(row=2, column=2, columnspan=1, padx=5, pady=5, sticky="nsew") - self.label_message_format = customtkinter.CTkLabel(self, text="Message Format:", fg_color="transparent", font=customtkinter.CTkFont(family=FONT_FAMILY)) + # entry message format + self.label_message_format = customtkinter.CTkLabel( + self.tabview_config.tab("Parameter"), + text="Message Format:", + fg_color="transparent", + font=customtkinter.CTkFont(family=FONT_FAMILY) + ) self.label_message_format.grid(row=3, column=0, columnspan=1, padx=5, pady=5, sticky="nsew") - self.entry_message_format = customtkinter.CTkEntry(self, placeholder_text=MESSAGE_FORMAT, font=customtkinter.CTkFont(family=FONT_FAMILY)) + self.entry_message_format = customtkinter.CTkEntry( + self.tabview_config.tab("Parameter"), + placeholder_text=MESSAGE_FORMAT, + font=customtkinter.CTkFont(family=FONT_FAMILY) + ) self.entry_message_format.grid(row=3, column=1, columnspan=1, padx=1, pady=5, sticky="nsew") - self.button_message_format = customtkinter.CTkButton(self, text="", width=1, command=self.update_message_format, - image=customtkinter.CTkImage(Image.open(os.path.join(os.path.dirname(__file__), "img", "save-icon.png")))) + self.button_message_format = customtkinter.CTkButton( + self.tabview_config.tab("Parameter"), + text="", + width=1, + command=self.update_message_format, + image=customtkinter.CTkImage(Image.open(os.path.join(os.path.dirname(__file__), "img", "save-icon.png"))) + ) self.button_message_format.grid(row=3, column=2, columnspan=1, padx=5, pady=5, sticky="nsew") - self.label_transparency = customtkinter.CTkLabel(self, text="Transparency:", fg_color="transparent", font=customtkinter.CTkFont(family=FONT_FAMILY)) - self.label_transparency.grid(row=4, column=0, columnspan=1, padx=5, pady=5, sticky="nsew") - self.slider_transparency = customtkinter.CTkSlider(self, from_=50, to=100, command=self.update_transparency) - self.slider_transparency.grid(row=4, column=1, columnspan=2, padx=10, pady=10, sticky="nsew") - self.slider_transparency.set(TRANSPARENCY) - def update_ip_address(self): value = self.entry_ip_address.get() if len(value) > 0: @@ -221,7 +404,6 @@ class ToplevelWindow_config(customtkinter.CTkToplevel): json.dump(config, fp, indent=4) TRANSLATOR = deepl.Translator(AUTH_KEY) - self.parent.textbox_message_log.configure(state='normal') self.parent.textbox_message_log.delete("0.0", "end") self.parent.textbox_message_log.configure(state='disabled') @@ -244,7 +426,7 @@ class ToplevelWindow_config(customtkinter.CTkToplevel): with open(PATH_CONFIG, "w") as fp: json.dump(config, fp, indent=4) - def update_transparency(self, value): + def slider_transparency_callback(self, value): global TRANSPARENCY TRANSPARENCY = value with open(PATH_CONFIG, "r") as fp: @@ -254,13 +436,87 @@ class ToplevelWindow_config(customtkinter.CTkToplevel): json.dump(config, fp, indent=4) self.parent.wm_attributes("-alpha", TRANSPARENCY/100) + def optionmenu_translator_callback(self, choice): + global CHOICE_TRANSLATOR + CHOICE_TRANSLATOR = choice + with open(PATH_CONFIG, "r") as fp: + config = json.load(fp) + config["CHOICE_TRANSLATOR"] = CHOICE_TRANSLATOR + with open(PATH_CONFIG, "w") as fp: + json.dump(config, fp, indent=4) + + def optionmenu_language_callback(self, choice): + global TARGET_LANG + TARGET_LANG = choice + with open(PATH_CONFIG, "r") as fp: + config = json.load(fp) + config["TARGET_LANG"] = TARGET_LANG + with open(PATH_CONFIG, "w") as fp: + json.dump(config, fp, indent=4) + + def optionmenu_theme_callback(self, choice): + global APPEARANCE_THEME + APPEARANCE_THEME = choice + with open(PATH_CONFIG, "r") as fp: + config = json.load(fp) + config["APPEARANCE_THEME"] = APPEARANCE_THEME + with open(PATH_CONFIG, "w") as fp: + json.dump(config, fp, indent=4) + customtkinter.set_appearance_mode(APPEARANCE_THEME) + + def optionmenu_ui_scaling_callback(self, choice): + global UI_SCALING + UI_SCALING = choice + with open(PATH_CONFIG, "r") as fp: + config = json.load(fp) + config["UI_SCALING"] = UI_SCALING + with open(PATH_CONFIG, "w") as fp: + json.dump(config, fp, indent=4) + new_scaling_float = int(UI_SCALING.replace("%", "")) / 100 + customtkinter.set_widget_scaling(new_scaling_float) + + def optionmenu_font_family_callback(self, choice): + global FONT_FAMILY + FONT_FAMILY = choice + with open(PATH_CONFIG, "r") as fp: + config = json.load(fp) + config["FONT_FAMILY"] = FONT_FAMILY + with open(PATH_CONFIG, "w") as fp: + json.dump(config, fp, indent=4) + + self.parent.checkbox_translation.configure(font=customtkinter.CTkFont(family=FONT_FAMILY)) + self.parent.checkbox_foreground.configure(font=customtkinter.CTkFont(family=FONT_FAMILY)) + self.parent.textbox_message_log.configure(font=customtkinter.CTkFont(family=FONT_FAMILY)) + self.parent.entry_message_box.configure(font=customtkinter.CTkFont(family=FONT_FAMILY)) + self.parent.information_window.textbox_information.configure(font=customtkinter.CTkFont(family=FONT_FAMILY)) + self.tabview_config._segmented_button.configure(font=customtkinter.CTkFont(family=FONT_FAMILY)) + self.label_translator.configure(font=customtkinter.CTkFont(family=FONT_FAMILY)) + self.optionmenu_translator.configure(font=customtkinter.CTkFont(family=FONT_FAMILY)) + self.label_language.configure(font=customtkinter.CTkFont(family=FONT_FAMILY)) + self.optionmenu_language.configure(font=customtkinter.CTkFont(family=FONT_FAMILY)) + self.label_transparency.configure(font=customtkinter.CTkFont(family=FONT_FAMILY)) + self.label_appearance_theme.configure(font=customtkinter.CTkFont(family=FONT_FAMILY)) + self.optionmenu_appearance_theme.configure(font=customtkinter.CTkFont(family=FONT_FAMILY)) + self.label_ui_scaling.configure(font=customtkinter.CTkFont(family=FONT_FAMILY)) + self.optionmenu_ui_scaling.configure(font=customtkinter.CTkFont(family=FONT_FAMILY)) + self.label_font_family.configure(font=customtkinter.CTkFont(family=FONT_FAMILY)) + self.optionmenu_font_family.configure(font=customtkinter.CTkFont(family=FONT_FAMILY)) + self.label_ip_address.configure(font=customtkinter.CTkFont(family=FONT_FAMILY)) + self.entry_ip_address.configure(font=customtkinter.CTkFont(family=FONT_FAMILY)) + self.label_port.configure(font=customtkinter.CTkFont(family=FONT_FAMILY)) + self.entry_port.configure(font=customtkinter.CTkFont(family=FONT_FAMILY)) + self.label_authkey.configure(font=customtkinter.CTkFont(family=FONT_FAMILY)) + self.entry_authkey.configure(font=customtkinter.CTkFont(family=FONT_FAMILY)) + self.label_message_format.configure(font=customtkinter.CTkFont(family=FONT_FAMILY)) + self.entry_message_format.configure(font=customtkinter.CTkFont(family=FONT_FAMILY)) + class App(customtkinter.CTk): - def __init__(self): - super().__init__() + def __init__(self, *args, **kwargs): + super().__init__(*args, **kwargs) self.iconbitmap(os.path.join(os.path.dirname(__file__), "img", "app.ico")) self.title("VRCT") - self.geometry(f"{400}x{190}") - self.minsize(400, 190) + self.geometry(f"{400}x{110}") + self.minsize(400, 110) self.grid_columnconfigure(1, weight=1) self.grid_rowconfigure(0, weight=1) @@ -270,48 +526,63 @@ class App(customtkinter.CTk): self.sidebar_frame.grid_rowconfigure(5, weight=1) # checkbox translation - self.checkbox_translation = customtkinter.CTkCheckBox(self.sidebar_frame, text="translation", onvalue=True, offvalue=False, - command=self.checkbox_translation_callback, - font=customtkinter.CTkFont(family=FONT_FAMILY)) + self.checkbox_translation = customtkinter.CTkCheckBox( + self.sidebar_frame, + text="translation", + onvalue=True, + offvalue=False, + command=self.checkbox_translation_callback, + font=customtkinter.CTkFont(family=FONT_FAMILY) + ) self.checkbox_translation.grid(row=0, column=0, columnspan=2 ,padx=10, pady=(5, 5), sticky="we") # checkbox foreground - self.checkbox_foreground = customtkinter.CTkCheckBox(self.sidebar_frame, text="foreground", onvalue=True, offvalue=False, - command=self.checkbox_foreground_callback, - font=customtkinter.CTkFont(family=FONT_FAMILY)) + self.checkbox_foreground = customtkinter.CTkCheckBox( + self.sidebar_frame, + text="foreground", + onvalue=True, + offvalue=False, + command=self.checkbox_foreground_callback, + font=customtkinter.CTkFont(family=FONT_FAMILY) + ) self.checkbox_foreground.grid(row=1, column=0, columnspan=2 ,padx=10, pady=(5, 5), sticky="we") - # combobox translator - self.combobox_translator = customtkinter.CTkComboBox(self.sidebar_frame, - command=self.combobox_translator_callback, - font=customtkinter.CTkFont(family=FONT_FAMILY)) - self.combobox_translator.grid(row=2, column=0, columnspan=2 ,padx=10, pady=(5, 5), sticky="we") - - # combobox language - self.combobox_language = customtkinter.CTkComboBox(self.sidebar_frame, - command=self.combobox_language_callback, - font=customtkinter.CTkFont(family=FONT_FAMILY)) - self.combobox_language.grid(row=3, column=0, columnspan=2, padx=10, pady=(5, 5), sticky="we") - # button information - self.button_information = customtkinter.CTkButton(self.sidebar_frame, text="", width=70, command=self.open_information, - image=customtkinter.CTkImage(Image.open(os.path.join(os.path.dirname(__file__), "img", "info-icon-white.png")))) - self.button_information.grid(row=5, column=0, padx=(10, 5), pady=(10, 10), sticky="wse") + self.button_information = customtkinter.CTkButton( + self.sidebar_frame, + text="", + width=25, + command=self.open_information, + image=customtkinter.CTkImage(Image.open(os.path.join(os.path.dirname(__file__), "img", "info-icon-white.png"))) + ) + self.button_information.grid(row=5, column=0, padx=(10, 5), pady=(5, 5), sticky="wse") self.information_window = None # button config - self.button_config = customtkinter.CTkButton(self.sidebar_frame, text="", width=70, command=self.open_config, - image=customtkinter.CTkImage(Image.open(os.path.join(os.path.dirname(__file__), "img", "config-icon-white.png")))) - self.button_config.grid(row=5, column=1, padx=(5, 10), pady=(10, 10), sticky="wse") + self.button_config = customtkinter.CTkButton( + self.sidebar_frame, + text="", + width=25, + command=self.open_config, + image=customtkinter.CTkImage(Image.open(os.path.join(os.path.dirname(__file__), "img", "config-icon-white.png"))) + ) + self.button_config.grid(row=5, column=1, padx=(5, 10), pady=(5, 5), sticky="wse") self.config_window = None # create textbox message log - self.textbox_message_log = customtkinter.CTkTextbox(self, font=customtkinter.CTkFont(family=FONT_FAMILY)) + self.textbox_message_log = customtkinter.CTkTextbox( + self, + font=customtkinter.CTkFont(family=FONT_FAMILY) + ) self.textbox_message_log.grid(row=0, column=1, padx=(10, 10), pady=(10, 5), sticky="nsew") self.textbox_message_log.configure(state='disabled') # create entry message box - self.entry_message_box = customtkinter.CTkEntry(self, placeholder_text="message", font=customtkinter.CTkFont(family=FONT_FAMILY)) + self.entry_message_box = customtkinter.CTkEntry( + self, + placeholder_text="message", + font=customtkinter.CTkFont(family=FONT_FAMILY) + ) self.entry_message_box.grid(row=1, column=1, columnspan=2, padx=(10, 10), pady=(5, 10), sticky="nsew") # set default values @@ -327,13 +598,7 @@ class App(customtkinter.CTk): self.checkbox_foreground.deselect() self.attributes("-topmost", False) - self.combobox_translator.configure(values=["DeepL"],) - self.combobox_language.configure(values=[ - "JA","BG","CS","DA","DE","EL","EN","EN-US","EN-GB","ES","ET","FI","FR","HU", - "ID","IT","KO","LT","LV","NB","NL","PL","PT","PT-BR","PT-PT","RO","RU","SK", - "SL","SV","TR","UK","ZH", - ],) - self.entry_message_box.bind("", self.press_key) + self.entry_message_box.bind("", self.entry_message_box_press_key_enter) if TRANSLATOR is None: # error update Auth key @@ -341,18 +606,16 @@ class App(customtkinter.CTk): self.textbox_message_log.insert("0.0", f"Auth Keyを設定してないか間違っています\n") self.textbox_message_log.configure(state='disabled') - self.combobox_language.set(TARGET_LANG) - self.combobox_translator.set(CHOICE_TRANSLATOR) self.wm_attributes("-alpha", TRANSPARENCY/100) def open_config(self): if self.config_window is None or not self.config_window.winfo_exists(): - self.config_window = ToplevelWindow_config(self) + self.config_window = ToplevelWindowConfig(self) self.config_window.focus() def open_information(self): if self.information_window is None or not self.information_window.winfo_exists(): - self.information_window = ToplevelWindow_information(self) + self.information_window = ToplevelWindowInformation(self) self.information_window.focus() def checkbox_translation_callback(self): @@ -364,24 +627,6 @@ class App(customtkinter.CTk): with open(PATH_CONFIG, "w") as fp: json.dump(config, fp, indent=4) - def combobox_translator_callback(self, choice): - global CHOICE_TRANSLATOR - CHOICE_TRANSLATOR = choice - with open(PATH_CONFIG, "r") as fp: - config = json.load(fp) - config["CHOICE_TRANSLATOR"] = CHOICE_TRANSLATOR - with open(PATH_CONFIG, "w") as fp: - json.dump(config, fp, indent=4) - - def combobox_language_callback(self, choice): - global TARGET_LANG - TARGET_LANG = choice - with open(PATH_CONFIG, "r") as fp: - config = json.load(fp) - config["TARGET_LANG"] = TARGET_LANG - with open(PATH_CONFIG, "w") as fp: - json.dump(config, fp, indent=4) - def checkbox_foreground_callback(self): global ENABLE_FOREGROUND ENABLE_FOREGROUND = self.checkbox_foreground.get() @@ -396,14 +641,14 @@ class App(customtkinter.CTk): else: self.attributes("-topmost", False) - def press_key(self, event): + def entry_message_box_press_key_enter(self, event): if TRANSLATOR is None: pass else: message = self.entry_message_box.get() # translate - if self.checkbox_translation.get() is True: + if self.checkbox_translation.get() is True and len(message) > 0: result = TRANSLATOR.translate_text(message, target_lang=TARGET_LANG) chat_message = MESSAGE_FORMAT.replace("[message]", message).replace("[translation]", result.text) else: