From 0a2cb500267dcce87589abed9c7bda8e211293af Mon Sep 17 00:00:00 2001 From: "Marvin.K.Breuer (MKB)" Date: Sun, 1 Sep 2019 07:30:17 +0200 Subject: [PATCH] Update mi_gui.py fixed: icons and space for the buttons and dropdown panel menus --- blender/addons/2.8/mira_tools/mi_gui.py | 306 ++++++++++++------------ 1 file changed, 153 insertions(+), 153 deletions(-) diff --git a/blender/addons/2.8/mira_tools/mi_gui.py b/blender/addons/2.8/mira_tools/mi_gui.py index b3003a36..a3db46fd 100644 --- a/blender/addons/2.8/mira_tools/mi_gui.py +++ b/blender/addons/2.8/mira_tools/mi_gui.py @@ -20,10 +20,7 @@ from bpy import* -############----------------------############ -############ Props for DROPDOWN ############ -############----------------------############ - +# DROPDOWN PROPERTIES # class DropdownMiraToolProps(bpy.types.PropertyGroup): """ Fake module like class @@ -42,10 +39,8 @@ class DropdownMiraToolProps(bpy.types.PropertyGroup): display_mira_obj_retopology: bpy.props.BoolProperty(name="Object Retopology", description="UI Object Retopology", default=False) -############-----------------------------############ -############ DROPDOWN Layout for PANEL ############ -############-----------------------------############ +# PANEL LAYOUT DROPDOWN # class MI_PT_Panel(bpy.types.Panel): bl_idname = "MI_PT_Panel" bl_label = "Mira Tools" @@ -57,18 +52,19 @@ class MI_PT_Panel(bpy.types.Panel): def draw(self, context): mt = context.window_manager.mirawindow layout = self.layout - #mi_settings = context.scene.mi_settings + #layout = self.layout.column(align=True) + layout.scale_y = 1.1 +# MODIFY # -------------------------------------------------- - #col = layout.column(align = True) + col = layout.column(align = True) + box = col.box().column(align=True) if mt.display_mira_modify: - box = layout.box() row = box.row(align=True) row.prop(mt, "display_mira_modify", text="", icon='TRIA_DOWN') else: - box = layout.box() row = box.row(align=True) row.prop(mt, "display_mira_modify", text="", icon='TRIA_RIGHT') @@ -77,22 +73,27 @@ def draw(self, context): row.prop(context.scene.mi_extrude_settings, "do_symmetry", text='', icon="UV_ISLANDSEL") if context.scene.mi_extrude_settings.do_symmetry: sub = row.row(align=True) - sub.scale_x = 0.15 + sub.scale_x = 0.35 sub.prop(context.scene.mi_extrude_settings, "symmetry_axys", text='') row.operator("mira.draw_extrude", text="", icon="VPAINT_HLT") + row.operator("mira.unbevel", text="", icon="DRIVER_ROTATIONAL_DIFFERENCE") - ###space### - if mt.display_mira_modify: - ###space### - col = layout.column(align=True) - box = col.column(align=True).box().column() - col_top = box.column(align=True) + if mt.display_mira_modify: - row = col_top.column() + box.separator() + box = col.box().column(align=True) + box.separator() + + row = box.column() + row.operator("mira.simple_extrude", text="Simple Extrude", icon="VPAINT_HLT") + + box.separator() + box = col.box().column(align=True) + box.separator() + + row = box.column() row.operator("mira.draw_extrude", text="Draw Extrude", icon="VPAINT_HLT") - #row.prop(context.scene.mi_extrude_settings, "extrude_mode", text='Mode') - row.prop(context.scene.mi_extrude_settings, "extrude_step_type", text='Step') if context.scene.mi_extrude_settings.extrude_step_type == 'Asolute': @@ -100,82 +101,78 @@ def draw(self, context): else: row.prop(context.scene.mi_extrude_settings, "relative_extrude_step", text='') - row = col_top.column() + row = box.column() if context.scene.mi_settings.surface_snap is False: row.prop(context.scene.mi_extrude_settings, "do_symmetry", text='Symmetry') if context.scene.mi_extrude_settings.do_symmetry: row.prop(context.scene.mi_extrude_settings, "symmetry_axys", text='Axys') - row.separator() - row.operator("mira.simple_extrude", text="Simple Extrude", icon="VPAINT_HLT") - - row.separator() - row.operator("mira.unbevel", text="Unbevel", icon="VPAINT_HLT") + box.separator() + box = col.box().column(align=True) + box.separator() + + row = box.column() + row.operator("mira.unbevel", text="Unbevel", icon="DRIVER_ROTATIONAL_DIFFERENCE") box.separator() + +# RETOPO # -------------------------------------------------- - #col = layout.column(align = True) + col = layout.column(align = True) + box = col.box().column(align=True) if mt.display_mira_sface: - - box = layout.box() row = box.row(align=True) row.prop(mt, "display_mira_sface", text="", icon='TRIA_DOWN') else: - box = layout.box() row = box.row(align=True) row.prop(mt, "display_mira_sface", text="", icon='TRIA_RIGHT') row.label(text="Retopo") row.operator("mira.poly_loop", text="", icon="MESH_GRID") - #sub = row.row(align=True) - #sub.scale_x = 0.15 - row.prop(context.scene.mi_cur_surfs_settings, "spread_loops_type", text='', icon="COLLAPSEMENU") + sub = row.row(align=True) + sub.scale_x = 0.35 + sub.prop(context.scene.mi_cur_surfs_settings, "spread_loops_type", text='', icon="COLLAPSEMENU") row.operator("mira.curve_surfaces", text="", icon="SURFACE_NCURVE") - ###space### if mt.display_mira_sface: - ###space### - - col = layout.column(align=True) - box = col.column(align=True).box().column() - col_top = box.column(align=True) + + box.separator() + box = col.box().column(align=True) + box.separator() - row = col_top.column(align=True) + row = box.column(align=True) row.operator("mira.poly_loop", text="Poly Loop", icon="MESH_GRID") - row.separator() - #col = layout.column(align=True) - #box = col.column(align=True).box().column() - #col_top = box.column(align=True) + box.separator() + box = col.box().column(align=True) + box.separator() - row = col_top.column() + row = box.column() row.operator("mira.curve_surfaces", text="CurveSurfaces", icon="SURFACE_NCURVE") row.prop(context.scene.mi_cur_surfs_settings, "spread_loops_type", text='Points') - #box.separator() - - row.separator() + box.separator() + box = col.box().column(align=True) + box.separator() - row = col_top.column() + row = box.column() row.operator("mira.snap_points", text="Snap Points", icon="SURFACE_NCURVE") - - + box.separator() +# DEFORM # -------------------------------------------------- - #col = layout.column(align = True) + col = layout.column(align = True) + box = col.box().column(align=True) if mt.display_mira_deform: - - box = layout.box() row = box.row(align=True) row.prop(mt, "display_mira_deform", text="", icon='TRIA_DOWN') else: - box = layout.box() row = box.row(align=True) row.prop(mt, "display_mira_deform", text="", icon='TRIA_RIGHT') @@ -184,59 +181,56 @@ def draw(self, context): row.prop(context.scene.mi_ldeformer_settings, "manual_update", text='', icon="DISK_DRIVE") row.operator("mira.linear_deformer", text="", icon="OUTLINER_OB_MESH") - ###space### if mt.display_mira_deform: - ###space### - col = layout.column(align=True) - box = col.column(align=True).box().column() - col_top = box.column(align=True) + box.separator() + box = col.box().column(align=True) + box.separator() - row = col_top.column() + row = box.column() row.operator("mira.noise", text="NoiseDeform", icon="RNDCURVE") - row.separator() - row.operator("mira.deformer", text="Deformer") + + box.separator() + box = col.box().column(align=True) + box.separator() + row.operator("mira.linear_deformer", text="LinearDeformer", icon="OUTLINER_OB_MESH") row.prop(context.scene.mi_ldeformer_settings, "manual_update", text='ManualUpdate') box.separator() - -# -------------------------------------------------- +# ARC +# -------------------------------------------------- + col = layout.column(align = True) + box = col.box().column(align=True) if mt.display_mira_arc: - - box = layout.box() row = box.row(align=True) row.prop(mt, "display_mira_arc", text="", icon='TRIA_DOWN') else: - box = layout.box() row = box.row(align=True) row.prop(mt, "display_mira_arc", text="", icon='TRIA_RIGHT') row.label(text="Arc") - - sub = row.row(align=True) - sub.scale_x = 1.7 - sub.operator("mira.make_arc", text="", icon ="SPHERECURVE") + row.operator("mira.make_arc", text="", icon ="SPHERECURVE") row.operator("mira.make_arc_get_axis", text="", icon ="FACESEL") - - ###space### + if mt.display_mira_arc: - ###space### - box = layout.box().column(align=True) + box.separator() + box = col.box().column(align=True) + box.separator() row = box.row(align=True) row.label(text="Arc Creation") box.separator() - row = box.row(align=True) - row.operator("mira.make_arc", text="MakeArc") - row.operator("mira.make_arc_get_axis", text="GetAxis") + row = box.column(align=True) + row.operator("mira.make_arc", text="Make Arc", icon ="SPHERECURVE") + row.operator("mira.make_arc_get_axis", text="Get Axis", icon ="FACESEL") box.separator() @@ -245,58 +239,60 @@ def draw(self, context): box.separator() - + + +# CURVE GUIDE # -------------------------------------------------- - #col = layout.column(align = True) + col = layout.column(align = True) + box = col.box().column(align=True) if mt.display_mira_guide: - - box = layout.box() row = box.row(align=True) row.prop(mt, "display_mira_guide", text="", icon='TRIA_DOWN') else: - box = layout.box() row = box.row(align=True) row.prop(mt, "display_mira_guide", text="", icon='TRIA_RIGHT') row.label(text="CGuide") - row.prop(context.scene.mi_curguide_settings, "points_number", text='') - row.prop(context.scene.mi_curguide_settings, "deform_type", text='') - - #sub = row.row(align=True) - #sub.scale_x = 0.15 - #sub.prop(context.scene.mi_curguide_settings, "deform_type", text='', icon="COLLAPSEMENU") + sub = row.row(align=True) + sub.scale_x = 0.5 + sub.prop(context.scene.mi_curguide_settings, "points_number", text='') + + sub1 = row.row(align=True) + sub1.scale_x = 0.35 + sub1.prop(context.scene.mi_curguide_settings, "deform_type", text='', icon="COLLAPSEMENU") row.operator("mira.curve_guide", text='', icon="RNA") - ###space### if mt.display_mira_guide: - ###space### - col = layout.column(align=True) - box = col.column(align=True).box().column() - col_top = box.column(align=True) + box.separator() + box = col.box().column(align=True) + box.separator() - row = col_top.column(align=True) + row = box.column(align=True) row.operator("mira.curve_guide", text="CurveGuide", icon="RNA") row.prop(context.scene.mi_curguide_settings, "points_number", text='LoopSpread') + + box.separator() - row = col_top.column(align=True) - row.prop(context.scene.mi_curguide_settings, "deform_type", text='DeformType') + row = box.row() + row.label(text='DeformType') + row.prop(context.scene.mi_curguide_settings, "deform_type", text='') box.separator() + +# CURVE STRETCH # -------------------------------------------------- - #col = layout.column(align = True) + col = layout.column(align = True) + box = col.box().column(align=True) if mt.display_mira_stretch: - - box = layout.box() row = box.row(align=True) row.prop(mt, "display_mira_stretch", text="", icon='TRIA_DOWN') else: - box = layout.box() row = box.row(align=True) row.prop(mt, "display_mira_stretch", text="", icon='TRIA_RIGHT') @@ -306,30 +302,30 @@ def draw(self, context): sub.prop(context.scene.mi_cur_stretch_settings, "points_number", text='') row.operator("mira.curve_stretch", text="", icon="STYLUS_PRESSURE") - ###space### if mt.display_mira_stretch: - ###space### - col = layout.column(align=True) - box = col.column(align=True).box().column() - col_top = box.column(align=True) + box.separator() + box = col.box().column(align=True) + box.separator() - row = col_top.column(align=True) + row = box.column(align=True) row.operator("mira.curve_stretch", text="CurveStretch", icon="STYLUS_PRESSURE") row.prop(context.scene.mi_cur_stretch_settings, "points_number", text='PointsNumber') box.separator() -# -------------------------------------------------- +# SETTINGS +# -------------------------------------------------- + + col = layout.column(align = True) + box = col.box().column(align=True) if mt.display_mira_settings: - box = layout.box() row = box.row(align=True) row.prop(mt, "display_mira_settings", text="", icon='TRIA_DOWN') else: - box = layout.box() row = box.row(align=True) row.prop(mt, "display_mira_settings", text="", icon='TRIA_RIGHT') @@ -340,25 +336,23 @@ def draw(self, context): sub.prop(context.scene.mi_settings, "snap_objects", text='', icon="HIDE_OFF") row.prop(context.scene.mi_settings, "surface_snap", text='', icon="SNAP_ON") - ###space### if mt.display_mira_settings: - ###space### - col = layout.column(align=True) - box = col.column(align=True).box().column() - col_top = box.column(align=True) + box.separator() + box = col.box().column(align=True) + box.separator() - row = col_top.column() + row = box.column() row.prop(context.scene.mi_settings, "surface_snap", text='Surface Snapping') row.prop(context.scene.mi_settings, "convert_instances", text='Convert Instances') row.prop(context.scene.mi_settings, "snap_points", text='Snap Points') row.prop(context.scene.mi_settings, "snap_objects", text='SnapObjects') - col = layout.column(align=True) - box = col.column(align=True).box().column() - col_top = box.column(align=True) + box.separator() + box = col.box().column(align=True) + box.separator() - row = col_top.column() + row = box.column() row.prop(context.scene.mi_settings, "spread_mode", text='Spread') row.prop(context.scene.mi_settings, "curve_resolution", text='Resolution') @@ -368,6 +362,8 @@ def draw(self, context): box.separator() + + class MI_PT_Object_Panel(bpy.types.Panel): bl_idname = "MI_PT_Object_Panel" bl_label = "Mira Tools" @@ -380,66 +376,70 @@ def draw(self, context): mt = context.window_manager.mirawindow layout = self.layout + #layout = self.layout.column(align=True) + layout.scale_y = 1.1 mi_settings = context.scene.mi_settings - if mt.display_mira_wrap: - box = layout.box() +# WRAP +# -------------------------------------------------- + + col = layout.column(align=True) + box = col.box().column(align=True) + if mt.display_mira_wrap: row = box.row(align=True) row.prop(mt, "display_mira_wrap", text="", icon='TRIA_DOWN') else: - box = layout.box() row = box.row(align=True) row.prop(mt, "display_mira_wrap", text="", icon='TRIA_RIGHT') row.label(text="Wrap") - #sub = row.row(align=True) - #sub.scale_x = 1.7 row.operator("mira.wrap_object", text="", icon ="MOD_LATTICE") row.operator("mira.wrap_scale", text="", icon ="KEYFRAME") row.operator("mira.wrap_master", text="", icon ="MOD_SHRINKWRAP") - - ###space### + if mt.display_mira_wrap: - ###space### - box = layout.box().column(align=True) + box.separator() + box = col.box().column(align=True) + box.separator() + + row = box.column(align=True) + row.operator("mira.wrap_object", text="Wrap Object", icon ="MOD_LATTICE") + row.operator("mira.wrap_scale", text="Wrap Scale", icon ="KEYFRAME") + row.operator("mira.wrap_master", text="Wrap Master", icon ="MOD_SHRINKWRAP") + + box.separator() - col_top = box.column(align=True) - row = col_top.column() - row.operator("mira.wrap_object", text="Wrap Object") - row.operator("mira.wrap_scale", text="Wrap Scale") - row.operator("mira.wrap_master", text="Wrap Master") - # Object Retopology +# OBJECT RETOPOLOGY +# -------------------------------------------------- + + col = layout.column(align=True) + box = col.box().column(align=True) if mt.display_mira_obj_retopology: - - box = layout.box() row = box.row(align=True) row.prop(mt, "display_mira_obj_retopology", text="", icon='TRIA_DOWN') else: - box = layout.box() row = box.row(align=True) row.prop(mt, "display_mira_obj_retopology", text="", icon='TRIA_RIGHT') row.label(text="Retopo") - - #row.operator("mira.wrap_object", text="", icon ="MOD_LATTICE") - #row.operator("mira.wrap_scale", text="", icon ="KEYFRAME") - #row.operator("mira.wrap_master", text="", icon ="MOD_SHRINKWRAP") - - ###space### + row.operator("mira.retopo_loops", text="", icon ="XRAY") + if mt.display_mira_obj_retopology: - ###space### - - box = layout.box().column(align=True) - - col_top = box.column(align=True) - row = col_top.column() - row.operator("mira.retopo_loops", text="Retopo Loops") + box.separator() + box = col.box().column(align=True) + box.separator() + + row = box.column() + row.operator("mira.retopo_loops", text="Retopo Loops", icon ="XRAY") + + box.separator() + # PRIMITIVES MENU