diff options
Diffstat (limited to 'source/blender/editors/gpencil/gpencil_buttons.c')
| -rw-r--r-- | source/blender/editors/gpencil/gpencil_buttons.c | 39 |
1 files changed, 19 insertions, 20 deletions
diff --git a/source/blender/editors/gpencil/gpencil_buttons.c b/source/blender/editors/gpencil/gpencil_buttons.c index 87a9c3cd52f..96bc4259661 100644 --- a/source/blender/editors/gpencil/gpencil_buttons.c +++ b/source/blender/editors/gpencil/gpencil_buttons.c @@ -138,7 +138,7 @@ static void gp_drawui_layer (uiLayout *layout, bGPdata *gpd, bGPDlayer *gpl) sprintf(name, "%s (Hidden)", gpl->info); else sprintf(name, "%s (Locked)", gpl->info); - uiItemL(subrow, name, 0); + uiItemL(subrow, name, ICON_NULL); /* delete button (only if hidden but not locked!) */ if ((gpl->flag & GP_LAYER_HIDE) & !(gpl->flag & GP_LAYER_LOCKED)) { @@ -165,7 +165,7 @@ static void gp_drawui_layer (uiLayout *layout, bGPdata *gpd, bGPDlayer *gpl) uiBlockSetEmboss(block, UI_EMBOSS); /* name */ - uiItemR(subrow, &ptr, "info", 0, "", 0); + uiItemR(subrow, &ptr, "info", 0, "", ICON_NULL); /* delete 'button' */ uiBlockSetEmboss(block, UI_EMBOSSN); @@ -189,17 +189,17 @@ static void gp_drawui_layer (uiLayout *layout, bGPdata *gpd, bGPDlayer *gpl) /* color */ subcol= uiLayoutColumn(col, 1); - uiItemR(subcol, &ptr, "color", 0, "", 0); - uiItemR(subcol, &ptr, "alpha", UI_ITEM_R_SLIDER, NULL, 0); + uiItemR(subcol, &ptr, "color", 0, "", ICON_NULL); + uiItemR(subcol, &ptr, "alpha", UI_ITEM_R_SLIDER, NULL, ICON_NULL); /* stroke thickness */ subcol= uiLayoutColumn(col, 1); - uiItemR(subcol, &ptr, "line_width", UI_ITEM_R_SLIDER, NULL, 0); + uiItemR(subcol, &ptr, "line_width", UI_ITEM_R_SLIDER, NULL, ICON_NULL); /* debugging options */ if (G.f & G_DEBUG) { subcol= uiLayoutColumn(col, 1); - uiItemR(subcol, &ptr, "show_points", 0, NULL, 0); + uiItemR(subcol, &ptr, "show_points", 0, NULL, ICON_NULL); } /* right column ................... */ @@ -207,13 +207,9 @@ static void gp_drawui_layer (uiLayout *layout, bGPdata *gpd, bGPDlayer *gpl) /* onion-skinning */ subcol= uiLayoutColumn(col, 1); - uiItemR(subcol, &ptr, "use_onion_skinning", 0, "Onion Skinning", 0); - uiItemR(subcol, &ptr, "ghost_range_max", 0, "Frames", 0); // XXX shorter name here? i.e. GStep + uiItemR(subcol, &ptr, "use_onion_skinning", 0, "Onion Skinning", ICON_NULL); + uiItemR(subcol, &ptr, "ghost_range_max", 0, "Frames", ICON_NULL); // XXX shorter name here? i.e. GStep - /* additional options... */ - subcol= uiLayoutColumn(col, 1); - uiItemO(subcol, "Delete Frame", 0, "GPENCIL_OT_active_frame_delete"); - uiItemO(subcol, "Convert...", 0, "GPENCIL_OT_convert"); } } @@ -242,8 +238,11 @@ static void draw_gpencil_panel (bContext *C, uiLayout *layout, bGPdata *gpd, Poi uiTemplateID(col, C, ctx_ptr, "grease_pencil", "GPENCIL_OT_data_add", NULL, "GPENCIL_OT_data_unlink"); /* add new layer button - can be used even when no data, since it can add a new block too */ - uiItemO(col, NULL, 0, "GPENCIL_OT_layer_add"); - + uiItemO(col, "New Layer", ICON_NULL, "GPENCIL_OT_layer_add"); + row= uiLayoutRow(col, 1); + uiItemO(row, "Delete Frame", ICON_NULL, "GPENCIL_OT_active_frame_delete"); + uiItemO(row, "Convert", ICON_NULL, "GPENCIL_OT_convert"); + /* sanity checks... */ if (gpd == NULL) return; @@ -257,7 +256,7 @@ static void draw_gpencil_panel (bContext *C, uiLayout *layout, bGPdata *gpd, Poi /* draw gpd drawing settings first ------------------------------------- */ col= uiLayoutColumn(layout, 1); /* label */ - uiItemL(col, "Drawing Settings:", 0); + uiItemL(col, "Drawing Settings:", ICON_NULL); /* check whether advanced 3D-View drawing space options can be used */ if (CTX_wm_view3d(C)) { @@ -269,16 +268,16 @@ static void draw_gpencil_panel (bContext *C, uiLayout *layout, bGPdata *gpd, Poi /* drawing space options */ row= uiLayoutRow(col, 1); - uiItemEnumR_string(row, &gpd_ptr, "draw_mode", "VIEW", NULL, 0); - uiItemEnumR_string(row, &gpd_ptr, "draw_mode", "CURSOR", NULL, 0); + uiItemEnumR_string(row, &gpd_ptr, "draw_mode", "VIEW", NULL, ICON_NULL); + uiItemEnumR_string(row, &gpd_ptr, "draw_mode", "CURSOR", NULL, ICON_NULL); row= uiLayoutRow(col, 1); uiLayoutSetActive(row, v3d_stroke_opts); - uiItemEnumR_string(row, &gpd_ptr, "draw_mode", "SURFACE", NULL, 0); - uiItemEnumR_string(row, &gpd_ptr, "draw_mode", "STROKE", NULL, 0); + uiItemEnumR_string(row, &gpd_ptr, "draw_mode", "SURFACE", NULL, ICON_NULL); + uiItemEnumR_string(row, &gpd_ptr, "draw_mode", "STROKE", NULL, ICON_NULL); row= uiLayoutRow(col, 0); uiLayoutSetActive(row, v3d_stroke_opts==STROKE_OPTS_V3D_ON); - uiItemR(row, &gpd_ptr, "use_stroke_endpoints", 0, NULL, 0); + uiItemR(row, &gpd_ptr, "use_stroke_endpoints", 0, NULL, ICON_NULL); } |