diff --git a/ui/atlas_materials.py b/ui/atlas_materials.py index 7b307d3..285d3b5 100644 --- a/ui/atlas_materials.py +++ b/ui/atlas_materials.py @@ -73,16 +73,29 @@ class AvatarToolKit_PT_TextureAtlasPanel(Panel): armature = get_selected_armature(context) if armature: - row = layout.row() - boxoutter = row.box() + layout.label(text=t("TextureAtlas.label"), icon='TEXTURE') + + layout.separator(factor=0.5) + + box = layout.box() + row = box.row() direction_icon = 'RIGHTARROW' if not context.scene.texture_atlas_Has_Mat_List_Shown else 'DOWNARROW_HLT' - row = boxoutter.row() - row.operator(AvatarToolKit_OT_ExpandSectionMaterials.bl_idname, text=(t("TextureAtlas.reload_list") if not context.scene.texture_atlas_Has_Mat_List_Shown else t("TextureAtlas.loaded_list")), icon=direction_icon) + row.operator(AvatarToolKit_OT_ExpandSectionMaterials.bl_idname, + text=(t("TextureAtlas.reload_list") if not context.scene.texture_atlas_Has_Mat_List_Shown else t("TextureAtlas.loaded_list")), + icon=direction_icon) + if context.scene.texture_atlas_Has_Mat_List_Shown: - row = boxoutter.row() - row.template_list(AvatarToolKit_UL_MaterialTextureAtlasProperties.bl_idname, 'material_list', context.scene, 'materials', - context.scene, 'texture_atlas_material_index', rows=12, type='DEFAULT') - row = layout.row() - row.operator(AvatarToolKit_OT_AtlasMaterials.bl_idname, text=t("TextureAtlas.atlas_materials")) + row = box.row() + row.template_list(AvatarToolKit_UL_MaterialTextureAtlasProperties.bl_idname, 'material_list', + context.scene, 'materials', context.scene, 'texture_atlas_material_index', + rows=12, type='DEFAULT') + + layout.separator(factor=1.0) + + row = layout.row() + row.scale_y = 1.5 + row.operator(AvatarToolKit_OT_AtlasMaterials.bl_idname, text=t("TextureAtlas.atlas_materials"), icon='NODE_TEXTURE') + else: layout.label(text=t("Tools.select_armature"), icon='ERROR') + diff --git a/ui/merge_armatures.py b/ui/merge_armatures.py index 76055b0..8f00458 100644 --- a/ui/merge_armatures.py +++ b/ui/merge_armatures.py @@ -25,16 +25,24 @@ class AvatarToolkit_PT_MergeArmaturesPanel(Panel): layout.label(text=t("MergeArmatures.title.label"), icon='ARMATURE_DATA') layout.separator(factor=0.5) - row = layout.row(align=True) - row.prop(context.scene, property="selected_armature",text=t("MergeArmatures.target_armature.label"),icon="STYLUS_PRESSURE") - row = layout.row(align=True) - row.prop(context.scene, property="merge_armature_source",icon="SORT_DESC") - row = layout.row(align=True) - row.prop(context.scene, property="merge_armature_align_bones") - row = layout.row(align=True) - row.prop(context.scene, property="merge_armature_apply_transforms") - row = layout.row(align=True) - row.operator(operator=AvatarToolkit_OT_MergeArmatures.bl_idname,icon="ARMATURE_DATA") + + box = layout.box() + col = box.column(align=True) + + col.prop(context.scene, property="selected_armature", text=t("MergeArmatures.target_armature.label"), icon="ARMATURE_DATA") + col.prop(context.scene, property="merge_armature_source", icon="OUTLINER_OB_ARMATURE") + + layout.separator(factor=0.5) + + col = layout.column(align=True) + col.prop(context.scene, property="merge_armature_align_bones", icon="BONE_DATA") + col.prop(context.scene, property="merge_armature_apply_transforms", icon="OBJECT_ORIGIN") + + layout.separator(factor=1.0) + + row = layout.row() + row.scale_y = 1.5 + row.operator(operator=AvatarToolkit_OT_MergeArmatures.bl_idname, icon="ARMATURE_DATA") else: - layout.label(text=t("MergeArmatures.select_armature"), icon='ERROR') \ No newline at end of file + layout.label(text=t("MergeArmatures.select_armature"), icon='ERROR') diff --git a/ui/mmd_options.py b/ui/mmd_options.py index b488f70..fe2c04e 100644 --- a/ui/mmd_options.py +++ b/ui/mmd_options.py @@ -20,10 +20,32 @@ class AvatarToolkit_PT_MMDOptionsPanel(bpy.types.Panel): def draw(self, context: bpy.types.Context) -> None: layout = self.layout - layout.operator(AvatarToolKit_OT_CleanupMesh.bl_idname) - layout.operator(AvatarToolKit_OT_JoinAllMeshes.bl_idname) - layout.operator(AvatarToolKit_OT_OptimizeWeights.bl_idname) - layout.operator(AvatarToolKit_OT_OptimizeArmature.bl_idname) - layout.operator(AvatarToolKit_OT_ApplyTransforms.bl_idname) - layout.operator(AvatarToolKit_OT_CombineMaterials.bl_idname) - layout.operator(AvatarToolKit_OT_ConvertMaterials.bl_idname) + layout.label(text=t("MMDOptions.title"), icon='OUTLINER_OB_ARMATURE') + + layout.separator(factor=0.5) + + col = layout.column(align=True) + col.scale_y = 1.2 + col.operator(AvatarToolKit_OT_CleanupMesh.bl_idname, icon='BRUSH_DATA') + col.operator(AvatarToolKit_OT_JoinAllMeshes.bl_idname, icon='OBJECT_DATAMODE') + + layout.separator(factor=0.5) + + col = layout.column(align=True) + col.scale_y = 1.2 + col.operator(AvatarToolKit_OT_OptimizeWeights.bl_idname, icon='MOD_VERTEX_WEIGHT') + col.operator(AvatarToolKit_OT_OptimizeArmature.bl_idname, icon='ARMATURE_DATA') + + layout.separator(factor=0.5) + + row = layout.row(align=True) + row.scale_y = 1.2 + row.operator(AvatarToolKit_OT_ApplyTransforms.bl_idname, icon='OBJECT_ORIGIN') + row.operator(AvatarToolKit_OT_CombineMaterials.bl_idname, icon='MATERIAL') + + layout.separator(factor=0.5) + + row = layout.row() + row.scale_y = 1.2 + row.operator(AvatarToolKit_OT_ConvertMaterials.bl_idname, icon='SHADING_TEXTURE') + diff --git a/ui/optimization.py b/ui/optimization.py index 657ecc9..cd6256a 100644 --- a/ui/optimization.py +++ b/ui/optimization.py @@ -24,16 +24,22 @@ class AvatarToolkit_PT_OptimizationPanel(bpy.types.Panel): if armature: layout.label(text=t("Optimization.options.label"), icon='SETTINGS') - row = layout.row() + layout.separator(factor=0.5) + + row = layout.row(align=True) row.scale_y = 1.2 row.operator(AvatarToolKit_OT_CombineMaterials.bl_idname, text=t("Optimization.combine_materials.label"), icon='MATERIAL') + + layout.separator(factor=0.5) + row = layout.row(align=True) row.scale_y = 1.2 row.operator(AvatarToolKit_OT_RemoveDoublesSafely.bl_idname, text=t("Optimization.remove_doubles_safely.label"), icon='SNAP_VERTEX') - row.operator(AvatarToolKit_OT_RemoveDoublesSafelyAdvanced.bl_idname, text=t("Optimization.remove_doubles_safely_advanced.label"), icon = "ACTION") - layout.separator(factor=0.5) + row.operator(AvatarToolKit_OT_RemoveDoublesSafelyAdvanced.bl_idname, text=t("Optimization.remove_doubles_safely_advanced.label"), icon="ACTION") - layout.label(text=t("Optimization.joinmeshes.label"), icon='SETTINGS') + layout.separator(factor=1.0) + + layout.label(text=t("Optimization.joinmeshes.label"), icon='OBJECT_DATA') row = layout.row(align=True) row.scale_y = 1.2 row.operator(AvatarToolKit_OT_JoinAllMeshes.bl_idname, text=t("Optimization.join_all_meshes.label"), icon='OUTLINER_OB_MESH') diff --git a/ui/quick_access.py b/ui/quick_access.py index 83cfb7f..26a33ef 100644 --- a/ui/quick_access.py +++ b/ui/quick_access.py @@ -25,32 +25,40 @@ class AvatarToolkitQuickAccessPanel(Panel): layout = self.layout layout.label(text=t("Quick_Access.options"), icon='TOOL_SETTINGS') - layout.label(text=t("Quick_Access.select_armature"), icon='ARMATURE_DATA') + layout.separator(factor=1.0) + layout.label(text=t("Quick_Access.select_armature"), icon='ARMATURE_DATA') layout.prop(context.scene, "selected_armature", text="") - row = layout.row() - row.label(text=t("Quick_Access.import_export.label"), icon='IMPORT') - - layout.separator(factor=0.5) + layout.separator(factor=1.0) + layout.label(text=t("Quick_Access.import_export.label"), icon='IMPORT') + row = layout.row(align=True) - row.scale_y = 1.5 + row.scale_y = 1.5 row.operator(AvatarToolKit_OT_ImportAnyModel.bl_idname, text=t("Quick_Access.import"), icon='IMPORT') row.operator(AVATAR_TOOLKIT_OT_ExportMenu.bl_idname, text=t("Quick_Access.export"), icon='EXPORT') - + + layout.separator(factor=1.0) + if get_selected_armature(context) != None: if(context.mode == "POSE"): - row = layout.row(align=True) - row.operator(AvatarToolkit_OT_StopPoseMode.bl_idname, text=t("Quick_Access.stop_pose_mode.label"), icon='POSE_HLT') - row = layout.row(align=True) - row.operator(AvatarToolkit_OT_ApplyPoseAsRest.bl_idname, text=t("Quick_Access.apply_pose_as_rest.label"), icon='MOD_ARMATURE') - row = layout.row(align=True) - row.operator(AvatarToolkit_OT_ApplyPoseAsShapekey.bl_idname, text=t("Quick_Access.apply_pose_as_shapekey.label"), icon='MOD_ARMATURE') + col = layout.column(align=True) + col.scale_y = 1.2 + col.operator(AvatarToolkit_OT_StopPoseMode.bl_idname, text=t("Quick_Access.stop_pose_mode.label"), icon='POSE_HLT') + + layout.separator(factor=0.5) + + col = layout.column(align=True) + col.scale_y = 1.2 + col.operator(AvatarToolkit_OT_ApplyPoseAsRest.bl_idname, text=t("Quick_Access.apply_pose_as_rest.label"), icon='MOD_ARMATURE') + col.operator(AvatarToolkit_OT_ApplyPoseAsShapekey.bl_idname, text=t("Quick_Access.apply_pose_as_shapekey.label"), icon='MOD_ARMATURE') else: - row = layout.row(align=True) + row = layout.row() + row.scale_y = 1.2 row.operator(AvatarToolkit_OT_StartPoseMode.bl_idname, text=t("Quick_Access.start_pose_mode.label"), icon='POSE_HLT') + @register_wrap class AVATAR_TOOLKIT_OT_ExportMenu(bpy.types.Operator): bl_idname = "avatar_toolkit.export_menu" diff --git a/ui/tools.py b/ui/tools.py index 973c46f..df218c7 100644 --- a/ui/tools.py +++ b/ui/tools.py @@ -32,28 +32,45 @@ class AvatarToolkit_PT_ToolsPanel(bpy.types.Panel): row = layout.row(align=True) row.scale_y = 1.5 row.operator(AvatarToolKit_OT_ConvertToResonite.bl_idname, text=t("Tools.convert_to_resonite.label"), icon='SCENE_DATA') + row = layout.row(align=True) - row.operator(AvatarToolKit_OT_CreateDigitigradeLegs.bl_idname, text=t("Tools.create_digitigrade_legs.label"), icon='BONE_DATA') - layout.separator() - row = layout.row(align=True) + row.scale_y = 1.5 + row.operator(AvatarToolKit_OT_ConvertRigifyToUnity.bl_idname, text=t("Tools.convert_rigify_to_unity.label"), icon='ARMATURE_DATA') + + layout.separator(factor=1.0) + layout.label(text=t("Tools.separate_by.label"), icon='MESH_DATA') + row = layout.row(align=True) row.operator(AvatarToolKit_OT_SeparateByMaterials.bl_idname, text=t("Tools.separate_by_materials.label"), icon='MATERIAL') row.operator(AvatarToolKit_OT_SeparateByLooseParts.bl_idname, text=t("Tools.separate_by_loose_parts.label"), icon='OUTLINER_OB_MESH') + + layout.separator(factor=1.0) + + layout.label(text=t("Tools.bone_tools.label"), icon='BONE_DATA') row = layout.row(align=True) - row.operator(AvatarToolKit_OT_ApplyTransforms.bl_idname, text=t("Tools.apply_transforms.label"), icon='OBJECT_ORIGIN') - row.operator(AvatarToolkit_OT_RemoveUnusedShapekeys.bl_idname, text=t("Tools.remove_unused_shapekeys.label"), icon='SHAPEKEY_DATA') + row.operator(AvatarToolKit_OT_CreateDigitigradeLegs.bl_idname, text=t("Tools.create_digitigrade_legs.label"), icon='BONE_DATA') + row = layout.row(align=True) row.operator(AvatarToolkit_OT_RemoveZeroWeightBones.bl_idname, text=t("Tools.remove_zero_weight_bones.label"), icon='BONE_DATA') + row = layout.row(align=True) row.operator(AvatarToolkit_OT_MergeBonesToActive.bl_idname, text=t("Tools.merge_bones_to_active.label"), icon='BONE_DATA') row.operator(AvatarToolkit_OT_MergeBonesToParents.bl_idname, text=t("Tools.merge_bones_to_parents.label"), icon='BONE_DATA') + row = layout.row(align=True) row.operator(AvatarToolKit_OT_ConnectBones.bl_idname, text=t("Tools.connect_bones.label"), icon='BONE_DATA') - row = layout.row(align=True) row.operator(AvatarToolKit_OT_DeleteBoneConstraints.bl_idname, text=t("Tools.delete_bone_constraints.label"), icon='CONSTRAINT_BONE') - row = layout.row(align=True) - row.operator(AvatarToolKit_OT_ConvertRigifyToUnity.bl_idname, text=t("Tools.convert_rigify_to_unity.label"), icon='ARMATURE_DATA') + row = layout.row() row.prop(context.scene, "merge_twist_bones") + + layout.separator(factor=1.0) + + layout.label(text=t("Tools.additional_tools.label"), icon='TOOL_SETTINGS') + row = layout.row(align=True) + row.operator(AvatarToolKit_OT_ApplyTransforms.bl_idname, text=t("Tools.apply_transforms.label"), icon='OBJECT_ORIGIN') + row.operator(AvatarToolkit_OT_RemoveUnusedShapekeys.bl_idname, text=t("Tools.remove_unused_shapekeys.label"), icon='SHAPEKEY_DATA') + + layout.separator(factor=1.0) else: layout.label(text=t("Tools.select_armature"), icon='ERROR') diff --git a/ui/viseme.py b/ui/viseme.py index b961663..8e0ef26 100644 --- a/ui/viseme.py +++ b/ui/viseme.py @@ -20,20 +20,29 @@ class AvatarToolkitVisemePanel(bpy.types.Panel): armature = get_selected_armature(context) if armature: + layout.label(text=t("VisemePanel.label"), icon='SOUND') + + layout.separator(factor=0.5) + layout.prop(context.scene, "selected_mesh", text=t("VisemePanel.select_mesh"), icon='OUTLINER_OB_MESH') - row = layout.row() mesh = bpy.data.objects.get(context.scene.selected_mesh) if mesh and mesh.type == 'MESH': if mesh.data.shape_keys: - layout.prop_search(context.scene, "avatar_toolkit_mouth_a", mesh.data.shape_keys, "key_blocks", text=t('VisemePanel.mouth_a.label'), icon='SHAPEKEY_DATA') - layout.prop_search(context.scene, "avatar_toolkit_mouth_o", mesh.data.shape_keys, "key_blocks", text=t('VisemePanel.mouth_o.label'), icon='SHAPEKEY_DATA') - layout.prop_search(context.scene, "avatar_toolkit_mouth_ch", mesh.data.shape_keys, "key_blocks", text=t('VisemePanel.mouth_ch.label'), icon='SHAPEKEY_DATA') + box = layout.box() + col = box.column(align=True) + col.prop_search(context.scene, "avatar_toolkit_mouth_a", mesh.data.shape_keys, "key_blocks", text=t('VisemePanel.mouth_a.label'), icon='SHAPEKEY_DATA') + col.prop_search(context.scene, "avatar_toolkit_mouth_o", mesh.data.shape_keys, "key_blocks", text=t('VisemePanel.mouth_o.label'), icon='SHAPEKEY_DATA') + col.prop_search(context.scene, "avatar_toolkit_mouth_ch", mesh.data.shape_keys, "key_blocks", text=t('VisemePanel.mouth_ch.label'), icon='SHAPEKEY_DATA') + + layout.separator(factor=0.5) layout.prop(context.scene, 'avatar_toolkit_shape_intensity', text=t('VisemePanel.shape_intensity'), icon='FORCE_LENNARDJONES') + layout.separator(factor=1.0) + row = layout.row() - row.scale_y = 1.2 + row.scale_y = 1.5 row.operator(AvatarToolKit_OT_AutoVisemeButton.bl_idname, text=t('VisemePanel.create_visemes'), icon='TRIA_RIGHT') else: layout.label(text=t('VisemePanel.error.noShapekeys'), icon='ERROR') @@ -42,5 +51,6 @@ class AvatarToolkitVisemePanel(bpy.types.Panel): else: layout.label(text=t('VisemePanel.error.noArmature'), icon='ERROR') - layout.separator() + layout.separator(factor=1.0) layout.label(text=t('VisemePanel.info.selectMesh'), icon='HELP') +