[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [25198] trunk/blender: Animation Editors: Fixes for RNA/Python Bastardisation
Joshua Leung
aligorith at gmail.com
Tue Dec 8 07:32:31 CET 2009
Revision: 25198
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=25198
Author: aligorith
Date: 2009-12-08 07:32:30 +0100 (Tue, 08 Dec 2009)
Log Message:
-----------
Animation Editors: Fixes for RNA/Python Bastardisation
Still not happy about the tight/regular-spacing imposed by the layout engine automation, but will tweak later.
Modified Paths:
--------------
trunk/blender/release/scripts/ui/space_dopesheet.py
trunk/blender/release/scripts/ui/space_graph.py
trunk/blender/release/scripts/ui/space_nla.py
trunk/blender/source/blender/makesrna/intern/rna_action.c
trunk/blender/source/blender/makesrna/intern/rna_scene.c
trunk/blender/source/blender/makesrna/intern/rna_space.c
Modified: trunk/blender/release/scripts/ui/space_dopesheet.py
===================================================================
--- trunk/blender/release/scripts/ui/space_dopesheet.py 2009-12-08 01:56:01 UTC (rev 25197)
+++ trunk/blender/release/scripts/ui/space_dopesheet.py 2009-12-08 06:32:30 UTC (rev 25198)
@@ -16,172 +16,171 @@
#
# ##### END GPL LICENSE BLOCK #####
-# <pep8 compliant>
import bpy
class DOPESHEET_HT_header(bpy.types.Header):
- bl_space_type = 'DOPESHEET_EDITOR'
+ bl_space_type = 'DOPESHEET_EDITOR'
- def draw(self, context):
- layout = self.layout
+ def draw(self, context):
+ layout = self.layout
- st = context.space_data
+ st = context.space_data
- row = layout.row(align=True)
- row.template_header()
+ row = layout.row(align=True)
+ row.template_header()
- if context.area.show_menus:
- sub = row.row(align=True)
+ if context.area.show_menus:
+ sub = row.row(align=True)
- sub.menu("DOPESHEET_MT_view")
- sub.menu("DOPESHEET_MT_select")
+ sub.menu("DOPESHEET_MT_view")
+ sub.menu("DOPESHEET_MT_select")
- if st.mode == 'DOPESHEET' or (st.mode == 'ACTION' and st.action != None):
- sub.menu("DOPESHEET_MT_channel")
- elif st.mode == 'GPENCIL':
- # gpencil Channel menu
- pass
+ if st.mode == 'DOPESHEET' or (st.mode == 'ACTION' and st.action != None):
+ sub.menu("DOPESHEET_MT_channel")
+ elif st.mode == 'GPENCIL':
+ # gpencil Channel menu
+ pass
- if st.mode != 'GPENCIL':
- sub.menu("DOPESHEET_MT_key")
+ if st.mode != 'GPENCIL':
+ sub.menu("DOPESHEET_MT_key")
- layout.prop(st, "mode", text="")
- layout.prop(st.dopesheet, "display_summary", text="Summary")
+ layout.prop(st, "mode", text="")
+ layout.prop(st.dopesheet, "display_summary", text="Summary")
- if st.mode == 'DOPESHEET':
- layout.template_dopesheet_filter(st.dopesheet)
- elif st.mode == 'ACTION':
- layout.template_ID(st, "action", "action.new")
+ if st.mode == 'DOPESHEET':
+ layout.template_dopesheet_filter(st.dopesheet)
+ elif st.mode == 'ACTION':
+ layout.template_ID(st, "action", new="action.new")
- if st.mode != 'GPENCIL':
- layout.prop(st, "autosnap", text="")
+ if st.mode != 'GPENCIL':
+ layout.prop(st, "autosnap", text="")
- row = layout.row(align=True)
- row.operator("action.copy", text="", icon='ICON_COPYDOWN')
- row.operator("action.paste", text="", icon='ICON_PASTEDOWN')
+ row = layout.row(align=True)
+ row.operator("action.copy", text="", icon='ICON_COPYDOWN')
+ row.operator("action.paste", text="", icon='ICON_PASTEDOWN')
class DOPESHEET_MT_view(bpy.types.Menu):
- bl_label = "View"
+ bl_label = "View"
- def draw(self, context):
- layout = self.layout
+ def draw(self, context):
+ layout = self.layout
- st = context.space_data
+ st = context.space_data
- layout.column()
+ layout.column()
- layout.prop(st, "show_cframe_indicator")
- layout.prop(st, "show_sliders")
- layout.prop(st, "automerge_keyframes")
+ layout.prop(st, "show_cframe_indicator")
+ layout.prop(st, "show_sliders")
+ layout.prop(st, "automerge_keyframes")
- if st.show_seconds:
- layout.operator("anim.time_toggle", text="Show Frames")
- else:
- layout.operator("anim.time_toggle", text="Show Seconds")
+ if st.show_seconds:
+ layout.operator("anim.time_toggle", text="Show Frames")
+ else:
+ layout.operator("anim.time_toggle", text="Show Seconds")
- layout.separator()
- layout.operator("anim.previewrange_set")
- layout.operator("anim.previewrange_clear")
- layout.operator("action.previewrange_set")
+ layout.separator()
+ layout.operator("anim.previewrange_set")
+ layout.operator("anim.previewrange_clear")
+ layout.operator("action.previewrange_set")
- layout.separator()
- layout.operator("action.frame_jump")
- layout.operator("action.view_all")
+ layout.separator()
+ layout.operator("action.frame_jump")
+ layout.operator("action.view_all")
- layout.separator()
- layout.operator("screen.area_dupli")
- layout.operator("screen.screen_full_area")
+ layout.separator()
+ layout.operator("screen.area_dupli")
+ layout.operator("screen.screen_full_area")
class DOPESHEET_MT_select(bpy.types.Menu):
- bl_label = "Select"
+ bl_label = "Select"
- def draw(self, context):
- layout = self.layout
+ def draw(self, context):
+ layout = self.layout
- layout.column()
- # This is a bit misleading as the operator's default text is "Select All" while it actually *toggles* All/None
- layout.operator("action.select_all_toggle")
- layout.operator("action.select_all_toggle", text="Invert Selection").invert = True
+ layout.column()
+ # This is a bit misleading as the operator's default text is "Select All" while it actually *toggles* All/None
+ layout.operator("action.select_all_toggle")
+ layout.operator("action.select_all_toggle", text="Invert Selection").invert = True
- layout.separator()
- layout.operator("action.select_border")
- layout.operator("action.select_border", text="Border Axis Range").axis_range = True
+ layout.separator()
+ layout.operator("action.select_border")
+ layout.operator("action.select_border", text="Border Axis Range").axis_range = True
- layout.separator()
- layout.operator("action.select_column", text="Columns on Selected Keys").mode = 'KEYS'
- layout.operator("action.select_column", text="Column on Current Frame").mode = 'CFRA'
+ layout.separator()
+ layout.operator("action.select_column", text="Columns on Selected Keys").mode = 'KEYS'
+ layout.operator("action.select_column", text="Column on Current Frame").mode = 'CFRA'
- layout.operator("action.select_column", text="Columns on Selected Markers").mode = 'MARKERS_COLUMN'
- layout.operator("action.select_column", text="Between Selected Markers").mode = 'MARKERS_BETWEEN'
+ layout.operator("action.select_column", text="Columns on Selected Markers").mode = 'MARKERS_COLUMN'
+ layout.operator("action.select_column", text="Between Selected Markers").mode = 'MARKERS_BETWEEN'
class DOPESHEET_MT_channel(bpy.types.Menu):
- bl_label = "Channel"
+ bl_label = "Channel"
- def draw(self, context):
- layout = self.layout
+ def draw(self, context):
+ layout = self.layout
- layout.column()
- layout.operator("anim.channels_setting_toggle")
- layout.operator("anim.channels_setting_enable")
- layout.operator("anim.channels_setting_disable")
+ layout.column()
+ layout.operator("anim.channels_setting_toggle")
+ layout.operator("anim.channels_setting_enable")
+ layout.operator("anim.channels_setting_disable")
- layout.separator()
- layout.operator("anim.channels_editable_toggle")
+ layout.separator()
+ layout.operator("anim.channels_editable_toggle")
- layout.separator()
- layout.operator("anim.channels_expand")
- layout.operator("anim.channels_collapse")
+ layout.separator()
+ layout.operator("anim.channels_expand")
+ layout.operator("anim.channels_collapse")
class DOPESHEET_MT_key(bpy.types.Menu):
- bl_label = "Key"
+ bl_label = "Key"
- def draw(self, context):
- layout = self.layout
+ def draw(self, context):
+ layout = self.layout
- layout.column()
- layout.menu("DOPESHEET_MT_key_transform", text="Transform")
+ layout.column()
+ layout.menu("DOPESHEET_MT_key_transform", text="Transform")
- layout.operator_menu_enum("action.snap", property="type", text="Snap")
- layout.operator_menu_enum("action.mirror", property="type", text="Mirror")
+ layout.operator_menu_enum("action.snap", property="type", text="Snap")
+ layout.operator_menu_enum("action.mirror", property="type", text="Mirror")
- layout.separator()
- # Inconsistent naming? act/action
- layout.operator("act.keyframe_insert")
+ layout.separator()
+ # Inconsistent naming? act/action
+ layout.operator("act.keyframe_insert")
- layout.separator()
- layout.operator("action.duplicate")
- layout.operator("action.delete")
+ layout.separator()
+ layout.operator("action.duplicate")
+ layout.operator("action.delete")
- layout.separator()
- layout.operator_menu_enum("action.keyframe_type", property="type", text="Keyframe Type")
- layout.operator_menu_enum("action.handle_type", property="type", text="Handle Type")
- layout.operator_menu_enum("action.interpolation_type", property="type", text="Interpolation Mode")
- layout.operator_menu_enum("action.extrapolation_type", property="type", text="Extrapolation Mode")
+ layout.separator()
+ layout.operator_menu_enum("action.keyframe_type", property="type", text="Keyframe Type")
+ layout.operator_menu_enum("action.handle_type", property="type", text="Handle Type")
+ layout.operator_menu_enum("action.interpolation_type", property="type", text="Interpolation Mode")
+ layout.operator_menu_enum("action.extrapolation_type", property="type", text="Extrapolation Mode")
- layout.separator()
- layout.operator("action.clean")
- layout.operator("action.sample")
+ layout.separator()
+ layout.operator("action.clean")
+ layout.operator("action.sample")
- layout.separator()
- layout.operator("action.copy")
- layout.operator("action.paste")
+ layout.separator()
+ layout.operator("action.copy")
+ layout.operator("action.paste")
class DOPESHEET_MT_key_transform(bpy.types.Menu):
- bl_label = "Transform"
+ bl_label = "Transform"
- def draw(self, context):
- layout = self.layout
+ def draw(self, context):
+ layout = self.layout
- layout.column()
- layout.operator("tfm.translate", text="Grab/Move")
- layout.operator("tfm.transform", text="Extend").mode = 'TIME_EXTEND'
- layout.operator("tfm.resize", text="Scale")
+ layout.column()
+ layout.operator("tfm.translate", text="Grab/Move")
+ layout.operator("tfm.transform", text="Extend").mode = 'TIME_EXTEND'
+ layout.operator("tfm.resize", text="Scale")
bpy.types.register(DOPESHEET_HT_header) # header/menu classes
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list