[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [24801] trunk/blender: more ui api changes .
Campbell Barton
ideasman42 at gmail.com
Mon Nov 23 12:43:38 CET 2009
Revision: 24801
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=24801
Author: campbellbarton
Date: 2009-11-23 12:43:38 +0100 (Mon, 23 Nov 2009)
Log Message:
-----------
more ui api changes.
- remove functions such as operator_int(), operator_enum(), operator_string
this mixed with keyword arguments in a way that made them hard to read.
Instead, have operator() always return properties rather then needing an argument.
- rename prop_pointer() --> prop_object(), pointer is more a C thing.
- missed item_enumR(), rename to prop_enum()
Modified Paths:
--------------
trunk/blender/release/scripts/io/export_3ds.py
trunk/blender/release/scripts/io/export_fbx.py
trunk/blender/release/scripts/io/export_mdd.py
trunk/blender/release/scripts/io/export_obj.py
trunk/blender/release/scripts/io/export_ply.py
trunk/blender/release/scripts/io/export_x3d.py
trunk/blender/release/scripts/modules/bpy_types.py
trunk/blender/release/scripts/modules/rna_prop_ui.py
trunk/blender/release/scripts/ui/properties_data_bone.py
trunk/blender/release/scripts/ui/properties_data_mesh.py
trunk/blender/release/scripts/ui/properties_data_modifier.py
trunk/blender/release/scripts/ui/properties_material.py
trunk/blender/release/scripts/ui/properties_object.py
trunk/blender/release/scripts/ui/properties_object_constraint.py
trunk/blender/release/scripts/ui/properties_particle.py
trunk/blender/release/scripts/ui/properties_physics_cloth.py
trunk/blender/release/scripts/ui/properties_physics_common.py
trunk/blender/release/scripts/ui/properties_physics_field.py
trunk/blender/release/scripts/ui/properties_physics_fluid.py
trunk/blender/release/scripts/ui/properties_physics_smoke.py
trunk/blender/release/scripts/ui/properties_physics_softbody.py
trunk/blender/release/scripts/ui/properties_render.py
trunk/blender/release/scripts/ui/properties_texture.py
trunk/blender/release/scripts/ui/space_console.py
trunk/blender/release/scripts/ui/space_image.py
trunk/blender/release/scripts/ui/space_info.py
trunk/blender/release/scripts/ui/space_logic.py
trunk/blender/release/scripts/ui/space_outliner.py
trunk/blender/release/scripts/ui/space_sequencer.py
trunk/blender/release/scripts/ui/space_text.py
trunk/blender/release/scripts/ui/space_time.py
trunk/blender/release/scripts/ui/space_userpref.py
trunk/blender/release/scripts/ui/space_view3d.py
trunk/blender/release/scripts/ui/space_view3d_toolbar.py
trunk/blender/source/blender/editors/object/object_transform.c
trunk/blender/source/blender/makesrna/intern/rna_ui_api.c
Modified: trunk/blender/release/scripts/io/export_3ds.py
===================================================================
--- trunk/blender/release/scripts/io/export_3ds.py 2009-11-23 09:47:56 UTC (rev 24800)
+++ trunk/blender/release/scripts/io/export_3ds.py 2009-11-23 11:43:38 UTC (rev 24801)
@@ -1142,6 +1142,6 @@
def menu_func(self, context):
default_path = bpy.data.filename.replace(".blend", ".3ds")
- self.layout.operator_string(Export3DS.bl_idname, "path", default_path, text="Autodesk 3DS...")
+ self.layout.operator(Export3DS.bl_idname, text="Autodesk 3DS...").path = default_path
menu_item = dynamic_menu.add(bpy.types.INFO_MT_file_export, menu_func)
Modified: trunk/blender/release/scripts/io/export_fbx.py
===================================================================
--- trunk/blender/release/scripts/io/export_fbx.py 2009-11-23 09:47:56 UTC (rev 24800)
+++ trunk/blender/release/scripts/io/export_fbx.py 2009-11-23 11:43:38 UTC (rev 24801)
@@ -3466,7 +3466,7 @@
def menu_func(self, context):
default_path = bpy.data.filename.replace(".blend", ".fbx")
- self.layout.operator_string(ExportFBX.bl_idname, "path", default_path, text="Autodesk FBX...")
+ self.layout.operator(ExportFBX.bl_idname, text="Autodesk FBX...").path = default_path
menu_item = dynamic_menu.add(bpy.types.INFO_MT_file_export, menu_func)
Modified: trunk/blender/release/scripts/io/export_mdd.py
===================================================================
--- trunk/blender/release/scripts/io/export_mdd.py 2009-11-23 09:47:56 UTC (rev 24800)
+++ trunk/blender/release/scripts/io/export_mdd.py 2009-11-23 11:43:38 UTC (rev 24801)
@@ -191,7 +191,7 @@
def menu_func(self, context):
default_path = bpy.data.filename.replace(".blend", ".mdd")
- self.layout.operator_string(ExportMDD.bl_idname, "path", default_path, text="Vertex Keyframe Animation (.mdd)...")
+ self.layout.operator(ExportMDD.bl_idname, text="Vertex Keyframe Animation (.mdd)...").path = default_path
menu_item = dynamic_menu.add(bpy.types.INFO_MT_file_export, menu_func)
Modified: trunk/blender/release/scripts/io/export_obj.py
===================================================================
--- trunk/blender/release/scripts/io/export_obj.py 2009-11-23 09:47:56 UTC (rev 24800)
+++ trunk/blender/release/scripts/io/export_obj.py 2009-11-23 11:43:38 UTC (rev 24801)
@@ -1008,7 +1008,7 @@
def menu_func(self, context):
default_path = bpy.data.filename.replace(".blend", ".obj")
- self.layout.operator_string(ExportOBJ.bl_idname, "path", default_path, text="Wavefront (.obj)...")
+ self.layout.operator(ExportOBJ.bl_idname, text="Wavefront (.obj)...").path = default_path
menu_item = dynamic_menu.add(bpy.types.INFO_MT_file_export, menu_func)
Modified: trunk/blender/release/scripts/io/export_ply.py
===================================================================
--- trunk/blender/release/scripts/io/export_ply.py 2009-11-23 09:47:56 UTC (rev 24800)
+++ trunk/blender/release/scripts/io/export_ply.py 2009-11-23 11:43:38 UTC (rev 24801)
@@ -298,7 +298,7 @@
def menu_func(self, context):
default_path = bpy.data.filename.replace(".blend", ".ply")
- self.layout.operator_string(ExportPLY.bl_idname, "path", default_path, text="Stanford (.ply)...")
+ self.layout.operator(ExportPLY.bl_idname, text="Stanford (.ply)...").path = default_path
menu_item = dynamic_menu.add(bpy.types.INFO_MT_file_export, menu_func)
Modified: trunk/blender/release/scripts/io/export_x3d.py
===================================================================
--- trunk/blender/release/scripts/io/export_x3d.py 2009-11-23 09:47:56 UTC (rev 24800)
+++ trunk/blender/release/scripts/io/export_x3d.py 2009-11-23 11:43:38 UTC (rev 24801)
@@ -1244,7 +1244,7 @@
def menu_func(self, context):
default_path = bpy.data.filename.replace(".blend", ".x3d")
- self.layout.operator_string(ExportX3D.bl_idname, "path", default_path, text="X3D Extensible 3D (.x3d)...")
+ self.layout.operator(ExportX3D.bl_idname, text="X3D Extensible 3D (.x3d)...").path = default_path
menu_item = dynamic_menu.add(bpy.types.INFO_MT_file_export, menu_func)
Modified: trunk/blender/release/scripts/modules/bpy_types.py
===================================================================
--- trunk/blender/release/scripts/modules/bpy_types.py 2009-11-23 09:47:56 UTC (rev 24800)
+++ trunk/blender/release/scripts/modules/bpy_types.py 2009-11-23 11:43:38 UTC (rev 24801)
@@ -145,7 +145,7 @@
if f.startswith("."):
continue
- layout.operator_string(operator, "path", path, text=path_to_name(f))
+ layout.operator(operator, text=path_to_name(f)).path = path
def draw_preset(self, context):
'''Define these on the subclass
Modified: trunk/blender/release/scripts/modules/rna_prop_ui.py
===================================================================
--- trunk/blender/release/scripts/modules/rna_prop_ui.py 2009-11-23 09:47:56 UTC (rev 24800)
+++ trunk/blender/release/scripts/modules/rna_prop_ui.py 2009-11-23 11:43:38 UTC (rev 24801)
@@ -75,7 +75,7 @@
if use_edit:
row = layout.row()
- props = row.operator("wm.properties_add", properties=True, text="Add")
+ props = row.operator("wm.properties_add", text="Add")
props.path = context_member
del row
@@ -112,10 +112,10 @@
if use_edit:
row = split.row(align=True)
- prop = row.operator("wm.properties_edit", properties=True, text="edit")
+ prop = row.operator("wm.properties_edit", text="edit")
assign_props(prop, val_draw, key)
- prop = row.operator("wm.properties_remove", properties=True, text="", icon='ICON_ZOOMOUT')
+ prop = row.operator("wm.properties_remove", text="", icon='ICON_ZOOMOUT')
assign_props(prop, val_draw, key)
Modified: trunk/blender/release/scripts/ui/properties_data_bone.py
===================================================================
--- trunk/blender/release/scripts/ui/properties_data_bone.py 2009-11-23 09:47:56 UTC (rev 24800)
+++ trunk/blender/release/scripts/ui/properties_data_bone.py 2009-11-23 11:43:38 UTC (rev 24801)
@@ -174,7 +174,7 @@
if ob and pchan:
col.label(text="Bone Group:")
- col.prop_pointer(pchan, "bone_group", ob.pose, "bone_groups", text="")
+ col.prop_object(pchan, "bone_group", ob.pose, "bone_groups", text="")
if wide_ui:
col = split.column()
@@ -182,7 +182,7 @@
if context.bone:
col.prop(bone, "parent", text="")
else:
- col.prop_pointer(bone, "parent", arm, "edit_bones", text="")
+ col.prop_object(bone, "parent", arm, "edit_bones", text="")
sub = col.column()
sub.active = (bone.parent is not None)
Modified: trunk/blender/release/scripts/ui/properties_data_mesh.py
===================================================================
--- trunk/blender/release/scripts/ui/properties_data_mesh.py 2009-11-23 09:47:56 UTC (rev 24800)
+++ trunk/blender/release/scripts/ui/properties_data_mesh.py 2009-11-23 11:43:38 UTC (rev 24801)
@@ -177,8 +177,8 @@
col.separator()
sub = col.column(align=True)
- sub.operator_enum("object.shape_key_move", "type", 'UP', icon='ICON_TRIA_UP', text="")
- sub.operator_enum("object.shape_key_move", "type", 'DOWN', icon='ICON_TRIA_DOWN', text="")
+ sub.operator("object.shape_key_move", icon='ICON_TRIA_UP', text="").type = 'UP'
+ sub.operator("object.shape_key_move", icon='ICON_TRIA_DOWN', text="").type = 'DOWN'
split = layout.split(percentage=0.4)
row = split.row()
@@ -233,8 +233,8 @@
col = split.column(align=True)
col.active = enable_edit_value
col.label(text="Blend:")
- col.prop_pointer(kb, "vertex_group", ob, "vertex_groups", text="")
- col.prop_pointer(kb, "relative_key", key, "keys", text="")
+ col.prop_object(kb, "vertex_group", ob, "vertex_groups", text="")
+ col.prop_object(kb, "relative_key", key, "keys", text="")
else:
row = layout.row()
Modified: trunk/blender/release/scripts/ui/properties_data_modifier.py
===================================================================
--- trunk/blender/release/scripts/ui/properties_data_modifier.py 2009-11-23 09:47:56 UTC (rev 24800)
+++ trunk/blender/release/scripts/ui/properties_data_modifier.py 2009-11-23 11:43:38 UTC (rev 24801)
@@ -62,7 +62,7 @@
if wide_ui:
col = split.column()
col.label(text="Vertex Group::")
- col.prop_pointer(md, "vertex_group", ob, "vertex_groups", text="")
+ col.prop_object(md, "vertex_group", ob, "vertex_groups", text="")
sub = col.column()
sub.active = bool(md.vertex_group)
sub.prop(md, "invert")
@@ -201,7 +201,7 @@
col = split.column()
col.label(text="Vertex Group:")
- col.prop_pointer(md, "vertex_group", ob, "vertex_groups", text="")
+ col.prop_object(md, "vertex_group", ob, "vertex_groups", text="")
if wide_ui:
col = split.column()
col.label(text="Control Object:")
@@ -224,7 +224,7 @@
if wide_ui:
col = split.column()
col.label(text="Vertex Group:")
- col.prop_pointer(md, "vertex_group", ob, "vertex_groups", text="")
+ col.prop_object(md, "vertex_group", ob, "vertex_groups", text="")
layout.label(text="Deformation Axis:")
layout.row().prop(md, "deform_axis", expand=True)
@@ -239,7 +239,7 @@
col.label(text="Texture:")
col.prop(md, "texture", text="")
col.label(text="Vertex Group:")
- col.prop_pointer(md, "vertex_group", ob, "vertex_groups", text="")
+ col.prop_object(md, "vertex_group", ob, "vertex_groups", text="")
if wide_ui:
col = split.column()
@@ -250,7 +250,7 @@
if md.texture_coordinates == 'OBJECT':
layout.prop(md, "texture_coordinate_object", text="Object")
elif md.texture_coordinates == 'UV' and ob.type == 'MESH':
- layout.prop_pointer(md, "uv_layer", ob.data, "uv_textures")
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list