kannonier8/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

remove ICON prefix from the enum, for python this is redundant eg.

Browse Source 
layout.prop("setting", icon='ICON_BLAH_BLAH')

Also reverted previous commit, the cursor subtype just needed to be added to the switch statement.
This commit is contained in:
Campbell Barton 2009-12-10 10:23:53 +00:00
parent 9c5019a9a9
commit b5740b0e77
33 changed files with 201 additions and 200 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
release/scripts/io/netrender/ui.py
View File

@ -71,7 +71,7 @@ class RENDER_PT_network_settings(RenderButtonsPanel):
if scene.network_render.mode == "RENDER_MASTER": if scene.network_render.mode == "RENDER_MASTER":
col.prop(scene.network_render, "server_broadcast") col.prop(scene.network_render, "server_broadcast")
else: else:
col.operator("render.netclientscan", icon="ICON_FILE_REFRESH", text="") col.operator("render.netclientscan", icon='FILE_REFRESH', text="")
@rnaType @rnaType
class RENDER_PT_network_job(RenderButtonsPanel): class RENDER_PT_network_job(RenderButtonsPanel):
@ -93,9 +93,9 @@ class RENDER_PT_network_job(RenderButtonsPanel):
split = layout.split() split = layout.split()
col = split.column() col = split.column()
col.operator("render.netclientanim", icon='ICON_RENDER_ANIMATION') col.operator("render.netclientanim", icon='RENDER_ANIMATION')
col.operator("render.netclientsend", icon="ICON_FILE_BLEND") col.operator("render.netclientsend", icon='FILE_BLEND')
col.operator("render.netclientweb", icon="ICON_QUESTION") col.operator("render.netclientweb", icon='QUESTION')
col.prop(scene.network_render, "job_name") col.prop(scene.network_render, "job_name")
row = col.row() row = col.row()
row.prop(scene.network_render, "priority") row.prop(scene.network_render, "priority")
@ -120,8 +120,8 @@ class RENDER_PT_network_slaves(RenderButtonsPanel):
row.template_list(netsettings, "slaves", netsettings, "active_slave_index", rows=2) row.template_list(netsettings, "slaves", netsettings, "active_slave_index", rows=2)
sub = row.column(align=True) sub = row.column(align=True)
sub.operator("render.netclientslaves", icon="ICON_FILE_REFRESH", text="") sub.operator("render.netclientslaves", icon='FILE_REFRESH', text="")
sub.operator("render.netclientblacklistslave", icon="ICON_ZOOMOUT", text="") sub.operator("render.netclientblacklistslave", icon='ZOOMOUT', text="")
if len(netrender.slaves) == 0 and len(netsettings.slaves) > 0: if len(netrender.slaves) == 0 and len(netsettings.slaves) > 0:
while(len(netsettings.slaves) > 0): while(len(netsettings.slaves) > 0):
@ -156,7 +156,7 @@ class RENDER_PT_network_slaves_blacklist(RenderButtonsPanel):
row.template_list(netsettings, "slaves_blacklist", netsettings, "active_blacklisted_slave_index", rows=2) row.template_list(netsettings, "slaves_blacklist", netsettings, "active_blacklisted_slave_index", rows=2)
sub = row.column(align=True) sub = row.column(align=True)
sub.operator("render.netclientwhitelistslave", icon="ICON_ZOOMOUT", text="") sub.operator("render.netclientwhitelistslave", icon='ZOOMOUT', text="")
if len(netrender.blacklist) == 0 and len(netsettings.slaves_blacklist) > 0: if len(netrender.blacklist) == 0 and len(netsettings.slaves_blacklist) > 0:
while(len(netsettings.slaves_blacklist) > 0): while(len(netsettings.slaves_blacklist) > 0):
@ -191,10 +191,10 @@ class RENDER_PT_network_jobs(RenderButtonsPanel):
row.template_list(netsettings, "jobs", netsettings, "active_job_index", rows=2) row.template_list(netsettings, "jobs", netsettings, "active_job_index", rows=2)
sub = row.column(align=True) sub = row.column(align=True)
sub.operator("render.netclientstatus", icon="ICON_FILE_REFRESH", text="") sub.operator("render.netclientstatus", icon='FILE_REFRESH', text="")
sub.operator("render.netclientcancel", icon="ICON_ZOOMOUT", text="") sub.operator("render.netclientcancel", icon='ZOOMOUT', text="")
sub.operator("render.netclientcancelall", icon="ICON_PANEL_CLOSE", text="") sub.operator("render.netclientcancelall", icon='PANEL_CLOSE', text="")
sub.operator("render.netclientdownload", icon='ICON_RENDER_ANIMATION', text="") sub.operator("render.netclientdownload", icon='RENDER_ANIMATION', text="")
if len(netrender.jobs) == 0 and len(netsettings.jobs) > 0: if len(netrender.jobs) == 0 and len(netsettings.jobs) > 0:
while(len(netsettings.jobs) > 0): while(len(netsettings.jobs) > 0):

2
release/scripts/op/add_mesh_torus.py
View File

@ -131,7 +131,7 @@ bpy.ops.add(AddTorus)
import dynamic_menu import dynamic_menu
menu_func = (lambda self, context: self.layout.operator(AddTorus.bl_idname, menu_func = (lambda self, context: self.layout.operator(AddTorus.bl_idname,
text="Torus", icon='ICON_MESH_DONUT')) text="Torus", icon='MESH_DONUT'))
menu_item = dynamic_menu.add(bpy.types.INFO_MT_mesh_add, menu_func) menu_item = dynamic_menu.add(bpy.types.INFO_MT_mesh_add, menu_func)

4
release/scripts/ui/properties_data_armature.py
View File

@ -128,8 +128,8 @@ class DATA_PT_bone_groups(DataButtonsPanel):
col = row.column(align=True) col = row.column(align=True)
col.active = (ob.proxy is None) col.active = (ob.proxy is None)
col.operator("pose.group_add", icon='ICON_ZOOMIN', text="") col.operator("pose.group_add", icon='ZOOMIN', text="")
col.operator("pose.group_remove", icon='ICON_ZOOMOUT', text="") col.operator("pose.group_remove", icon='ZOOMOUT', text="")
group = pose.active_bone_group group = pose.active_bone_group
if group: if group:

2
release/scripts/ui/properties_data_bone.py
View File

@ -43,7 +43,7 @@ class BONE_PT_context_bone(BoneButtonsPanel):
bone = context.edit_bone bone = context.edit_bone
row = layout.row() row = layout.row()
row.label(text="", icon='ICON_BONE_DATA') row.label(text="", icon='BONE_DATA')
row.prop(bone, "name", text="") row.prop(bone, "name", text="")

36
release/scripts/ui/properties_data_mesh.py
View File

