rot_mode, ui: ui and classes rearrangement

Author: eigen-value

__init__.py

@@ -319,8 +319,8 @@ def update_mode(self, context):
                                                      default="")
 
     IDStore.rigify_transfer_only_selected = bpy.props.BoolProperty(name="Transfer Only Selected", description="Transfer selected bones only", default=True)
-    IDStore.rigify_transfer_start_frame = bpy.props.IntProperty(name="Transfer Start Frame", description="First Frame to Transfer", default=0, min= 0)
-    IDStore.rigify_transfer_end_frame = bpy.props.IntProperty(name="Transfer End Frame", description="Last Frame to Transfer", default=0, min= 0)
+    IDStore.rigify_transfer_start_frame = bpy.props.IntProperty(name="Start Frame", description="First Frame to Transfer", default=0, min= 0)
+    IDStore.rigify_transfer_end_frame = bpy.props.IntProperty(name="End Frame", description="Last Frame to Transfer", default=0, min= 0)
 
     if (ui and 'legacy' in str(ui)) or bpy.context.user_preferences.addons['rigify'].preferences.legacy_mode:
         # update legacy on restart or reload

rot_mode.py

@@ -256,50 +256,29 @@ def draw(self, context):
 
         col = layout.column(align=True)
         row = col.row(align=True)
+        id_store = context.window_manager
 
         layout.prop(scn, 'order_list')
 
-        col = layout.column(align=True)
-        row = col.row(align=True)
+        if id_store.rigify_convert_only_selected:
+            icon = 'OUTLINER_DATA_ARMATURE'
+        else:
+            icon = 'ARMATURE_DATA'
 
-        col.label(text="Current Action:")
-        col.operator('current.selected')
-        col.operator('current.every')
+        layout.prop(id_store, 'rigify_convert_only_selected', toggle=True, icon=icon)
 
-        row = col.row(align=True)
         col = layout.column(align=True)
+        row = col.row(align=True)
 
-        col.label(text="All Actions:")
-        col.operator('all.selected')
-        col.operator('all.every')
-
-
-class CONVERT_OT_current_action_selected_bones(bpy.types.Operator):
-    bl_label = 'Selected Bones'
-    bl_idname = 'current.selected'
-    bl_description = 'Converts selected bones in current Action'
-    bl_options = {'REGISTER', 'UNDO'}
-
-    # on mouse up:
-    def invoke(self, context, event):
-        self.execute(context)
-        return {'FINISHED'}
-
-    def execute(op, context):
-        obj = bpy.context.active_object
-        pose_bones = bpy.context.selected_pose_bones
-        action = obj.animation_data.action
-        order = order_list[bpy.context.scene['order_list']]
-
-        convert.one_act_sel_bon(obj, action, pose_bones, order)
-
-        return {'FINISHED'}
+        row.operator('rigify_quat2eu.current', icon='ACTION')
+        row = col.row(align=True)
+        row.operator('rigify_quat2eu.all', icon='NLA')
 
 
-class CONVERT_OT_current_action_every_bones(bpy.types.Operator):
-    bl_label = 'All Bones'
-    bl_idname = 'current.every'
-    bl_description = 'Converts every bone in current Action'
+class CONVERT_OT_quat2eu_current_action(bpy.types.Operator):
+    bl_label = 'Convert Current Action'
+    bl_idname = 'rigify_quat2eu.current'
+    bl_description = 'Converts bones in current Action'
     bl_options = {'REGISTER', 'UNDO'}
 
     # on mouse up:
@@ -312,16 +291,20 @@ def execute(op, context):
         pose_bones = bpy.context.selected_pose_bones
         action = obj.animation_data.action
         order = order_list[bpy.context.scene['order_list']]
+        id_store = context.window_manager
 
-        convert.one_act_every_bon(obj, action, order)
+        if id_store.rigify_convert_only_selected:
+            convert.one_act_sel_bon(obj, action, pose_bones, order)
+        else:
+            convert.one_act_every_bon(obj, action, order)
 
         return {'FINISHED'}
 
 
-class CONVERT_OT_all_actions_selected_bones(bpy.types.Operator):
-    bl_label = 'Selected Bone'
-    bl_idname = 'all.selected'
-    bl_description = 'Converts selected bones in every Action'
+class CONVERT_OT_quat2eu_all_actions(bpy.types.Operator):
+    bl_label = 'Convert All Actions'
+    bl_idname = 'rigify_quat2eu.all'
+    bl_description = 'Converts bones in every Action'
     bl_options = {'REGISTER', 'UNDO'}
 
     # on mouse up:
@@ -333,32 +316,19 @@ def execute(op, context):
         obj = bpy.context.active_object
         pose_bones = bpy.context.selected_pose_bones
         order = order_list[bpy.context.scene['order_list']]
