Animation Editors: Fixes for RNA/Python Bastardisation
authorJoshua Leung <aligorith@gmail.com>
Tue, 8 Dec 2009 06:32:30 +0000 (06:32 +0000)
committerJoshua Leung <aligorith@gmail.com>
Tue, 8 Dec 2009 06:32:30 +0000 (06:32 +0000)
Still not happy about the tight/regular-spacing imposed by the layout engine automation, but will tweak later.

release/scripts/ui/space_dopesheet.py
release/scripts/ui/space_graph.py
release/scripts/ui/space_nla.py
source/blender/makesrna/intern/rna_action.c
source/blender/makesrna/intern/rna_scene.c
source/blender/makesrna/intern/rna_space.c

index 520d8283ae9e12b7e00437c4e8f681bc05c7a668..db01134604e8ece1d6967efc688ed4c844d2906d 100644 (file)
 #
 # ##### 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
index 0a7ae02df29e1153ea9d6273f71a8fd1f2c5bc01..b9f5364da3aa2655c9e47287d30a3a0161d73d06 100644 (file)
 #
 # ##### END GPL LICENSE BLOCK #####
 
-# <pep8 compliant>
 import bpy
 
 
 class GRAPH_HT_header(bpy.types.Header):
-    bl_space_type = 'GRAPH_EDITOR'
+       bl_space_type = 'GRAPH_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("GRAPH_MT_view")
-            sub.menu("GRAPH_MT_select")
-            sub.menu("GRAPH_MT_channel")
-            sub.menu("GRAPH_MT_key")
+                       sub.menu("GRAPH_MT_view")
+                       sub.menu("GRAPH_MT_select")
+                       sub.menu("GRAPH_MT_channel")
+                       sub.menu("GRAPH_MT_key")
 
-        layout.prop(st, "mode", text="")
+               layout.prop(st, "mode", text="")
 
-        layout.template_dopesheet_filter(st.dopesheet)
+               layout.template_dopesheet_filter(st.dopesheet)
 
-        layout.prop(st, "autosnap", text="")
-        layout.prop(st, "pivot_point", text="", icon_only=True)
+               layout.prop(st, "autosnap", text="")
+               layout.prop(st, "pivot_point", text="", icon_only=True)
 
-        row = layout.row(align=True)
-        row.operator("graph.copy", text="", icon='ICON_COPYDOWN')
-        row.operator("graph.paste", text="", icon='ICON_PASTEDOWN')
+               row = layout.row(align=True)
+               row.operator("graph.copy", text="", icon='ICON_COPYDOWN')
+               row.operator("graph.paste", text="", icon='ICON_PASTEDOWN')
 
-        row = layout.row(align=True)
-        # these likely need new icons
-        row.operator("graph.ghost_curves_create", text="", icon='ICON_GHOST_ENABLED')
-        row.operator("graph.ghost_curves_clear", text="", icon='ICON_GHOST_DISABLED')
+               row = layout.row(align=True)
+               if st.has_ghost_curves:
+                       row.operator("graph.ghost_curves_clear", text="", icon='ICON_GHOST_DISABLED')
+               else:
+                       row.operator("graph.ghost_curves_create", text="", icon='ICON_GHOST_ENABLED')
 
 
 class GRAPH_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.separator()
-        layout.operator("graph.properties", icon="ICON_MENU_PANEL")
+               layout.separator()
+               layout.operator("graph.properties", icon="ICON_MENU_PANEL")
 
-        layout.prop(st, "show_cframe_indicator")
-        layout.prop(st, "show_cursor")
-        layout.prop(st, "show_sliders")
-        layout.prop(st, "automerge_keyframes")
+               layout.prop(st, "show_cframe_indicator")
+               layout.prop(st, "show_cursor")
+               layout.prop(st, "show_sliders")
+               layout.prop(st, "automerge_keyframes")
 
-        layout.separator()
-        layout.operator("graph.handles_view_toggle")
-        layout.prop(st, "only_selected_curves_handles")
-        layout.prop(st, "only_selected_keyframe_handles")
-        layout.operator("anim.time_toggle")
+               layout.separator()
+               if st.show_handles:
+                       layout.operator("graph.handles_view_toggle", icon="ICON_CHECKBOX_HLT", text="Show All Handles")
+               else:
+                       layout.operator("graph.handles_view_toggle", icon="ICON_CHECKBOX_DEHLT", text="Show All Handles")
+               layout.prop(st, "only_selected_curves_handles")
+               layout.prop(st, "only_selected_keyframe_handles")
+               layout.operator("anim.time_toggle")
 
