active bone shape

__init__.py

@@ -53,6 +53,7 @@ def register():
     #bpy.types.Scene.bone_widget = bpy.props.PointerProperty(type=BoneWidgetSettings)
     #get_widgets(DefaultFolder, DefaultShapes)
     #get_widgets(CustomFolder, CustomShapes)
+    sys.modules.update({"bone_widget.ctx": context.BW_context()})
     from bone_widget import ctx
 
     for f in ctx.folders:

context.py

@@ -153,12 +153,15 @@ class BW_context:
 
         ob = bpy.context.object
         if ob.type == 'ARMATURE':
-            bones = ob.pose.bones
-            return [b for b in bones if b.bone.select]
-        else:
+            return bpy.context.selected_pose_bones
+            #bones = ob.pose.bones
+            #return [b for b in bones if b.bone.select]
+        elif self.rig:
             widgets = self.selected_widgets
             return [b for b in self.rig.pose.bones if b.custom_shape in widgets]
 
+        return []
+
     @property
     def widget(self):
         if not self.poll():

operators.py

@@ -420,7 +420,7 @@ class BW_OT_create_widget(Operator):
 
     @classmethod
     def poll(cls, context):
-        return ctx.bone and ctx.active_widget
+        return ctx.selected_bones and ctx.active_widget
 
     def execute(self, context):
         folder = ctx.active_folder        
@@ -633,23 +633,33 @@ class BW_OT_add_widget(Operator):
     bl_label = "Add Widget"
     bl_options = {'REGISTER', 'UNDO'}
 
+    replace: BoolProperty(default=False, name='Replace')
+
     @classmethod
     def poll(cls, context):
         return ctx.widget
 
+    def invoke(self, context, event):
+        if event.ctrl:
+            self.replace = True
+        
+        return self.execute(context)
+
     def execute(self, context):
+        folder = ctx.active_folder
         shape = ctx.widget
         bone = ctx.bone
 
-        if bone:
-            name = bone.name
-        else:
-            name = shape.name
+        if self.replace and ctx.active_widget:
+            name = ctx.active_widget.name
+        else: #Find a unique name
+            name = folder.get_widget_display_name(bone.name if bone else shape.name)
 
-        #name = name.split('-', 1)[-1]
-        #name = re.sub('.\d{3}', '', name)
-        folder = ctx.active_folder
-        name = folder.get_widget_clean_name(name)
+            i = 0
+            org_name = name
+            while name in folder.widgets:
+                name = f'{org_name} {i:02d}'
+                i += 1
        
         widget_path = folder.get_widget_path(name)
         icon_path = folder.get_icon_path(name)
@@ -661,6 +671,7 @@ class BW_OT_add_widget(Operator):
         shape_copy = shape.copy()
         shape_copy.data = shape_copy.data.copy()
         
+        if bone:
             shape_copy.matrix_world = get_bone_matrix(bone)
 
             mat = custom_shape_matrix(bone)

properties.py

@@ -70,12 +70,17 @@ def refresh(self, context):
     bpy.ops.bonewidget.refresh_folders()
 
 class BW_PG_folder(PropertyGroup):
-    icons = bpy.utils.previews.new()
+    #icons = bpy.utils.previews.new()
     path: StringProperty(subtype='FILE_PATH', default='Default', update=refresh)
     expand: BoolProperty()
     widgets: CollectionProperty(type=BW_PG_widget)
     widget_index: IntProperty()
 
+    @property
+    def icons(self):
+        prefs = ctx.prefs
+        return prefs.get_folder_previews(self.as_pointer())
+
     @property
     def abspath(self):
         return ctx.abspath(self.path)
@@ -202,6 +207,8 @@ class BW_PG_bone_color(PropertyGroup):
 class BW_prefs(AddonPreferences):
     bl_idname = __package__
 
+    previews = {}
+
     default_folder: PointerProperty(type=BW_PG_folder)
     folders: CollectionProperty(type=BW_PG_folder)
     folder_index: IntProperty()
@@ -225,6 +232,12 @@ class BW_prefs(AddonPreferences):
 
     #use_custom_colors: BoolProperty(name='Custom Colors', default=False, update=set_default_colors)
 
+    def get_folder_previews(self, adress):
+        if adress not in self.previews:
+            self.previews[adress] = bpy.utils.previews.new()
+        
+        return self.previews[adress]
+
     def draw(self, context):
         draw_prefs(self.layout)
 

ui.py

@@ -249,6 +249,14 @@ class BW_PT_main(Panel):
                 edit_row.operator('bonewidget.create_widget', text='Create')
                 edit_row.operator('bonewidget.edit_widget', text='Edit')
         
+        # Draw Active Bone Shape
+        if context.active_pose_bone:
+            widget_col.separator()
+            col = widget_col.column(align=False)
+            col.use_property_split = True
+            col.prop(context.active_pose_bone, 'name', text='Bone Name')
+            col.prop(context.active_pose_bone, 'custom_shape', text='Widget')
+
         if ctx.prefs.use_custom_collection and ctx.rig:
             widget_col.separator()
             row = widget_col.row()