Merge branch 'bugfix#18_shiina' into develop

This commit is contained in:
misygauziya
2023-07-18 23:52:40 +09:00

41
VRCT.py
View File

@@ -82,9 +82,10 @@ class App(CTk):
with open(self.PATH_CONFIG, 'r') as fp: with open(self.PATH_CONFIG, 'r') as fp:
config = json_load(fp) config = json_load(fp)
# main window # main window
if "ENABLE_TRANSLATION" in config.keys(): # main windowは初期はすべてOFFにする
if type(config["ENABLE_TRANSLATION"]) is bool: # if "ENABLE_TRANSLATION" in config.keys():
self.ENABLE_TRANSLATION = config["ENABLE_TRANSLATION"] # if type(config["ENABLE_TRANSLATION"]) is bool:
# self.ENABLE_TRANSLATION = config["ENABLE_TRANSLATION"]
# 環境に依ってマイクとスピーカーを同時起動するとエラーが発生するため、起動時は強制的にOFFにする # 環境に依ってマイクとスピーカーを同時起動するとエラーが発生するため、起動時は強制的にOFFにする
# if "ENABLE_TRANSCRIPTION_SEND" in config.keys(): # if "ENABLE_TRANSCRIPTION_SEND" in config.keys():
@@ -94,9 +95,9 @@ class App(CTk):
# if type(config["ENABLE_TRANSCRIPTION_RECEIVE"]) is bool: # if type(config["ENABLE_TRANSCRIPTION_RECEIVE"]) is bool:
# self.ENABLE_TRANSCRIPTION_RECEIVE = config["ENABLE_TRANSCRIPTION_RECEIVE"] # self.ENABLE_TRANSCRIPTION_RECEIVE = config["ENABLE_TRANSCRIPTION_RECEIVE"]
if "ENABLE_FOREGROUND" in config.keys(): # if "ENABLE_FOREGROUND" in config.keys():
if type(config["ENABLE_FOREGROUND"]) is bool: # if type(config["ENABLE_FOREGROUND"]) is bool:
self.ENABLE_FOREGROUND = config["ENABLE_FOREGROUND"] # self.ENABLE_FOREGROUND = config["ENABLE_FOREGROUND"]
# tab ui # tab ui
if "TRANSPARENCY" in config.keys(): if "TRANSPARENCY" in config.keys():
@@ -210,10 +211,10 @@ class App(CTk):
with open(self.PATH_CONFIG, 'w') as fp: with open(self.PATH_CONFIG, 'w') as fp:
config = { config = {
"ENABLE_TRANSLATION": self.ENABLE_TRANSLATION, # "ENABLE_TRANSLATION": self.ENABLE_TRANSLATION,
# "ENABLE_TRANSCRIPTION_SEND": self.ENABLE_TRANSCRIPTION_SEND, # "ENABLE_TRANSCRIPTION_SEND": self.ENABLE_TRANSCRIPTION_SEND,
# "ENABLE_TRANSCRIPTION_RECEIVE": self.ENABLE_TRANSCRIPTION_RECEIVE, # "ENABLE_TRANSCRIPTION_RECEIVE": self.ENABLE_TRANSCRIPTION_RECEIVE,
"ENABLE_FOREGROUND": self.ENABLE_FOREGROUND, # "ENABLE_FOREGROUND": self.ENABLE_FOREGROUND,
"TRANSPARENCY": self.TRANSPARENCY, "TRANSPARENCY": self.TRANSPARENCY,
"APPEARANCE_THEME": self.APPEARANCE_THEME, "APPEARANCE_THEME": self.APPEARANCE_THEME,
"UI_SCALING": self.UI_SCALING, "UI_SCALING": self.UI_SCALING,
@@ -352,12 +353,12 @@ class App(CTk):
print_textbox(self.textbox_message_log, "Auth Key or language setting is incorrect", "ERROR") print_textbox(self.textbox_message_log, "Auth Key or language setting is incorrect", "ERROR")
print_textbox(self.textbox_message_system_log, "Auth Key or language setting is incorrect", "ERROR") print_textbox(self.textbox_message_system_log, "Auth Key or language setting is incorrect", "ERROR")
## set checkbox enable translation # ## set checkbox enable translation
if self.ENABLE_TRANSLATION: # if self.ENABLE_TRANSLATION:
self.checkbox_translation.select() # self.checkbox_translation.select()
self.checkbox_translation_callback() # self.checkbox_translation_callback()
else: # else:
self.checkbox_translation.deselect() # self.checkbox_translation.deselect()
# ## set checkbox enable transcription send # ## set checkbox enable transcription send
# if self.ENABLE_TRANSCRIPTION_SEND: # if self.ENABLE_TRANSCRIPTION_SEND:
@@ -373,12 +374,12 @@ class App(CTk):
# else: # else:
# self.checkbox_transcription_receive.deselect() # self.checkbox_transcription_receive.deselect()
## set set checkbox enable foreground # ## set set checkbox enable foreground
if self.ENABLE_FOREGROUND: # if self.ENABLE_FOREGROUND:
self.checkbox_foreground.select() # self.checkbox_foreground.select()
self.checkbox_foreground_callback() # self.checkbox_foreground_callback()
else: # else:
self.checkbox_foreground.deselect() # self.checkbox_foreground.deselect()
## set word filter ## set word filter
for f in self.INPUT_MIC_WORD_FILTER: for f in self.INPUT_MIC_WORD_FILTER: