2.5 UI

* RNA enum for icons to allow specifying icons as string
* example: row.itemR(st, "line_numbers", text="", icon='ICON_LINENUMBERS_OFF')

1 files changed, 4 insertions, 852 deletions

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 {