@ -114,12 +114,12 @@ class DATA_PT_vertex_groups(DataButtonsPanel):
row.template_list(ob, "vertex_groups", ob, "active_vertex_group_index", rows=rows) row.template_list(ob, "vertex_groups", ob, "active_vertex_group_index", rows=rows)
col = row.column(align=True) col = row.column(align=True)
col.operator("object.vertex_group_add", icon='ICON_ZOOMIN', text="") col.operator("object.vertex_group_add", icon='ZOOMIN', text="")
col.operator("object.vertex_group_remove", icon='ICON_ZOOMOUT', text="") col.operator("object.vertex_group_remove", icon='ZOOMOUT', text="")
col.operator("object.vertex_group_copy", icon='ICON_COPY_ID', text="") col.operator("object.vertex_group_copy", icon='COPY_ID', text="")
if ob.data.users > 1: if ob.data.users > 1:
col.operator("object.vertex_group_copy_to_linked", icon='ICON_LINK_AREA', text="") col.operator("object.vertex_group_copy_to_linked", icon='LINK_AREA', text="")
if group: if group:
row = layout.row() row = layout.row()
@ -170,15 +170,15 @@ class DATA_PT_shape_keys(DataButtonsPanel):
col = row.column() col = row.column()
sub = col.column(align=True) sub = col.column(align=True)
sub.operator("object.shape_key_add", icon='ICON_ZOOMIN', text="") sub.operator("object.shape_key_add", icon='ZOOMIN', text="")
sub.operator("object.shape_key_remove", icon='ICON_ZOOMOUT', text="") sub.operator("object.shape_key_remove", icon='ZOOMOUT', text="")
if kb: if kb:
col.separator() col.separator()
sub = col.column(align=True) sub = col.column(align=True)
sub.operator("object.shape_key_move", icon='ICON_TRIA_UP', text="").type = 'UP' sub.operator("object.shape_key_move", icon='TRIA_UP', text="").type = 'UP'
sub.operator("object.shape_key_move", icon='ICON_TRIA_DOWN', text="").type = 'DOWN' sub.operator("object.shape_key_move", icon='TRIA_DOWN', text="").type = 'DOWN'
split = layout.split(percentage=0.4) split = layout.split(percentage=0.4)
row = split.row() row = split.row()
@ -198,18 +198,18 @@ class DATA_PT_shape_keys(DataButtonsPanel):
subsub = sub.row(align=True) subsub = sub.row(align=True)
subsub.active = enable_edit_value subsub.active = enable_edit_value
if ob.shape_key_lock: if ob.shape_key_lock:
subsub.prop(ob, "shape_key_lock", icon='ICON_PINNED', text="") subsub.prop(ob, "shape_key_lock", icon='PINNED', text="")
else: else:
subsub.prop(ob, "shape_key_lock", icon='ICON_UNPINNED', text="") subsub.prop(ob, "shape_key_lock", icon='UNPINNED', text="")
if kb.mute: if kb.mute:
subsub.prop(kb, "mute", icon='ICON_MUTE_IPO_ON', text="") subsub.prop(kb, "mute", icon='MUTE_IPO_ON', text="")
else: else:
subsub.prop(kb, "mute", icon='ICON_MUTE_IPO_OFF', text="") subsub.prop(kb, "mute", icon='MUTE_IPO_OFF', text="")
sub.prop(ob, "shape_key_edit_mode", text="") sub.prop(ob, "shape_key_edit_mode", text="")
sub = row.row(align=True) sub = row.row(align=True)
sub.operator("object.shape_key_mirror", icon='ICON_ARROW_LEFTRIGHT', text="") sub.operator("object.shape_key_mirror", icon='ARROW_LEFTRIGHT', text="")
sub.operator("object.shape_key_clear", icon='ICON_X', text="") sub.operator("object.shape_key_clear", icon='X', text="")
row = layout.row() row = layout.row()
@ -256,8 +256,8 @@ class DATA_PT_uv_texture(DataButtonsPanel):
col.template_list(me, "uv_textures", me, "active_uv_texture_index", rows=2) col.template_list(me, "uv_textures", me, "active_uv_texture_index", rows=2)
col = row.column(align=True) col = row.column(align=True)
col.operator("mesh.uv_texture_add", icon='ICON_ZOOMIN', text="") col.operator("mesh.uv_texture_add", icon='ZOOMIN', text="")
col.operator("mesh.uv_texture_remove", icon='ICON_ZOOMOUT', text="") col.operator("mesh.uv_texture_remove", icon='ZOOMOUT', text="")
lay = me.active_uv_texture lay = me.active_uv_texture
if lay: if lay:
@ -278,8 +278,8 @@ class DATA_PT_vertex_colors(DataButtonsPanel):
col.template_list(me, "vertex_colors", me, "active_vertex_color_index", rows=2) col.template_list(me, "vertex_colors", me, "active_vertex_color_index", rows=2)
col = row.column(align=True) col = row.column(align=True)
col.operator("mesh.vertex_color_add", icon='ICON_ZOOMIN', text="") col.operator("mesh.vertex_color_add", icon='ZOOMIN', text="")
col.operator("mesh.vertex_color_remove", icon='ICON_ZOOMOUT', text="") col.operator("mesh.vertex_color_remove", icon='ZOOMOUT', text="")
lay = me.active_vertex_color lay = me.active_vertex_color
if lay: if lay:

6
release/scripts/ui/properties_material.py
View File

@ -89,9 +89,9 @@ class MATERIAL_PT_context_material(MaterialButtonsPanel):
row.template_list(ob, "materials", ob, "active_material_index", rows=2) row.template_list(ob, "materials", ob, "active_material_index", rows=2)
col = row.column(align=True) col = row.column(align=True)
col.operator("object.material_slot_add", icon='ICON_ZOOMIN', text="") col.operator("object.material_slot_add", icon='ZOOMIN', text="")
col.operator("object.material_slot_remove", icon='ICON_ZOOMOUT', text="") col.operator("object.material_slot_remove", icon='ZOOMOUT', text="")
col.operator("object.material_slot_copy", icon='ICON_COPY_ID', text="") col.operator("object.material_slot_copy", icon='COPY_ID', text="")
if ob.mode == 'EDIT': if ob.mode == 'EDIT':
row = layout.row(align=True) row = layout.row(align=True)

4
release/scripts/ui/properties_object.py
View File

@ -38,7 +38,7 @@ class OBJECT_PT_context_object(ObjectButtonsPanel):
ob = context.object ob = context.object
row = layout.row() row = layout.row()
row.label(text="", icon='ICON_OBJECT_DATA') row.label(text="", icon='OBJECT_DATA')
row.prop(ob, "name", text="") row.prop(ob, "name", text="")
@ -162,7 +162,7 @@ class OBJECT_PT_groups(ObjectButtonsPanel):
row = col.box().row() row = col.box().row()
row.prop(group, "name", text="") row.prop(group, "name", text="")
row.operator("object.group_remove", text="", icon='ICON_X') row.operator("object.group_remove", text="", icon='X')
split = col.box().split() split = col.box().split()

2
release/scripts/ui/properties_object_constraint.py
View File

@ -59,7 +59,7 @@ class ConstraintButtonsPanel(bpy.types.Panel):
if wide_ui: if wide_ui:
if target and owner: if target and owner:
row.label(icon='ICON_ARROW_LEFTRIGHT') row.label(icon='ARROW_LEFTRIGHT')
else: else:
row = layout.row() row = layout.row()
if owner: if owner:

40
release/scripts/ui/properties_particle.py
View File

