rna UI api rename...
authorCampbell Barton <ideasman42@gmail.com>
Mon, 23 Nov 2009 00:27:30 +0000 (00:27 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Mon, 23 Nov 2009 00:27:30 +0000 (00:27 +0000)
note: this aims to follow pep8 however I chose to use 'prop/props' rather then 'property/properties' because it would make function names too long.

itemR() --> prop()
items_enumR() --> props_enum()
item_menu_enumR() --> prop_menu_enum()
item_pointerR() --> prop_pointer()
itemO() --> operator()
item_enumO() --> operator_enum()
items_enumO() --> operator_enums()
item_menu_enumO() --> operator_menu_enum()
item_booleanO() --> operator_boolean()
item_intO() --> operator_int()
item_floatO() --> operator_float()
item_stringO() --> operator_string()
itemL() --> label()
itemM() --> menu()
itemS() --> separator()

batch script used http://www.pasteall.org/9345

57 files changed:
release/scripts/io/engine_render_pov.py
release/scripts/io/export_3ds.py
release/scripts/io/export_fbx.py
release/scripts/io/export_mdd.py
release/scripts/io/export_obj.py
release/scripts/io/export_ply.py
release/scripts/io/export_x3d.py
release/scripts/io/import_anim_bvh.py
release/scripts/io/import_scene_3ds.py
release/scripts/io/import_scene_obj.py
release/scripts/io/netrender/ui.py
release/scripts/modules/bpy_types.py
release/scripts/modules/rna_prop_ui.py
release/scripts/op/add_mesh_torus.py
release/scripts/op/mesh_skin.py
release/scripts/op/uvcalc_smart_project.py
release/scripts/templates/operator.py
release/scripts/ui/properties_data_armature.py
release/scripts/ui/properties_data_bone.py
release/scripts/ui/properties_data_camera.py
release/scripts/ui/properties_data_curve.py
release/scripts/ui/properties_data_empty.py
release/scripts/ui/properties_data_lamp.py
release/scripts/ui/properties_data_lattice.py
release/scripts/ui/properties_data_mesh.py
release/scripts/ui/properties_data_metaball.py
release/scripts/ui/properties_data_modifier.py
release/scripts/ui/properties_game.py
release/scripts/ui/properties_material.py
release/scripts/ui/properties_object.py
release/scripts/ui/properties_object_constraint.py
release/scripts/ui/properties_particle.py
release/scripts/ui/properties_physics_cloth.py
release/scripts/ui/properties_physics_common.py
release/scripts/ui/properties_physics_field.py
release/scripts/ui/properties_physics_fluid.py
release/scripts/ui/properties_physics_smoke.py
release/scripts/ui/properties_physics_softbody.py
release/scripts/ui/properties_render.py
release/scripts/ui/properties_scene.py
release/scripts/ui/properties_texture.py
release/scripts/ui/properties_world.py
release/scripts/ui/space_buttons.py
release/scripts/ui/space_console.py
release/scripts/ui/space_filebrowser.py
release/scripts/ui/space_image.py
release/scripts/ui/space_info.py
release/scripts/ui/space_logic.py
release/scripts/ui/space_node.py
release/scripts/ui/space_outliner.py
release/scripts/ui/space_sequencer.py
release/scripts/ui/space_text.py
release/scripts/ui/space_time.py
release/scripts/ui/space_userpref.py
release/scripts/ui/space_view3d.py
release/scripts/ui/space_view3d_toolbar.py
source/blender/makesrna/intern/rna_ui_api.c

index 014cf56f6a7f04b0e35d29d92f83bea132abe17a..ddca6eb43dc21003008571e9f5c8affb9ad1695b 100644 (file)
@@ -884,7 +884,7 @@ class RENDER_PT_povray_radiosity(RenderButtonsPanel):
        def draw_header(self, context):
                scene = context.scene
 
-               self.layout.itemR(scene, "pov_radio_enable", text="")
+               self.layout.prop(scene, "pov_radio_enable", text="")
 
        def draw(self, context):
                layout = self.layout
@@ -897,34 +897,34 @@ class RENDER_PT_povray_radiosity(RenderButtonsPanel):
                split = layout.split()
                
                col = split.column()
-               col.itemR(scene, "pov_radio_count", text="Rays")
-               col.itemR(scene, "pov_radio_recursion_limit", text="Recursions")
+               col.prop(scene, "pov_radio_count", text="Rays")
+               col.prop(scene, "pov_radio_recursion_limit", text="Recursions")
                col = split.column()
-               col.itemR(scene, "pov_radio_error_bound", text="Error")
+               col.prop(scene, "pov_radio_error_bound", text="Error")
                
-               layout.itemR(scene, "pov_radio_display_advanced")
+               layout.prop(scene, "pov_radio_display_advanced")
                
                if scene.pov_radio_display_advanced:
                        split = layout.split()
                
                        col = split.column()
-                       col.itemR(scene, "pov_radio_adc_bailout", slider=True)
-                       col.itemR(scene, "pov_radio_gray_threshold", slider=True)
-                       col.itemR(scene, "pov_radio_low_error_factor", slider=True)
+                       col.prop(scene, "pov_radio_adc_bailout", slider=True)
+                       col.prop(scene, "pov_radio_gray_threshold", slider=True)
+                       col.prop(scene, "pov_radio_low_error_factor", slider=True)
 
                        col = split.column()
-                       col.itemR(scene, "pov_radio_brightness")
-                       col.itemR(scene, "pov_radio_minimum_reuse", text="Min Reuse")
-                       col.itemR(scene, "pov_radio_nearest_count")
+                       col.prop(scene, "pov_radio_brightness")
+                       col.prop(scene, "pov_radio_minimum_reuse", text="Min Reuse")
+                       col.prop(scene, "pov_radio_nearest_count")
 
                        split = layout.split()
                
                        col = split.column()
-                       col.itemL(text="Estimation Influence:")
-                       col.itemR(scene, "pov_radio_media")
-                       col.itemR(scene, "pov_radio_normal")
+                       col.label(text="Estimation Influence:")
+                       col.prop(scene, "pov_radio_media")
+                       col.prop(scene, "pov_radio_normal")
                        
                        col = split.column()
-                       col.itemR(scene, "pov_radio_always_sample")
+                       col.prop(scene, "pov_radio_always_sample")
 
 bpy.types.register(RENDER_PT_povray_radiosity)
index 0d5827f6f18e2130a9d7aeecfbe7142735e3d501..386870051ffa9f76e6531b03c3bcf3b4b6ffa3c7 100644 (file)
@@ -1142,6 +1142,6 @@ import dynamic_menu
 
 def menu_func(self, context):
     default_path = bpy.data.filename.replace(".blend", ".3ds")
-    self.layout.item_stringO(Export3DS.bl_idname, "path", default_path, text="Autodesk 3DS...")
+    self.layout.operator_string(Export3DS.bl_idname, "path", default_path, text="Autodesk 3DS...")
 
 menu_item = dynamic_menu.add(bpy.types.INFO_MT_file_export, menu_func)
index b266d74fb57d8f47b9abaffa2b509b8a7d70b880..4f03d66af020abae34c79667a6ac8c53b77017c0 100644 (file)
@@ -3466,7 +3466,7 @@ import dynamic_menu
 
 def menu_func(self, context):
     default_path = bpy.data.filename.replace(".blend", ".fbx")
-    self.layout.item_stringO(ExportFBX.bl_idname, "path", default_path, text="Autodesk FBX...")
+    self.layout.operator_string(ExportFBX.bl_idname, "path", default_path, text="Autodesk FBX...")
 
 menu_item = dynamic_menu.add(bpy.types.INFO_MT_file_export, menu_func)
 
index 7d08b4f9d7a157ed14e9e1e70d608bfc2ae38d94..3c7c1192c77a11185b90f0aad8181448db2bb1ac 100644 (file)
@@ -191,7 +191,7 @@ import dynamic_menu
 
 def menu_func(self, context):
     default_path = bpy.data.filename.replace(".blend", ".mdd")
-    self.layout.item_stringO(ExportMDD.bl_idname, "path", default_path, text="Vertex Keyframe Animation (.mdd)...")
+    self.layout.operator_string(ExportMDD.bl_idname, "path", default_path, text="Vertex Keyframe Animation (.mdd)...")
 
 menu_item = dynamic_menu.add(bpy.types.INFO_MT_file_export, menu_func)
 
index feeb7cb1f34c4420667e21b7d2b39b460755fe95..b55e3844ec8ea85b8dd0ec8c2f0d52574c74058a 100644 (file)
@@ -1008,7 +1008,7 @@ import dynamic_menu
 
 def menu_func(self, context):
     default_path = bpy.data.filename.replace(".blend", ".obj")
-    self.layout.item_stringO(ExportOBJ.bl_idname, "path", default_path, text="Wavefront (.obj)...")
+    self.layout.operator_string(ExportOBJ.bl_idname, "path", default_path, text="Wavefront (.obj)...")
 
 menu_item = dynamic_menu.add(bpy.types.INFO_MT_file_export, menu_func)
 
index e97ca2155f03a3f3264fd600d366211347a72ea8..f057c027df97dc027e9127bfa4d17341d03c18a1 100644 (file)
@@ -298,7 +298,7 @@ import dynamic_menu
 
 def menu_func(self, context):
     default_path = bpy.data.filename.replace(".blend", ".ply")
-    self.layout.item_stringO(ExportPLY.bl_idname, "path", default_path, text="Stanford (.ply)...")
+    self.layout.operator_string(ExportPLY.bl_idname, "path", default_path, text="Stanford (.ply)...")
 
 menu_item = dynamic_menu.add(bpy.types.INFO_MT_file_export, menu_func)
 
index 1fb4393020869f1b0309e83fb10034ad74f6c6bd..5af063fdf1a9b17c24d965d7170edf38e83212a8 100644 (file)
@@ -1244,7 +1244,7 @@ import dynamic_menu
 
 def menu_func(self, context):
     default_path = bpy.data.filename.replace(".blend", ".x3d")
-    self.layout.item_stringO(ExportX3D.bl_idname, "path", default_path, text="X3D Extensible 3D (.x3d)...")
+    self.layout.operator_string(ExportX3D.bl_idname, "path", default_path, text="X3D Extensible 3D (.x3d)...")
 
 menu_item = dynamic_menu.add(bpy.types.INFO_MT_file_export, menu_func)
 
index 364a16b00ea7ddf5125bed7b699e7982153b1ed4..65f397f681a956cf9696ae0f99d9f4ee0d0e6296 100644 (file)
@@ -877,5 +877,5 @@ bpy.ops.add(BvhImporter)
 
 
 import dynamic_menu
-menu_func = lambda self, context: self.layout.itemO(BvhImporter.bl_idname, text="Motion Capture (.bvh)...")
+menu_func = lambda self, context: self.layout.operator(BvhImporter.bl_idname, text="Motion Capture (.bvh)...")
 menu_item = dynamic_menu.add(bpy.types.INFO_MT_file_import, menu_func)
index dd8c24398ae42d688127b0f50e5795ce7f573890..57b93d3c683bde965b6b6c629653e33830dbf5d9 100644 (file)
@@ -1167,7 +1167,7 @@ class IMPORT_OT_autodesk_3ds(bpy.types.Operator):
 bpy.ops.add(IMPORT_OT_autodesk_3ds)
 
 import dynamic_menu
-menu_func = lambda self, context: self.layout.itemO(IMPORT_OT_autodesk_3ds.bl_idname, text="3D Studio (.3ds)...")
+menu_func = lambda self, context: self.layout.operator(IMPORT_OT_autodesk_3ds.bl_idname, text="3D Studio (.3ds)...")
 menu_item = dynamic_menu.add(bpy.types.INFO_MT_file_import, menu_func)
 
 # NOTES:
index 2bce99ffb3e5a818709bb210c5c064f15d3babb1..0ef0083b44d928e51fadb86e0d26bcdd99156169 100644 (file)
@@ -1626,7 +1626,7 @@ bpy.ops.add(IMPORT_OT_obj)
 
 
 import dynamic_menu
-menu_func = lambda self, context: self.layout.itemO(IMPORT_OT_obj.bl_idname, text="Wavefront (.obj)...")
+menu_func = lambda self, context: self.layout.operator(IMPORT_OT_obj.bl_idname, text="Wavefront (.obj)...")
 menu_item = dynamic_menu.add(bpy.types.INFO_MT_file_import, menu_func)
 
 
index e0273618900e548ecb35b3aa16f4f6fec5c3ca8f..081d9952871cc860e66ec9648e1fffc35f8c7815 100644 (file)
@@ -63,15 +63,15 @@ class RENDER_PT_network_settings(RenderButtonsPanel):
                split = layout.split()
                
                col = split.column()
-               col.itemR(scene.network_render, "mode")
-               col.itemR(scene.network_render, "path")
-               col.itemR(scene.network_render, "server_address")
-               col.itemR(scene.network_render, "server_port")
+               col.prop(scene.network_render, "mode")
+               col.prop(scene.network_render, "path")
+               col.prop(scene.network_render, "server_address")
+               col.prop(scene.network_render, "server_port")
                
                if scene.network_render.mode == "RENDER_MASTER":
-                       col.itemR(scene.network_render, "server_broadcast")
+                       col.prop(scene.network_render, "server_broadcast")
                else:
-                       col.itemO("render.netclientscan", icon="ICON_FILE_REFRESH", text="")
+                       col.operator("render.netclientscan", icon="ICON_FILE_REFRESH", text="")
 
 @rnaType
 class RENDER_PT_network_job(RenderButtonsPanel):
@@ -93,13 +93,13 @@ class RENDER_PT_network_job(RenderButtonsPanel):
                split = layout.split()
                
                col = split.column()
-               col.itemO("render.netclientanim", icon='ICON_RENDER_ANIMATION')
-               col.itemO("render.netclientsend", icon="ICON_FILE_BLEND")
-               col.itemO("render.netclientweb", icon="ICON_QUESTION")
-               col.itemR(scene.network_render, "job_name")
+               col.operator("render.netclientanim", icon='ICON_RENDER_ANIMATION')
+               col.operator("render.netclientsend", icon="ICON_FILE_BLEND")
+               col.operator("render.netclientweb", icon="ICON_QUESTION")
+               col.prop(scene.network_render, "job_name")
                row = col.row()
-               row.itemR(scene.network_render, "priority")
-               row.itemR(scene.network_render, "chunks")
+               row.prop(scene.network_render, "priority")
+               row.prop(scene.network_render, "chunks")
 
 @rnaType
 class RENDER_PT_network_slaves(RenderButtonsPanel):
@@ -120,22 +120,22 @@ class RENDER_PT_network_slaves(RenderButtonsPanel):
                row.template_list(netsettings, "slaves", netsettings, "active_slave_index", rows=2)
 
                sub = row.column(align=True)
-               sub.itemO("render.netclientslaves", icon="ICON_FILE_REFRESH", text="")
-               sub.itemO("render.netclientblacklistslave", icon="ICON_ZOOMOUT", text="")
+               sub.operator("render.netclientslaves", icon="ICON_FILE_REFRESH", text="")
+               sub.operator("render.netclientblacklistslave", icon="ICON_ZOOMOUT", text="")
                
                if len(netrender.slaves) == 0 and len(netsettings.slaves) > 0:
                        while(len(netsettings.slaves) > 0):
                                netsettings.slaves.remove(0)
                
                if netsettings.active_slave_index >= 0 and len(netsettings.slaves) > 0:
-                       layout.itemS()
+                       layout.separator()
                        
                        slave = netrender.slaves[netsettings.active_slave_index]
 
-                       layout.itemL(text="Name: " + slave.name)
-                       layout.itemL(text="Address: " + slave.address[0])
-                       layout.itemL(text="Seen: " + time.ctime(slave.last_seen))
-                       layout.itemL(text="Stats: " + slave.stats)
+                       layout.label(text="Name: " + slave.name)
+                       layout.label(text="Address: " + slave.address[0])
+                       layout.label(text="Seen: " + time.ctime(slave.last_seen))
+                       layout.label(text="Stats: " + slave.stats)
 
 @rnaType
 class RENDER_PT_network_slaves_blacklist(RenderButtonsPanel):
@@ -156,21 +156,21 @@ class RENDER_PT_network_slaves_blacklist(RenderButtonsPanel):
                row.template_list(netsettings, "slaves_blacklist", netsettings, "active_blacklisted_slave_index", rows=2)
 
                sub = row.column(align=True)
-               sub.itemO("render.netclientwhitelistslave", icon="ICON_ZOOMOUT", text="")
+               sub.operator("render.netclientwhitelistslave", icon="ICON_ZOOMOUT", text="")
 
                if len(netrender.blacklist) == 0 and len(netsettings.slaves_blacklist) > 0:
                        while(len(netsettings.slaves_blacklist) > 0):
                                netsettings.slaves_blacklist.remove(0)
                
                if netsettings.active_blacklisted_slave_index >= 0 and len(netsettings.slaves_blacklist) > 0:
-                       layout.itemS()
+                       layout.separator()
                        
                        slave = netrender.blacklist[netsettings.active_blacklisted_slave_index]
 
-                       layout.itemL(text="Name: " + slave.name)
-                       layout.itemL(text="Address: " + slave.address[0])
-                       layout.itemL(text="Seen: " + time.ctime(slave.last_seen))
-                       layout.itemL(text="Stats: " + slave.stats)
+                       layout.label(text="Name: " + slave.name)
+                       layout.label(text="Address: " + slave.address[0])
+                       layout.label(text="Seen: " + time.ctime(slave.last_seen))
+                       layout.label(text="Stats: " + slave.stats)
 
 @rnaType
 class RENDER_PT_network_jobs(RenderButtonsPanel):
@@ -191,24 +191,24 @@ class RENDER_PT_network_jobs(RenderButtonsPanel):
                row.template_list(netsettings, "jobs", netsettings, "active_job_index", rows=2)
 
                sub = row.column(align=True)
-               sub.itemO("render.netclientstatus", icon="ICON_FILE_REFRESH", text="")
-               sub.itemO("render.netclientcancel", icon="ICON_ZOOMOUT", text="")
-               sub.itemO("render.netclientcancelall", icon="ICON_PANEL_CLOSE", text="")
-               sub.itemO("render.netclientdownload", icon='ICON_RENDER_ANIMATION', text="")
+               sub.operator("render.netclientstatus", icon="ICON_FILE_REFRESH", text="")
+               sub.operator("render.netclientcancel", icon="ICON_ZOOMOUT", text="")
+               sub.operator("render.netclientcancelall", icon="ICON_PANEL_CLOSE", text="")
+               sub.operator("render.netclientdownload", icon='ICON_RENDER_ANIMATION', text="")
 
                if len(netrender.jobs) == 0 and len(netsettings.jobs) > 0:
                        while(len(netsettings.jobs) > 0):
                                netsettings.jobs.remove(0)
                
                if netsettings.active_job_index >= 0 and len(netsettings.jobs) > 0:
-                       layout.itemS()
+                       layout.separator()
                        
                        job = netrender.jobs[netsettings.active_job_index]
 
-                       layout.itemL(text="Name: %s" % job.name)
-                       layout.itemL(text="Length: %04i" % len(job))
-                       layout.itemL(text="Done: %04i" % job.results[DONE])
-                       layout.itemL(text="Error: %04i" % job.results[ERROR])
+                       layout.label(text="Name: %s" % job.name)
+                       layout.label(text="Length: %04i" % len(job))
+                       layout.label(text="Done: %04i" % job.results[DONE])
+                       layout.label(text="Error: %04i" % job.results[ERROR])
 
 @rnaType
 class NetRenderSettings(bpy.types.IDPropertyGroup):
index 8e05b9bb8bd47e6f97deb6ba0b382a03944a7dc4..4966cb4bcfa25cf7978df653a0e8095d43188a10 100644 (file)
@@ -145,7 +145,7 @@ class Menu(StructRNA):
             if f.startswith("."):
                 continue
 
-            layout.item_stringO(operator, "path", path, text=path_to_name(f))
+            layout.operator_string(operator, "path", path, text=path_to_name(f))
     
     def draw_preset(self, context):
         '''Define these on the subclass
index badd37db83e938d2e846e09285e3b2708cb17963..78eb21533e1b5c90547fa181523dc7ed63c9034d 100644 (file)
@@ -75,7 +75,7 @@ def draw(layout, context, context_member, use_edit = True):
 
     if use_edit:
         row = layout.row()
-        props = row.itemO("wm.properties_add", properties=True, text="Add")
+        props = row.operator("wm.properties_add", properties=True, text="Add")
         props.path = context_member
         del row
 
@@ -102,20 +102,20 @@ def draw(layout, context, context_member, use_edit = True):
         else:
             row = box.row()
 
-        row.itemL(text=key)
+        row.label(text=key)
 
         # explicit exception for arrays
         if convert_to_pyobject and not hasattr(val_orig, "len"):
-            row.itemL(text=val_draw)
+            row.label(text=val_draw)
         else:
-            row.itemR(rna_item, '["%s"]' % key, text="")
+            row.prop(rna_item, '["%s"]' % key, text="")
 
         if use_edit:
             row = split.row(align=True)
-            prop = row.itemO("wm.properties_edit", properties=True, text="edit")
+            prop = row.operator("wm.properties_edit", properties=True, text="edit")
             assign_props(prop, val_draw, key)
 
-            prop = row.itemO("wm.properties_remove", properties=True, text="", icon='ICON_ZOOMOUT')
+            prop = row.operator("wm.properties_remove", properties=True, text="", icon='ICON_ZOOMOUT')
             assign_props(prop, val_draw, key)
 
 
index 33866de18bb781f65eceb403638c32551421fe9e..fe8feecf43d3df4782284ee1cf872422f676cea7 100644 (file)
@@ -130,7 +130,7 @@ bpy.ops.add(AddTorus)
 # Add to a menu
 import dynamic_menu
 
-menu_func = (lambda self, context: self.layout.itemO(AddTorus.bl_idname,
+menu_func = (lambda self, context: self.layout.operator(AddTorus.bl_idname,
                                         text="Torus", icon='ICON_MESH_DONUT'))
 
 menu_item = dynamic_menu.add(bpy.types.INFO_MT_mesh_add, menu_func)
index 9416ee24e14f6b38c5d3bdc40c4be991a0a0534d..63b5a44e901ea652a50cc829f9ba384ff0678939 100644 (file)
@@ -650,7 +650,7 @@ bpy.ops.add(MESH_OT_skin)
 
 # Add to a menu
 import dynamic_menu
-menu_item = dynamic_menu.add(bpy.types.VIEW3D_MT_edit_mesh_faces, (lambda self, context: self.layout.itemO("mesh.skin", text="Bridge Faces")) )
+menu_item = dynamic_menu.add(bpy.types.VIEW3D_MT_edit_mesh_faces, (lambda self, context: self.layout.operator("mesh.skin", text="Bridge Faces")) )
 
 if __name__ == "__main__":
        bpy.ops.mesh.skin()
index 23357bd15728fe9fa9cf0c95d021144c494e250a..cc8aa5fe63a5533b2d9e2636eb2c5adb1fb62987 100644 (file)
@@ -1136,7 +1136,7 @@ bpy.ops.add(SmartProject)
 # Add to a menu
 import dynamic_menu
 
-menu_func = (lambda self, context: self.layout.itemO(SmartProject.bl_idname,
+menu_func = (lambda self, context: self.layout.operator(SmartProject.bl_idname,
                                                                                text="Smart Project"))
 
 menu_item = dynamic_menu.add(bpy.types.VIEW3D_MT_uv_map, menu_func)
index dc46b66c96fde3a00d113051f21c3c35fbb60b14..5e8a2f33cb7d719d2d2b17952262051553834668 100644 (file)
@@ -51,7 +51,7 @@ bpy.ops.add(ExportSomeData)
 
 # Only needed if you want to add into a dynamic menu
 import dynamic_menu
-menu_func = lambda self, context: self.layout.itemO("export.some_data", text="Example Exporter...")
+menu_func = lambda self, context: self.layout.operator("export.some_data", text="Example Exporter...")
 menu_item = dynamic_menu.add(bpy.types.INFO_MT_file_export, menu_func)
 
 # Use for running this script directly
index b0d2873fb8f67c3014d20954a47b7ca0edbd06be..1024ddc7836bc551c39b3cf4f49b5e98befd195e 100644 (file)
@@ -47,10 +47,10 @@ class DATA_PT_context_arm(DataButtonsPanel):
             split = layout.split(percentage=0.65)
             if ob:
                 split.template_ID(ob, "data")
-                split.itemS()
+                split.separator()
             elif arm:
                 split.template_ID(space, "pin_id")
-                split.itemS()
+                split.separator()
         else:
             layout.template_ID(ob, "data")
 
@@ -64,23 +64,23 @@ class DATA_PT_skeleton(DataButtonsPanel):
         arm = context.armature
         wide_ui = context.region.width > narrowui
 
-        layout.itemR(arm, "pose_position", expand=True)
+        layout.prop(arm, "pose_position", expand=True)
 
         split = layout.split()
 
         col = split.column()
-        col.itemL(text="Layers:")
-        col.itemR(arm, "layer", text="")
-        col.itemL(text="Protected Layers:")
-        col.itemR(arm, "layer_protection", text="")
+        col.label(text="Layers:")
+        col.prop(arm, "layer", text="")
+        col.label(text="Protected Layers:")
+        col.prop(arm, "layer_protection", text="")
 
         if wide_ui:
             col = split.column()
-        col.itemL(text="Deform:")
-        col.itemR(arm, "deform_vertexgroups", text="Vertex Groups")
-        col.itemR(arm, "deform_envelope", text="Envelopes")
-        col.itemR(arm, "deform_quaternion", text="Quaternion")
-        col.itemR(arm, "deform_bbone_rest", text="B-Bones Rest")
+        col.label(text="Deform:")
+        col.prop(arm, "deform_vertexgroups", text="Vertex Groups")
+        col.prop(arm, "deform_envelope", text="Envelopes")
+        col.prop(arm, "deform_quaternion", text="Quaternion")
+        col.prop(arm, "deform_bbone_rest", text="B-Bones Rest")
 
 
 class DATA_PT_display(DataButtonsPanel):
@@ -93,21 +93,21 @@ class DATA_PT_display(DataButtonsPanel):
         wide_ui = context.region.width > narrowui
 
         if wide_ui:
-            layout.row().itemR(arm, "drawtype", expand=True)
+            layout.row().prop(arm, "drawtype", expand=True)
         else:
-            layout.row().itemR(arm, "drawtype", text="")
+            layout.row().prop(arm, "drawtype", text="")
 
         split = layout.split()
 
         col = split.column()
-        col.itemR(arm, "draw_names", text="Names")
-        col.itemR(arm, "draw_axes", text="Axes")
-        col.itemR(arm, "draw_custom_bone_shapes", text="Shapes")
+        col.prop(arm, "draw_names", text="Names")
+        col.prop(arm, "draw_axes", text="Axes")
+        col.prop(arm, "draw_custom_bone_shapes", text="Shapes")
 
         if wide_ui:
             col = split.column()
-        col.itemR(arm, "draw_group_colors", text="Colors")
-        col.itemR(arm, "delay_deform", text="Delay Refresh")
+        col.prop(arm, "draw_group_colors", text="Colors")
+        col.prop(arm, "delay_deform", text="Delay Refresh")
 
 
 class DATA_PT_bone_groups(DataButtonsPanel):
@@ -128,20 +128,20 @@ class DATA_PT_bone_groups(DataButtonsPanel):
 
         col = row.column(align=True)
         col.active = (ob.proxy is None)
-        col.itemO("pose.group_add", icon='ICON_ZOOMIN', text="")
-        col.itemO("pose.group_remove", icon='ICON_ZOOMOUT', text="")
+        col.operator("pose.group_add", icon='ICON_ZOOMIN', text="")
+        col.operator("pose.group_remove", icon='ICON_ZOOMOUT', text="")
 
         group = pose.active_bone_group
         if group:
             col = layout.column()
             col.active = (ob.proxy is None)
-            col.itemR(group, "name")
+            col.prop(group, "name")
 
             split = layout.split()
             split.active = (ob.proxy is None)
 
             col = split.column()
-            col.itemR(group, "color_set")
+            col.prop(group, "color_set")
             if group.color_set:
                 if wide_ui:
                     col = split.column()
@@ -150,10 +150,10 @@ class DATA_PT_bone_groups(DataButtonsPanel):
         row = layout.row(align=True)
         row.active = (ob.proxy is None)
 
-        row.itemO("pose.group_assign", text="Assign")
-        row.itemO("pose.group_remove", text="Remove") #row.itemO("pose.bone_group_remove_from", text="Remove")
-        #row.itemO("object.bone_group_select", text="Select")
-        #row.itemO("object.bone_group_deselect", text="Deselect")
+        row.operator("pose.group_assign", text="Assign")
+        row.operator("pose.group_remove", text="Remove") #row.operator("pose.bone_group_remove_from", text="Remove")
+        #row.operator("object.bone_group_select", text="Select")
+        #row.operator("object.bone_group_deselect", text="Deselect")
 
 
 class DATA_PT_paths(DataButtonsPanel):
@@ -166,41 +166,41 @@ class DATA_PT_paths(DataButtonsPanel):
         wide_ui = context.region.width > narrowui
 
         if wide_ui:
-            layout.itemR(arm, "paths_type", expand=True)
+            layout.prop(arm, "paths_type", expand=True)
         else:
-            layout.itemR(arm, "paths_type", text="")
+            layout.prop(arm, "paths_type", text="")
 
         split = layout.split()
 
         col = split.column()
         sub = col.column(align=True)
         if (arm.paths_type == 'CURRENT_FRAME'):
-            sub.itemR(arm, "path_before_current", text="Before")
-            sub.itemR(arm, "path_after_current", text="After")
+            sub.prop(arm, "path_before_current", text="Before")
+            sub.prop(arm, "path_after_current", text="After")
         elif (arm.paths_type == 'RANGE'):
-            sub.itemR(arm, "path_start_frame", text="Start")
-            sub.itemR(arm, "path_end_frame", text="End")
+            sub.prop(arm, "path_start_frame", text="Start")
+            sub.prop(arm, "path_end_frame", text="End")
 
-        sub.itemR(arm, "path_size", text="Step")
-        col.row().itemR(arm, "paths_location", expand=True)
+        sub.prop(arm, "path_size", text="Step")
+        col.row().prop(arm, "paths_location", expand=True)
 
         if wide_ui:
             col = split.column()
-        col.itemL(text="Display:")
-        col.itemR(arm, "paths_show_frame_numbers", text="Frame Numbers")
-        col.itemR(arm, "paths_highlight_keyframes", text="Keyframes")
-        col.itemR(arm, "paths_show_keyframe_numbers", text="Keyframe Numbers")
+        col.label(text="Display:")
+        col.prop(arm, "paths_show_frame_numbers", text="Frame Numbers")
+        col.prop(arm, "paths_highlight_keyframes", text="Keyframes")
+        col.prop(arm, "paths_show_keyframe_numbers", text="Keyframe Numbers")
 
-        layout.itemS()
+        layout.separator()
 
         split = layout.split()
 
         col = split.column()
-        col.itemO("pose.paths_calculate", text="Calculate Paths")
+        col.operator("pose.paths_calculate", text="Calculate Paths")
 
         if wide_ui:
             col = split.column()
-        col.itemO("pose.paths_clear", text="Clear Paths")
+        col.operator("pose.paths_clear", text="Clear Paths")
 
 
 class DATA_PT_ghost(DataButtonsPanel):
@@ -213,9 +213,9 @@ class DATA_PT_ghost(DataButtonsPanel):
         wide_ui = context.region.width > narrowui
 
         if wide_ui:
-            layout.itemR(arm, "ghost_type", expand=True)
+            layout.prop(arm, "ghost_type", expand=True)
         else:
-            layout.itemR(arm, "ghost_type", text="")
+            layout.prop(arm, "ghost_type", text="")
 
         split = layout.split()
 
@@ -223,17 +223,17 @@ class DATA_PT_ghost(DataButtonsPanel):
 
         sub = col.column(align=True)
         if arm.ghost_type == 'RANGE':
-            sub.itemR(arm, "ghost_start_frame", text="Start")
-            sub.itemR(arm, "ghost_end_frame", text="End")
-            sub.itemR(arm, "ghost_size", text="Step")
+            sub.prop(arm, "ghost_start_frame", text="Start")
+            sub.prop(arm, "ghost_end_frame", text="End")
+            sub.prop(arm, "ghost_size", text="Step")
         elif arm.ghost_type == 'CURRENT_FRAME':
-            sub.itemR(arm, "ghost_step", text="Range")
-            sub.itemR(arm, "ghost_size", text="Step")
+            sub.prop(arm, "ghost_step", text="Range")
+            sub.prop(arm, "ghost_size", text="Step")
 
         if wide_ui:
             col = split.column()
-        col.itemL(text="Display:")
-        col.itemR(arm, "ghost_only_selected", text="Selected Only")
+        col.label(text="Display:")
+        col.prop(arm, "ghost_only_selected", text="Selected Only")
 
 bpy.types.register(DATA_PT_context_arm)
 bpy.types.register(DATA_PT_skeleton)
index a102c2c4db66e19e7a1ea6ea3c7558de9b7c695c..b60a2a78d2adc0086f360a47a93dc4c83b68e951 100644 (file)
@@ -43,8 +43,8 @@ class BONE_PT_context_bone(BoneButtonsPanel):
             bone = context.edit_bone
 
         row = layout.row()
-        row.itemL(text="", icon='ICON_BONE_DATA')
-        row.itemR(bone, "name", text="")
+        row.label(text="", icon='ICON_BONE_DATA')
+        row.prop(bone, "name", text="")
 
 
 class BONE_PT_transform(BoneButtonsPanel):
@@ -61,21 +61,21 @@ class BONE_PT_transform(BoneButtonsPanel):
             bone = context.edit_bone
             if wide_ui:
                 row = layout.row()
-                row.column().itemR(bone, "head")
-                row.column().itemR(bone, "tail")
+                row.column().prop(bone, "head")
+                row.column().prop(bone, "tail")
 
                 col = row.column()
                 sub = col.column(align=True)
-                sub.itemL(text="Roll:")
-                sub.itemR(bone, "roll", text="")
-                sub.itemL()
-                sub.itemR(bone, "locked")
+                sub.label(text="Roll:")
+                sub.prop(bone, "roll", text="")
+                sub.label()
+                sub.prop(bone, "locked")
             else:
                 col = layout.column()
-                col.itemR(bone, "head")
-                col.itemR(bone, "tail")
-                col.itemR(bone, "roll")
-                col.itemR(bone, "locked")
+                col.prop(bone, "head")
+                col.prop(bone, "tail")
+                col.prop(bone, "roll")
+                col.prop(bone, "locked")
 
         else:
             pchan = ob.pose.bones[context.bone.name]
@@ -83,37 +83,37 @@ class BONE_PT_transform(BoneButtonsPanel):
             if wide_ui:
                 row = layout.row()
                 col = row.column()
-                col.itemR(pchan, "location")
+                col.prop(pchan, "location")
                 col.active = not (bone.parent and bone.connected)
 
                 col = row.column()
                 if pchan.rotation_mode == 'QUATERNION':
-                    col.itemR(pchan, "rotation_quaternion", text="Rotation")
+                    col.prop(pchan, "rotation_quaternion", text="Rotation")
                 elif pchan.rotation_mode == 'AXIS_ANGLE':
-                    #col.itemL(text="Rotation")
-                    #col.itemR(pchan, "rotation_angle", text="Angle")
-                    #col.itemR(pchan, "rotation_axis", text="Axis")
-                    col.itemR(pchan, "rotation_axis_angle", text="Rotation")
+                    #col.label(text="Rotation")
+                    #col.prop(pchan, "rotation_angle", text="Angle")
+                    #col.prop(pchan, "rotation_axis", text="Axis")
+                    col.prop(pchan, "rotation_axis_angle", text="Rotation")
                 else:
-                    col.itemR(pchan, "rotation_euler", text="Rotation")
+                    col.prop(pchan, "rotation_euler", text="Rotation")
 
-                row.column().itemR(pchan, "scale")
+                row.column().prop(pchan, "scale")
 
-                layout.itemR(pchan, "rotation_mode")
+                layout.prop(pchan, "rotation_mode")
             else:
                 col = layout.column()
                 sub = col.column()
                 sub.active = not (bone.parent and bone.connected)
-                sub.itemR(pchan, "location")
-                col.itemL(text="Rotation:")
-                col.itemR(pchan, "rotation_mode", text="")
+                sub.prop(pchan, "location")
+                col.label(text="Rotation:")
+                col.prop(pchan, "rotation_mode", text="")
                 if pchan.rotation_mode == 'QUATERNION':
-                    col.itemR(pchan, "rotation_quaternion", text="")
+                    col.prop(pchan, "rotation_quaternion", text="")
                 elif pchan.rotation_mode == 'AXIS_ANGLE':
-                    col.itemR(pchan, "rotation_axis_angle", text="")
+                    col.prop(pchan, "rotation_axis_angle", text="")
                 else:
-                    col.itemR(pchan, "rotation_euler", text="")
-                col.itemR(pchan, "scale")
+                    col.prop(pchan, "rotation_euler", text="")
+                col.prop(pchan, "scale")
 
 
 class BONE_PT_transform_locks(BoneButtonsPanel):
@@ -132,19 +132,19 @@ class BONE_PT_transform_locks(BoneButtonsPanel):
 
         row = layout.row()
         col = row.column()
-        col.itemR(pchan, "lock_location")
+        col.prop(pchan, "lock_location")
         col.active = not (bone.parent and bone.connected)
 
         col = row.column()
         if pchan.rotation_mode in ('QUATERNION', 'AXIS_ANGLE'):
-            col.itemR(pchan, "lock_rotations_4d", text="Lock Rotation")
+            col.prop(pchan, "lock_rotations_4d", text="Lock Rotation")
             if pchan.lock_rotations_4d:
-                col.itemR(pchan, "lock_rotation_w", text="W")
-            col.itemR(pchan, "lock_rotation", text="")
+                col.prop(pchan, "lock_rotation_w", text="W")
+            col.prop(pchan, "lock_rotation", text="")
         else:
-            col.itemR(pchan, "lock_rotation", text="Rotation")
+            col.prop(pchan, "lock_rotation", text="Rotation")
 
-        row.column().itemR(pchan, "lock_scale")
+        row.column().prop(pchan, "lock_scale")
 
 
 class BONE_PT_relations(BoneButtonsPanel):
@@ -167,28 +167,28 @@ class BONE_PT_relations(BoneButtonsPanel):
         split = layout.split()
 
         col = split.column()
-        col.itemL(text="Layers:")
-        col.itemR(bone, "layer", text="")
+        col.label(text="Layers:")
+        col.prop(bone, "layer", text="")
 
-        col.itemS()
+        col.separator()
 
         if ob and pchan:
-            col.itemL(text="Bone Group:")
-            col.item_pointerR(pchan, "bone_group", ob.pose, "bone_groups", text="")
+            col.label(text="Bone Group:")
+            col.prop_pointer(pchan, "bone_group", ob.pose, "bone_groups", text="")
 
         if wide_ui:
             col = split.column()
-        col.itemL(text="Parent:")
+        col.label(text="Parent:")
         if context.bone:
-            col.itemR(bone, "parent", text="")
+            col.prop(bone, "parent", text="")
         else:
-            col.item_pointerR(bone, "parent", arm, "edit_bones", text="")
+            col.prop_pointer(bone, "parent", arm, "edit_bones", text="")
 
         sub = col.column()
         sub.active = (bone.parent is not None)
-        sub.itemR(bone, "connected")
-        sub.itemR(bone, "hinge", text="Inherit Rotation")
-        sub.itemR(bone, "inherit_scale", text="Inherit Scale")
+        sub.prop(bone, "connected")
+        sub.prop(bone, "hinge", text="Inherit Rotation")
+        sub.prop(bone, "inherit_scale", text="Inherit Scale")
 
 
 class BONE_PT_display(BoneButtonsPanel):
@@ -215,13 +215,13 @@ class BONE_PT_display(BoneButtonsPanel):
             split = layout.split()
 
             col = split.column()
-            col.itemR(bone, "draw_wire", text="Wireframe")
-            col.itemR(bone, "hidden", text="Hide")
+            col.prop(bone, "draw_wire", text="Wireframe")
+            col.prop(bone, "hidden", text="Hide")
 
             if wide_ui:
                 col = split.column()
-            col.itemL(text="Custom Shape:")
-            col.itemR(pchan, "custom_shape", text="")
+            col.label(text="Custom Shape:")
+            col.prop(pchan, "custom_shape", text="")
 
 
 class BONE_PT_deform(BoneButtonsPanel):
@@ -234,7 +234,7 @@ class BONE_PT_deform(BoneButtonsPanel):
         if not bone:
             bone = context.edit_bone
 
-        self.layout.itemR(bone, "deform", text="")
+        self.layout.prop(bone, "deform", text="")
 
     def draw(self, context):
         layout = self.layout
@@ -250,29 +250,29 @@ class BONE_PT_deform(BoneButtonsPanel):
         split = layout.split()
 
         col = split.column()
-        col.itemL(text="Envelope:")
+        col.label(text="Envelope:")
 
         sub = col.column(align=True)
-        sub.itemR(bone, "envelope_distance", text="Distance")
-        sub.itemR(bone, "envelope_weight", text="Weight")
-        col.itemR(bone, "multiply_vertexgroup_with_envelope", text="Multiply")
+        sub.prop(bone, "envelope_distance", text="Distance")
+        sub.prop(bone, "envelope_weight", text="Weight")
+        col.prop(bone, "multiply_vertexgroup_with_envelope", text="Multiply")
 
         sub = col.column(align=True)
-        sub.itemL(text="Radius:")
-        sub.itemR(bone, "head_radius", text="Head")
-        sub.itemR(bone, "tail_radius", text="Tail")
+        sub.label(text="Radius:")
+        sub.prop(bone, "head_radius", text="Head")
+        sub.prop(bone, "tail_radius", text="Tail")
 
         if wide_ui:
             col = split.column()
-        col.itemL(text="Curved Bones:")
+        col.label(text="Curved Bones:")
 
         sub = col.column(align=True)
-        sub.itemR(bone, "bbone_segments", text="Segments")
-        sub.itemR(bone, "bbone_in", text="Ease In")
-        sub.itemR(bone, "bbone_out", text="Ease Out")
+        sub.prop(bone, "bbone_segments", text="Segments")
+        sub.prop(bone, "bbone_in", text="Ease In")
+        sub.prop(bone, "bbone_out", text="Ease Out")
 
-        col.itemL(text="Offset:")
-        col.itemR(bone, "cyclic_offset")
+        col.label(text="Offset:")
+        col.prop(bone, "cyclic_offset")
 
 
 class BONE_PT_properties(BoneButtonsPanel):
index 3af875d623978d6c8c3d23ebf728d427073636ac..e8cba6be7dfd8ee4b50e825172b24390f4444a79 100644 (file)
@@ -47,10 +47,10 @@ class DATA_PT_context_camera(DataButtonsPanel):
             split = layout.split(percentage=0.65)
             if ob:
                 split.template_ID(ob, "data")
-                split.itemS()
+                split.separator()
             elif cam:
                 split.template_ID(space, "pin_id")
-                split.itemS()
+                split.separator()
         else:
             if ob:
                 layout.template_ID(ob, "data")
@@ -68,50 +68,50 @@ class DATA_PT_camera(DataButtonsPanel):
         wide_ui = context.region.width > narrowui
 
         if wide_ui:
-            layout.itemR(cam, "type", expand=True)
+            layout.prop(cam, "type", expand=True)
         else:
-            layout.itemR(cam, "type", text="")
+            layout.prop(cam, "type", text="")
 
         split = layout.split()
 
         col = split.column()
         if cam.type == 'PERSP':
             if cam.lens_unit == 'MILLIMETERS':
-                col.itemR(cam, "lens", text="Angle")
+                col.prop(cam, "lens", text="Angle")
             elif cam.lens_unit == 'DEGREES':
-                col.itemR(cam, "angle")
+                col.prop(cam, "angle")
             if wide_ui:
                 col = split.column()
-            col.itemR(cam, "lens_unit", text="")
+            col.prop(cam, "lens_unit", text="")
 
         elif cam.type == 'ORTHO':
-            col.itemR(cam, "ortho_scale")
+            col.prop(cam, "ortho_scale")
 
-        layout.itemR(cam, "panorama")
+        layout.prop(cam, "panorama")
 
         split = layout.split()
 
         col = split.column(align=True)
-        col.itemL(text="Shift:")
-        col.itemR(cam, "shift_x", text="X")
-        col.itemR(cam, "shift_y", text="Y")
+        col.label(text="Shift:")
+        col.prop(cam, "shift_x", text="X")
+        col.prop(cam, "shift_y", text="Y")
 
         if wide_ui:
             col = split.column(align=True)
-        col.itemL(text="Clipping:")
-        col.itemR(cam, "clip_start", text="Start")
-        col.itemR(cam, "clip_end", text="End")
+        col.label(text="Clipping:")
+        col.prop(cam, "clip_start", text="Start")
+        col.prop(cam, "clip_end", text="End")
 
-        layout.itemL(text="Depth of Field:")
+        layout.label(text="Depth of Field:")
 
         split = layout.split()
 
         col = split.column()
-        col.itemR(cam, "dof_object", text="")
+        col.prop(cam, "dof_object", text="")
 
         if wide_ui:
             col = split.column()
-        col.itemR(cam, "dof_distance", text="Distance")
+        col.prop(cam, "dof_distance", text="Distance")
 
 
 class DATA_PT_camera_display(DataButtonsPanel):
@@ -126,19 +126,19 @@ class DATA_PT_camera_display(DataButtonsPanel):
         split = layout.split()
 
         col = split.column()
-        col.itemR(cam, "show_limits", text="Limits")
-        col.itemR(cam, "show_mist", text="Mist")
-        col.itemR(cam, "show_title_safe", text="Title Safe")
-        col.itemR(cam, "show_name", text="Name")
+        col.prop(cam, "show_limits", text="Limits")
+        col.prop(cam, "show_mist", text="Mist")
+        col.prop(cam, "show_title_safe", text="Title Safe")
+        col.prop(cam, "show_name", text="Name")
 
         if wide_ui:
             col = split.column()
-        col.itemR(cam, "draw_size", text="Size")
-        col.itemS()
-        col.itemR(cam, "show_passepartout", text="Passepartout")
+        col.prop(cam, "draw_size", text="Size")
+        col.separator()
+        col.prop(cam, "show_passepartout", text="Passepartout")
         sub = col.column()
         sub.active = cam.show_passepartout
-        sub.itemR(cam, "passepartout_alpha", text="Alpha", slider=True)
+        sub.prop(cam, "passepartout_alpha", text="Alpha", slider=True)
 
 bpy.types.register(DATA_PT_context_camera)
 bpy.types.register(DATA_PT_camera)
index aa7e586da5d5794c7284f65b74b60f486e6e9eaa..9a7961cfa3331c4d833ebac13d7b0cdb195bf7d7 100644 (file)
@@ -64,10 +64,10 @@ class DATA_PT_context_curve(DataButtonsPanel):
 
             if ob:
                 split.template_ID(ob, "data")
-                split.itemS()
+                split.separator()
             elif curve:
                 split.template_ID(space, "pin_id")
-                split.itemS()
+                split.separator()
         else:
             layout.template_ID(ob, "data")
 
@@ -87,42 +87,42 @@ class DATA_PT_shape_curve(DataButtonsPanel):
 
         if is_curve:
             row = layout.row()
-            row.itemR(curve, "dimensions", expand=True)
+            row.prop(curve, "dimensions", expand=True)
 
         split = layout.split()
 
         col = split.column()
-        col.itemL(text="Resolution:")
+        col.label(text="Resolution:")
         sub = col.column(align=True)
-        sub.itemR(curve, "resolution_u", text="Preview U")
-        sub.itemR(curve, "render_resolution_u", text="Render U")
+        sub.prop(curve, "resolution_u", text="Preview U")
+        sub.prop(curve, "render_resolution_u", text="Render U")
         if is_curve:
-            col.itemL(text="Twisting:")
-            col.itemR(curve, "twist_mode", text="")
-            col.itemR(curve, "twist_smooth", text="Smooth")
+            col.label(text="Twisting:")
+            col.prop(curve, "twist_mode", text="")
+            col.prop(curve, "twist_smooth", text="Smooth")
         if is_text:
-            col.itemL(text="Display:")
-            col.itemR(curve, "fast", text="Fast Editing")
+            col.label(text="Display:")
+            col.prop(curve, "fast", text="Fast Editing")
 
         if wide_ui:
             col = split.column()
 
         if is_surf:
             sub = col.column(align=True)
-            sub.itemL(text="")
-            sub.itemR(curve, "resolution_v", text="Preview V")
-            sub.itemR(curve, "render_resolution_v", text="Render V")
+            sub.label(text="")
+            sub.prop(curve, "resolution_v", text="Preview V")
+            sub.prop(curve, "render_resolution_v", text="Render V")
 
         if is_curve or is_text:
             sub = col.column()
             sub.active = (curve.dimensions == '2D')
-            sub.itemL(text="Caps:")
-            sub.itemR(curve, "front")
-            sub.itemR(curve, "back")
+            sub.label(text="Caps:")
+            sub.prop(curve, "front")
+            sub.prop(curve, "back")
 
-        col.itemL(text="Textures:")
-#       col.itemR(curve, "uv_orco")
-        col.itemR(curve, "auto_texspace")
+        col.label(text="Textures:")
+#       col.prop(curve, "uv_orco")
+        col.prop(curve, "auto_texspace")
 
 
 class DATA_PT_geometry_curve(DataButtonsPanel):
@@ -137,19 +137,19 @@ class DATA_PT_geometry_curve(DataButtonsPanel):
         split = layout.split()
 
         col = split.column()
-        col.itemL(text="Modification:")
-        col.itemR(curve, "width")
-        col.itemR(curve, "extrude")
-        col.itemL(text="Taper Object:")
-        col.itemR(curve, "taper_object", text="")
+        col.label(text="Modification:")
+        col.prop(curve, "width")
+        col.prop(curve, "extrude")
+        col.label(text="Taper Object:")
+        col.prop(curve, "taper_object", text="")
 
         if wide_ui:
             col = split.column()
-        col.itemL(text="Bevel:")
-        col.itemR(curve, "bevel_depth", text="Depth")
-        col.itemR(curve, "bevel_resolution", text="Resolution")
-        col.itemL(text="Bevel Object:")
-        col.itemR(curve, "bevel_object", text="")
+        col.label(text="Bevel:")
+        col.prop(curve, "bevel_depth", text="Depth")
+        col.prop(curve, "bevel_resolution", text="Resolution")
+        col.label(text="Bevel Object:")
+        col.prop(curve, "bevel_object", text="")
 
 
 class DATA_PT_pathanim(DataButtonsPanelCurve):
@@ -158,7 +158,7 @@ class DATA_PT_pathanim(DataButtonsPanelCurve):
     def draw_header(self, context):
         curve = context.curve
 
-        self.layout.itemR(curve, "use_path", text="")
+        self.layout.prop(curve, "use_path", text="")
 
     def draw(self, context):
         layout = self.layout
@@ -169,21 +169,21 @@ class DATA_PT_pathanim(DataButtonsPanelCurve):
         layout.active = curve.use_path
 
         row = layout.row()
-        layout.itemR(curve, "path_length", text="Frames")
+        layout.prop(curve, "path_length", text="Frames")
 
         if wide_ui:
-            row.itemL()
+            row.label()
 
         split = layout.split()
 
         col = split.column()
-        col.itemR(curve, "use_path_follow")
-        col.itemR(curve, "use_stretch")
+        col.prop(curve, "use_path_follow")
+        col.prop(curve, "use_stretch")
 
         if wide_ui:
             col = split.column()
-        col.itemR(curve, "use_radius")
-        col.itemR(curve, "use_time_offset", text="Offset Children")
+        col.prop(curve, "use_radius")
+        col.prop(curve, "use_time_offset", text="Offset Children")
 
 
 class DATA_PT_active_spline(DataButtonsPanelActive):
@@ -204,57 +204,57 @@ class DATA_PT_active_spline(DataButtonsPanelActive):
             # These settings are below but its easier to have
             # poly's set aside since they use so few settings
             col = split.column()
-            col.itemL(text="Cyclic:")
-            col.itemR(act_spline, "smooth")
+            col.label(text="Cyclic:")
+            col.prop(act_spline, "smooth")
             col = split.column()
-            col.itemR(act_spline, "cyclic_u", text="U")
+            col.prop(act_spline, "cyclic_u", text="U")
 
         else:
             col = split.column()
-            col.itemL(text="Cyclic:")
+            col.label(text="Cyclic:")
             if act_spline.type == 'NURBS':
-                col.itemL(text="Bezier:")
-                col.itemL(text="Endpoint:")
-                col.itemL(text="Order:")
+                col.label(text="Bezier:")
+                col.label(text="Endpoint:")
+                col.label(text="Order:")
 
-            col.itemL(text="Resolution:")
+            col.label(text="Resolution:")
 
             col = split.column()
-            col.itemR(act_spline, "cyclic_u", text="U")
+            col.prop(act_spline, "cyclic_u", text="U")
 
             if act_spline.type == 'NURBS':
                 sub = col.column()
                 # sub.active = (not act_spline.cyclic_u)
-                sub.itemR(act_spline, "bezier_u", text="U")
-                sub.itemR(act_spline, "endpoint_u", text="U")
+                sub.prop(act_spline, "bezier_u", text="U")
+                sub.prop(act_spline, "endpoint_u", text="U")
 
                 sub = col.column()
-                sub.itemR(act_spline, "order_u", text="U")
-            col.itemR(act_spline, "resolution_u", text="U")
+                sub.prop(act_spline, "order_u", text="U")
+            col.prop(act_spline, "resolution_u", text="U")
 
             if is_surf:
                 col = split.column()
-                col.itemR(act_spline, "cyclic_v", text="V")
+                col.prop(act_spline, "cyclic_v", text="V")
 
                 # its a surface, assume its a nurb.
                 sub = col.column()
                 sub.active = (not act_spline.cyclic_v)
-                sub.itemR(act_spline, "bezier_v", text="V")
-                sub.itemR(act_spline, "endpoint_v", text="V")
+                sub.prop(act_spline, "bezier_v", text="V")
+                sub.prop(act_spline, "endpoint_v", text="V")
                 sub = col.column()
-                sub.itemR(act_spline, "order_v", text="V")
-                sub.itemR(act_spline, "resolution_v", text="V")
+                sub.prop(act_spline, "order_v", text="V")
+                sub.prop(act_spline, "resolution_v", text="V")
 
             if not is_surf:
                 split = layout.split()
                 col = split.column()
                 col.active = (curve.dimensions == '3D')
 
-                col.itemL(text="Interpolation:")
-                col.itemR(act_spline, "tilt_interpolation", text="Tilt")
-                col.itemR(act_spline, "radius_interpolation", text="Radius")
+                col.label(text="Interpolation:")
+                col.prop(act_spline, "tilt_interpolation", text="Tilt")
+                col.prop(act_spline, "radius_interpolation", text="Radius")
 
-            layout.itemR(act_spline, "smooth")
+            layout.prop(act_spline, "smooth")
 
 
 class DATA_PT_font(DataButtonsPanel):
@@ -271,44 +271,44 @@ class DATA_PT_font(DataButtonsPanel):
         wide_ui = context.region.width > narrowui
 
         if wide_ui:
-            layout.itemR(text, "font")
+            layout.prop(text, "font")
         else:
-            layout.itemR(text, "font", text="")
+            layout.prop(text, "font", text="")
 
         split = layout.split()
 
         col = split.column()
-        col.itemR(text, "text_size", text="Size")
+        col.prop(text, "text_size", text="Size")
         if wide_ui:
             col = split.column()
-        col.itemR(text, "shear")
+        col.prop(text, "shear")
 
         split = layout.split()
 
         col = split.column()
-        col.itemL(text="Object Font:")
-        col.itemR(text, "family", text="")
+        col.label(text="Object Font:")
+        col.prop(text, "family", text="")
 
         if wide_ui:
             col = split.column()
-        col.itemL(text="Text on Curve:")
-        col.itemR(text, "text_on_curve", text="")
+        col.label(text="Text on Curve:")
+        col.prop(text, "text_on_curve", text="")
 
         split = layout.split()
 
         col = split.column(align=True)
-        col.itemL(text="Underline:")
-        col.itemR(text, "ul_position", text="Position")
-        col.itemR(text, "ul_height", text="Thickness")
+        col.label(text="Underline:")
+        col.prop(text, "ul_position", text="Position")
+        col.prop(text, "ul_height", text="Thickness")
 
         if wide_ui:
             col = split.column()
-        col.itemL(text="Character:")
-        col.itemR(char, "bold")
-        col.itemR(char, "italic")
-        col.itemR(char, "underline")
-#       col.itemR(char, "style")
-#       col.itemR(char, "wrap")
+        col.label(text="Character:")
+        col.prop(char, "bold")
+        col.prop(char, "italic")
+        col.prop(char, "underline")
+#       col.prop(char, "style")
+#       col.prop(char, "wrap")
 
 
 class DATA_PT_paragraph(DataButtonsPanel):
@@ -323,25 +323,25 @@ class DATA_PT_paragraph(DataButtonsPanel):
         text = context.curve
         wide_ui = context.region.width > narrowui
 
-        layout.itemL(text="Align:")
+        layout.label(text="Align:")
         if wide_ui:
-            layout.itemR(text, "spacemode", expand=True)
+            layout.prop(text, "spacemode", expand=True)
         else:
-            layout.itemR(text, "spacemode", text="")
+            layout.prop(text, "spacemode", text="")
 
         split = layout.split()
 
         col = split.column(align=True)
-        col.itemL(text="Spacing:")
-        col.itemR(text, "spacing", text="Character")
-        col.itemR(text, "word_spacing", text="Word")
-        col.itemR(text, "line_dist", text="Line")
+        col.label(text="Spacing:")
+        col.prop(text, "spacing", text="Character")
+        col.prop(text, "word_spacing", text="Word")
+        col.prop(text, "line_dist", text="Line")
 
         if wide_ui:
             col = split.column(align=True)
-        col.itemL(text="Offset:")
-        col.itemR(text, "offset_x", text="X")
-        col.itemR(text, "offset_y", text="Y")
+        col.label(text="Offset:")
+        col.prop(text, "offset_x", text="X")
+        col.prop(text, "offset_y", text="Y")
 
 
 class DATA_PT_textboxes(DataButtonsPanel):
@@ -360,15 +360,15 @@ class DATA_PT_textboxes(DataButtonsPanel):
             split = layout.box().split()
 
             col = split.column(align=True)
-            col.itemL(text="Dimensions:")
-            col.itemR(box, "width", text="Width")
-            col.itemR(box, "height", text="Height")
+            col.label(text="Dimensions:")
+            col.prop(box, "width", text="Width")
+            col.prop(box, "height", text="Height")
 
             if wide_ui:
                 col = split.column(align=True)
-            col.itemL(text="Offset:")
-            col.itemR(box, "x", text="X")
-            col.itemR(box, "y", text="Y")
+            col.label(text="Offset:")
+            col.prop(box, "x", text="X")
+            col.prop(box, "y", text="Y")
 
 bpy.types.register(DATA_PT_context_curve)
 bpy.types.register(DATA_PT_shape_curve)
index eb84902b0bd45da0a413ca234100785fc1782381..9f304d2dc1b4d0f4e1108e8a2a1c72a0d2b9b820 100644 (file)
@@ -41,10 +41,10 @@ class DATA_PT_empty(DataButtonsPanel):
         wide_ui = context.region.width > narrowui
 
         if wide_ui:
-            layout.itemR(ob, "empty_draw_type", text="Display")
+            layout.prop(ob, "empty_draw_type", text="Display")
         else:
-            layout.itemR(ob, "empty_draw_type", text="")
+            layout.prop(ob, "empty_draw_type", text="")
 
-        layout.itemR(ob, "empty_draw_size", text="Size")
+        layout.prop(ob, "empty_draw_size", text="Size")
 
 bpy.types.register(DATA_PT_empty)
index 9a3785415ac3a2a6e1ca8915d151aa8369a0fda2..d5025983ff3f31137d1e75e67b208a3bb085411d 100644 (file)
@@ -54,10 +54,10 @@ class DATA_PT_context_lamp(DataButtonsPanel):
             split = layout.split(percentage=0.65)
             if ob:
                 split.template_ID(ob, "data")
-                split.itemS()
+                split.separator()
             elif lamp:
                 split.template_ID(space, "pin_id")
-                split.itemS()
+                split.separator()
         else:
             if ob:
                 layout.template_ID(ob, "data")
@@ -75,40 +75,40 @@ class DATA_PT_lamp(DataButtonsPanel):
         wide_ui = context.region.width > narrowui
 
         if wide_ui:
-            layout.itemR(lamp, "type", expand=True)
+            layout.prop(lamp, "type", expand=True)
         else:
-            layout.itemR(lamp, "type", text="")
+            layout.prop(lamp, "type", text="")
 
         split = layout.split()
 
         col = split.column()
         sub = col.column()
-        sub.itemR(lamp, "color", text="")
-        sub.itemR(lamp, "energy")
+        sub.prop(lamp, "color", text="")
+        sub.prop(lamp, "energy")
 
         if lamp.type in ('POINT', 'SPOT'):
-            sub.itemL(text="Falloff:")
-            sub.itemR(lamp, "falloff_type", text="")
-            sub.itemR(lamp, "distance")
+            sub.label(text="Falloff:")
+            sub.prop(lamp, "falloff_type", text="")
+            sub.prop(lamp, "distance")
 
             if lamp.falloff_type == 'LINEAR_QUADRATIC_WEIGHTED':
-                col.itemL(text="Attenuation Factors:")
+                col.label(text="Attenuation Factors:")
                 sub = col.column(align=True)
-                sub.itemR(lamp, "linear_attenuation", slider=True, text="Linear")
-                sub.itemR(lamp, "quadratic_attenuation", slider=True, text="Quadratic")
+                sub.prop(lamp, "linear_attenuation", slider=True, text="Linear")
+                sub.prop(lamp, "quadratic_attenuation", slider=True, text="Quadratic")
 
-            col.itemR(lamp, "sphere")
+            col.prop(lamp, "sphere")
 
         if lamp.type == 'AREA':
-            col.itemR(lamp, "distance")
-            col.itemR(lamp, "gamma")
+            col.prop(lamp, "distance")
+            col.prop(lamp, "gamma")
 
         if wide_ui:
             col = split.column()
-        col.itemR(lamp, "negative")
-        col.itemR(lamp, "layer", text="This Layer Only")
-        col.itemR(lamp, "specular")
-        col.itemR(lamp, "diffuse")
+        col.prop(lamp, "negative")
+        col.prop(lamp, "layer", text="This Layer Only")
+        col.prop(lamp, "specular")
+        col.prop(lamp, "diffuse")
 
 
 class DATA_PT_sunsky(DataButtonsPanel):
@@ -124,59 +124,59 @@ class DATA_PT_sunsky(DataButtonsPanel):
         lamp = context.lamp.sky
         wide_ui = context.region.width > narrowui
 
-        layout.itemR(lamp, "sky")
+        layout.prop(lamp, "sky")
 
         row = layout.row()
         row.active = lamp.sky or lamp.atmosphere
-        row.itemR(lamp, "atmosphere_turbidity", text="Turbidity")
+        row.prop(lamp, "atmosphere_turbidity", text="Turbidity")
 
         split = layout.split()
 
         col = split.column()
         col.active = lamp.sky
-        col.itemL(text="Blending:")
+        col.label(text="Blending:")
         sub = col.column()
-        sub.itemR(lamp, "sky_blend_type", text="")
-        sub.itemR(lamp, "sky_blend", text="Factor")
+        sub.prop(lamp, "sky_blend_type", text="")
+        sub.prop(lamp, "sky_blend", text="Factor")
 
-        col.itemL(text="Color Space:")
+        col.label(text="Color Space:")
         sub = col.column()
-        sub.row().itemR(lamp, "sky_color_space", expand=True)
-        sub.itemR(lamp, "sky_exposure", text="Exposure")
+        sub.row().prop(lamp, "sky_color_space", expand=True)
+        sub.prop(lamp, "sky_exposure", text="Exposure")
 
         if wide_ui:
             col = split.column()
         col.active = lamp.sky
-        col.itemL(text="Horizon:")
+        col.label(text="Horizon:")
         sub = col.column()
-        sub.itemR(lamp, "horizon_brightness", text="Brightness")
-        sub.itemR(lamp, "spread", text="Spread")
+        sub.prop(lamp, "horizon_brightness", text="Brightness")
+        sub.prop(lamp, "spread", text="Spread")
 
-        col.itemL(text="Sun:")
+        col.label(text="Sun:")
         sub = col.column()
-        sub.itemR(lamp, "sun_brightness", text="Brightness")
-        sub.itemR(lamp, "sun_size", text="Size")
-        sub.itemR(lamp, "backscattered_light", slider=True, text="Back Light")
+        sub.prop(lamp, "sun_brightness", text="Brightness")
+        sub.prop(lamp, "sun_size", text="Size")
+        sub.prop(lamp, "backscattered_light", slider=True, text="Back Light")
 
-        layout.itemS()
+        layout.separator()
 
-        layout.itemR(lamp, "atmosphere")
+        layout.prop(lamp, "atmosphere")
 
         split = layout.split()
 
         col = split.column()
         col.active = lamp.atmosphere
-        col.itemL(text="Intensity:")
-        col.itemR(lamp, "sun_intensity", text="Sun")
-        col.itemR(lamp, "atmosphere_distance_factor", text="Distance")
+        col.label(text="Intensity:")
+        col.prop(lamp, "sun_intensity", text="Sun")
+        col.prop(lamp, "atmosphere_distance_factor", text="Distance")
 
         if wide_ui:
             col = split.column()
         col.active = lamp.atmosphere
-        col.itemL(text="Scattering:")
+        col.label(text="Scattering:")
         sub = col.column(align=True)
-        sub.itemR(lamp, "atmosphere_inscattering", slider=True, text="Inscattering")
-        sub.itemR(lamp, "atmosphere_extinction", slider=True, text="Extinction")
+        sub.prop(lamp, "atmosphere_inscattering", slider=True, text="Inscattering")
+        sub.prop(lamp, "atmosphere_extinction", slider=True, text="Extinction")
 
 
 class DATA_PT_shadow(DataButtonsPanel):
@@ -193,38 +193,38 @@ class DATA_PT_shadow(DataButtonsPanel):
         wide_ui = context.region.width > narrowui
 
         if wide_ui:
-            layout.itemR(lamp, "shadow_method", expand=True)
+            layout.prop(lamp, "shadow_method", expand=True)
         else:
-            layout.itemR(lamp, "shadow_method", text="")
+            layout.prop(lamp, "shadow_method", text="")
 
         if lamp.shadow_method != 'NOSHADOW':
             split = layout.split()
 
             col = split.column()
-            col.itemR(lamp, "shadow_color", text="")
+            col.prop(lamp, "shadow_color", text="")
 
             if wide_ui:
                 col = split.column()
-            col.itemR(lamp, "shadow_layer", text="This Layer Only")
-            col.itemR(lamp, "only_shadow")
+            col.prop(lamp, "shadow_layer", text="This Layer Only")
+            col.prop(lamp, "only_shadow")
 
         if lamp.shadow_method == 'RAY_SHADOW':
             col = layout.column()
-            col.itemL(text="Sampling:")
+            col.label(text="Sampling:")
             if wide_ui:
-                col.row().itemR(lamp, "shadow_ray_sampling_method", expand=True)
+                col.row().prop(lamp, "shadow_ray_sampling_method", expand=True)
             else:
-                col.itemR(lamp, "shadow_ray_sampling_method", text="")
+                col.prop(lamp, "shadow_ray_sampling_method", text="")
 
             if lamp.type in ('POINT', 'SUN', 'SPOT'):
                 split = layout.split()
 
                 col = split.column()
-                col.itemR(lamp, "shadow_soft_size", text="Soft Size")
+                col.prop(lamp, "shadow_soft_size", text="Soft Size")
 
-                col.itemR(lamp, "shadow_ray_samples", text="Samples")
+                col.prop(lamp, "shadow_ray_samples", text="Samples")
                 if lamp.shadow_ray_sampling_method == 'ADAPTIVE_QMC':
-                    col.itemR(lamp, "shadow_adaptive_threshold", text="Threshold")
+                    col.prop(lamp, "shadow_adaptive_threshold", text="Threshold")
                 if wide_ui:
                     col = split.column()
 
@@ -234,22 +234,22 @@ class DATA_PT_shadow(DataButtonsPanel):
                 col = split.column()
 
                 if lamp.shape == 'SQUARE':
-                    col.itemR(lamp, "shadow_ray_samples_x", text="Samples")
+                    col.prop(lamp, "shadow_ray_samples_x", text="Samples")
                 elif lamp.shape == 'RECTANGLE':
-                    col.itemR(lamp, "shadow_ray_samples_x", text="Samples X")
-                    col.itemR(lamp, "shadow_ray_samples_y", text="Samples Y")
+                    col.prop(lamp, "shadow_ray_samples_x", text="Samples X")
+                    col.prop(lamp, "shadow_ray_samples_y", text="Samples Y")
 
                 if lamp.shadow_ray_sampling_method == 'ADAPTIVE_QMC':
-                    col.itemR(lamp, "shadow_adaptive_threshold", text="Threshold")
+                    col.prop(lamp, "shadow_adaptive_threshold", text="Threshold")
                     if wide_ui:
                         col = split.column()
 
                 elif lamp.shadow_ray_sampling_method == 'CONSTANT_JITTERED':
                     if wide_ui:
                         col = split.column()
-                    col.itemR(lamp, "umbra")
-                    col.itemR(lamp, "dither")
-                    col.itemR(lamp, "jitter")
+                    col.prop(lamp, "umbra")
+                    col.prop(lamp, "dither")
+                    col.prop(lamp, "jitter")
                 else:
                     if wide_ui:
                         col = split.column()
@@ -257,49 +257,49 @@ class DATA_PT_shadow(DataButtonsPanel):
 
         elif lamp.shadow_method == 'BUFFER_SHADOW':
             col = layout.column()
-            col.itemL(text="Buffer Type:")
+            col.label(text="Buffer Type:")
             if wide_ui:
-                col.row().itemR(lamp, "shadow_buffer_type", expand=True)
+                col.row().prop(lamp, "shadow_buffer_type", expand=True)
             else:
-                col.row().itemR(lamp, "shadow_buffer_type", text="")
+                col.row().prop(lamp, "shadow_buffer_type", text="")
 
             if lamp.shadow_buffer_type in ('REGULAR', 'HALFWAY', 'DEEP'):
                 split = layout.split()
 
                 col = split.column()
-                col.itemL(text="Filter Type:")
-                col.itemR(lamp, "shadow_filter_type", text="")
+                col.label(text="Filter Type:")
+                col.prop(lamp, "shadow_filter_type", text="")
                 sub = col.column(align=True)
-                sub.itemR(lamp, "shadow_buffer_soft", text="Soft")
-                sub.itemR(lamp, "shadow_buffer_bias", text="Bias")
+                sub.prop(lamp, "shadow_buffer_soft", text="Soft")
+                sub.prop(lamp, "shadow_buffer_bias", text="Bias")
 
                 if wide_ui:
                     col = split.column()
-                col.itemL(text="Sample Buffers:")
-                col.itemR(lamp, "shadow_sample_buffers", text="")
+                col.label(text="Sample Buffers:")
+                col.prop(lamp, "shadow_sample_buffers", text="")
                 sub = col.column(align=True)
-                sub.itemR(lamp, "shadow_buffer_size", text="Size")
-                sub.itemR(lamp, "shadow_buffer_samples", text="Samples")
+                sub.prop(lamp, "shadow_buffer_size", text="Size")
+                sub.prop(lamp, "shadow_buffer_samples", text="Samples")
                 if lamp.shadow_buffer_type == 'DEEP':
-                    col.itemR(lamp, "compression_threshold")
+                    col.prop(lamp, "compression_threshold")
 
             elif lamp.shadow_buffer_type == 'IRREGULAR':
-                layout.itemR(lamp, "shadow_buffer_bias", text="Bias")
+                layout.prop(lamp, "shadow_buffer_bias", text="Bias")
 
             split = layout.split()
 
             col = split.column()
-            col.itemR(lamp, "auto_clip_start", text="Autoclip Start")
+            col.prop(lamp, "auto_clip_start", text="Autoclip Start")
             sub = col.column()
             sub.active = not lamp.auto_clip_start
-            sub.itemR(lamp, "shadow_buffer_clip_start", text="Clip Start")
+            sub.prop(lamp, "shadow_buffer_clip_start", text="Clip Start")
 
             if wide_ui:
                 col = split.column()
-            col.itemR(lamp, "auto_clip_end", text="Autoclip End")
+            col.prop(lamp, "auto_clip_end", text="Autoclip End")
             sub = col.column()
             sub.active = not lamp.auto_clip_end
-            sub.itemR(lamp, "shadow_buffer_clip_end", text=" Clip End")
+            sub.prop(lamp, "shadow_buffer_clip_end", text=" Clip End")
 
 
 class DATA_PT_area(DataButtonsPanel):
@@ -317,14 +317,14 @@ class DATA_PT_area(DataButtonsPanel):
         split = layout.split()
 
         col = split.column()
-        col.row().itemR(lamp, "shape", expand=True)
+        col.row().prop(lamp, "shape", expand=True)
 
         sub = col.column(align=True)
         if (lamp.shape == 'SQUARE'):
-            sub.itemR(lamp, "size")
+            sub.prop(lamp, "size")
         elif (lamp.shape == 'RECTANGLE'):
-            sub.itemR(lamp, "size", text="Size X")
-            sub.itemR(lamp, "size_y", text="Size Y")
+            sub.prop(lamp, "size", text="Size X")
+            sub.prop(lamp, "size_y", text="Size Y")
 
 
 class DATA_PT_spot(DataButtonsPanel):
@@ -344,20 +344,20 @@ class DATA_PT_spot(DataButtonsPanel):
 
         col = split.column()
         sub = col.column()
-        sub.itemR(lamp, "spot_size", text="Size")
-        sub.itemR(lamp, "spot_blend", text="Blend", slider=True)
-        col.itemR(lamp, "square")
+        sub.prop(lamp, "spot_size", text="Size")
+        sub.prop(lamp, "spot_blend", text="Blend", slider=True)
+        col.prop(lamp, "square")
 
         if wide_ui:
             col = split.column()
         else:
-            col.itemS()
-        col.itemR(lamp, "halo")
+            col.separator()
+        col.prop(lamp, "halo")
         sub = col.column(align=True)
         sub.active = lamp.halo
-        sub.itemR(lamp, "halo_intensity", text="Intensity")
+        sub.prop(lamp, "halo_intensity", text="Intensity")
         if lamp.shadow_method == 'BUFFER_SHADOW':
-            sub.itemR(lamp, "halo_step", text="Step")
+            sub.prop(lamp, "halo_step", text="Step")
 
 
 class DATA_PT_falloff_curve(DataButtonsPanel):
index e8aeebcf20878e94b7280e2e4fec36db8a12336c..640f625a7defa408ca72191f3c8a398c81e24b91 100644 (file)
@@ -47,10 +47,10 @@ class DATA_PT_context_lattice(DataButtonsPanel):
             split = layout.split(percentage=0.65)
             if ob:
                 split.template_ID(ob, "data")
-                split.itemS()
+                split.separator()
             elif lat:
                 split.template_ID(space, "pin_id")
-                split.itemS()
+                split.separator()
         else:
             if ob:
                 layout.template_ID(ob, "data")
@@ -69,26 +69,26 @@ class DATA_PT_lattice(DataButtonsPanel):
 
         split = layout.split()
         col = split.column()
-        col.itemR(lat, "points_u")
+        col.prop(lat, "points_u")
         if wide_ui:
             col = split.column()
-        col.itemR(lat, "interpolation_type_u", text="")
+        col.prop(lat, "interpolation_type_u", text="")
 
         split = layout.split()
         col = split.column()
-        col.itemR(lat, "points_v")
+        col.prop(lat, "points_v")
         if wide_ui:
             col = split.column()
-        col.itemR(lat, "interpolation_type_v", text="")
+        col.prop(lat, "interpolation_type_v", text="")
 
         split = layout.split()
         col = split.column()
-        col.itemR(lat, "points_w")
+        col.prop(lat, "points_w")
         if wide_ui:
             col = split.column()
-        col.itemR(lat, "interpolation_type_w", text="")
+        col.prop(lat, "interpolation_type_w", text="")
 
-        layout.itemR(lat, "outside")
+        layout.prop(lat, "outside")
 
 bpy.types.register(DATA_PT_context_lattice)
 bpy.types.register(DATA_PT_lattice)
index fb00ff4970014635d30ad302a892838ceb966a86..9c907101655ff78563d43c0035dc96401551e875 100644 (file)
@@ -47,10 +47,10 @@ class DATA_PT_context_mesh(DataButtonsPanel):
             split = layout.split(percentage=0.65)
             if ob:
                 split.template_ID(ob, "data")
-                split.itemS()
+                split.separator()
             elif mesh:
                 split.template_ID(space, "pin_id")
-                split.itemS()
+                split.separator()
         else:
             if ob:
                 layout.template_ID(ob, "data")
@@ -70,17 +70,17 @@ class DATA_PT_normals(DataButtonsPanel):
         split = layout.split()
 
         col = split.column()
-        col.itemR(mesh, "autosmooth")
+        col.prop(mesh, "autosmooth")
         sub = col.column()
         sub.active = mesh.autosmooth
-        sub.itemR(mesh, "autosmooth_angle", text="Angle")
+        sub.prop(mesh, "autosmooth_angle", text="Angle")
 
         if wide_ui:
             col = split.column()
         else:
-            col.itemS()
-        col.itemR(mesh, "vertex_normal_flip")
-        col.itemR(mesh, "double_sided")
+            col.separator()
+        col.prop(mesh, "vertex_normal_flip")
+        col.prop(mesh, "double_sided")
 
 
 class DATA_PT_settings(DataButtonsPanel):
@@ -91,7 +91,7 @@ class DATA_PT_settings(DataButtonsPanel):
 
         mesh = context.mesh
 
-        layout.itemR(mesh, "texture_mesh")
+        layout.prop(mesh, "texture_mesh")
 
 
 class DATA_PT_vertex_groups(DataButtonsPanel):
@@ -114,29 +114,29 @@ class DATA_PT_vertex_groups(DataButtonsPanel):
         row.template_list(ob, "vertex_groups", ob, "active_vertex_group_index", rows=rows)
 
         col = row.column(align=True)
-        col.itemO("object.vertex_group_add", icon='ICON_ZOOMIN', text="")
-        col.itemO("object.vertex_group_remove", icon='ICON_ZOOMOUT', text="")
+        col.operator("object.vertex_group_add", icon='ICON_ZOOMIN', text="")
+        col.operator("object.vertex_group_remove", icon='ICON_ZOOMOUT', text="")
 
-        col.itemO("object.vertex_group_copy", icon='ICON_COPY_ID', text="")
+        col.operator("object.vertex_group_copy", icon='ICON_COPY_ID', text="")
         if ob.data.users > 1:
-            col.itemO("object.vertex_group_copy_to_linked", icon='ICON_LINK_AREA', text="")
+            col.operator("object.vertex_group_copy_to_linked", icon='ICON_LINK_AREA', text="")
 
         if group:
             row = layout.row()
-            row.itemR(group, "name")
+            row.prop(group, "name")
 
         if ob.mode == 'EDIT' and len(ob.vertex_groups) > 0:
             row = layout.row()
 
             sub = row.row(align=True)
-            sub.itemO("object.vertex_group_assign", text="Assign")
-            sub.itemO("object.vertex_group_remove_from", text="Remove")
+            sub.operator("object.vertex_group_assign", text="Assign")
+            sub.operator("object.vertex_group_remove_from", text="Remove")
 
             sub = row.row(align=True)
-            sub.itemO("object.vertex_group_select", text="Select")
-            sub.itemO("object.vertex_group_deselect", text="Deselect")
+            sub.operator("object.vertex_group_select", text="Select")
+            sub.operator("object.vertex_group_deselect", text="Deselect")
 
-            layout.itemR(context.tool_settings, "vertex_group_weight", text="Weight")
+            layout.prop(context.tool_settings, "vertex_group_weight", text="Weight")
 
 
 class DATA_PT_shape_keys(DataButtonsPanel):
@@ -170,27 +170,27 @@ class DATA_PT_shape_keys(DataButtonsPanel):
         col = row.column()
 
         sub = col.column(align=True)
-        sub.itemO("object.shape_key_add", icon='ICON_ZOOMIN', text="")
-        sub.itemO("object.shape_key_remove", icon='ICON_ZOOMOUT', text="")
+        sub.operator("object.shape_key_add", icon='ICON_ZOOMIN', text="")
+        sub.operator("object.shape_key_remove", icon='ICON_ZOOMOUT', text="")
 
         if kb:
-            col.itemS()
+            col.separator()
 
             sub = col.column(align=True)
-            sub.item_enumO("object.shape_key_move", "type", 'UP', icon='ICON_TRIA_UP', text="")
-            sub.item_enumO("object.shape_key_move", "type", 'DOWN', icon='ICON_TRIA_DOWN', text="")
+            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="")
 
             split = layout.split(percentage=0.4)
             row = split.row()
             row.enabled = enable_edit
             if wide_ui:
-                row.itemR(key, "relative")
+                row.prop(key, "relative")
 
             row = split.row()
             row.alignment = 'RIGHT'
 
             if not wide_ui:
-                layout.itemR(key, "relative")
+                layout.prop(key, "relative")
                 row = layout.row()
 
 
@@ -198,48 +198,48 @@ class DATA_PT_shape_keys(DataButtonsPanel):
             subsub = sub.row(align=True)
             subsub.active = enable_edit_value
             if ob.shape_key_lock:
-                subsub.itemR(ob, "shape_key_lock", icon='ICON_PINNED', text="")
+                subsub.prop(ob, "shape_key_lock", icon='ICON_PINNED', text="")
             else:
-                subsub.itemR(ob, "shape_key_lock", icon='ICON_UNPINNED', text="")
+                subsub.prop(ob, "shape_key_lock", icon='ICON_UNPINNED', text="")
             if kb.mute:
-                subsub.itemR(kb, "mute", icon='ICON_MUTE_IPO_ON', text="")
+                subsub.prop(kb, "mute", icon='ICON_MUTE_IPO_ON', text="")
             else:
-                subsub.itemR(kb, "mute", icon='ICON_MUTE_IPO_OFF', text="")
-            sub.itemR(ob, "shape_key_edit_mode", text="")
+                subsub.prop(kb, "mute", icon='ICON_MUTE_IPO_OFF', text="")
+            sub.prop(ob, "shape_key_edit_mode", text="")
 
             sub = row.row(align=True)
-            sub.itemO("object.shape_key_mirror", icon='ICON_ARROW_LEFTRIGHT', text="")
-            sub.itemO("object.shape_key_clear", icon='ICON_X', text="")
+            sub.operator("object.shape_key_mirror", icon='ICON_ARROW_LEFTRIGHT', text="")
+            sub.operator("object.shape_key_clear", icon='ICON_X', text="")
 
 
             row = layout.row()
-            row.itemR(kb, "name")
+            row.prop(kb, "name")
 
             if key.relative:
                 if ob.active_shape_key_index != 0:
                     row = layout.row()
                     row.active = enable_edit_value
-                    row.itemR(kb, "value")
+                    row.prop(kb, "value")
 
                     split = layout.split()
 
                     col = split.column(align=True)
                     col.active = enable_edit_value
-                    col.itemL(text="Range:")
-                    col.itemR(kb, "slider_min", text="Min")
-                    col.itemR(kb, "slider_max", text="Max")
+                    col.label(text="Range:")
+                    col.prop(kb, "slider_min", text="Min")
+                    col.prop(kb, "slider_max", text="Max")
 
                     if wide_ui:
                         col = split.column(align=True)
                     col.active = enable_edit_value
-                    col.itemL(text="Blend:")
-                    col.item_pointerR(kb, "vertex_group", ob, "vertex_groups", text="")
-                    col.item_pointerR(kb, "relative_key", key, "keys", text="")
+                    col.label(text="Blend:")
+                    col.prop_pointer(kb, "vertex_group", ob, "vertex_groups", text="")
+                    col.prop_pointer(kb, "relative_key", key, "keys", text="")
 
             else:
                 row = layout.row()
                 row.active = enable_edit_value
-                row.itemR(key, "slurph")
+                row.prop(key, "slurph")
 
 
 class DATA_PT_uv_texture(DataButtonsPanel):
@@ -256,12 +256,12 @@ class DATA_PT_uv_texture(DataButtonsPanel):
         col.template_list(me, "uv_textures", me, "active_uv_texture_index", rows=2)
 
         col = row.column(align=True)
-        col.itemO("mesh.uv_texture_add", icon='ICON_ZOOMIN', text="")
-        col.itemO("mesh.uv_texture_remove", icon='ICON_ZOOMOUT', text="")
+        col.operator("mesh.uv_texture_add", icon='ICON_ZOOMIN', text="")
+        col.operator("mesh.uv_texture_remove", icon='ICON_ZOOMOUT', text="")
 
         lay = me.active_uv_texture
         if lay:
-            layout.itemR(lay, "name")
+            layout.prop(lay, "name")
 
 
 class DATA_PT_vertex_colors(DataButtonsPanel):
@@ -278,12 +278,12 @@ class DATA_PT_vertex_colors(DataButtonsPanel):
         col.template_list(me, "vertex_colors", me, "active_vertex_color_index", rows=2)
 
         col = row.column(align=True)
-        col.itemO("mesh.vertex_color_add", icon='ICON_ZOOMIN', text="")
-        col.itemO("mesh.vertex_color_remove", icon='ICON_ZOOMOUT', text="")
+        col.operator("mesh.vertex_color_add", icon='ICON_ZOOMIN', text="")
+        col.operator("mesh.vertex_color_remove", icon='ICON_ZOOMOUT', text="")
 
         lay = me.active_vertex_color
         if lay:
-            layout.itemR(lay, "name")
+            layout.prop(lay, "name")
 
 bpy.types.register(DATA_PT_context_mesh)
 bpy.types.register(DATA_PT_normals)
index 96bf7246d7e8790a2703d8c51b2db50aa2ce86f4..e36bdc991e179920694af3a0740acb92815d6465 100644 (file)
@@ -47,10 +47,10 @@ class DATA_PT_context_metaball(DataButtonsPanel):
             split = layout.split(percentage=0.65)
             if ob:
                 split.template_ID(ob, "data")
-                split.itemS()
+                split.separator()
             elif mball:
                 split.template_ID(space, "pin_id")
-                split.itemS()
+                split.separator()
         else:
             if ob:
                 layout.template_ID(ob, "data")
@@ -70,21 +70,21 @@ class DATA_PT_metaball(DataButtonsPanel):
         split = layout.split()
 
         col = split.column()
-        col.itemL(text="Resolution:")
+        col.label(text="Resolution:")
         sub = col.column(align=True)
-        sub.itemR(mball, "wire_size", text="View")
-        sub.itemR(mball, "render_size", text="Render")
+        sub.prop(mball, "wire_size", text="View")
+        sub.prop(mball, "render_size", text="Render")
 
         if wide_ui:
             col = split.column()
-        col.itemL(text="Settings:")
-        col.itemR(mball, "threshold", text="Threshold")
+        col.label(text="Settings:")
+        col.prop(mball, "threshold", text="Threshold")
 
-        layout.itemL(text="Update:")
+        layout.label(text="Update:")
         if wide_ui:
-            layout.itemR(mball, "flag", expand=True)
+            layout.prop(mball, "flag", expand=True)
         else:
-            layout.itemR(mball, "flag", text="")
+            layout.prop(mball, "flag", text="")
 
 
 class DATA_PT_metaball_element(DataButtonsPanel):
@@ -100,35 +100,35 @@ class DATA_PT_metaball_element(DataButtonsPanel):
         wide_ui = context.region.width > narrowui
 
         if wide_ui:
-            layout.itemR(metaelem, "type")
+            layout.prop(metaelem, "type")
         else:
-            layout.itemR(metaelem, "type", text="")
+            layout.prop(metaelem, "type", text="")
 
         split = layout.split()
 
         col = split.column(align=True)
-        col.itemL(text="Settings:")
-        col.itemR(metaelem, "stiffness", text="Stiffness")
-        col.itemR(metaelem, "negative", text="Negative")
-        col.itemR(metaelem, "hide", text="Hide")
+        col.label(text="Settings:")
+        col.prop(metaelem, "stiffness", text="Stiffness")
+        col.prop(metaelem, "negative", text="Negative")
+        col.prop(metaelem, "hide", text="Hide")
 
         if wide_ui:
             col = split.column(align=True)
 
         if metaelem.type in ('CUBE', 'ELLIPSOID'):
-            col.itemL(text="Size:")
-            col.itemR(metaelem, "size_x", text="X")
-            col.itemR(metaelem, "size_y", text="Y")
-            col.itemR(metaelem, "size_z", text="Z")
+            col.label(text="Size:")
+            col.prop(metaelem, "size_x", text="X")
+            col.prop(metaelem, "size_y", text="Y")
+            col.prop(metaelem, "size_z", text="Z")
 
         elif metaelem.type == 'TUBE':
-            col.itemL(text="Size:")
-            col.itemR(metaelem, "size_x", text="X")
+            col.label(text="Size:")
+            col.prop(metaelem, "size_x", text="X")
 
         elif metaelem.type == 'PLANE':
-            col.itemL(text="Size:")
-            col.itemR(metaelem, "size_x", text="X")
-            col.itemR(metaelem, "size_y", text="Y")
+            col.label(text="Size:")
+            col.prop(metaelem, "size_x", text="X")
+            col.prop(metaelem, "size_y", text="Y")
 
 bpy.types.register(DATA_PT_context_metaball)
 bpy.types.register(DATA_PT_metaball)
index 63006b27d15765191dac805facbf9f68dc920866..5a308d0849149e0fddd1aa50b75070a825b9331b 100644 (file)
@@ -38,9 +38,9 @@ class DATA_PT_modifiers(DataButtonsPanel):
         wide_ui = context.region.width > narrowui
 
         row = layout.row()
-        row.item_menu_enumO("object.modifier_add", "type")
+        row.operator_menu_enum("object.modifier_add", "type")
         if wide_ui:
-            row.itemL()
+            row.label()
 
         for md in ob.modifiers:
             box = layout.template_modifier(md)
@@ -56,447 +56,447 @@ class DATA_PT_modifiers(DataButtonsPanel):
         split = layout.split()
 
         col = split.column()
-        col.itemL(text="Object:")
-        col.itemR(md, "object", text="")
+        col.label(text="Object:")
+        col.prop(md, "object", text="")
 
         if wide_ui:
             col = split.column()
-        col.itemL(text="Vertex Group::")
-        col.item_pointerR(md, "vertex_group", ob, "vertex_groups", text="")
+        col.label(text="Vertex Group::")
+        col.prop_pointer(md, "vertex_group", ob, "vertex_groups", text="")
         sub = col.column()
         sub.active = md.vertex_group
-        sub.itemR(md, "invert")
+        sub.prop(md, "invert")
 
         split = layout.split()
 
         col = split.column()
-        col.itemL(text="Bind To:")
-        col.itemR(md, "use_vertex_groups", text="Vertex Groups")
-        col.itemR(md, "use_bone_envelopes", text="Bone Envelopes")
+        col.label(text="Bind To:")
+        col.prop(md, "use_vertex_groups", text="Vertex Groups")
+        col.prop(md, "use_bone_envelopes", text="Bone Envelopes")
 
         if wide_ui:
             col = split.column()
-        col.itemL(text="Deformation:")
-        col.itemR(md, "quaternion")
-        col.itemR(md, "multi_modifier")
+        col.label(text="Deformation:")
+        col.prop(md, "quaternion")
+        col.prop(md, "multi_modifier")
 
     def ARRAY(self, layout, ob, md, wide_ui):
         if wide_ui:
-            layout.itemR(md, "fit_type")
+            layout.prop(md, "fit_type")
         else:
-            layout.itemR(md, "fit_type", text="")
+            layout.prop(md, "fit_type", text="")
 
 
         if md.fit_type == 'FIXED_COUNT':
-            layout.itemR(md, "count")
+            layout.prop(md, "count")
         elif md.fit_type == 'FIT_LENGTH':
-            layout.itemR(md, "length")
+            layout.prop(md, "length")
         elif md.fit_type == 'FIT_CURVE':
-            layout.itemR(md, "curve")
+            layout.prop(md, "curve")
 
-        layout.itemS()
+        layout.separator()
 
         split = layout.split()
 
         col = split.column()
-        col.itemR(md, "constant_offset")
+        col.prop(md, "constant_offset")
         sub = col.column()
         sub.active = md.constant_offset
-        sub.itemR(md, "constant_offset_displacement", text="")
+        sub.prop(md, "constant_offset_displacement", text="")
 
-        col.itemS()
+        col.separator()
 
-        col.itemR(md, "merge_adjacent_vertices", text="Merge")
+        col.prop(md, "merge_adjacent_vertices", text="Merge")
         sub = col.column()
         sub.active = md.merge_adjacent_vertices
-        sub.itemR(md, "merge_end_vertices", text="First Last")
-        sub.itemR(md, "merge_distance", text="Distance")
+        sub.prop(md, "merge_end_vertices", text="First Last")
+        sub.prop(md, "merge_distance", text="Distance")
 
         if wide_ui:
             col = split.column()
-        col.itemR(md, "relative_offset")
+        col.prop(md, "relative_offset")
         sub = col.column()
         sub.active = md.relative_offset
-        sub.itemR(md, "relative_offset_displacement", text="")
+        sub.prop(md, "relative_offset_displacement", text="")
 
-        col.itemS()
+        col.separator()
 
-        col.itemR(md, "add_offset_object")
+        col.prop(md, "add_offset_object")
         sub = col.column()
         sub.active = md.add_offset_object
-        sub.itemR(md, "offset_object", text="")
+        sub.prop(md, "offset_object", text="")
 
-        layout.itemS()
+        layout.separator()
 
         col = layout.column()
-        col.itemR(md, "start_cap")
-        col.itemR(md, "end_cap")
+        col.prop(md, "start_cap")
+        col.prop(md, "end_cap")
 
     def BEVEL(self, layout, ob, md, wide_ui):
         split = layout.split()
 
         col = split.column()
-        col.itemR(md, "width")
+        col.prop(md, "width")
 
         if wide_ui:
             col = split.column()
-        col.itemR(md, "only_vertices")
+        col.prop(md, "only_vertices")
 
-        layout.itemL(text="Limit Method:")
-        layout.row().itemR(md, "limit_method", expand=True)
+        layout.label(text="Limit Method:")
+        layout.row().prop(md, "limit_method", expand=True)
         if md.limit_method == 'ANGLE':
-            layout.itemR(md, "angle")
+            layout.prop(md, "angle")
         elif md.limit_method == 'WEIGHT':
-            layout.row().itemR(md, "edge_weight_method", expand=True)
+            layout.row().prop(md, "edge_weight_method", expand=True)
 
     def BOOLEAN(self, layout, ob, md, wide_ui):
         split = layout.split()
 
         col = split.column()
-        col.itemL(text="Operation:")
-        col.itemR(md, "operation", text="")
+        col.label(text="Operation:")
+        col.prop(md, "operation", text="")
 
         if wide_ui:
             col = split.column()
-        col.itemL(text="Object:")
-        col.itemR(md, "object", text="")
+        col.label(text="Object:")
+        col.prop(md, "object", text="")
 
     def BUILD(self, layout, ob, md, wide_ui):
         split = layout.split()
 
         col = split.column()
-        col.itemR(md, "start")
-        col.itemR(md, "length")
+        col.prop(md, "start")
+        col.prop(md, "length")
 
         if wide_ui:
             col = split.column()
-        col.itemR(md, "randomize")
+        col.prop(md, "randomize")
         sub = col.column()
         sub.active = md.randomize
-        sub.itemR(md, "seed")
+        sub.prop(md, "seed")
 
     def CAST(self, layout, ob, md, wide_ui):
         split = layout.split(percentage=0.25)
 
         if wide_ui:
-            split.itemL(text="Cast Type:")
-            split.itemR(md, "cast_type", text="")
+            split.label(text="Cast Type:")
+            split.prop(md, "cast_type", text="")
         else:
-            layout.itemR(md, "cast_type", text="")
+            layout.prop(md, "cast_type", text="")
 
         split = layout.split(percentage=0.25)
 
         col = split.column()
-        col.itemR(md, "x")
-        col.itemR(md, "y")
-        col.itemR(md, "z")
+        col.prop(md, "x")
+        col.prop(md, "y")
+        col.prop(md, "z")
 
         col = split.column()
-        col.itemR(md, "factor")
-        col.itemR(md, "radius")
-        col.itemR(md, "size")
-        col.itemR(md, "from_radius")
+        col.prop(md, "factor")
+        col.prop(md, "radius")
+        col.prop(md, "size")
+        col.prop(md, "from_radius")
 
         split = layout.split()
 
         col = split.column()
-        col.itemL(text="Vertex Group:")
-        col.item_pointerR(md, "vertex_group", ob, "vertex_groups", text="")
+        col.label(text="Vertex Group:")
+        col.prop_pointer(md, "vertex_group", ob, "vertex_groups", text="")
         if wide_ui:
             col = split.column()
-        col.itemL(text="Control Object:")
-        col.itemR(md, "object", text="")
+        col.label(text="Control Object:")
+        col.prop(md, "object", text="")
         if md.object:
-            col.itemR(md, "use_transform")
+            col.prop(md, "use_transform")
 
     def CLOTH(self, layout, ob, md, wide_ui):
-        layout.itemL(text="See Cloth panel.")
+        layout.label(text="See Cloth panel.")
 
     def COLLISION(self, layout, ob, md, wide_ui):
-        layout.itemL(text="See Collision panel.")
+        layout.label(text="See Collision panel.")
 
     def CURVE(self, layout, ob, md, wide_ui):
         split = layout.split()
 
         col = split.column()
-        col.itemL(text="Object:")
-        col.itemR(md, "object", text="")
+        col.label(text="Object:")
+        col.prop(md, "object", text="")
         if wide_ui:
             col = split.column()
-        col.itemL(text="Vertex Group:")
-        col.item_pointerR(md, "vertex_group", ob, "vertex_groups", text="")
-        layout.itemL(text="Deformation Axis:")
-        layout.row().itemR(md, "deform_axis", expand=True)
+        col.label(text="Vertex Group:")
+        col.prop_pointer(md, "vertex_group", ob, "vertex_groups", text="")
+        layout.label(text="Deformation Axis:")
+        layout.row().prop(md, "deform_axis", expand=True)
 
     def DECIMATE(self, layout, ob, md, wide_ui):
-        layout.itemR(md, "ratio")
-        layout.itemR(md, "face_count")
+        layout.prop(md, "ratio")
+        layout.prop(md, "face_count")
 
     def DISPLACE(self, layout, ob, md, wide_ui):
         split = layout.split()
 
         col = split.column()
-        col.itemL(text="Texture:")
-        col.itemR(md, "texture", text="")
-        col.itemL(text="Vertex Group:")
-        col.item_pointerR(md, "vertex_group", ob, "vertex_groups", text="")
+        col.label(text="Texture:")
+        col.prop(md, "texture", text="")
+        col.label(text="Vertex Group:")
+        col.prop_pointer(md, "vertex_group", ob, "vertex_groups", text="")
 
         if wide_ui:
             col = split.column()
-        col.itemL(text="Direction:")
-        col.itemR(md, "direction", text="")
-        col.itemL(text="Texture Coordinates:")
-        col.itemR(md, "texture_coordinates", text="")
+        col.label(text="Direction:")
+        col.prop(md, "direction", text="")
+        col.label(text="Texture Coordinates:")
+        col.prop(md, "texture_coordinates", text="")
         if md.texture_coordinates == 'OBJECT':
-            layout.itemR(md, "texture_coordinate_object", text="Object")
+            layout.prop(md, "texture_coordinate_object", text="Object")
         elif md.texture_coordinates == 'UV' and ob.type == 'MESH':
-            layout.item_pointerR(md, "uv_layer", ob.data, "uv_textures")
+            layout.prop_pointer(md, "uv_layer", ob.data, "uv_textures")
 
-        layout.itemS()
+        layout.separator()
 
         split = layout.split()
 
         col = split.column()
-        col.itemR(md, "midlevel")
+        col.prop(md, "midlevel")
 
         if wide_ui:
             col = split.column()
-        col.itemR(md, "strength")
+        col.prop(md, "strength")
 
     def EDGE_SPLIT(self, layout, ob, md, wide_ui):
         split = layout.split()
 
         col = split.column()
-        col.itemR(md, "use_edge_angle", text="Edge Angle")
+        col.prop(md, "use_edge_angle", text="Edge Angle")
         sub = col.column()
         sub.active = md.use_edge_angle
-        sub.itemR(md, "split_angle")
+        sub.prop(md, "split_angle")
 
         if wide_ui:
             col = split.column()
-        col.itemR(md, "use_sharp", text="Sharp Edges")
+        col.prop(md, "use_sharp", text="Sharp Edges")
 
     def EXPLODE(self, layout, ob, md, wide_ui):
         split = layout.split()
 
         col = split.column()
-        col.itemL(text="Vertex group:")
-        col.item_pointerR(md, "vertex_group", ob, "vertex_groups", text="")
+        col.label(text="Vertex group:")
+        col.prop_pointer(md, "vertex_group", ob, "vertex_groups", text="")
         sub = col.column()
         sub.active = md.vertex_group
-        sub.itemR(md, "protect")
+        sub.prop(md, "protect")
 
         if wide_ui:
             col = split.column()
-        col.itemR(md, "split_edges")
-        col.itemR(md, "unborn")
-        col.itemR(md, "alive")
-        col.itemR(md, "dead")
+        col.prop(md, "split_edges")
+        col.prop(md, "unborn")
+        col.prop(md, "alive")
+        col.prop(md, "dead")
 
-        layout.itemO("object.explode_refresh", text="Refresh")
+        layout.operator("object.explode_refresh", text="Refresh")
 
     def FLUID_SIMULATION(self, layout, ob, md, wide_ui):
-        layout.itemL(text="See Fluid panel.")
+        layout.label(text="See Fluid panel.")
 
     def HOOK(self, layout, ob, md, wide_ui):
         split = layout.split()
 
         col = split.column()
-        col.itemL(text="Object:")
-        col.itemR(md, "object", text="")
+        col.label(text="Object:")
+        col.prop(md, "object", text="")
         if md.object and md.object.type == 'ARMATURE':
-            col.itemL(text="Bone:")
-            col.item_pointerR(md, "subtarget", md.object.data, "bones", text="")
+            col.label(text="Bone:")
+            col.prop_pointer(md, "subtarget", md.object.data, "bones", text="")
         if wide_ui:
             col = split.column()
-        col.itemL(text="Vertex Group:")
-        col.item_pointerR(md, "vertex_group", ob, "vertex_groups", text="")
+        col.label(text="Vertex Group:")
+        col.prop_pointer(md, "vertex_group", ob, "vertex_groups", text="")
 
-        layout.itemS()
+        layout.separator()
 
         split = layout.split()
 
         col = split.column()
-        col.itemR(md, "falloff")
-        col.itemR(md, "force", slider=True)
+        col.prop(md, "falloff")
+        col.prop(md, "force", slider=True)
         if wide_ui:
             col = split.column()
         else:
-            col.itemS()
-        col.itemO("object.hook_reset", text="Reset")
-        col.itemO("object.hook_recenter", text="Recenter")
+            col.separator()
+        col.operator("object.hook_reset", text="Reset")
+        col.operator("object.hook_recenter", text="Recenter")
 
         if ob.mode == 'EDIT':
-            layout.itemS()
+            layout.separator()
             row = layout.row()
-            row.itemO("object.hook_select", text="Select")
-            row.itemO("object.hook_assign", text="Assign")
+            row.operator("object.hook_select", text="Select")
+            row.operator("object.hook_assign", text="Assign")
 
     def LATTICE(self, layout, ob, md, wide_ui):
         split = layout.split()
 
         col = split.column()
-        col.itemL(text="Object:")
-        col.itemR(md, "object", text="")
+        col.label(text="Object:")
+        col.prop(md, "object", text="")
 
         if wide_ui:
             col = split.column()
-        col.itemL(text="Vertex Group:")
-        col.item_pointerR(md, "vertex_group", ob, "vertex_groups", text="")
+        col.label(text="Vertex Group:")
+        col.prop_pointer(md, "vertex_group", ob, "vertex_groups", text="")
 
     def MASK(self, layout, ob, md, wide_ui):
         split = layout.split()
 
         col = split.column()
-        col.itemL(text="Mode:")
-        col.itemR(md, "mode", text="")
+        col.label(text="Mode:")
+        col.prop(md, "mode", text="")
         if wide_ui:
             col = split.column()
-        col.itemL(text="Vertex Group:")
+        col.label(text="Vertex Group:")
         if md.mode == 'ARMATURE':
-            col.itemR(md, "armature", text="")
+            col.prop(md, "armature", text="")
         elif md.mode == 'VERTEX_GROUP':
-            col.item_pointerR(md, "vertex_group", ob, "vertex_groups", text="")
+            col.prop_pointer(md, "vertex_group", ob, "vertex_groups", text="")
 
         sub = col.column()
         sub.active = md.vertex_group
-        sub.itemR(md, "invert")
+        sub.prop(md, "invert")
 
     def MESH_DEFORM(self, layout, ob, md, wide_ui):
         split = layout.split()
         col = split.column()
-        col.itemL(text="Object:")
-        col.itemR(md, "object", text="")
+        col.label(text="Object:")
+        col.prop(md, "object", text="")
         if md.object and md.object.type == 'ARMATURE':
-            col.itemL(text="Bone:")
-            col.item_pointerR(md, "subtarget", md.object.data, "bones", text="")
+            col.label(text="Bone:")
+            col.prop_pointer(md, "subtarget", md.object.data, "bones", text="")
         if wide_ui:
             col = split.column()
-        col.itemL(text="Vertex Group:")
-        col.item_pointerR(md, "vertex_group", ob, "vertex_groups", text="")
+        col.label(text="Vertex Group:")
+        col.prop_pointer(md, "vertex_group", ob, "vertex_groups", text="")
 
         sub = col.column()
         sub.active = md.vertex_group
-        sub.itemR(md, "invert")
+        sub.prop(md, "invert")
 
-        layout.itemS()
+        layout.separator()
 
         if md.is_bound:
-            layout.itemO("object.meshdeform_bind", text="Unbind")
+            layout.operator("object.meshdeform_bind", text="Unbind")
         else:
-            layout.itemO("object.meshdeform_bind", text="Bind")
+            layout.operator("object.meshdeform_bind", text="Bind")
             split = layout.split()
 
             col = split.column()
-            col.itemR(md, "precision")
+            col.prop(md, "precision")
 
             if wide_ui:
                 col = split.column()
-            col.itemR(md, "dynamic")
+            col.prop(md, "dynamic")
 
     def MIRROR(self, layout, ob, md, wide_ui):
-        layout.itemR(md, "merge_limit")
+        layout.prop(md, "merge_limit")
         if wide_ui:
             split = layout.split(percentage=0.25)
         else:
             split = layout.split(percentage=0.4)
 
         col = split.column()
-        col.itemL(text="Axis:")
-        col.itemR(md, "x")
-        col.itemR(md, "y")
-        col.itemR(md, "z")
+        col.label(text="Axis:")
+        col.prop(md, "x")
+        col.prop(md, "y")
+        col.prop(md, "z")
 
         if wide_ui:
             col = split.column()
         else:
             subsplit = layout.split()
             col = subsplit.column()
-        col.itemL(text="Options:")
-        col.itemR(md, "clip", text="Clipping")
-        col.itemR(md, "mirror_vertex_groups", text="Vertex Groups")
+        col.label(text="Options:")
+        col.prop(md, "clip", text="Clipping")
+        col.prop(md, "mirror_vertex_groups", text="Vertex Groups")
 
         col = split.column()
-        col.itemL(text="Textures:")
-        col.itemR(md, "mirror_u", text="U")
-        col.itemR(md, "mirror_v", text="V")
+        col.label(text="Textures:")
+        col.prop(md, "mirror_u", text="U")
+        col.prop(md, "mirror_v", text="V")
 
         col = layout.column()
-        col.itemL(text="Mirror Object:")
-        col.itemR(md, "mirror_object", text="")
+        col.label(text="Mirror Object:")
+        col.prop(md, "mirror_object", text="")
 
     def MULTIRES(self, layout, ob, md, wide_ui):
         if wide_ui:
-            layout.row().itemR(md, "subdivision_type", expand=True)
+            layout.row().prop(md, "subdivision_type", expand=True)
         else:
-            layout.row().itemR(md, "subdivision_type", text="")
-        layout.itemR(md, "level")
+            layout.row().prop(md, "subdivision_type", text="")
+        layout.prop(md, "level")
 
         split = layout.split()
 
         col = split.column()
-        col.itemO("object.multires_subdivide", text="Subdivide")
+        col.operator("object.multires_subdivide", text="Subdivide")
 
         if wide_ui:
             col = split.column()
-        col.itemO("object.multires_higher_levels_delete", text="Delete Higher")
+        col.operator("object.multires_higher_levels_delete", text="Delete Higher")
 
     def PARTICLE_INSTANCE(self, layout, ob, md, wide_ui):
-        layout.itemR(md, "object")
-        layout.itemR(md, "particle_system_number", text="Particle System")
+        layout.prop(md, "object")
+        layout.prop(md, "particle_system_number", text="Particle System")
 
         split = layout.split()
         col = split.column()
-        col.itemL(text="Create From:")
-        col.itemR(md, "normal")
-        col.itemR(md, "children")
-        col.itemR(md, "size")
+        col.label(text="Create From:")
+        col.prop(md, "normal")
+        col.prop(md, "children")
+        col.prop(md, "size")
 
         if wide_ui:
             col = split.column()
-        col.itemL(text="Show Particles When:")
-        col.itemR(md, "alive")
-        col.itemR(md, "unborn")
-        col.itemR(md, "dead")
+        col.label(text="Show Particles When:")
+        col.prop(md, "alive")
+        col.prop(md, "unborn")
+        col.prop(md, "dead")
 
-        layout.itemS()
+        layout.separator()
 
-        layout.itemR(md, "path", text="Create Along Paths")
+        layout.prop(md, "path", text="Create Along Paths")
 
         split = layout.split()
         split.active = md.path
         col = split.column()
-        col.row().itemR(md, "axis", expand=True)
-        col.itemR(md, "keep_shape")
+        col.row().prop(md, "axis", expand=True)
+        col.prop(md, "keep_shape")
 
         if wide_ui:
             col = split.column()
-        col.itemR(md, "position", slider=True)
-        col.itemR(md, "random_position", text="Random", slider=True)
+        col.prop(md, "position", slider=True)
+        col.prop(md, "random_position", text="Random", slider=True)
 
     def PARTICLE_SYSTEM(self, layout, ob, md, wide_ui):
-        layout.itemL(text="See Particle panel.")
+        layout.label(text="See Particle panel.")
 
     def SHRINKWRAP(self, layout, ob, md, wide_ui):
         split = layout.split()
         col = split.column()
-        col.itemL(text="Target:")
-        col.itemR(md, "target", text="")
+        col.label(text="Target:")
+        col.prop(md, "target", text="")
         if wide_ui:
             col = split.column()
-        col.itemL(text="Vertex Group:")
-        col.item_pointerR(md, "vertex_group", ob, "vertex_groups", text="")
+        col.label(text="Vertex Group:")
+        col.prop_pointer(md, "vertex_group", ob, "vertex_groups", text="")
 
         split = layout.split()
 
         col = split.column()
-        col.itemR(md, "offset")
-        col.itemR(md, "subsurf_levels")
+        col.prop(md, "offset")
+        col.prop(md, "subsurf_levels")
 
         if wide_ui:
             col = split.column()
-            col.itemL(text="Mode:")
-        col.itemR(md, "mode", text="")
+            col.label(text="Mode:")
+        col.prop(md, "mode", text="")
 
         if wide_ui:
             split = layout.split(percentage=0.25)
@@ -505,186 +505,186 @@ class DATA_PT_modifiers(DataButtonsPanel):
         col = split.column()
 
         if md.mode == 'PROJECT':
-            col.itemL(text="Axis:")
-            col.itemR(md, "x")
-            col.itemR(md, "y")
-            col.itemR(md, "z")
+            col.label(text="Axis:")
+            col.prop(md, "x")
+            col.prop(md, "y")
+            col.prop(md, "z")
 
             col = split.column()
-            col.itemL(text="Direction:")
-            col.itemR(md, "negative")
-            col.itemR(md, "positive")
+            col.label(text="Direction:")
+            col.prop(md, "negative")
+            col.prop(md, "positive")
 
             if wide_ui:
                 col = split.column()
             else:
                 subsplit = layout.split()
                 col = subsplit.column()
-            col.itemL(text="Cull Faces:")
-            col.itemR(md, "cull_front_faces", text="Front")
-            col.itemR(md, "cull_back_faces", text="Back")
+            col.label(text="Cull Faces:")
+            col.prop(md, "cull_front_faces", text="Front")
+            col.prop(md, "cull_back_faces", text="Back")
 
-            layout.itemL(text="Auxiliary Target:")
-            layout.itemR(md, "auxiliary_target", text="")
+            layout.label(text="Auxiliary Target:")
+            layout.prop(md, "auxiliary_target", text="")
 
         elif md.mode == 'NEAREST_SURFACEPOINT':
-            layout.itemR(md, "keep_above_surface")
+            layout.prop(md, "keep_above_surface")
 
     def SIMPLE_DEFORM(self, layout, ob, md, wide_ui):
         split = layout.split()
 
         col = split.column()
-        col.itemL(text="Mode:")
-        col.itemR(md, "mode", text="")
+        col.label(text="Mode:")
+        col.prop(md, "mode", text="")
 
         if wide_ui:
             col = split.column()
-        col.itemL(text="Vertex Group:")
-        col.item_pointerR(md, "vertex_group", ob, "vertex_groups", text="")
+        col.label(text="Vertex Group:")
+        col.prop_pointer(md, "vertex_group", ob, "vertex_groups", text="")
 
         split = layout.split()
 
         col = split.column()
-        col.itemL(text="Origin:")
-        col.itemR(md, "origin", text="")
+        col.label(text="Origin:")
+        col.prop(md, "origin", text="")
         sub = col.column()
         sub.active = md.origin
-        sub.itemR(md, "relative")
+        sub.prop(md, "relative")
 
         if wide_ui:
             col = split.column()
-        col.itemL(text="Deform:")
-        col.itemR(md, "factor")
-        col.itemR(md, "limits", slider=True)
+        col.label(text="Deform:")
+        col.prop(md, "factor")
+        col.prop(md, "limits", slider=True)
         if md.mode in ('TAPER', 'STRETCH'):
-            col.itemR(md, "lock_x_axis")
-            col.itemR(md, "lock_y_axis")
+            col.prop(md, "lock_x_axis")
+            col.prop(md, "lock_y_axis")
 
     def SMOKE(self, layout, ob, md, wide_ui):
-        layout.itemL(text="See Smoke panel.")
+        layout.label(text="See Smoke panel.")
 
     def SMOOTH(self, layout, ob, md, wide_ui):
         split = layout.split(percentage=0.25)
 
         col = split.column()
-        col.itemL(text="Axis:")
-        col.itemR(md, "x")
-        col.itemR(md, "y")
-        col.itemR(md, "z")
+        col.label(text="Axis:")
+        col.prop(md, "x")
+        col.prop(md, "y")
+        col.prop(md, "z")
 
         col = split.column()
-        col.itemR(md, "factor")
-        col.itemR(md, "repeat")
-        col.itemL(text="Vertex Group:")
-        col.item_pointerR(md, "vertex_group", ob, "vertex_groups", text="")
+        col.prop(md, "factor")
+        col.prop(md, "repeat")
+        col.label(text="Vertex Group:")
+        col.prop_pointer(md, "vertex_group", ob, "vertex_groups", text="")
 
     def SOFT_BODY(self, layout, ob, md, wide_ui):
-        layout.itemL(text="See Soft Body panel.")
+        layout.label(text="See Soft Body panel.")
 
     def SUBSURF(self, layout, ob, md, wide_ui):
         if wide_ui:
-            layout.row().itemR(md, "subdivision_type", expand=True)
+            layout.row().prop(md, "subdivision_type", expand=True)
         else:
-            layout.row().itemR(md, "subdivision_type", text="")
+            layout.row().prop(md, "subdivision_type", text="")
 
         split = layout.split()
         col = split.column()
-        col.itemL(text="Subdivisions:")
-        col.itemR(md, "levels", text="View")
-        col.itemR(md, "render_levels", text="Render")
+        col.label(text="Subdivisions:")
+        col.prop(md, "levels", text="View")
+        col.prop(md, "render_levels", text="Render")
 
         if wide_ui:
             col = split.column()
-        col.itemL(text="Options:")
-        col.itemR(md, "optimal_draw", text="Optimal Display")
-        col.itemR(md, "subsurf_uv")
+        col.label(text="Options:")
+        col.prop(md, "optimal_draw", text="Optimal Display")
+        col.prop(md, "subsurf_uv")
 
     def SURFACE(self, layout, ob, md, wide_ui):
-        layout.itemL(text="See Fields panel.")
+        layout.label(text="See Fields panel.")
 
     def UV_PROJECT(self, layout, ob, md, wide_ui):
         if ob.type == 'MESH':
             split = layout.split()
             col = split.column()
-            col.itemL(text="UV Layer:")
-            col.item_pointerR(md, "uv_layer", ob.data, "uv_textures", text="")
+            col.label(text="UV Layer:")
+            col.prop_pointer(md, "uv_layer", ob.data, "uv_textures", text="")
 
             if wide_ui:
                 col = split.column()
-            col.itemL(text="Image:")
-            col.itemR(md, "image", text="")
+            col.label(text="Image:")
+            col.prop(md, "image", text="")
 
             split = layout.split()
             col = split.column()
-            col.itemR(md, "override_image")
-            col.itemR(md, "num_projectors", text="Projectors")
+            col.prop(md, "override_image")
+            col.prop(md, "num_projectors", text="Projectors")
             for proj in md.projectors:
-                col.itemR(proj, "object", text="")
+                col.prop(proj, "object", text="")
 
             if wide_ui:
                 col = split.column()
             sub = col.column(align=True)
-            sub.itemL(text="Aspect Ratio:")
-            sub.itemR(md, "horizontal_aspect_ratio", text="Horizontal")
-            sub.itemR(md, "vertical_aspect_ratio", text="Vertical")
+            sub.label(text="Aspect Ratio:")
+            sub.prop(md, "horizontal_aspect_ratio", text="Horizontal")
+            sub.prop(md, "vertical_aspect_ratio", text="Vertical")
 
     def WAVE(self, layout, ob, md, wide_ui):
         split = layout.split()
 
         col = split.column()
-        col.itemL(text="Motion:")
-        col.itemR(md, "x")
-        col.itemR(md, "y")
-        col.itemR(md, "cyclic")
+        col.label(text="Motion:")
+        col.prop(md, "x")
+        col.prop(md, "y")
+        col.prop(md, "cyclic")
 
         if wide_ui:
             col = split.column()
-        col.itemR(md, "normals")
+        col.prop(md, "normals")
         sub = col.column()
         sub.active = md.normals
-        sub.itemR(md, "x_normal", text="X")
-        sub.itemR(md, "y_normal", text="Y")
-        sub.itemR(md, "z_normal", text="Z")
+        sub.prop(md, "x_normal", text="X")
+        sub.prop(md, "y_normal", text="Y")
+        sub.prop(md, "z_normal", text="Z")
 
         split = layout.split()
 
         col = split.column()
-        col.itemL(text="Time:")
+        col.label(text="Time:")
         sub = col.column(align=True)
-        sub.itemR(md, "time_offset", text="Offset")
-        sub.itemR(md, "lifetime", text="Life")
-        col.itemR(md, "damping_time", text="Damping")
+        sub.prop(md, "time_offset", text="Offset")
+        sub.prop(md, "lifetime", text="Life")
+        col.prop(md, "damping_time", text="Damping")
 
         if wide_ui:
             col = split.column()
-        col.itemL(text="Position:")
+        col.label(text="Position:")
         sub = col.column(align=True)
-        sub.itemR(md, "start_position_x", text="X")
-        sub.itemR(md, "start_position_y", text="Y")
-        col.itemR(md, "falloff_radius", text="Falloff")
+        sub.prop(md, "start_position_x", text="X")
+        sub.prop(md, "start_position_y", text="Y")
+        col.prop(md, "falloff_radius", text="Falloff")
 
-        layout.itemS()
+        layout.separator()
 
-        layout.itemR(md, "start_position_object")
-        layout.item_pointerR(md, "vertex_group", ob, "vertex_groups")
-        layout.itemR(md, "texture")
-        layout.itemR(md, "texture_coordinates")
+        layout.prop(md, "start_position_object")
+        layout.prop_pointer(md, "vertex_group", ob, "vertex_groups")
+        layout.prop(md, "texture")
+        layout.prop(md, "texture_coordinates")
         if md.texture_coordinates == 'MAP_UV' and ob.type == 'MESH':
-            layout.item_pointerR(md, "uv_layer", ob.data, "uv_textures")
+            layout.prop_pointer(md, "uv_layer", ob.data, "uv_textures")
         elif md.texture_coordinates == 'OBJECT':
-            layout.itemR(md, "texture_coordinates_object")
+            layout.prop(md, "texture_coordinates_object")
 
-        layout.itemS()
+        layout.separator()
 
         split = layout.split()
 
         col = split.column()
-        col.itemR(md, "speed", slider=True)
-        col.itemR(md, "height", slider=True)
+        col.prop(md, "speed", slider=True)
+        col.prop(md, "height", slider=True)
 
         if wide_ui:
             col = split.column()
-        col.itemR(md, "width", slider=True)
-        col.itemR(md, "narrowness", slider=True)
+        col.prop(md, "width", slider=True)
+        col.prop(md, "narrowness", slider=True)
 
 bpy.types.register(DATA_PT_modifiers)
index 150296af07096cfdcf01e6e0b484452a51f08f46..6f62d35f8db47e54667e33e26651c6e9b9562f3a 100644 (file)
@@ -45,120 +45,120 @@ class PHYSICS_PT_game_physics(PhysicsButtonsPanel):
         wide_ui = context.region.width > narrowui
 
         if wide_ui:
-            layout.itemR(game, "physics_type")
+            layout.prop(game, "physics_type")
         else:
-            layout.itemR(game, "physics_type", text="")
-        layout.itemS()
+            layout.prop(game, "physics_type", text="")
+        layout.separator()
 
         #if game.physics_type == 'DYNAMIC':
         if game.physics_type in ('DYNAMIC', 'RIGID_BODY'):
             split = layout.split()
 
             col = split.column()
-            col.itemR(game, "actor")
-            col.itemR(game, "ghost")
-            col.itemR(ob, "restrict_render", text="Invisible") # out of place but useful
+            col.prop(game, "actor")
+            col.prop(game, "ghost")
+            col.prop(ob, "restrict_render", text="Invisible") # out of place but useful
 
             if wide_ui:
                 col = split.column()
-            col.itemR(game, "material_physics")
-            col.itemR(game, "rotate_from_normal")
-            col.itemR(game, "no_sleeping")
+            col.prop(game, "material_physics")
+            col.prop(game, "rotate_from_normal")
+            col.prop(game, "no_sleeping")
 
-            layout.itemS()
+            layout.separator()
 
             split = layout.split()
 
             col = split.column()
-            col.itemL(text="Attributes:")
-            col.itemR(game, "mass")
-            col.itemR(game, "radius")
-            col.itemR(game, "form_factor")
+            col.label(text="Attributes:")
+            col.prop(game, "mass")
+            col.prop(game, "radius")
+            col.prop(game, "form_factor")
 
             if wide_ui:
                 col = split.column()
             sub = col.column()
             sub.active = (game.physics_type == 'RIGID_BODY')
-            sub.itemR(game, "anisotropic_friction")
+            sub.prop(game, "anisotropic_friction")
             subsub = sub.column()
             subsub.active = game.anisotropic_friction
-            subsub.itemR(game, "friction_coefficients", text="", slider=True)
+            subsub.prop(game, "friction_coefficients", text="", slider=True)
 
             split = layout.split()
 
             col = split.column()
-            col.itemL(text="Velocity:")
+            col.label(text="Velocity:")
             sub = col.column(align=True)
-            sub.itemR(game, "minimum_velocity", text="Minimum")
-            sub.itemR(game, "maximum_velocity", text="Maximum")
+            sub.prop(game, "minimum_velocity", text="Minimum")
+            sub.prop(game, "maximum_velocity", text="Maximum")
 
             if wide_ui:
                 col = split.column()
-            col.itemL(text="Damping:")
+            col.label(text="Damping:")
             sub = col.column(align=True)
-            sub.itemR(game, "damping", text="Translation", slider=True)
-            sub.itemR(game, "rotation_damping", text="Rotation", slider=True)
+            sub.prop(game, "damping", text="Translation", slider=True)
+            sub.prop(game, "rotation_damping", text="Rotation", slider=True)
 
-            layout.itemS()
+            layout.separator()
 
             split = layout.split()
 
             col = split.column()
-            col.itemL(text="Lock Translation:")
-            col.itemR(game, "lock_x_axis", text="X")
-            col.itemR(game, "lock_y_axis", text="Y")
-            col.itemR(game, "lock_z_axis", text="Z")
+            col.label(text="Lock Translation:")
+            col.prop(game, "lock_x_axis", text="X")
+            col.prop(game, "lock_y_axis", text="Y")
+            col.prop(game, "lock_z_axis", text="Z")
 
             col = split.column()
-            col.itemL(text="Lock Rotation:")
-            col.itemR(game, "lock_x_rot_axis", text="X")
-            col.itemR(game, "lock_y_rot_axis", text="Y")
-            col.itemR(game, "lock_z_rot_axis", text="Z")
+            col.label(text="Lock Rotation:")
+            col.prop(game, "lock_x_rot_axis", text="X")
+            col.prop(game, "lock_y_rot_axis", text="Y")
+            col.prop(game, "lock_z_rot_axis", text="Z")
 
         elif game.physics_type == 'SOFT_BODY':
             col = layout.column()
-            col.itemR(game, "actor")
-            col.itemR(game, "ghost")
-            col.itemR(ob, "restrict_render", text="Invisible")
+            col.prop(game, "actor")
+            col.prop(game, "ghost")
+            col.prop(ob, "restrict_render", text="Invisible")
 
-            layout.itemS()
+            layout.separator()
 
             split = layout.split()
 
             col = split.column()
-            col.itemL(text="Attributes:")
-            col.itemR(game, "mass")
-            col.itemR(soft, "welding")
-            col.itemR(soft, "position_iterations")
-            col.itemR(soft, "linstiff", slider=True)
-            col.itemR(soft, "dynamic_friction", slider=True)
-            col.itemR(soft, "margin", slider=True)
-            col.itemR(soft, "bending_const", text="Bending Constraints")
+            col.label(text="Attributes:")
+            col.prop(game, "mass")
+            col.prop(soft, "welding")
+            col.prop(soft, "position_iterations")
+            col.prop(soft, "linstiff", slider=True)
+            col.prop(soft, "dynamic_friction", slider=True)
+            col.prop(soft, "margin", slider=True)
+            col.prop(soft, "bending_const", text="Bending Constraints")
 
             if wide_ui:
                 col = split.column()
-            col.itemR(soft, "shape_match")
+            col.prop(soft, "shape_match")
             sub = col.column()
             sub.active = soft.shape_match
-            sub.itemR(soft, "threshold", slider=True)
+            sub.prop(soft, "threshold", slider=True)
 
-            col.itemS()
+            col.separator()
 
-            col.itemL(text="Cluster Collision:")
-            col.itemR(soft, "cluster_rigid_to_softbody")
-            col.itemR(soft, "cluster_soft_to_softbody")
+            col.label(text="Cluster Collision:")
+            col.prop(soft, "cluster_rigid_to_softbody")
+            col.prop(soft, "cluster_soft_to_softbody")
             sub = col.column()
             sub.active = (soft.cluster_rigid_to_softbody or soft.cluster_soft_to_softbody)
-            sub.itemR(soft, "cluster_iterations", text="Iterations")
+            sub.prop(soft, "cluster_iterations", text="Iterations")
 
         elif game.physics_type == 'STATIC':
             col = layout.column()
-            col.itemR(game, "actor")
-            col.itemR(game, "ghost")
-            col.itemR(ob, "restrict_render", text="Invisible")
+            col.prop(game, "actor")
+            col.prop(game, "ghost")
+            col.prop(ob, "restrict_render", text="Invisible")
 
         elif game.physics_type in ('SENSOR', 'INVISIBLE', 'NO_COLLISION', 'OCCLUDE'):
-            layout.itemR(ob, "restrict_render", text="Invisible")
+            layout.prop(ob, "restrict_render", text="Invisible")
 
 
 class PHYSICS_PT_game_collision_bounds(PhysicsButtonsPanel):
@@ -172,7 +172,7 @@ class PHYSICS_PT_game_collision_bounds(PhysicsButtonsPanel):
     def draw_header(self, context):
         game = context.active_object.game
 
-        self.layout.itemR(game, "use_collision_bounds", text="")
+        self.layout.prop(game, "use_collision_bounds", text="")
 
     def draw(self, context):
         layout = self.layout
@@ -182,18 +182,18 @@ class PHYSICS_PT_game_collision_bounds(PhysicsButtonsPanel):
 
         layout.active = game.use_collision_bounds
         if wide_ui:
-            layout.itemR(game, "collision_bounds", text="Bounds")
+            layout.prop(game, "collision_bounds", text="Bounds")
         else:
-            layout.itemR(game, "collision_bounds", text="")
+            layout.prop(game, "collision_bounds", text="")
 
         split = layout.split()
 
         col = split.column()
-        col.itemR(game, "collision_margin", text="Margin", slider=True)
+        col.prop(game, "collision_margin", text="Margin", slider=True)
 
         if wide_ui:
             col = split.column()
-        col.itemR(game, "collision_compound", text="Compound")
+        col.prop(game, "collision_compound", text="Compound")
 
 
 bpy.types.register(PHYSICS_PT_game_physics)
@@ -217,8 +217,8 @@ class RENDER_PT_game(RenderButtonsPanel):
         layout = self.layout
 
         row = layout.row()
-        row.itemO("view3d.game_start", text="Start")
-        row.itemL()
+        row.operator("view3d.game_start", text="Start")
+        row.label()
 
 
 class RENDER_PT_game_player(RenderButtonsPanel):
@@ -230,32 +230,32 @@ class RENDER_PT_game_player(RenderButtonsPanel):
         gs = context.scene.game_data
         wide_ui = context.region.width > narrowui
 
-        layout.itemR(gs, "fullscreen")
+        layout.prop(gs, "fullscreen")
 
         split = layout.split()
 
         col = split.column()
-        col.itemL(text="Resolution:")
+        col.label(text="Resolution:")
         sub = col.column(align=True)
-        sub.itemR(gs, "resolution_x", slider=False, text="X")
-        sub.itemR(gs, "resolution_y", slider=False, text="Y")
+        sub.prop(gs, "resolution_x", slider=False, text="X")
+        sub.prop(gs, "resolution_y", slider=False, text="Y")
 
         if wide_ui:
             col = split.column()
-        col.itemL(text="Quality:")
+        col.label(text="Quality:")
         sub = col.column(align=True)
-        sub.itemR(gs, "depth", text="Bit Depth", slider=False)
-        sub.itemR(gs, "frequency", text="FPS", slider=False)
+        sub.prop(gs, "depth", text="Bit Depth", slider=False)
+        sub.prop(gs, "frequency", text="FPS", slider=False)
 
         # framing:
         col = layout.column()
-        col.itemL(text="Framing:")
+        col.label(text="Framing:")
         if wide_ui:
-            col.row().itemR(gs, "framing_type", expand=True)
+            col.row().prop(gs, "framing_type", expand=True)
         else:
-            col.itemR(gs, "framing_type", text="")
+            col.prop(gs, "framing_type", text="")
         if gs.framing_type == 'LETTERBOX':
-            col.itemR(gs, "framing_color", text="")
+            col.prop(gs, "framing_color", text="")
 
 
 class RENDER_PT_game_stereo(RenderButtonsPanel):
@@ -269,20 +269,20 @@ class RENDER_PT_game_stereo(RenderButtonsPanel):
         wide_ui = context.region.width > narrowui
 
         # stereo options:
-        layout.itemR(gs, "stereo", expand=True)
+        layout.prop(gs, "stereo", expand=True)
 
         # stereo:
         if stereo_mode == 'STEREO':
-            layout.itemR(gs, "stereo_mode")
-            layout.itemL(text="To do: Focal Length")
-            layout.itemL(text="To do: Eye Separation")
+            layout.prop(gs, "stereo_mode")
+            layout.label(text="To do: Focal Length")
+            layout.label(text="To do: Eye Separation")
 
         # dome:
         elif stereo_mode == 'DOME':
             if wide_ui:
-                layout.itemR(gs, "dome_mode", text="Dome Type")
+                layout.prop(gs, "dome_mode", text="Dome Type")
             else:
-                layout.itemR(gs, "dome_mode", text="")
+                layout.prop(gs, "dome_mode", text="")
 
             dome_type = gs.dome_mode
 
@@ -293,29 +293,29 @@ class RENDER_PT_game_stereo(RenderButtonsPanel):
                dome_type == 'TRUNCATED_FRONT':
 
                 col = split.column()
-                col.itemR(gs, "dome_buffer_resolution", text="Resolution", slider=True)
-                col.itemR(gs, "dome_angle", slider=True)
+                col.prop(gs, "dome_buffer_resolution", text="Resolution", slider=True)
+                col.prop(gs, "dome_angle", slider=True)
 
                 if wide_ui:
                     col = split.column()
-                col.itemR(gs, "dome_tesselation", text="Tesselation")
-                col.itemR(gs, "dome_tilt")
+                col.prop(gs, "dome_tesselation", text="Tesselation")
+                col.prop(gs, "dome_tilt")
 
             elif dome_type == 'PANORAM_SPH':
                 col = split.column()
 
-                col.itemR(gs, "dome_buffer_resolution", text="Resolution", slider=True)
+                col.prop(gs, "dome_buffer_resolution", text="Resolution", slider=True)
                 if wide_ui:
                     col = split.column()
-                col.itemR(gs, "dome_tesselation", text="Tesselation")
+                col.prop(gs, "dome_tesselation", text="Tesselation")
 
             else: # cube map
                 col = split.column()
-                col.itemR(gs, "dome_buffer_resolution", text="Resolution", slider=True)
+                col.prop(gs, "dome_buffer_resolution", text="Resolution", slider=True)
                 if wide_ui:
                     col = split.column()
 
-            layout.itemR(gs, "dome_text")
+            layout.prop(gs, "dome_text")
 
 
 class RENDER_PT_game_shading(RenderButtonsPanel):
@@ -328,22 +328,22 @@ class RENDER_PT_game_shading(RenderButtonsPanel):
         wide_ui = context.region.width > narrowui
 
         if wide_ui:
-            layout.itemR(gs, "material_mode", expand=True)
+            layout.prop(gs, "material_mode", expand=True)
         else:
-            layout.itemR(gs, "material_mode", text="")
+            layout.prop(gs, "material_mode", text="")
 
         if gs.material_mode == 'GLSL':
             split = layout.split()
 
             col = split.column()
-            col.itemR(gs, "glsl_lights", text="Lights")
-            col.itemR(gs, "glsl_shaders", text="Shaders")
-            col.itemR(gs, "glsl_shadows", text="Shadows")
+            col.prop(gs, "glsl_lights", text="Lights")
+            col.prop(gs, "glsl_shaders", text="Shaders")
+            col.prop(gs, "glsl_shadows", text="Shadows")
 
             col = split.column()
-            col.itemR(gs, "glsl_ramps", text="Ramps")
-            col.itemR(gs, "glsl_nodes", text="Nodes")
-            col.itemR(gs, "glsl_extra_textures", text="Extra Textures")
+            col.prop(gs, "glsl_ramps", text="Ramps")
+            col.prop(gs, "glsl_nodes", text="Nodes")
+            col.prop(gs, "glsl_extra_textures", text="Extra Textures")
 
 
 class RENDER_PT_game_performance(RenderButtonsPanel):
@@ -358,17 +358,17 @@ class RENDER_PT_game_performance(RenderButtonsPanel):
         split = layout.split()
 
         col = split.column()
-        col.itemL(text="Show:")
-        col.itemR(gs, "show_debug_properties", text="Debug Properties")
-        col.itemR(gs, "show_framerate_profile", text="Framerate and Profile")
-        col.itemR(gs, "show_physics_visualization", text="Physics Visualization")
-        col.itemR(gs, "deprecation_warnings")
+        col.label(text="Show:")
+        col.prop(gs, "show_debug_properties", text="Debug Properties")
+        col.prop(gs, "show_framerate_profile", text="Framerate and Profile")
+        col.prop(gs, "show_physics_visualization", text="Physics Visualization")
+        col.prop(gs, "deprecation_warnings")
 
         if wide_ui:
             col = split.column()
-        col.itemL(text="Render:")
-        col.itemR(gs, "all_frames")
-        col.itemR(gs, "display_lists")
+        col.label(text="Render:")
+        col.prop(gs, "all_frames")
+        col.prop(gs, "display_lists")
 
 
 class RENDER_PT_game_sound(RenderButtonsPanel):
@@ -381,11 +381,11 @@ class RENDER_PT_game_sound(RenderButtonsPanel):
         wide_ui = context.region.width > narrowui
 
         if wide_ui:
-            layout.itemR(scene, "distance_model")
+            layout.prop(scene, "distance_model")
         else:
-            layout.itemR(scene, "distance_model", text="")
-        layout.itemR(scene, "speed_of_sound", text="Speed")
-        layout.itemR(scene, "doppler_factor")
+            layout.prop(scene, "distance_model", text="")
+        layout.prop(scene, "speed_of_sound", text="Speed")
+        layout.prop(scene, "doppler_factor")
 
 bpy.types.register(RENDER_PT_game)
 bpy.types.register(RENDER_PT_game_player)
@@ -446,11 +446,11 @@ class WORLD_PT_game_world(WorldButtonsPanel):
         split = layout.split()
 
         col = split.column()
-        col.itemR(world, "horizon_color")
+        col.prop(world, "horizon_color")
 
         if wide_ui:
             col = split.column()
-        col.itemR(world, "ambient_color")
+        col.prop(world, "ambient_color")
 
 
 class WORLD_PT_game_mist(WorldButtonsPanel):
@@ -459,7 +459,7 @@ class WORLD_PT_game_mist(WorldButtonsPanel):
     def draw_header(self, context):
         world = context.world
 
-        self.layout.itemR(world.mist, "enabled", text="")
+        self.layout.prop(world.mist, "enabled", text="")
 
     def draw(self, context):
         layout = self.layout
@@ -471,11 +471,11 @@ class WORLD_PT_game_mist(WorldButtonsPanel):
         split = layout.split()
 
         col = split.column()
-        col.itemR(world.mist, "start")
+        col.prop(world.mist, "start")
 
         if wide_ui:
             col = split.column()
-        col.itemR(world.mist, "depth")
+        col.prop(world.mist, "depth")
 
 
 class WORLD_PT_game_physics(WorldButtonsPanel):
@@ -487,40 +487,40 @@ class WORLD_PT_game_physics(WorldButtonsPanel):
         gs = context.scene.game_data
         wide_ui = context.region.width > narrowui
 
-        layout.itemR(gs, "physics_engine")
+        layout.prop(gs, "physics_engine")
         if gs.physics_engine != 'NONE':
-            layout.itemR(gs, "physics_gravity", text="Gravity")
+            layout.prop(gs, "physics_gravity", text="Gravity")
 
             split = layout.split()
 
             col = split.column()
-            col.itemL(text="Physics Steps:")
+            col.label(text="Physics Steps:")
             sub = col.column(align=True)
-            sub.itemR(gs, "physics_step_max", text="Max")
-            sub.itemR(gs, "physics_step_sub", text="Substeps")
-            col.itemR(gs, "fps", text="FPS")
+            sub.prop(gs, "physics_step_max", text="Max")
+            sub.prop(gs, "physics_step_sub", text="Substeps")
+            col.prop(gs, "fps", text="FPS")
 
             if wide_ui:
                 col = split.column()
-            col.itemL(text="Logic Steps:")
-            col.itemR(gs, "logic_step_max", text="Max")
+            col.label(text="Logic Steps:")
+            col.prop(gs, "logic_step_max", text="Max")
 
             col = layout.column()
-            col.itemR(gs, "use_occlusion_culling", text="Occlusion Culling")
+            col.prop(gs, "use_occlusion_culling", text="Occlusion Culling")
             sub = col.column()
             sub.active = gs.use_occlusion_culling
-            sub.itemR(gs, "occlusion_culling_resolution", text="Resolution")
+            sub.prop(gs, "occlusion_culling_resolution", text="Resolution")
 
         else:
             split = layout.split()
 
             col = split.column()
-            col.itemL(text="Physics Steps:")
-            col.itemR(gs, "fps", text="FPS")
+            col.label(text="Physics Steps:")
+            col.prop(gs, "fps", text="FPS")
 
             col = split.column()
-            col.itemL(text="Logic Steps:")
-            col.itemR(gs, "logic_step_max", text="Max")
+            col.label(text="Logic Steps:")
+            col.prop(gs, "logic_step_max", text="Max")
 
 bpy.types.register(WORLD_PT_game_context_world)
 bpy.types.register(WORLD_PT_game_world)
index b89e1fe2ade6c0f8ce45b463e3052f802a39368c..473cea89805138a9a79861287b95af18a53a2390 100644 (file)
@@ -89,15 +89,15 @@ class MATERIAL_PT_context_material(MaterialButtonsPanel):
             row.template_list(ob, "materials", ob, "active_material_index", rows=2)
 
             col = row.column(align=True)
-            col.itemO("object.material_slot_add", icon='ICON_ZOOMIN', text="")
-            col.itemO("object.material_slot_remove", icon='ICON_ZOOMOUT', text="")
-            col.itemO("object.material_slot_copy", icon='ICON_COPY_ID', text="")
+            col.operator("object.material_slot_add", icon='ICON_ZOOMIN', text="")
+            col.operator("object.material_slot_remove", icon='ICON_ZOOMOUT', text="")
+            col.operator("object.material_slot_copy", icon='ICON_COPY_ID', text="")
 
             if ob.mode == 'EDIT':
                 row = layout.row(align=True)
-                row.itemO("object.material_slot_assign", text="Assign")
-                row.itemO("object.material_slot_select", text="Select")
-                row.itemO("object.material_slot_deselect", text="Deselect")
+                row.operator("object.material_slot_assign", text="Assign")
+                row.operator("object.material_slot_select", text="Select")
+                row.operator("object.material_slot_deselect", text="Deselect")
 
         if wide_ui:
             split = layout.split(percentage=0.65)
@@ -106,12 +106,12 @@ class MATERIAL_PT_context_material(MaterialButtonsPanel):
                 split.template_ID(ob, "active_material", new="material.new")
                 row = split.row()
                 if slot:
-                    row.itemR(slot, "link", text="")
+                    row.prop(slot, "link", text="")
                 else:
-                    row.itemL()
+                    row.label()
             elif mat:
                 split.template_ID(space, "pin_id")
-                split.itemS()
+                split.separator()
         else:
             if ob:
                 layout.template_ID(ob, "active_material", new="material.new")
@@ -120,9 +120,9 @@ class MATERIAL_PT_context_material(MaterialButtonsPanel):
 
         if mat:
             if wide_ui:
-                layout.itemR(mat, "type", expand=True)
+                layout.prop(mat, "type", expand=True)
             else:
-                layout.itemR(mat, "type", text="")
+                layout.prop(mat, "type", text="")
 
 
 class MATERIAL_PT_shading(MaterialButtonsPanel):
@@ -146,21 +146,21 @@ class MATERIAL_PT_shading(MaterialButtonsPanel):
             col = split.column()
             sub = col.column()
             sub.active = not mat.shadeless
-            sub.itemR(mat, "emit")
-            sub.itemR(mat, "ambient")
+            sub.prop(mat, "emit")
+            sub.prop(mat, "ambient")
             sub = col.column()
-            sub.itemR(mat, "translucency")
+            sub.prop(mat, "translucency")
 
             if wide_ui:
                 col = split.column()
-            col.itemR(mat, "shadeless")
+            col.prop(mat, "shadeless")
             sub = col.column()
             sub.active = not mat.shadeless
-            sub.itemR(mat, "tangent_shading")
-            sub.itemR(mat, "cubic")
+            sub.prop(mat, "tangent_shading")
+            sub.prop(mat, "cubic")
 
         elif mat.type == 'HALO':
-            layout.itemR(mat, "alpha")
+            layout.prop(mat, "alpha")
 
 
 class MATERIAL_PT_strand(MaterialButtonsPanel):
@@ -184,32 +184,32 @@ class MATERIAL_PT_strand(MaterialButtonsPanel):
 
         col = split.column()
         sub = col.column(align=True)
-        sub.itemL(text="Size:")
-        sub.itemR(tan, "root_size", text="Root")
-        sub.itemR(tan, "tip_size", text="Tip")
-        sub.itemR(tan, "min_size", text="Minimum")
-        sub.itemR(tan, "blender_units")
+        sub.label(text="Size:")
+        sub.prop(tan, "root_size", text="Root")
+        sub.prop(tan, "tip_size", text="Tip")
+        sub.prop(tan, "min_size", text="Minimum")
+        sub.prop(tan, "blender_units")
         sub = col.column()
         sub.active = (not mat.shadeless)
-        sub.itemR(tan, "tangent_shading")
-        col.itemR(tan, "shape")
+        sub.prop(tan, "tangent_shading")
+        col.prop(tan, "shape")
 
         if wide_ui:
             col = split.column()
-        col.itemL(text="Shading:")
-        col.itemR(tan, "width_fade")
+        col.label(text="Shading:")
+        col.prop(tan, "width_fade")
         ob = context.object
         if ob and ob.type == 'MESH':
-            col.item_pointerR(tan, "uv_layer", ob.data, "uv_textures", text="")
+            col.prop_pointer(tan, "uv_layer", ob.data, "uv_textures", text="")
         else:
-            col.itemR(tan, "uv_layer", text="")
-        col.itemS()
+            col.prop(tan, "uv_layer", text="")
+        col.separator()
         sub = col.column()
         sub.active = (not mat.shadeless)
-        sub.itemR(tan, "surface_diffuse")
+        sub.prop(tan, "surface_diffuse")
         sub = col.column()
         sub.active = tan.surface_diffuse
-        sub.itemR(tan, "blend_distance", text="Distance")
+        sub.prop(tan, "blend_distance", text="Distance")
 
 
 class MATERIAL_PT_physics(MaterialButtonsPanel):
@@ -225,15 +225,15 @@ class MATERIAL_PT_physics(MaterialButtonsPanel):
         split = layout.split()
 
         col = split.column()
-        col.itemR(phys, "distance")
-        col.itemR(phys, "friction")
-        col.itemR(phys, "align_to_normal")
+        col.prop(phys, "distance")
+        col.prop(phys, "friction")
+        col.prop(phys, "align_to_normal")
 
         if wide_ui:
             col = split.column()
-        col.itemR(phys, "force", slider=True)
-        col.itemR(phys, "elasticity", slider=True)
-        col.itemR(phys, "damp", slider=True)
+        col.prop(phys, "force", slider=True)
+        col.prop(phys, "elasticity", slider=True)
+        col.prop(phys, "damp", slider=True)
 
 
 class MATERIAL_PT_options(MaterialButtonsPanel):
@@ -254,31 +254,31 @@ class MATERIAL_PT_options(MaterialButtonsPanel):
         split = layout.split()
 
         col = split.column()
-        col.itemR(mat, "traceable")
-        col.itemR(mat, "full_oversampling")
-        col.itemR(mat, "sky")
-        col.itemR(mat, "exclude_mist")
-        col.itemR(mat, "invert_z")
+        col.prop(mat, "traceable")
+        col.prop(mat, "full_oversampling")
+        col.prop(mat, "sky")
+        col.prop(mat, "exclude_mist")
+        col.prop(mat, "invert_z")
         sub = col.row()
-        sub.itemR(mat, "z_offset")
+        sub.prop(mat, "z_offset")
         sub.active = mat.transparency and mat.transparency_method == 'Z_TRANSPARENCY'
         sub = col.column(align=True)
-        sub.itemL(text="Light Group:")
-        sub.itemR(mat, "light_group", text="")
+        sub.label(text="Light Group:")
+        sub.prop(mat, "light_group", text="")
         row = sub.row()
         row.active = bool(mat.light_group)
-        row.itemR(mat, "light_group_exclusive", text="Exclusive")
+        row.prop(mat, "light_group_exclusive", text="Exclusive")
 
         if wide_ui:
             col = split.column()
-        col.itemR(mat, "face_texture")
+        col.prop(mat, "face_texture")
         sub = col.column()
         sub.active = mat.face_texture
-        sub.itemR(mat, "face_texture_alpha")
-        col.itemS()
-        col.itemR(mat, "vertex_color_paint")
-        col.itemR(mat, "vertex_color_light")
-        col.itemR(mat, "object_color")
+        sub.prop(mat, "face_texture_alpha")
+        col.separator()
+        col.prop(mat, "vertex_color_paint")
+        col.prop(mat, "vertex_color_light")
+        col.prop(mat, "object_color")
 
 
 class MATERIAL_PT_shadow(MaterialButtonsPanel):
@@ -300,22 +300,22 @@ class MATERIAL_PT_shadow(MaterialButtonsPanel):
         split = layout.split()
 
         col = split.column()
-        col.itemR(mat, "shadows", text="Receive")
-        col.itemR(mat, "receive_transparent_shadows", text="Receive Transparent")
-        col.itemR(mat, "only_shadow", text="Shadows Only")
-        col.itemR(mat, "cast_shadows_only", text="Cast Only")
-        col.itemR(mat, "shadow_casting_alpha", text="Casting Alpha")
+        col.prop(mat, "shadows", text="Receive")
+        col.prop(mat, "receive_transparent_shadows", text="Receive Transparent")
+        col.prop(mat, "only_shadow", text="Shadows Only")
+        col.prop(mat, "cast_shadows_only", text="Cast Only")
+        col.prop(mat, "shadow_casting_alpha", text="Casting Alpha")
 
         if wide_ui:
             col = split.column()
-        col.itemR(mat, "cast_buffer_shadows")
+        col.prop(mat, "cast_buffer_shadows")
         sub = col.column()
         sub.active = mat.cast_buffer_shadows
-        sub.itemR(mat, "shadow_buffer_bias", text="Buffer Bias")
-        col.itemR(mat, "ray_shadow_bias", text="Auto Ray Bias")
+        sub.prop(mat, "shadow_buffer_bias", text="Buffer Bias")
+        col.prop(mat, "ray_shadow_bias", text="Auto Ray Bias")
         sub = col.column()
         sub.active = (not mat.ray_shadow_bias)
-        sub.itemR(mat, "shadow_ray_bias", text="Ray Bias")
+        sub.prop(mat, "shadow_ray_bias", text="Ray Bias")
 
 
 class MATERIAL_PT_diffuse(MaterialButtonsPanel):
@@ -336,57 +336,57 @@ class MATERIAL_PT_diffuse(MaterialButtonsPanel):
         split = layout.split()
 
         col = split.column()
-        col.itemR(mat, "diffuse_color", text="")
+        col.prop(mat, "diffuse_color", text="")
         sub = col.column()
         sub.active = (not mat.shadeless)
-        sub.itemR(mat, "diffuse_intensity", text="Intensity")
+        sub.prop(mat, "diffuse_intensity", text="Intensity")
 
         if wide_ui:
             col = split.column()
         col.active = (not mat.shadeless)
-        col.itemR(mat, "diffuse_shader", text="")
-        col.itemR(mat, "use_diffuse_ramp", text="Ramp")
+        col.prop(mat, "diffuse_shader", text="")
+        col.prop(mat, "use_diffuse_ramp", text="Ramp")
 
         col = layout.column()
         col.active = (not mat.shadeless)
         if mat.diffuse_shader == 'OREN_NAYAR':
-            col.itemR(mat, "roughness")
+            col.prop(mat, "roughness")
         elif mat.diffuse_shader == 'MINNAERT':
-            col.itemR(mat, "darkness")
+            col.prop(mat, "darkness")
         elif mat.diffuse_shader == 'TOON':
             split = col.split()
 
             col = split.column()
-            col.itemR(mat, "diffuse_toon_size", text="Size")
+            col.prop(mat, "diffuse_toon_size", text="Size")
 
             if wide_ui:
                 col = split.column()
-            col.itemR(mat, "diffuse_toon_smooth", text="Smooth")
+            col.prop(mat, "diffuse_toon_smooth", text="Smooth")
         elif mat.diffuse_shader == 'FRESNEL':
             split = col.split()
 
             col = split.column()
-            col.itemR(mat, "diffuse_fresnel", text="Fresnel")
+            col.prop(mat, "diffuse_fresnel", text="Fresnel")
 
             if wide_ui:
                 col = split.column()
-            col.itemR(mat, "diffuse_fresnel_factor", text="Factor")
+            col.prop(mat, "diffuse_fresnel_factor", text="Factor")
 
         if mat.use_diffuse_ramp:
-            layout.itemS()
+            layout.separator()
             layout.template_color_ramp(mat, "diffuse_ramp", expand=True)
-            layout.itemS()
+            layout.separator()
 
             split = layout.split()
 
             col = split.column()
-            col.itemR(mat, "diffuse_ramp_input", text="Input")
+            col.prop(mat, "diffuse_ramp_input", text="Input")
 
             if wide_ui:
                 col = split.column()
-            col.itemR(mat, "diffuse_ramp_blend", text="Blend")
+            col.prop(mat, "diffuse_ramp_blend", text="Blend")
             row = layout.row()
-            row.itemR(mat, "diffuse_ramp_factor", text="Factor")
+            row.prop(mat, "diffuse_ramp_factor", text="Factor")
 
 
 class MATERIAL_PT_specular(MaterialButtonsPanel):
@@ -409,53 +409,53 @@ class MATERIAL_PT_specular(MaterialButtonsPanel):
         split = layout.split()
 
         col = split.column()
-        col.itemR(mat, "specular_color", text="")
-        col.itemR(mat, "specular_intensity", text="Intensity")
+        col.prop(mat, "specular_color", text="")
+        col.prop(mat, "specular_intensity", text="Intensity")
 
         if wide_ui:
             col = split.column()
-        col.itemR(mat, "specular_shader", text="")
-        col.itemR(mat, "use_specular_ramp", text="Ramp")
+        col.prop(mat, "specular_shader", text="")
+        col.prop(mat, "use_specular_ramp", text="Ramp")
 
         col = layout.column()
         if mat.specular_shader in ('COOKTORR', 'PHONG'):
-            col.itemR(mat, "specular_hardness", text="Hardness")
+            col.prop(mat, "specular_hardness", text="Hardness")
         elif mat.specular_shader == 'BLINN':
             split = layout.split()
 
             col = split.column()
-            col.itemR(mat, "specular_hardness", text="Hardness")
+            col.prop(mat, "specular_hardness", text="Hardness")
 
             if wide_ui:
                 col = split.column()
-            col.itemR(mat, "specular_ior", text="IOR")
+            col.prop(mat, "specular_ior", text="IOR")
         elif mat.specular_shader == 'WARDISO':
-            col.itemR(mat, "specular_slope", text="Slope")
+            col.prop(mat, "specular_slope", text="Slope")
         elif mat.specular_shader == 'TOON':
             split = layout.split()
 
             col = split.column()
-            col.itemR(mat, "specular_toon_size", text="Size")
+            col.prop(mat, "specular_toon_size", text="Size")
 
             if wide_ui:
                 col = split.column()
-            col.itemR(mat, "specular_toon_smooth", text="Smooth")
+            col.prop(mat, "specular_toon_smooth", text="Smooth")
 
         if mat.use_specular_ramp:
-            layout.itemS()
+            layout.separator()
             layout.template_color_ramp(mat, "specular_ramp", expand=True)
-            layout.itemS()
+            layout.separator()
             split = layout.split()
 
             col = split.column()
-            col.itemR(mat, "specular_ramp_input", text="Input")
+            col.prop(mat, "specular_ramp_input", text="Input")
 
             if wide_ui:
                 col = split.column()
-            col.itemR(mat, "specular_ramp_blend", text="Blend")
+            col.prop(mat, "specular_ramp_blend", text="Blend")
 
             row = layout.row()
-            row.itemR(mat, "specular_ramp_factor", text="Factor")
+            row.prop(mat, "specular_ramp_factor", text="Factor")
 
 
 class MATERIAL_PT_sss(MaterialButtonsPanel):
@@ -473,7 +473,7 @@ class MATERIAL_PT_sss(MaterialButtonsPanel):
         sss = mat.subsurface_scattering
 
         self.layout.active = (not mat.shadeless)
-        self.layout.itemR(sss, "enabled", text="")
+        self.layout.prop(sss, "enabled", text="")
 
     def draw(self, context):
         layout = self.layout
@@ -486,28 +486,28 @@ class MATERIAL_PT_sss(MaterialButtonsPanel):
 
         row = layout.row().split()
         sub = row.row(align=True).split(percentage=0.75)
-        sub.itemM("MATERIAL_MT_sss_presets", text="Presets")
-        sub.itemO("material.sss_preset_add", text="Add")
+        sub.menu("MATERIAL_MT_sss_presets", text="Presets")
+        sub.operator("material.sss_preset_add", text="Add")
 
         split = layout.split()
 
         col = split.column()
-        col.itemR(sss, "ior")
-        col.itemR(sss, "scale")
-        col.itemR(sss, "color", text="")
-        col.itemR(sss, "radius", text="RGB Radius")
+        col.prop(sss, "ior")
+        col.prop(sss, "scale")
+        col.prop(sss, "color", text="")
+        col.prop(sss, "radius", text="RGB Radius")
 
         if wide_ui:
             col = split.column()
         sub = col.column(align=True)
-        sub.itemL(text="Blend:")
-        sub.itemR(sss, "color_factor", text="Color")
-        sub.itemR(sss, "texture_factor", text="Texture")
-        sub.itemL(text="Scattering Weight:")
-        sub.itemR(sss, "front")
-        sub.itemR(sss, "back")
-        col.itemS()
-        col.itemR(sss, "error_tolerance", text="Error")
+        sub.label(text="Blend:")
+        sub.prop(sss, "color_factor", text="Color")
+        sub.prop(sss, "texture_factor", text="Texture")
+        sub.label(text="Scattering Weight:")
+        sub.prop(sss, "front")
+        sub.prop(sss, "back")
+        col.separator()
+        col.prop(sss, "error_tolerance", text="Error")
 
 
 class MATERIAL_PT_mirror(MaterialButtonsPanel):
@@ -523,7 +523,7 @@ class MATERIAL_PT_mirror(MaterialButtonsPanel):
     def draw_header(self, context):
         raym = active_node_mat(context.material).raytrace_mirror
 
-        self.layout.itemR(raym, "enabled", text="")
+        self.layout.prop(raym, "enabled", text="")
 
     def draw(self, context):
         layout = self.layout
@@ -537,36 +537,36 @@ class MATERIAL_PT_mirror(MaterialButtonsPanel):
         split = layout.split()
 
         col = split.column()
-        col.itemR(raym, "reflect_factor")
-        col.itemR(mat, "mirror_color", text="")
+        col.prop(raym, "reflect_factor")
+        col.prop(mat, "mirror_color", text="")
 
         if wide_ui:
             col = split.column()
-        col.itemR(raym, "fresnel")
+        col.prop(raym, "fresnel")
         sub = col.column()
         sub.active = raym.fresnel > 0
-        sub.itemR(raym, "fresnel_factor", text="Blend")
+        sub.prop(raym, "fresnel_factor", text="Blend")
 
         split = layout.split()
 
         col = split.column()
-        col.itemS()
-        col.itemR(raym, "distance", text="Max Dist")
-        col.itemR(raym, "depth")
-        col.itemS()
+        col.separator()
+        col.prop(raym, "distance", text="Max Dist")
+        col.prop(raym, "depth")
+        col.separator()
         sub = col.split(percentage=0.4)
-        sub.itemL(text="Fade To:")
-        sub.itemR(raym, "fade_to", text="")
+        sub.label(text="Fade To:")
+        sub.prop(raym, "fade_to", text="")
 
         if wide_ui:
             col = split.column()
-        col.itemL(text="Gloss:")
-        col.itemR(raym, "gloss_factor", text="Amount")
+        col.label(text="Gloss:")
+        col.prop(raym, "gloss_factor", text="Amount")
         sub = col.column()
         sub.active = raym.gloss_factor < 1.0
-        sub.itemR(raym, "gloss_threshold", text="Threshold")
-        sub.itemR(raym, "gloss_samples", text="Samples")
-        sub.itemR(raym, "gloss_anisotropic", text="Anisotropic")
+        sub.prop(raym, "gloss_threshold", text="Threshold")
+        sub.prop(raym, "gloss_samples", text="Samples")
+        sub.prop(raym, "gloss_anisotropic", text="Anisotropic")
 
 
 class MATERIAL_PT_transp(MaterialButtonsPanel):
@@ -582,7 +582,7 @@ class MATERIAL_PT_transp(MaterialButtonsPanel):
     def draw_header(self, context):
         mat = active_node_mat(context.material)
 
-        self.layout.itemR(mat, "transparency", text="")
+        self.layout.prop(mat, "transparency", text="")
 
     def draw(self, context):
         layout = self.layout
@@ -594,46 +594,46 @@ class MATERIAL_PT_transp(MaterialButtonsPanel):
         row = layout.row()
         row.active = mat.transparency and (not mat.shadeless)
         if wide_ui:
-            row.itemR(mat, "transparency_method", expand=True)
+            row.prop(mat, "transparency_method", expand=True)
         else:
-            row.itemR(mat, "transparency_method", text="")
+            row.prop(mat, "transparency_method", text="")
 
         split = layout.split()
 
         col = split.column()
-        col.itemR(mat, "alpha")
+        col.prop(mat, "alpha")
         row = col.row()
         row.active = mat.transparency and (not mat.shadeless)
-        row.itemR(mat, "specular_alpha", text="Specular")
+        row.prop(mat, "specular_alpha", text="Specular")
 
         if wide_ui:
             col = split.column()
         col.active = (not mat.shadeless)
-        col.itemR(rayt, "fresnel")
+        col.prop(rayt, "fresnel")
         sub = col.column()
         sub.active = rayt.fresnel > 0
-        sub.itemR(rayt, "fresnel_factor", text="Blend")
+        sub.prop(rayt, "fresnel_factor", text="Blend")
 
         if mat.transparency_method == 'RAYTRACE':
-            layout.itemS()
+            layout.separator()
             split = layout.split()
             split.active = mat.transparency
 
             col = split.column()
-            col.itemR(rayt, "ior")
-            col.itemR(rayt, "filter")
-            col.itemR(rayt, "falloff")
-            col.itemR(rayt, "limit")
-            col.itemR(rayt, "depth")
+            col.prop(rayt, "ior")
+            col.prop(rayt, "filter")
+            col.prop(rayt, "falloff")
+            col.prop(rayt, "limit")
+            col.prop(rayt, "depth")
 
             if wide_ui:
                 col = split.column()
-            col.itemL(text="Gloss:")
-            col.itemR(rayt, "gloss_factor", text="Amount")
+            col.label(text="Gloss:")
+            col.prop(rayt, "gloss_factor", text="Amount")
             sub = col.column()
             sub.active = rayt.gloss_factor < 1.0
-            sub.itemR(rayt, "gloss_threshold", text="Threshold")
-            sub.itemR(rayt, "gloss_samples", text="Samples")
+            sub.prop(rayt, "gloss_threshold", text="Threshold")
+            sub.prop(rayt, "gloss_samples", text="Samples")
 
 
 class MATERIAL_PT_halo(MaterialButtonsPanel):
@@ -655,35 +655,35 @@ class MATERIAL_PT_halo(MaterialButtonsPanel):
         split = layout.split()
 
         col = split.column()
-        col.itemR(mat, "diffuse_color", text="")
-        col.itemR(halo, "size")
-        col.itemR(halo, "hardness")
-        col.itemR(halo, "add")
-        col.itemL(text="Options:")
-        col.itemR(halo, "texture")
-        col.itemR(halo, "vertex_normal")
-        col.itemR(halo, "xalpha")
-        col.itemR(halo, "shaded")
-        col.itemR(halo, "soft")
+        col.prop(mat, "diffuse_color", text="")
+        col.prop(halo, "size")
+        col.prop(halo, "hardness")
+        col.prop(halo, "add")
+        col.label(text="Options:")
+        col.prop(halo, "texture")
+        col.prop(halo, "vertex_normal")
+        col.prop(halo, "xalpha")
+        col.prop(halo, "shaded")
+        col.prop(halo, "soft")
 
         if wide_ui:
             col = split.column()
-        col.itemR(halo, "ring")
+        col.prop(halo, "ring")
         sub = col.column()
         sub.active = halo.ring
-        sub.itemR(halo, "rings")
-        sub.itemR(mat, "mirror_color", text="")
-        col.itemS()
-        col.itemR(halo, "lines")
+        sub.prop(halo, "rings")
+        sub.prop(mat, "mirror_color", text="")
+        col.separator()
+        col.prop(halo, "lines")
         sub = col.column()
         sub.active = halo.lines
-        sub.itemR(halo, "line_number", text="Lines")
-        sub.itemR(mat, "specular_color", text="")
-        col.itemS()
-        col.itemR(halo, "star")
+        sub.prop(halo, "line_number", text="Lines")
+        sub.prop(mat, "specular_color", text="")
+        col.separator()
+        col.prop(halo, "star")
         sub = col.column()
         sub.active = halo.star
-        sub.itemR(halo, "star_tips")
+        sub.prop(halo, "star_tips")
 
 
 class MATERIAL_PT_flare(MaterialButtonsPanel):
@@ -698,7 +698,7 @@ class MATERIAL_PT_flare(MaterialButtonsPanel):
     def draw_header(self, context):
         halo = context.material.halo
 
-        self.layout.itemR(halo, "flare_mode", text="")
+        self.layout.prop(halo, "flare_mode", text="")
 
     def draw(self, context):
         layout = self.layout
@@ -712,13 +712,13 @@ class MATERIAL_PT_flare(MaterialButtonsPanel):
         split = layout.split()
 
         col = split.column()
-        col.itemR(halo, "flare_size", text="Size")
-        col.itemR(halo, "flare_boost", text="Boost")
-        col.itemR(halo, "flare_seed", text="Seed")
+        col.prop(halo, "flare_size", text="Size")
+        col.prop(halo, "flare_boost", text="Boost")
+        col.prop(halo, "flare_seed", text="Seed")
         if wide_ui:
             col = split.column()
-        col.itemR(halo, "flares_sub", text="Subflares")
-        col.itemR(halo, "flare_subsize", text="Subsize")
+        col.prop(halo, "flares_sub", text="Subflares")
+        col.prop(halo, "flare_subsize", text="Subsize")
 
 bpy.types.register(MATERIAL_PT_context_material)
 bpy.types.register(MATERIAL_PT_preview)
@@ -760,11 +760,11 @@ class MATERIAL_PT_volume_density(VolumeButtonsPanel):
 
         split = layout.split()
         col = split.column()
-        col.itemR(vol, "density")
+        col.prop(vol, "density")
 
         if wide_ui:
             col = split.column()
-        col.itemR(vol, "density_scale")
+        col.prop(vol, "density_scale")
 
 
 class MATERIAL_PT_volume_shading(VolumeButtonsPanel):
@@ -781,18 +781,18 @@ class MATERIAL_PT_volume_shading(VolumeButtonsPanel):
         split = layout.split()
 
         col = split.column()
-        col.itemR(vol, "scattering")
-        col.itemR(vol, "asymmetry")
-        col.itemR(vol, "transmission_color")
+        col.prop(vol, "scattering")
+        col.prop(vol, "asymmetry")
+        col.prop(vol, "transmission_color")
 
         if wide_ui:
             col = split.column()
         sub = col.column(align=True)
-        sub.itemR(vol, "emission")
-        sub.itemR(vol, "emission_color", text="")
+        sub.prop(vol, "emission")
+        sub.prop(vol, "emission_color", text="")
         sub = col.column(align=True)
-        sub.itemR(vol, "reflection")
-        sub.itemR(vol, "reflection_color", text="")
+        sub.prop(vol, "reflection")
+        sub.prop(vol, "reflection_color", text="")
 
 
 class MATERIAL_PT_volume_lighting(VolumeButtonsPanel):
@@ -809,28 +809,28 @@ class MATERIAL_PT_volume_lighting(VolumeButtonsPanel):
         split = layout.split()
 
         col = split.column()
-        col.itemR(vol, "lighting_mode", text="")
+        col.prop(vol, "lighting_mode", text="")
 
         if wide_ui:
             col = split.column()
 
         if vol.lighting_mode == 'SHADED':
-            col.itemR(vol, "external_shadows")
-            col.itemR(vol, "light_cache")
+            col.prop(vol, "external_shadows")
+            col.prop(vol, "light_cache")
             sub = col.column()
             sub.active = vol.light_cache
-            sub.itemR(vol, "cache_resolution")
+            sub.prop(vol, "cache_resolution")
         elif vol.lighting_mode in ('MULTIPLE_SCATTERING', 'SHADED_PLUS_MULTIPLE_SCATTERING'):
             sub = col.column()
             sub.enabled = True
             sub.active = False
-            sub.itemR(vol, "light_cache")
-            col.itemR(vol, "cache_resolution")
+            sub.prop(vol, "light_cache")
+            col.prop(vol, "cache_resolution")
 
             sub = col.column(align=True)
-            sub.itemR(vol, "ms_diffusion")
-            sub.itemR(vol, "ms_spread")
-            sub.itemR(vol, "ms_intensity")
+            sub.prop(vol, "ms_diffusion")
+            sub.prop(vol, "ms_spread")
+            sub.prop(vol, "ms_intensity")
 
 
 class MATERIAL_PT_volume_transp(VolumeButtonsPanel):
@@ -844,9 +844,9 @@ class MATERIAL_PT_volume_transp(VolumeButtonsPanel):
         wide_ui = context.region.width > narrowui
 
         if wide_ui:
-            layout.itemR(mat, "transparency_method", expand=True)
+            layout.prop(mat, "transparency_method", expand=True)
         else:
-            layout.itemR(mat, "transparency_method", text="")
+            layout.prop(mat, "transparency_method", text="")
 
 
 class MATERIAL_PT_volume_integration(VolumeButtonsPanel):
@@ -863,15 +863,15 @@ class MATERIAL_PT_volume_integration(VolumeButtonsPanel):
         split = layout.split()
 
         col = split.column()
-        col.itemL(text="Step Calculation:")
-        col.itemR(vol, "step_calculation", text="")
+        col.label(text="Step Calculation:")
+        col.prop(vol, "step_calculation", text="")
         col = col.column(align=True)
-        col.itemR(vol, "step_size")
+        col.prop(vol, "step_size")
 
         if wide_ui:
             col = split.column()
-        col.itemL()
-        col.itemR(vol, "depth_cutoff")
+        col.label()
+        col.prop(vol, "depth_cutoff")
 
 bpy.types.register(MATERIAL_MT_sss_presets)
 
index e124d654b5393859fdc3a191f34c4fc2d2335a4b..60b65937377a931cab658b4892107e5bafb7aa28 100644 (file)
@@ -38,8 +38,8 @@ class OBJECT_PT_context_object(ObjectButtonsPanel):
         ob = context.object
 
         row = layout.row()
-        row.itemL(text="", icon='ICON_OBJECT_DATA')
-        row.itemR(ob, "name", text="")
+        row.label(text="", icon='ICON_OBJECT_DATA')
+        row.prop(ob, "name", text="")
 
 
 class OBJECT_PT_transform(ObjectButtonsPanel):
@@ -54,32 +54,32 @@ class OBJECT_PT_transform(ObjectButtonsPanel):
         if wide_ui:
             row = layout.row()
 
-            row.column().itemR(ob, "location")
+            row.column().prop(ob, "location")
             if ob.rotation_mode == 'QUATERNION':
-                row.column().itemR(ob, "rotation_quaternion", text="Rotation")
+                row.column().prop(ob, "rotation_quaternion", text="Rotation")
             elif ob.rotation_mode == 'AXIS_ANGLE':
-                #row.column().itemL(text="Rotation")
-                #row.column().itemR(pchan, "rotation_angle", text="Angle")
-                #row.column().itemR(pchan, "rotation_axis", text="Axis")
-                row.column().itemR(ob, "rotation_axis_angle", text="Rotation")
+                #row.column().label(text="Rotation")
+                #row.column().prop(pchan, "rotation_angle", text="Angle")
+                #row.column().prop(pchan, "rotation_axis", text="Axis")
+                row.column().prop(ob, "rotation_axis_angle", text="Rotation")
             else:
-                row.column().itemR(ob, "rotation_euler", text="Rotation")
+                row.column().prop(ob, "rotation_euler", text="Rotation")
 
-            row.column().itemR(ob, "scale")
+            row.column().prop(ob, "scale")
 
-            layout.itemR(ob, "rotation_mode")
+            layout.prop(ob, "rotation_mode")
         else:
             col = layout.column()
-            col.itemR(ob, "location")
-            col.itemL(text="Rotation:")
-            col.itemR(ob, "rotation_mode", text="")
+            col.prop(ob, "location")
+            col.label(text="Rotation:")
+            col.prop(ob, "rotation_mode", text="")
             if ob.rotation_mode == 'QUATERNION':
-                col.itemR(ob, "rotation_quaternion", text="")
+                col.prop(ob, "rotation_quaternion", text="")
             elif ob.rotation_mode == 'AXIS_ANGLE':
-                col.itemR(ob, "rotation_axis_angle", text="")
+                col.prop(ob, "rotation_axis_angle", text="")
             else:
-                col.itemR(ob, "rotation_euler", text="")
-            col.itemR(ob, "scale")
+                col.prop(ob, "rotation_euler", text="")
+            col.prop(ob, "scale")
 
 
 class OBJECT_PT_transform_locks(ObjectButtonsPanel):
@@ -95,18 +95,18 @@ class OBJECT_PT_transform_locks(ObjectButtonsPanel):
         row = layout.row()
 
         col = row.column()
-        col.itemR(ob, "lock_location", text="Location")
+        col.prop(ob, "lock_location", text="Location")
 
         col = row.column()
         if ob.rotation_mode in ('QUATERNION', 'AXIS_ANGLE'):
-            col.itemR(ob, "lock_rotations_4d", text="Rotation")
+            col.prop(ob, "lock_rotations_4d", text="Rotation")
             if ob.lock_rotations_4d:
-                col.itemR(ob, "lock_rotation_w", text="W")
-            col.itemR(ob, "lock_rotation", text="")
+                col.prop(ob, "lock_rotation_w", text="W")
+            col.prop(ob, "lock_rotation", text="")
         else:
-            col.itemR(ob, "lock_rotation", text="Rotation")
+            col.prop(ob, "lock_rotation", text="Rotation")
 
-        row.column().itemR(ob, "lock_scale", text="Scale")
+        row.column().prop(ob, "lock_scale", text="Scale")
 
 
 class OBJECT_PT_relations(ObjectButtonsPanel):
@@ -121,20 +121,20 @@ class OBJECT_PT_relations(ObjectButtonsPanel):
         split = layout.split()
 
         col = split.column()
-        col.itemR(ob, "layers")
-        col.itemS()
-        col.itemR(ob, "pass_index")
+        col.prop(ob, "layers")
+        col.separator()
+        col.prop(ob, "pass_index")
 
         if wide_ui:
             col = split.column()
-        col.itemL(text="Parent:")
-        col.itemR(ob, "parent", text="")
+        col.label(text="Parent:")
+        col.prop(ob, "parent", text="")
 
         sub = col.column()
-        sub.itemR(ob, "parent_type", text="")
+        sub.prop(ob, "parent_type", text="")
         parent = ob.parent
         if parent and ob.parent_type == 'BONE' and parent.type == 'ARMATURE':
-            sub.item_pointerR(ob, "parent_bone", parent.data, "bones", text="")
+            sub.prop_pointer(ob, "parent_bone", parent.data, "bones", text="")
         sub.active = (parent is not None)
 
 
@@ -149,10 +149,10 @@ class OBJECT_PT_groups(ObjectButtonsPanel):
 
         if wide_ui:
             split = layout.split()
-            split.item_menu_enumO("object.group_add", "group", text="Add to Group")
-            split.itemL()
+            split.operator_menu_enum("object.group_add", "group", text="Add to Group")
+            split.label()
         else:
-            layout.item_menu_enumO("object.group_add", "group", text="Add to Group")
+            layout.operator_menu_enum("object.group_add", "group", text="Add to Group")
 
         for group in bpy.data.groups:
             if ob.name in group.objects:
@@ -161,17 +161,17 @@ class OBJECT_PT_groups(ObjectButtonsPanel):
                 col.set_context_pointer("group", group)
 
                 row = col.box().row()
-                row.itemR(group, "name", text="")
-                row.itemO("object.group_remove", text="", icon='VICON_X')
+                row.prop(group, "name", text="")
+                row.operator("object.group_remove", text="", icon='VICON_X')
 
                 split = col.box().split()
 
                 col = split.column()
-                col.itemR(group, "layer", text="Dupli")
+                col.prop(group, "layer", text="Dupli")
 
                 if wide_ui:
                     col = split.column()
-                col.itemR(group, "dupli_offset", text="")
+                col.prop(group, "dupli_offset", text="")
 
 
 class OBJECT_PT_display(ObjectButtonsPanel):
@@ -185,28 +185,28 @@ class OBJECT_PT_display(ObjectButtonsPanel):
 
         split = layout.split()
         col = split.column()
-        col.itemR(ob, "max_draw_type", text="Type")
+        col.prop(ob, "max_draw_type", text="Type")
 
         if wide_ui:
             col = split.column()
         row = col.row()
-        row.itemR(ob, "draw_bounds", text="Bounds")
+        row.prop(ob, "draw_bounds", text="Bounds")
         sub = row.row()
         sub.active = ob.draw_bounds
-        sub.itemR(ob, "draw_bounds_type", text="")
+        sub.prop(ob, "draw_bounds_type", text="")
 
         split = layout.split()
 
         col = split.column()
-        col.itemR(ob, "draw_name", text="Name")
-        col.itemR(ob, "draw_axis", text="Axis")
-        col.itemR(ob, "draw_wire", text="Wire")
+        col.prop(ob, "draw_name", text="Name")
+        col.prop(ob, "draw_axis", text="Axis")
+        col.prop(ob, "draw_wire", text="Wire")
 
         if wide_ui:
             col = split.column()
-        col.itemR(ob, "draw_texture_space", text="Texture Space")
-        col.itemR(ob, "x_ray", text="X-Ray")
-        col.itemR(ob, "draw_transparent", text="Transparency")
+        col.prop(ob, "draw_texture_space", text="Texture Space")
+        col.prop(ob, "x_ray", text="X-Ray")
+        col.prop(ob, "draw_transparent", text="Transparency")
 
 
 class OBJECT_PT_duplication(ObjectButtonsPanel):
@@ -219,42 +219,42 @@ class OBJECT_PT_duplication(ObjectButtonsPanel):
         wide_ui = context.region.width > narrowui
 
         if wide_ui:
-            layout.itemR(ob, "dupli_type", expand=True)
+            layout.prop(ob, "dupli_type", expand=True)
         else:
-            layout.itemR(ob, "dupli_type", text="")
+            layout.prop(ob, "dupli_type", text="")
 
         if ob.dupli_type == 'FRAMES':
             split = layout.split()
 
             col = split.column(align=True)
-            col.itemR(ob, "dupli_frames_start", text="Start")
-            col.itemR(ob, "dupli_frames_end", text="End")
+            col.prop(ob, "dupli_frames_start", text="Start")
+            col.prop(ob, "dupli_frames_end", text="End")
 
             if wide_ui:
                 col = split.column(align=True)
-            col.itemR(ob, "dupli_frames_on", text="On")
-            col.itemR(ob, "dupli_frames_off", text="Off")
+            col.prop(ob, "dupli_frames_on", text="On")
+            col.prop(ob, "dupli_frames_off", text="Off")
 
-            layout.itemR(ob, "dupli_frames_no_speed", text="No Speed")
+            layout.prop(ob, "dupli_frames_no_speed", text="No Speed")
 
         elif ob.dupli_type == 'VERTS':
-            layout.itemR(ob, "dupli_verts_rotation", text="Rotation")
+            layout.prop(ob, "dupli_verts_rotation", text="Rotation")
 
         elif ob.dupli_type == 'FACES':
             split = layout.split()
 
             col = split.column()
-            col.itemR(ob, "dupli_faces_scale", text="Scale")
+            col.prop(ob, "dupli_faces_scale", text="Scale")
 
             if wide_ui:
                 col = split.column()
-            col.itemR(ob, "dupli_faces_inherit_scale", text="Inherit Scale")
+            col.prop(ob, "dupli_faces_inherit_scale", text="Inherit Scale")
 
         elif ob.dupli_type == 'GROUP':
             if wide_ui:
-                layout.itemR(ob, "dupli_group", text="Group")
+                layout.prop(ob, "dupli_group", text="Group")
             else:
-                layout.itemR(ob, "dupli_group", text="")
+                layout.prop(ob, "dupli_group", text="")
 
 
 class OBJECT_PT_animation(ObjectButtonsPanel):
@@ -269,27 +269,27 @@ class OBJECT_PT_animation(ObjectButtonsPanel):
         split = layout.split()
 
         col = split.column()
-        col.itemL(text="Time Offset:")
-        col.itemR(ob, "time_offset_edit", text="Edit")
+        col.label(text="Time Offset:")
+        col.prop(ob, "time_offset_edit", text="Edit")
         row = col.row()
-        row.itemR(ob, "time_offset_particle", text="Particle")
+        row.prop(ob, "time_offset_particle", text="Particle")
         row.active = len(ob.particle_systems) != 0
         row = col.row()
-        row.itemR(ob, "time_offset_parent", text="Parent")
+        row.prop(ob, "time_offset_parent", text="Parent")
         row.active = (ob.parent is not None)
         row = col.row()
-        row.itemR(ob, "slow_parent")
+        row.prop(ob, "slow_parent")
         row.active = (ob.parent is not None)
-        col.itemR(ob, "time_offset", text="Offset")
+        col.prop(ob, "time_offset", text="Offset")
 
         if wide_ui:
             col = split.column()
-        col.itemL(text="Track:")
-        col.itemR(ob, "track", text="")
-        col.itemR(ob, "track_axis", text="Axis")
-        col.itemR(ob, "up_axis", text="Up Axis")
+        col.label(text="Track:")
+        col.prop(ob, "track", text="")
+        col.prop(ob, "track_axis", text="Axis")
+        col.prop(ob, "up_axis", text="Up Axis")
         row = col.row()
-        row.itemR(ob, "track_override_parent", text="Override Parent")
+        row.prop(ob, "track_override_parent", text="Override Parent")
         row.active = (ob.parent is not None)
 
 
index 272fc6b8c6c9c4cd3f1731491ddf92cc1927d6c5..5208ab28f0db509cb3d6b34fc748b676ad8ce2b6 100644 (file)
@@ -39,7 +39,7 @@ class ConstraintButtonsPanel(bpy.types.Panel):
             # show/key buttons here are most likely obsolete now, with
             # keyframing functionality being part of every button
             if con.type not in ('RIGID_BODY_JOINT', 'SPLINE_IK', 'NULL'):
-                box.itemR(con, "influence")
+                box.prop(con, "influence")
 
     def space_template(self, layout, con, wide_ui, target=True, owner=True):
         if target or owner:
@@ -47,63 +47,63 @@ class ConstraintButtonsPanel(bpy.types.Panel):
             split = layout.split(percentage=0.2)
 
             if wide_ui:
-                split.itemL(text="Space:")
+                split.label(text="Space:")
                 row = split.row()
             else:
                 row = layout.row()
 
 
             if target:
-                row.itemR(con, "target_space", text="")
+                row.prop(con, "target_space", text="")
 
             if wide_ui:
                 if target and owner:
-                    row.itemL(icon='ICON_ARROW_LEFTRIGHT')
+                    row.label(icon='ICON_ARROW_LEFTRIGHT')
             else:
                 row = layout.row()
             if owner:
-                row.itemR(con, "owner_space", text="")
+                row.prop(con, "owner_space", text="")
 
     def target_template(self, layout, con, wide_ui, subtargets=True):
         if wide_ui:
-            layout.itemR(con, "target") # XXX limiting settings for only 'curves' or some type of object
+            layout.prop(con, "target") # XXX limiting settings for only 'curves' or some type of object
         else:
-            layout.itemR(con, "target", text="")
+            layout.prop(con, "target", text="")
 
         if con.target and subtargets:
             if con.target.type == 'ARMATURE':
                 if wide_ui:
-                    layout.item_pointerR(con, "subtarget", con.target.data, "bones", text="Bone")
+                    layout.prop_pointer(con, "subtarget", con.target.data, "bones", text="Bone")
                 else:
-                    layout.item_pointerR(con, "subtarget", con.target.data, "bones", text="")
+                    layout.prop_pointer(con, "subtarget", con.target.data, "bones", text="")
 
                 if con.type == 'COPY_LOCATION':
                     row = layout.row()
-                    row.itemL(text="Head/Tail:")
-                    row.itemR(con, "head_tail", text="")
+                    row.label(text="Head/Tail:")
+                    row.prop(con, "head_tail", text="")
             elif con.target.type in ('MESH', 'LATTICE'):
-                layout.item_pointerR(con, "subtarget", con.target, "vertex_groups", text="Vertex Group")
+                layout.prop_pointer(con, "subtarget", con.target, "vertex_groups", text="Vertex Group")
 
     def ik_template(self, layout, con, wide_ui):
         # only used for iTaSC
-        layout.itemR(con, "pole_target")
+        layout.prop(con, "pole_target")
 
         if con.pole_target and con.pole_target.type == 'ARMATURE':
-            layout.item_pointerR(con, "pole_subtarget", con.pole_target.data, "bones", text="Bone")
+            layout.prop_pointer(con, "pole_subtarget", con.pole_target.data, "bones", text="Bone")
 
         if con.pole_target:
             row = layout.row()
-            row.itemL()
-            row.itemR(con, "pole_angle")
+            row.label()
+            row.prop(con, "pole_angle")
 
         split = layout.split(percentage=0.33)
         col = split.column()
-        col.itemR(con, "tail")
-        col.itemR(con, "stretch")
+        col.prop(con, "tail")
+        col.prop(con, "stretch")
 
         col = split.column()
-        col.itemR(con, "chain_length")
-        col.itemR(con, "targetless")
+        col.prop(con, "chain_length")
+        col.prop(con, "targetless")
 
     def CHILD_OF(self, context, layout, con, wide_ui):
         self.target_template(layout, con, wide_ui)
@@ -111,136 +111,136 @@ class ConstraintButtonsPanel(bpy.types.Panel):
         split = layout.split()
 
         col = split.column()
-        col.itemL(text="Location:")
-        col.itemR(con, "locationx", text="X")
-        col.itemR(con, "locationy", text="Y")
-        col.itemR(con, "locationz", text="Z")
+        col.label(text="Location:")
+        col.prop(con, "locationx", text="X")
+        col.prop(con, "locationy", text="Y")
+        col.prop(con, "locationz", text="Z")
 
         col = split.column()
-        col.itemL(text="Rotation:")
-        col.itemR(con, "rotationx", text="X")
-        col.itemR(con, "rotationy", text="Y")
-        col.itemR(con, "rotationz", text="Z")
+        col.label(text="Rotation:")
+        col.prop(con, "rotationx", text="X")
+        col.prop(con, "rotationy", text="Y")
+        col.prop(con, "rotationz", text="Z")
 
         col = split.column()
-        col.itemL(text="Scale:")
-        col.itemR(con, "sizex", text="X")
-        col.itemR(con, "sizey", text="Y")
-        col.itemR(con, "sizez", text="Z")
+        col.label(text="Scale:")
+        col.prop(con, "sizex", text="X")
+        col.prop(con, "sizey", text="Y")
+        col.prop(con, "sizez", text="Z")
 
         split = layout.split()
 
         col = split.column()
-        col.itemO("constraint.childof_set_inverse")
+        col.operator("constraint.childof_set_inverse")
 
         if wide_ui:
             col = split.column()
-        col.itemO("constraint.childof_clear_inverse")
+        col.operator("constraint.childof_clear_inverse")
 
     def TRACK_TO(self, context, layout, con, wide_ui):
         self.target_template(layout, con, wide_ui)
 
         row = layout.row()
         if wide_ui:
-            row.itemL(text="To:")
-        row.itemR(con, "track", expand=True)
+            row.label(text="To:")
+        row.prop(con, "track", expand=True)
 
         split = layout.split()
 
         col = split.column()
-        col.itemR(con, "up", text="Up")
+        col.prop(con, "up", text="Up")
 
         if wide_ui:
             col = split.column()
-        col.itemR(con, "target_z")
+        col.prop(con, "target_z")
 
         self.space_template(layout, con, wide_ui)
 
     def IK(self, context, layout, con, wide_ui):
         if context.object.pose.ik_solver == "ITASC":
-            layout.itemR(con, "ik_type")
+            layout.prop(con, "ik_type")
             getattr(self, 'IK_' + con.ik_type)(context, layout, con, wide_ui)
         else:
             # Legacy IK constraint
             self.target_template(layout, con, wide_ui)
             if wide_ui:
-                layout.itemR(con, "pole_target")
+                layout.prop(con, "pole_target")
             else:
-                layout.itemR(con, "pole_target", text="")
+                layout.prop(con, "pole_target", text="")
             if con.pole_target and con.pole_target.type == 'ARMATURE':
                 if wide_ui:
-                    layout.item_pointerR(con, "pole_subtarget", con.pole_target.data, "bones", text="Bone")
+                    layout.prop_pointer(con, "pole_subtarget", con.pole_target.data, "bones", text="Bone")
                 else:
-                    layout.item_pointerR(con, "pole_subtarget", con.pole_target.data, "bones", text="")
+                    layout.prop_pointer(con, "pole_subtarget", con.pole_target.data, "bones", text="")
 
             if con.pole_target:
                 row = layout.row()
-                row.itemR(con, "pole_angle")
+                row.prop(con, "pole_angle")
                 if wide_ui:
-                    row.itemL()
+                    row.label()
 
             split = layout.split()
             col = split.column()
-            col.itemR(con, "iterations")
-            col.itemR(con, "chain_length")
+            col.prop(con, "iterations")
+            col.prop(con, "chain_length")
 
-            col.itemL(text="Weight:")
-            col.itemR(con, "weight", text="Position", slider=True)
+            col.label(text="Weight:")
+            col.prop(con, "weight", text="Position", slider=True)
             sub = col.column()
             sub.active = con.rotation
-            sub.itemR(con, "orient_weight", text="Rotation", slider=True)
+            sub.prop(con, "orient_weight", text="Rotation", slider=True)
 
             if wide_ui:
                 col = split.column()
-            col.itemR(con, "tail")
-            col.itemR(con, "stretch")
-            col.itemS()
-            col.itemR(con, "targetless")
-            col.itemR(con, "rotation")
+            col.prop(con, "tail")
+            col.prop(con, "stretch")
+            col.separator()
+            col.prop(con, "targetless")
+            col.prop(con, "rotation")
 
     def IK_COPY_POSE(self, context, layout, con, wide_ui):
         self.target_template(layout, con, wide_ui)
         self.ik_template(layout, con, wide_ui)
 
         row = layout.row()
-        row.itemL(text="Axis Ref:")
-        row.itemR(con, "axis_reference", expand=True)
+        row.label(text="Axis Ref:")
+        row.prop(con, "axis_reference", expand=True)
         split = layout.split(percentage=0.33)
-        split.row().itemR(con, "position")
+        split.row().prop(con, "position")
         row = split.row()
-        row.itemR(con, "weight", text="Weight", slider=True)
+        row.prop(con, "weight", text="Weight", slider=True)
         row.active = con.position
         split = layout.split(percentage=0.33)
         row = split.row()
-        row.itemL(text="Lock:")
+        row.label(text="Lock:")
         row = split.row()
-        row.itemR(con, "pos_lock_x", text="X")
-        row.itemR(con, "pos_lock_y", text="Y")
-        row.itemR(con, "pos_lock_z", text="Z")
+        row.prop(con, "pos_lock_x", text="X")
+        row.prop(con, "pos_lock_y", text="Y")
+        row.prop(con, "pos_lock_z", text="Z")
         split.active = con.position
 
         split = layout.split(percentage=0.33)
-        split.row().itemR(con, "rotation")
+        split.row().prop(con, "rotation")
         row = split.row()
-        row.itemR(con, "orient_weight", text="Weight", slider=True)
+        row.prop(con, "orient_weight", text="Weight", slider=True)
         row.active = con.rotation
         split = layout.split(percentage=0.33)
         row = split.row()
-        row.itemL(text="Lock:")
+        row.label(text="Lock:")
         row = split.row()
-        row.itemR(con, "rot_lock_x", text="X")
-        row.itemR(con, "rot_lock_y", text="Y")
-        row.itemR(con, "rot_lock_z", text="Z")
+        row.prop(con, "rot_lock_x", text="X")
+        row.prop(con, "rot_lock_y", text="Y")
+        row.prop(con, "rot_lock_z", text="Z")
         split.active = con.rotation
 
     def IK_DISTANCE(self, context, layout, con, wide_ui):
         self.target_template(layout, con, wide_ui)
         self.ik_template(layout, con, wide_ui)
 
-        layout.itemR(con, "limit_mode")
+        layout.prop(con, "limit_mode")
         row = layout.row()
-        row.itemR(con, "weight", text="Weight", slider=True)
-        row.itemR(con, "distance", text="Distance", slider=True)
+        row.prop(con, "weight", text="Weight", slider=True)
+        row.prop(con, "distance", text="Distance", slider=True)
 
     def FOLLOW_PATH(self, context, layout, con, wide_ui):
         self.target_template(layout, con, wide_ui)
@@ -248,153 +248,153 @@ class ConstraintButtonsPanel(bpy.types.Panel):
         split = layout.split()
 
         col = split.column()
-        col.itemR(con, "use_curve_follow")
-        col.itemR(con, "use_curve_radius")
+        col.prop(con, "use_curve_follow")
+        col.prop(con, "use_curve_radius")
 
         if wide_ui:
             col = split.column()
-        col.itemR(con, "use_fixed_position")
+        col.prop(con, "use_fixed_position")
         if con.use_fixed_position:
-            col.itemR(con, "offset_factor", text="Offset")
+            col.prop(con, "offset_factor", text="Offset")
         else:
-            col.itemR(con, "offset")
+            col.prop(con, "offset")
 
         row = layout.row()
         if wide_ui:
-            row.itemL(text="Forward:")
-        row.itemR(con, "forward", expand=True)
+            row.label(text="Forward:")
+        row.prop(con, "forward", expand=True)
 
         row = layout.row()
-        row.itemR(con, "up", text="Up")
+        row.prop(con, "up", text="Up")
         if wide_ui:
-            row.itemL()
+            row.label()
 
     def LIMIT_ROTATION(self, context, layout, con, wide_ui):
 
         split = layout.split()
 
         col = split.column(align=True)
-        col.itemR(con, "use_limit_x")
+        col.prop(con, "use_limit_x")
         sub = col.column()
         sub.active = con.use_limit_x
-        sub.itemR(con, "minimum_x", text="Min")
-        sub.itemR(con, "maximum_x", text="Max")
+        sub.prop(con, "minimum_x", text="Min")
+        sub.prop(con, "maximum_x", text="Max")
 
         if wide_ui:
             col = split.column(align=True)
-        col.itemR(con, "use_limit_y")
+        col.prop(con, "use_limit_y")
         sub = col.column()
         sub.active = con.use_limit_y
-        sub.itemR(con, "minimum_y", text="Min")
-        sub.itemR(con, "maximum_y", text="Max")
+        sub.prop(con, "minimum_y", text="Min")
+        sub.prop(con, "maximum_y", text="Max")
 
         if wide_ui:
             col = split.column(align=True)
-        col.itemR(con, "use_limit_z")
+        col.prop(con, "use_limit_z")
         sub = col.column()
         sub.active = con.use_limit_z
-        sub.itemR(con, "minimum_z", text="Min")
-        sub.itemR(con, "maximum_z", text="Max")
+        sub.prop(con, "minimum_z", text="Min")
+        sub.prop(con, "maximum_z", text="Max")
 
         row = layout.row()
-        row.itemR(con, "limit_transform")
+        row.prop(con, "limit_transform")
         if wide_ui:
-            row.itemL()
+            row.label()
 
         row = layout.row()
         if wide_ui:
-            row.itemL(text="Convert:")
-        row.itemR(con, "owner_space", text="")
+            row.label(text="Convert:")
+        row.prop(con, "owner_space", text="")
 
     def LIMIT_LOCATION(self, context, layout, con, wide_ui):
         split = layout.split()
 
         col = split.column()
-        col.itemR(con, "use_minimum_x")
+        col.prop(con, "use_minimum_x")
         sub = col.column()
         sub.active = con.use_minimum_x
-        sub.itemR(con, "minimum_x", text="")
-        col.itemR(con, "use_maximum_x")
+        sub.prop(con, "minimum_x", text="")
+        col.prop(con, "use_maximum_x")
         sub = col.column()
         sub.active = con.use_maximum_x
-        sub.itemR(con, "maximum_x", text="")
+        sub.prop(con, "maximum_x", text="")
 
         if wide_ui:
             col = split.column()
-        col.itemR(con, "use_minimum_y")
+        col.prop(con, "use_minimum_y")
         sub = col.column()
         sub.active = con.use_minimum_y
-        sub.itemR(con, "minimum_y", text="")
-        col.itemR(con, "use_maximum_y")
+        sub.prop(con, "minimum_y", text="")
+        col.prop(con, "use_maximum_y")
         sub = col.column()
         sub.active = con.use_maximum_y
-        sub.itemR(con, "maximum_y", text="")
+        sub.prop(con, "maximum_y", text="")
 
         if wide_ui:
             col = split.column()
-        col.itemR(con, "use_minimum_z")
+        col.prop(con, "use_minimum_z")
         sub = col.column()
         sub.active = con.use_minimum_z
-        sub.itemR(con, "minimum_z", text="")
-        col.itemR(con, "use_maximum_z")
+        sub.prop(con, "minimum_z", text="")
+        col.prop(con, "use_maximum_z")
         sub = col.column()
         sub.active = con.use_maximum_z
-        sub.itemR(con, "maximum_z", text="")
+        sub.prop(con, "maximum_z", text="")
 
         row = layout.row()
-        row.itemR(con, "limit_transform")
+        row.prop(con, "limit_transform")
         if wide_ui:
-            row.itemL()
+            row.label()
 
         row = layout.row()
         if wide_ui:
-            row.itemL(text="Convert:")
-        row.itemR(con, "owner_space", text="")
+            row.label(text="Convert:")
+        row.prop(con, "owner_space", text="")
 
     def LIMIT_SCALE(self, context, layout, con, wide_ui):
         split = layout.split()
 
         col = split.column()
-        col.itemR(con, "use_minimum_x")
+        col.prop(con, "use_minimum_x")
         sub = col.column()
         sub.active = con.use_minimum_x
-        sub.itemR(con, "minimum_x", text="")
-        col.itemR(con, "use_maximum_x")
+        sub.prop(con, "minimum_x", text="")
+        col.prop(con, "use_maximum_x")
         sub = col.column()
         sub.active = con.use_maximum_x
-        sub.itemR(con, "maximum_x", text="")
+        sub.prop(con, "maximum_x", text="")
 
         if wide_ui:
             col = split.column()
-        col.itemR(con, "use_minimum_y")
+        col.prop(con, "use_minimum_y")
         sub = col.column()
         sub.active = con.use_minimum_y
-        sub.itemR(con, "minimum_y", text="")
-        col.itemR(con, "use_maximum_y")
+        sub.prop(con, "minimum_y", text="")
+        col.prop(con, "use_maximum_y")
         sub = col.column()
         sub.active = con.use_maximum_y
-        sub.itemR(con, "maximum_y", text="")
+        sub.prop(con, "maximum_y", text="")
 
         if wide_ui:
             col = split.column()
-        col.itemR(con, "use_minimum_z")
+        col.prop(con, "use_minimum_z")
         sub = col.column()
         sub.active = con.use_minimum_z
-        sub.itemR(con, "minimum_z", text="")
-        col.itemR(con, "use_maximum_z")
+        sub.prop(con, "minimum_z", text="")
+        col.prop(con, "use_maximum_z")
         sub = col.column()
         sub.active = con.use_maximum_z
-        sub.itemR(con, "maximum_z", text="")
+        sub.prop(con, "maximum_z", text="")
 
         row = layout.row()
-        row.itemR(con, "limit_transform")
+        row.prop(con, "limit_transform")
         if wide_ui:
-            row.itemL()
+            row.label()
 
         row = layout.row()
         if wide_ui:
-            row.itemL(text="Convert:")
-        row.itemR(con, "owner_space", text="")
+            row.label(text="Convert:")
+        row.prop(con, "owner_space", text="")
 
     def COPY_ROTATION(self, context, layout, con, wide_ui):
         self.target_template(layout, con, wide_ui)
@@ -402,24 +402,24 @@ class ConstraintButtonsPanel(bpy.types.Panel):
         split = layout.split()
 
         col = split.column()
-        col.itemR(con, "rotate_like_x", text="X")
+        col.prop(con, "rotate_like_x", text="X")
         sub = col.column()
         sub.active = con.rotate_like_x
-        sub.itemR(con, "invert_x", text="Invert")
+        sub.prop(con, "invert_x", text="Invert")
 
         col = split.column()
-        col.itemR(con, "rotate_like_y", text="Y")
+        col.prop(con, "rotate_like_y", text="Y")
         sub = col.column()
         sub.active = con.rotate_like_y
-        sub.itemR(con, "invert_y", text="Invert")
+        sub.prop(con, "invert_y", text="Invert")
 
         col = split.column()
-        col.itemR(con, "rotate_like_z", text="Z")
+        col.prop(con, "rotate_like_z", text="Z")
         sub = col.column()
         sub.active = con.rotate_like_z
-        sub.itemR(con, "invert_z", text="Invert")
+        sub.prop(con, "invert_z", text="Invert")
 
-        layout.itemR(con, "offset")
+        layout.prop(con, "offset")
 
         self.space_template(layout, con, wide_ui)
 
@@ -429,24 +429,24 @@ class ConstraintButtonsPanel(bpy.types.Panel):
         split = layout.split()
 
         col = split.column()
-        col.itemR(con, "locate_like_x", text="X")
+        col.prop(con, "locate_like_x", text="X")
         sub = col.column()
         sub.active = con.locate_like_x
-        sub.itemR(con, "invert_x", text="Invert")
+        sub.prop(con, "invert_x", text="Invert")
 
         col = split.column()
-        col.itemR(con, "locate_like_y", text="Y")
+        col.prop(con, "locate_like_y", text="Y")
         sub = col.column()
         sub.active = con.locate_like_y
-        sub.itemR(con, "invert_y", text="Invert")
+        sub.prop(con, "invert_y", text="Invert")
 
         col = split.column()
-        col.itemR(con, "locate_like_z", text="Z")
+        col.prop(con, "locate_like_z", text="Z")
         sub = col.column()
         sub.active = con.locate_like_z
-        sub.itemR(con, "invert_z", text="Invert")
+        sub.prop(con, "invert_z", text="Invert")
 
-        layout.itemR(con, "offset")
+        layout.prop(con, "offset")
 
         self.space_template(layout, con, wide_ui)
 
@@ -454,11 +454,11 @@ class ConstraintButtonsPanel(bpy.types.Panel):
         self.target_template(layout, con, wide_ui)
 
         row = layout.row(align=True)
-        row.itemR(con, "size_like_x", text="X")
-        row.itemR(con, "size_like_y", text="Y")
-        row.itemR(con, "size_like_z", text="Z")
+        row.prop(con, "size_like_x", text="X")
+        row.prop(con, "size_like_y", text="Y")
+        row.prop(con, "size_like_z", text="Z")
 
-        layout.itemR(con, "offset")
+        layout.prop(con, "offset")
 
         self.space_template(layout, con, wide_ui)
 
@@ -468,56 +468,56 @@ class ConstraintButtonsPanel(bpy.types.Panel):
         self.target_template(layout, con, wide_ui)
 
         if wide_ui:
-            layout.itemR(con, "action")
+            layout.prop(con, "action")
         else:
-            layout.itemR(con, "action", text="")
+            layout.prop(con, "action", text="")
 
         if wide_ui:
-            layout.itemR(con, "transform_channel")
+            layout.prop(con, "transform_channel")
         else:
-            layout.itemR(con, "transform_channel", text="")
+            layout.prop(con, "transform_channel", text="")
 
         split = layout.split()
 
         col = split.column(align=True)
-        col.itemL(text="Action Length:")
-        col.itemR(con, "start_frame", text="Start")
-        col.itemR(con, "end_frame", text="End")
+        col.label(text="Action Length:")
+        col.prop(con, "start_frame", text="Start")
+        col.prop(con, "end_frame", text="End")
 
         if wide_ui:
             col = split.column(align=True)
-        col.itemL(text="Target Range:")
-        col.itemR(con, "minimum", text="Min")
-        col.itemR(con, "maximum", text="Max")
+        col.label(text="Target Range:")
+        col.prop(con, "minimum", text="Min")
+        col.prop(con, "maximum", text="Max")
 
         row = layout.row()
         if wide_ui:
-            row.itemL(text="Convert:")
-        row.itemR(con, "target_space", text="")
+            row.label(text="Convert:")
+        row.prop(con, "target_space", text="")
 
     def LOCKED_TRACK(self, context, layout, con, wide_ui):
         self.target_template(layout, con, wide_ui)
 
         row = layout.row()
         if wide_ui:
-            row.itemL(text="To:")
-        row.itemR(con, "track", expand=True)
+            row.label(text="To:")
+        row.prop(con, "track", expand=True)
 
         row = layout.row()
         if wide_ui:
-            row.itemL(text="Lock:")
-        row.itemR(con, "locked", expand=True)
+            row.label(text="Lock:")
+        row.prop(con, "locked", expand=True)
 
     def LIMIT_DISTANCE(self, context, layout, con, wide_ui):
         self.target_template(layout, con, wide_ui)
 
         col = layout.column(align=True)
-        col.itemR(con, "distance")
-        col.itemO("constraint.limitdistance_reset")
+        col.prop(con, "distance")
+        col.operator("constraint.limitdistance_reset")
 
         row = layout.row()
-        row.itemL(text="Clamp Region:")
-        row.itemR(con, "limit_mode", text="")
+        row.label(text="Clamp Region:")
+        row.prop(con, "limit_mode", text="")
 
     def STRETCH_TO(self, context, layout, con, wide_ui):
         self.target_template(layout, con, wide_ui)
@@ -525,23 +525,23 @@ class ConstraintButtonsPanel(bpy.types.Panel):
         split = layout.split()
 
         col = split.column()
-        col.itemR(con, "original_length", text="Rest Length")
+        col.prop(con, "original_length", text="Rest Length")
 
         if wide_ui:
             col = split.column()
-        col.itemO("constraint.stretchto_reset", text="Reset")
+        col.operator("constraint.stretchto_reset", text="Reset")
 
         col = layout.column()
-        col.itemR(con, "bulge", text="Volume Variation")
+        col.prop(con, "bulge", text="Volume Variation")
 
         row = layout.row()
         if wide_ui:
-            row.itemL(text="Volume:")
-        row.itemR(con, "volume", expand=True)
+            row.label(text="Volume:")
+        row.prop(con, "volume", expand=True)
         if not wide_ui:
             row = layout.row()
-        row.itemL(text="Plane:")
-        row.itemR(con, "keep_axis", expand=True)
+        row.label(text="Plane:")
+        row.prop(con, "keep_axis", expand=True)
 
     def FLOOR(self, context, layout, con, wide_ui):
         self.target_template(layout, con, wide_ui)
@@ -549,54 +549,54 @@ class ConstraintButtonsPanel(bpy.types.Panel):
         split = layout.split()
 
         col = split.column()
-        col.itemR(con, "sticky")
+        col.prop(con, "sticky")
 
         if wide_ui:
             col = split.column()
-        col.itemR(con, "use_rotation")
+        col.prop(con, "use_rotation")
 
-        layout.itemR(con, "offset")
+        layout.prop(con, "offset")
 
         row = layout.row()
         if wide_ui:
-            row.itemL(text="Min/Max:")
-        row.itemR(con, "floor_location", expand=True)
+            row.label(text="Min/Max:")
+        row.prop(con, "floor_location", expand=True)
 
     def RIGID_BODY_JOINT(self, context, layout, con, wide_ui):
         self.target_template(layout, con, wide_ui)
 
         if wide_ui:
-            layout.itemR(con, "pivot_type")
+            layout.prop(con, "pivot_type")
         else:
-            layout.itemR(con, "pivot_type", text="")
+            layout.prop(con, "pivot_type", text="")
         if wide_ui:
-            layout.itemR(con, "child")
+            layout.prop(con, "child")
         else:
-            layout.itemR(con, "child", text="")
+            layout.prop(con, "child", text="")
 
         split = layout.split()
 
         col = split.column()
-        col.itemR(con, "disable_linked_collision", text="No Collision")
+        col.prop(con, "disable_linked_collision", text="No Collision")
 
         if wide_ui:
             col = split.column()
-        col.itemR(con, "draw_pivot", text="Display Pivot")
+        col.prop(con, "draw_pivot", text="Display Pivot")
 
         split = layout.split()
 
         col = split.column(align=True)
-        col.itemL(text="Pivot:")
-        col.itemR(con, "pivot_x", text="X")
-        col.itemR(con, "pivot_y", text="Y")
-        col.itemR(con, "pivot_z", text="Z")
+        col.label(text="Pivot:")
+        col.prop(con, "pivot_x", text="X")
+        col.prop(con, "pivot_y", text="Y")
+        col.prop(con, "pivot_z", text="Z")
 
         if wide_ui:
             col = split.column(align=True)
-        col.itemL(text="Axis:")
-        col.itemR(con, "axis_x", text="X")
-        col.itemR(con, "axis_y", text="Y")
-        col.itemR(con, "axis_z", text="Z")
+        col.label(text="Axis:")
+        col.prop(con, "axis_x", text="X")
+        col.prop(con, "axis_y", text="Y")
+        col.prop(con, "axis_z", text="Z")
 
         #Missing: Limit arrays (not wrapped in RNA yet)
 
@@ -605,113 +605,113 @@ class ConstraintButtonsPanel(bpy.types.Panel):
 
         row = layout.row()
         if wide_ui:
-            row.itemL(text="Main Axis:")
-        row.itemR(con, "main_axis", expand=True)
+            row.label(text="Main Axis:")
+        row.prop(con, "main_axis", expand=True)
 
         row = layout.row()
-        row.itemR(con, "cyclic")
+        row.prop(con, "cyclic")
 
     def TRANSFORM(self, context, layout, con, wide_ui):
         self.target_template(layout, con, wide_ui)
 
-        layout.itemR(con, "extrapolate_motion", text="Extrapolate")
+        layout.prop(con, "extrapolate_motion", text="Extrapolate")
 
         col = layout.column()
-        col.row().itemL(text="Source:")
-        col.row().itemR(con, "map_from", expand=True)
+        col.row().label(text="Source:")
+        col.row().prop(con, "map_from", expand=True)
 
         split = layout.split()
 
         sub = split.column(align=True)
-        sub.itemL(text="X:")
-        sub.itemR(con, "from_min_x", text="Min")
-        sub.itemR(con, "from_max_x", text="Max")
+        sub.label(text="X:")
+        sub.prop(con, "from_min_x", text="Min")
+        sub.prop(con, "from_max_x", text="Max")
 
         if wide_ui:
             sub = split.column(align=True)
-        sub.itemL(text="Y:")
-        sub.itemR(con, "from_min_y", text="Min")
-        sub.itemR(con, "from_max_y", text="Max")
+        sub.label(text="Y:")
+        sub.prop(con, "from_min_y", text="Min")
+        sub.prop(con, "from_max_y", text="Max")
 
         if wide_ui:
             sub = split.column(align=True)
-        sub.itemL(text="Z:")
-        sub.itemR(con, "from_min_z", text="Min")
-        sub.itemR(con, "from_max_z", text="Max")
+        sub.label(text="Z:")
+        sub.prop(con, "from_min_z", text="Min")
+        sub.prop(con, "from_max_z", text="Max")
 
         split = layout.split()
 
         col = split.column()
-        col.itemL(text="Destination:")
-        col.row().itemR(con, "map_to", expand=True)
+        col.label(text="Destination:")
+        col.row().prop(con, "map_to", expand=True)
 
         split = layout.split()
 
         col = split.column()
-        col.itemL(text="X:")
-        col.row().itemR(con, "map_to_x_from", expand=True)
+        col.label(text="X:")
+        col.row().prop(con, "map_to_x_from", expand=True)
 
         sub = col.column(align=True)
-        sub.itemR(con, "to_min_x", text="Min")
-        sub.itemR(con, "to_max_x", text="Max")
+        sub.prop(con, "to_min_x", text="Min")
+        sub.prop(con, "to_max_x", text="Max")
 
         if wide_ui:
             col = split.column()
-        col.itemL(text="Y:")
-        col.row().itemR(con, "map_to_y_from", expand=True)
+        col.label(text="Y:")
+        col.row().prop(con, "map_to_y_from", expand=True)
 
         sub = col.column(align=True)
-        sub.itemR(con, "to_min_y", text="Min")
-        sub.itemR(con, "to_max_y", text="Max")
+        sub.prop(con, "to_min_y", text="Min")
+        sub.prop(con, "to_max_y", text="Max")
 
         if wide_ui:
             col = split.column()
-        col.itemL(text="Z:")
-        col.row().itemR(con, "map_to_z_from", expand=True)
+        col.label(text="Z:")
+        col.row().prop(con, "map_to_z_from", expand=True)
 
         sub = col.column(align=True)
-        sub.itemR(con, "to_min_z", text="Min")
-        sub.itemR(con, "to_max_z", text="Max")
+        sub.prop(con, "to_min_z", text="Min")
+        sub.prop(con, "to_max_z", text="Max")
 
         self.space_template(layout, con, wide_ui)
 
     def SHRINKWRAP(self, context, layout, con, wide_ui):
         self.target_template(layout, con, wide_ui)
 
-        layout.itemR(con, "distance")
-        layout.itemR(con, "shrinkwrap_type")
+        layout.prop(con, "distance")
+        layout.prop(con, "shrinkwrap_type")
 
         if con.shrinkwrap_type == 'PROJECT':
             row = layout.row(align=True)
-            row.itemR(con, "axis_x")
-            row.itemR(con, "axis_y")
-            row.itemR(con, "axis_z")
+            row.prop(con, "axis_x")
+            row.prop(con, "axis_y")
+            row.prop(con, "axis_z")
 
     def DAMPED_TRACK(self, context, layout, con, wide_ui):
         self.target_template(layout, con, wide_ui)
 
         row = layout.row()
         if wide_ui:
-            row.itemL(text="To:")
-        row.itemR(con, "track", expand=True)
+            row.label(text="To:")
+        row.prop(con, "track", expand=True)
 
     def SPLINE_IK(self, context, layout, con, wide_ui):
         self.target_template(layout, con, wide_ui)
 
         col = layout.column()
-        col.itemL(text="Spline Fitting:")
-        col.itemR(con, "chain_length")
-        col.itemR(con, "even_divisions")
-        col.itemR(con, "chain_offset")
+        col.label(text="Spline Fitting:")
+        col.prop(con, "chain_length")
+        col.prop(con, "even_divisions")
+        col.prop(con, "chain_offset")
 
         col = layout.column()
-        col.itemL(text="Chain Scaling:")
-        col.itemR(con, "y_stretch")
+        col.label(text="Chain Scaling:")
+        col.prop(con, "y_stretch")
         if wide_ui:
-            col.itemR(con, "xz_scaling_mode")
+            col.prop(con, "xz_scaling_mode")
         else:
-            col.itemR(con, "xz_scaling_mode", text="")
-        col.itemR(con, "use_curve_radius")
+            col.prop(con, "xz_scaling_mode", text="")
+        col.prop(con, "use_curve_radius")
 
 
 class OBJECT_PT_constraints(ConstraintButtonsPanel):
@@ -727,9 +727,9 @@ class OBJECT_PT_constraints(ConstraintButtonsPanel):
         wide_ui = context.region.width > narrowui
 
         row = layout.row()
-        row.item_menu_enumO("object.constraint_add", "type")
+        row.operator_menu_enum("object.constraint_add", "type")
         if wide_ui:
-            row.itemL()
+            row.label()
 
         for con in ob.constraints:
             self.draw_constraint(context, con)
@@ -759,12 +759,12 @@ class BONE_PT_inverse_kinematics(ConstraintButtonsPanel):
         wide_ui = context.region.width > narrowui
 
         row = layout.row()
-        row.itemR(ob.pose, "ik_solver")
+        row.prop(ob.pose, "ik_solver")
 
         split = layout.split(percentage=0.25)
-        split.itemR(pchan, "ik_dof_x", text="X")
+        split.prop(pchan, "ik_dof_x", text="X")
         row = split.row()
-        row.itemR(pchan, "ik_stiffness_x", text="Stiffness", slider=True)
+        row.prop(pchan, "ik_stiffness_x", text="Stiffness", slider=True)
         row.active = pchan.ik_dof_x
 
         if wide_ui:
@@ -772,18 +772,18 @@ class BONE_PT_inverse_kinematics(ConstraintButtonsPanel):
             sub = split.row()
         else:
             sub = layout.column(align=True)
-        sub.itemR(pchan, "ik_limit_x", text="Limit")
+        sub.prop(pchan, "ik_limit_x", text="Limit")
         sub.active = pchan.ik_dof_x
         if wide_ui:
             sub = split.row(align=True)
-        sub.itemR(pchan, "ik_min_x", text="")
-        sub.itemR(pchan, "ik_max_x", text="")
+        sub.prop(pchan, "ik_min_x", text="")
+        sub.prop(pchan, "ik_max_x", text="")
         sub.active = pchan.ik_dof_x and pchan.ik_limit_x
 
         split = layout.split(percentage=0.25)
-        split.itemR(pchan, "ik_dof_y", text="Y")
+        split.prop(pchan, "ik_dof_y", text="Y")
         row = split.row()
-        row.itemR(pchan, "ik_stiffness_y", text="Stiffness", slider=True)
+        row.prop(pchan, "ik_stiffness_y", text="Stiffness", slider=True)
         row.active = pchan.ik_dof_y
 
         if wide_ui:
@@ -791,18 +791,18 @@ class BONE_PT_inverse_kinematics(ConstraintButtonsPanel):
             sub = split.row()
         else:
             sub = layout.column(align=True)
-        sub.itemR(pchan, "ik_limit_y", text="Limit")
+        sub.prop(pchan, "ik_limit_y", text="Limit")
         sub.active = pchan.ik_dof_y
         if wide_ui:
             sub = split.row(align=True)
-        sub.itemR(pchan, "ik_min_y", text="")
-        sub.itemR(pchan, "ik_max_y", text="")
+        sub.prop(pchan, "ik_min_y", text="")
+        sub.prop(pchan, "ik_max_y", text="")
         sub.active = pchan.ik_dof_y and pchan.ik_limit_y
 
         split = layout.split(percentage=0.25)
-        split.itemR(pchan, "ik_dof_z", text="Z")
+        split.prop(pchan, "ik_dof_z", text="Z")
         sub = split.row()
-        sub.itemR(pchan, "ik_stiffness_z", text="Stiffness", slider=True)
+        sub.prop(pchan, "ik_stiffness_z", text="Stiffness", slider=True)
         sub.active = pchan.ik_dof_z
 
         if wide_ui:
@@ -810,29 +810,29 @@ class BONE_PT_inverse_kinematics(ConstraintButtonsPanel):
             sub = split.row()
         else:
             sub = layout.column(align=True)
-        sub.itemR(pchan, "ik_limit_z", text="Limit")
+        sub.prop(pchan, "ik_limit_z", text="Limit")
         sub.active = pchan.ik_dof_z
         if wide_ui:
             sub = split.row(align=True)
-        sub.itemR(pchan, "ik_min_z", text="")
-        sub.itemR(pchan, "ik_max_z", text="")
+        sub.prop(pchan, "ik_min_z", text="")
+        sub.prop(pchan, "ik_max_z", text="")
         sub.active = pchan.ik_dof_z and pchan.ik_limit_z
         split = layout.split()
-        split.itemR(pchan, "ik_stretch", text="Stretch", slider=True)
+        split.prop(pchan, "ik_stretch", text="Stretch", slider=True)
         if wide_ui:
-            split.itemL()
+            split.label()
 
         if ob.pose.ik_solver == 'ITASC':
             split = layout.split()
             col = split.column()
-            col.itemR(pchan, "ik_rot_control", text="Control Rotation")
+            col.prop(pchan, "ik_rot_control", text="Control Rotation")
             if wide_ui:
                 col = split.column()
-            col.itemR(pchan, "ik_rot_weight", text="Weight", slider=True)
+            col.prop(pchan, "ik_rot_weight", text="Weight", slider=True)
             # not supported yet
             #row = layout.row()
-            #row.itemR(pchan, "ik_lin_control", text="Joint Size")
-            #row.itemR(pchan, "ik_lin_weight", text="Weight", slider=True)
+            #row.prop(pchan, "ik_lin_control", text="Joint Size")
+            #row.prop(pchan, "ik_lin_weight", text="Weight", slider=True)
 
 
 class BONE_PT_iksolver_itasc(ConstraintButtonsPanel):
@@ -857,39 +857,39 @@ class BONE_PT_iksolver_itasc(ConstraintButtonsPanel):
         itasc = ob.pose.ik_param
         wide_ui = context.region.width > narrowui
 
-        layout.itemR(itasc, "mode", expand=True)
+        layout.prop(itasc, "mode", expand=True)
         simulation = itasc.mode == 'SIMULATION'
         if simulation:
-            layout.itemL(text="Reiteration:")
-            layout.itemR(itasc, "reiteration", expand=True)
+            layout.label(text="Reiteration:")
+            layout.prop(itasc, "reiteration", expand=True)
 
         split = layout.split()
         split.active = not simulation or itasc.reiteration != 'NEVER'
         col = split.column()
-        col.itemR(itasc, "precision")
+        col.prop(itasc, "precision")
 
         if wide_ui:
             col = split.column()
-        col.itemR(itasc, "num_iter")
+        col.prop(itasc, "num_iter")
 
 
         if simulation:
-            layout.itemR(itasc, "auto_step")
+            layout.prop(itasc, "auto_step")
             row = layout.row()
             if itasc.auto_step:
-                row.itemR(itasc, "min_step", text="Min")
-                row.itemR(itasc, "max_step", text="Max")
+                row.prop(itasc, "min_step", text="Min")
+                row.prop(itasc, "max_step", text="Max")
             else:
-                row.itemR(itasc, "num_step")
+                row.prop(itasc, "num_step")
 
-        layout.itemR(itasc, "solver")
+        layout.prop(itasc, "solver")
         if simulation:
-            layout.itemR(itasc, "feedback")
-            layout.itemR(itasc, "max_velocity")
+            layout.prop(itasc, "feedback")
+            layout.prop(itasc, "max_velocity")
         if itasc.solver == 'DLS':
             row = layout.row()
-            row.itemR(itasc, "dampmax", text="Damp", slider=True)
-            row.itemR(itasc, "dampeps", text="Eps", slider=True)
+            row.prop(itasc, "dampmax", text="Damp", slider=True)
+            row.prop(itasc, "dampeps", text="Eps", slider=True)
 
 
 class BONE_PT_constraints(ConstraintButtonsPanel):
@@ -908,9 +908,9 @@ class BONE_PT_constraints(ConstraintButtonsPanel):
         wide_ui = context.region.width > narrowui
 
         row = layout.row()
-        row.item_menu_enumO("pose.constraint_add", "type")
+        row.operator_menu_enum("pose.constraint_add", "type")
         if wide_ui:
-            row.itemL()
+            row.label()
 
         for con in pchan.constraints:
             self.draw_constraint(context, con)
index 9315b209861fa8e17bfe596bd2ac93e56fd9f57f..f70e269e7cd10ebcd9f03f2d420581f0944e8a74 100644 (file)
@@ -66,68 +66,68 @@ class PARTICLE_PT_particles(ParticleButtonsPanel):
             row.template_list(ob, "particle_systems", ob, "active_particle_system_index", rows=2)
 
             col = row.column(align=True)
-            col.itemO("object.particle_system_add", icon='ICON_ZOOMIN', text="")
-            col.itemO("object.particle_system_remove", icon='ICON_ZOOMOUT', text="")
+            col.operator("object.particle_system_add", icon='ICON_ZOOMIN', text="")
+            col.operator("object.particle_system_remove", icon='ICON_ZOOMOUT', text="")
 
         if psys and not psys.settings:
             split = layout.split(percentage=0.32)
 
             col = split.column()
-            col.itemL(text="Name:")
-            col.itemL(text="Settings:")
+            col.label(text="Name:")
+            col.label(text="Settings:")
 
             col = split.column()
-            col.itemR(psys, "name", text="")
+            col.prop(psys, "name", text="")
             col.template_ID(psys, "settings", new="particle.new")
         elif psys:
             part = psys.settings
 
             split = layout.split(percentage=0.32)
             col = split.column()
-            col.itemL(text="Name:")
+            col.label(text="Name:")
             if part.type in ('EMITTER', 'REACTOR', 'HAIR'):
-                col.itemL(text="Settings:")
-                col.itemL(text="Type:")
+                col.label(text="Settings:")
+                col.label(text="Type:")
 
             col = split.column()
-            col.itemR(psys, "name", text="")
+            col.prop(psys, "name", text="")
             if part.type in ('EMITTER', 'REACTOR', 'HAIR'):
                 col.template_ID(psys, "settings", new="particle.new")
 
             #row = layout.row()
-            #row.itemL(text="Viewport")
-            #row.itemL(text="Render")
+            #row.label(text="Viewport")
+            #row.label(text="Render")
 
             if part:
                 if part.type not in ('EMITTER', 'REACTOR', 'HAIR'):
-                    layout.itemL(text="No settings for fluid particles")
+                    layout.label(text="No settings for fluid particles")
                     return
 
                 row = col.row()
                 row.enabled = particle_panel_enabled(context, psys)
-                row.itemR(part, "type", text="")
-                row.itemR(psys, "seed")
+                row.prop(part, "type", text="")
+                row.prop(psys, "seed")
 
                 split = layout.split(percentage=0.65)
                 if part.type == 'HAIR':
                     if psys.edited:
-                        split.itemO("particle.edited_clear", text="Free Edit")
+                        split.operator("particle.edited_clear", text="Free Edit")
                     else:
-                        split.itemL(text="")
+                        split.label(text="")
                     row = split.row()
                     row.enabled = particle_panel_enabled(context, psys)
-                    row.itemR(part, "hair_step")
+                    row.prop(part, "hair_step")
                     if psys.edited:
                         if psys.global_hair:
-                            layout.itemO("particle.connect_hair")
-                            layout.itemL(text="Hair is disconnected.")
+                            layout.operator("particle.connect_hair")
+                            layout.label(text="Hair is disconnected.")
                         else:
-                            layout.itemO("particle.disconnect_hair")
-                            layout.itemL(text="")
+                            layout.operator("particle.disconnect_hair")
+                            layout.label(text="")
                 elif part.type == 'REACTOR':
                     split.enabled = particle_panel_enabled(context, psys)
-                    split.itemR(psys, "reactor_target_object")
-                    split.itemR(psys, "reactor_target_particle_system", text="Particle System")
+                    split.prop(psys, "reactor_target_object")
+                    split.prop(psys, "reactor_target_particle_system", text="Particle System")
 
 
 class PARTICLE_PT_emission(ParticleButtonsPanel):
@@ -149,39 +149,39 @@ class PARTICLE_PT_emission(ParticleButtonsPanel):
 
         row = layout.row()
         row.active = part.distribution != 'GRID'
-        row.itemR(part, "amount")
+        row.prop(part, "amount")
 
         if part.type != 'HAIR':
             split = layout.split()
 
             col = split.column(align=True)
-            col.itemR(part, "start")
-            col.itemR(part, "end")
+            col.prop(part, "start")
+            col.prop(part, "end")
 
             col = split.column(align=True)
-            col.itemR(part, "lifetime")
-            col.itemR(part, "random_lifetime", slider=True)
+            col.prop(part, "lifetime")
+            col.prop(part, "random_lifetime", slider=True)
 
-        layout.row().itemL(text="Emit From:")
+        layout.row().label(text="Emit From:")
 
         row = layout.row()
-        row.itemR(part, "emit_from", expand=True)
+        row.prop(part, "emit_from", expand=True)
         row = layout.row()
-        row.itemR(part, "trand")
+        row.prop(part, "trand")
         if part.distribution != 'GRID':
-            row.itemR(part, "even_distribution")
+            row.prop(part, "even_distribution")
 
         if part.emit_from == 'FACE' or part.emit_from == 'VOLUME':
             row = layout.row()
-            row.itemR(part, "distribution", expand=True)
+            row.prop(part, "distribution", expand=True)
 
             row = layout.row()
 
             if part.distribution == 'JIT':
-                row.itemR(part, "userjit", text="Particles/Face")
-                row.itemR(part, "jitter_factor", text="Jittering Amount", slider=True)
+                row.prop(part, "userjit", text="Particles/Face")
+                row.prop(part, "jitter_factor", text="Jittering Amount", slider=True)
             elif part.distribution == 'GRID':
-                row.itemR(part, "grid_resolution")
+                row.prop(part, "grid_resolution")
 
 
 class PARTICLE_PT_hair_dynamics(ParticleButtonsPanel):
@@ -200,9 +200,9 @@ class PARTICLE_PT_hair_dynamics(ParticleButtonsPanel):
         #cloth = context.cloth.collision_settings
 
         #self.layout.active = cloth_panel_enabled(context.cloth)
-        #self.layout.itemR(cloth, "enable_collision", text="")
+        #self.layout.prop(cloth, "enable_collision", text="")
         psys = context.particle_system
-        self.layout.itemR(psys, "hair_dynamics", text="")
+        self.layout.prop(psys, "hair_dynamics", text="")
 
     def draw(self, context):
         layout = self.layout
@@ -216,22 +216,22 @@ class PARTICLE_PT_hair_dynamics(ParticleButtonsPanel):
         split = layout.split()
 
         col = split.column()
-        col.itemL(text="Material:")
+        col.label(text="Material:")
         sub = col.column(align=True)
-        sub.itemR(cloth, "pin_stiffness", text="Stiffness")
-        sub.itemR(cloth, "mass")
-        sub.itemR(cloth, "bending_stiffness", text="Bending")
-        sub.itemR(cloth, "internal_friction", slider=True)
+        sub.prop(cloth, "pin_stiffness", text="Stiffness")
+        sub.prop(cloth, "mass")
+        sub.prop(cloth, "bending_stiffness", text="Bending")
+        sub.prop(cloth, "internal_friction", slider=True)
 
         col = split.column()
 
-        col.itemL(text="Damping:")
+        col.label(text="Damping:")
         sub = col.column(align=True)
-        sub.itemR(cloth, "spring_damping", text="Spring")
-        sub.itemR(cloth, "air_damping", text="Air")
+        sub.prop(cloth, "spring_damping", text="Spring")
+        sub.prop(cloth, "air_damping", text="Air")
 
-        col.itemL(text="Quality:")
-        col.itemR(cloth, "quality", text="Steps", slider=True)
+        col.label(text="Quality:")
+        col.prop(cloth, "quality", text="Steps", slider=True)
 
 
 class PARTICLE_PT_cache(ParticleButtonsPanel):
@@ -277,29 +277,29 @@ class PARTICLE_PT_velocity(ParticleButtonsPanel):
         split = layout.split()
 
         sub = split.column()
-        sub.itemL(text="Emitter Geometry:")
-        sub.itemR(part, "normal_factor")
+        sub.label(text="Emitter Geometry:")
+        sub.prop(part, "normal_factor")
         subsub = sub.column(align=True)
-        subsub.itemR(part, "tangent_factor")
-        subsub.itemR(part, "tangent_phase", slider=True)
+        subsub.prop(part, "tangent_factor")
+        subsub.prop(part, "tangent_phase", slider=True)
 
         sub = split.column()
-        sub.itemL(text="Emitter Object")
-        sub.itemR(part, "object_aligned_factor", text="")
+        sub.label(text="Emitter Object")
+        sub.prop(part, "object_aligned_factor", text="")
 
-        layout.row().itemL(text="Other:")
+        layout.row().label(text="Other:")
         split = layout.split()
         sub = split.column()
         if part.emit_from == 'PARTICLE':
-            sub.itemR(part, "particle_factor")
+            sub.prop(part, "particle_factor")
         else:
-            sub.itemR(part, "object_factor", slider=True)
+            sub.prop(part, "object_factor", slider=True)
         sub = split.column()
-        sub.itemR(part, "random_factor")
+        sub.prop(part, "random_factor")
 
         #if part.type=='REACTOR':
-        #      sub.itemR(part, "reactor_factor")
-        #      sub.itemR(part, "reaction_shape", slider=True)
+        #      sub.prop(part, "reactor_factor")
+        #      sub.prop(part, "reaction_shape", slider=True)
 
 
 class PARTICLE_PT_rotation(ParticleButtonsPanel):
@@ -321,25 +321,25 @@ class PARTICLE_PT_rotation(ParticleButtonsPanel):
         layout.enabled = particle_panel_enabled(context, psys)
 
         split = layout.split()
-        split.itemL(text="Initial Rotation:")
-        split.itemR(part, "rotation_dynamic")
+        split.label(text="Initial Rotation:")
+        split.prop(part, "rotation_dynamic")
         split = layout.split()
 
         sub = split.column(align=True)
-        sub.itemR(part, "rotation_mode", text="")
-        sub.itemR(part, "random_rotation_factor", slider=True, text="Random")
+        sub.prop(part, "rotation_mode", text="")
+        sub.prop(part, "random_rotation_factor", slider=True, text="Random")
 
         sub = split.column(align=True)
-        sub.itemR(part, "phase_factor", slider=True)
-        sub.itemR(part, "random_phase_factor", text="Random", slider=True)
+        sub.prop(part, "phase_factor", slider=True)
+        sub.prop(part, "random_phase_factor", text="Random", slider=True)
 
-        layout.row().itemL(text="Angular Velocity:")
-        layout.row().itemR(part, "angular_velocity_mode", expand=True)
+        layout.row().label(text="Angular Velocity:")
+        layout.row().prop(part, "angular_velocity_mode", expand=True)
         split = layout.split()
 
         sub = split.column()
 
-        sub.itemR(part, "angular_velocity_factor", text="")
+        sub.prop(part, "angular_velocity_factor", text="")
 
 
 class PARTICLE_PT_physics(ParticleButtonsPanel):
@@ -360,29 +360,29 @@ class PARTICLE_PT_physics(ParticleButtonsPanel):
         layout.enabled = particle_panel_enabled(context, psys)
 
         row = layout.row()
-        row.itemR(part, "physics_type", expand=True)
+        row.prop(part, "physics_type", expand=True)
         if part.physics_type != 'NO':
             row = layout.row()
             col = row.column(align=True)
-            col.itemR(part, "particle_size")
-            col.itemR(part, "random_size", slider=True)
+            col.prop(part, "particle_size")
+            col.prop(part, "random_size", slider=True)
             col = row.column(align=True)
-            col.itemR(part, "mass")
-            col.itemR(part, "sizemass", text="Multiply mass with size")
+            col.prop(part, "mass")
+            col.prop(part, "sizemass", text="Multiply mass with size")
 
         if part.physics_type == 'NEWTON':
             split = layout.split()
             sub = split.column()
 
-            sub.itemL(text="Forces:")
-            sub.itemR(part, "brownian_factor")
-            sub.itemR(part, "drag_factor", slider=True)
-            sub.itemR(part, "damp_factor", slider=True)
+            sub.label(text="Forces:")
+            sub.prop(part, "brownian_factor")
+            sub.prop(part, "drag_factor", slider=True)
+            sub.prop(part, "damp_factor", slider=True)
             sub = split.column()
-            sub.itemR(part, "size_deflect")
-            sub.itemR(part, "die_on_collision")
-            sub.itemR(part, "integrator")
-            sub.itemR(part, "time_tweak")
+            sub.prop(part, "size_deflect")
+            sub.prop(part, "die_on_collision")
+            sub.prop(part, "integrator")
+            sub.prop(part, "time_tweak")
 
         elif part.physics_type == 'KEYED':
             split = layout.split()
@@ -391,61 +391,61 @@ class PARTICLE_PT_physics(ParticleButtonsPanel):
             row = layout.row()
             col = row.column()
             col.active = not psys.keyed_timing
-            col.itemR(part, "keyed_loops", text="Loops")
-            row.itemR(psys, "keyed_timing", text="Use Timing")
+            col.prop(part, "keyed_loops", text="Loops")
+            row.prop(psys, "keyed_timing", text="Use Timing")
 
-            layout.itemL(text="Keys:")
+            layout.label(text="Keys:")
         elif part.physics_type == 'BOIDS':
             boids = part.boids
 
 
             row = layout.row()
-            row.itemR(boids, "allow_flight")
-            row.itemR(boids, "allow_land")
-            row.itemR(boids, "allow_climb")
+            row.prop(boids, "allow_flight")
+            row.prop(boids, "allow_land")
+            row.prop(boids, "allow_climb")
 
             split = layout.split()
 
             sub = split.column()
             col = sub.column(align=True)
             col.active = boids.allow_flight
-            col.itemR(boids, "air_max_speed")
-            col.itemR(boids, "air_min_speed", slider=True)
-            col.itemR(boids, "air_max_acc", slider=True)
-            col.itemR(boids, "air_max_ave", slider=True)
-            col.itemR(boids, "air_personal_space")
+            col.prop(boids, "air_max_speed")
+            col.prop(boids, "air_min_speed", slider=True)
+            col.prop(boids, "air_max_acc", slider=True)
+            col.prop(boids, "air_max_ave", slider=True)
+            col.prop(boids, "air_personal_space")
             row = col.row()
             row.active = (boids.allow_land or boids.allow_climb) and boids.allow_flight
-            row.itemR(boids, "landing_smoothness")
+            row.prop(boids, "landing_smoothness")
 
             sub = split.column()
             col = sub.column(align=True)
             col.active = boids.allow_land or boids.allow_climb
-            col.itemR(boids, "land_max_speed")
-            col.itemR(boids, "land_jump_speed")
-            col.itemR(boids, "land_max_acc", slider=True)
-            col.itemR(boids, "land_max_ave", slider=True)
-            col.itemR(boids, "land_personal_space")
-            col.itemR(boids, "land_stick_force")
+            col.prop(boids, "land_max_speed")
+            col.prop(boids, "land_jump_speed")
+            col.prop(boids, "land_max_acc", slider=True)
+            col.prop(boids, "land_max_ave", slider=True)
+            col.prop(boids, "land_personal_space")
+            col.prop(boids, "land_stick_force")
 
             row = layout.row()
 
             col = row.column(align=True)
-            col.itemL(text="Battle:")
-            col.itemR(boids, "health")
-            col.itemR(boids, "strength")
-            col.itemR(boids, "aggression")
-            col.itemR(boids, "accuracy")
-            col.itemR(boids, "range")
+            col.label(text="Battle:")
+            col.prop(boids, "health")
+            col.prop(boids, "strength")
+            col.prop(boids, "aggression")
+            col.prop(boids, "accuracy")
+            col.prop(boids, "range")
 
             col = row.column()
-            col.itemL(text="Misc:")
-            col.itemR(boids, "banking", slider=True)
-            col.itemR(boids, "height", slider=True)
+            col.label(text="Misc:")
+            col.prop(boids, "banking", slider=True)
+            col.prop(boids, "height", slider=True)
 
         if part.physics_type == 'KEYED' or part.physics_type == 'BOIDS':
             if part.physics_type == 'BOIDS':
-                layout.itemL(text="Relations:")
+                layout.label(text="Relations:")
 
             row = layout.row()
             row.template_list(psys, "targets", psys, "active_particle_target_index")
@@ -453,12 +453,12 @@ class PARTICLE_PT_physics(ParticleButtonsPanel):
             col = row.column()
             sub = col.row()
             subsub = sub.column(align=True)
-            subsub.itemO("particle.new_target", icon='ICON_ZOOMIN', text="")
-            subsub.itemO("particle.remove_target", icon='ICON_ZOOMOUT', text="")
+            subsub.operator("particle.new_target", icon='ICON_ZOOMIN', text="")
+            subsub.operator("particle.remove_target", icon='ICON_ZOOMOUT', text="")
             sub = col.row()
             subsub = sub.column(align=True)
-            subsub.itemO("particle.target_move_up", icon='VICON_MOVE_UP', text="")
-            subsub.itemO("particle.target_move_down", icon='VICON_MOVE_DOWN', text="")
+            subsub.operator("particle.target_move_up", icon='VICON_MOVE_UP', text="")
+            subsub.operator("particle.target_move_down", icon='VICON_MOVE_DOWN', text="")
 
             key = psys.active_particle_target
             if key:
@@ -467,20 +467,20 @@ class PARTICLE_PT_physics(ParticleButtonsPanel):
                     col = row.column()
                     #doesn't work yet
                     #col.red_alert = key.valid
-                    col.itemR(key, "object", text="")
-                    col.itemR(key, "system", text="System")
+                    col.prop(key, "object", text="")
+                    col.prop(key, "system", text="System")
                     col = row.column()
                     col.active = psys.keyed_timing
-                    col.itemR(key, "time")
-                    col.itemR(key, "duration")
+                    col.prop(key, "time")
+                    col.prop(key, "duration")
                 else:
                     sub = row.row()
                     #doesn't work yet
                     #sub.red_alert = key.valid
-                    sub.itemR(key, "object", text="")
-                    sub.itemR(key, "system", text="System")
+                    sub.prop(key, "object", text="")
+                    sub.prop(key, "system", text="System")
 
-                    layout.itemR(key, "mode", expand=True)
+                    layout.prop(key, "mode", expand=True)
 
 
 class PARTICLE_PT_boidbrain(ParticleButtonsPanel):
@@ -508,22 +508,22 @@ class PARTICLE_PT_boidbrain(ParticleButtonsPanel):
         #row.template_list(boids, "states", boids, "active_boid_state_index", compact="True")
         #col = row.row()
         #sub = col.row(align=True)
-        #sub.itemO("boid.state_add", icon='ICON_ZOOMIN', text="")
-        #sub.itemO("boid.state_del", icon='ICON_ZOOMOUT', text="")
+        #sub.operator("boid.state_add", icon='ICON_ZOOMIN', text="")
+        #sub.operator("boid.state_del", icon='ICON_ZOOMOUT', text="")
         #sub = row.row(align=True)
-        #sub.itemO("boid.state_move_up", icon='VICON_MOVE_UP', text="")
-        #sub.itemO("boid.state_move_down", icon='VICON_MOVE_DOWN', text="")
+        #sub.operator("boid.state_move_up", icon='VICON_MOVE_UP', text="")
+        #sub.operator("boid.state_move_down", icon='VICON_MOVE_DOWN', text="")
 
         state = boids.active_boid_state
 
-        #layout.itemR(state, "name", text="State name")
+        #layout.prop(state, "name", text="State name")
 
         row = layout.row()
-        row.itemR(state, "ruleset_type")
+        row.prop(state, "ruleset_type")
         if state.ruleset_type == 'FUZZY':
-            row.itemR(state, "rule_fuzziness", slider=True)
+            row.prop(state, "rule_fuzziness", slider=True)
         else:
-            row.itemL(text="")
+            row.label(text="")
 
         row = layout.row()
         row.template_list(state, "rules", state, "active_boid_rule_index")
@@ -531,54 +531,54 @@ class PARTICLE_PT_boidbrain(ParticleButtonsPanel):
         col = row.column()
         sub = col.row()
         subsub = sub.column(align=True)
-        subsub.item_menu_enumO("boid.rule_add", "type", icon='ICON_ZOOMIN', text="")
-        subsub.itemO("boid.rule_del", icon='ICON_ZOOMOUT', text="")
+        subsub.operator_menu_enum("boid.rule_add", "type", icon='ICON_ZOOMIN', text="")
+        subsub.operator("boid.rule_del", icon='ICON_ZOOMOUT', text="")
         sub = col.row()
         subsub = sub.column(align=True)
-        subsub.itemO("boid.rule_move_up", icon='VICON_MOVE_UP', text="")
-        subsub.itemO("boid.rule_move_down", icon='VICON_MOVE_DOWN', text="")
+        subsub.operator("boid.rule_move_up", icon='VICON_MOVE_UP', text="")
+        subsub.operator("boid.rule_move_down", icon='VICON_MOVE_DOWN', text="")
 
         rule = state.active_boid_rule
 
         if rule:
             row = layout.row()
-            row.itemR(rule, "name", text="")
+            row.prop(rule, "name", text="")
             #somebody make nice icons for boids here please! -jahka
-            row.itemR(rule, "in_air", icon='VICON_MOVE_UP', text="")
-            row.itemR(rule, "on_land", icon='VICON_MOVE_DOWN', text="")
+            row.prop(rule, "in_air", icon='VICON_MOVE_UP', text="")
+            row.prop(rule, "on_land", icon='VICON_MOVE_DOWN', text="")
 
             row = layout.row()
 
             if rule.type == 'GOAL':
-                row.itemR(rule, "object")
+                row.prop(rule, "object")
                 row = layout.row()
-                row.itemR(rule, "predict")
+                row.prop(rule, "predict")
             elif rule.type == 'AVOID':
-                row.itemR(rule, "object")
+                row.prop(rule, "object")
                 row = layout.row()
-                row.itemR(rule, "predict")
-                row.itemR(rule, "fear_factor")
+                row.prop(rule, "predict")
+                row.prop(rule, "fear_factor")
             elif rule.type == 'FOLLOW_PATH':
-                row.itemL(text="Not yet functional.")
+                row.label(text="Not yet functional.")
             elif rule.type == 'AVOID_COLLISION':
-                row.itemR(rule, "boids")
-                row.itemR(rule, "deflectors")
-                row.itemR(rule, "look_ahead")
+                row.prop(rule, "boids")
+                row.prop(rule, "deflectors")
+                row.prop(rule, "look_ahead")
             elif rule.type == 'FOLLOW_LEADER':
-                row.itemR(rule, "object", text="")
-                row.itemR(rule, "distance")
+                row.prop(rule, "object", text="")
+                row.prop(rule, "distance")
                 row = layout.row()
-                row.itemR(rule, "line")
+                row.prop(rule, "line")
                 sub = row.row()
                 sub.active = rule.line
-                sub.itemR(rule, "queue_size")
+                sub.prop(rule, "queue_size")
             elif rule.type == 'AVERAGE_SPEED':
-                row.itemR(rule, "speed", slider=True)
-                row.itemR(rule, "wander", slider=True)
-                row.itemR(rule, "level", slider=True)
+                row.prop(rule, "speed", slider=True)
+                row.prop(rule, "wander", slider=True)
+                row.prop(rule, "level", slider=True)
             elif rule.type == 'FIGHT':
-                row.itemR(rule, "distance")
-                row.itemR(rule, "flee_distance")
+                row.prop(rule, "distance")
+                row.prop(rule, "flee_distance")
 
 
 class PARTICLE_PT_render(ParticleButtonsPanel):
@@ -599,90 +599,90 @@ class PARTICLE_PT_render(ParticleButtonsPanel):
         part = psys.settings
 
         row = layout.row()
-        row.itemR(part, "material")
-        row.itemR(psys, "parent")
+        row.prop(part, "material")
+        row.prop(psys, "parent")
 
         split = layout.split()
 
         sub = split.column()
-        sub.itemR(part, "emitter")
-        sub.itemR(part, "parent")
+        sub.prop(part, "emitter")
+        sub.prop(part, "parent")
         sub = split.column()
-        sub.itemR(part, "unborn")
-        sub.itemR(part, "died")
+        sub.prop(part, "unborn")
+        sub.prop(part, "died")
 
         row = layout.row()
-        row.itemR(part, "ren_as", expand=True)
+        row.prop(part, "ren_as", expand=True)
 
         split = layout.split()
 
         sub = split.column()
 
         if part.ren_as == 'LINE':
-            sub.itemR(part, "line_length_tail")
-            sub.itemR(part, "line_length_head")
+            sub.prop(part, "line_length_tail")
+            sub.prop(part, "line_length_head")
             sub = split.column()
-            sub.itemR(part, "velocity_length")
+            sub.prop(part, "velocity_length")
         elif part.ren_as == 'PATH':
 
             if part.type != 'HAIR' and part.physics_type != 'KEYED' and (psys.point_cache.baked is False):
                 box = layout.box()
-                box.itemL(text="Baked or keyed particles needed for correct rendering.")
+                box.label(text="Baked or keyed particles needed for correct rendering.")
                 return
 
-            sub.itemR(part, "render_strand")
+            sub.prop(part, "render_strand")
             subsub = sub.column()
             subsub.active = (part.render_strand is False)
-            subsub.itemR(part, "render_adaptive")
+            subsub.prop(part, "render_adaptive")
             subsub = sub.column()
             subsub.active = part.render_adaptive or part.render_strand == True
-            subsub.itemR(part, "adaptive_angle")
+            subsub.prop(part, "adaptive_angle")
             subsub = sub.column()
             subsub.active = (part.render_adaptive is True and part.render_strand is False)
-            subsub.itemR(part, "adaptive_pix")
-            sub.itemR(part, "hair_bspline")
-            sub.itemR(part, "render_step", text="Steps")
+            subsub.prop(part, "adaptive_pix")
+            sub.prop(part, "hair_bspline")
+            sub.prop(part, "render_step", text="Steps")
 
             sub = split.column()
-            sub.itemL(text="Timing:")
-            sub.itemR(part, "abs_path_time")
-            sub.itemR(part, "path_start", text="Start", slider=not part.abs_path_time)
-            sub.itemR(part, "path_end", text="End", slider=not part.abs_path_time)
-            sub.itemR(part, "random_length", text="Random", slider=True)
+            sub.label(text="Timing:")
+            sub.prop(part, "abs_path_time")
+            sub.prop(part, "path_start", text="Start", slider=not part.abs_path_time)
+            sub.prop(part, "path_end", text="End", slider=not part.abs_path_time)
+            sub.prop(part, "random_length", text="Random", slider=True)
 
             row = layout.row()
             col = row.column()
 
             if part.type == 'HAIR' and part.render_strand == True and part.child_type == 'FACES':
-                layout.itemR(part, "enable_simplify")
+                layout.prop(part, "enable_simplify")
                 if part.enable_simplify == True:
                     row = layout.row()
-                    row.itemR(part, "simplify_refsize")
-                    row.itemR(part, "simplify_rate")
-                    row.itemR(part, "simplify_transition")
+                    row.prop(part, "simplify_refsize")
+                    row.prop(part, "simplify_rate")
+                    row.prop(part, "simplify_transition")
                     row = layout.row()
-                    row.itemR(part, "viewport")
+                    row.prop(part, "viewport")
                     sub = row.row()
                     sub.active = part.viewport == True
-                    sub.itemR(part, "simplify_viewport")
+                    sub.prop(part, "simplify_viewport")
 
         elif part.ren_as == 'OBJECT':
-            sub.itemR(part, "dupli_object")
-            sub.itemR(part, "use_global_dupli")
+            sub.prop(part, "dupli_object")
+            sub.prop(part, "use_global_dupli")
         elif part.ren_as == 'GROUP':
-            sub.itemR(part, "dupli_group")
+            sub.prop(part, "dupli_group")
             split = layout.split()
             sub = split.column()
-            sub.itemR(part, "whole_group")
+            sub.prop(part, "whole_group")
             subsub = sub.column()
             subsub.active = (part.whole_group is False)
-            subsub.itemR(part, "use_group_count")
+            subsub.prop(part, "use_group_count")
 
             sub = split.column()
             subsub = sub.column()
             subsub.active = (part.whole_group is False)
-            subsub.itemR(part, "use_global_dupli")
-            subsub.itemR(part, "rand_group")
+            subsub.prop(part, "use_global_dupli")
+            subsub.prop(part, "rand_group")
 
             if part.use_group_count and not part.whole_group:
                 row = layout.row()
@@ -691,61 +691,61 @@ class PARTICLE_PT_render(ParticleButtonsPanel):
                 col = row.column()
                 sub = col.row()
                 subsub = sub.column(align=True)
-                subsub.itemO("particle.dupliob_copy", icon='ICON_ZOOMIN', text="")
-                subsub.itemO("particle.dupliob_remove", icon='ICON_ZOOMOUT', text="")
-                subsub.itemO("particle.dupliob_move_up", icon='VICON_MOVE_UP', text="")
-                subsub.itemO("particle.dupliob_move_down", icon='VICON_MOVE_DOWN', text="")
+                subsub.operator("particle.dupliob_copy", icon='ICON_ZOOMIN', text="")
+                subsub.operator("particle.dupliob_remove", icon='ICON_ZOOMOUT', text="")
+                subsub.operator("particle.dupliob_move_up", icon='VICON_MOVE_UP', text="")
+                subsub.operator("particle.dupliob_move_down", icon='VICON_MOVE_DOWN', text="")
 
                 weight = part.active_dupliweight
                 if weight:
                     row = layout.row()
-                    row.itemR(weight, "count")
+                    row.prop(weight, "count")
 
         elif part.ren_as == 'BILLBOARD':
-            sub.itemL(text="Align:")
+            sub.label(text="Align:")
 
             row = layout.row()
-            row.itemR(part, "billboard_align", expand=True)
-            row.itemR(part, "billboard_lock", text="Lock")
+            row.prop(part, "billboard_align", expand=True)
+            row.prop(part, "billboard_lock", text="Lock")
             row = layout.row()
-            row.itemR(part, "billboard_object")
+            row.prop(part, "billboard_object")
 
             row = layout.row()
             col = row.column(align=True)
-            col.itemL(text="Tilt:")
-            col.itemR(part, "billboard_tilt", text="Angle", slider=True)
-            col.itemR(part, "billboard_random_tilt", slider=True)
+            col.label(text="Tilt:")
+            col.prop(part, "billboard_tilt", text="Angle", slider=True)
+            col.prop(part, "billboard_random_tilt", slider=True)
             col = row.column()
-            col.itemR(part, "billboard_offset")
+            col.prop(part, "billboard_offset")
 
             row = layout.row()
-            row.itemR(psys, "billboard_normal_uv")
+            row.prop(psys, "billboard_normal_uv")
             row = layout.row()
-            row.itemR(psys, "billboard_time_index_uv")
+            row.prop(psys, "billboard_time_index_uv")
 
             row = layout.row()
-            row.itemL(text="Split uv's:")
-            row.itemR(part, "billboard_uv_split", text="Number of splits")
+            row.label(text="Split uv's:")
+            row.prop(part, "billboard_uv_split", text="Number of splits")
             row = layout.row()
-            row.itemR(psys, "billboard_split_uv")
+            row.prop(psys, "billboard_split_uv")
             row = layout.row()
-            row.itemL(text="Animate:")
-            row.itemR(part, "billboard_animation", expand=True)
-            row.itemL(text="Offset:")
-            row.itemR(part, "billboard_split_offset", expand=True)
+            row.label(text="Animate:")
+            row.prop(part, "billboard_animation", expand=True)
+            row.label(text="Offset:")
+            row.prop(part, "billboard_split_offset", expand=True)
 
         if part.ren_as == 'HALO' or part.ren_as == 'LINE' or part.ren_as == 'BILLBOARD':
             row = layout.row()
             col = row.column()
-            col.itemR(part, "trail_count")
+            col.prop(part, "trail_count")
             if part.trail_count > 1:
-                col.itemR(part, "abs_path_time", text="Length in frames")
+                col.prop(part, "abs_path_time", text="Length in frames")
                 col = row.column()
-                col.itemR(part, "path_end", text="Length", slider=not part.abs_path_time)
-                col.itemR(part, "random_length", text="Random", slider=True)
+                col.prop(part, "path_end", text="Length", slider=not part.abs_path_time)
+                col.prop(part, "random_length", text="Random", slider=True)
             else:
                 col = row.column()
-                col.itemL(text="")
+                col.label(text="")
 
 
 class PARTICLE_PT_draw(ParticleButtonsPanel):
@@ -767,7 +767,7 @@ class PARTICLE_PT_draw(ParticleButtonsPanel):
         part = psys.settings
 
         row = layout.row()
-        row.itemR(part, "draw_as", expand=True)
+        row.prop(part, "draw_as", expand=True)
 
         if part.draw_as == 'NONE' or (part.ren_as == 'NONE' and part.draw_as == 'RENDER'):
             return
@@ -776,34 +776,34 @@ class PARTICLE_PT_draw(ParticleButtonsPanel):
 
         if path and part.type != 'HAIR' and part.physics_type != 'KEYED' and psys.point_cache.baked is False:
             box = layout.box()
-            box.itemL(text="Baked or keyed particles needed for correct drawing.")
+            box.label(text="Baked or keyed particles needed for correct drawing.")
             return
 
         row = layout.row()
-        row.itemR(part, "display", slider=True)
+        row.prop(part, "display", slider=True)
         if part.draw_as != 'RENDER' or part.ren_as == 'HALO':
-            row.itemR(part, "draw_size")
+            row.prop(part, "draw_size")
         else:
-            row.itemL(text="")
+            row.label(text="")
 
         row = layout.row()
         col = row.column()
-        col.