diff options
| -rw-r--r-- | projectfiles_vc9/blender/editors/ED_editors.vcproj | 4 | ||||
| -rw-r--r-- | release/ui/buttons_scene.py | 4 | ||||
| -rw-r--r-- | release/ui/space_text.py | 18 | ||||
| -rw-r--r-- | source/blender/editors/include/UI_icons.h | 882 | ||||
| -rw-r--r-- | source/blender/editors/include/UI_resources.h | 856 | ||||
| -rw-r--r-- | source/blender/editors/interface/interface_api.c | 15 | ||||
| -rw-r--r-- | source/blender/editors/interface/resources.c | 2 |
7 files changed, 916 insertions, 865 deletions
diff --git a/projectfiles_vc9/blender/editors/ED_editors.vcproj b/projectfiles_vc9/blender/editors/ED_editors.vcproj index 28fcd89042d..aaec7a66a55 100644 --- a/projectfiles_vc9/blender/editors/ED_editors.vcproj +++ b/projectfiles_vc9/blender/editors/ED_editors.vcproj @@ -310,6 +310,10 @@ >
</File>
<File
+ RelativePath="..\..\..\source\blender\editors\include\UI_icons.h"
+ >
+ </File>
+ <File
RelativePath="..\..\..\source\blender\editors\include\UI_interface.h"
>
</File>
diff --git a/release/ui/buttons_scene.py b/release/ui/buttons_scene.py index 1252b9f8c17..df172ea8298 100644 --- a/release/ui/buttons_scene.py +++ b/release/ui/buttons_scene.py @@ -162,8 +162,8 @@ class RENDER_PT_render(RenderButtonsPanel): rd = context.scene.render_data row = layout.row() - row.itemO("SCREEN_OT_render", text="Render Still", icon=109) - row.item_booleanO("SCREEN_OT_render", "anim", True, text="Render Animation", icon=111) + row.itemO("SCREEN_OT_render", text="Render Still", icon='ICON_IMAGE_COL') + row.item_booleanO("SCREEN_OT_render", "anim", True, text="Render Animation", icon='ICON_SEQUENCE') row = layout.row() row.itemR(rd, "do_composite") diff --git a/release/ui/space_text.py b/release/ui/space_text.py index 8daca086111..d347fd7c3b1 100644 --- a/release/ui/space_text.py +++ b/release/ui/space_text.py @@ -30,12 +30,12 @@ class TEXT_HT_header(bpy.types.Header): if text and text.modified: row = layout.row() # row.color(redalert) - row.itemO("TEXT_OT_resolve_conflict", text="", icon=ICON_HELP) + row.itemO("TEXT_OT_resolve_conflict", text="", icon='ICON_HELP') row = layout.row(align=True) - row.itemR(st, "line_numbers", text="", icon=ICON_LINENUMBERS_OFF) - row.itemR(st, "word_wrap", text="", icon=ICON_WORDWRAP_OFF) - row.itemR(st, "syntax_highlight", text="", icon=ICON_SYNTAX_OFF) + row.itemR(st, "line_numbers", text="", icon='ICON_LINENUMBERS_OFF') + row.itemR(st, "word_wrap", text="", icon='ICON_WORDWRAP_OFF') + row.itemR(st, "syntax_highlight", text="", icon='ICON_SYNTAX_OFF') # row.itemR(st, "do_python_plugins", text="", icon=ICON_SCRIPTPLUGINS) layout.template_ID(context, st, "text", new="TEXT_OT_new", open="TEXT_OT_open", unlink="TEXT_OT_unlink") @@ -63,9 +63,9 @@ class TEXT_PT_properties(bpy.types.Panel): layout = self.layout flow = layout.column_flow() - flow.itemR(st, "line_numbers", icon=ICON_LINENUMBERS_OFF) - flow.itemR(st, "word_wrap", icon=ICON_WORDWRAP_OFF) - flow.itemR(st, "syntax_highlight", icon=ICON_SYNTAX_OFF) + flow.itemR(st, "line_numbers", icon='ICON_LINENUMBERS_OFF') + flow.itemR(st, "word_wrap", icon='ICON_WORDWRAP_OFF') + flow.itemR(st, "syntax_highlight", icon='ICON_SYNTAX_OFF') flow.itemR(st, "live_edit") flow = layout.column_flow() @@ -85,14 +85,14 @@ class TEXT_PT_find(bpy.types.Panel): col = layout.column(align=True) row = col.row() row.itemR(st, "find_text", text="") - row.itemO("TEXT_OT_find_set_selected", text="", icon=ICON_TEXT) + row.itemO("TEXT_OT_find_set_selected", text="", icon='ICON_TEXT') col.itemO("TEXT_OT_find") # replace col = layout.column(align=True) row = col.row() row.itemR(st, "replace_text", text="") - row.itemO("TEXT_OT_replace_set_selected", text="", icon=ICON_TEXT) + row.itemO("TEXT_OT_replace_set_selected", text="", icon='ICON_TEXT') col.itemO("TEXT_OT_replace") # mark diff --git a/source/blender/editors/include/UI_icons.h b/source/blender/editors/include/UI_icons.h new file mode 100644 index 00000000000..a38dfd93c30 --- /dev/null +++ b/source/blender/editors/include/UI_icons.h @@ -0,0 +1,882 @@ +/** + * $Id: + * + * ***** BEGIN GPL LICENSE BLOCK ***** + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software Foundation, + * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * + * The Original Code is Copyright (C) 2009 Blender Foundation. + * All rights reserved. + * + * + * Contributor(s): Blender Foundation + * + * ***** END GPL LICENSE BLOCK ***** + */ + +/* Note: this is included twice with different #defines for DEF_ICON + once from UI_resources.h for the internal icon enum and once fro interface_api.c for + definition of the RNA enum for he icons */ + +DEF_ICON(ICON_BLENDER) +DEF_ICON(ICON_QUESTION) +DEF_ICON(ICON_ERROR) +DEF_ICON(ICON_BLANK1) // XXX this is used lots, it's not actually 'blank' +DEF_ICON(ICON_TRIA_RIGHT) +DEF_ICON(ICON_TRIA_DOWN) +DEF_ICON(ICON_TRIA_LEFT) +DEF_ICON(ICON_TRIA_UP) +DEF_ICON(ICON_ARROW_LEFTRIGHT) +DEF_ICON(ICON_PLUS) +DEF_ICON(ICON_DISCLOSURE_TRI_DOWN) +DEF_ICON(ICON_DISCLOSURE_TRI_RIGHT) +DEF_ICON(ICON_RADIOBUT_OFF) +DEF_ICON(ICON_RADIOBUT_ON) +DEF_ICON(ICON_MENU_PANEL) +DEF_ICON(ICON_PYTHON) +DEF_ICON(ICON_BLANK003) +DEF_ICON(ICON_DOT) +DEF_ICON(ICON_BLANK004) +DEF_ICON(ICON_X) +DEF_ICON(ICON_BLANK005) +DEF_ICON(ICON_GO_LEFT) +DEF_ICON(ICON_BLANK006) +DEF_ICON(ICON_BLANK007) +DEF_ICON(ICON_BLANK008) +DEF_ICON(ICON_BLANK008b) + + /* ui */ +DEF_ICON(ICON_FULLSCREEN) +DEF_ICON(ICON_SPLITSCREEN) +DEF_ICON(ICON_RIGHTARROW_THIN) +DEF_ICON(ICON_BORDERMOVE) +DEF_ICON(ICON_VIEWZOOM) +DEF_ICON(ICON_ZOOMIN) +DEF_ICON(ICON_ZOOMOUT) +DEF_ICON(ICON_PANEL_CLOSE) +DEF_ICON(ICON_BLANK009) +DEF_ICON(ICON_EYEDROPPER) +DEF_ICON(ICON_BLANK010) +DEF_ICON(ICON_AUTO) +DEF_ICON(ICON_CHECKBOX_DEHLT) +DEF_ICON(ICON_CHECKBOX_HLT) +DEF_ICON(ICON_UNLOCKED) +DEF_ICON(ICON_LOCKED) +DEF_ICON(ICON_PINNED) +DEF_ICON(ICON_UNPINNED) +DEF_ICON(ICON_BLANK015) +DEF_ICON(ICON_RIGHTARROW) +DEF_ICON(ICON_DOWNARROW_HLT) +DEF_ICON(ICON_DOTSUP) +DEF_ICON(ICON_DOTSDOWN) +DEF_ICON(ICON_LINK) +DEF_ICON(ICON_INLINK) +DEF_ICON(ICON_BLANK012b) + + /* various ui */ +DEF_ICON(ICON_HELP) +DEF_ICON(ICON_GHOSTDRAW) +DEF_ICON(ICON_COLOR) +DEF_ICON(ICON_LINKED) +DEF_ICON(ICON_UNLINKED) +DEF_ICON(ICON_HAND) +DEF_ICON(ICON_ZOOM_ALL) +DEF_ICON(ICON_ZOOM_SELECTED) +DEF_ICON(ICON_ZOOM_PREVIOUS) +DEF_ICON(ICON_ZOOM_IN) +DEF_ICON(ICON_ZOOM_OUT) +DEF_ICON(ICON_RENDER_REGION) +DEF_ICON(ICON_BORDER_RECT) +DEF_ICON(ICON_BORDER_LASSO) +DEF_ICON(ICON_FREEZE) +DEF_ICON(ICON_BLANK031) +DEF_ICON(ICON_BLANK032) +DEF_ICON(ICON_BLANK033) +DEF_ICON(ICON_BLANK034) +DEF_ICON(ICON_BLANK035) +DEF_ICON(ICON_BLANK036) +DEF_ICON(ICON_BLANK037) +DEF_ICON(ICON_BLANK038) +DEF_ICON(ICON_BLANK039) +DEF_ICON(ICON_BLANK040) +DEF_ICON(ICON_BLANK040b) + + /* BUTTONS */ +DEF_ICON(ICON_LAMP) +DEF_ICON(ICON_MATERIAL) +DEF_ICON(ICON_TEXTURE) +DEF_ICON(ICON_ANIM) +DEF_ICON(ICON_WORLD) +DEF_ICON(ICON_SCENE) +DEF_ICON(ICON_EDIT) +DEF_ICON(ICON_GAME) +DEF_ICON(ICON_RADIO) +DEF_ICON(ICON_SCRIPT) +DEF_ICON(ICON_PARTICLES) +DEF_ICON(ICON_PHYSICS) +DEF_ICON(ICON_SPEAKER) +DEF_ICON(ICON_BLANK041) +DEF_ICON(ICON_BLANK042) +DEF_ICON(ICON_BLANK043) +DEF_ICON(ICON_BLANK044) +DEF_ICON(ICON_BLANK045) +DEF_ICON(ICON_BLANK046) +DEF_ICON(ICON_BLANK047) +DEF_ICON(ICON_BLANK048) +DEF_ICON(ICON_BLANK049) +DEF_ICON(ICON_BLANK050) +DEF_ICON(ICON_BLANK051) +DEF_ICON(ICON_BLANK052) +DEF_ICON(ICON_BLANK052b) + + /* EDITORS */ +DEF_ICON(ICON_VIEW3D) +DEF_ICON(ICON_IPO) +DEF_ICON(ICON_OOPS) +DEF_ICON(ICON_BUTS) +DEF_ICON(ICON_FILESEL) +DEF_ICON(ICON_IMAGE_COL) +DEF_ICON(ICON_INFO) +DEF_ICON(ICON_SEQUENCE) +DEF_ICON(ICON_TEXT) +DEF_ICON(ICON_IMASEL) +DEF_ICON(ICON_SOUND) +DEF_ICON(ICON_ACTION) +DEF_ICON(ICON_NLA) +DEF_ICON(ICON_SCRIPTWIN) +DEF_ICON(ICON_TIME) +DEF_ICON(ICON_NODE) +DEF_ICON(ICON_BLANK053) +DEF_ICON(ICON_BLANK054) +DEF_ICON(ICON_BLANK055) +DEF_ICON(ICON_BLANK056) +DEF_ICON(ICON_BLANK057) +DEF_ICON(ICON_BLANK058) +DEF_ICON(ICON_BLANK059) +DEF_ICON(ICON_BLANK060) +DEF_ICON(ICON_BLANK061) +DEF_ICON(ICON_BLANK061b) + + /* MODES */ +DEF_ICON(ICON_OBJECT_DATAMODE) // XXX fix this up +DEF_ICON(ICON_EDITMODE_HLT) +DEF_ICON(ICON_FACESEL_HLT) +DEF_ICON(ICON_VPAINT_HLT) +DEF_ICON(ICON_TPAINT_HLT) +DEF_ICON(ICON_WPAINT_HLT) +DEF_ICON(ICON_SCULPTMODE_HLT) +DEF_ICON(ICON_POSE_HLT) +DEF_ICON(ICON_PARTICLEMODE) +DEF_ICON(ICON_BLANK062) +DEF_ICON(ICON_BLANK063) +DEF_ICON(ICON_BLANK064) +DEF_ICON(ICON_BLANK065) +DEF_ICON(ICON_BLANK066) +DEF_ICON(ICON_BLANK067) +DEF_ICON(ICON_BLANK068) +DEF_ICON(ICON_BLANK069) +DEF_ICON(ICON_BLANK070) +DEF_ICON(ICON_BLANK071) +DEF_ICON(ICON_BLANK072) +DEF_ICON(ICON_BLANK073) +DEF_ICON(ICON_BLANK074) +DEF_ICON(ICON_BLANK075) +DEF_ICON(ICON_BLANK076) +DEF_ICON(ICON_BLANK077) +DEF_ICON(ICON_BLANK077b) + + /* DATA */ +DEF_ICON(ICON_SCENE_DATA) +DEF_ICON(ICON_RENDERLAYERS) +DEF_ICON(ICON_WORLD_DATA) +DEF_ICON(ICON_OBJECT_DATA) +DEF_ICON(ICON_MESH_DATA) +DEF_ICON(ICON_CURVE_DATA) +DEF_ICON(ICON_META_DATA) +DEF_ICON(ICON_LATTICE_DATA) +DEF_ICON(ICON_LAMP_DATA) +DEF_ICON(ICON_MATERIAL_DATA) +DEF_ICON(ICON_TEXTURE_DATA) +DEF_ICON(ICON_ANIM_DATA) +DEF_ICON(ICON_CAMERA_DATA) +DEF_ICON(ICON_PARTICLE_DATA) +DEF_ICON(ICON_LIBRARY_DATA_DIRECT) +DEF_ICON(ICON_GROUP) +DEF_ICON(ICON_ARMATURE_DATA) +DEF_ICON(ICON_POSE_DATA) +DEF_ICON(ICON_BONE_DATA) +DEF_ICON(ICON_CONSTRAINT) +DEF_ICON(ICON_SHAPEKEY_DATA) +DEF_ICON(ICON_BLANK079a) +DEF_ICON(ICON_BLANK079) +DEF_ICON(ICON_PACKAGE) +DEF_ICON(ICON_UGLYPACKAGE) +DEF_ICON(ICON_BLANK079b) + + /* DATA */ +DEF_ICON(ICON_BRUSH_DATA) +DEF_ICON(ICON_IMAGE_DATA) +DEF_ICON(ICON_FILE) +DEF_ICON(ICON_FCURVE) +DEF_ICON(ICON_FONT_DATA) +DEF_ICON(ICON_RENDER_RESULT) +DEF_ICON(ICON_SURFACE_DATA) +DEF_ICON(ICON_EMPTY_DATA) +DEF_ICON(ICON_SETTINGS) +DEF_ICON(ICON_BLANK080D) +DEF_ICON(ICON_BLANK080E) +DEF_ICON(ICON_BLANK080F) +DEF_ICON(ICON_BLANK080) +DEF_ICON(ICON_STRANDS) +DEF_ICON(ICON_LIBRARY_DATA_INDIRECT) +DEF_ICON(ICON_BLANK082) +DEF_ICON(ICON_BLANK083) +DEF_ICON(ICON_BLANK084) +DEF_ICON(ICON_GROUP_BONE) +DEF_ICON(ICON_GROUP_VERTEX) +DEF_ICON(ICON_GROUP_VCOL) +DEF_ICON(ICON_GROUP_UVS) +DEF_ICON(ICON_BLANK089) +DEF_ICON(ICON_BLANK090) +DEF_ICON(ICON_RNA) +DEF_ICON(ICON_BLANK090b) + + /* available */ +DEF_ICON(ICON_BLANK092) +DEF_ICON(ICON_BLANK093) +DEF_ICON(ICON_BLANK094) +DEF_ICON(ICON_BLANK095) +DEF_ICON(ICON_BLANK096) +DEF_ICON(ICON_BLANK097) +DEF_ICON(ICON_BLANK098) +DEF_ICON(ICON_BLANK099) +DEF_ICON(ICON_BLANK100) +DEF_ICON(ICON_BLANK101) +DEF_ICON(ICON_BLANK102) +DEF_ICON(ICON_BLANK103) +DEF_ICON(ICON_BLANK104) +DEF_ICON(ICON_BLANK105) +DEF_ICON(ICON_BLANK106) +DEF_ICON(ICON_BLANK107) +DEF_ICON(ICON_BLANK108) +DEF_ICON(ICON_BLANK109) +DEF_ICON(ICON_BLANK110) +DEF_ICON(ICON_BLANK111) +DEF_ICON(ICON_BLANK112) +DEF_ICON(ICON_BLANK113) +DEF_ICON(ICON_BLANK114) +DEF_ICON(ICON_BLANK115) +DEF_ICON(ICON_BLANK116) +DEF_ICON(ICON_BLANK116b) + + /* OUTLINER */ +DEF_ICON(ICON_OUTLINER_OB_EMPTY) +DEF_ICON(ICON_OUTLINER_OB_MESH) +DEF_ICON(ICON_OUTLINER_OB_CURVE) +DEF_ICON(ICON_OUTLINER_OB_LATTICE) +DEF_ICON(ICON_OUTLINER_OB_META) +DEF_ICON(ICON_OUTLINER_OB_LAMP) +DEF_ICON(ICON_OUTLINER_OB_CAMERA) +DEF_ICON(ICON_OUTLINER_OB_ARMATURE) +DEF_ICON(ICON_OUTLINER_OB_FONT) +DEF_ICON(ICON_OUTLINER_OB_SURFACE) +DEF_ICON(ICON_BLANK119) +DEF_ICON(ICON_BLANK120) +DEF_ICON(ICON_BLANK121) +DEF_ICON(ICON_BLANK122) +DEF_ICON(ICON_BLANK123) +DEF_ICON(ICON_BLANK124) +DEF_ICON(ICON_BLANK125) +DEF_ICON(ICON_BLANK126) +DEF_ICON(ICON_BLANK127) +DEF_ICON(ICON_RESTRICT_VIEW_OFF) +DEF_ICON(ICON_RESTRICT_VIEW_ON) +DEF_ICON(ICON_RESTRICT_SELECT_OFF) +DEF_ICON(ICON_RESTRICT_SELECT_ON) +DEF_ICON(ICON_RESTRICT_RENDER_OFF) +DEF_ICON(ICON_RESTRICT_RENDER_ON) +DEF_ICON(ICON_BLANK127b) + + /* OUTLINER */ +DEF_ICON(ICON_OUTLINER_DATA_EMPTY) +DEF_ICON(ICON_OUTLINER_DATA_MESH) +DEF_ICON(ICON_OUTLINER_DATA_CURVE) +DEF_ICON(ICON_OUTLINER_DATA_LATTICE) +DEF_ICON(ICON_OUTLINER_DATA_META) +DEF_ICON(ICON_OUTLINER_DATA_LAMP) +DEF_ICON(ICON_OUTLINER_DATA_CAMERA) +DEF_ICON(ICON_OUTLINER_DATA_ARMATURE) +DEF_ICON(ICON_OUTLINER_DATA_FONT) +DEF_ICON(ICON_OUTLINER_DATA_SURFACE) +DEF_ICON(ICON_OUTLINER_DATA_POSE) +DEF_ICON(ICON_BLANK129) +DEF_ICON(ICON_BLANK130) +DEF_ICON(ICON_BLANK131) +DEF_ICON(ICON_BLANK132) +DEF_ICON(ICON_BLANK133) +DEF_ICON(ICON_BLANK134) +DEF_ICON(ICON_BLANK135) +DEF_ICON(ICON_BLANK136) +DEF_ICON(ICON_BLANK137) +DEF_ICON(ICON_BLANK138) +DEF_ICON(ICON_BLANK139) +DEF_ICON(ICON_BLANK140) +DEF_ICON(ICON_BLANK141) +DEF_ICON(ICON_BLANK142) +DEF_ICON(ICON_BLANK142b) + + /* PRIMITIVES */ +DEF_ICON(ICON_MESH_PLANE) +DEF_ICON(ICON_MESH_CUBE) +DEF_ICON(ICON_MESH_CIRCLE) +DEF_ICON(ICON_MESH_UVSPHERE) +DEF_ICON(ICON_MESH_ICOSPHERE) +DEF_ICON(ICON_MESH_GRID) +DEF_ICON(ICON_MESH_MONKEY) +DEF_ICON(ICON_MESH_TUBE) +DEF_ICON(ICON_MESH_DONUT) +DEF_ICON(ICON_MESH_CONE) +DEF_ICON(ICON_BLANK610) +DEF_ICON(ICON_BLANK611) +DEF_ICON(ICON_LAMP_POINT) +DEF_ICON(ICON_LAMP_SUN) +DEF_ICON(ICON_LAMP_SPOT) +DEF_ICON(ICON_LAMP_HEMI) +DEF_ICON(ICON_LAMP_AREA) +DEF_ICON(ICON_BLANK617) +DEF_ICON(ICON_BLANK618) +DEF_ICON(ICON_BLANK619) +DEF_ICON(ICON_META_PLANE) +DEF_ICON(ICON_META_CUBE) +DEF_ICON(ICON_META_BALL) +DEF_ICON(ICON_META_ELLIPSOID) +DEF_ICON(ICON_META_TUBE) +DEF_ICON(ICON_BLANK625) + + /* PRIMITIVES */ +DEF_ICON(ICON_SURFACE_NCURVE) +DEF_ICON(ICON_SURFACE_NCIRCLE) +DEF_ICON(ICON_SURFACE_NSURFACE) +DEF_ICON(ICON_SURFACE_NTUBE) +DEF_ICON(ICON_SURFACE_NSPHERE) +DEF_ICON(ICON_SURFACE_NDONUT) +DEF_ICON(ICON_BLANK636) +DEF_ICON(ICON_BLANK637) +DEF_ICON(ICON_BLANK638) +DEF_ICON(ICON_CURVE_BEZCURVE) +DEF_ICON(ICON_CURVE_BEZCIRCLE) +DEF_ICON(ICON_CURVE_NCURVE) +DEF_ICON(ICON_CURVE_NCIRCLE) +DEF_ICON(ICON_CURVE_PATH) +DEF_ICON(ICON_BLANK644) +DEF_ICON(ICON_BLANK645) +DEF_ICON(ICON_BLANK646) +DEF_ICON(ICON_BLANK647) +DEF_ICON(ICON_BLANK648) +DEF_ICON(ICON_BLANK649) +DEF_ICON(ICON_BLANK650) +DEF_ICON(ICON_BLANK651) +DEF_ICON(ICON_BLANK652) +DEF_ICON(ICON_BLANK653) +DEF_ICON(ICON_BLANK654) +DEF_ICON(ICON_BLANK655) + + /* EMPTY */ +DEF_ICON(ICON_BLANK660) +DEF_ICON(ICON_BLANK661) +DEF_ICON(ICON_BLANK662) +DEF_ICON(ICON_BLANK663) +DEF_ICON(ICON_BLANK664) +DEF_ICON(ICON_BLANK665) +DEF_ICON(ICON_BLANK666) +DEF_ICON(ICON_BLANK667) +DEF_ICON(ICON_BLANK668) +DEF_ICON(ICON_BLANK669) +DEF_ICON(ICON_BLANK670) +DEF_ICON(ICON_BLANK671) +DEF_ICON(ICON_BLANK672) +DEF_ICON(ICON_BLANK673) +DEF_ICON(ICON_BLANK674) +DEF_ICON(ICON_BLANK675) +DEF_ICON(ICON_BLANK676) +DEF_ICON(ICON_BLANK677) +DEF_ICON(ICON_BLANK678) +DEF_ICON(ICON_BLANK679) +DEF_ICON(ICON_BLANK680) +DEF_ICON(ICON_BLANK681) +DEF_ICON(ICON_BLANK682) +DEF_ICON(ICON_BLANK683) +DEF_ICON(ICON_BLANK684) +DEF_ICON(ICON_BLANK685) + + /* EMPTY */ +DEF_ICON(ICON_BLANK690) +DEF_ICON(ICON_BLANK691) +DEF_ICON(ICON_BLANK692) +DEF_ICON(ICON_BLANK693) +DEF_ICON(ICON_BLANK694) +DEF_ICON(ICON_BLANK695) +DEF_ICON(ICON_BLANK696) +DEF_ICON(ICON_BLANK697) +DEF_ICON(ICON_BLANK698) +DEF_ICON(ICON_BLANK699) +DEF_ICON(ICON_BLANK700) +DEF_ICON(ICON_BLANK701) +DEF_ICON(ICON_BLANK702) +DEF_ICON(ICON_BLANK703) +DEF_ICON(ICON_BLANK704) +DEF_ICON(ICON_BLANK705) +DEF_ICON(ICON_BLANK706) +DEF_ICON(ICON_BLANK707) +DEF_ICON(ICON_BLANK708) +DEF_ICON(ICON_BLANK709) +DEF_ICON(ICON_BLANK710) +DEF_ICON(ICON_BLANK711) +DEF_ICON(ICON_BLANK712) +DEF_ICON(ICON_BLANK713) +DEF_ICON(ICON_BLANK714) +DEF_ICON(ICON_BLANK715) + + /* EMPTY */ +DEF_ICON(ICON_BLANK720) +DEF_ICON(ICON_BLANK721) +DEF_ICON(ICON_BLANK722) +DEF_ICON(ICON_BLANK733) +DEF_ICON(ICON_BLANK734) +DEF_ICON(ICON_BLANK735) +DEF_ICON(ICON_BLANK736) +DEF_ICON(ICON_BLANK737) +DEF_ICON(ICON_BLANK738) +DEF_ICON(ICON_BLANK739) +DEF_ICON(ICON_BLANK740) +DEF_ICON(ICON_BLANK741) +DEF_ICON(ICON_BLANK742) +DEF_ICON(ICON_BLANK743) +DEF_ICON(ICON_BLANK744) +DEF_ICON(ICON_BLANK745) +DEF_ICON(ICON_BLANK746) +DEF_ICON(ICON_BLANK747) +DEF_ICON(ICON_BLANK748) +DEF_ICON(ICON_BLANK749) +DEF_ICON(ICON_BLANK750) +DEF_ICON(ICON_BLANK751) +DEF_ICON(ICON_BLANK752) +DEF_ICON(ICON_BLANK753) +DEF_ICON(ICON_BLANK754) +DEF_ICON(ICON_BLANK755) + + /* EMPTY */ +DEF_ICON(ICON_BLANK760) +DEF_ICON(ICON_BLANK761) +DEF_ICON(ICON_BLANK762) +DEF_ICON(ICON_BLANK763) +DEF_ICON(ICON_BLANK764) +DEF_ICON(ICON_BLANK765) +DEF_ICON(ICON_BLANK766) +DEF_ICON(ICON_BLANK767) +DEF_ICON(ICON_BLANK768) +DEF_ICON(ICON_BLANK769) +DEF_ICON(ICON_BLANK770) +DEF_ICON(ICON_BLANK771) +DEF_ICON(ICON_BLANK772) +DEF_ICON(ICON_BLANK773) +DEF_ICON(ICON_BLANK774) +DEF_ICON(ICON_BLANK775) +DEF_ICON(ICON_BLANK776) +DEF_ICON(ICON_BLANK777) +DEF_ICON(ICON_BLANK778) +DEF_ICON(ICON_BLANK779) +DEF_ICON(ICON_BLANK780) +DEF_ICON(ICON_BLANK781) +DEF_ICON(ICON_BLANK782) +DEF_ICON(ICON_BLANK783) +DEF_ICON(ICON_BLANK784) +DEF_ICON(ICON_BLANK785) + + /* MODIFIERS */ +DEF_ICON(ICON_MODIFIER) +DEF_ICON(ICON_MOD_WAVE) +DEF_ICON(ICON_MOD_BUILD) +DEF_ICON(ICON_MOD_DECIM) +DEF_ICON(ICON_MOD_MIRROR) +DEF_ICON(ICON_MOD_SOFT) +DEF_ICON(ICON_MOD_SUBSURF) +DEF_ICON(ICON_HOOK) +DEF_ICON(ICON_MOD_PHYSICS) +DEF_ICON(ICON_MOD_PARTICLES) +DEF_ICON(ICON_MOD_BOOLEAN) +DEF_ICON(ICON_MOD_EDGESPLIT) +DEF_ICON(ICON_MOD_ARRAY) +DEF_ICON(ICON_MOD_UVPROJECT) +DEF_ICON(ICON_MOD_DISPLACE) +DEF_ICON(ICON_MOD_CURVE) +DEF_ICON(ICON_MOD_LATTICE) +DEF_ICON(ICON_BLANK143) +DEF_ICON(ICON_MOD_ARMATURE) +DEF_ICON(ICON_MOD_SHRINKWRAP) +DEF_ICON(ICON_MOD_CAST) +DEF_ICON(ICON_MOD_MESHDEFORM) +DEF_ICON(ICON_MOD_BEVEL) +DEF_ICON(ICON_MOD_SMOOTH) +DEF_ICON(ICON_MOD_SIMPLEDEFORM) +DEF_ICON(ICON_MOD_MASK) + + /* MODIFIERS */ +DEF_ICON(ICON_MOD_CLOTH) +DEF_ICON(ICON_MOD_EXPLODE) +DEF_ICON(ICON_MOD_FLUIDSIM) +DEF_ICON(ICON_MOD_MULTIRES) +DEF_ICON(ICON_BLANK157) +DEF_ICON(ICON_BLANK158) +DEF_ICON(ICON_BLANK159) +DEF_ICON(ICON_BLANK160) +DEF_ICON(ICON_BLANK161) +DEF_ICON(ICON_BLANK162) +DEF_ICON(ICON_BLANK163) +DEF_ICON(ICON_BLANK164) +DEF_ICON(ICON_BLANK165) +DEF_ICON(ICON_BLANK166) +DEF_ICON(ICON_BLANK167) +DEF_ICON(ICON_BLANK168) +DEF_ICON(ICON_BLANK169) +DEF_ICON(ICON_BLANK170) +DEF_ICON(ICON_BLANK171) +DEF_ICON(ICON_BLANK172) +DEF_ICON(ICON_BLANK173) +DEF_ICON(ICON_BLANK174) +DEF_ICON(ICON_BLANK175) +DEF_ICON(ICON_BLANK176) +DEF_ICON(ICON_BLANK177) +DEF_ICON(ICON_BLANK177b) + + /* ANIMATION */ +DEF_ICON(ICON_REC) +DEF_ICON(ICON_PLAY) +DEF_ICON(ICON_FF) +DEF_ICON(ICON_REW) +DEF_ICON(ICON_PAUSE) +DEF_ICON(ICON_PREV_KEYFRAME) +DEF_ICON(ICON_NEXT_KEYFRAME) +DEF_ICON(ICON_PLAY_AUDIO) +DEF_ICON(ICON_BLANK178) +DEF_ICON(ICON_BLANK179) +DEF_ICON(ICON_BLANK180) +DEF_ICON(ICON_PMARKER_ACT) +DEF_ICON(ICON_PMARKER_SEL) +DEF_ICON(ICON_PMARKER) +DEF_ICON(ICON_MARKER_HLT) +DEF_ICON(ICON_MARKER) +DEF_ICON(ICON_SPACE2) // XXX +DEF_ICON(ICON_SPACE3) // XXX +DEF_ICON(ICON_BLANK181) +DEF_ICON(ICON_KEY_DEHLT) +DEF_ICON(ICON_KEY_HLT) +DEF_ICON(ICON_MUTE_IPO_OFF) +DEF_ICON(ICON_MUTE_IPO_ON) +DEF_ICON(ICON_BLANK182) +DEF_ICON(ICON_BLANK183) +DEF_ICON(ICON_BLANK183b) + + /* available */ +DEF_ICON(ICON_BLANK184) +DEF_ICON(ICON_BLANK185) +DEF_ICON(ICON_BLANK186) +DEF_ICON(ICON_BLANK187) +DEF_ICON(ICON_BLANK188) +DEF_ICON(ICON_BLANK189) +DEF_ICON(ICON_BLANK190) +DEF_ICON(ICON_BLANK191) +DEF_ICON(ICON_BLANK192) +DEF_ICON(ICON_BLANK193) +DEF_ICON(ICON_BLANK194) +DEF_ICON(ICON_BLANK195) +DEF_ICON(ICON_BLANK196) +DEF_ICON(ICON_BLANK197) +DEF_ICON(ICON_BLANK198) +DEF_ICON(ICON_BLANK199) +DEF_ICON(ICON_BLANK200) +DEF_ICON(ICON_BLANK201) +DEF_ICON(ICON_BLANK202) +DEF_ICON(ICON_BLANK203) +DEF_ICON(ICON_BLANK204) +DEF_ICON(ICON_BLANK205) +DEF_ICON(ICON_BLANK206) +DEF_ICON(ICON_BLANK207) +DEF_ICON(ICON_BLANK208) +DEF_ICON(ICON_BLANK208b) + + /* EDITING */ +DEF_ICON(ICON_VERTEXSEL) +DEF_ICON(ICON_EDGESEL) +DEF_ICON(ICON_FACESEL) +DEF_ICON(ICON_LINKEDSEL) +DEF_ICON(ICON_BLANK210) +DEF_ICON(ICON_ROTATE) +DEF_ICON(ICON_CURSOR) +DEF_ICON(ICON_ROTATECOLLECTION) +DEF_ICON(ICON_ROTATECENTER) +DEF_ICON(ICON_ROTACTIVE) +DEF_ICON(ICON_ALIGN) +DEF_ICON(ICON_BLANK211) +DEF_ICON(ICON_SMOOTHCURVE) +DEF_ICON(ICON_SPHERECURVE) +DEF_ICON(ICON_ROOTCURVE) +DEF_ICON(ICON_SHARPCURVE) +DEF_ICON(ICON_LINCURVE) +DEF_ICON(ICON_NOCURVE) +DEF_ICON(ICON_RNDCURVE) +DEF_ICON(ICON_PROP_OFF) +DEF_ICON(ICON_PROP_ON) +DEF_ICON(ICON_PROP_CON) +DEF_ICON(ICON_BLANK212) +DEF_ICON(ICON_BLANK213) +DEF_ICON(ICON_BLANK214) +DEF_ICON(ICON_BLANK214b) + + /* EDITING */ +DEF_ICON(ICON_MAN_TRANS) +DEF_ICON(ICON_MAN_ROT) +DEF_ICON(ICON_MAN_SCALE) +DEF_ICON(ICON_MANIPUL) +DEF_ICON(ICON_BLANK215) +DEF_ICON(ICON_SNAP_GEAR) +DEF_ICON(ICON_SNAP_GEO) +DEF_ICON(ICON_SNAP_NORMAL) +DEF_ICON(ICON_SNAP_VERTEX) +DEF_ICON(ICON_SNAP_EDGE) +DEF_ICON(ICON_SNAP_FACE) +DEF_ICON(ICON_SNAP_VOLUME) +DEF_ICON(ICON_STICKY_UVS_LOC) +DEF_ICON(ICON_STICKY_UVS_DISABLE) +DEF_ICON(ICON_STICKY_UVS_VERT) +DEF_ICON(ICON_CLIPUV_DEHLT) +DEF_ICON(ICON_CLIPUV_HLT) +DEF_ICON(ICON_BLANK219) +DEF_ICON(ICON_SNAP_PEEL_OBJECT) +DEF_ICON(ICON_BLANK221) +DEF_ICON(ICON_GRID) +DEF_ICON(ICON_GEARS) +DEF_ICON(ICON_BLANK224) +DEF_ICON(ICON_BLANK225) +DEF_ICON(ICON_BLANK226) +DEF_ICON(ICON_BLANK226b) + + /* EDITING */ +DEF_ICON(ICON_PASTEDOWN) +DEF_ICON(ICON_COPYDOWN) +DEF_ICON(ICON_PASTEFLIPUP) +DEF_ICON(ICON_PASTEFLIPDOWN) +DEF_ICON(ICON_BLANK227) +DEF_ICON(ICON_BLANK228) +DEF_ICON(ICON_BLANK229) +DEF_ICON(ICON_BLANK230) +DEF_ICON(ICON_BLANK231) +DEF_ICON(ICON_BLANK232) +DEF_ICON(ICON_BLANK233) +DEF_ICON(ICON_BLANK234) +DEF_ICON(ICON_BLANK235) +DEF_ICON(ICON_BLANK236) +DEF_ICON(ICON_BLANK237) +DEF_ICON(ICON_BLANK238) +DEF_ICON(ICON_BLANK239) +DEF_ICON(ICON_BLANK240) +DEF_ICON(ICON_BLANK241) +DEF_ICON(ICON_BLANK242) +DEF_ICON(ICON_BLANK243) +DEF_ICON(ICON_BLANK244) +DEF_ICON(ICON_BLANK245) +DEF_ICON(ICON_BLANK246) +DEF_ICON(ICON_BLANK247) +DEF_ICON(ICON_BLANK247b) + + /* 3D VIEW */ +DEF_ICON(ICON_BBOX) +DEF_ICON(ICON_WIRE) +DEF_ICON(ICON_SOLID) +DEF_ICON(ICON_SMOOTH) +DEF_ICON(ICON_POTATO) +DEF_ICON(ICON_BLANK248) +DEF_ICON(ICON_ORTHO) +DEF_ICON(ICON_BLANK249) +DEF_ICON(ICON_CAMERA) +DEF_ICON(ICON_LOCKVIEW_OFF) +DEF_ICON(ICON_LOCKVIEW_ON) +DEF_ICON(ICON_BLANK250) +DEF_ICON(ICON_AXIS_SIDE) +DEF_ICON(ICON_AXIS_FRONT) +DEF_ICON(ICON_AXIS_TOP) +DEF_ICON(ICON_NDOF_DOM) +DEF_ICON(ICON_NDOF_TURN) +DEF_ICON(ICON_NDOF_FLY) +DEF_ICON(ICON_NDOF_TRANS) +DEF_ICON(ICON_LAYER_USED) +DEF_ICON(ICON_LAYER_ACTIVE) +DEF_ICON(ICON_BLANK254) +DEF_ICON(ICON_BLANK255) +DEF_ICON(ICON_BLANK256) +DEF_ICON(ICON_BLANK257) +DEF_ICON(ICON_BLANK257b) + + /* available */ +DEF_ICON(ICON_BLANK258) +DEF_ICON(ICON_BLANK259) +DEF_ICON(ICON_BLANK260) +DEF_ICON(ICON_BLANK261) +DEF_ICON(ICON_BLANK262) +DEF_ICON(ICON_BLANK263) +DEF_ICON(ICON_BLANK264) +DEF_ICON(ICON_BLANK265) +DEF_ICON(ICON_BLANK266) +DEF_ICON(ICON_BLANK267) +DEF_ICON(ICON_BLANK268) +DEF_ICON(ICON_BLANK269) +DEF_ICON(ICON_BLANK270) +DEF_ICON(ICON_BLANK271) +DEF_ICON(ICON_BLANK272) +DEF_ICON(ICON_BLANK273) +DEF_ICON(ICON_BLANK274) +DEF_ICON(ICON_BLANK275) +DEF_ICON(ICON_BLANK276) +DEF_ICON(ICON_BLANK277) +DEF_ICON(ICON_BLANK278) +DEF_ICON(ICON_BLANK279) +DEF_ICON(ICON_BLANK280) +DEF_ICON(ICON_BLANK281) +DEF_ICON(ICON_BLANK282) +DEF_ICON(ICON_BLANK282b) + + /* FILE SELECT */ +DEF_ICON(ICON_SORTALPHA) +DEF_ICON(ICON_SORTBYEXT) +DEF_ICON(ICON_SORTTIME) +DEF_ICON(ICON_SORTSIZE) +DEF_ICON(ICON_LONGDISPLAY) +DEF_ICON(ICON_SHORTDISPLAY) +DEF_ICON(ICON_GHOST) +DEF_ICON(ICON_IMGDISPLAY) +DEF_ICON(ICON_BLANK284) +DEF_ICON(ICON_BLANK285) +DEF_ICON(ICON_BOOKMARKS) +DEF_ICON(ICON_FONTPREVIEW) +DEF_ICON(ICON_FILTER) +DEF_ICON(ICON_NEWFOLDER) +DEF_ICON(ICON_BLANK285F) +DEF_ICON(ICON_FILE_PARENT) +DEF_ICON(ICON_FILE_REFRESH) +DEF_ICON(ICON_FILE_FOLDER) +DEF_ICON(ICON_FILE_BLANK) +DEF_ICON(ICON_FILE_BLEND) +DEF_ICON(ICON_FILE_IMAGE) +DEF_ICON(ICON_FILE_MOVIE) +DEF_ICON(ICON_FILE_SCRIPT) +DEF_ICON(ICON_FILE_SOUND) +DEF_ICON(ICON_FILE_FONT) +DEF_ICON(ICON_BLANK291b) + + /* available */ +DEF_ICON(ICON_BLANK292) +DEF_ICON(ICON_BLANK293) +DEF_ICON(ICON_BLANK294) +DEF_ICON(ICON_BLANK295) +DEF_ICON(ICON_BLANK296) +DEF_ICON(ICON_BLANK297) +DEF_ICON(ICON_BLANK298) +DEF_ICON(ICON_BLANK299) +DEF_ICON(ICON_BLANK300) +DEF_ICON(ICON_BLANK301) +DEF_ICON(ICON_BLANK302) +DEF_ICON(ICON_BLANK303) +DEF_ICON(ICON_BLANK304) +DEF_ICON(ICON_BLANK305) +DEF_ICON(ICON_BLANK306) +DEF_ICON(ICON_BLANK307) +DEF_ICON(ICON_BLANK308) +DEF_ICON(ICON_BLANK309) +DEF_ICON(ICON_BLANK310) +DEF_ICON(ICON_BLANK311) +DEF_ICON(ICON_BLANK312) +DEF_ICON(ICON_BLANK313) +DEF_ICON(ICON_BLANK314) +DEF_ICON(ICON_BLANK315) +DEF_ICON(ICON_BLANK316) +DEF_ICON(ICON_DISK_DRIVE) + + /* SHADING / TEXT */ +DEF_ICON(ICON_MATPLANE) +DEF_ICON(ICON_MATSPHERE) +DEF_ICON(ICON_MATCUBE) +DEF_ICON(ICON_MONKEY) +DEF_ICON(ICON_HAIR) +DEF_ICON(ICON_RING) +DEF_ICON(ICON_BLANK317) +DEF_ICON(ICON_BLANK318) +DEF_ICON(ICON_BLANK319) +DEF_ICON(ICON_BLANK320) +DEF_ICON(ICON_BLANK321) +DEF_ICON(ICON_BLANK322) +DEF_ICON(ICON_WORDWRAP_OFF) +DEF_ICON(ICON_WORDWRAP_ON) +DEF_ICON(ICON_SYNTAX_OFF) +DEF_ICON(ICON_SYNTAX_ON) +DEF_ICON(ICON_LINENUMBERS_OFF) +DEF_ICON(ICON_LINENUMBERS_ON) +DEF_ICON(ICON_SCRIPTPLUGINS) // XXX CREATE NEW +DEF_ICON(ICON_BLANK323) +DEF_ICON(ICON_BLANK324) +DEF_ICON(ICON_BLANK325) +DEF_ICON(ICON_BLANK326) +DEF_ICON(ICON_BLANK327) +DEF_ICON(ICON_BLANK328) +DEF_ICON(ICON_BLANK328b) + + /* SEQUENCE / IMAGE EDITOR */ +DEF_ICON(ICON_SEQ_SEQUENCER) +DEF_ICON(ICON_SEQ_PREVIEW) +DEF_ICON(ICON_SEQ_LUMA_WAVEFORM) +DEF_ICON(ICON_SEQ_CHROMA_SCOPE) +DEF_ICON(ICON_SEQ_HISTOGRAM) +DEF_ICON(ICON_BLANK330) +DEF_ICON(ICON_BLANK331) +DEF_ICON(ICON_BLANK332) +DEF_ICON(ICON_BLANK333) +DEF_ICON(ICON_IMAGE_RGB) // XXX CHANGE TO STRAIGHT ALPHA, Z ETC +DEF_ICON(ICON_IMAGE_RGB_ALPHA) +DEF_ICON(ICON_IMAGE_ALPHA) +DEF_ICON(ICON_IMAGE_ZDEPTH) +DEF_ICON(ICON_IMAGEFILE) +DEF_ICON(ICON_BLANK336) +DEF_ICON(ICON_BLANK337) +DEF_ICON(ICON_BLANK338) +DEF_ICON(ICON_BLANK339) +DEF_ICON(ICON_BLANK340) +DEF_ICON(ICON_BLANK341) +DEF_ICON(ICON_BLANK342) +DEF_ICON(ICON_BLANK343) +DEF_ICON(ICON_BLANK344) +DEF_ICON(ICON_BLANK345) +DEF_ICON(ICON_BLANK346) +DEF_ICON(ICON_BLANK346b) + + /* vector icons */ + +DEF_ICON(VICON_VIEW3D) +DEF_ICON(VICON_EDIT) +DEF_ICON(VICON_EDITMODE_DEHLT) +DEF_ICON(VICON_EDITMODE_HLT) +DEF_ICON(VICON_DISCLOSURE_TRI_RIGHT) +DEF_ICON(VICON_DISCLOSURE_TRI_DOWN) +DEF_ICON(VICON_MOVE_UP) +DEF_ICON(VICON_MOVE_DOWN) +DEF_ICON(VICON_X) diff --git a/source/blender/editors/include/UI_resources.h b/source/blender/editors/include/UI_resources.h index 6fa0eb90c5f..7168e593a8a 100644 --- a/source/blender/editors/include/UI_resources.h +++ b/source/blender/editors/include/UI_resources.h @@ -35,864 +35,16 @@ /* elubie: TODO: move the typedef for icons to UI_interface_icons.h */ /* and add/replace include of UI_resources.h by UI_interface_icons.h */ +#define DEF_ICON(name) name, typedef enum { #define BIFICONID_FIRST (ICON_BLENDER) /* ui */ - ICON_BLENDER, - ICON_QUESTION, - ICON_ERROR, - ICON_BLANK1, // XXX this is used lots, it's not actually 'blank' - ICON_TRIA_RIGHT, - ICON_TRIA_DOWN, - ICON_TRIA_LEFT, - ICON_TRIA_UP, - ICON_ARROW_LEFTRIGHT, - ICON_PLUS, - ICON_DISCLOSURE_TRI_DOWN, - ICON_DISCLOSURE_TRI_RIGHT, - ICON_RADIOBUT_OFF, - ICON_RADIOBUT_ON, - ICON_MENU_PANEL, - ICON_PYTHON, - ICON_BLANK003, - ICON_DOT, - ICON_BLANK004, - ICON_X, - ICON_BLANK005, - ICON_GO_LEFT, - ICON_BLANK006, - ICON_BLANK007, - ICON_BLANK008, - ICON_BLANK008b, - - /* ui */ - ICON_FULLSCREEN, - ICON_SPLITSCREEN, - ICON_RIGHTARROW_THIN, - ICON_BORDERMOVE, - ICON_VIEWZOOM, - ICON_ZOOMIN, - ICON_ZOOMOUT, - ICON_PANEL_CLOSE, - ICON_BLANK009, - ICON_EYEDROPPER, - ICON_BLANK010, - ICON_AUTO, - ICON_CHECKBOX_DEHLT, - ICON_CHECKBOX_HLT, - ICON_UNLOCKED, - ICON_LOCKED, - ICON_PINNED, - ICON_UNPINNED, - ICON_BLANK015, - ICON_RIGHTARROW, - ICON_DOWNARROW_HLT, - ICON_DOTSUP, - ICON_DOTSDOWN, - ICON_LINK, - ICON_INLINK, - ICON_BLANK012b, - - /* various ui */ - ICON_HELP, - ICON_GHOSTDRAW, - ICON_COLOR, - ICON_LINKED, - ICON_UNLINKED, - ICON_HAND, - ICON_ZOOM_ALL, - ICON_ZOOM_SELECTED, - ICON_ZOOM_PREVIOUS, - ICON_ZOOM_IN, - ICON_ZOOM_OUT, - ICON_RENDER_REGION, - ICON_BORDER_RECT, - ICON_BORDER_LASSO, - ICON_FREEZE, - ICON_BLANK031, - ICON_BLANK032, - ICON_BLANK033, - ICON_BLANK034, - ICON_BLANK035, - ICON_BLANK036, - ICON_BLANK037, - ICON_BLANK038, - ICON_BLANK039, - ICON_BLANK040, - ICON_BLANK040b, - - /* BUTTONS */ - ICON_LAMP, - ICON_MATERIAL, - ICON_TEXTURE, - ICON_ANIM, - ICON_WORLD, - ICON_SCENE, - ICON_EDIT, - ICON_GAME, - ICON_RADIO, - ICON_SCRIPT, - ICON_PARTICLES, - ICON_PHYSICS, - ICON_SPEAKER, - ICON_BLANK041, - ICON_BLANK042, - ICON_BLANK043, - ICON_BLANK044, - ICON_BLANK045, - ICON_BLANK046, - ICON_BLANK047, - ICON_BLANK048, - ICON_BLANK049, - ICON_BLANK050, - ICON_BLANK051, - ICON_BLANK052, - ICON_BLANK052b, - - /* EDITORS */ - ICON_VIEW3D, - ICON_IPO, - ICON_OOPS, - ICON_BUTS, - ICON_FILESEL, - ICON_IMAGE_COL, - ICON_INFO, - ICON_SEQUENCE, - ICON_TEXT, - ICON_IMASEL, - ICON_SOUND, - ICON_ACTION, - ICON_NLA, - ICON_SCRIPTWIN, - ICON_TIME, - ICON_NODE, - ICON_BLANK053, - ICON_BLANK054, - ICON_BLANK055, - ICON_BLANK056, - ICON_BLANK057, - ICON_BLANK058, - ICON_BLANK059, - ICON_BLANK060, - ICON_BLANK061, - ICON_BLANK061b, - - /* MODES */ - ICON_OBJECT_DATAMODE, // XXX fix this up - ICON_EDITMODE_HLT, - ICON_FACESEL_HLT, - ICON_VPAINT_HLT, - ICON_TPAINT_HLT, - ICON_WPAINT_HLT, - ICON_SCULPTMODE_HLT, - ICON_POSE_HLT, - ICON_PARTICLEMODE, - ICON_BLANK062, - ICON_BLANK063, - ICON_BLANK064, - ICON_BLANK065, - ICON_BLANK066, - ICON_BLANK067, - ICON_BLANK068, - ICON_BLANK069, - ICON_BLANK070, - ICON_BLANK071, - ICON_BLANK072, - ICON_BLANK073, - ICON_BLANK074, - ICON_BLANK075, - ICON_BLANK076, - ICON_BLANK077, - ICON_BLANK077b, - - /* DATA */ - ICON_SCENE_DATA, - ICON_RENDERLAYERS, - ICON_WORLD_DATA, - ICON_OBJECT_DATA, - ICON_MESH_DATA, - ICON_CURVE_DATA, - ICON_META_DATA, - ICON_LATTICE_DATA, - ICON_LAMP_DATA, - ICON_MATERIAL_DATA, - ICON_TEXTURE_DATA, - ICON_ANIM_DATA, - ICON_CAMERA_DATA, - ICON_PARTICLE_DATA, - ICON_LIBRARY_DATA_DIRECT, - ICON_GROUP, - ICON_ARMATURE_DATA, - ICON_POSE_DATA, - ICON_BONE_DATA, - ICON_CONSTRAINT, - ICON_SHAPEKEY_DATA, - ICON_BLANK079a, - ICON_BLANK079, - ICON_PACKAGE, - ICON_UGLYPACKAGE, - ICON_BLANK079b, - - /* DATA */ - ICON_BRUSH_DATA, - ICON_IMAGE_DATA, - ICON_FILE, - ICON_FCURVE, - ICON_FONT_DATA, - ICON_RENDER_RESULT, - ICON_SURFACE_DATA, - ICON_EMPTY_DATA, - ICON_SETTINGS, - ICON_BLANK080D, - ICON_BLANK080E, - ICON_BLANK080F, - ICON_BLANK080, - ICON_STRANDS, - ICON_LIBRARY_DATA_INDIRECT, - ICON_BLANK082, - ICON_BLANK083, - ICON_BLANK084, - ICON_GROUP_BONE, - ICON_GROUP_VERTEX, - ICON_GROUP_VCOL, - ICON_GROUP_UVS, - ICON_BLANK089, - ICON_BLANK090, - ICON_RNA, - ICON_BLANK090b, - - /* available */ - ICON_BLANK092, - ICON_BLANK093, - ICON_BLANK094, - ICON_BLANK095, - ICON_BLANK096, - ICON_BLANK097, - ICON_BLANK098, - ICON_BLANK099, - ICON_BLANK100, - ICON_BLANK101, - ICON_BLANK102, - ICON_BLANK103, - ICON_BLANK104, - ICON_BLANK105, - ICON_BLANK106, - ICON_BLANK107, - ICON_BLANK108, - ICON_BLANK109, - ICON_BLANK110, - ICON_BLANK111, - ICON_BLANK112, - ICON_BLANK113, - ICON_BLANK114, - ICON_BLANK115, - ICON_BLANK116, - ICON_BLANK116b, - - /* OUTLINER */ - ICON_OUTLINER_OB_EMPTY, - ICON_OUTLINER_OB_MESH, - ICON_OUTLINER_OB_CURVE, - ICON_OUTLINER_OB_LATTICE, - ICON_OUTLINER_OB_META, - ICON_OUTLINER_OB_LAMP, - ICON_OUTLINER_OB_CAMERA, - ICON_OUTLINER_OB_ARMATURE, - ICON_OUTLINER_OB_FONT, - ICON_OUTLINER_OB_SURFACE, - ICON_BLANK119, - ICON_BLANK120, - ICON_BLANK121, - ICON_BLANK122, - ICON_BLANK123, - ICON_BLANK124, - ICON_BLANK125, - ICON_BLANK126, - ICON_BLANK127, - ICON_RESTRICT_VIEW_OFF, - ICON_RESTRICT_VIEW_ON, - ICON_RESTRICT_SELECT_OFF, - ICON_RESTRICT_SELECT_ON, - ICON_RESTRICT_RENDER_OFF, - ICON_RESTRICT_RENDER_ON, - ICON_BLANK127b, - - /* OUTLINER */ - ICON_OUTLINER_DATA_EMPTY, - ICON_OUTLINER_DATA_MESH, - ICON_OUTLINER_DATA_CURVE, - ICON_OUTLINER_DATA_LATTICE, - ICON_OUTLINER_DATA_META, - ICON_OUTLINER_DATA_LAMP, - ICON_OUTLINER_DATA_CAMERA, - ICON_OUTLINER_DATA_ARMATURE, - ICON_OUTLINER_DATA_FONT, - ICON_OUTLINER_DATA_SURFACE, - ICON_OUTLINER_DATA_POSE, - ICON_BLANK129, - ICON_BLANK130, - ICON_BLANK131, - ICON_BLANK132, - ICON_BLANK133, - ICON_BLANK134, - ICON_BLANK135, - ICON_BLANK136, - ICON_BLANK137, - ICON_BLANK138, - ICON_BLANK139, - ICON_BLANK140, - ICON_BLANK141, - ICON_BLANK142, - ICON_BLANK142b, - - /* PRIMITIVES */ - ICON_MESH_PLANE, - ICON_MESH_CUBE, - ICON_MESH_CIRCLE, - ICON_MESH_UVSPHERE, - ICON_MESH_ICOSPHERE, - ICON_MESH_GRID, - ICON_MESH_MONKEY, - ICON_MESH_TUBE, - ICON_MESH_DONUT, - ICON_MESH_CONE, - ICON_BLANK610, - ICON_BLANK611, - ICON_LAMP_POINT, - ICON_LAMP_SUN, - ICON_LAMP_SPOT, - ICON_LAMP_HEMI, - ICON_LAMP_AREA, - ICON_BLANK617, - ICON_BLANK618, - ICON_BLANK619, - ICON_META_PLANE, - ICON_META_CUBE, - ICON_META_BALL, - ICON_META_ELLIPSOID, - ICON_META_TUBE, - ICON_BLANK625, - - /* PRIMITIVES */ - ICON_SURFACE_NCURVE, - ICON_SURFACE_NCIRCLE, - ICON_SURFACE_NSURFACE, - ICON_SURFACE_NTUBE, - ICON_SURFACE_NSPHERE, - ICON_SURFACE_NDONUT, - ICON_BLANK636, - ICON_BLANK637, - ICON_BLANK638, - ICON_CURVE_BEZCURVE, - ICON_CURVE_BEZCIRCLE, - ICON_CURVE_NCURVE, - ICON_CURVE_NCIRCLE, - ICON_CURVE_PATH, - ICON_BLANK644, - ICON_BLANK645, - ICON_BLANK646, - ICON_BLANK647, - ICON_BLANK648, - ICON_BLANK649, - ICON_BLANK650, - ICON_BLANK651, - ICON_BLANK652, - ICON_BLANK653, - ICON_BLANK654, - ICON_BLANK655, - - /* EMPTY */ - ICON_BLANK660, - ICON_BLANK661, - ICON_BLANK662, - ICON_BLANK663, - ICON_BLANK664, - ICON_BLANK665, - ICON_BLANK666, - ICON_BLANK667, - ICON_BLANK668, - ICON_BLANK669, - ICON_BLANK670, - ICON_BLANK671, - ICON_BLANK672, - ICON_BLANK673, - ICON_BLANK674, - ICON_BLANK675, - ICON_BLANK676, - ICON_BLANK677, - ICON_BLANK678, - ICON_BLANK679, - ICON_BLANK680, - ICON_BLANK681, - ICON_BLANK682, - ICON_BLANK683, - ICON_BLANK684, - ICON_BLANK685, - - /* EMPTY */ - ICON_BLANK690, - ICON_BLANK691, - ICON_BLANK692, - ICON_BLANK693, - ICON_BLANK694, - ICON_BLANK695, - ICON_BLANK696, - ICON_BLANK697, - ICON_BLANK698, - ICON_BLANK699, - ICON_BLANK700, - ICON_BLANK701, - ICON_BLANK702, - ICON_BLANK703, - ICON_BLANK704, - ICON_BLANK705, - ICON_BLANK706, - ICON_BLANK707, - ICON_BLANK708, - ICON_BLANK709, - ICON_BLANK710, - ICON_BLANK711, - ICON_BLANK712, - ICON_BLANK713, - ICON_BLANK714, - ICON_BLANK715, - - /* EMPTY */ - ICON_BLANK720, - ICON_BLANK721, - ICON_BLANK722, - ICON_BLANK733, - ICON_BLANK734, - ICON_BLANK735, - ICON_BLANK736, - ICON_BLANK737, - ICON_BLANK738, - ICON_BLANK739, - ICON_BLANK740, - ICON_BLANK741, - ICON_BLANK742, - ICON_BLANK743, - ICON_BLANK744, - ICON_BLANK745, - ICON_BLANK746, - ICON_BLANK747, - ICON_BLANK748, - ICON_BLANK749, - ICON_BLANK750, - ICON_BLANK751, - ICON_BLANK752, - ICON_BLANK753, - ICON_BLANK754, - ICON_BLANK755, - - /* EMPTY */ - ICON_BLANK760, - ICON_BLANK761, - ICON_BLANK762, - ICON_BLANK763, - ICON_BLANK764, - ICON_BLANK765, - ICON_BLANK766, - ICON_BLANK767, - ICON_BLANK768, - ICON_BLANK769, - ICON_BLANK770, - ICON_BLANK771, - ICON_BLANK772, - ICON_BLANK773, - ICON_BLANK774, - ICON_BLANK775, - ICON_BLANK776, - ICON_BLANK777, - ICON_BLANK778, - ICON_BLANK779, - ICON_BLANK780, - ICON_BLANK781, - ICON_BLANK782, - ICON_BLANK783, - ICON_BLANK784, - ICON_BLANK785, - - /* MODIFIERS */ - ICON_MODIFIER, - ICON_MOD_WAVE, - ICON_MOD_BUILD, - ICON_MOD_DECIM, - ICON_MOD_MIRROR, - ICON_MOD_SOFT, - ICON_MOD_SUBSURF, - ICON_HOOK, - ICON_MOD_PHYSICS, - ICON_MOD_PARTICLES, - ICON_MOD_BOOLEAN, - ICON_MOD_EDGESPLIT, - ICON_MOD_ARRAY, - ICON_MOD_UVPROJECT, - ICON_MOD_DISPLACE, - ICON_MOD_CURVE, - ICON_MOD_LATTICE, - ICON_BLANK143, - ICON_MOD_ARMATURE, - ICON_MOD_SHRINKWRAP, - ICON_MOD_CAST, - ICON_MOD_MESHDEFORM, - ICON_MOD_BEVEL, - ICON_MOD_SMOOTH, - ICON_MOD_SIMPLEDEFORM, - ICON_MOD_MASK, - - /* MODIFIERS */ - ICON_MOD_CLOTH, - ICON_MOD_EXPLODE, - ICON_MOD_FLUIDSIM, - ICON_MOD_MULTIRES, - ICON_BLANK157, - ICON_BLANK158, - ICON_BLANK159, - ICON_BLANK160, - ICON_BLANK161, - ICON_BLANK162, - ICON_BLANK163, - ICON_BLANK164, - ICON_BLANK165, - ICON_BLANK166, - ICON_BLANK167, - ICON_BLANK168, - ICON_BLANK169, - ICON_BLANK170, - ICON_BLANK171, - ICON_BLANK172, - ICON_BLANK173, - ICON_BLANK174, - ICON_BLANK175, - ICON_BLANK176, - ICON_BLANK177, - ICON_BLANK177b, - - /* ANIMATION */ - ICON_REC, - ICON_PLAY, - ICON_FF, - ICON_REW, - ICON_PAUSE, - ICON_PREV_KEYFRAME, - ICON_NEXT_KEYFRAME, - ICON_PLAY_AUDIO, - ICON_BLANK178, - ICON_BLANK179, - ICON_BLANK180, - ICON_PMARKER_ACT, - ICON_PMARKER_SEL, - ICON_PMARKER, - ICON_MARKER_HLT, - ICON_MARKER, - ICON_SPACE2, // XXX - ICON_SPACE3, // XXX - ICON_BLANK181, - ICON_KEY_DEHLT, - ICON_KEY_HLT, - ICON_MUTE_IPO_OFF, - ICON_MUTE_IPO_ON, - ICON_BLANK182, - ICON_BLANK183, - ICON_BLANK183b, - - /* available */ - ICON_BLANK184, - ICON_BLANK185, - ICON_BLANK186, - ICON_BLANK187, - ICON_BLANK188, - ICON_BLANK189, - ICON_BLANK190, - ICON_BLANK191, - ICON_BLANK192, - ICON_BLANK193, - ICON_BLANK194, - ICON_BLANK195, - ICON_BLANK196, - ICON_BLANK197, - ICON_BLANK198, - ICON_BLANK199, - ICON_BLANK200, - ICON_BLANK201, - ICON_BLANK202, - ICON_BLANK203, - ICON_BLANK204, - ICON_BLANK205, - ICON_BLANK206, - ICON_BLANK207, - ICON_BLANK208, - ICON_BLANK208b, - - /* EDITING */ - ICON_VERTEXSEL, - ICON_EDGESEL, - ICON_FACESEL, - ICON_LINKEDSEL, - ICON_BLANK210, - ICON_ROTATE, - ICON_CURSOR, - ICON_ROTATECOLLECTION, - ICON_ROTATECENTER, - ICON_ROTACTIVE, - ICON_ALIGN, - ICON_BLANK211, - ICON_SMOOTHCURVE, - ICON_SPHERECURVE, - ICON_ROOTCURVE, - ICON_SHARPCURVE, - ICON_LINCURVE, - ICON_NOCURVE, - ICON_RNDCURVE, - ICON_PROP_OFF, - ICON_PROP_ON, - ICON_PROP_CON, - ICON_BLANK212, - ICON_BLANK213, - ICON_BLANK214, - ICON_BLANK214b, - - /* EDITING */ - ICON_MAN_TRANS, - ICON_MAN_ROT, - ICON_MAN_SCALE, - ICON_MANIPUL, - ICON_BLANK215, - ICON_SNAP_GEAR, - ICON_SNAP_GEO, - ICON_SNAP_NORMAL, - ICON_SNAP_VERTEX, - ICON_SNAP_EDGE, - ICON_SNAP_FACE, - ICON_SNAP_VOLUME, - ICON_STICKY_UVS_LOC, - ICON_STICKY_UVS_DISABLE, - ICON_STICKY_UVS_VERT, - ICON_CLIPUV_DEHLT, - ICON_CLIPUV_HLT, - ICON_BLANK219, - ICON_SNAP_PEEL_OBJECT, - ICON_BLANK221, - ICON_GRID, - ICON_GEARS, - ICON_BLANK224, - ICON_BLANK225, - ICON_BLANK226, - ICON_BLANK226b, - - /* EDITING */ - ICON_PASTEDOWN, - ICON_COPYDOWN, - ICON_PASTEFLIPUP, - ICON_PASTEFLIPDOWN, - ICON_BLANK227, - ICON_BLANK228, - ICON_BLANK229, - ICON_BLANK230, - ICON_BLANK231, - ICON_BLANK232, - ICON_BLANK233, - ICON_BLANK234, - ICON_BLANK235, - ICON_BLANK236, - ICON_BLANK237, - ICON_BLANK238, - ICON_BLANK239, - ICON_BLANK240, - ICON_BLANK241, - ICON_BLANK242, - ICON_BLANK243, - ICON_BLANK244, - ICON_BLANK245, - ICON_BLANK246, - ICON_BLANK247, - ICON_BLANK247b, - - /* 3D VIEW */ - ICON_BBOX, - ICON_WIRE, - ICON_SOLID, - ICON_SMOOTH, - ICON_POTATO, - ICON_BLANK248, - ICON_ORTHO, - ICON_BLANK249, - ICON_CAMERA, - ICON_LOCKVIEW_OFF, - ICON_LOCKVIEW_ON, - ICON_BLANK250, - ICON_AXIS_SIDE, - ICON_AXIS_FRONT, - ICON_AXIS_TOP, - ICON_NDOF_DOM, - ICON_NDOF_TURN, - ICON_NDOF_FLY, - ICON_NDOF_TRANS, - ICON_LAYER_USED, - ICON_LAYER_ACTIVE, - ICON_BLANK254, - ICON_BLANK255, - ICON_BLANK256, - ICON_BLANK257, - ICON_BLANK257b, - - /* available */ - ICON_BLANK258, - ICON_BLANK259, - ICON_BLANK260, - ICON_BLANK261, - ICON_BLANK262, - ICON_BLANK263, - ICON_BLANK264, - ICON_BLANK265, - ICON_BLANK266, - ICON_BLANK267, - ICON_BLANK268, - ICON_BLANK269, - ICON_BLANK270, - ICON_BLANK271, - ICON_BLANK272, - ICON_BLANK273, - ICON_BLANK274, - ICON_BLANK275, - ICON_BLANK276, - ICON_BLANK277, - ICON_BLANK278, - ICON_BLANK279, - ICON_BLANK280, - ICON_BLANK281, - ICON_BLANK282, - ICON_BLANK282b, - - /* FILE SELECT */ - ICON_SORTALPHA, - ICON_SORTBYEXT, - ICON_SORTTIME, - ICON_SORTSIZE, - ICON_LONGDISPLAY, - ICON_SHORTDISPLAY, - ICON_GHOST, - ICON_IMGDISPLAY, - ICON_BLANK284, - ICON_BLANK285, - ICON_BOOKMARKS, - ICON_FONTPREVIEW, - ICON_FILTER, - ICON_NEWFOLDER, - ICON_BLANK285F, - ICON_FILE_PARENT, - ICON_FILE_REFRESH, - ICON_FILE_FOLDER, - ICON_FILE_BLANK, - ICON_FILE_BLEND, - ICON_FILE_IMAGE, - ICON_FILE_MOVIE, - ICON_FILE_SCRIPT, - ICON_FILE_SOUND, - ICON_FILE_FONT, - ICON_BLANK291b, - - /* available */ - ICON_BLANK292, - ICON_BLANK293, - ICON_BLANK294, - ICON_BLANK295, - ICON_BLANK296, - ICON_BLANK297, - ICON_BLANK298, - ICON_BLANK299, - ICON_BLANK300, - ICON_BLANK301, - ICON_BLANK302, - ICON_BLANK303, - ICON_BLANK304, - ICON_BLANK305, - ICON_BLANK306, - ICON_BLANK307, - ICON_BLANK308, - ICON_BLANK309, - ICON_BLANK310, - ICON_BLANK311, - ICON_BLANK312, - ICON_BLANK313, - ICON_BLANK314, - ICON_BLANK315, - ICON_BLANK316, - ICON_DISK_DRIVE, - - /* SHADING / TEXT */ - ICON_MATPLANE, - ICON_MATSPHERE, - ICON_MATCUBE, - ICON_MONKEY, - ICON_HAIR, - ICON_RING, - ICON_BLANK317, - ICON_BLANK318, - ICON_BLANK319, - ICON_BLANK320, - ICON_BLANK321, - ICON_BLANK322, - ICON_WORDWRAP_OFF, - ICON_WORDWRAP_ON, - ICON_SYNTAX_OFF, - ICON_SYNTAX_ON, - ICON_LINENUMBERS_OFF, - ICON_LINENUMBERS_ON, - ICON_SCRIPTPLUGINS, // XXX CREATE NEW - ICON_BLANK323, - ICON_BLANK324, - ICON_BLANK325, - ICON_BLANK326, - ICON_BLANK327, - ICON_BLANK328, - ICON_BLANK328b, - - /* SEQUENCE / IMAGE EDITOR */ - ICON_SEQ_SEQUENCER, - ICON_SEQ_PREVIEW, - ICON_SEQ_LUMA_WAVEFORM, - ICON_SEQ_CHROMA_SCOPE, - ICON_SEQ_HISTOGRAM, - ICON_BLANK330, - ICON_BLANK331, - ICON_BLANK332, - ICON_BLANK333, - ICON_IMAGE_RGB, // XXX CHANGE TO STRAIGHT ALPHA, Z ETC - ICON_IMAGE_RGB_ALPHA, - ICON_IMAGE_ALPHA, - ICON_IMAGE_ZDEPTH, - ICON_IMAGEFILE, - ICON_BLANK336, - ICON_BLANK337, - ICON_BLANK338, - ICON_BLANK339, - ICON_BLANK340, - ICON_BLANK341, - ICON_BLANK342, - ICON_BLANK343, - ICON_BLANK344, - ICON_BLANK345, - ICON_BLANK346, - ICON_BLANK346b, - - /* vector icons */ - - VICON_VIEW3D, - VICON_EDIT, - VICON_EDITMODE_DEHLT, - VICON_EDITMODE_HLT, - VICON_DISCLOSURE_TRI_RIGHT, - VICON_DISCLOSURE_TRI_DOWN, - VICON_MOVE_UP, - VICON_MOVE_DOWN, - VICON_X - -#define BIFICONID_LAST (VICON_X) +#include "UI_icons.h" + BIFICONID_LAST #define BIFNICONIDS (BIFICONID_LAST-BIFICONID_FIRST + 1) } BIFIconID; +#undef DEF_ICON typedef enum { diff --git a/source/blender/editors/interface/interface_api.c b/source/blender/editors/interface/interface_api.c index b4e7dc03506..7b2cdbe32dd 100644 --- a/source/blender/editors/interface/interface_api.c +++ b/source/blender/editors/interface/interface_api.c @@ -33,11 +33,24 @@ #include "RNA_types.h" #include "UI_interface.h" +#include "UI_resources.h" + +#define DEF_ICON(name) {name, #name, #name, ""}, +static EnumPropertyItem icon_items[] = { +#include "UI_icons.h" + {0, NULL, NULL, NULL}}; +#undef DEF_ICON static void api_ui_item_common(FunctionRNA *func) { + PropertyRNA *prop; + RNA_def_string(func, "text", "", 0, "", "Override automatic text of the item."); - RNA_def_int(func, "icon", 0, 0, INT_MAX, "", "Override automatic icon of the item.", 0, INT_MAX); + + prop= RNA_def_property(func, "icon", PROP_ENUM, PROP_NONE); + RNA_def_property_enum_items(prop, icon_items); + RNA_def_property_ui_text(prop, "Icon", "Override automatic icon of the item."); + } static void api_ui_item_op_common(FunctionRNA *func) diff --git a/source/blender/editors/interface/resources.c b/source/blender/editors/interface/resources.c index 1cb58c986d0..edf2f160285 100644 --- a/source/blender/editors/interface/resources.c +++ b/source/blender/editors/interface/resources.c @@ -75,7 +75,7 @@ static int theme_regionid= RGN_TYPE_WINDOW; void ui_resources_init(void) { - UI_icons_init(BIFICONID_LAST+1); + UI_icons_init(BIFICONID_LAST); } void ui_resources_free(void) |