Merge branch 'speaker2Chatbox' into develop

This commit is contained in:
Sakamoto Shiina
2024-01-07 06:24:04 +09:00
2 changed files with 9 additions and 3 deletions

View File

@@ -813,8 +813,9 @@ def createMainWindow():
model.addKeywords() model.addKeywords()
# check Software Updated # check Software Updated
if model.checkSoftwareUpdated() is True: if config.ENABLE_SPEAKER2CHATBOX is False:
view.showUpdateAvailableButton() if model.checkSoftwareUpdated() is True:
view.showUpdateAvailableButton()
# init logger # init logger
if config.ENABLE_LOGGER is True: if config.ENABLE_LOGGER is True:

View File

@@ -30,6 +30,11 @@ class View():
ui_language=config.UI_LANGUAGE, ui_language=config.UI_LANGUAGE,
) )
if config.ENABLE_SPEAKER2CHATBOX is False:
VERSION_TEXT=i18n.t("config_window.version", version=config.VERSION)
else:
VERSION_TEXT=i18n.t("config_window.version", version=config.VERSION) + " (Speaker2Chatbox)"
self.settings = SimpleNamespace() self.settings = SimpleNamespace()
theme = get_appearance_mode() if config.APPEARANCE_THEME == "System" else config.APPEARANCE_THEME theme = get_appearance_mode() if config.APPEARANCE_THEME == "System" else config.APPEARANCE_THEME
all_ctm = ColorThemeManager(theme) all_ctm = ColorThemeManager(theme)
@@ -180,7 +185,7 @@ class View():
ACTIVE_SETTING_BOX_TAB_ATTR_NAME="side_menu_tab_appearance", ACTIVE_SETTING_BOX_TAB_ATTR_NAME="side_menu_tab_appearance",
CALLBACK_SELECTED_SETTING_BOX_TAB=None, CALLBACK_SELECTED_SETTING_BOX_TAB=None,
VAR_ERROR_MESSAGE=StringVar(value=""), VAR_ERROR_MESSAGE=StringVar(value=""),
VAR_VERSION=StringVar(value=i18n.t("config_window.version", version=config.VERSION)), VAR_VERSION=StringVar(value=VERSION_TEXT),
VAR_CONFIG_WINDOW_TITLE=StringVar(value=i18n.t("config_window.config_title")), VAR_CONFIG_WINDOW_TITLE=StringVar(value=i18n.t("config_window.config_title")),
VAR_CONFIG_WINDOW_COMPACT_MODE_LABEL=StringVar(value=i18n.t("config_window.compact_mode")), VAR_CONFIG_WINDOW_COMPACT_MODE_LABEL=StringVar(value=i18n.t("config_window.compact_mode")),
VAR_CONFIG_WINDOW_RESTART_BUTTON_LABEL=StringVar(value=i18n.t("config_window.restart_message")), VAR_CONFIG_WINDOW_RESTART_BUTTON_LABEL=StringVar(value=i18n.t("config_window.restart_message")),