+        id_store = context.window_manager
 
-        convert.all_act_sel_bon(obj, pose_bones, order)
-
-        return {'FINISHED'}
-
-
-class CONVERT_OT_all_action_every_bones(bpy.types.Operator):
-    bl_label = 'All Bone'
-    bl_idname = 'all.every'
-    bl_description = 'Converts every bone in every Action'
-    bl_options = {'REGISTER', 'UNDO'}
-
-    # on mouse up:
-    def invoke(self, context, event):
-        self.execute(context)
-        return {'FINISHED'}
-
-    def execute(op, context):
-        obj = bpy.context.active_object
-        order = order_list[bpy.context.scene['order_list']]
+        if id_store.rigify_convert_only_selected:
+            convert.all_act_sel_bon(obj, pose_bones, order)
+        else:
+            convert.all_act_every_bon(obj, order)
 
-        convert.all_act_every_bon(obj, order)
         return {'FINISHED'}
 
 
 def register():
+    IDStore = bpy.types.WindowManager
+
     items = [('QUATERNION', 'QUATERNION', 'QUATERNION'),
              ('XYZ', 'XYZ', 'XYZ'),
              ('XZY', 'XZY', 'XZY'),
@@ -367,21 +337,23 @@ def register():
              ('ZXY', 'ZXY', 'ZXY'),
              ('ZYX', 'ZYX', 'ZYX')]
 
-    bpy.types.Scene.order_list = bpy.props.EnumProperty(items=items, name='Order',
+    bpy.types.Scene.order_list = bpy.props.EnumProperty(items=items, name='Convert to',
                                                         description="The target rotation mode", default='QUATERNION')
 
-    bpy.utils.register_class(ToolsPanel)
-    bpy.utils.register_class(CONVERT_OT_all_action_every_bones)
-    bpy.utils.register_class(CONVERT_OT_all_actions_selected_bones)
-    bpy.utils.register_class(CONVERT_OT_current_action_every_bones)
-    bpy.utils.register_class(CONVERT_OT_current_action_selected_bones)
+    IDStore.rigify_convert_only_selected = bpy.props.BoolProperty(
+        name="Convert Only Selected", description="Convert selected bones only", default=True)
 
+    bpy.utils.register_class(ToolsPanel)
+    bpy.utils.register_class(CONVERT_OT_quat2eu_current_action)
+    bpy.utils.register_class(CONVERT_OT_quat2eu_all_actions)
 
 def unregister():
+    IDStore = bpy.types.WindowManager
+
     bpy.utils.unregister_class(ToolsPanel)
-    bpy.utils.unregister_class(CONVERT_OT_all_action_every_bones)
-    bpy.utils.unregister_class(CONVERT_OT_all_actions_selected_bones)
-    bpy.utils.unregister_class(CONVERT_OT_current_action_every_bones)
-    bpy.utils.unregister_class(CONVERT_OT_current_action_selected_bones)
+    bpy.utils.unregister_class(CONVERT_OT_quat2eu_current_action)
+    bpy.utils.unregister_class(CONVERT_OT_quat2eu_all_actions)
+
+    del IDStore.rigify_convert_only_selected
 
 # bpy.utils.register_module(__name__)

ui.py

@@ -640,7 +640,13 @@ def draw(self, context):
         id_store = context.window_manager
         if obj is not None:
             row = self.layout.row()
-            row.prop(id_store, 'rigify_transfer_only_selected')
+
+            if id_store.rigify_transfer_only_selected:
+                icon = 'OUTLINER_DATA_ARMATURE'
+            else:
+                icon = 'ARMATURE_DATA'
+
+            row.prop(id_store, 'rigify_transfer_only_selected', toggle=True, icon=icon)
 
             row = self.layout.row(align=True)
             row.operator("rigify.ik2fk", text='IK2FK Pose', icon='SNAP_ON')
@@ -655,11 +661,11 @@ def draw(self, context):
             row.operator("rigify.clear_animation", text="Clear FK Action", icon='CANCEL').type = "FK"
 
             row = self.layout.row(align=True)
-            op = row.operator("rigify.rotation_pole", icon='SCRIPTWIN', text='Switch to pole')
+            op = row.operator("rigify.rotation_pole", icon='FORCE_HARMONIC', text='Switch to pole')
             op.value = True
             op.toggle = False
             op.bake = True
-            op = row.operator("rigify.rotation_pole", icon='SCRIPTWIN', text='Switch to rotation')
+            op = row.operator("rigify.rotation_pole", icon='FORCE_MAGNETIC', text='Switch to rotation')
             op.value = False
             op.toggle = False
             op.bake = True