@ -66,8 +66,8 @@ class PARTICLE_PT_particles(ParticleButtonsPanel):
row.template_list(ob, "particle_systems", ob, "active_particle_system_index", rows=2) row.template_list(ob, "particle_systems", ob, "active_particle_system_index", rows=2)
col = row.column(align=True) col = row.column(align=True)
col.operator("object.particle_system_add", icon='ICON_ZOOMIN', text="") col.operator("object.particle_system_add", icon='ZOOMIN', text="")
col.operator("object.particle_system_remove", icon='ICON_ZOOMOUT', text="") col.operator("object.particle_system_remove", icon='ZOOMOUT', text="")
if psys and not psys.settings: if psys and not psys.settings:
split = layout.split(percentage=0.32) split = layout.split(percentage=0.32)
@ -457,12 +457,12 @@ class PARTICLE_PT_physics(ParticleButtonsPanel):
col = row.column() col = row.column()
sub = col.row() sub = col.row()
subsub = sub.column(align=True) subsub = sub.column(align=True)
subsub.operator("particle.new_target", icon='ICON_ZOOMIN', text="") subsub.operator("particle.new_target", icon='ZOOMIN', text="")
subsub.operator("particle.target_remove", icon='ICON_ZOOMOUT', text="") subsub.operator("particle.target_remove", icon='ZOOMOUT', text="")
sub = col.row() sub = col.row()
subsub = sub.column(align=True) subsub = sub.column(align=True)
subsub.operator("particle.target_move_up", icon='VICON_MOVE_UP', text="") subsub.operator("particle.target_move_up", icon='MOVE_UP_VEC', text="")
subsub.operator("particle.target_move_down", icon='VICON_MOVE_DOWN', text="") subsub.operator("particle.target_move_down", icon='MOVE_DOWN_VEC', text="")
key = psys.active_particle_target key = psys.active_particle_target
if key: if key:
@ -512,11 +512,11 @@ class PARTICLE_PT_boidbrain(ParticleButtonsPanel):
#row.template_list(boids, "states", boids, "active_boid_state_index", compact="True") #row.template_list(boids, "states", boids, "active_boid_state_index", compact="True")
#col = row.row() #col = row.row()
#sub = col.row(align=True) #sub = col.row(align=True)
#sub.operator("boid.state_add", icon='ICON_ZOOMIN', text="") #sub.operator("boid.state_add", icon='ZOOMIN', text="")
#sub.operator("boid.state_del", icon='ICON_ZOOMOUT', text="") #sub.operator("boid.state_del", icon='ZOOMOUT', text="")
#sub = row.row(align=True) #sub = row.row(align=True)
#sub.operator("boid.state_move_up", icon='VICON_MOVE_UP', text="") #sub.operator("boid.state_move_up", icon='MOVE_UP_VEC', text="")
#sub.operator("boid.state_move_down", icon='VICON_MOVE_DOWN', text="") #sub.operator("boid.state_move_down", icon='MOVE_DOWN_VEC', text="")
state = boids.active_boid_state state = boids.active_boid_state
@ -535,12 +535,12 @@ class PARTICLE_PT_boidbrain(ParticleButtonsPanel):
col = row.column() col = row.column()
sub = col.row() sub = col.row()
subsub = sub.column(align=True) subsub = sub.column(align=True)
subsub.operator_menu_enum("boid.rule_add", "type", icon='ICON_ZOOMIN', text="") subsub.operator_menu_enum("boid.rule_add", "type", icon='ZOOMIN', text="")
subsub.operator("boid.rule_del", icon='ICON_ZOOMOUT', text="") subsub.operator("boid.rule_del", icon='ZOOMOUT', text="")
sub = col.row() sub = col.row()
subsub = sub.column(align=True) subsub = sub.column(align=True)
subsub.operator("boid.rule_move_up", icon='VICON_MOVE_UP', text="") subsub.operator("boid.rule_move_up", icon='MOVE_UP_VEC', text="")
subsub.operator("boid.rule_move_down", icon='VICON_MOVE_DOWN', text="") subsub.operator("boid.rule_move_down", icon='MOVE_DOWN_VEC', text="")
rule = state.active_boid_rule rule = state.active_boid_rule
@ -548,8 +548,8 @@ class PARTICLE_PT_boidbrain(ParticleButtonsPanel):
row = layout.row() row = layout.row()
row.prop(rule, "name", text="") row.prop(rule, "name", text="")
#somebody make nice icons for boids here please! -jahka #somebody make nice icons for boids here please! -jahka
row.prop(rule, "in_air", icon='VICON_MOVE_UP', text="") row.prop(rule, "in_air", icon='MOVE_UP_VEC', text="")
row.prop(rule, "on_land", icon='VICON_MOVE_DOWN', text="") row.prop(rule, "on_land", icon='MOVE_DOWN_VEC', text="")
row = layout.row() row = layout.row()
@ -695,10 +695,10 @@ class PARTICLE_PT_render(ParticleButtonsPanel):
col = row.column() col = row.column()
sub = col.row() sub = col.row()
subsub = sub.column(align=True) subsub = sub.column(align=True)
subsub.operator("particle.dupliob_copy", icon='ICON_ZOOMIN', text="") subsub.operator("particle.dupliob_copy", icon='ZOOMIN', text="")
subsub.operator("particle.dupliob_remove", icon='ICON_ZOOMOUT', text="") subsub.operator("particle.dupliob_remove", icon='ZOOMOUT', text="")
subsub.operator("particle.dupliob_move_up", icon='VICON_MOVE_UP', text="") subsub.operator("particle.dupliob_move_up", icon='MOVE_UP_VEC', text="")
subsub.operator("particle.dupliob_move_down", icon='VICON_MOVE_DOWN', text="") subsub.operator("particle.dupliob_move_down", icon='MOVE_DOWN_VEC', text="")
weight = part.active_dupliweight weight = part.active_dupliweight
if weight: if weight:

4
release/scripts/ui/properties_physics_common.py
View File

@ -30,8 +30,8 @@ def point_cache_ui(self, context, cache, enabled, particles, smoke):
row = layout.row() row = layout.row()
row.template_list(cache, "point_cache_list", cache, "active_point_cache_index", rows=2) row.template_list(cache, "point_cache_list", cache, "active_point_cache_index", rows=2)
col = row.column(align=True) col = row.column(align=True)
col.operator("ptcache.add", icon='ICON_ZOOMIN', text="") col.operator("ptcache.add", icon='ZOOMIN', text="")
col.operator("ptcache.remove", icon='ICON_ZOOMOUT', text="") col.operator("ptcache.remove", icon='ZOOMOUT', text="")
row = layout.row() row = layout.row()
row.label(text="File Name:") row.label(text="File Name:")

2
release/scripts/ui/properties_physics_fluid.py
View File

@ -72,7 +72,7 @@ class PHYSICS_PT_fluid(PhysicButtonsPanel):
layout.prop(fluid, "type", text="") layout.prop(fluid, "type", text="")
if fluid.type == 'DOMAIN': if fluid.type == 'DOMAIN':
layout.operator("fluid.bake", text="Bake Fluid Simulation", icon='ICON_MOD_FLUIDSIM') layout.operator("fluid.bake", text="Bake Fluid Simulation", icon='MOD_FLUIDSIM')
split = layout.split() split = layout.split()
col = split.column() col = split.column()

18
release/scripts/ui/properties_render.py
View File

@ -53,11 +53,11 @@ class RENDER_PT_render(RenderButtonsPanel):
split = layout.split() split = layout.split()
col = split.column() col = split.column()
col.operator("screen.render", text="Image", icon='ICON_RENDER_STILL') col.operator("screen.render", text="Image", icon='RENDER_STILL')
if wide_ui: if wide_ui:
col = split.column() col = split.column()
col.operator("screen.render", text="Animation", icon='ICON_RENDER_ANIMATION').animation = True col.operator("screen.render", text="Animation", icon='RENDER_ANIMATION').animation = True
layout.prop(rd, "display_mode", text="Display") layout.prop(rd, "display_mode", text="Display")
@ -78,8 +78,8 @@ class RENDER_PT_layers(RenderButtonsPanel):
row.template_list(rd, "layers", rd, "active_layer_index", rows=2) row.template_list(rd, "layers", rd, "active_layer_index", rows=2)
col = row.column(align=True) col = row.column(align=True)
col.operator("scene.render_layer_add", icon='ICON_ZOOMIN', text="") col.operator("scene.render_layer_add", icon='ZOOMIN', text="")
col.operator("scene.render_layer_remove", icon='ICON_ZOOMOUT', text="") col.operator("scene.render_layer_remove", icon='ZOOMOUT', text="")
rl = rd.layers[rd.active_layer_index] rl = rd.layers[rd.active_layer_index]
@ -145,19 +145,19 @@ class RENDER_PT_layers(RenderButtonsPanel):
col.prop(rl, "pass_diffuse") col.prop(rl, "pass_diffuse")
row = col.row() row = col.row()
row.prop(rl, "pass_specular") row.prop(rl, "pass_specular")
row.prop(rl, "pass_specular_exclude", text="", icon='ICON_X') row.prop(rl, "pass_specular_exclude", text="", icon='X')
row = col.row() row = col.row()
row.prop(rl, "pass_shadow") row.prop(rl, "pass_shadow")
row.prop(rl, "pass_shadow_exclude", text="", icon='ICON_X') row.prop(rl, "pass_shadow_exclude", text="", icon='X')
row = col.row() row = col.row()
row.prop(rl, "pass_ao") row.prop(rl, "pass_ao")
row.prop(rl, "pass_ao_exclude", text="", icon='ICON_X') row.prop(rl, "pass_ao_exclude", text="", icon='X')
row = col.row() row = col.row()
row.prop(rl, "pass_reflection") row.prop(rl, "pass_reflection")
row.prop(rl, "pass_reflection_exclude", text="", icon='ICON_X') row.prop(rl, "pass_reflection_exclude", text="", icon='X')
row = col.row() row = col.row()
row.prop(rl, "pass_refraction") row.prop(rl, "pass_refraction")
row.prop(rl, "pass_refraction_exclude", text="", icon='ICON_X') row.prop(rl, "pass_refraction_exclude", text="", icon='X')
class RENDER_PT_shading(RenderButtonsPanel): class RENDER_PT_shading(RenderButtonsPanel):

