From 0b1e731246d83c18cc0f07c0bb214e098229e06f Mon Sep 17 00:00:00 2001 From: Sakamoto Shiina <68018796+ShiinaSakamoto@users.noreply.github.com> Date: Wed, 13 Sep 2023 16:31:44 +0900 Subject: [PATCH] =?UTF-8?q?[Update]=20Main=20Window:=20Sidebar=20Language?= =?UTF-8?q?=20Settings=20DropdownMenu=E9=96=8B=E9=96=89=E6=A9=9F=E8=83=BD?= =?UTF-8?q?=E3=82=92=E3=83=88=E3=82=B0=E3=83=AB=E5=BC=8F=E3=81=AB=E3=80=82?= =?UTF-8?q?=20Selectable=20Languages=20Window:=20=E3=82=BF=E3=82=A4?= =?UTF-8?q?=E3=83=88=E3=83=AB=E8=BF=BD=E5=8A=A0=E3=80=82=E4=BB=8A=E9=96=8B?= =?UTF-8?q?=E3=81=84=E3=81=A6=E3=81=84=E3=82=8B=E3=82=82=E3=81=AE=E3=81=8C?= =?UTF-8?q?Your=20Language=E3=81=AA=E3=81=AE=E3=81=8BTarget=20Language?= =?UTF-8?q?=E3=81=AA=E3=81=AE=E3=81=8B=E5=88=86=E3=81=8B=E3=82=8B=E3=82=88?= =?UTF-8?q?=E3=81=86=E3=81=AB=E3=80=82=20=E3=83=A1=E3=82=A4=E3=83=B3?= =?UTF-8?q?=E7=94=BB=E9=9D=A2=E3=81=AE=E3=82=B5=E3=82=A4=E3=82=BA=E3=81=AB?= =?UTF-8?q?=E5=90=88=E3=82=8F=E3=81=9B=E3=81=A6=E9=96=8B=E3=81=8F=E3=82=A6?= =?UTF-8?q?=E3=82=A4=E3=83=B3=E3=83=89=E3=82=A6=E3=81=AE=E3=82=B5=E3=82=A4?= =?UTF-8?q?=E3=82=BA=E3=82=82=E5=A4=89=E3=82=8F=E3=82=8B=E3=82=88=E3=81=86?= =?UTF-8?q?=E3=81=AB=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- view.py | 7 ++++ vrct_gui/_CreateSelectableLanguagesWindow.py | 39 +++++++++++++++----- vrct_gui/ui_managers/ColorThemeManager.py | 2 + vrct_gui/vrct_gui.py | 25 +++++++++++-- 4 files changed, 59 insertions(+), 14 deletions(-) diff --git a/view.py b/view.py index f3e783e1..568a4bae 100644 --- a/view.py +++ b/view.py @@ -70,6 +70,7 @@ class View(): VAR_LABEL_YOUR_LANGUAGE=StringVar(value="Your Language"), # JA: あなたの言語 VAR_YOUR_LANGUAGE = StringVar(value="Japanese\n(Japan)"), CALLBACK_OPEN_SELECTABLE_YOUR_LANGUAGE_WINDOW=None, + IS_OPENED_SELECTABLE_YOUR_LANGUAGE_WINDOW=False, CALLBACK_SELECTED_YOUR_LANGUAGE=None, VAR_LABEL_BOTH_DIRECTION_DESC=StringVar(value="Translate Each Other"), # JA: 双方向に翻訳 @@ -77,6 +78,7 @@ class View(): VAR_LABEL_TARGET_LANGUAGE=StringVar(value="Target Language"), # JA: 相手の言語 VAR_TARGET_LANGUAGE = StringVar(value="English\n(United States)"), CALLBACK_OPEN_SELECTABLE_TARGET_LANGUAGE_WINDOW=None, + IS_OPENED_SELECTABLE_TARGET_LANGUAGE_WINDOW=False, CALLBACK_SELECTED_TARGET_LANGUAGE=None, @@ -86,6 +88,9 @@ class View(): VAR_LABEL_TEXTBOX_SYSTEM=StringVar(value="System"), # JA: システム + # Selectable Language Window + VAR_TITLE_LABEL_SELECTABLE_LANGUAGE=StringVar(value=""), + VAR_GO_BACK_LABEL_SELECTABLE_LANGUAGE=StringVar(value="Go Back"), @@ -381,8 +386,10 @@ class View(): vrct_gui.recreateMainWindowSidebar() def openSelectableLanguagesWindow_YourLanguage(self, _e): + self.view_variable.VAR_TITLE_LABEL_SELECTABLE_LANGUAGE.set("Your Language") vrct_gui.openSelectableLanguagesWindow("your_language") def openSelectableLanguagesWindow_TargetLanguage(self, _e): + self.view_variable.VAR_TITLE_LABEL_SELECTABLE_LANGUAGE.set("Target Language") vrct_gui.openSelectableLanguagesWindow("target_language") diff --git a/vrct_gui/_CreateSelectableLanguagesWindow.py b/vrct_gui/_CreateSelectableLanguagesWindow.py index ee5a0ea5..e0c8d6ce 100644 --- a/vrct_gui/_CreateSelectableLanguagesWindow.py +++ b/vrct_gui/_CreateSelectableLanguagesWindow.py @@ -37,13 +37,15 @@ class _CreateSelectableLanguagesWindow(CTkToplevel): def createContainer(self, selectable_language_window_type): self.selectable_language_window_type = selectable_language_window_type + self.attach.update_idletasks() self.x_pos = self.attach.winfo_rootx() self.y_pos = self.attach.winfo_rooty() - self.width_new = self.attach.winfo_width() - 16 - self.height_new = self.attach.winfo_height() - 50 + self.width_new = self.attach.winfo_width() + self.height_new = self.attach.winfo_height() - self.geometry('+{}+{}'.format(self.x_pos, self.y_pos)) + self.geometry('{}x{}+{}+{}'.format(self.width_new, self.height_new, self.x_pos, self.y_pos)) + if self.is_created is True: @@ -69,16 +71,15 @@ class _CreateSelectableLanguagesWindow(CTkToplevel): def _createContainer(self): - # self.geometry('{}x{}+{}+{}'.format(self.width_new, self.height_new, self.x_pos, self.y_pos)) - # self.geometry('{}x{}+{}+{}'.format(self.width_new, self.height_new, self.x_pos, self.y_pos)) - - self.rowconfigure(0, minsize=50) - self.top_container = CTkFrame(self, corner_radius=0, fg_color=self.settings.ctm.MAIN_BG_COLOR, width=0, height=0) + self.rowconfigure(1, weight=1) + self.columnconfigure(0, weight=1) + self.top_container = CTkFrame(self, corner_radius=0, fg_color=self.settings.ctm.TOP_BG_COLOR, width=0, height=0) self.top_container.grid(row=0, column=0, sticky="nsew") self.top_container.rowconfigure((0,2), weight=1) + self.top_container.columnconfigure(1, weight=1) self.go_back_button_container = CTkFrame(self.top_container, corner_radius=0, fg_color=self.settings.ctm.GO_BACK_BUTTON_BG_COLOR, width=0, height=0) self.go_back_button_container.grid(row=1, column=0) @@ -88,19 +89,37 @@ class _CreateSelectableLanguagesWindow(CTkToplevel): self.go_back_button_label = CTkLabel( self.go_back_button_label_wrapper, - text="Go back", + textvariable=self._view_variable.VAR_GO_BACK_LABEL_SELECTABLE_LANGUAGE, height=0, corner_radius=0, font=CTkFont(family=self.settings.FONT_FAMILY, size=14, weight="normal"), anchor="w", text_color=self.settings.ctm.BASIC_TEXT_COLOR, ) - self.go_back_button_label.grid(row=1, column=0, padx=10, pady=10) + self.go_back_button_label.grid(row=0, column=0, padx=10, pady=8) bindButtonReleaseFunction([self.go_back_button_label_wrapper, self.go_back_button_label], lambda _e: self.vrct_gui.closeSelectableLanguagesWindow()) + self.title_container = CTkFrame(self.top_container, corner_radius=0, fg_color=self.settings.ctm.TOP_BG_COLOR, width=0, height=0) + self.title_container.grid(row=1, column=1, sticky="nsew") + + self.title_container.columnconfigure((0,2), weight=1) + self.title_container.rowconfigure((0,2), weight=1) + self.title_label = CTkLabel( + self.title_container, + textvariable=self._view_variable.VAR_TITLE_LABEL_SELECTABLE_LANGUAGE, + height=0, + corner_radius=0, + font=CTkFont(family=self.settings.FONT_FAMILY, size=18, weight="normal"), + anchor="w", + text_color=self.settings.ctm.TITLE_TEXT_COLOR, + ) + self.title_label.grid(row=1, column=1) + + + self.scroll_frame_container = CTkScrollableFrame(self, corner_radius=0, fg_color=self.settings.ctm.MAIN_BG_COLOR, width=self.width_new, height=self.height_new) self.scroll_frame_container.grid(row=1, column=0, sticky="nsew") diff --git a/vrct_gui/ui_managers/ColorThemeManager.py b/vrct_gui/ui_managers/ColorThemeManager.py index 029d34b8..2f980de4 100644 --- a/vrct_gui/ui_managers/ColorThemeManager.py +++ b/vrct_gui/ui_managers/ColorThemeManager.py @@ -181,6 +181,8 @@ class ColorThemeManager(): self.selectable_language_window.GO_BACK_BUTTON_BG_COLOR = self.DARK_800_COLOR + self.selectable_language_window.TOP_BG_COLOR = self.main.SIDEBAR_BG_COLOR + self.selectable_language_window.TITLE_TEXT_COLOR = self.DARK_400_COLOR self.selectable_language_window.LANGUAGE_BUTTON_BG_HOVERED_COLOR = self.DARK_825_COLOR self.selectable_language_window.LANGUAGE_BUTTON_BG_CLICKED_COLOR = self.DARK_888_COLOR diff --git a/vrct_gui/vrct_gui.py b/vrct_gui/vrct_gui.py index c4720fb6..36287308 100644 --- a/vrct_gui/vrct_gui.py +++ b/vrct_gui/vrct_gui.py @@ -64,13 +64,28 @@ class VRCT_GUI(CTk): self.config_window.grab_release() + + def openSelectableLanguagesWindow(self, selectable_language_window_type): if selectable_language_window_type == "your_language": - self.sls__arrow_img_your_language.configure(image=CTkImage((self.settings.main.image_file.ARROW_LEFT),size=(20,20))) - elif selectable_language_window_type == "target_language": - self.sls__arrow_img_target_language.configure(image=CTkImage((self.settings.main.image_file.ARROW_LEFT),size=(20,20))) + if self._view_variable.IS_OPENED_SELECTABLE_YOUR_LANGUAGE_WINDOW is False: + self.sls__arrow_img_your_language.configure(image=CTkImage((self.settings.main.image_file.ARROW_LEFT),size=(20,20))) + self._view_variable.IS_OPENED_SELECTABLE_YOUR_LANGUAGE_WINDOW = True + self._view_variable.IS_OPENED_SELECTABLE_TARGET_LANGUAGE_WINDOW = False + else: + self._view_variable.IS_OPENED_SELECTABLE_YOUR_LANGUAGE_WINDOW = False + return + + elif selectable_language_window_type == "target_language": + if self._view_variable.IS_OPENED_SELECTABLE_TARGET_LANGUAGE_WINDOW is False: + self.sls__arrow_img_target_language.configure(image=CTkImage((self.settings.main.image_file.ARROW_LEFT),size=(20,20))) + self._view_variable.IS_OPENED_SELECTABLE_TARGET_LANGUAGE_WINDOW = True + self._view_variable.IS_OPENED_SELECTABLE_YOUR_LANGUAGE_WINDOW = False + else: + self._view_variable.IS_OPENED_SELECTABLE_TARGET_LANGUAGE_WINDOW = False + return + - self.sls__arrow_img_target_language self.selectable_languages_window.createContainer(selectable_language_window_type) self.selectable_languages_window.deiconify() self.selectable_languages_window.focus_set() @@ -81,6 +96,8 @@ class VRCT_GUI(CTk): self.sls__arrow_img_your_language.configure(image=CTkImage((self.settings.main.image_file.ARROW_LEFT).rotate(180),size=(20,20))) self.sls__arrow_img_target_language.configure(image=CTkImage((self.settings.main.image_file.ARROW_LEFT).rotate(180),size=(20,20))) self.selectable_languages_window.withdraw() + self._view_variable.IS_OPENED_SELECTABLE_TARGET_LANGUAGE_WINDOW = False + self._view_variable.IS_OPENED_SELECTABLE_YOUR_LANGUAGE_WINDOW = False