Index: trunk/src/drc.c =================================================================== --- trunk/src/drc.c (revision 21313) +++ trunk/src/drc.c (revision 21314) @@ -84,7 +84,7 @@ pcb_printf("%m+required value %$mS\n", conf_core.editor.grid_unit->allow, v->data.drc.required_value); if (v->data.drc.have_measured) pcb_printf("%m+measured value %$mS\n", conf_core.editor.grid_unit->allow, v->data.drc.measured_value); - printf("%s\n\n", v->explanation); + printf("%s\n\n", v->description); } } else if (pcb_strcasecmp(dlg_type, "log") == 0) { @@ -98,7 +98,7 @@ pcb_printf("%m+required value %$mS\n", conf_core.editor.grid_unit->allow, v->data.drc.required_value); if (v->data.drc.have_measured) pcb_message(PCB_MSG_INFO, "%m+measured value %$mS\n", conf_core.editor.grid_unit->allow, v->data.drc.measured_value); - pcb_message(PCB_MSG_INFO, "%s\n\n", v->explanation); + pcb_message(PCB_MSG_INFO, "%s\n\n", v->description); } } if (pcb_strcasecmp(dlg_type, "dump") == 0) { @@ -115,10 +115,10 @@ pcb_printf("R%$mm\n", v->data.drc.required_value); if (v->data.drc.have_measured) pcb_printf("M%$mm\n", v->data.drc.measured_value); - for(s = v->explanation; *s != '\0'; s++) + for(s = v->description; *s != '\0'; s++) if (*s == '\n') *s = ' '; - printf("E%s\n\n", v->explanation); + printf("E%s\n\n", v->description); } } else if (pcb_strcasecmp(dlg_type, "count") == 0) Index: trunk/src/view.c =================================================================== --- trunk/src/view.c (revision 21313) +++ trunk/src/view.c (revision 21314) @@ -51,7 +51,7 @@ pcb_idpath_list_clear(&item->objs[0]); pcb_idpath_list_clear(&item->objs[1]); free(item->title); - free(item->explanation); + free(item->description); free(item); } @@ -112,7 +112,7 @@ } } -pcb_view_t *pcb_view_new(const char *type, const char *title, const char *explanation) +pcb_view_t *pcb_view_new(const char *type, const char *title, const char *description) { pcb_view_t *v = calloc(sizeof(pcb_view_t), 1); @@ -121,11 +121,11 @@ if (type == NULL) type = ""; if (title == NULL) title = ""; - if (explanation == NULL) explanation = ""; + if (description == NULL) description = ""; v->type = pcb_strdup(type); v->title = pcb_strdup(title); - v->explanation = pcb_strdup(explanation); + v->description = pcb_strdup(description); return v; } @@ -225,7 +225,7 @@ pcb_append_printf(dst, "%sha:view.%lu {\n", prefix, v->uid); view_append_str(dst, prefix, "type", v->type); view_append_str(dst, prefix, "title", v->title); - view_append_str(dst, prefix, "explanation", v->explanation); + view_append_str(dst, prefix, "description", v->description); if (v->have_bbox) pcb_append_printf(dst, "%s bbox = {%.08$$mm; %.08$$mm; %.08$$mm; %.08$$mm;}\n", prefix, v->bbox.X1, v->bbox.Y1, v->bbox.X2, v->bbox.Y2); if (v->have_xy) Index: trunk/src/view.h =================================================================== --- trunk/src/view.h (revision 21313) +++ trunk/src/view.h (revision 21314) @@ -48,7 +48,7 @@ char *type; char *title; - char *explanation; + char *description; /* these indicate whether some of the following fields are valid */ unsigned have_bbox:1; @@ -103,7 +103,7 @@ void pcb_view_goto(pcb_view_t *item); /* Allocate a new, floating (unlinked) view with no data or bbox */ -pcb_view_t *pcb_view_new(const char *type, const char *title, const char *explanation); +pcb_view_t *pcb_view_new(const char *type, const char *title, const char *description); /* Append obj to one of the object groups in view (resolving to idpath) */ void pcb_view_append_obj(pcb_view_t *view, int grp, pcb_any_obj_t *obj); Index: trunk/src_plugins/dialogs/dlg_view.c =================================================================== --- trunk/src_plugins/dialogs/dlg_view.c (revision 21313) +++ trunk/src_plugins/dialogs/dlg_view.c (revision 21314) @@ -56,7 +56,7 @@ unsigned long int selected; - int wpos, wlist, wcount, wprev, wexplanation, wmeasure; + int wpos, wlist, wcount, wprev, wdescription, wmeasure; int wbtn_pasteb, wbtn_pastea, wbtn_copy, wbtn_cut; }; @@ -177,7 +177,7 @@ pcb_view_t *v = pcb_view_by_uid(ctx->lst, ctx->selected); if (v != NULL) { pcb_view_goto(v); - PCB_DAD_SET_VALUE(ctx->dlg_hid_ctx, ctx->wexplanation, str_value, re_wrap(pcb_strdup(v->explanation), 32)); + PCB_DAD_SET_VALUE(ctx->dlg_hid_ctx, ctx->wdescription, str_value, re_wrap(pcb_strdup(v->description), 32)); switch(v->data_type) { case PCB_VIEW_PLAIN: PCB_DAD_SET_VALUE(ctx->dlg_hid_ctx, ctx->wmeasure, str_value, pcb_strdup("")); @@ -193,7 +193,7 @@ if (v == NULL) { ctx->selected = 0; - PCB_DAD_SET_VALUE(ctx->dlg_hid_ctx, ctx->wexplanation, str_value, pcb_strdup("")); + PCB_DAD_SET_VALUE(ctx->dlg_hid_ctx, ctx->wdescription, str_value, pcb_strdup("")); PCB_DAD_SET_VALUE(ctx->dlg_hid_ctx, ctx->wmeasure, str_value, pcb_strdup("")); } else @@ -520,8 +520,8 @@ PCB_DAD_PREVIEW(ctx->dlg, view_expose_cb, view_mouse_cb, NULL, NULL, 100, 100, ctx); ctx->wprev = PCB_DAD_CURRENT(ctx->dlg); PCB_DAD_COMPFLAG(ctx->dlg, PCB_HATF_EXPFILL); - PCB_DAD_LABEL(ctx->dlg, "(explanation)"); - ctx->wexplanation = PCB_DAD_CURRENT(ctx->dlg); + PCB_DAD_LABEL(ctx->dlg, "(description)"); + ctx->wdescription = PCB_DAD_CURRENT(ctx->dlg); PCB_DAD_LABEL(ctx->dlg, "(measure)"); ctx->wmeasure = PCB_DAD_CURRENT(ctx->dlg); PCB_DAD_END(ctx->dlg); @@ -561,8 +561,8 @@ ctx->wprev = PCB_DAD_CURRENT(ctx->dlg); PCB_DAD_COMPFLAG(ctx->dlg, PCB_HATF_EXPFILL); PCB_DAD_BEGIN_VBOX(ctx->dlg); - PCB_DAD_LABEL(ctx->dlg, "(explanation)"); - ctx->wexplanation = PCB_DAD_CURRENT(ctx->dlg); + PCB_DAD_LABEL(ctx->dlg, "(description)"); + ctx->wdescription = PCB_DAD_CURRENT(ctx->dlg); PCB_DAD_LABEL(ctx->dlg, "(measure)"); ctx->wmeasure = PCB_DAD_CURRENT(ctx->dlg); PCB_DAD_END(ctx->dlg);