8
release/scripts/ui/properties_scene.py
View File

@ -85,8 +85,8 @@ class SCENE_PT_keying_sets(SceneButtonsPanel):
col.template_list(scene, "keying_sets", scene, "active_keying_set_index", rows=2) col.template_list(scene, "keying_sets", scene, "active_keying_set_index", rows=2)
col = row.column(align=True) col = row.column(align=True)
col.operator("anim.keying_set_add", icon='ICON_ZOOMIN', text="") col.operator("anim.keying_set_add", icon='ZOOMIN', text="")
col.operator("anim.keying_set_remove", icon='ICON_ZOOMOUT', text="") col.operator("anim.keying_set_remove", icon='ZOOMOUT', text="")
ks = scene.active_keying_set ks = scene.active_keying_set
if ks: if ks:
@ -125,8 +125,8 @@ class SCENE_PT_keying_set_paths(SceneButtonsPanel):
col.template_list(ks, "paths", ks, "active_path_index", rows=2) col.template_list(ks, "paths", ks, "active_path_index", rows=2)
col = row.column(align=True) col = row.column(align=True)
col.operator("anim.keying_set_path_add", icon='ICON_ZOOMIN', text="") col.operator("anim.keying_set_path_add", icon='ZOOMIN', text="")
col.operator("anim.keying_set_path_remove", icon='ICON_ZOOMOUT', text="") col.operator("anim.keying_set_path_remove", icon='ZOOMOUT', text="")
ksp = ks.active_path ksp = ks.active_path
if ksp: if ksp:

4
release/scripts/ui/properties_texture.py
View File

@ -99,8 +99,8 @@ class TEXTURE_PT_context_texture(TextureButtonsPanel):
row.template_list(idblock, "textures", idblock, "active_texture_index", rows=2) row.template_list(idblock, "textures", idblock, "active_texture_index", rows=2)
col = row.column(align=True) col = row.column(align=True)
col.operator("texture.slot_move", text="", icon='ICON_TRIA_UP').type = 'UP' col.operator("texture.slot_move", text="", icon='TRIA_UP').type = 'UP'
col.operator("texture.slot_move", text="", icon='ICON_TRIA_DOWN').type = 'DOWN' col.operator("texture.slot_move", text="", icon='TRIA_DOWN').type = 'DOWN'
if wide_ui: if wide_ui:

4
release/scripts/ui/space_dopesheet.py
View File

@ -57,8 +57,8 @@ class DOPESHEET_HT_header(bpy.types.Header):
layout.prop(st, "autosnap", text="") layout.prop(st, "autosnap", text="")
row = layout.row(align=True) row = layout.row(align=True)
row.operator("action.copy", text="", icon='ICON_COPYDOWN') row.operator("action.copy", text="", icon='COPYDOWN')
row.operator("action.paste", text="", icon='ICON_PASTEDOWN') row.operator("action.paste", text="", icon='PASTEDOWN')
class DOPESHEET_MT_view(bpy.types.Menu): class DOPESHEET_MT_view(bpy.types.Menu):

12
release/scripts/ui/space_filebrowser.py
View File

@ -35,22 +35,22 @@ class FILEBROWSER_HT_header(bpy.types.Header):
row.separator() row.separator()
row = layout.row(align=True) row = layout.row(align=True)
row.operator("file.previous", text="", icon='ICON_BACK') row.operator("file.previous", text="", icon='BACK')
row.operator("file.next", text="", icon='ICON_FORWARD') row.operator("file.next", text="", icon='FORWARD')
row.operator("file.parent", text="", icon='ICON_FILE_PARENT') row.operator("file.parent", text="", icon='FILE_PARENT')
row.operator("file.refresh", text="", icon='ICON_FILE_REFRESH') row.operator("file.refresh", text="", icon='FILE_REFRESH')
row = layout.row() row = layout.row()
row.separator() row.separator()
row = layout.row(align=True) row = layout.row(align=True)
row.operator("file.directory_new", text="", icon='ICON_NEWFOLDER') row.operator("file.directory_new", text="", icon='NEWFOLDER')
layout.prop(params, "display", expand=True, text="") layout.prop(params, "display", expand=True, text="")
layout.prop(params, "sort", expand=True, text="") layout.prop(params, "sort", expand=True, text="")
layout.prop(params, "hide_dot", text="Hide Invisible") layout.prop(params, "hide_dot", text="Hide Invisible")
layout.prop(params, "do_filter", text="", icon='ICON_FILTER') layout.prop(params, "do_filter", text="", icon='FILTER')
row = layout.row(align=True) row = layout.row(align=True)
row.active = params.do_filter row.active = params.do_filter

14
release/scripts/ui/space_graph.py
View File

@ -46,14 +46,14 @@ class GRAPH_HT_header(bpy.types.Header):
layout.prop(st, "pivot_point", text="", icon_only=True) layout.prop(st, "pivot_point", text="", icon_only=True)
row = layout.row(align=True) row = layout.row(align=True)
row.operator("graph.copy", text="", icon='ICON_COPYDOWN') row.operator("graph.copy", text="", icon='COPYDOWN')
row.operator("graph.paste", text="", icon='ICON_PASTEDOWN') row.operator("graph.paste", text="", icon='PASTEDOWN')
row = layout.row(align=True) row = layout.row(align=True)
if st.has_ghost_curves: if st.has_ghost_curves:
row.operator("graph.ghost_curves_clear", text="", icon='ICON_GHOST_DISABLED') row.operator("graph.ghost_curves_clear", text="", icon='GHOST_DISABLED')
else: else:
row.operator("graph.ghost_curves_create", text="", icon='ICON_GHOST_ENABLED') row.operator("graph.ghost_curves_create", text="", icon='GHOST_ENABLED')
class GRAPH_MT_view(bpy.types.Menu): class GRAPH_MT_view(bpy.types.Menu):
@ -67,7 +67,7 @@ class GRAPH_MT_view(bpy.types.Menu):
layout.column() layout.column()
layout.separator() layout.separator()
layout.operator("graph.properties", icon="ICON_MENU_PANEL") layout.operator("graph.properties", icon='MENU_PANEL')
layout.prop(st, "show_cframe_indicator") layout.prop(st, "show_cframe_indicator")
layout.prop(st, "show_cursor") layout.prop(st, "show_cursor")
@ -76,9 +76,9 @@ class GRAPH_MT_view(bpy.types.Menu):
layout.separator() layout.separator()
if st.show_handles: if st.show_handles:
layout.operator("graph.handles_view_toggle", icon="ICON_CHECKBOX_HLT", text="Show All Handles") layout.operator("graph.handles_view_toggle", icon='CHECKBOX_HLT', text="Show All Handles")
else: else:
layout.operator("graph.handles_view_toggle", icon="ICON_CHECKBOX_DEHLT", text="Show All Handles") layout.operator("graph.handles_view_toggle", icon='CHECKBOX_DEHLT', text="Show All Handles")
layout.prop(st, "only_selected_curves_handles") layout.prop(st, "only_selected_curves_handles")
layout.prop(st, "only_selected_keyframe_handles") layout.prop(st, "only_selected_keyframe_handles")
layout.operator("anim.time_toggle") layout.operator("anim.time_toggle")

6
release/scripts/ui/space_image.py
View File

@ -34,7 +34,7 @@ class IMAGE_MT_view(bpy.types.Menu):
show_uvedit = sima.show_uvedit show_uvedit = sima.show_uvedit
layout.operator("image.properties", icon='ICON_MENU_PANEL') layout.operator("image.properties", icon='MENU_PANEL')
layout.separator() layout.separator()
@ -306,9 +306,9 @@ class IMAGE_HT_header(bpy.types.Header):
row = layout.row(align=True) row = layout.row(align=True)
if ima.type == 'COMPOSITE': if ima.type == 'COMPOSITE':
row.operator("image.record_composite", icon='ICON_REC') row.operator("image.record_composite", icon='REC')
if ima.type == 'COMPOSITE' and ima.source in ('MOVIE', 'SEQUENCE'): if ima.type == 'COMPOSITE' and ima.source in ('MOVIE', 'SEQUENCE'):
row.operator("image.play_composite", icon='ICON_PLAY') row.operator("image.play_composite", icon='PLAY')
if show_uvedit or sima.image_painting: if show_uvedit or sima.image_painting:
layout.prop(sima, "update_automatically", text="") layout.prop(sima, "update_automatically", text="")

