Merge branch 'multi_language_translation' into for_webui

This commit is contained in:
misyaguziya
2024-09-10 14:46:30 +09:00
3 changed files with 30 additions and 12 deletions

View File

@@ -193,14 +193,14 @@ class Config:
if isinstance(value, bool):
self._IS_RESET_BUTTON_DISPLAYED_FOR_WHISPER = value
@property
def IS_EASTER_EGG_ENABLED(self):
return self._IS_EASTER_EGG_ENABLED
# @property
# def IS_EASTER_EGG_ENABLED(self):
# return self._IS_EASTER_EGG_ENABLED
@IS_EASTER_EGG_ENABLED.setter
def IS_EASTER_EGG_ENABLED(self, value):
if isinstance(value, bool):
self._IS_EASTER_EGG_ENABLED = value
# @IS_EASTER_EGG_ENABLED.setter
# def IS_EASTER_EGG_ENABLED(self, value):
# if isinstance(value, bool):
# self._IS_EASTER_EGG_ENABLED = value
# Save Json Data
## Main Window
@@ -964,7 +964,7 @@ class Config:
# self._CURRENT_SENT_MESSAGES_LOG_INDEX = 0
self._IS_RESET_BUTTON_DISPLAYED_FOR_TRANSLATION = False
self._IS_RESET_BUTTON_DISPLAYED_FOR_WHISPER = False
self._IS_EASTER_EGG_ENABLED = False
# self._IS_EASTER_EGG_ENABLED = False
# Save Json Data
## Main Window

View File

@@ -81,7 +81,6 @@ def messageFormatter(format_type:str, translation:list, message:list):
def changeToCTranslate2Process():
config.SELECTED_TAB_YOUR_TRANSLATOR_ENGINES[config.SELECTED_TAB_NO] = "CTranslate2"
config.SELECTED_TAB_TARGET_TRANSLATOR_ENGINES[config.SELECTED_TAB_NO] = "CTranslate2"
updateTranslationEngineAndEngineList()
# func transcription send message
class MicMessage:
@@ -373,13 +372,17 @@ def callbackMessageBoxTypingStop(*args, **kwargs) -> dict:
# if config.CURRENT_SENT_MESSAGES_LOG_INDEX < len(config.SENT_MESSAGES_LOG) - 1:
# updateMessageBox(1)
def updateTranslationEngineAndEngineList():
engine = config.SELECTED_TAB_YOUR_TRANSLATOR_ENGINES[config.SELECTED_TAB_NO]
def getTranslationEngines(*args, **kwargs) -> dict:
engines = model.findTranslationEngines(
config.SELECTED_TAB_YOUR_LANGUAGES[config.SELECTED_TAB_NO],
config.SELECTED_TAB_TARGET_LANGUAGES[config.SELECTED_TAB_NO],
config.ENABLE_MULTI_LANGUAGE_TRANSLATION,
)
return {"status":200, "result":engines}
def updateTranslationEngineAndEngineList():
engine = config.SELECTED_TAB_YOUR_TRANSLATOR_ENGINES[config.SELECTED_TAB_NO]
engines = getTranslationEngines()["result"]
if engine not in engines:
engine = engines[0]
config.SELECTED_TAB_YOUR_TRANSLATOR_ENGINES[config.SELECTED_TAB_NO] = engine
@@ -487,6 +490,16 @@ def callbackDisableForeground(*args, **kwargs) -> dict:
config.ENABLE_FOREGROUND = False
return {"status":200, "result":config.ENABLE_FOREGROUND}
def callbackEnableMultiLanguageTranslation(*args, **kwargs) -> dict:
printLog("Enable Multi Language Translation")
config.ENABLE_MULTI_LANGUAGE_TRANSLATION = True
return {"status":200, "result":config.ENABLE_MULTI_LANGUAGE_TRANSLATION}
def callbackDisableMultiLanguageTranslation(*args, **kwargs) -> dict:
printLog("Disable Multi Language Translation")
config.ENABLE_MULTI_LANGUAGE_TRANSLATION = False
return {"status":200, "result":config.ENABLE_MULTI_LANGUAGE_TRANSLATION}
def callbackEnableMainWindowSidebarCompactMode(*args, **kwargs) -> dict:
printLog("Enable MainWindow Sidebar Compact Mode")
config.IS_MAIN_WINDOW_SIDEBAR_COMPACT_MODE = True
@@ -571,7 +584,7 @@ def callbackSetUiLanguage(data, *args, **kwargs) -> dict:
config.UI_LANGUAGE = data
return {"status":200, "result":config.UI_LANGUAGE}
def callbackEnableRestoreMainWindowGeometry(data, *args, **kwargs) -> dict:
def callbackEnableRestoreMainWindowGeometry(*args, **kwargs) -> dict:
printLog("Enable Restore Main Window Geometry")
config.ENABLE_RESTORE_MAIN_WINDOW_GEOMETRY = True
return {"status":200, "result":config.ENABLE_RESTORE_MAIN_WINDOW_GEOMETRY}

View File

@@ -96,6 +96,8 @@ controller_mapping = {
# "/controller/callback_enable_easter_egg": controller.callbackEnableEasterEgg,
"/controller/callback_open_config_window": controller.callbackOpenConfigWindow,
"/controller/callback_close_config_window": controller.callbackCloseConfigWindow,
"/controller/callback_enable_multi_language_translation": controller.callbackEnableMultiLanguageTranslation,
"/controller/callback_disable_multi_language_translation": controller.callbackDisableMultiLanguageTranslation,
"/controller/callback_enable_main_window_sidebar_compact_mode": controller.callbackEnableMainWindowSidebarCompactMode,
"/controller/callback_disable_main_window_sidebar_compact_mode": controller.callbackDisableMainWindowSidebarCompactMode,
"/controller/callback_enable_translation": controller.callbackEnableTranslation,
@@ -113,6 +115,7 @@ controller_mapping = {
"/controller/set_target_language_and_country": controller.setTargetLanguageAndCountry,
"/controller/swap_your_language_and_target_language": controller.swapYourLanguageAndTargetLanguage,
"/controller/callback_selected_language_preset_tab": controller.callbackSelectedLanguagePresetTab,
"/controller/list_translation_engines": controller.getTranslationEngines,
"/controller/callback_selected_translation_engine": controller.callbackSelectedTranslationEngine,
"/controller/callback_disable_config_window_compact_mode": controller.callbackEnableConfigWindowCompactMode,
"/controller/callback_enable_config_window_compact_mode": controller.callbackDisableConfigWindowCompactMode,
@@ -329,6 +332,8 @@ if __name__ == "__main__":
case "/controller/callback_messagebox_send":
# handleControllerRequest("/controller/callback_enable_translation")
data = {"id":"123456", "message":"テスト"}
case "/controller/callback_selected_translation_engine":
data = "DeepL"
case "/controller/set_your_language_and_country":
data = {
"primary": {