[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [25278] trunk/blender: remove ICON prefix from the enum, for python this is redundant eg.
Campbell Barton
ideasman42 at gmail.com
Thu Dec 10 11:23:53 CET 2009
Revision: 25278
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=25278
Author: campbellbarton
Date: 2009-12-10 11:23:53 +0100 (Thu, 10 Dec 2009)
Log Message:
-----------
remove ICON prefix from the enum, for python this is redundant eg.
layout.prop("setting", icon='ICON_BLAH_BLAH')
Also reverted previous commit, the cursor subtype just needed to be added to the switch statement.
Modified Paths:
--------------
trunk/blender/release/scripts/io/netrender/ui.py
trunk/blender/release/scripts/op/add_mesh_torus.py
trunk/blender/release/scripts/ui/properties_data_armature.py
trunk/blender/release/scripts/ui/properties_data_bone.py
trunk/blender/release/scripts/ui/properties_data_mesh.py
trunk/blender/release/scripts/ui/properties_material.py
trunk/blender/release/scripts/ui/properties_object.py
trunk/blender/release/scripts/ui/properties_object_constraint.py
trunk/blender/release/scripts/ui/properties_particle.py
trunk/blender/release/scripts/ui/properties_physics_common.py
trunk/blender/release/scripts/ui/properties_physics_fluid.py
trunk/blender/release/scripts/ui/properties_render.py
trunk/blender/release/scripts/ui/properties_scene.py
trunk/blender/release/scripts/ui/properties_texture.py
trunk/blender/release/scripts/ui/space_dopesheet.py
trunk/blender/release/scripts/ui/space_filebrowser.py
trunk/blender/release/scripts/ui/space_graph.py
trunk/blender/release/scripts/ui/space_image.py
trunk/blender/release/scripts/ui/space_info.py
trunk/blender/release/scripts/ui/space_logic.py
trunk/blender/release/scripts/ui/space_nla.py
trunk/blender/release/scripts/ui/space_node.py
trunk/blender/release/scripts/ui/space_outliner.py
trunk/blender/release/scripts/ui/space_sequencer.py
trunk/blender/release/scripts/ui/space_text.py
trunk/blender/release/scripts/ui/space_time.py
trunk/blender/release/scripts/ui/space_userpref.py
trunk/blender/release/scripts/ui/space_view3d.py
trunk/blender/source/blender/editors/include/UI_icons.h
trunk/blender/source/blender/editors/interface/interface_icons.c
trunk/blender/source/blender/editors/space_buttons/buttons_context.c
trunk/blender/source/blender/makesrna/intern/rna_ui_api.c
trunk/blender/source/blender/python/intern/bpy_rna.c
Modified: trunk/blender/release/scripts/io/netrender/ui.py
===================================================================
--- trunk/blender/release/scripts/io/netrender/ui.py 2009-12-10 09:58:10 UTC (rev 25277)
+++ trunk/blender/release/scripts/io/netrender/ui.py 2009-12-10 10:23:53 UTC (rev 25278)
@@ -71,7 +71,7 @@
if scene.network_render.mode == "RENDER_MASTER":
col.prop(scene.network_render, "server_broadcast")
else:
- col.operator("render.netclientscan", icon="ICON_FILE_REFRESH", text="")
+ col.operator("render.netclientscan", icon='FILE_REFRESH', text="")
@rnaType
class RENDER_PT_network_job(RenderButtonsPanel):
@@ -93,9 +93,9 @@
split = layout.split()
col = split.column()
- col.operator("render.netclientanim", icon='ICON_RENDER_ANIMATION')
- col.operator("render.netclientsend", icon="ICON_FILE_BLEND")
- col.operator("render.netclientweb", icon="ICON_QUESTION")
+ col.operator("render.netclientanim", icon='RENDER_ANIMATION')
+ col.operator("render.netclientsend", icon='FILE_BLEND')
+ col.operator("render.netclientweb", icon='QUESTION')
col.prop(scene.network_render, "job_name")
row = col.row()
row.prop(scene.network_render, "priority")
@@ -120,8 +120,8 @@
row.template_list(netsettings, "slaves", netsettings, "active_slave_index", rows=2)
sub = row.column(align=True)
- sub.operator("render.netclientslaves", icon="ICON_FILE_REFRESH", text="")
- sub.operator("render.netclientblacklistslave", icon="ICON_ZOOMOUT", text="")
+ sub.operator("render.netclientslaves", icon='FILE_REFRESH', text="")
+ sub.operator("render.netclientblacklistslave", icon='ZOOMOUT', text="")
if len(netrender.slaves) == 0 and len(netsettings.slaves) > 0:
while(len(netsettings.slaves) > 0):
@@ -156,7 +156,7 @@
row.template_list(netsettings, "slaves_blacklist", netsettings, "active_blacklisted_slave_index", rows=2)
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:
while(len(netsettings.slaves_blacklist) > 0):
@@ -191,10 +191,10 @@
row.template_list(netsettings, "jobs", netsettings, "active_job_index", rows=2)
sub = row.column(align=True)
- 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="")
+ sub.operator("render.netclientstatus", icon='FILE_REFRESH', text="")
+ sub.operator("render.netclientcancel", icon='ZOOMOUT', text="")
+ sub.operator("render.netclientcancelall", icon='PANEL_CLOSE', text="")
+ sub.operator("render.netclientdownload", icon='RENDER_ANIMATION', text="")
if len(netrender.jobs) == 0 and len(netsettings.jobs) > 0:
while(len(netsettings.jobs) > 0):
Modified: trunk/blender/release/scripts/op/add_mesh_torus.py
===================================================================
--- trunk/blender/release/scripts/op/add_mesh_torus.py 2009-12-10 09:58:10 UTC (rev 25277)
+++ trunk/blender/release/scripts/op/add_mesh_torus.py 2009-12-10 10:23:53 UTC (rev 25278)
@@ -131,7 +131,7 @@
import dynamic_menu
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)
Modified: trunk/blender/release/scripts/ui/properties_data_armature.py
===================================================================
--- trunk/blender/release/scripts/ui/properties_data_armature.py 2009-12-10 09:58:10 UTC (rev 25277)
+++ trunk/blender/release/scripts/ui/properties_data_armature.py 2009-12-10 10:23:53 UTC (rev 25278)
@@ -128,8 +128,8 @@
col = row.column(align=True)
col.active = (ob.proxy is None)
- col.operator("pose.group_add", icon='ICON_ZOOMIN', text="")
- col.operator("pose.group_remove", icon='ICON_ZOOMOUT', text="")
+ col.operator("pose.group_add", icon='ZOOMIN', text="")
+ col.operator("pose.group_remove", icon='ZOOMOUT', text="")
group = pose.active_bone_group
if group:
Modified: trunk/blender/release/scripts/ui/properties_data_bone.py
===================================================================
--- trunk/blender/release/scripts/ui/properties_data_bone.py 2009-12-10 09:58:10 UTC (rev 25277)
+++ trunk/blender/release/scripts/ui/properties_data_bone.py 2009-12-10 10:23:53 UTC (rev 25278)
@@ -43,7 +43,7 @@
bone = context.edit_bone
row = layout.row()
- row.label(text="", icon='ICON_BONE_DATA')
+ row.label(text="", icon='BONE_DATA')
row.prop(bone, "name", text="")
Modified: trunk/blender/release/scripts/ui/properties_data_mesh.py
===================================================================
--- trunk/blender/release/scripts/ui/properties_data_mesh.py 2009-12-10 09:58:10 UTC (rev 25277)
+++ trunk/blender/release/scripts/ui/properties_data_mesh.py 2009-12-10 10:23:53 UTC (rev 25278)
@@ -114,12 +114,12 @@
row.template_list(ob, "vertex_groups", ob, "active_vertex_group_index", rows=rows)
col = row.column(align=True)
- col.operator("object.vertex_group_add", icon='ICON_ZOOMIN', text="")
- col.operator("object.vertex_group_remove", icon='ICON_ZOOMOUT', text="")
+ col.operator("object.vertex_group_add", icon='ZOOMIN', 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:
- 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:
row = layout.row()
@@ -170,15 +170,15 @@
col = row.column()
sub = col.column(align=True)
- sub.operator("object.shape_key_add", icon='ICON_ZOOMIN', text="")
- sub.operator("object.shape_key_remove", icon='ICON_ZOOMOUT', text="")
+ sub.operator("object.shape_key_add", icon='ZOOMIN', text="")
+ sub.operator("object.shape_key_remove", icon='ZOOMOUT', text="")
if kb:
col.separator()
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='ICON_TRIA_DOWN', text="").type = 'DOWN'
+ sub.operator("object.shape_key_move", icon='TRIA_UP', text="").type = 'UP'
+ sub.operator("object.shape_key_move", icon='TRIA_DOWN', text="").type = 'DOWN'
split = layout.split(percentage=0.4)
row = split.row()
@@ -198,18 +198,18 @@
subsub = sub.row(align=True)
subsub.active = enable_edit_value
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:
- subsub.prop(ob, "shape_key_lock", icon='ICON_UNPINNED', text="")
+ subsub.prop(ob, "shape_key_lock", icon='UNPINNED', text="")
if kb.mute:
- subsub.prop(kb, "mute", icon='ICON_MUTE_IPO_ON', text="")
+ subsub.prop(kb, "mute", icon='MUTE_IPO_ON', text="")
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 = row.row(align=True)
- sub.operator("object.shape_key_mirror", icon='ICON_ARROW_LEFTRIGHT', text="")
- sub.operator("object.shape_key_clear", icon='ICON_X', text="")
+ sub.operator("object.shape_key_mirror", icon='ARROW_LEFTRIGHT', text="")
+ sub.operator("object.shape_key_clear", icon='X', text="")
row = layout.row()
@@ -256,8 +256,8 @@
col.template_list(me, "uv_textures", me, "active_uv_texture_index", rows=2)
col = row.column(align=True)
- col.operator("mesh.uv_texture_add", icon='ICON_ZOOMIN', text="")
- col.operator("mesh.uv_texture_remove", icon='ICON_ZOOMOUT', text="")
+ col.operator("mesh.uv_texture_add", icon='ZOOMIN', text="")
+ col.operator("mesh.uv_texture_remove", icon='ZOOMOUT', text="")
lay = me.active_uv_texture
if lay:
@@ -278,8 +278,8 @@
col.template_list(me, "vertex_colors", me, "active_vertex_color_index", rows=2)
col = row.column(align=True)
- col.operator("mesh.vertex_color_add", icon='ICON_ZOOMIN', text="")
- col.operator("mesh.vertex_color_remove", icon='ICON_ZOOMOUT', text="")
+ col.operator("mesh.vertex_color_add", icon='ZOOMIN', text="")
+ col.operator("mesh.vertex_color_remove", icon='ZOOMOUT', text="")
lay = me.active_vertex_color
if lay:
Modified: trunk/blender/release/scripts/ui/properties_material.py
===================================================================
--- trunk/blender/release/scripts/ui/properties_material.py 2009-12-10 09:58:10 UTC (rev 25277)
+++ trunk/blender/release/scripts/ui/properties_material.py 2009-12-10 10:23:53 UTC (rev 25278)
@@ -89,9 +89,9 @@
row.template_list(ob, "materials", ob, "active_material_index", rows=2)
col = row.column(align=True)
- 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="")
+ col.operator("object.material_slot_add", icon='ZOOMIN', text="")
+ col.operator("object.material_slot_remove", icon='ZOOMOUT', text="")
+ col.operator("object.material_slot_copy", icon='COPY_ID', text="")
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list