78
release/scripts/ui/space_info.py
View File

@ -47,7 +47,7 @@ class INFO_HT_header(bpy.types.Header):
sub.menu("INFO_MT_help") sub.menu("INFO_MT_help")
if window.screen.fullscreen: if window.screen.fullscreen:
layout.operator("screen.back_to_previous", icon="ICON_SCREEN_BACK", text="Back to Previous") layout.operator("screen.back_to_previous", icon='SCREEN_BACK', text="Back to Previous")
layout.separator() layout.separator()
else: else:
layout.template_ID(context.window, "screen", new="screen.new", unlink="screen.delete") layout.template_ID(context.window, "screen", new="screen.new", unlink="screen.delete")
@ -66,7 +66,7 @@ class INFO_HT_header(bpy.types.Header):
layout.label(text=scene.statistics()) layout.label(text=scene.statistics())
layout.operator("wm.window_fullscreen_toggle", icon='ICON_FULLSCREEN_ENTER', text="") layout.operator("wm.window_fullscreen_toggle", icon='FULLSCREEN_ENTER', text="")
class INFO_MT_file(bpy.types.Menu): class INFO_MT_file(bpy.types.Menu):
@ -76,9 +76,9 @@ class INFO_MT_file(bpy.types.Menu):
layout = self.layout layout = self.layout
layout.operator_context = 'EXEC_AREA' layout.operator_context = 'EXEC_AREA'
layout.operator("wm.read_homefile", text="New", icon='ICON_NEW') layout.operator("wm.read_homefile", text="New", icon='NEW')
layout.operator_context = 'INVOKE_AREA' layout.operator_context = 'INVOKE_AREA'
layout.operator("wm.open_mainfile", text="Open...", icon='ICON_FILE_FOLDER') layout.operator("wm.open_mainfile", text="Open...", icon='FILE_FOLDER')
layout.operator_menu_enum("wm.open_recentfile", "file", text="Open Recent") layout.operator_menu_enum("wm.open_recentfile", "file", text="Open Recent")
layout.operator("wm.recover_last_session") layout.operator("wm.recover_last_session")
layout.operator("wm.recover_auto_save", text="Recover Auto Save...") layout.operator("wm.recover_auto_save", text="Recover Auto Save...")
@ -86,13 +86,13 @@ class INFO_MT_file(bpy.types.Menu):
layout.separator() layout.separator()
layout.operator_context = 'INVOKE_AREA' layout.operator_context = 'INVOKE_AREA'
layout.operator("wm.save_mainfile", text="Save", icon='ICON_FILE_TICK') layout.operator("wm.save_mainfile", text="Save", icon='FILE_TICK')
layout.operator_context = 'INVOKE_AREA' layout.operator_context = 'INVOKE_AREA'
layout.operator("wm.save_as_mainfile", text="Save As...") layout.operator("wm.save_as_mainfile", text="Save As...")
layout.separator() layout.separator()
layout.operator("screen.userpref_show", text="User Preferences...", icon='ICON_PREFERENCES') layout.operator("screen.userpref_show", text="User Preferences...", icon='PREFERENCES')
layout.operator("wm.read_homefile", text="Load Factory Settings").factory = True layout.operator("wm.read_homefile", text="Load Factory Settings").factory = True
layout.separator() layout.separator()
@ -113,7 +113,7 @@ class INFO_MT_file(bpy.types.Menu):
layout.separator() layout.separator()
layout.operator_context = 'EXEC_AREA' layout.operator_context = 'EXEC_AREA'
layout.operator("wm.exit_blender", text="Quit", icon='ICON_QUIT') layout.operator("wm.exit_blender", text="Quit", icon='QUIT')
# test for expanding menus # test for expanding menus
''' '''
@ -171,16 +171,16 @@ class INFO_MT_mesh_add(dynamic_menu.DynMenu):
def draw(self, context): def draw(self, context):
layout = self.layout layout = self.layout
layout.operator_context = 'INVOKE_REGION_WIN' layout.operator_context = 'INVOKE_REGION_WIN'
layout.operator("mesh.primitive_plane_add", icon='ICON_MESH_PLANE', text="Plane") layout.operator("mesh.primitive_plane_add", icon='MESH_PLANE', text="Plane")
layout.operator("mesh.primitive_cube_add", icon='ICON_MESH_CUBE', text="Cube") layout.operator("mesh.primitive_cube_add", icon='MESH_CUBE', text="Cube")
layout.operator("mesh.primitive_circle_add", icon='ICON_MESH_CIRCLE', text="Circle") layout.operator("mesh.primitive_circle_add", icon='MESH_CIRCLE', text="Circle")
layout.operator("mesh.primitive_uv_sphere_add", icon='ICON_MESH_UVSPHERE', text="UV Sphere") layout.operator("mesh.primitive_uv_sphere_add", icon='MESH_UVSPHERE', text="UV Sphere")
layout.operator("mesh.primitive_ico_sphere_add", icon='ICON_MESH_ICOSPHERE', text="Icosphere") layout.operator("mesh.primitive_ico_sphere_add", icon='MESH_ICOSPHERE', text="Icosphere")
layout.operator("mesh.primitive_tube_add", icon='ICON_MESH_TUBE', text="Tube") layout.operator("mesh.primitive_tube_add", icon='MESH_TUBE', text="Tube")
layout.operator("mesh.primitive_cone_add", icon='ICON_MESH_CONE', text="Cone") layout.operator("mesh.primitive_cone_add", icon='MESH_CONE', text="Cone")
layout.separator() layout.separator()
layout.operator("mesh.primitive_grid_add", icon='ICON_MESH_GRID', text="Grid") layout.operator("mesh.primitive_grid_add", icon='MESH_GRID', text="Grid")
layout.operator("mesh.primitive_monkey_add", icon='ICON_MESH_MONKEY', text="Monkey") layout.operator("mesh.primitive_monkey_add", icon='MESH_MONKEY', text="Monkey")
class INFO_MT_add(bpy.types.Menu): class INFO_MT_add(bpy.types.Menu):
@ -191,37 +191,37 @@ class INFO_MT_add(bpy.types.Menu):
layout.operator_context = 'EXEC_SCREEN' layout.operator_context = 'EXEC_SCREEN'
#layout.operator_menu_enum("object.mesh_add", "type", text="Mesh", icon='ICON_OUTLINER_OB_MESH') #layout.operator_menu_enum("object.mesh_add", "type", text="Mesh", icon='OUTLINER_OB_MESH')
layout.menu("INFO_MT_mesh_add", icon='ICON_OUTLINER_OB_MESH') layout.menu("INFO_MT_mesh_add", icon='OUTLINER_OB_MESH')
layout.operator_menu_enum("object.curve_add", "type", text="Curve", icon='ICON_OUTLINER_OB_CURVE') layout.operator_menu_enum("object.curve_add", "type", text="Curve", icon='OUTLINER_OB_CURVE')
layout.operator_menu_enum("object.surface_add", "type", text="Surface", icon='ICON_OUTLINER_OB_SURFACE') layout.operator_menu_enum("object.surface_add", "type", text="Surface", icon='OUTLINER_OB_SURFACE')
layout.operator_menu_enum("object.metaball_add", "type", 'META', text="Metaball", icon='ICON_OUTLINER_OB_META') layout.operator_menu_enum("object.metaball_add", "type", 'META', text="Metaball", icon='OUTLINER_OB_META')
layout.operator("object.text_add", text="Text", icon='ICON_OUTLINER_OB_FONT') layout.operator("object.text_add", text="Text", icon='OUTLINER_OB_FONT')
layout.separator() layout.separator()
layout.operator_context = 'INVOKE_REGION_WIN' layout.operator_context = 'INVOKE_REGION_WIN'
layout.operator("object.armature_add", text="Armature", icon='ICON_OUTLINER_OB_ARMATURE') layout.operator("object.armature_add", text="Armature", icon='OUTLINER_OB_ARMATURE')
layout.operator("object.add", text="Lattice", icon='ICON_OUTLINER_OB_LATTICE').type = 'LATTICE' layout.operator("object.add", text="Lattice", icon='OUTLINER_OB_LATTICE').type = 'LATTICE'
layout.operator("object.add", text="Empty", icon='ICON_OUTLINER_OB_EMPTY').type = 'EMPTY' layout.operator("object.add", text="Empty", icon='OUTLINER_OB_EMPTY').type = 'EMPTY'
layout.separator() layout.separator()
layout.operator("object.add", text="Camera", icon='ICON_OUTLINER_OB_CAMERA').type = 'CAMERA' layout.operator("object.add", text="Camera", icon='OUTLINER_OB_CAMERA').type = 'CAMERA'
layout.operator_context = 'EXEC_SCREEN' layout.operator_context = 'EXEC_SCREEN'
layout.operator_menu_enum("object.lamp_add", "type", 'LAMP', text="Lamp", icon='ICON_OUTLINER_OB_LAMP') layout.operator_menu_enum("object.lamp_add", "type", 'LAMP', text="Lamp", icon='OUTLINER_OB_LAMP')
layout.separator() layout.separator()
layout.operator_menu_enum("object.effector_add", "type", 'EMPTY', text="Force Field", icon='ICON_OUTLINER_OB_EMPTY') layout.operator_menu_enum("object.effector_add", "type", 'EMPTY', text="Force Field", icon='OUTLINER_OB_EMPTY')
layout.separator() layout.separator()
layout.operator_menu_enum("object.group_instance_add", "type", text="Group Instance", icon='ICON_OUTLINER_OB_EMPTY') layout.operator_menu_enum("object.group_instance_add", "type", text="Group Instance", icon='OUTLINER_OB_EMPTY')
class INFO_MT_game(bpy.types.Menu): class INFO_MT_game(bpy.types.Menu):
@ -250,8 +250,8 @@ class INFO_MT_render(bpy.types.Menu):
# rd = context.scene.render_data # rd = context.scene.render_data
layout.operator("screen.render", text="Render Image", icon='ICON_RENDER_STILL') layout.operator("screen.render", text="Render Image", icon='RENDER_STILL')
layout.operator("screen.render", text="Render Animation", icon='ICON_RENDER_ANIMATION').animation = True layout.operator("screen.render", text="Render Animation", icon='RENDER_ANIMATION').animation = True
layout.separator() layout.separator()
@ -269,19 +269,19 @@ class INFO_MT_help(bpy.types.Menu):
def draw(self, context): def draw(self, context):
layout = self.layout layout = self.layout
layout.operator("help.manual", icon='ICON_HELP') layout.operator("help.manual", icon='HELP')
layout.operator("help.release_logs", icon='ICON_URL') layout.operator("help.release_logs", icon='URL')
layout.separator() layout.separator()
layout.operator("help.blender_website", icon='ICON_URL') layout.operator("help.blender_website", icon='URL')
layout.operator("help.blender_eshop", icon='ICON_URL') layout.operator("help.blender_eshop", icon='URL')
layout.operator("help.developer_community", icon='ICON_URL') layout.operator("help.developer_community", icon='URL')
layout.operator("help.user_community", icon='ICON_URL') layout.operator("help.user_community", icon='URL')
layout.separator() layout.separator()
layout.operator("help.report_bug", icon='ICON_URL') layout.operator("help.report_bug", icon='URL')
layout.separator() layout.separator()
layout.operator("help.python_api", icon='ICON_URL') layout.operator("help.python_api", icon='URL')
layout.operator("help.operator_cheat_sheet") layout.operator("help.operator_cheat_sheet")
bpy.types.register(INFO_HT_header) bpy.types.register(INFO_HT_header)

