[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [25168] trunk/blender: Porting of Graph Editor's UI to python, just header done for now.
Elia Sarti
vekoon at gmail.com
Mon Dec 7 12:50:05 CET 2009
Revision: 25168
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=25168
Author: vekoon
Date: 2009-12-07 12:50:05 +0100 (Mon, 07 Dec 2009)
Log Message:
-----------
Porting of Graph Editor's UI to python, just header done for now.
Brecht, I added a Layout template function, template_dopesheet_filter -> uiTemplateDopeSheetFilter, this creates the group of buttons for filtering ID type (and some other options) for animation editors (Graph, NLA and Dopesheet). I hope this is all right, if not, we can move this maybe to a .py file as a function for reuse.
Modified Paths:
--------------
trunk/blender/source/blender/editors/include/UI_interface.h
trunk/blender/source/blender/editors/interface/interface_templates.c
trunk/blender/source/blender/editors/space_graph/graph_header.c
trunk/blender/source/blender/editors/space_graph/space_graph.c
trunk/blender/source/blender/makesrna/intern/rna_ui_api.c
Added Paths:
-----------
trunk/blender/release/scripts/ui/space_graph.py
Added: trunk/blender/release/scripts/ui/space_graph.py
===================================================================
--- trunk/blender/release/scripts/ui/space_graph.py (rev 0)
+++ trunk/blender/release/scripts/ui/space_graph.py 2009-12-07 11:50:05 UTC (rev 25168)
@@ -0,0 +1,189 @@
+# ##### BEGIN GPL LICENSE BLOCK #####
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software Foundation,
+# Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+#
+# ##### END GPL LICENSE BLOCK #####
+
+# <pep8 compliant>
+import bpy
+
+
+class GRAPH_HT_header(bpy.types.Header):
+ bl_space_type = 'GRAPH_EDITOR'
+
+ def draw(self, context):
+ layout = self.layout
+
+ st = context.space_data
+
+ row = layout.row(align=True)
+ row.template_header()
+
+ 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")
+
+ layout.prop(st, "mode", text="")
+
+ layout.template_dopesheet_filter(st.dopesheet)
+
+ 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)
+ # 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')
+
+
+class GRAPH_MT_view(bpy.types.Menu):
+ bl_label = "View"
+
+ def draw(self, context):
+ layout = self.layout
+
+ st = context.space_data
+
+ layout.column()
+
+ layout.separator()
+ layout.operator("graph.properties")
+
+ 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()
+ 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("screen.area_dupli")
+ layout.operator("screen.screen_full_area")
+
+class GRAPH_MT_select(bpy.types.Menu):
+ bl_label = "Select"
+
+ 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.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.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"
+
+ 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.separator()
+ layout.operator("anim.channels_editable_toggle")
+
+ layout.separator()
+ layout.operator("anim.channels_expand")
+ layout.operator("anim.channels_collapse")
+
+class GRAPH_MT_key(bpy.types.Menu):
+ bl_label = "Key"
+
+ def draw(self, context):
+ layout = self.layout
+
+ 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.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_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.copy")
+ layout.operator("graph.paste")
+
+class GRAPH_MT_key_transform(bpy.types.Menu):
+ bl_label = "Transform"
+
+ 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")
+
+
+bpy.types.register(GRAPH_HT_header) # header/menu classes
+bpy.types.register(GRAPH_MT_view)
+bpy.types.register(GRAPH_MT_select)
+bpy.types.register(GRAPH_MT_channel)
+bpy.types.register(GRAPH_MT_key)
+bpy.types.register(GRAPH_MT_key_transform)
+
Modified: trunk/blender/source/blender/editors/include/UI_interface.h
===================================================================
--- trunk/blender/source/blender/editors/include/UI_interface.h 2009-12-07 11:02:59 UTC (rev 25167)
+++ trunk/blender/source/blender/editors/include/UI_interface.h 2009-12-07 11:50:05 UTC (rev 25168)
@@ -636,6 +636,7 @@
/* templates */
void uiTemplateHeader(uiLayout *layout, struct bContext *C, int menus);
+void uiTemplateDopeSheetFilter(uiLayout *layout, struct bContext *C, struct PointerRNA *ptr);
void uiTemplateID(uiLayout *layout, struct bContext *C, struct PointerRNA *ptr, char *propname,
char *newop, char *openop, char *unlinkop);
void uiTemplateAnyID(uiLayout *layout, struct bContext *C, struct PointerRNA *ptr, char *propname,
Modified: trunk/blender/source/blender/editors/interface/interface_templates.c
===================================================================
--- trunk/blender/source/blender/editors/interface/interface_templates.c 2009-12-07 11:02:59 UTC (rev 25167)
+++ trunk/blender/source/blender/editors/interface/interface_templates.c 2009-12-07 11:50:05 UTC (rev 25168)
@@ -60,12 +60,58 @@
void uiTemplateHeader(uiLayout *layout, bContext *C, int menus)
{
uiBlock *block;
-
+
block= uiLayoutAbsoluteBlock(layout);
if(menus) ED_area_header_standardbuttons(C, block, 0);
else ED_area_header_switchbutton(C, block, 0);
}
+/********************** DopeSheet Filter Template *************************/
+
+void uiTemplateDopeSheetFilter(uiLayout *layout, bContext *C, PointerRNA *ptr)
+{
+ Main *mainptr= CTX_data_main(C);
+ ScrArea *sa= CTX_wm_area(C);
+ uiLayout *row= layout;
+ short nlaActive= ((sa) && (sa->spacetype==SPACE_NLA));
+
+ /* more 'generic' filtering options */
+ if (nlaActive)
+ row= uiLayoutRow(layout, 1);
+
+ uiItemR(row, "", 0, ptr, "only_selected", 0);
+
+ if (nlaActive)
+ uiItemR(row, "", 0, ptr, "include_missing_nla", 0);
+
+ if (nlaActive)
+ row= layout;
+
+ /* datatype based - only available datatypes are shown */
+ row= uiLayoutRow(layout, 1);
+
+ uiItemR(row, "", 0, ptr, "display_scene", 0);
+ uiItemR(row, "", 0, ptr, "display_world", 0);
+ uiItemR(row, "", 0, ptr, "display_node", 0);
+
+ if (mainptr && mainptr->key.first)
+ uiItemR(row, "", 0, ptr, "display_shapekeys", 0);
+ if (mainptr && mainptr->mat.first)
+ uiItemR(row, "", 0, ptr, "display_material", 0);
+ if (mainptr && mainptr->lamp.first)
+ uiItemR(row, "", 0, ptr, "display_lamp", 0);
+ if (mainptr && mainptr->camera.first)
+ uiItemR(row, "", 0, ptr, "display_camera", 0);
+ if (mainptr && mainptr->curve.first)
+ uiItemR(row, "", 0, ptr, "display_curve", 0);
+ if (mainptr && mainptr->mball.first)
+ uiItemR(row, "", 0, ptr, "display_metaball", 0);
+ if (mainptr && mainptr->armature.first)
+ uiItemR(row, "", 0, ptr, "display_armature", 0);
+ if (mainptr && mainptr->particle.first)
+ uiItemR(row, "", 0, ptr, "display_particle", 0);
+}
+
/********************** Search Callbacks *************************/
typedef struct TemplateID {
Modified: trunk/blender/source/blender/editors/space_graph/graph_header.c
===================================================================
--- trunk/blender/source/blender/editors/space_graph/graph_header.c 2009-12-07 11:02:59 UTC (rev 25167)
+++ trunk/blender/source/blender/editors/space_graph/graph_header.c 2009-12-07 11:50:05 UTC (rev 25168)
@@ -63,249 +63,11 @@
#include "graph_intern.h"
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list