From ce9cc9684f3ab00f2427d3ad7ae28b3ef3ab498a Mon Sep 17 00:00:00 2001 From: Yusarina Date: Fri, 5 Jul 2024 13:01:59 +0100 Subject: [PATCH 01/10] Translation Update Translation System now works! --- __init__.py | 8 ++++-- core/export_resonite.py | 5 ++-- core/properties.py | 7 +++-- functions/combine_materials.py | 5 ++-- functions/translations.py | 46 +++++++++++++++++++++++++------ resources/translations/en_US.json | 12 +++++++- resources/translations/ja_JP.json | 21 ++++++++++---- ui/quick_access.py | 13 +++++---- ui/settings.py | 4 +-- 9 files changed, 86 insertions(+), 35 deletions(-) diff --git a/__init__.py b/__init__.py index caa78a7..22af111 100644 --- a/__init__.py +++ b/__init__.py @@ -19,14 +19,16 @@ def register(): properties.register() # Order the classes before registration core.register.order_classes() - # Register the UI classes - - # Iterate over the classes to register and register them + # Register the properties core.register.register_properties() + # Register the UI classes for cls in core.register.__bl_ordered_classes: print("registering " + str(cls)) bpy.utils.register_class(cls) + # Load the translations after everything else is registered + functions.translations.load_translations() + def unregister(): print("Unregistering Avatar Toolkit") # Unregister the UI classes diff --git a/core/export_resonite.py b/core/export_resonite.py index 5603773..4cb73fe 100644 --- a/core/export_resonite.py +++ b/core/export_resonite.py @@ -5,13 +5,14 @@ from .common import get_armature from bpy.types import Object, ShapeKey, Mesh, Context, Operator from functools import lru_cache from ..core.register import register_wrap +from ..functions.translations import t @register_wrap class ExportResonite(Operator): bl_idname = 'avatar_toolkit.export_resonite' - bl_label = "Export to Resonite" - bl_description = "Export a GLB with all animations and materials. For animation data see: " + bl_label = t("Export.resonite.label") + bl_description = t("Export.resonite.desc") bl_options = {'REGISTER', 'UNDO'} filepath: bpy.props.StringProperty() diff --git a/core/properties.py b/core/properties.py index 1e4f319..13ef631 100644 --- a/core/properties.py +++ b/core/properties.py @@ -3,13 +3,14 @@ from ..functions.translations import t, get_languages_list, update_ui from ..core.register import register_property from typing import Tuple -def register() -> None: - register_property((bpy.types.Scene, "language", bpy.props.EnumProperty( +def register(): + register_property((bpy.types.Scene, "avatar_toolkit_language", bpy.props.EnumProperty( name=t("Settings.language.label"), description=t("Settings.language.desc"), items=get_languages_list, + default=0, update=update_ui ))) -def unregister() -> None: +def unregister(): pass diff --git a/functions/combine_materials.py b/functions/combine_materials.py index 4eaa93d..58fce78 100644 --- a/functions/combine_materials.py +++ b/functions/combine_materials.py @@ -4,6 +4,7 @@ from typing import List, Tuple, Optional from bpy.types import Material, Operator, Context, Object from ..core.common import clean_material_names from ..core.register import register_wrap +from ..functions.translations import t def textures_match(tex1: bpy.types.ImageTexture, tex2: bpy.types.ImageTexture) -> bool: return tex1.image == tex2.image and tex1.extension == tex2.extension @@ -58,8 +59,8 @@ def report_consolidated(self: Operator, num_combined: int) -> None: @register_wrap class CombineMaterials(Operator): bl_idname = "avatar_toolkit.combine_materials" - bl_label = "Combine Materials" - bl_description = "Combine similar materials to optimize the model" + bl_label = t("Optimization.combinematerials.label") + bl_description = t("Optimization.combinematerials.desc") bl_options = {'REGISTER', 'UNDO'} @classmethod diff --git a/functions/translations.py b/functions/translations.py index 4f84a1d..af928fa 100644 --- a/functions/translations.py +++ b/functions/translations.py @@ -19,10 +19,28 @@ def load_translations() -> None: dictionary = dict() languages = ["auto"] - language: str = bpy.context.preferences.view.language - + # Populate languages list for i in os.listdir(translations_dir): - languages.append(i.split(".")[0]) + lang = i.split(".")[0] + if lang != "auto": + languages.append(lang) + + # Check if the context and scene are available + if hasattr(bpy.context, "scene"): + # Check if the property exists before trying to access it + if hasattr(bpy.context.scene, "avatar_toolkit_language"): + language_index = bpy.context.scene.avatar_toolkit_language + if isinstance(language_index, str): + language_index = int(language_index) + if language_index == 0: # "auto" + language = bpy.context.preferences.view.language + else: + language = languages[language_index] + else: + language = bpy.context.preferences.view.language + else: + # Set a default language if the context or scene is not available + language = "en_US" translation_file: str = os.path.join(translations_dir, language + ".json") if os.path.exists(translation_file): @@ -52,13 +70,23 @@ def t(phrase: str, *args, **kwargs) -> str: return output.format(*args, **kwargs) def get_languages_list(self, context) -> List[Tuple[str, str, str]]: - choices: List[Tuple[str, str, str]] = [] - for language in languages: - choices.append((language, language, language)) - return choices + return [(str(i), lang, f"Use {lang} language") for i, lang in enumerate(languages)] -def update_ui(self, context) -> None: +def refresh_translations(): load_translations() - bpy.ops.wm.redraw_timer(type='DRAW_WIN_SWAP', iterations=1) + # Force a full UI update + for window in bpy.context.window_manager.windows: + for area in window.screen.areas: + area.tag_redraw() +def update_ui(self, context): + refresh_translations() + # Force Blender to redraw all UI elements + for screen in bpy.data.screens: + for area in screen.areas: + area.tag_redraw() + # Update the Scene to trigger a full UI refresh + bpy.context.scene.update_tag() + +# Initial load of translations load_translations() diff --git a/resources/translations/en_US.json b/resources/translations/en_US.json index ed97a90..bb29761 100644 --- a/resources/translations/en_US.json +++ b/resources/translations/en_US.json @@ -2,7 +2,17 @@ "messages": { "Settings.label": "Settings", "Settings.language.label": "Language", - "Settings.language.desc": "Select the language for the addon's UI" + "Settings.language.desc": "Select the language for the addon's UI", + "Export.resonite.label": "Export to Resonite", + "Export.resonite.desc": "Export a GLB with all animations and materials. For animation data see:", + "Optimization.combinematerials.label": "Combine Materials", + "Optimization.combinematerials.desc": "Combine similar materials to optimize the model", + "QuickAccess.label": "Quick Access", + "QuickAcess.importexport.txt": "Import/Export", + "QuickAccess.options": "Quick Access Options", + "QuickAccess.importexport.txt": "Import/Export", + "QuickAccess.import": "Import", + "QuickAccess.export": "Export" } } diff --git a/resources/translations/ja_JP.json b/resources/translations/ja_JP.json index 1c53c39..625f13a 100644 --- a/resources/translations/ja_JP.json +++ b/resources/translations/ja_JP.json @@ -1,8 +1,17 @@ { - "messages": { - "Settings.label": "Settings Ja Test", - "Settings.language.label": "Language Ja Test", - "Settings.language.desc": "Select the language for the addon's UI Ja Test" - } + "messages": { + "Settings.label": "設定", + "Settings.language.label": "言語", + "Settings.language.desc": "アドオンのUI言語を選択してください", + "Export.resonite.label": "Resoniteにエクスポート", + "Export.resonite.desc": "すべてのアニメーションとマテリアルを含むGLBをエクスポートします。アニメーションデータについては以下を参照してください：", + "Optimization.combinematerials.label": "マテリアルを結合", + "Optimization.combinematerials.desc": "類似したマテリアルを結合してモデルを最適化します", + "QuickAccess.label": "クイックアクセス", + "QuickAcess.importexport.txt": "インポート/エクスポート", + "QuickAccess.options": "クイックアクセスオプション", + "QuickAccess.importexport.txt": "インポート/エクスポート", + "QuickAccess.import": "インポート", + "QuickAccess.export": "エクスポート" } - \ No newline at end of file +} diff --git a/ui/quick_access.py b/ui/quick_access.py index 1d93c25..bb1a9b2 100644 --- a/ui/quick_access.py +++ b/ui/quick_access.py @@ -2,13 +2,14 @@ import bpy from ..core.register import register_wrap from .panel import AvatarToolkitPanel from bpy.types import Context +from ..functions.translations import t from ..core.import_pmx import import_pmx from ..core.import_pmd import import_pmd @register_wrap class AvatarToolkitQuickAccessPanel(bpy.types.Panel): - bl_label = "Quick Access" + bl_label = t("QuickAccesslabel") bl_idname = "OBJECT_PT_avatar_toolkit_quick_access" bl_space_type = 'VIEW_3D' bl_region_type = 'UI' @@ -17,17 +18,17 @@ class AvatarToolkitQuickAccessPanel(bpy.types.Panel): def draw(self, context: Context): layout = self.layout - layout.label(text="Quick Access Options") - + layout.label(text=t("QuickAccess.options")) + row = layout.row() - row.label(text="Import/Export", icon='IMPORT') + row.label(text=t("QuickAccess.importexport.txt"), icon='IMPORT') layout.separator(factor=0.5) row = layout.row(align=True) row.scale_y = 1.5 - row.operator("avatar_toolkit.import_menu", text="Import") - row.operator("avatar_toolkit.export_menu", text="Export") + row.operator("avatar_toolkit.import_menu", text=t("QuickAccess.import")) + row.operator("avatar_toolkit.export_menu", text=t("QuickAccess.export")) @register_wrap class AVATAR_TOOLKIT_OT_import_menu(bpy.types.Operator): diff --git a/ui/settings.py b/ui/settings.py index bd298ed..4287a9c 100644 --- a/ui/settings.py +++ b/ui/settings.py @@ -14,6 +14,4 @@ class AvatarToolkitSettingsPanel(bpy.types.Panel): def draw(self, context): layout = self.layout - props = context.scene - - layout.prop(props, "language") + layout.prop(context.scene, "avatar_toolkit_language", text=t("Settings.language.label")) From b7026b2a415350a8dbf75a33acfcb213475c4143 Mon Sep 17 00:00:00 2001 From: Yusarina Date: Fri, 5 Jul 2024 13:47:09 +0100 Subject: [PATCH 02/10] Improvements - Added Most UI Translations. - Improve Readability of the translation strings. --- functions/combine_materials.py | 4 ++-- functions/join_meshes.py | 9 ++++---- functions/resonite_functions.py | 5 ++-- resources/translations/en_US.json | 38 +++++++++++++++++++++---------- resources/translations/ja_JP.json | 37 +++++++++++++++++++++--------- ui/optimization.py | 12 ++++++---- ui/panel.py | 1 + ui/quick_access.py | 26 ++++++++++----------- ui/tools.py | 5 ++-- 9 files changed, 86 insertions(+), 51 deletions(-) diff --git a/functions/combine_materials.py b/functions/combine_materials.py index 58fce78..d2fa56a 100644 --- a/functions/combine_materials.py +++ b/functions/combine_materials.py @@ -59,8 +59,8 @@ def report_consolidated(self: Operator, num_combined: int) -> None: @register_wrap class CombineMaterials(Operator): bl_idname = "avatar_toolkit.combine_materials" - bl_label = t("Optimization.combinematerials.label") - bl_description = t("Optimization.combinematerials.desc") + bl_label = t("Optimization.combine_materials.label") + bl_description = t("Optimization.combine_materials.desc") bl_options = {'REGISTER', 'UNDO'} @classmethod diff --git a/functions/join_meshes.py b/functions/join_meshes.py index b2edfef..195870e 100644 --- a/functions/join_meshes.py +++ b/functions/join_meshes.py @@ -3,12 +3,13 @@ from typing import List, Optional from bpy.types import Operator, Context, Object from ..core.register import register_wrap from ..core.common import fix_uv_coordinates +from ..functions.translations import t @register_wrap class JoinAllMeshes(Operator): bl_idname = "avatar_toolkit.join_all_meshes" - bl_label = "Join All Meshes" - bl_description = "Join all meshes in the scene" + bl_label = t("Optimization.join_all_meshes.label") + bl_description = t("Optimization.join_all_meshes.desc") bl_options = {'REGISTER', 'UNDO'} @classmethod @@ -45,8 +46,8 @@ class JoinAllMeshes(Operator): @register_wrap class JoinSelectedMeshes(Operator): bl_idname = "avatar_toolkit.join_selected_meshes" - bl_label = "Join Selected Meshes" - bl_description = "Join selected meshes" + bl_label = t("Optimization.join_selected_meshes.label") + bl_description = t("Optimization.join_selected_meshes.desc") bl_options = {'REGISTER', 'UNDO'} @classmethod diff --git a/functions/resonite_functions.py b/functions/resonite_functions.py index adaeead..74a80be 100644 --- a/functions/resonite_functions.py +++ b/functions/resonite_functions.py @@ -5,12 +5,13 @@ import re from bpy.types import Operator, Context, Object from ..core.dictionaries import bone_names from ..core.common import get_armature, simplify_bonename +from ..functions.translations import t @register_wrap class ConvertToResonite(Operator): bl_idname = 'avatar_toolkit.convert_to_resonite' - bl_label = "Convert to Resonite" #t('Tools.convert_to_resonite.label') - bl_description = "Converts bone names on a model to names compatable with Resonite" #t('Tools.convert_to_resonite.desc') + bl_label = t('Tools.convert_to_resonite.label') + bl_description = t('Tools.convert_to_resonite.desc') bl_options = {'REGISTER', 'UNDO'} @classmethod diff --git a/resources/translations/en_US.json b/resources/translations/en_US.json index bb29761..53554ed 100644 --- a/resources/translations/en_US.json +++ b/resources/translations/en_US.json @@ -1,19 +1,33 @@ { "messages": { - "Settings.label": "Settings", - "Settings.language.label": "Language", - "Settings.language.desc": "Select the language for the addon's UI", + "Quick_Access.label": "Quick Access", + "Quick_Access.import_export.label": "Import/Export", + "Quick_Access.options": "Quick Access Options", + "Quick_Access.import_export.txt": "Import/Export", + "Quick_Access.import_menu.label": "Import Menu", + "Quick_Access.import": "Import", + "Quick_Access.export": "Export", + "Quick_Access.import_pmx": "Import PMX", + "Quick_Access.import_pmd": "Import PMD", + "Quick_Access.export_menu.label": "Export Menu", + "Quick_Access.select_export.label": "Select Export Method", + "Quick_Access.select_export_resonite.label": "Resonite", "Export.resonite.label": "Export to Resonite", "Export.resonite.desc": "Export a GLB with all animations and materials. For animation data see:", - "Optimization.combinematerials.label": "Combine Materials", - "Optimization.combinematerials.desc": "Combine similar materials to optimize the model", - "QuickAccess.label": "Quick Access", - "QuickAcess.importexport.txt": "Import/Export", - "QuickAccess.options": "Quick Access Options", - "QuickAccess.importexport.txt": "Import/Export", - "QuickAccess.import": "Import", - "QuickAccess.export": "Export" + "Optimization.label": "Optimization", + "Optimization.options.label": "Optimization Options", + "Optimization.combine_materials.label": "Combine Materials", + "Optimization.combine_materials.desc": "Combine similar materials to optimize the model", + "Optimization.join_all_meshes.label": "Join All Meshes", + "Optimization.join_all_meshes.desc": "Join all meshes into one", + "Optimization.join_selected_meshes.label": "Join Selected Mehses", + "Optimization.join_selected_meshes.desc": "Join all currntly Selected Mehses into one", + "Tools.tools_title.label": "Tools", + "Tools.convert_to_resonite.label": "Convert to Resonite", + "Tools.convert_to_resonite.desc": "Converts bone names on a model to names compatable with Resonite", + "Settings.label": "Settings", + "Settings.language.label": "Language", + "Settings.language.desc": "Select the language for the addon's UI" } } - \ No newline at end of file diff --git a/resources/translations/ja_JP.json b/resources/translations/ja_JP.json index 625f13a..91d6509 100644 --- a/resources/translations/ja_JP.json +++ b/resources/translations/ja_JP.json @@ -1,17 +1,32 @@ { "messages": { - "Settings.label": "設定", - "Settings.language.label": "言語", - "Settings.language.desc": "アドオンのUI言語を選択してください", + "Quick_Access.label": "クイックアクセス", + "Quick_Access.import_export.label": "インポート/エクスポート", + "Quick_Access.options": "クイックアクセスオプション", + "Quick_Access.import_export.txt": "インポート/エクスポート", + "Quick_Access.import_menu.label": "インポートメニュー", + "Quick_Access.import": "インポート", + "Quick_Access.export": "エクスポート", + "Quick_Access.import_pmx": "PMXインポート", + "Quick_Access.import_pmd": "PMDインポート", + "Quick_Access.export_menu.label": "エクスポートメニュー", + "Quick_Access.select_export.label": "エクスポート方法を選択", + "Quick_Access.select_export_resonite.label": "Resonite", "Export.resonite.label": "Resoniteにエクスポート", "Export.resonite.desc": "すべてのアニメーションとマテリアルを含むGLBをエクスポートします。アニメーションデータについては以下を参照してください：", - "Optimization.combinematerials.label": "マテリアルを結合", - "Optimization.combinematerials.desc": "類似したマテリアルを結合してモデルを最適化します", - "QuickAccess.label": "クイックアクセス", - "QuickAcess.importexport.txt": "インポート/エクスポート", - "QuickAccess.options": "クイックアクセスオプション", - "QuickAccess.importexport.txt": "インポート/エクスポート", - "QuickAccess.import": "インポート", - "QuickAccess.export": "エクスポート" + "Optimization.label": "最適化", + "Optimization.options.label": "最適化オプション", + "Optimization.combine_materials.label": "マテリアルを結合", + "Optimization.combine_materials.desc": "類似したマテリアルを結合してモデルを最適化します", + "Optimization.join_all_meshes.label": "すべてのメッシュを結合", + "Optimization.join_all_meshes.desc": "すべてのメッシュを1つに結合します", + "Optimization.join_selected_meshes.label": "選択したメッシュを結合", + "Optimization.join_selected_meshes.desc": "現在選択されているすべてのメッシュを1つに結合します", + "Tools.tools_title.label": "ツール", + "Tools.convert_to_resonite.label": "Resoniteに変換", + "Tools.convert_to_resonite.desc": "モデルのボーン名をResoniteと互換性のある名前に変換します", + "Settings.label": "設定", + "Settings.language.label": "言語", + "Settings.language.desc": "アドオンのUI言語を選択してください" } } diff --git a/ui/optimization.py b/ui/optimization.py index 2f6e69a..674bfb7 100644 --- a/ui/optimization.py +++ b/ui/optimization.py @@ -1,10 +1,11 @@ import bpy from ..core.register import register_wrap from .panel import AvatarToolkitPanel +from ..functions.translations import t @register_wrap class AvatarToolkitOptimizationPanel(bpy.types.Panel): - bl_label = "Optimization" + bl_label = t("Optimization.label") bl_idname = "OBJECT_PT_avatar_toolkit_optimization" bl_space_type = 'VIEW_3D' bl_region_type = 'UI' @@ -13,18 +14,19 @@ class AvatarToolkitOptimizationPanel(bpy.types.Panel): def draw(self, context): layout = self.layout - layout.label(text="Optimization Options") + layout.label(text=t("Optimization.options.label")) row = layout.row() row.scale_y = 1.2 - row.operator("avatar_toolkit.combine_materials", text="Combine Materials") + row.operator("avatar_toolkit.combine_materials", text=t("Optimization.combine_materials.label")) + layout.separator(factor=0.5) row = layout.row(align=True) row.scale_y = 1.2 - row.operator("avatar_toolkit.join_all_meshes", text="Join All Meshes") - row.operator("avatar_toolkit.join_selected_meshes", text="Join Selected Meshes") + row.operator("avatar_toolkit.join_all_meshes", text=t("Optimization.join_all_meshes.label")) + row.operator("avatar_toolkit.join_selected_meshes", text=t("Optimization.join_selected_meshes.label")) # Add optimization options here diff --git a/ui/panel.py b/ui/panel.py index a987a28..29829de 100644 --- a/ui/panel.py +++ b/ui/panel.py @@ -1,5 +1,6 @@ import bpy from ..core.register import register_wrap +from ..functions.translations import t @register_wrap class AvatarToolkitPanel(bpy.types.Panel): diff --git a/ui/quick_access.py b/ui/quick_access.py index bb1a9b2..d317a64 100644 --- a/ui/quick_access.py +++ b/ui/quick_access.py @@ -9,7 +9,7 @@ from ..core.import_pmd import import_pmd @register_wrap class AvatarToolkitQuickAccessPanel(bpy.types.Panel): - bl_label = t("QuickAccesslabel") + bl_label = t("Quick_Access.label") bl_idname = "OBJECT_PT_avatar_toolkit_quick_access" bl_space_type = 'VIEW_3D' bl_region_type = 'UI' @@ -18,22 +18,22 @@ class AvatarToolkitQuickAccessPanel(bpy.types.Panel): def draw(self, context: Context): layout = self.layout - layout.label(text=t("QuickAccess.options")) + layout.label(text=t("Quick_Access.options")) row = layout.row() - row.label(text=t("QuickAccess.importexport.txt"), icon='IMPORT') + row.label(text=t("Quick_Access.import_export.label"), icon='IMPORT') layout.separator(factor=0.5) row = layout.row(align=True) row.scale_y = 1.5 - row.operator("avatar_toolkit.import_menu", text=t("QuickAccess.import")) - row.operator("avatar_toolkit.export_menu", text=t("QuickAccess.export")) + row.operator("avatar_toolkit.import_menu", text=t("Quick_Access.import")) + row.operator("avatar_toolkit.export_menu", text=t("Quick_Access.export")) @register_wrap class AVATAR_TOOLKIT_OT_import_menu(bpy.types.Operator): bl_idname = "avatar_toolkit.import_menu" - bl_label = "Import Menu" + bl_label = t("Quick_Access.import_menu.label") def execute(self, context: Context): return {'FINISHED'} @@ -45,13 +45,13 @@ class AVATAR_TOOLKIT_OT_import_menu(bpy.types.Operator): def draw(self, context: Context): layout = self.layout layout.label(text="Select Import Method") - layout.operator("avatar_toolkit.import_pmx", text="Import PMX") - layout.operator("avatar_toolkit.import_pmd", text="Import PMD") + layout.operator("avatar_toolkit.import_pmx", text=t("Quick_Access.import_pmx")) + layout.operator("avatar_toolkit.import_pmd", text=t("Quick_Access.import_pmd")) @register_wrap class AVATAR_TOOLKIT_OT_export_menu(bpy.types.Operator): bl_idname = "avatar_toolkit.export_menu" - bl_label = "Export Menu" + bl_label = t("Quick_Access.export_menu.label") def execute(self, context: Context): return {'FINISHED'} @@ -62,13 +62,13 @@ class AVATAR_TOOLKIT_OT_export_menu(bpy.types.Operator): def draw(self, context: Context): layout = self.layout - layout.label(text="Select Export Method") - layout.operator("avatar_toolkit.export_resonite", text="Export Resonite") + layout.label(text=t("Quick_Access.select_export.label")) + layout.operator("avatar_toolkit.export_resonite", text=t("Quick_Access.select_export_resonite.label")) @register_wrap class AVATAR_TOOLKIT_OT_import_pmx(bpy.types.Operator): bl_idname = "avatar_toolkit.import_pmx" - bl_label = "Import PMX" + bl_label = t("Quick_Access.import_pmx") filepath: bpy.props.StringProperty(subtype="FILE_PATH") @@ -83,7 +83,7 @@ class AVATAR_TOOLKIT_OT_import_pmx(bpy.types.Operator): @register_wrap class AVATAR_TOOLKIT_OT_import_pmd(bpy.types.Operator): bl_idname = "avatar_toolkit.import_pmd" - bl_label = "Import PMD" + bl_label = t("Quick_Access.import_pmd") filepath: bpy.props.StringProperty(subtype="FILE_PATH") diff --git a/ui/tools.py b/ui/tools.py index 408a95d..58bf61c 100644 --- a/ui/tools.py +++ b/ui/tools.py @@ -2,6 +2,7 @@ import bpy from ..core.register import register_wrap from .panel import AvatarToolkitPanel from bpy.types import Context +from ..functions.translations import t @register_wrap class AvatarToolkitToolsPanel(bpy.types.Panel): @@ -14,9 +15,9 @@ class AvatarToolkitToolsPanel(bpy.types.Panel): def draw(self, context: Context): layout = self.layout - layout.label(text="Tools") + layout.label(text=t("Tools.tools_title.label")) layout.separator(factor=0.5) row = layout.row(align=True) row.scale_y = 1.5 - row.operator("avatar_toolkit.convert_to_resonite", text="Translate to Resonite") \ No newline at end of file + row.operator("avatar_toolkit.convert_to_resonite", text=t("Tools.convert_to_resonite.label")) \ No newline at end of file From 03a24650f1f1385337c61924ea5e4615f012521c Mon Sep 17 00:00:00 2001 From: Yusarina Date: Fri, 5 Jul 2024 14:20:45 +0100 Subject: [PATCH 03/10] Small updates --- __init__.py | 7 +++++-- resources/translations/en_US.json | 3 ++- resources/translations/ja_JP.json | 3 ++- ui/quick_access.py | 2 ++ 4 files changed, 11 insertions(+), 4 deletions(-) diff --git a/__init__.py b/__init__.py index 22af111..eed4b2c 100644 --- a/__init__.py +++ b/__init__.py @@ -17,6 +17,10 @@ def register(): print("Registering Avatar Toolkit") # Register the addon properties properties.register() + + # Load the translations + functions.translations.load_translations() + # Order the classes before registration core.register.order_classes() # Register the properties @@ -26,8 +30,7 @@ def register(): print("registering " + str(cls)) bpy.utils.register_class(cls) - # Load the translations after everything else is registered - functions.translations.load_translations() + def unregister(): print("Unregistering Avatar Toolkit") diff --git a/resources/translations/en_US.json b/resources/translations/en_US.json index 53554ed..49b9b23 100644 --- a/resources/translations/en_US.json +++ b/resources/translations/en_US.json @@ -3,12 +3,13 @@ "Quick_Access.label": "Quick Access", "Quick_Access.import_export.label": "Import/Export", "Quick_Access.options": "Quick Access Options", - "Quick_Access.import_export.txt": "Import/Export", "Quick_Access.import_menu.label": "Import Menu", "Quick_Access.import": "Import", "Quick_Access.export": "Export", "Quick_Access.import_pmx": "Import PMX", + "Quick_Access.import_pmx.desc": "Import MMD PMX Model", "Quick_Access.import_pmd": "Import PMD", + "Quick_Access.import_pmd.desc": "Import MMD PMD Model", "Quick_Access.export_menu.label": "Export Menu", "Quick_Access.select_export.label": "Select Export Method", "Quick_Access.select_export_resonite.label": "Resonite", diff --git a/resources/translations/ja_JP.json b/resources/translations/ja_JP.json index 91d6509..263544b 100644 --- a/resources/translations/ja_JP.json +++ b/resources/translations/ja_JP.json @@ -3,12 +3,13 @@ "Quick_Access.label": "クイックアクセス", "Quick_Access.import_export.label": "インポート/エクスポート", "Quick_Access.options": "クイックアクセスオプション", - "Quick_Access.import_export.txt": "インポート/エクスポート", "Quick_Access.import_menu.label": "インポートメニュー", "Quick_Access.import": "インポート", "Quick_Access.export": "エクスポート", "Quick_Access.import_pmx": "PMXインポート", + "Quick_Access.import_pmx.desc": "MMD PMXモデルをインポート", "Quick_Access.import_pmd": "PMDインポート", + "Quick_Access.import_pmd.desc": "MMD PMDモデルをインポート", "Quick_Access.export_menu.label": "エクスポートメニュー", "Quick_Access.select_export.label": "エクスポート方法を選択", "Quick_Access.select_export_resonite.label": "Resonite", diff --git a/ui/quick_access.py b/ui/quick_access.py index d317a64..a4d1373 100644 --- a/ui/quick_access.py +++ b/ui/quick_access.py @@ -34,6 +34,7 @@ class AvatarToolkitQuickAccessPanel(bpy.types.Panel): class AVATAR_TOOLKIT_OT_import_menu(bpy.types.Operator): bl_idname = "avatar_toolkit.import_menu" bl_label = t("Quick_Access.import_menu.label") + bl_description = t("Quick_Access.import_menu.desc") def execute(self, context: Context): return {'FINISHED'} @@ -52,6 +53,7 @@ class AVATAR_TOOLKIT_OT_import_menu(bpy.types.Operator): class AVATAR_TOOLKIT_OT_export_menu(bpy.types.Operator): bl_idname = "avatar_toolkit.export_menu" bl_label = t("Quick_Access.export_menu.label") + bl_description = t("Quick_Access.import_pmx.desc") def execute(self, context: Context): return {'FINISHED'} From 9ec186b1cfc8791473b52947eb7f4dda473a83e7 Mon Sep 17 00:00:00 2001 From: 989onan Date: Sun, 7 Jul 2024 16:19:52 -0400 Subject: [PATCH 04/10] Added a modal for remove doubles - made remove doubles a blender modal. this way the code can run over multiple frames. - Since remove doubles is async now, the user gets feedback on which shapekey and mesh is being worked on - this does not remove doubles correctly yet, but is very close to ready --- .gitignore | 1 + .vscode/settings.json | 11 +++ functions/remove_doubles_safely.py | 103 +++++++++++++++++++++++++++++ ui/optimization.py | 1 + ui/tools.py | 4 +- 5 files changed, 119 insertions(+), 1 deletion(-) create mode 100644 functions/remove_doubles_safely.py diff --git a/.gitignore b/.gitignore index fd20fdd..5aea8c5 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ *.pyc +.vscode/settings.json diff --git a/.vscode/settings.json b/.vscode/settings.json index e69de29..96df99e 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -0,0 +1,11 @@ +{ + "python.analysis.extraPaths": [ + "D:\\SteamLibrary\\steamapps\\common\\Blender\\4.0\\scripts\\addons", + "C:\\Users\\Onan\\AppData\\Roaming\\Blender Foundation\\Blender\\4.0\\scripts\\addons",//C:/Users/Onan/AppData/Roaming/Blender Foundation/Blender/4.0/scripts/addons + "D:\\blender stuff\\blendercodestuff\\4.0" + ], + "python.analysis.diagnosticSeverityOverrides": { + "reportInvalidTypeForm": "none" + }, + "python.REPL.enableREPLSmartSend": false, +} \ No newline at end of file diff --git a/functions/remove_doubles_safely.py b/functions/remove_doubles_safely.py new file mode 100644 index 0000000..e962df6 --- /dev/null +++ b/functions/remove_doubles_safely.py @@ -0,0 +1,103 @@ +from ast import Dict +from itertools import count +import bpy +import re +from typing import List, Tuple, Optional, TypedDict +from bpy.types import Material, Operator, Context, Object +from ..core.register import register_wrap + + +class meshEntry(TypedDict): + mesh: bpy.types.Object + shapekeys: list[str] + +@register_wrap +class RemoveDoublesSafely(Operator): + bl_idname = "avatar_toolkit.remove_doubles_safely" + bl_label = "Remove Doubles Safely" + bl_description = "Remove Doubles on all meshes, making sure to not fuse things like mouths together." + bl_options = {'REGISTER', 'UNDO'} + objects_to_do: list[meshEntry] = [] + + @classmethod + def poll(cls, context: Context) -> bool: + return context.mode == 'OBJECT' + + def execute(self, context: Context) -> set: + if not bpy.data.objects: + self.report({'INFO'}, "No objects in the scene") + return + + bpy.ops.object.mode_set(mode='OBJECT') + bpy.ops.object.select_all(action='DESELECT') + + meshes: List[Object] = [obj for obj in context.view_layer.objects if obj.type == 'MESH'] + + for mesh in meshes: + if mesh.data.name not in [stored_object["mesh"].data.name for stored_object in self.objects_to_do]: + mesh_shapekeys = {"mesh":mesh,"shapekeys":[]} + mesh_data: bpy.types.Mesh = mesh.data + shape: bpy.types.ShapeKey = None + if mesh_data.shape_keys: + for shape in mesh_data.shape_keys.key_blocks: + mesh_shapekeys["shapekeys"].append(shape.name) + self.objects_to_do.append(mesh_shapekeys) + + + return {'FINISHED'} + + def invoke(self, context: Context, event: bpy.types.Event) -> set: + + self.execute(context) + context.window_manager.modal_handler_add(self) + return {'RUNNING_MODAL'} + + def modify_mesh(self, context: Context, mesh: meshEntry): + mesh["mesh"].select_set(True) + context.view_layer.objects.active = mesh["mesh"] + bpy.ops.object.mode_set(mode='EDIT') + + + + + + + + + bpy.ops.object.mode_set(mode='OBJECT') + mesh["mesh"].select_set(False) + + + def modal(self, context: Context, event: bpy.types.Event) -> set: + + + + + if len(self.objects_to_do) > 0: + mesh = self.objects_to_do[0] + mesh_data: bpy.types.Mesh = mesh["mesh"].data + if len(mesh['shapekeys']) > 0: + shapekeyname: str = mesh['shapekeys'].pop(0) + + target_shapekey: int = mesh_data.shape_keys.key_blocks.find(shapekeyname) + mesh["mesh"].active_shape_key_index = target_shapekey + print("doing shapekey \""+shapekeyname+"\" on mesh \""+mesh['mesh'].name+"\".") + self.modify_mesh(context, mesh) + + elif not (mesh_data.shape_keys): + print("doing mesh with no shapekeys named \""+mesh['mesh'].name+"\".") + self.modify_mesh(context, mesh) + self.objects_to_do.pop(0) + else: + self.objects_to_do.pop(0) + else: + return {'FINISHED'} + + return {'RUNNING_MODAL'} + + + + + + + diff --git a/ui/optimization.py b/ui/optimization.py index 2f6e69a..0de9bae 100644 --- a/ui/optimization.py +++ b/ui/optimization.py @@ -25,6 +25,7 @@ class AvatarToolkitOptimizationPanel(bpy.types.Panel): row.scale_y = 1.2 row.operator("avatar_toolkit.join_all_meshes", text="Join All Meshes") row.operator("avatar_toolkit.join_selected_meshes", text="Join Selected Meshes") + row.operator("avatar_toolkit.remove_doubles_safely", text="Remove Doubles Safely") # Add optimization options here diff --git a/ui/tools.py b/ui/tools.py index 408a95d..2c2ea05 100644 --- a/ui/tools.py +++ b/ui/tools.py @@ -19,4 +19,6 @@ class AvatarToolkitToolsPanel(bpy.types.Panel): row = layout.row(align=True) row.scale_y = 1.5 - row.operator("avatar_toolkit.convert_to_resonite", text="Translate to Resonite") \ No newline at end of file + row.operator("avatar_toolkit.convert_to_resonite", text="Translate to Resonite") + row = layout.row(align=True) + row.operator("avatar_toolkit.remove_doubles_safely", text="Remove Doubles Safely") \ No newline at end of file From 12e651f68c974f3dc96163820719270fa0fd872b Mon Sep 17 00:00:00 2001 From: 989onan Date: Sun, 7 Jul 2024 17:49:03 -0400 Subject: [PATCH 05/10] Finished merge doubles this now does doubles asyncronously --- .vscode/settings.json | 6 ++--- functions/remove_doubles_safely.py | 41 +++++++++++++++++++++++++++--- 2 files changed, 41 insertions(+), 6 deletions(-) diff --git a/.vscode/settings.json b/.vscode/settings.json index 96df99e..e685f8d 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -1,8 +1,8 @@ { "python.analysis.extraPaths": [ - "D:\\SteamLibrary\\steamapps\\common\\Blender\\4.0\\scripts\\addons", - "C:\\Users\\Onan\\AppData\\Roaming\\Blender Foundation\\Blender\\4.0\\scripts\\addons",//C:/Users/Onan/AppData/Roaming/Blender Foundation/Blender/4.0/scripts/addons - "D:\\blender stuff\\blendercodestuff\\4.0" + "D:\\SteamLibrary\\steamapps\\common\\Blender\\4.3\\scripts\\addons", + "C:\\Users\\Onan\\AppData\\Roaming\\Blender Foundation\\Blender\\4.3\\extensions\\user_default\\",//C:/Users/Onan/AppData/Roaming/Blender Foundation/Blender/4.0/scripts/addons + "D:\\blender stuff\\blendercodestuff\\4.3" ], "python.analysis.diagnosticSeverityOverrides": { "reportInvalidTypeForm": "none" diff --git a/functions/remove_doubles_safely.py b/functions/remove_doubles_safely.py index e962df6..1263e2d 100644 --- a/functions/remove_doubles_safely.py +++ b/functions/remove_doubles_safely.py @@ -18,6 +18,7 @@ class RemoveDoublesSafely(Operator): bl_description = "Remove Doubles on all meshes, making sure to not fuse things like mouths together." bl_options = {'REGISTER', 'UNDO'} objects_to_do: list[meshEntry] = [] + merge_distance: bpy.props.FloatProperty(default=0.0001) @classmethod def poll(cls, context: Context) -> bool: @@ -55,11 +56,17 @@ class RemoveDoublesSafely(Operator): def modify_mesh(self, context: Context, mesh: meshEntry): mesh["mesh"].select_set(True) context.view_layer.objects.active = mesh["mesh"] + context.view_layer.objects.active = mesh["mesh"] + mesh_data: bpy.types.Mesh = mesh["mesh"].data bpy.ops.object.mode_set(mode='EDIT') - - + bpy.ops.object.mode_set(mode='OBJECT') + for index, point in enumerate(mesh["mesh"].active_shape_key.points): + if point.co.xyz != mesh_data.shape_keys.key_blocks[0].points[index].co.xyz: + mesh_data.vertices[index].select = True + print("shapekey has a moved vertex at index \""+str(index)+"\", excluding from double merging!") + bpy.ops.object.mode_set(mode='EDIT') @@ -86,10 +93,38 @@ class RemoveDoublesSafely(Operator): elif not (mesh_data.shape_keys): print("doing mesh with no shapekeys named \""+mesh['mesh'].name+"\".") - self.modify_mesh(context, mesh) + mesh["mesh"].select_set(True) + context.view_layer.objects.active = mesh["mesh"] + bpy.ops.object.mode_set(mode='EDIT') + mesh_data.vertices.foreach_set("select",[False]*len(mesh_data.vertices)) + + bpy.ops.mesh.select_all(action="INVERT") + bpy.ops.mesh.remove_doubles(threshold=self.merge_distance,use_unselected=False) + + bpy.ops.object.mode_set(mode='OBJECT') + mesh["mesh"].select_set(False) self.objects_to_do.pop(0) else: + mesh["mesh"].select_set(True) + context.view_layer.objects.active = mesh["mesh"] + bpy.ops.object.mode_set(mode='EDIT') + + bpy.ops.mesh.select_all(action="INVERT") + bpy.ops.mesh.remove_doubles(threshold=self.merge_distance,use_unselected=False) + + bpy.ops.object.mode_set(mode='OBJECT') + mesh["mesh"].select_set(False) + self.objects_to_do.pop(0) + if len(self.objects_to_do) > 0: + mesh = self.objects_to_do[0] + mesh["mesh"].select_set(True) + context.view_layer.objects.active = mesh["mesh"] + bpy.ops.object.mode_set(mode='EDIT') + mesh_data.vertices.foreach_set("select",[False]*len(mesh_data.vertices)) + bpy.ops.object.mode_set(mode='OBJECT') + mesh["mesh"].select_set(False) + else: return {'FINISHED'} From 88061d2ad5f4176f6864609c8bfab07f0b0c6183 Mon Sep 17 00:00:00 2001 From: 989onan Date: Sun, 7 Jul 2024 18:42:57 -0400 Subject: [PATCH 06/10] Update remove_doubles_safely.py use the get armature method properly --- functions/remove_doubles_safely.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/functions/remove_doubles_safely.py b/functions/remove_doubles_safely.py index 1263e2d..99850ae 100644 --- a/functions/remove_doubles_safely.py +++ b/functions/remove_doubles_safely.py @@ -5,6 +5,7 @@ import re from typing import List, Tuple, Optional, TypedDict from bpy.types import Material, Operator, Context, Object from ..core.register import register_wrap +from ..core.common import get_armature class meshEntry(TypedDict): @@ -31,8 +32,9 @@ class RemoveDoublesSafely(Operator): bpy.ops.object.mode_set(mode='OBJECT') bpy.ops.object.select_all(action='DESELECT') + objects: List[Object] = get_armature(context).children if get_armature(context) else context.view_layer.objects - meshes: List[Object] = [obj for obj in context.view_layer.objects if obj.type == 'MESH'] + meshes: List[Object] = [obj for obj in objects if obj.type == 'MESH'] for mesh in meshes: if mesh.data.name not in [stored_object["mesh"].data.name for stored_object in self.objects_to_do]: From eaafd3bb691ffe06cdd7c414b020a109cb904a5c Mon Sep 17 00:00:00 2001 From: Yusarina Date: Mon, 8 Jul 2024 09:13:52 +0100 Subject: [PATCH 07/10] Translation Updates. - Added addon_preferences so we can save users preferences into a json file. - Made translation slightly simpler This mostly works just have to figure out why we can't update description on reload (There only update on blender restart). --- __init__.py | 12 ++--- core/addon_preferences.py | 43 ++++++++++++++++ core/properties.py | 22 +++++---- core/register.py | 9 ++-- functions/translations.py | 81 ++++++++++++++++--------------- resources/translations/en_US.json | 3 ++ resources/translations/ja_JP.json | 3 ++ 7 files changed, 115 insertions(+), 58 deletions(-) create mode 100644 core/addon_preferences.py diff --git a/__init__.py b/__init__.py index eed4b2c..f49f0c7 100644 --- a/__init__.py +++ b/__init__.py @@ -6,12 +6,14 @@ if "bpy" not in locals(): from .core import register from .core.register import __bl_ordered_classes from .core import properties + from .core import addon_preferences else: import importlib importlib.reload(ui) importlib.reload(core) importlib.reload(functions) importlib.reload(properties) + importlib.reload(addon_preferences) def register(): print("Registering Avatar Toolkit") @@ -26,18 +28,16 @@ def register(): # Register the properties core.register.register_properties() # Register the UI classes - for cls in core.register.__bl_ordered_classes: - print("registering " + str(cls)) - bpy.utils.register_class(cls) - - + for cls in __bl_ordered_classes: + print("registering" + str(cls)) + bpy.utils.register_class(cls) def unregister(): print("Unregistering Avatar Toolkit") # Unregister the UI classes # Iterate over the classes to unregister in reverse order and unregister them - for cls in reversed(core.register.__bl_ordered_classes): + for cls in reversed(list(__bl_ordered_classes)): bpy.utils.unregister_class(cls) print("unregistering " + str(cls)) core.register.unregister_properties() diff --git a/core/addon_preferences.py b/core/addon_preferences.py new file mode 100644 index 0000000..7949f1d --- /dev/null +++ b/core/addon_preferences.py @@ -0,0 +1,43 @@ +import bpy +import os +import json +from bpy.types import AddonPreferences +from typing import Any, Dict + +# Get the directory of the current file +PREFERENCES_DIR = os.path.dirname(os.path.abspath(__file__)) +PREFERENCES_FILE = os.path.join(PREFERENCES_DIR, "preferences.json") + +def save_preference(key: str, value: Any) -> None: + """Save a single preference to the JSON file.""" + prefs = load_preferences() + prefs[key] = value + with open(PREFERENCES_FILE, 'w') as f: + json.dump(prefs, f, indent=4) + +def load_preferences() -> Dict[str, Any]: + """Load all preferences from the JSON file.""" + if os.path.exists(PREFERENCES_FILE): + with open(PREFERENCES_FILE, 'r') as f: + return json.load(f) + return {} + +def get_preference(key: str, default: Any = None) -> Any: + """Get a single preference from the JSON file.""" + prefs = load_preferences() + return prefs.get(key, default) + +class AvatarToolkitPreferences(AddonPreferences): + bl_idname = __package__.rsplit('.', 1)[0] + + def draw(self, context): + layout = self.layout + layout.label(text="Preferences are managed internally.") + # You can add more UI elements here if needed + +def get_addon_preferences(context): + return context.preferences.addons[AvatarToolkitPreferences.bl_idname].preferences + +# Initialize preferences if the file doesn't exist +if not os.path.exists(PREFERENCES_FILE): + save_preference("language", 0) # Set default language to 0 (auto) \ No newline at end of file diff --git a/core/properties.py b/core/properties.py index 13ef631..9bf108d 100644 --- a/core/properties.py +++ b/core/properties.py @@ -1,16 +1,18 @@ import bpy -from ..functions.translations import t, get_languages_list, update_ui -from ..core.register import register_property -from typing import Tuple +from ..functions.translations import t, get_languages_list, update_language +from ..core.addon_preferences import get_preference def register(): - register_property((bpy.types.Scene, "avatar_toolkit_language", bpy.props.EnumProperty( - name=t("Settings.language.label"), - description=t("Settings.language.desc"), + default_language = get_preference("language", 0) + + bpy.types.Scene.avatar_toolkit_language = bpy.props.EnumProperty( + name=t("Settings.language.label", "Language"), + description=t("Settings.language.desc", "Select the language for the addon"), items=get_languages_list, - default=0, - update=update_ui - ))) + default=default_language, + update=update_language + ) def unregister(): - pass + if hasattr(bpy.types.Scene, "avatar_toolkit_language"): + del bpy.types.Scene.avatar_toolkit_language \ No newline at end of file diff --git a/core/register.py b/core/register.py index c7dc5dc..449050e 100644 --- a/core/register.py +++ b/core/register.py @@ -1,5 +1,5 @@ import bpy -import typing +from typing import List, Type # List to store the classes to register __bl_classes = [] @@ -21,8 +21,11 @@ def register_property(prop): def register_properties(): for prop in __bl_props: - setattr(prop[0], prop[1], prop[2]) - + if isinstance(prop[2], bpy.props._PropertyDeferred): + setattr(prop[0], prop[1], prop[2]) + else: + prop() + def unregister_properties(): for prop in reversed(__bl_props): delattr(prop[0], prop[1]) diff --git a/functions/translations.py b/functions/translations.py index af928fa..c60e886 100644 --- a/functions/translations.py +++ b/functions/translations.py @@ -2,20 +2,24 @@ import os import json import bpy from bpy.app.translations import locale -from ..core.register import register_wrap from typing import Dict, List, Tuple +from ..core.addon_preferences import save_preference, get_preference -main_dir: str = os.path.dirname(os.path.dirname(os.path.abspath(__file__))) -resources_dir: str = os.path.join(main_dir, "resources") -translations_dir: str = os.path.join(resources_dir, "translations") +# Use __file__ to get the current file's directory +current_dir = os.path.dirname(os.path.abspath(__file__)) +main_dir = os.path.dirname(current_dir) +resources_dir = os.path.join(main_dir, "resources") +translations_dir = os.path.join(resources_dir, "translations") dictionary: Dict[str, str] = dict() languages: List[str] = [] verbose: bool = True -def load_translations() -> None: +def load_translations() -> bool: global dictionary, languages + old_dictionary = dictionary.copy() + dictionary = dict() languages = ["auto"] @@ -25,68 +29,67 @@ def load_translations() -> None: if lang != "auto": languages.append(lang) - # Check if the context and scene are available - if hasattr(bpy.context, "scene"): - # Check if the property exists before trying to access it - if hasattr(bpy.context.scene, "avatar_toolkit_language"): - language_index = bpy.context.scene.avatar_toolkit_language - if isinstance(language_index, str): - language_index = int(language_index) - if language_index == 0: # "auto" - language = bpy.context.preferences.view.language - else: - language = languages[language_index] - else: - language = bpy.context.preferences.view.language + language_index = get_preference("language", 0) + print(f"Loading translations for language index: {language_index}") # Debug print + + if language_index == 0: # "auto" + language = bpy.context.preferences.view.language else: - # Set a default language if the context or scene is not available - language = "en_US" + try: + language = languages[language_index] + except IndexError: + language = bpy.context.preferences.view.language + + print(f"Selected language: {language}") # Debug print translation_file: str = os.path.join(translations_dir, language + ".json") if os.path.exists(translation_file): with open(translation_file, 'r', encoding='utf-8') as file: dictionary = json.load(file)["messages"] + print(f"Loaded translations: {dictionary}") # Debug print else: custom_language: str = language.split("_")[0] custom_translation_file: str = os.path.join(translations_dir, custom_language + ".json") if os.path.exists(custom_translation_file): with open(custom_translation_file, 'r', encoding='utf-8') as file: dictionary = json.load(file)["messages"] + print(f"Loaded custom translations: {dictionary}") # Debug print else: print(f"Translation file not found for language: {language}") default_file: str = os.path.join(translations_dir, "en_US.json") if os.path.exists(default_file): with open(default_file, 'r', encoding='utf-8') as file: dictionary = json.load(file)["messages"] + print(f"Loaded default translations: {dictionary}") # Debug print else: print("Default translation file 'en_US.json' not found.") -def t(phrase: str, *args, **kwargs) -> str: + return dictionary != old_dictionary + +def t(phrase: str, default: str = None) -> str: output: str = dictionary.get(phrase) if output is None: if verbose: - print('Warning: Unknown phrase: ' + phrase) - return phrase - return output.format(*args, **kwargs) + print(f'Warning: Unknown phrase: {phrase}') + return default if default is not None else phrase + print(f"Translating '{phrase}' to '{output}'") # Debug print + return output + +def get_language_display_name(lang: str) -> str: + if lang == "auto": + return t("Language.auto", "Automatic") + return t(f"Language.{lang}", lang) def get_languages_list(self, context) -> List[Tuple[str, str, str]]: - return [(str(i), lang, f"Use {lang} language") for i, lang in enumerate(languages)] + return [(str(i), get_language_display_name(lang), f"Use {lang} language") for i, lang in enumerate(languages)] -def refresh_translations(): +def update_language(self, context): + print(f"Updating language to: {self.avatar_toolkit_language}") # Debug print + save_preference("language", int(self.avatar_toolkit_language)) load_translations() - # Force a full UI update - for window in bpy.context.window_manager.windows: - for area in window.screen.areas: - area.tag_redraw() - -def update_ui(self, context): - refresh_translations() - # Force Blender to redraw all UI elements - for screen in bpy.data.screens: - for area in screen.areas: - area.tag_redraw() - # Update the Scene to trigger a full UI refresh - bpy.context.scene.update_tag() + # Reload the addon + bpy.ops.script.reload() # Initial load of translations +print("Performing initial load of translations") # Debug print load_translations() diff --git a/resources/translations/en_US.json b/resources/translations/en_US.json index 49b9b23..c9f60cc 100644 --- a/resources/translations/en_US.json +++ b/resources/translations/en_US.json @@ -1,5 +1,8 @@ { "messages": { + "Language.auto": "Automatic", + "Language.en_US": "English", + "Language.ja_JP": "日本語", "Quick_Access.label": "Quick Access", "Quick_Access.import_export.label": "Import/Export", "Quick_Access.options": "Quick Access Options", diff --git a/resources/translations/ja_JP.json b/resources/translations/ja_JP.json index 263544b..0fb43c5 100644 --- a/resources/translations/ja_JP.json +++ b/resources/translations/ja_JP.json @@ -1,5 +1,8 @@ { "messages": { + "Language.auto": "Automatic", + "Language.en_US": "English", + "Language.ja_JP": "日本語", "Quick_Access.label": "クイックアクセス", "Quick_Access.import_export.label": "インポート/エクスポート", "Quick_Access.options": "クイックアクセスオプション", From cce7e986bb6009adeca50aa4d912f32baa79b0ba Mon Sep 17 00:00:00 2001 From: Yusarina Date: Mon, 8 Jul 2024 09:42:16 +0100 Subject: [PATCH 08/10] Re-add typing --- core/register.py | 1 + 1 file changed, 1 insertion(+) diff --git a/core/register.py b/core/register.py index 449050e..aad610f 100644 --- a/core/register.py +++ b/core/register.py @@ -1,4 +1,5 @@ import bpy +import typing from typing import List, Type # List to store the classes to register From ee84ae640af9ca346457841192ba7ecf2dcc1523 Mon Sep 17 00:00:00 2001 From: Yusarina Date: Mon, 22 Jul 2024 01:56:22 +0100 Subject: [PATCH 09/10] Translation Popup now added. Due to some werid thing in Blender 4.2+ where we just can't get descriptions to translate, we now tell the user some translations won't apply unto restart. --- core/properties.py | 7 ++++++- functions/translations.py | 6 ++++-- resources/translations/en_US.json | 6 +++++- resources/translations/ja_JP.json | 6 +++++- ui/settings.py | 23 +++++++++++++++++++++++ 5 files changed, 43 insertions(+), 5 deletions(-) diff --git a/core/properties.py b/core/properties.py index 9bf108d..9841212 100644 --- a/core/properties.py +++ b/core/properties.py @@ -12,7 +12,12 @@ def register(): default=default_language, update=update_language ) + + bpy.types.Scene.avatar_toolkit_language_changed = bpy.props.BoolProperty(default=False) def unregister(): if hasattr(bpy.types.Scene, "avatar_toolkit_language"): - del bpy.types.Scene.avatar_toolkit_language \ No newline at end of file + del bpy.types.Scene.avatar_toolkit_language + + if hasattr(bpy.types.Scene, "avatar_toolkit_language_changed"): + del bpy.types.Scene.avatar_toolkit_language_changed diff --git a/functions/translations.py b/functions/translations.py index c60e886..9e2a742 100644 --- a/functions/translations.py +++ b/functions/translations.py @@ -87,8 +87,10 @@ def update_language(self, context): print(f"Updating language to: {self.avatar_toolkit_language}") # Debug print save_preference("language", int(self.avatar_toolkit_language)) load_translations() - # Reload the addon - bpy.ops.script.reload() + # Set a flag to indicate that a language change has occurred + context.scene.avatar_toolkit_language_changed = True + # Show popup after language change + bpy.ops.avatar_toolkit.translation_restart_popup('INVOKE_DEFAULT') # Initial load of translations print("Performing initial load of translations") # Debug print diff --git a/resources/translations/en_US.json b/resources/translations/en_US.json index c9f60cc..211cb5e 100644 --- a/resources/translations/en_US.json +++ b/resources/translations/en_US.json @@ -31,7 +31,11 @@ "Tools.convert_to_resonite.desc": "Converts bone names on a model to names compatable with Resonite", "Settings.label": "Settings", "Settings.language.label": "Language", - "Settings.language.desc": "Select the language for the addon's UI" + "Settings.language.desc": "Select the language for the addon's UI", + "Settings.translation_restart_popup.label": "Translation Update", + "Settings.translation_restart_popup.description": "Information about translation updates", + "Settings.translation_restart_popup.message1": "Some translations may not apply", + "Settings.translation_restart_popup.message2": "until you restart Blender." } } \ No newline at end of file diff --git a/resources/translations/ja_JP.json b/resources/translations/ja_JP.json index 0fb43c5..01e8d3b 100644 --- a/resources/translations/ja_JP.json +++ b/resources/translations/ja_JP.json @@ -31,6 +31,10 @@ "Tools.convert_to_resonite.desc": "モデルのボーン名をResoniteと互換性のある名前に変換します", "Settings.label": "設定", "Settings.language.label": "言語", - "Settings.language.desc": "アドオンのUI言語を選択してください" + "Settings.language.desc": "アドオンのUI言語を選択してください", + "Settings.translation_restart_popup.label": "翻訳の更新", + "Settings.translation_restart_popup.description": "翻訳の更新に関する情報", + "Settings.translation_restart_popup.message1": "一部の翻訳は適用されない場合があります", + "Settings.translation_restart_popup.message2": "Blenderを再起動するまで。" } } diff --git a/ui/settings.py b/ui/settings.py index 4287a9c..36089e9 100644 --- a/ui/settings.py +++ b/ui/settings.py @@ -15,3 +15,26 @@ class AvatarToolkitSettingsPanel(bpy.types.Panel): def draw(self, context): layout = self.layout layout.prop(context.scene, "avatar_toolkit_language", text=t("Settings.language.label")) + +@register_wrap +class AVATAR_TOOLKIT_OT_translation_restart_popup(bpy.types.Operator): + bl_idname = "avatar_toolkit.translation_restart_popup" + bl_label = t("Settings.translation_restart_popup.label") + bl_description = t("Settings.translation_restart_popup.description") + bl_options = {'INTERNAL'} + + def execute(self, context): + if context.scene.avatar_toolkit_language_changed: + # Reload the addon after the popup is closed + bpy.ops.script.reload() + context.scene.avatar_toolkit_language_changed = False + return {'FINISHED'} + + def invoke(self, context, event): + return context.window_manager.invoke_props_dialog(self, width=300) + + def draw(self, context): + layout = self.layout + layout.label(text=t("Settings.translation_restart_popup.message1")) + layout.label(text=t("Settings.translation_restart_popup.message2")) + From f0a5f6d10afe11e9712ff42096e29bd5273c037f Mon Sep 17 00:00:00 2001 From: Yusarina Date: Mon, 22 Jul 2024 22:08:38 +0100 Subject: [PATCH 10/10] Added Authors to json --- resources/translations/en_US.json | 3 ++- resources/translations/ja_JP.json | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/resources/translations/en_US.json b/resources/translations/en_US.json index 211cb5e..e5a05f3 100644 --- a/resources/translations/en_US.json +++ b/resources/translations/en_US.json @@ -1,5 +1,6 @@ { - "messages": { + "authors": ["Avatar Toolkit Team"], + "messages": { "Language.auto": "Automatic", "Language.en_US": "English", "Language.ja_JP": "日本語", diff --git a/resources/translations/ja_JP.json b/resources/translations/ja_JP.json index 01e8d3b..8e2c537 100644 --- a/resources/translations/ja_JP.json +++ b/resources/translations/ja_JP.json @@ -1,4 +1,5 @@ { + "authors": ["Avatar Toolkit Team"], "messages": { "Language.auto": "Automatic", "Language.en_US": "English",