4
release/scripts/ui/space_logic.py
View File

@ -43,7 +43,7 @@ class LOGIC_PT_properties(bpy.types.Panel):
row.prop(prop, "name", text="") row.prop(prop, "name", text="")
row.prop(prop, "type", text="") row.prop(prop, "type", text="")
row.prop(prop, "value", text="", toggle=True) # we dont care about the type. rna will display correctly row.prop(prop, "value", text="", toggle=True) # we dont care about the type. rna will display correctly
row.prop(prop, "debug", text="", toggle=True, icon='ICON_INFO') row.prop(prop, "debug", text="", toggle=True, icon='INFO')
row.operator("object.game_property_remove", text="", icon='ICON_X').index = i row.operator("object.game_property_remove", text="", icon='X').index = i
bpy.types.register(LOGIC_PT_properties) bpy.types.register(LOGIC_PT_properties)

2
release/scripts/ui/space_nla.py
View File

@ -53,7 +53,7 @@ class NLA_MT_view(bpy.types.Menu):
layout.column() layout.column()
layout.operator("nla.properties", icon="ICON_MENU_PANEL") layout.operator("nla.properties", icon='MENU_PANEL')
layout.separator() layout.separator()
layout.prop(st, "show_cframe_indicator") layout.prop(st, "show_cframe_indicator")

2
release/scripts/ui/space_node.py
View File

@ -73,7 +73,7 @@ class NODE_MT_view(bpy.types.Menu):
def draw(self, context): def draw(self, context):
layout = self.layout layout = self.layout
layout.operator("node.properties", icon='ICON_MENU_PANEL') layout.operator("node.properties", icon='MENU_PANEL')
layout.separator() layout.separator()
layout.operator("view2d.zoom_in") layout.operator("view2d.zoom_in")

8
release/scripts/ui/space_outliner.py
View File

@ -45,16 +45,16 @@ class OUTLINER_HT_header(bpy.types.Header):
if space.display_mode == 'DATABLOCKS': if space.display_mode == 'DATABLOCKS':
row = layout.row(align=True) row = layout.row(align=True)
row.operator("outliner.keyingset_add_selected", icon='ICON_ZOOMIN', text="") row.operator("outliner.keyingset_add_selected", icon='ZOOMIN', text="")
row.operator("outliner.keyingset_remove_selected", icon='ICON_ZOOMOUT', text="") row.operator("outliner.keyingset_remove_selected", icon='ZOOMOUT', text="")
if ks: if ks:
row = layout.row(align=False) row = layout.row(align=False)
row.prop_object(scene, "active_keying_set", scene, "keying_sets", text="") row.prop_object(scene, "active_keying_set", scene, "keying_sets", text="")
row = layout.row(align=True) row = layout.row(align=True)
row.operator("anim.keyframe_insert", text="", icon='ICON_KEY_HLT') row.operator("anim.keyframe_insert", text="", icon='KEY_HLT')
row.operator("anim.keyframe_delete", text="", icon='ICON_KEY_DEHLT') row.operator("anim.keyframe_delete", text="", icon='KEY_DEHLT')
else: else:
row = layout.row(align=False) row = layout.row(align=False)
row.label(text="No Keying Set active") row.label(text="No Keying Set active")

8
release/scripts/ui/space_sequencer.py
View File

@ -297,9 +297,9 @@ class SEQUENCER_PT_edit(SequencerButtonsPanel):
row = layout.row() row = layout.row()
if strip.mute == True: if strip.mute == True:
row.prop(strip, "mute", toggle=True, icon='ICON_RESTRICT_VIEW_ON', text="") row.prop(strip, "mute", toggle=True, icon='RESTRICT_VIEW_ON', text="")
elif strip.mute is False: elif strip.mute is False:
row.prop(strip, "mute", toggle=True, icon='ICON_RESTRICT_VIEW_OFF', text="") row.prop(strip, "mute", toggle=True, icon='RESTRICT_VIEW_OFF', text="")
sub = row.row() sub = row.row()
sub.active = (not strip.mute) sub.active = (not strip.mute)
@ -517,9 +517,9 @@ class SEQUENCER_PT_sound(SequencerButtonsPanel):
row = layout.row() row = layout.row()
if strip.sound.packed_file: if strip.sound.packed_file:
row.operator("sound.unpack", icon='ICON_PACKAGE', text="Unpack") row.operator("sound.unpack", icon='PACKAGE', text="Unpack")
else: else:
row.operator("sound.pack", icon='ICON_UGLYPACKAGE', text="Pack") row.operator("sound.pack", icon='UGLYPACKAGE', text="Pack")
row.prop(strip.sound, "caching") row.prop(strip.sound, "caching")

