diff options
author | Andrea Weikert <elubie@gmx.net> | 2011-02-27 21:03:19 +0300 |
---|---|---|
committer | Andrea Weikert <elubie@gmx.net> | 2011-02-27 21:03:19 +0300 |
commit | 4ed5cd6cef341727f230ff2d50feb460773a055d (patch) | |
tree | aeae01ad3f237785a238ed46086271d678464b03 /source/blender/editors/space_graph/graph_buttons.c | |
parent | 7a4ca6a36dbcd48721f09801195075e2a01f1dcc (diff) |
== UI icons ==
* Change ICON_NULL --> ICON_NONE to avoid two #defines with the same meaning.
Diffstat (limited to 'source/blender/editors/space_graph/graph_buttons.c')
-rw-r--r-- | source/blender/editors/space_graph/graph_buttons.c | 56 |
1 files changed, 28 insertions, 28 deletions
diff --git a/source/blender/editors/space_graph/graph_buttons.c b/source/blender/editors/space_graph/graph_buttons.c index 8c97e269aa4..da8f6d70bfe 100644 --- a/source/blender/editors/space_graph/graph_buttons.c +++ b/source/blender/editors/space_graph/graph_buttons.c @@ -139,19 +139,19 @@ static void graph_panel_view(const bContext *C, Panel *pa) /* 2D-Cursor */ col= uiLayoutColumn(pa->layout, 0); - uiItemR(col, &spaceptr, "show_cursor", 0, NULL, ICON_NULL); + uiItemR(col, &spaceptr, "show_cursor", 0, NULL, ICON_NONE); subcol= uiLayoutColumn(col, 1); uiLayoutSetActive(subcol, RNA_boolean_get(&spaceptr, "show_cursor")); - uiItemO(subcol, "Cursor from Selection", ICON_NULL, "GRAPH_OT_frame_jump"); + uiItemO(subcol, "Cursor from Selection", ICON_NONE, "GRAPH_OT_frame_jump"); subcol= uiLayoutColumn(col, 1); uiLayoutSetActive(subcol, RNA_boolean_get(&spaceptr, "show_cursor")); row= uiLayoutSplit(subcol, 0.7, 1); - uiItemR(row, &sceneptr, "frame_current", 0, "Cursor X", ICON_NULL); + uiItemR(row, &sceneptr, "frame_current", 0, "Cursor X", ICON_NONE); uiItemEnumO(row, "GRAPH_OT_snap", "To Keys", 0, "type", GRAPHKEYS_SNAP_CFRA); row= uiLayoutSplit(subcol, 0.7, 1); - uiItemR(row, &spaceptr, "cursor_position_y", 0, "Cursor Y", ICON_NULL); + uiItemR(row, &spaceptr, "cursor_position_y", 0, "Cursor Y", ICON_NONE); uiItemEnumO(row, "GRAPH_OT_snap", "To Keys", 0, "type", GRAPHKEYS_SNAP_VALUE); } @@ -187,18 +187,18 @@ static void graph_panel_properties(const bContext *C, Panel *pa) col= uiLayoutColumn(layout, 1); uiLayoutSetEnabled(col, (fcu->flag & FCURVE_DISABLED)!=0); uiItemR(col, &fcu_ptr, "data_path", 0, "", ICON_RNA); - uiItemR(col, &fcu_ptr, "array_index", 0, NULL, ICON_NULL); + uiItemR(col, &fcu_ptr, "array_index", 0, NULL, ICON_NONE); /* color settings */ col= uiLayoutColumn(layout, 1); - uiItemL(col, "Display Color:", ICON_NULL); + uiItemL(col, "Display Color:", ICON_NONE); row= uiLayoutRow(col, 1); - uiItemR(row, &fcu_ptr, "color_mode", 0, "", ICON_NULL); + uiItemR(row, &fcu_ptr, "color_mode", 0, "", ICON_NONE); subrow= uiLayoutRow(row, 1); uiLayoutSetEnabled(subrow, (fcu->color_mode==FCURVE_COLOR_CUSTOM)); - uiItemR(subrow, &fcu_ptr, "color", 0, "", ICON_NULL); + uiItemR(subrow, &fcu_ptr, "color", 0, "", ICON_NONE); MEM_freeN(ale); } @@ -264,33 +264,33 @@ static void graph_panel_key_properties(const bContext *C, Panel *pa) /* interpolation */ col= uiLayoutColumn(layout, 0); - uiItemR(col, &bezt_ptr, "interpolation", 0, NULL, ICON_NULL); + uiItemR(col, &bezt_ptr, "interpolation", 0, NULL, ICON_NONE); /* numerical coordinate editing */ col= uiLayoutColumn(layout, 1); /* keyframe itself */ - uiItemR(col, &bezt_ptr, "co", 0, "Key", ICON_NULL); + uiItemR(col, &bezt_ptr, "co", 0, "Key", ICON_NONE); /* previous handle - only if previous was Bezier interpolation */ if ((prevbezt) && (prevbezt->ipo == BEZT_IPO_BEZ)) - uiItemR(col, &bezt_ptr, "handle_left", 0, NULL, ICON_NULL); + uiItemR(col, &bezt_ptr, "handle_left", 0, NULL, ICON_NONE); /* next handle - only if current is Bezier interpolation */ if (bezt->ipo == BEZT_IPO_BEZ) - uiItemR(col, &bezt_ptr, "handle_right", 0, NULL, ICON_NULL); + uiItemR(col, &bezt_ptr, "handle_right", 0, NULL, ICON_NONE); } else { if ((fcu->bezt == NULL) && (fcu->modifiers.first)) { /* modifiers only - so no keyframes to be active */ - uiItemL(layout, "F-Curve only has F-Modifiers", ICON_NULL); + uiItemL(layout, "F-Curve only has F-Modifiers", ICON_NONE); uiItemL(layout, "See Modifiers panel below", ICON_INFO); } else if (fcu->fpt) { /* samples only */ - uiItemL(layout, "F-Curve doesn't have any keyframes as it only contains sampled points", ICON_NULL); + uiItemL(layout, "F-Curve doesn't have any keyframes as it only contains sampled points", ICON_NONE); } else - uiItemL(layout, "No active keyframe on F-Curve", ICON_NULL); + uiItemL(layout, "No active keyframe on F-Curve", ICON_NONE); } MEM_freeN(ale); @@ -469,7 +469,7 @@ static void graph_panel_driverVar__locDiff(uiLayout *layout, ID *id, DriverVar * uiItemPointerR(col, &dtar_ptr, "bone_target", &tar_ptr, "bones", "", ICON_BONE_DATA); } - uiItemR(col, &dtar_ptr, "use_local_space_transform", 0, NULL, ICON_NULL); + uiItemR(col, &dtar_ptr, "use_local_space_transform", 0, NULL, ICON_NONE); col= uiLayoutColumn(layout, 1); uiTemplateAnyID(col, &dtar2_ptr, "id", "id_type", "Ob/Bone 2:"); @@ -481,7 +481,7 @@ static void graph_panel_driverVar__locDiff(uiLayout *layout, ID *id, DriverVar * uiItemPointerR(col, &dtar2_ptr, "bone_target", &tar_ptr, "bones", "", ICON_BONE_DATA); } - uiItemR(col, &dtar2_ptr, "use_local_space_transform", 0, NULL, ICON_NULL); + uiItemR(col, &dtar2_ptr, "use_local_space_transform", 0, NULL, ICON_NONE); } /* settings for 'transform channel' driver variable type */ @@ -507,8 +507,8 @@ static void graph_panel_driverVar__transChan(uiLayout *layout, ID *id, DriverVar } row= uiLayoutRow(layout, 1); - uiItemR(row, &dtar_ptr, "transform_type", 0, "", ICON_NULL); - uiItemR(row, &dtar_ptr, "use_local_space_transform", 0, NULL, ICON_NULL); + uiItemR(row, &dtar_ptr, "transform_type", 0, "", ICON_NONE); + uiItemR(row, &dtar_ptr, "use_local_space_transform", 0, NULL, ICON_NONE); } /* driver settings for active F-Curve (only for 'Drivers' mode) */ @@ -547,12 +547,12 @@ static void graph_panel_drivers(const bContext *C, Panel *pa) col= uiLayoutColumn(pa->layout, 1); block= uiLayoutGetBlock(col); - uiItemR(col, &driver_ptr, "type", 0, NULL, ICON_NULL); + uiItemR(col, &driver_ptr, "type", 0, NULL, ICON_NONE); /* show expression box if doing scripted drivers, and/or error messages when invalid drivers exist */ if (driver->type == DRIVER_TYPE_PYTHON) { /* expression */ - uiItemR(col, &driver_ptr, "expression", 0, "Expr", ICON_NULL); + uiItemR(col, &driver_ptr, "expression", 0, "Expr", ICON_NONE); /* errors? */ if (driver->flag & DRIVER_FLAG_INVALID) @@ -566,17 +566,17 @@ static void graph_panel_drivers(const bContext *C, Panel *pa) col= uiLayoutColumn(pa->layout, 1); /* debug setting */ - uiItemR(col, &driver_ptr, "show_debug_info", 0, NULL, ICON_NULL); + uiItemR(col, &driver_ptr, "show_debug_info", 0, NULL, ICON_NONE); /* value of driver */ if (driver->flag & DRIVER_FLAG_SHOWDEBUG) { uiLayout *row= uiLayoutRow(col, 1); char valBuf[32]; - uiItemL(row, "Driver Value:", ICON_NULL); + uiItemL(row, "Driver Value:", ICON_NONE); sprintf(valBuf, "%.3f", driver->curval); - uiItemL(row, valBuf, ICON_NULL); + uiItemL(row, valBuf, ICON_NONE); } /* add driver variables */ @@ -601,7 +601,7 @@ static void graph_panel_drivers(const bContext *C, Panel *pa) row= uiLayoutRow(box, 0); block= uiLayoutGetBlock(row); /* variable name */ - uiItemR(row, &dvar_ptr, "name", 0, "", ICON_NULL); + uiItemR(row, &dvar_ptr, "name", 0, "", ICON_NONE); /* remove button */ uiBlockSetEmboss(block, UI_EMBOSSN); @@ -611,7 +611,7 @@ static void graph_panel_drivers(const bContext *C, Panel *pa) /* variable type */ row= uiLayoutRow(box, 0); - uiItemR(row, &dvar_ptr, "type", 0, "", ICON_NULL); + uiItemR(row, &dvar_ptr, "type", 0, "", ICON_NONE); /* variable type settings */ box= uiLayoutBox(col); @@ -637,10 +637,10 @@ static void graph_panel_drivers(const bContext *C, Panel *pa) box= uiLayoutBox(col); row= uiLayoutRow(box, 1); - uiItemL(row, "Value:", ICON_NULL); + uiItemL(row, "Value:", ICON_NONE); sprintf(valBuf, "%.3f", dvar->curval); - uiItemL(row, valBuf, ICON_NULL); + uiItemL(row, valBuf, ICON_NONE); } } |