Merge branch 'UI_2.0' of https://github.com/misyaguziya/VRCT into UI_2.0
This commit is contained in:
7
view.py
7
view.py
@@ -55,8 +55,15 @@ class View():
|
|||||||
CALLBACK_TOGGLE_FOREGROUND=None,
|
CALLBACK_TOGGLE_FOREGROUND=None,
|
||||||
|
|
||||||
# Language Settings
|
# Language Settings
|
||||||
|
VAR_LABEL_LANGUAGE_SETTINGS=StringVar(value="Language Settings"), # JA: 言語設定
|
||||||
|
|
||||||
CALLBACK_SELECTED_LANGUAGE_PRESET_TAB=None,
|
CALLBACK_SELECTED_LANGUAGE_PRESET_TAB=None,
|
||||||
|
VAR_LABEL_YOUR_LANGUAGE=StringVar(value="Your Language"), # JA: あなたの言語
|
||||||
VAR_YOUR_LANGUAGE = StringVar(value="Japanese\n(Japan)"),
|
VAR_YOUR_LANGUAGE = StringVar(value="Japanese\n(Japan)"),
|
||||||
|
|
||||||
|
VAR_LABEL_BOTH_DIRECTION_DESC=StringVar(value="Translate Each Other"), # JA: 双方向に翻訳
|
||||||
|
|
||||||
|
VAR_LABEL_TARGET_LANGUAGE=StringVar(value="Target Language"), # JA: 相手の言語
|
||||||
VAR_TARGET_LANGUAGE = StringVar(value="English\n(United States)"),
|
VAR_TARGET_LANGUAGE = StringVar(value="English\n(United States)"),
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -56,7 +56,7 @@ def createSidebarLanguagesSettings(settings, main_window, view_variable):
|
|||||||
|
|
||||||
|
|
||||||
|
|
||||||
def createOption_DropdownMenu_for_quickSettings(setattr_obj, parent_widget, optionmenu_attr_name, dropdown_menu_attr_name, dropdown_menu_values=None, width:int = 200, font_size:int = 10, text_color="white", command=None, variable=""):
|
def createOption_DropdownMenu_for_languageSettings(setattr_obj, parent_widget, optionmenu_attr_name, dropdown_menu_values, width:int = 200, font_size:int = 10, text_color="white", command=None, variable=""):
|
||||||
setattr(setattr_obj, optionmenu_attr_name, CTkOptionMenu(
|
setattr(setattr_obj, optionmenu_attr_name, CTkOptionMenu(
|
||||||
parent_widget,
|
parent_widget,
|
||||||
height=30,
|
height=30,
|
||||||
@@ -75,7 +75,7 @@ def createSidebarLanguagesSettings(settings, main_window, view_variable):
|
|||||||
|
|
||||||
|
|
||||||
|
|
||||||
def createQuickLanguageSettingBox(parent_widget, title_text, title_text_attr_name, optionmenu_attr_name, dropdown_menu_attr_name, dropdown_menu_values, variable):
|
def createLanguageSettingBox(parent_widget, var_title_text, title_text_attr_name, optionmenu_attr_name, dropdown_menu_values, variable):
|
||||||
sls__box = CTkFrame(parent_widget, corner_radius=0, fg_color=settings.ctm.SLS__BOX_BG_COLOR, width=0, height=0)
|
sls__box = CTkFrame(parent_widget, corner_radius=0, fg_color=settings.ctm.SLS__BOX_BG_COLOR, width=0, height=0)
|
||||||
|
|
||||||
sls__box.columnconfigure((0,2), weight=1)
|
sls__box.columnconfigure((0,2), weight=1)
|
||||||
@@ -85,7 +85,7 @@ def createSidebarLanguagesSettings(settings, main_window, view_variable):
|
|||||||
|
|
||||||
sls__label = CTkLabel(
|
sls__label = CTkLabel(
|
||||||
sls__box_wrapper,
|
sls__box_wrapper,
|
||||||
text=title_text,
|
textvariable=var_title_text,
|
||||||
height=0,
|
height=0,
|
||||||
font=CTkFont(family=settings.FONT_FAMILY, size=settings.uism.SLS__BOX_SECTION_TITLE_FONT_SIZE, weight="normal"),
|
font=CTkFont(family=settings.FONT_FAMILY, size=settings.uism.SLS__BOX_SECTION_TITLE_FONT_SIZE, weight="normal"),
|
||||||
text_color=settings.ctm.SLS__BOX_SECTION_TITLE_TEXT_COLOR
|
text_color=settings.ctm.SLS__BOX_SECTION_TITLE_TEXT_COLOR
|
||||||
@@ -96,11 +96,10 @@ def createSidebarLanguagesSettings(settings, main_window, view_variable):
|
|||||||
|
|
||||||
|
|
||||||
|
|
||||||
createOption_DropdownMenu_for_quickSettings(
|
createOption_DropdownMenu_for_languageSettings(
|
||||||
main_window,
|
main_window,
|
||||||
sls__box_wrapper,
|
sls__box_wrapper,
|
||||||
optionmenu_attr_name,
|
optionmenu_attr_name,
|
||||||
dropdown_menu_attr_name,
|
|
||||||
dropdown_menu_values=dropdown_menu_values,
|
dropdown_menu_values=dropdown_menu_values,
|
||||||
# command=self.fakeCommand,
|
# command=self.fakeCommand,
|
||||||
width=settings.uism.SLS__BOX_DROPDOWN_MENU_WIDTH,
|
width=settings.uism.SLS__BOX_DROPDOWN_MENU_WIDTH,
|
||||||
@@ -126,8 +125,7 @@ def createSidebarLanguagesSettings(settings, main_window, view_variable):
|
|||||||
|
|
||||||
|
|
||||||
main_window.sls__container_title = CTkLabel(main_window.sls__container,
|
main_window.sls__container_title = CTkLabel(main_window.sls__container,
|
||||||
# text="言語設定",
|
textvariable=view_variable.VAR_LABEL_LANGUAGE_SETTINGS,
|
||||||
text="Language Settings",
|
|
||||||
height=0,
|
height=0,
|
||||||
font=CTkFont(family=settings.FONT_FAMILY, size=settings.uism.SLS__TITLE_FONT_SIZE, weight="normal"),
|
font=CTkFont(family=settings.FONT_FAMILY, size=settings.uism.SLS__TITLE_FONT_SIZE, weight="normal"),
|
||||||
text_color=settings.ctm.SLS__TITLE_TEXT_COLOR
|
text_color=settings.ctm.SLS__TITLE_TEXT_COLOR
|
||||||
@@ -211,13 +209,11 @@ def createSidebarLanguagesSettings(settings, main_window, view_variable):
|
|||||||
main_window.sls__box_frame.grid_columnconfigure(0, weight=1)
|
main_window.sls__box_frame.grid_columnconfigure(0, weight=1)
|
||||||
|
|
||||||
# Your language
|
# Your language
|
||||||
main_window.sls__box_your_language = createQuickLanguageSettingBox(
|
main_window.sls__box_your_language = createLanguageSettingBox(
|
||||||
parent_widget=main_window.sls__box_frame,
|
parent_widget=main_window.sls__box_frame,
|
||||||
# title_text="あなたの言語",
|
var_title_text=view_variable.VAR_LABEL_YOUR_LANGUAGE,
|
||||||
title_text="Your Language",
|
|
||||||
title_text_attr_name="sls__title_text_your_language",
|
title_text_attr_name="sls__title_text_your_language",
|
||||||
optionmenu_attr_name="sls__optionmenu_your_language",
|
optionmenu_attr_name="sls__optionmenu_your_language",
|
||||||
dropdown_menu_attr_name="sls__dropdown_menu_your_language",
|
|
||||||
dropdown_menu_values=["1""2","pppp\npppp"],
|
dropdown_menu_values=["1""2","pppp\npppp"],
|
||||||
variable=view_variable.VAR_YOUR_LANGUAGE
|
variable=view_variable.VAR_YOUR_LANGUAGE
|
||||||
)
|
)
|
||||||
@@ -241,8 +237,7 @@ def createSidebarLanguagesSettings(settings, main_window, view_variable):
|
|||||||
|
|
||||||
main_window.sls__both_direction_desc = CTkLabel(
|
main_window.sls__both_direction_desc = CTkLabel(
|
||||||
main_window.sls__arrow_direction_box,
|
main_window.sls__arrow_direction_box,
|
||||||
# text="双方向に翻訳",
|
textvariable=view_variable.VAR_LABEL_BOTH_DIRECTION_DESC,
|
||||||
text="Translate Each Other",
|
|
||||||
height=0,
|
height=0,
|
||||||
font=CTkFont(family=settings.FONT_FAMILY, size=settings.uism.SLS__BOX_ARROWS_DESC_FONT_SIZE, weight="normal"),
|
font=CTkFont(family=settings.FONT_FAMILY, size=settings.uism.SLS__BOX_ARROWS_DESC_FONT_SIZE, weight="normal"),
|
||||||
text_color=settings.ctm.SLS__BOX_ARROWS_TEXT_COLOR,
|
text_color=settings.ctm.SLS__BOX_ARROWS_TEXT_COLOR,
|
||||||
@@ -261,13 +256,11 @@ def createSidebarLanguagesSettings(settings, main_window, view_variable):
|
|||||||
|
|
||||||
|
|
||||||
# Target language
|
# Target language
|
||||||
main_window.sls__box_target_language = createQuickLanguageSettingBox(
|
main_window.sls__box_target_language = createLanguageSettingBox(
|
||||||
parent_widget=main_window.sls__box_frame,
|
parent_widget=main_window.sls__box_frame,
|
||||||
# title_text="相手の言語",
|
var_title_text=view_variable.VAR_LABEL_TARGET_LANGUAGE,
|
||||||
title_text="Target Language",
|
|
||||||
title_text_attr_name="sls__title_text_target_language",
|
title_text_attr_name="sls__title_text_target_language",
|
||||||
optionmenu_attr_name="sls__optionmenu_target_language",
|
optionmenu_attr_name="sls__optionmenu_target_language",
|
||||||
dropdown_menu_attr_name="sls__dropdown_menu_target_language",
|
|
||||||
dropdown_menu_values=["1""2","pppp\npppp2"],
|
dropdown_menu_values=["1""2","pppp\npppp2"],
|
||||||
variable=view_variable.VAR_TARGET_LANGUAGE
|
variable=view_variable.VAR_TARGET_LANGUAGE
|
||||||
)
|
)
|
||||||
|
|||||||
Reference in New Issue
Block a user