8
release/scripts/ui/space_text.py
View File

@ -42,7 +42,7 @@ class TEXT_HT_header(bpy.types.Header):
if text and text.modified: if text and text.modified:
row = layout.row() row = layout.row()
# row.color(redalert) # row.color(redalert)
row.operator("text.resolve_conflict", text="", icon='ICON_HELP') row.operator("text.resolve_conflict", text="", icon='HELP')
layout.template_ID(st, "text", new="text.new", unlink="text.unlink") layout.template_ID(st, "text", new="text.new", unlink="text.unlink")
@ -104,14 +104,14 @@ class TEXT_PT_find(bpy.types.Panel):
col = layout.column(align=True) col = layout.column(align=True)
row = col.row() row = col.row()
row.prop(st, "find_text", text="") row.prop(st, "find_text", text="")
row.operator("text.find_set_selected", text="", icon='ICON_TEXT') row.operator("text.find_set_selected", text="", icon='TEXT')
col.operator("text.find") col.operator("text.find")
# replace # replace
col = layout.column(align=True) col = layout.column(align=True)
row = col.row() row = col.row()
row.prop(st, "replace_text", text="") row.prop(st, "replace_text", text="")
row.operator("text.replace_set_selected", text="", icon='ICON_TEXT') row.operator("text.replace_set_selected", text="", icon='TEXT')
col.operator("text.replace") col.operator("text.replace")
# mark # mark
@ -156,7 +156,7 @@ class TEXT_MT_text(bpy.types.Menu):
layout.separator() layout.separator()
layout.operator("text.properties", icon='ICON_MENU_PANEL') layout.operator("text.properties", icon='MENU_PANEL')
layout.menu("TEXT_MT_templates") layout.menu("TEXT_MT_templates")

24
release/scripts/ui/space_time.py
View File

@ -54,32 +54,32 @@ class TIME_HT_header(bpy.types.Header):
layout.separator() layout.separator()
row = layout.row(align=True) row = layout.row(align=True)
row.operator("screen.frame_jump", text="", icon='ICON_REW').end = False row.operator("screen.frame_jump", text="", icon='REW').end = False
row.operator("screen.keyframe_jump", text="", icon='ICON_PREV_KEYFRAME').next = False row.operator("screen.keyframe_jump", text="", icon='PREV_KEYFRAME').next = False
if not screen.animation_playing: if not screen.animation_playing:
row.operator("screen.animation_play", text="", icon='ICON_PLAY_REVERSE').reverse = True row.operator("screen.animation_play", text="", icon='PLAY_REVERSE').reverse = True
row.operator("screen.animation_play", text="", icon='ICON_PLAY') row.operator("screen.animation_play", text="", icon='PLAY')
else: else:
sub = row.row() sub = row.row()
sub.scale_x = 2.0 sub.scale_x = 2.0
sub.operator("screen.animation_play", text="", icon='ICON_PAUSE') sub.operator("screen.animation_play", text="", icon='PAUSE')
row.operator("screen.keyframe_jump", text="", icon='ICON_NEXT_KEYFRAME').next = True row.operator("screen.keyframe_jump", text="", icon='NEXT_KEYFRAME').next = True
row.operator("screen.frame_jump", text="", icon='ICON_FF').end = True row.operator("screen.frame_jump", text="", icon='FF').end = True
row = layout.row(align=True) row = layout.row(align=True)
row.prop(tools, "enable_auto_key", text="", toggle=True, icon='ICON_REC') row.prop(tools, "enable_auto_key", text="", toggle=True, icon='REC')
if screen.animation_playing and tools.enable_auto_key: if screen.animation_playing and tools.enable_auto_key:
subsub = row.row() subsub = row.row()
subsub.prop(tools, "record_with_nla", toggle=True) subsub.prop(tools, "record_with_nla", toggle=True)
layout.prop(scene, "sync_audio", text="Realtime", toggle=True, icon='ICON_SPEAKER') layout.prop(scene, "sync_audio", text="Realtime", toggle=True, icon='SPEAKER')
layout.separator() layout.separator()
row = layout.row(align=True) row = layout.row(align=True)
row.prop_object(scene, "active_keying_set", scene, "keying_sets", text="") row.prop_object(scene, "active_keying_set", scene, "keying_sets", text="")
row.operator("anim.keyframe_insert", text="", icon='ICON_KEY_HLT') row.operator("anim.keyframe_insert", text="", icon='KEY_HLT')
row.operator("anim.keyframe_delete", text="", icon='ICON_KEY_DEHLT') row.operator("anim.keyframe_delete", text="", icon='KEY_DEHLT')
class TIME_MT_view(bpy.types.Menu): class TIME_MT_view(bpy.types.Menu):
@ -146,7 +146,7 @@ class TIME_MT_playback(bpy.types.Menu):
layout.separator() layout.separator()
layout.prop(scene, "sync_audio", text="Realtime Playback", icon='ICON_SPEAKER') layout.prop(scene, "sync_audio", text="Realtime Playback", icon='SPEAKER')
layout.prop(scene, "mute_audio") layout.prop(scene, "mute_audio")
layout.prop(scene, "scrub_audio") layout.prop(scene, "scrub_audio")

12
release/scripts/ui/space_userpref.py
View File

@ -1215,16 +1215,16 @@ class USERPREF_PT_input(bpy.types.Panel):
row = subcol.row() row = subcol.row()
if kmi.expanded: if kmi.expanded:
row.prop(kmi, "expanded", text="", icon='ICON_TRIA_DOWN') row.prop(kmi, "expanded", text="", icon='TRIA_DOWN')
else: else:
row.prop(kmi, "expanded", text="", icon='ICON_TRIA_RIGHT') row.prop(kmi, "expanded", text="", icon='TRIA_RIGHT')
itemrow = row.row() itemrow = row.row()
itemrow.enabled = km.user_defined itemrow.enabled = km.user_defined
if kmi.active: if kmi.active:
itemrow.prop(kmi, "active", text="", icon='ICON_CHECKBOX_HLT') itemrow.prop(kmi, "active", text="", icon='CHECKBOX_HLT')
else: else:
itemrow.prop(kmi, "active", text="", icon='ICON_CHECKBOX_DEHLT') itemrow.prop(kmi, "active", text="", icon='CHECKBOX_DEHLT')
itemcol = itemrow.column() itemcol = itemrow.column()
itemcol.active = kmi.active itemcol.active = kmi.active
@ -1286,11 +1286,11 @@ class USERPREF_PT_input(bpy.types.Panel):
itemcol.separator() itemcol.separator()
itemrow.operator("wm.keyitem_remove", text="", icon='ICON_ZOOMOUT') itemrow.operator("wm.keyitem_remove", text="", icon='ZOOMOUT')
itemrow = col.row() itemrow = col.row()
itemrow.label() itemrow.label()
itemrow.operator("wm.keyitem_add", text="", icon='ICON_ZOOMIN') itemrow.operator("wm.keyitem_add", text="", icon='ZOOMIN')
itemrow.enabled = km.user_defined itemrow.enabled = km.user_defined
bpy.types.register(USERPREF_HT_header) bpy.types.register(USERPREF_HT_header)

18
release/scripts/ui/space_view3d.py
View File

