[bugfix] getImageFileFromUiUtilsなどimage file取得をimageFileManager(元imageFilenameManager)にて一括で行うように。

UIに入れる時はファイル名ではなくファイルそのもの
This commit is contained in:
Sakamoto Shiina
2023-09-05 01:53:49 +09:00
parent e1466efc51
commit 670a651e57
15 changed files with 110 additions and 108 deletions

View File

@@ -18,15 +18,15 @@ def _changeMainWindowWidgetsStatus(vrct_gui, settings, view_variable, status, ta
widget_label.configure(text_color=settings.ctm.SF__TEXT_DISABLED_COLOR)
widget_switch_box.configure(state="disabled", progress_color=settings.ctm.SF__SWITCH_BOX_DISABLE_BG_COLOR)
widget_selected_mark.configure(fg_color=settings.ctm.SF__SELECTED_MARK_DISABLE_BG_COLOR)
icon_filename = disabled_icon_name
icon_file = disabled_icon_name
elif status == "normal":
widget_frame.configure(cursor="hand2")
widget_label.configure(text_color=settings.ctm.LABELS_TEXT_COLOR)
widget_switch_box.configure(state="normal", progress_color=settings.ctm.SF__SWITCH_BOX_ACTIVE_BG_COLOR)
widget_selected_mark.configure(fg_color=settings.ctm.SF__SELECTED_MARK_ACTIVE_BG_COLOR)
icon_filename = icon_name
icon_file = icon_name
image = CTkImage(getImageFileFromUiUtils(icon_filename), size=COMPACT_MODE_ICON_SIZE_TUPLES)
image = CTkImage(icon_file, size=COMPACT_MODE_ICON_SIZE_TUPLES)
widget_compact_mode_icon.configure(image=image)
@@ -41,8 +41,8 @@ def _changeMainWindowWidgetsStatus(vrct_gui, settings, view_variable, status, ta
widget_switch_box=vrct_gui.translation_switch_box,
widget_selected_mark=vrct_gui.translation_selected_mark,
widget_compact_mode_icon=vrct_gui.translation_compact_mode_icon,
icon_name=settings.image_filename.TRANSLATION_ICON,
disabled_icon_name=settings.image_filename.TRANSLATION_ICON_DISABLED
icon_name=settings.image_file.TRANSLATION_ICON,
disabled_icon_name=settings.image_file.TRANSLATION_ICON_DISABLED
)
case "transcription_send_switch":
update_switch_status(
@@ -51,8 +51,8 @@ def _changeMainWindowWidgetsStatus(vrct_gui, settings, view_variable, status, ta
widget_switch_box=vrct_gui.transcription_send_switch_box,
widget_selected_mark=vrct_gui.transcription_send_selected_mark,
widget_compact_mode_icon=vrct_gui.transcription_send_compact_mode_icon,
icon_name=settings.image_filename.MIC_ICON,
disabled_icon_name=settings.image_filename.MIC_ICON_DISABLED
icon_name=settings.image_file.MIC_ICON,
disabled_icon_name=settings.image_file.MIC_ICON_DISABLED
)
case "transcription_receive_switch":
update_switch_status(
@@ -61,8 +61,8 @@ def _changeMainWindowWidgetsStatus(vrct_gui, settings, view_variable, status, ta
widget_switch_box=vrct_gui.transcription_receive_switch_box,
widget_selected_mark=vrct_gui.transcription_receive_selected_mark,
widget_compact_mode_icon=vrct_gui.transcription_receive_compact_mode_icon,
icon_name=settings.image_filename.HEADPHONES_ICON,
disabled_icon_name=settings.image_filename.HEADPHONES_ICON_DISABLED
icon_name=settings.image_file.HEADPHONES_ICON,
disabled_icon_name=settings.image_file.HEADPHONES_ICON_DISABLED
)
case "foreground_switch":
update_switch_status(
@@ -71,8 +71,8 @@ def _changeMainWindowWidgetsStatus(vrct_gui, settings, view_variable, status, ta
widget_switch_box=vrct_gui.foreground_switch_box,
widget_selected_mark=vrct_gui.foreground_selected_mark,
widget_compact_mode_icon=vrct_gui.foreground_compact_mode_icon,
icon_name=settings.image_filename.FOREGROUND_ICON,
disabled_icon_name=settings.image_filename.FOREGROUND_ICON_DISABLED
icon_name=settings.image_file.FOREGROUND_ICON,
disabled_icon_name=settings.image_file.FOREGROUND_ICON_DISABLED
)
@@ -105,12 +105,12 @@ def _changeMainWindowWidgetsStatus(vrct_gui, settings, view_variable, status, ta
if status == "disabled":
vrct_gui.sidebar_config_button_wrapper.configure(cursor="")
vrct_gui.sidebar_config_button.configure(
image=CTkImage(getImageFileFromUiUtils(settings.image_filename.CONFIGURATION_ICON_DISABLED)),
image=CTkImage((settings.image_file.CONFIGURATION_ICON_DISABLED)),
)
elif status == "normal":
vrct_gui.sidebar_config_button_wrapper.configure(cursor="hand2")
vrct_gui.sidebar_config_button.configure(
image=CTkImage(getImageFileFromUiUtils(settings.image_filename.CONFIGURATION_ICON)),
image=CTkImage((settings.image_file.CONFIGURATION_ICON)),
)
@@ -121,17 +121,17 @@ def _changeMainWindowWidgetsStatus(vrct_gui, settings, view_variable, status, ta
if view_variable.IS_MAIN_WINDOW_SIDEBAR_COMPACT_MODE is True:
image_file = CTkImage(getImageFileFromUiUtils(settings.image_filename.ARROW_LEFT_DISABLED).rotate(180), size=LOGO_SIZE)
image_file = CTkImage((settings.image_file.ARROW_LEFT_DISABLED).rotate(180), size=LOGO_SIZE)
else:
image_file = CTkImage(getImageFileFromUiUtils(settings.image_filename.ARROW_LEFT_DISABLED), size=LOGO_SIZE)
image_file = CTkImage((settings.image_file.ARROW_LEFT_DISABLED), size=LOGO_SIZE)
vrct_gui.minimize_sidebar_button.configure(image=image_file)
elif status == "normal":
vrct_gui.minimize_sidebar_button_container.configure(cursor="hand2")
if view_variable.IS_MAIN_WINDOW_SIDEBAR_COMPACT_MODE is True:
image_file = CTkImage(getImageFileFromUiUtils(settings.image_filename.ARROW_LEFT).rotate(180), size=LOGO_SIZE)
image_file = CTkImage((settings.image_file.ARROW_LEFT).rotate(180), size=LOGO_SIZE)
else:
image_file = CTkImage(getImageFileFromUiUtils(settings.image_filename.ARROW_LEFT), size=LOGO_SIZE)
image_file = CTkImage((settings.image_file.ARROW_LEFT), size=LOGO_SIZE)
vrct_gui.minimize_sidebar_button.configure(image=image_file)