From 6cd56991c35635e827f2580d3b7bb4d182f699be Mon Sep 17 00:00:00 2001 From: Sakamoto Shiina <68018796+ShiinaSakamoto@users.noreply.github.com> Date: Sun, 14 Jan 2024 19:11:09 +0900 Subject: [PATCH] =?UTF-8?q?[bugfix/chore]=20Main=20Window:=20Selectable=20?= =?UTF-8?q?Translation=20Engines.=20=E3=83=BB=E3=83=89=E3=83=AD=E3=83=83?= =?UTF-8?q?=E3=83=97=E3=83=80=E3=82=A6=E3=83=B3=E3=83=A1=E3=83=8B=E3=83=A5?= =?UTF-8?q?=E3=83=BC=E3=81=AE=E6=96=87=E8=A8=80=E4=BF=AE=E6=AD=A3=E3=80=82?= =?UTF-8?q?=EF=BC=88CTranslate2=E3=81=AE=E8=A1=A8=E7=A4=BA=E4=BF=AE?= =?UTF-8?q?=E6=AD=A3=E3=81=A8=E3=80=81=E3=83=87=E3=83=95=E3=82=A9=E3=83=AB?= =?UTF-8?q?=E3=83=88=E3=81=A7=E3=81=82=E3=82=8B=E6=97=A8=E3=82=92=E8=BF=BD?= =?UTF-8?q?=E5=8A=A0=EF=BC=89=20=E3=83=BB=E5=B9=85=E3=81=8C=E8=A6=8F?= =?UTF-8?q?=E5=AE=9A=E5=80=A4=E3=82=88=E3=82=8A=E8=B6=85=E3=81=88=E3=81=9F?= =?UTF-8?q?=E6=99=82=E3=81=AE=E5=87=A6=E7=90=86=E3=81=A7=E3=82=A8=E3=83=A9?= =?UTF-8?q?=E3=83=BC=E3=81=8C=E7=99=BA=E7=94=9F=E3=81=99=E3=82=8B=E3=81=AE?= =?UTF-8?q?=E3=82=92=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- locales/en.yml | 2 +- locales/ja.yml | 2 +- view.py | 8 +++++- .../createSidebarLanguagesSettings.py | 22 ---------------- vrct_gui/ui_managers/UiScalingManager.py | 3 ++- vrct_gui/vrct_gui.py | 25 ++++++++++++++++++- 6 files changed, 35 insertions(+), 27 deletions(-) diff --git a/locales/en.yml b/locales/en.yml index fdb5f4aa..d967956d 100644 --- a/locales/en.yml +++ b/locales/en.yml @@ -10,7 +10,7 @@ main_window: swap_button_label: Swap Languages target_language: Target Language translator: Translator - translator_ctranslate2: Internal + translator_ctranslate2: Internal (Default) textbox_tab_all: All textbox_tab_sent: Sent diff --git a/locales/ja.yml b/locales/ja.yml index 72d79c41..4443c822 100644 --- a/locales/ja.yml +++ b/locales/ja.yml @@ -10,7 +10,7 @@ main_window: swap_button_label: 言語を入れ替え target_language: 相手の言語 translator: 翻訳エンジン - translator_ctranslate2: オフライン翻訳 + translator_ctranslate2: オフライン翻訳（デフォルト） textbox_tab_all: 全て textbox_tab_sent: 送信 diff --git a/view.py b/view.py index 16b913dd..76089ece 100644 --- a/view.py +++ b/view.py @@ -89,6 +89,12 @@ class View(): **common_args ) + self.settings.dropdown_menu_window = SimpleNamespace( + # ctm=all_ctm.dropdown_menu_window, + uism=all_uism.dropdown_menu_window, + **common_args + ) + self.view_variable = SimpleNamespace( # Common CALLBACK_RESTART_SOFTWARE=None, @@ -906,7 +912,7 @@ class View(): def updateSelectableTranslationEngineList(self, selectable_translation_engines_list): translation_dict = {item: item for item in selectable_translation_engines_list} - translation_dict["CTranslate2"] = self.TEXT_TRANSLATOR_CTRANSLATE2 + translation_dict["CTranslate2"] = i18n.t("main_window.translator_ctranslate2") vrct_gui.translation_engine_dropdown_menu_window.updateDropdownMenuValues( dropdown_menu_widget_id="translation_engine_dropdown_menu", diff --git a/vrct_gui/main_window/widgets/_create_sidebar/createSidebarLanguagesSettings.py b/vrct_gui/main_window/widgets/_create_sidebar/createSidebarLanguagesSettings.py index e6c6c691..0c3a8e25 100644 --- a/vrct_gui/main_window/widgets/_create_sidebar/createSidebarLanguagesSettings.py +++ b/vrct_gui/main_window/widgets/_create_sidebar/createSidebarLanguagesSettings.py @@ -352,28 +352,6 @@ def createSidebarLanguagesSettings(settings, main_window, view_variable): - main_window.translation_engine_dropdown_menu_window = _CreateDropdownMenuWindow( - settings=settings, - view_variable=main_window._view_variable, - - window_additional_y_pos=4, - window_border_width=1, - scrollbar_ipadx=(2,2), - scrollbar_width=16, - value_ipadx=(8,0), - value_ipady=(6,6), - value_pady=0, - value_font_size=14, - dropdown_menu_default_min_width=200, - - window_bg_color="#1f2022", - window_border_color="#7f8084", - values_bg_color="#323336", - values_hovered_bg_color="#4b4c4f", - values_clicked_bg_color="#292a2d", - values_text_color=settings.ctm.BASIC_TEXT_COLOR, - ) - # main_window.translation_engine_dropdown_menu_window = _CreateDropdownMenuWindow( # settings=settings.config_window, # view_variable=main_window._view_variable, diff --git a/vrct_gui/ui_managers/UiScalingManager.py b/vrct_gui/ui_managers/UiScalingManager.py index 64550683..8fea6a2c 100644 --- a/vrct_gui/ui_managers/UiScalingManager.py +++ b/vrct_gui/ui_managers/UiScalingManager.py @@ -13,6 +13,7 @@ class UiScalingManager(): self.main_window_cover = SimpleNamespace() self.error_message_window = SimpleNamespace() self.confirmation_modal = SimpleNamespace() + self.dropdown_menu_window = SimpleNamespace() self._calculatedUiSizes() @@ -170,7 +171,7 @@ class UiScalingManager(): self.confirmation_modal.BUTTONS_IPADY = self._calculateUiSize(6) # Dropdown Menu Window - self.config_window.MARGIN_WIDTH = self._calculateUiSize(16) + self.dropdown_menu_window.MARGIN_WIDTH = self._calculateUiSize(16) # Config Window self.config_window.DEFAULT_WIDTH = self._calculateUiSize(1080) diff --git a/vrct_gui/vrct_gui.py b/vrct_gui/vrct_gui.py index 7c0bdc7f..7a4970c4 100644 --- a/vrct_gui/vrct_gui.py +++ b/vrct_gui/vrct_gui.py @@ -71,14 +71,37 @@ class VRCT_GUI(CTk): self.settings = settings self._view_variable = view_variable + self.translation_engine_dropdown_menu_window = _CreateDropdownMenuWindow( + settings=settings.dropdown_menu_window, + view_variable=self._view_variable, + + window_additional_y_pos=4, + window_border_width=1, + scrollbar_ipadx=(2,2), + scrollbar_width=16, + value_ipadx=(8,0), + value_ipady=(6,6), + value_pady=0, + value_font_size=14, + dropdown_menu_default_min_width=200, + + window_bg_color="#1f2022", + window_border_color="#7f8084", + values_bg_color="#323336", + values_hovered_bg_color="#4b4c4f", + values_clicked_bg_color="#292a2d", + values_text_color=settings.main.ctm.BASIC_TEXT_COLOR, + ) + createMainWindowWidgets( vrct_gui=self, settings=self.settings.main, view_variable=self._view_variable ) + # For Config Window self.dropdown_menu_window = _CreateDropdownMenuWindow( - settings=self.settings.config_window, + settings=self.settings.dropdown_menu_window, view_variable=self._view_variable, window_additional_y_pos=self.settings.config_window.uism.SB__DROPDOWN_MENU_WINDOW_ADDITIONAL_Y_POS,