@ -87,16 +87,16 @@ class VIEW3D_HT_header(bpy.types.Header):
# OpenGL render # OpenGL render
row = layout.row(align=True) row = layout.row(align=True)
row.operator("screen.opengl_render", text="", icon='ICON_RENDER_STILL') row.operator("screen.opengl_render", text="", icon='RENDER_STILL')
props = row.operator("screen.opengl_render", text="", icon='ICON_RENDER_ANIMATION') props = row.operator("screen.opengl_render", text="", icon='RENDER_ANIMATION')
props.animation = True props.animation = True
# Pose # Pose
if obj and obj.mode == 'POSE': if obj and obj.mode == 'POSE':
row = layout.row(align=True) row = layout.row(align=True)
row.operator("pose.copy", text="", icon='ICON_COPYDOWN') row.operator("pose.copy", text="", icon='COPYDOWN')
row.operator("pose.paste", text="", icon='ICON_PASTEDOWN') row.operator("pose.paste", text="", icon='PASTEDOWN')
props = row.operator("pose.paste", text="", icon='ICON_PASTEFLIPDOWN') props = row.operator("pose.paste", text="", icon='PASTEFLIPDOWN')
props.flipped = 1 props.flipped = 1
@ -230,8 +230,8 @@ class VIEW3D_MT_view(bpy.types.Menu):
def draw(self, context): def draw(self, context):
layout = self.layout layout = self.layout
layout.operator("view3d.properties", icon='ICON_MENU_PANEL') layout.operator("view3d.properties", icon='MENU_PANEL')
layout.operator("view3d.toolbar", icon='ICON_MENU_PANEL') layout.operator("view3d.toolbar", icon='MENU_PANEL')
layout.separator() layout.separator()
@ -1594,14 +1594,14 @@ class VIEW3D_PT_3dview_name(bpy.types.Panel):
ob = context.active_object ob = context.active_object
row = layout.row() row = layout.row()
row.label(text="", icon='ICON_OBJECT_DATA') row.label(text="", icon='OBJECT_DATA')
row.prop(ob, "name", text="") row.prop(ob, "name", text="")
if ob.type == 'ARMATURE' and ob.mode in ('EDIT', 'POSE'): if ob.type == 'ARMATURE' and ob.mode in ('EDIT', 'POSE'):
bone = context.active_bone bone = context.active_bone
if bone: if bone:
row = layout.row() row = layout.row()
row.label(text="", icon='ICON_BONE_DATA') row.label(text="", icon='BONE_DATA')
row.prop(bone, "name", text="") row.prop(bone, "name", text="")

20
source/blender/editors/include/UI_icons.h
View File

@ -871,14 +871,14 @@ DEF_ICON(ICON_BLANK346b)
/* vector icons */ /* vector icons */
DEF_ICON(VICON_VIEW3D) DEF_ICON(VICO_VIEW3D_VEC)
DEF_ICON(VICON_EDIT) DEF_ICON(VICO_EDIT_VEC)
DEF_ICON(VICON_EDITMODE_DEHLT) DEF_ICON(VICO_EDITMODE_DEHLT)
DEF_ICON(VICON_EDITMODE_HLT) DEF_ICON(VICO_EDITMODE_HLT)
DEF_ICON(VICON_DISCLOSURE_TRI_RIGHT) DEF_ICON(VICO_DISCLOSURE_TRI_RIGHT_VEC)
DEF_ICON(VICON_DISCLOSURE_TRI_DOWN) DEF_ICON(VICO_DISCLOSURE_TRI_DOWN_VEC)
DEF_ICON(VICON_MOVE_UP) DEF_ICON(VICO_MOVE_UP_VEC)
DEF_ICON(VICON_MOVE_DOWN) DEF_ICON(VICO_MOVE_DOWN_VEC)
DEF_ICON(VICON_X) DEF_ICON(VICO_X_VEC)
DEF_ICON(VICON_SMALL_TRI_RIGHT) DEF_ICON(VICO_SMALL_TRI_RIGHT_VEC)

20
source/blender/editors/interface/interface_icons.c
View File

@ -528,16 +528,16 @@ static void init_internal_icons()
} }
} }
def_internal_vicon(VICON_VIEW3D, vicon_view3d_draw); def_internal_vicon(VICO_VIEW3D_VEC, vicon_view3d_draw);
def_internal_vicon(VICON_EDIT, vicon_edit_draw); def_internal_vicon(VICO_EDIT_VEC, vicon_edit_draw);
def_internal_vicon(VICON_EDITMODE_DEHLT, vicon_editmode_dehlt_draw); def_internal_vicon(VICO_EDITMODE_DEHLT, vicon_editmode_dehlt_draw);
def_internal_vicon(VICON_EDITMODE_HLT, vicon_editmode_hlt_draw); def_internal_vicon(VICO_EDITMODE_HLT, vicon_editmode_hlt_draw);
def_internal_vicon(VICON_DISCLOSURE_TRI_RIGHT, vicon_disclosure_tri_right_draw); def_internal_vicon(VICO_DISCLOSURE_TRI_RIGHT_VEC, vicon_disclosure_tri_right_draw);
def_internal_vicon(VICON_DISCLOSURE_TRI_DOWN, vicon_disclosure_tri_down_draw); def_internal_vicon(VICO_DISCLOSURE_TRI_DOWN_VEC, vicon_disclosure_tri_down_draw);
def_internal_vicon(VICON_MOVE_UP, vicon_move_up_draw); def_internal_vicon(VICO_MOVE_UP_VEC, vicon_move_up_draw);
def_internal_vicon(VICON_MOVE_DOWN, vicon_move_down_draw); def_internal_vicon(VICO_MOVE_DOWN_VEC, vicon_move_down_draw);
def_internal_vicon(VICON_X, vicon_x_draw); def_internal_vicon(VICO_X_VEC, vicon_x_draw);
def_internal_vicon(VICON_SMALL_TRI_RIGHT, vicon_small_tri_right_draw); def_internal_vicon(VICO_SMALL_TRI_RIGHT_VEC, vicon_small_tri_right_draw);
IMB_freeImBuf(bbuf); IMB_freeImBuf(bbuf);
} }

2
source/blender/editors/space_buttons/buttons_context.c
View File

@ -767,7 +767,7 @@ void buttons_context_draw(const bContext *C, uiLayout *layout)
ptr= &path->ptr[a]; ptr= &path->ptr[a];
if(a != 0) if(a != 0)
uiItemL(row, "", VICON_SMALL_TRI_RIGHT); uiItemL(row, "", VICO_SMALL_TRI_RIGHT_VEC);
if(ptr->data) { if(ptr->data) {
icon= RNA_struct_ui_icon(ptr->type); icon= RNA_struct_ui_icon(ptr->type);

2
source/blender/makesrna/intern/rna_ui_api.c
View File

@ -64,7 +64,7 @@ static PointerRNA rna_uiItemO(uiLayout *layout, char *name, int icon, char *opna
#else #else
#define DEF_ICON(name) {name, #name, 0, #name, ""}, #define DEF_ICON(name) {name, (#name)+5, 0, (#name)+5, ""},
static EnumPropertyItem icon_items[] = { static EnumPropertyItem icon_items[] = {
#include "UI_icons.h" #include "UI_icons.h"
{0, NULL, 0, NULL, NULL}}; {0, NULL, 0, NULL, NULL}};

3
source/blender/python/intern/bpy_rna.c
View File

@ -158,12 +158,13 @@ PyObject *pyrna_math_object_from_array(PointerRNA *ptr, PropertyRNA *prop)
if (totdim == 1 || (totdim == 2 && subtype == PROP_MATRIX)) { if (totdim == 1 || (totdim == 2 && subtype == PROP_MATRIX)) {
ret = pyrna_prop_CreatePyObject(ptr, prop); /* owned by the Mathutils PyObject */ ret = pyrna_prop_CreatePyObject(ptr, prop); /* owned by the Mathutils PyObject */
switch(RNA_SUBTYPE_VALUE(RNA_property_subtype(prop))) { switch(RNA_property_subtype(prop)) {
case PROP_TRANSLATION: case PROP_TRANSLATION:
case PROP_DIRECTION: case PROP_DIRECTION:
case PROP_VELOCITY: case PROP_VELOCITY:
case PROP_ACCELERATION: case PROP_ACCELERATION:
case PROP_XYZ: case PROP_XYZ:
case PROP_XYZ|PROP_UNIT_LENGTH:
if(len>=2 && len <= 4) { if(len>=2 && len <= 4) {
PyObject *vec_cb= newVectorObject_cb(ret, len, mathutils_rna_array_cb_index, FALSE); PyObject *vec_cb= newVectorObject_cb(ret, len, mathutils_rna_array_cb_index, FALSE);
Py_DECREF(ret); /* the vector owns now */ Py_DECREF(ret); /* the vector owns now */