-        layout.separator()
-        layout.operator("anim.previewrange_set")
-        layout.operator("anim.previewrange_clear")
-        layout.operator("graph.previewrange_set")
+               layout.separator()
+               layout.operator("anim.previewrange_set")
+               layout.operator("anim.previewrange_clear")
+               layout.operator("graph.previewrange_set")
 
-        layout.separator()
-        layout.operator("graph.frame_jump")
-        layout.operator("graph.view_all")
+               layout.separator()
+               layout.operator("graph.frame_jump")
+               layout.operator("graph.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 GRAPH_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("graph.select_all_toggle")
-        layout.operator("graph.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("graph.select_all_toggle")
+               layout.operator("graph.select_all_toggle", text="Invert Selection").invert = True
 
-        layout.separator()
-        layout.operator("graph.select_border")
-        layout.operator("graph.select_border", text="Border Axis Range").axis_range = True
+               layout.separator()
+               layout.operator("graph.select_border")
+               layout.operator("graph.select_border", text="Border Axis Range").axis_range = True
 
-        layout.separator()
-        layout.operator("graph.select_column", text="Columns on Selected Keys").mode = 'KEYS'
-        layout.operator("graph.select_column", text="Column on Current Frame").mode = 'CFRA'
+               layout.separator()
+               layout.operator("graph.select_column", text="Columns on Selected Keys").mode = 'KEYS'
+               layout.operator("graph.select_column", text="Column on Current Frame").mode = 'CFRA'
 
-        layout.operator("graph.select_column", text="Columns on Selected Markers").mode = 'MARKERS_COLUMN'
-        layout.operator("graph.select_column", text="Between Selected Markers").mode = 'MARKERS_BETWEEN'
+               layout.operator("graph.select_column", text="Columns on Selected Markers").mode = 'MARKERS_COLUMN'
+               layout.operator("graph.select_column", text="Between Selected Markers").mode = 'MARKERS_BETWEEN'
 
 
 class GRAPH_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 GRAPH_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("GRAPH_MT_key_transform", text="Transform")
+               layout.column()
+               layout.menu("GRAPH_MT_key_transform", text="Transform")
 
-        layout.operator_menu_enum("graph.snap", property="type", text="Snap")
-        layout.operator_menu_enum("graph.mirror", property="type", text="Mirror")
+               layout.operator_menu_enum("graph.snap", property="type", text="Snap")
+               layout.operator_menu_enum("graph.mirror", property="type", text="Mirror")
 
-        layout.separator()
-        layout.operator("graph.keyframe_insert")
-        layout.operator("graph.fmodifier_add")
+               layout.separator()
+               layout.operator("graph.keyframe_insert")
+               layout.operator("graph.fmodifier_add")
 
-        layout.separator()
-        layout.operator("graph.duplicate")
-        layout.operator("graph.delete")
+               layout.separator()
+               layout.operator("graph.duplicate")
+               layout.operator("graph.delete")
 
-        layout.separator()
-        layout.operator_menu_enum("graph.handle_type", property="type", text="Handle Type")
-        layout.operator_menu_enum("graph.interpolation_type", property="type", text="Interpolation Mode")
-        layout.operator_menu_enum("graph.extrapolation_type", property="type", text="Extrapolation Mode")
+               layout.separator()
+               layout.operator_menu_enum("graph.handle_type", property="type", text="Handle Type")
+               layout.operator_menu_enum("graph.interpolation_type", property="type", text="Interpolation Mode")
+               layout.operator_menu_enum("graph.extrapolation_type", property="type", text="Extrapolation Mode")
 
-        layout.separator()
-        layout.operator("graph.clean")
-        layout.operator("graph.sample")
-        layout.operator("graph.bake")
+               layout.separator()
+               layout.operator("graph.clean")
+               layout.operator("graph.sample")
+               layout.operator("graph.bake")
 
-        layout.separator()
-        layout.operator("graph.copy")
-        layout.operator("graph.paste")
+               layout.separator()
+               layout.operator("graph.copy")
+               layout.operator("graph.paste")
 
 
 class GRAPH_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.rotate", text="Rotate")
-        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.rotate", text="Rotate")
+               layout.operator("tfm.resize", text="Scale")
 
 
 bpy.types.register(GRAPH_HT_header) # header/menu classes
index afd5e424b2dba82bbd6da7f48e2d95342757b084..bdcb6883ab346d7bd64d471b31e471a0427101e7 100644 (file)
 #
 # ##### END GPL LICENSE BLOCK #####
 
-# <pep8 compliant>
 import bpy
 
 
 class NLA_HT_header(bpy.types.Header):
-    bl_space_type = 'NLA_EDITOR'
+       bl_space_type = 'NLA_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("NLA_MT_view")
-            sub.menu("NLA_MT_select")
-            sub.menu("NLA_MT_edit")
-            sub.menu("NLA_MT_add")
+                       sub.menu("NLA_MT_view")
+                       sub.menu("NLA_MT_select")
+                       sub.menu("NLA_MT_edit")
+                       sub.menu("NLA_MT_add")
 
-        layout.template_dopesheet_filter(st.dopesheet)
+               layout.template_dopesheet_filter(st.dopesheet)
 
-        layout.prop(st, "autosnap", text="")
+               layout.prop(st, "autosnap", text="")
 
 
 class NLA_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.operator("nla.properties", icon="ICON_MENU_PANEL")
+               layout.operator("nla.properties", icon="ICON_MENU_PANEL")
 
-        layout.separator()
-        layout.prop(st, "show_cframe_indicator")
+               layout.separator()
+               layout.prop(st, "show_cframe_indicator")
 
-        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.prop(st, "show_strip_curves")
+               layout.prop(st, "show_strip_curves")
 
-        layout.separator()
-        layout.operator("anim.previewrange_set")
-        layout.operator("anim.previewrange_clear")
+               layout.separator()
+               layout.operator("anim.previewrange_set")
+               layout.operator("anim.previewrange_clear")
 
-        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 NLA_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("nla.select_all_toggle")
-        layout.operator("nla.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("nla.select_all_toggle")
+               layout.operator("nla.select_all_toggle", text="Invert Selection").invert = True
 
-        layout.separator()
-        layout.operator("nla.select_border")
-        layout.operator("nla.select_border", text="Border Axis Range").axis_range = True
+               layout.separator()
+               layout.operator("nla.select_border")
+               layout.operator("nla.select_border", text="Border Axis Range").axis_range = True
 
 
 class NLA_MT_edit(bpy.types.Menu):
-    bl_label = "Edit"
+       bl_label = "Edit"
 
-    def draw(self, context):
-        layout = self.layout
+       def draw(self, context):
+               layout = self.layout
+               
+               scene = context.scene
 
-        layout.column()
-        layout.menu("NLA_MT_edit_transform", text="Transform")
+               layout.column()
+               layout.menu("NLA_MT_edit_transform", text="Transform")
 
-        layout.operator_menu_enum("nla.snap", property="type", text="Snap")
+               layout.operator_menu_enum("nla.snap", property="type", text="Snap")
 
-        layout.separator()
-        layout.operator("nla.duplicate")
-        layout.operator("nla.split")
-        layout.operator("nla.delete")
+               layout.separator()
+               layout.operator("nla.duplicate")
+               layout.operator("nla.split")
+               layout.operator("nla.delete")
 
-        layout.separator()
-        layout.operator("nla.mute_toggle")
+               layout.separator()
+               layout.operator("nla.mute_toggle")
 
-        layout.separator()
-        layout.operator("nla.apply_scale")
-        layout.operator("nla.clear_scale")
+               layout.separator()
+               layout.operator("nla.apply_scale")
+               layout.operator("nla.clear_scale")
 
-        layout.separator()
-        layout.operator("nla.move_up")
-        layout.operator("nla.move_down")
+               layout.separator()
+               layout.operator("nla.move_up")
+               layout.operator("nla.move_down")
 
-        """
-        XXX not sure if we need this check and so scene.flag wrapped?
-    // TODO: names of these tools for 'tweakmode' need changing?
-    if (scene->flag & SCE_NLA_EDIT_ON)
-        uiItemO(layout, "Stop Tweaking Strip Actions", 0, "NLA_OT_tweakmode_exit");
-    else
-        uiItemO(layout, "Start Tweaking Strip Actions", 0, "NLA_OT_tweakmode_enter");
-        """
-        layout.separator()
-        layout.operator("nla.tweakmode_exit")
-        layout.operator("nla.tweakmode_enter")
+               layout.separator()
+               # TODO: names of these tools for 'tweakmode' need changing?
+               if scene.nla_tweakmode_on:
+                       layout.operator("nla.tweakmode_exit", text="Stop Tweaking Strip Actions")
+               else:
+                       layout.operator("nla.tweakmode_enter", text="Start Tweaking Strip Actions")
 
 
 class NLA_MT_add(bpy.types.Menu):
-    bl_label = "Add"
+       bl_label = "Add"
 
-    def draw(self, context):
-        layout = self.layout
+       def draw(self, context):
+               layout = self.layout
 
-        layout.column()
-        layout.operator("nla.actionclip_add")
-        layout.operator("nla.transition_add")
+               layout.column()
+               layout.operator("nla.actionclip_add")
+               layout.operator("nla.transition_add")
 
-        layout.separator()
-        layout.operator("nla.meta_add")
-        layout.operator("nla.meta_remove")
+               layout.separator()
+               layout.operator("nla.meta_add")
+               layout.operator("nla.meta_remove")
 
-        layout.separator()
-        layout.operator("nla.tracks_add")
-        layout.operator("nla.tracks_add", text="Add Tracks Above Selected").above_selected = True
+               layout.separator()
+               layout.operator("nla.tracks_add")
+               layout.operator("nla.tracks_add", text="Add Tracks Above Selected").above_selected = True
 
 
 class NLA_MT_edit_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(NLA_HT_header) # header/menu classes
index 3708d810ccaabb79745403c21bbf04bba0d0771d..0568652488dbf585385c326f27ba4a10fcb90519 100644 (file)
@@ -144,13 +144,13 @@ static void rna_def_dopesheet(BlenderRNA *brna)
 
        prop= RNA_def_property(srna, "include_missing_nla", PROP_BOOLEAN, PROP_NONE);
        RNA_def_property_boolean_negative_sdna(prop, NULL, "filterflag", ADS_FILTER_NLA_NOACT);
-       RNA_def_property_ui_text(prop, "Include Missing NLA", "Include Animation Data blocks with no NLA Data.");
+       RNA_def_property_ui_text(prop, "Include Missing NLA", "Include Animation Data blocks with no NLA data. (NLA Editor only)");
        RNA_def_property_ui_icon(prop, ICON_ACTION, 0);
        RNA_def_property_update(prop, NC_ANIMATION|ND_ANIMCHAN_EDIT, NULL);
 
        prop= RNA_def_property(srna, "collapse_summary", PROP_BOOLEAN, PROP_NONE);
        RNA_def_property_boolean_sdna(prop, NULL, "flag", ADS_FLAG_SUMMARY_COLLAPSED);
-       RNA_def_property_ui_text(prop, "Collapse Summary", "Collapse summary when shown, so all other channels get hidden.");
+       RNA_def_property_ui_text(prop, "Collapse Summary", "Collapse summary when shown, so all other channels get hidden. (DopeSheet Window Editors Only)");
        RNA_def_property_update(prop, NC_ANIMATION|ND_ANIMCHAN_EDIT, NULL);
 }
 
index 458fdbf2ea9a8be1acc069629765a179947e815d..5000dd90b1d8853a730541009f436a9bc93b956b 100644 (file)
@@ -2453,6 +2453,14 @@ void RNA_def_scene(BlenderRNA *brna)
        /* Animation Data (for Scene) */
        rna_def_animdata_common(srna);
        
+       /* Readonly Properties */
+       prop= RNA_def_property(srna, "nla_tweakmode_on", PROP_BOOLEAN, PROP_NONE);
+       RNA_def_property_boolean_sdna(prop, NULL, "flag", SCE_NLA_EDIT_ON);
+       RNA_def_property_clear_flag(prop, PROP_EDITABLE); /* DO NOT MAKE THIS EDITABLE, OR NLA EDITOR BREAKS */
+       RNA_def_property_ui_text(prop, "NLA TweakMode", "Indicates whether there is any action referenced by NLA being edited. Strictly read-only.");
+       RNA_def_property_update(prop, NC_SPACE|ND_SPACE_GRAPH, NULL);
+       
+       
        /* Nodes (Compositing) */
        prop= RNA_def_property(srna, "nodetree", PROP_POINTER, PROP_NONE);
        RNA_def_property_ui_text(prop, "Node Tree", "Compositing node tree.");
index 4a55d259be9f0156fb92eb88a3fdeeac8e929424..cc44a1b6c1477c13a3622a7e15fcb56940cefb1b 100644 (file)
@@ -84,10 +84,10 @@ static EnumPropertyItem transform_orientation_items[] = {
        {0, NULL, 0, NULL, NULL}};
 
 static EnumPropertyItem autosnap_items[] = {
-       {SACTSNAP_OFF, "NONE", 0, "None", ""},
-       {SACTSNAP_STEP, "STEP", 0, "Step", "Snap to 1.0 frame/second intervals."},
-       {SACTSNAP_FRAME, "FRAME", 0, "Frame", "Snap to actual frames/seconds (nla-action time)."},
-       {SACTSNAP_MARKER, "MARKER", 0, "Marker", "Snap to nearest marker."},
+       {SACTSNAP_OFF, "NONE", 0, "No Auto-Snap", ""},
+       {SACTSNAP_STEP, "STEP", 0, "Time Step", "Snap to 1.0 frame/second intervals."},
+       {SACTSNAP_FRAME, "FRAME", 0, "Nearest Frame", "Snap to actual frames/seconds (nla-action time)."},
+       {SACTSNAP_MARKER, "MARKER", 0, "Nearest Marker", "Snap to nearest marker."},
        {0, NULL, 0, NULL, NULL}};
 
 #ifdef RNA_RUNTIME
@@ -464,6 +464,12 @@ static void rna_SpaceDopeSheetEditor_action_update(bContext *C, PointerRNA *ptr)
        }
 }
 
+static int rna_SpaceGraphEditor_has_ghost_curves_get(PointerRNA *ptr)
+{
+       SpaceIpo *sipo= (SpaceIpo*)(ptr->data);
+       return (sipo->ghostCurves.first != NULL);
+}
+
 #else
 
 static void rna_def_space(BlenderRNA *brna)
@@ -1290,7 +1296,7 @@ static void rna_def_space_graph(BlenderRNA *brna)
        PropertyRNA *prop;
        
        static EnumPropertyItem mode_items[] = {
-               {SIPO_MODE_ANIMATION, "FCURVES", 0, "F-Curves", ""},
+               {SIPO_MODE_ANIMATION, "FCURVES", 0, "F-Curve Editor", ""},
                {SIPO_MODE_DRIVERS, "DRIVERS", 0, "Drivers", ""},
                {0, NULL, 0, NULL, NULL}};
                
@@ -1382,6 +1388,13 @@ static void rna_def_space_graph(BlenderRNA *brna)
        RNA_def_property_enum_items(prop, autosnap_items);
        RNA_def_property_ui_text(prop, "Auto Snap", "Automatic time snapping settings for transformations.");
        RNA_def_property_update(prop, NC_SPACE|ND_SPACE_GRAPH, NULL);
+       
+       /* readonly state info */
+       prop= RNA_def_property(srna, "has_ghost_curves", PROP_BOOLEAN, PROP_NONE);
+       RNA_def_property_boolean_sdna(prop, NULL, "flag", 0); /* XXX: hack to make this compile, since this property doesn't actually exist*/
+       RNA_def_property_boolean_funcs(prop, "rna_SpaceGraphEditor_has_ghost_curves_get", NULL);
+       RNA_def_property_ui_text(prop, "Has Ghost Curves", "Graph Editor instance has some ghost curves stored.");
+       RNA_def_property_update(prop, NC_SPACE|ND_SPACE_GRAPH, NULL);
 }
 
 static void rna_def_space_nla(BlenderRNA *brna)