Index: trunk/config.h.in =================================================================== --- trunk/config.h.in (revision 32102) +++ trunk/config.h.in (revision 32103) @@ -62,6 +62,8 @@ as ~/DOT_PCB_RND/ */ #define DOT_PCB_RND "@/local/pcb/dot_pcb_rnd@" +/* librnd transition */ +#define RND_DAD_CFG_NOLABEL 1 #endif @] Index: trunk/scconfig/Rev.h =================================================================== --- trunk/scconfig/Rev.h (revision 32102) +++ trunk/scconfig/Rev.h (revision 32103) @@ -1 +1 @@ -static const int myrev = 32099; +static const int myrev = 32103; Index: trunk/scconfig/Rev.tab =================================================================== --- trunk/scconfig/Rev.tab (revision 32102) +++ trunk/scconfig/Rev.tab (revision 32103) @@ -1,3 +1,4 @@ +32103 configure librnd DAD API transition (label cleanup) 32099 configure remove lesstif local dialog implementations: library, netlist 31776 configure new plugin: formula, for impedance calculations 31708 configure query plugin: move the advanced search dialog from dialogs plugin to query to better access of internals Index: trunk/src/brave.c =================================================================== --- trunk/src/brave.c (revision 32102) +++ trunk/src/brave.c (revision 32103) @@ -203,7 +203,7 @@ for(d = desc, len=0; d->name != NULL; d++,len++) { RND_DAD_LABEL(dlg, d->name); RND_DAD_HELP(dlg, d->lng); - RND_DAD_BOOL(dlg, ""); + RND_DAD_BOOL(dlg); d->widget = RND_DAD_CURRENT(dlg); RND_DAD_CHANGE_CB(dlg, brave_dialog_chg); RND_DAD_HELP(dlg, d->lng); Index: trunk/src/buffer.c =================================================================== --- trunk/src/buffer.c (revision 32102) +++ trunk/src/buffer.c (revision 32103) @@ -570,19 +570,19 @@ RND_DAD_COMPFLAG(ctx.dlg, RND_HATF_EXPFILL); RND_DAD_LABEL(ctx.dlg, "scale X"); - RND_DAD_REAL(ctx.dlg, ""); + RND_DAD_REAL(ctx.dlg); ctx.wx = RND_DAD_CURRENT(ctx.dlg); RND_DAD_DEFAULT_NUM(ctx.dlg, 1); RND_DAD_CHANGE_CB(ctx.dlg, scale_chg_cb); RND_DAD_LABEL(ctx.dlg, "same"); - RND_DAD_BOOL(ctx.dlg, ""); + RND_DAD_BOOL(ctx.dlg); ctx.wlock = RND_DAD_CURRENT(ctx.dlg); RND_DAD_DEFAULT_NUM(ctx.dlg, 1); RND_DAD_CHANGE_CB(ctx.dlg, scale_chg_cb); RND_DAD_LABEL(ctx.dlg, "scale Y"); - RND_DAD_REAL(ctx.dlg, ""); + RND_DAD_REAL(ctx.dlg); ctx.wy = RND_DAD_CURRENT(ctx.dlg); RND_DAD_DEFAULT_NUM(ctx.dlg, 1); RND_DAD_CHANGE_CB(ctx.dlg, scale_chg_cb); Index: trunk/src/extobj_helper.h =================================================================== --- trunk/src/extobj_helper.h (revision 32102) +++ trunk/src/extobj_helper.h (revision 32103) @@ -184,7 +184,7 @@ currval = d; \ RND_DAD_LABEL(dlg, vis_name); \ if (help != NULL) RND_DAD_HELP(dlg, help); \ - RND_DAD_COORD(dlg, ""); \ + RND_DAD_COORD(dlg); \ if (help != NULL) RND_DAD_HELP(dlg, help); \ RND_DAD_CHANGE_CB(dlg, pcb_exto_dlg_coord_cb); \ wid = RND_DAD_CURRENT(dlg); \ @@ -240,7 +240,7 @@ currval = strtol(sval, NULL, 10); \ RND_DAD_LABEL(dlg, vis_name); \ if (help != NULL) RND_DAD_HELP(dlg, help); \ - RND_DAD_INTEGER(dlg, ""); \ + RND_DAD_INTEGER(dlg); \ if (help != NULL) RND_DAD_HELP(dlg, help); \ RND_DAD_CHANGE_CB(dlg, pcb_exto_dlg_int_cb); \ wid = RND_DAD_CURRENT(dlg); \ Index: trunk/src/librnd/core/hid_dad_spin.c =================================================================== --- trunk/src/librnd/core/hid_dad_spin.c (revision 32102) +++ trunk/src/librnd/core/hid_dad_spin.c (revision 32103) @@ -197,7 +197,7 @@ if (spin->unit_family == (RND_UNIT_METRIC | RND_UNIT_IMPERIAL)) { RND_DAD_LABEL(ctx.dlg, "Use the global"); - RND_DAD_BOOL(ctx.dlg, ""); + RND_DAD_BOOL_(ctx.dlg); RND_DAD_HELP(ctx.dlg, "Ignore the above unit selection,\nuse the global unit (grid unit) in this spinbox,\nfollow changes of the global unit"); ctx.wglob = RND_DAD_CURRENT(ctx.dlg); RND_DAD_DEFAULT_NUM(ctx.dlg, (spin->unit == NULL)); @@ -204,7 +204,7 @@ RND_DAD_CHANGE_CB(ctx.dlg, spin_unit_chg_cb); RND_DAD_LABEL(ctx.dlg, "Stick to unit"); - RND_DAD_BOOL(ctx.dlg, ""); + RND_DAD_BOOL_(ctx.dlg); RND_DAD_HELP(ctx.dlg, "Upon any update from software, switch back to\the selected unit even if the user specified\na different unit in the text field."); ctx.wstick = RND_DAD_CURRENT(ctx.dlg); RND_DAD_DEFAULT_NUM(ctx.dlg, spin->no_unit_chg); Index: trunk/src_plugins/ddraft/constraint_gui.c =================================================================== --- trunk/src_plugins/ddraft/constraint_gui.c (revision 32102) +++ trunk/src_plugins/ddraft/constraint_gui.c (revision 32103) @@ -211,7 +211,7 @@ RND_DAD_BEGIN_VBOX(cnstgui_ctx.dlg); RND_DAD_BEGIN_HBOX(cnstgui_ctx.dlg); RND_DAD_LABEL(cnstgui_ctx.dlg, "All direction lines:"); - RND_DAD_BOOL(cnstgui_ctx.dlg, ""); + RND_DAD_BOOL(cnstgui_ctx.dlg); cnstgui_ctx.alldir = RND_DAD_CURRENT(cnstgui_ctx.dlg); RND_DAD_CHANGE_CB(cnstgui_ctx.dlg, set_alldir); RND_DAD_HELP(cnstgui_ctx.dlg, "Constraints work well only when\nthe all-direction-lines is enabled"); @@ -226,7 +226,7 @@ RND_DAD_END(cnstgui_ctx.dlg); RND_DAD_BEGIN_HBOX(cnstgui_ctx.dlg); RND_DAD_LABEL(cnstgui_ctx.dlg, "Angle modulo:"); - RND_DAD_REAL(cnstgui_ctx.dlg, ""); + RND_DAD_REAL(cnstgui_ctx.dlg); cnstgui_ctx.line_angle_mod = RND_DAD_CURRENT(cnstgui_ctx.dlg); RND_DAD_MINVAL(cnstgui_ctx.dlg, 0); RND_DAD_MAXVAL(cnstgui_ctx.dlg, 180); @@ -243,7 +243,7 @@ RND_DAD_END(cnstgui_ctx.dlg); RND_DAD_BEGIN_HBOX(cnstgui_ctx.dlg); RND_DAD_LABEL(cnstgui_ctx.dlg, "Length modulo:"); - RND_DAD_COORD(cnstgui_ctx.dlg, ""); + RND_DAD_COORD(cnstgui_ctx.dlg); cnstgui_ctx.line_length_mod = RND_DAD_CURRENT(cnstgui_ctx.dlg); RND_DAD_MINVAL(cnstgui_ctx.dlg, 0); RND_DAD_MAXVAL(cnstgui_ctx.dlg, RND_MM_TO_COORD(1000)); @@ -286,7 +286,7 @@ RND_DAD_END(cnstgui_ctx.dlg); RND_DAD_BEGIN_HBOX(cnstgui_ctx.dlg); RND_DAD_LABEL(cnstgui_ctx.dlg, "Angle modulo:"); - RND_DAD_REAL(cnstgui_ctx.dlg, ""); + RND_DAD_REAL(cnstgui_ctx.dlg); cnstgui_ctx.move_angle_mod = RND_DAD_CURRENT(cnstgui_ctx.dlg); RND_DAD_MINVAL(cnstgui_ctx.dlg, 0); RND_DAD_MAXVAL(cnstgui_ctx.dlg, 180); @@ -303,7 +303,7 @@ RND_DAD_END(cnstgui_ctx.dlg); RND_DAD_BEGIN_HBOX(cnstgui_ctx.dlg); RND_DAD_LABEL(cnstgui_ctx.dlg, "Length modulo:"); - RND_DAD_COORD(cnstgui_ctx.dlg, ""); + RND_DAD_COORD(cnstgui_ctx.dlg); cnstgui_ctx.move_length_mod = RND_DAD_CURRENT(cnstgui_ctx.dlg); RND_DAD_MINVAL(cnstgui_ctx.dlg, 0); RND_DAD_MAXVAL(cnstgui_ctx.dlg, RND_MM_TO_COORD(1000)); Index: trunk/src_plugins/dialogs/dlg_export.c =================================================================== --- trunk/src_plugins/dialogs/dlg_export.c (revision 32102) +++ trunk/src_plugins/dialogs/dlg_export.c (revision 32103) @@ -200,17 +200,17 @@ switch(opts[i].type) { case RND_HATT_COORD: - RND_DAD_COORD(export_ctx.dlg, opts[i].name); + RND_DAD_COORD(export_ctx.dlg); RND_DAD_MINMAX(export_ctx.dlg, opts[i].min_val, opts[i].max_val); RND_DAD_DEFAULT_NUM(export_ctx.dlg, opts[i].default_val.crd); break; case RND_HATT_INTEGER: - RND_DAD_INTEGER(export_ctx.dlg, opts[i].name); + RND_DAD_INTEGER(export_ctx.dlg); RND_DAD_MINMAX(export_ctx.dlg, opts[i].min_val, opts[i].max_val); RND_DAD_DEFAULT_NUM(export_ctx.dlg, opts[i].default_val.lng); break; case RND_HATT_REAL: - RND_DAD_REAL(export_ctx.dlg, opts[i].name); + RND_DAD_REAL(export_ctx.dlg); RND_DAD_MINMAX(export_ctx.dlg, opts[i].min_val, opts[i].max_val); RND_DAD_DEFAULT_NUM(export_ctx.dlg, opts[i].default_val.dbl); break; Index: trunk/src_plugins/dialogs/dlg_flag_edit.c =================================================================== --- trunk/src_plugins/dialogs/dlg_flag_edit.c (revision 32102) +++ trunk/src_plugins/dialogs/dlg_flag_edit.c (revision 32103) @@ -130,7 +130,7 @@ for(n = 0; n < pcb_object_flagbits_len; n++) { if (pcb_object_flagbits[n].object_types & ctx.obj_type) { RND_DAD_BEGIN_HBOX(dlg); - RND_DAD_BOOL(dlg, ""); + RND_DAD_BOOL(dlg); RND_DAD_HELP(dlg, pcb_object_flagbits[n].help); ctx.wid[ctx.len] = RND_DAD_CURRENT(dlg); ctx.flag_bit[ctx.len] = pcb_object_flagbits[n].mask; Index: trunk/src_plugins/dialogs/dlg_layer_binding.c =================================================================== --- trunk/src_plugins/dialogs/dlg_layer_binding.c (revision 32102) +++ trunk/src_plugins/dialogs/dlg_layer_binding.c (revision 32103) @@ -372,7 +372,7 @@ w->type = RND_DAD_CURRENT(dlg); RND_DAD_END(dlg); RND_DAD_BEGIN_HBOX(dlg); - RND_DAD_INTEGER(dlg, NULL); + RND_DAD_INTEGER(dlg); RND_DAD_MINVAL(dlg, 0); RND_DAD_MAXVAL(dlg, num_copper); w->offs = RND_DAD_CURRENT(dlg); Index: trunk/src_plugins/dialogs/dlg_layer_flags.c =================================================================== --- trunk/src_plugins/dialogs/dlg_layer_flags.c (revision 32102) +++ trunk/src_plugins/dialogs/dlg_layer_flags.c (revision 32103) @@ -53,11 +53,11 @@ RND_DAD_HELP(dlg, "logical layer name"); wname = RND_DAD_CURRENT(dlg); RND_DAD_LABEL(dlg, "sub"); - RND_DAD_BOOL(dlg, ""); + RND_DAD_BOOL(dlg); RND_DAD_HELP(dlg, "Layer is drawn negatively in composition\n(will not work on copper)"); wsub = RND_DAD_CURRENT(dlg); RND_DAD_LABEL(dlg, "auto"); - RND_DAD_BOOL(dlg, ""); + RND_DAD_BOOL(dlg); RND_DAD_HELP(dlg, "Layer is target for autogenerated objects\nand side effects, e.g. padstack shapes"); wauto = RND_DAD_CURRENT(dlg); RND_DAD_END(dlg); Index: trunk/src_plugins/dialogs/dlg_lib_pstk.c =================================================================== --- trunk/src_plugins/dialogs/dlg_lib_pstk.c (revision 32102) +++ trunk/src_plugins/dialogs/dlg_lib_pstk.c (revision 32103) @@ -569,7 +569,7 @@ RND_DAD_BEGIN_TABLE(ctx->dlg, 2); RND_DAD_LABEL(ctx->dlg, "Grid:"); - RND_DAD_COORD(ctx->dlg, ""); + RND_DAD_COORD(ctx->dlg); ctx->wgrid = RND_DAD_CURRENT(ctx->dlg); RND_DAD_MINMAX(ctx->dlg, RND_MM_TO_COORD(0.01), RND_MM_TO_COORD(10)); RND_DAD_DEFAULT_NUM(ctx->dlg, (rnd_coord_t)RND_MM_TO_COORD(1)); @@ -585,11 +585,11 @@ for(n = 0; n < pcb_proto_num_layers; n++) { RND_DAD_LABEL(ctx->dlg, pcb_proto_layers[n].name); RND_DAD_BEGIN_HBOX(ctx->dlg); - RND_DAD_BOOL(ctx->dlg, ""); + RND_DAD_BOOL(ctx->dlg); RND_DAD_DEFAULT_NUM(ctx->dlg, 1); RND_DAD_CHANGE_CB(ctx->dlg, pstklib_update_prv); ctx->wlayerv[n] = RND_DAD_CURRENT(ctx->dlg); - RND_DAD_BOOL(ctx->dlg, ""); + RND_DAD_BOOL(ctx->dlg); RND_DAD_DEFAULT_NUM(ctx->dlg, (pcb_proto_layers[n].mask == (PCB_LYT_TOP | PCB_LYT_COPPER))); RND_DAD_CHANGE_CB(ctx->dlg, pstklib_update_layerc); ctx->wlayerc[n] = RND_DAD_CURRENT(ctx->dlg); Index: trunk/src_plugins/dialogs/dlg_library_param.c =================================================================== --- trunk/src_plugins/dialogs/dlg_library_param.c (revision 32102) +++ trunk/src_plugins/dialogs/dlg_library_param.c (revision 32103) @@ -146,7 +146,7 @@ switch(curr_type) { \ case RND_HATT_COORD: \ case RND_HATT_END: \ - RND_DAD_COORD(library_ctx.pdlg, ""); \ + RND_DAD_COORD(library_ctx.pdlg); \ ctx->pwid[curr] = RND_DAD_CURRENT(library_ctx.pdlg); \ RND_DAD_MINMAX(library_ctx.pdlg, 0, RND_MM_TO_COORD(512)); \ RND_DAD_CHANGE_CB(library_ctx.pdlg, library_param_cb); \ @@ -157,7 +157,7 @@ RND_DAD_CHANGE_CB(library_ctx.pdlg, library_param_cb); \ break; \ case RND_HATT_BOOL: \ - RND_DAD_BOOL(library_ctx.pdlg, ""); \ + RND_DAD_BOOL(library_ctx.pdlg); \ ctx->pwid[curr] = RND_DAD_CURRENT(library_ctx.pdlg); \ RND_DAD_CHANGE_CB(library_ctx.pdlg, library_param_cb); \ break; \ Index: trunk/src_plugins/dialogs/dlg_loadsave.c =================================================================== --- trunk/src_plugins/dialogs/dlg_loadsave.c (revision 32102) +++ trunk/src_plugins/dialogs/dlg_loadsave.c (revision 32103) @@ -359,7 +359,7 @@ RND_DAD_BEGIN_HBOX(save->fmtsub->dlg); RND_DAD_LABEL(save->fmtsub->dlg, "Guess format:"); RND_DAD_HELP(save->fmtsub->dlg, guess_help); - RND_DAD_BOOL(save->fmtsub->dlg, ""); + RND_DAD_BOOL(save->fmtsub->dlg); save->wguess = RND_DAD_CURRENT(save->fmtsub->dlg); RND_DAD_CHANGE_CB(save->fmtsub->dlg, guess_chg); RND_DAD_DEFAULT_NUM(save->fmtsub->dlg, !!dialogs_conf.plugins.dialogs.file_select_dialog.save_as_format_guess); Index: trunk/src_plugins/dialogs/dlg_padstack.c =================================================================== --- trunk/src_plugins/dialogs/dlg_padstack.c (revision 32102) +++ trunk/src_plugins/dialogs/dlg_padstack.c (revision 32103) @@ -663,7 +663,7 @@ pse->shrink = RND_DAD_CURRENT(dlg); RND_DAD_CHANGE_CB(dlg, pse_shape_shrink); RND_DAD_HELP(dlg, "Make the shape smaller by the selected amount"); - RND_DAD_COORD(dlg, ""); + RND_DAD_COORD(dlg); pse->amount = RND_DAD_CURRENT(dlg); RND_DAD_MINMAX(dlg, 1, RND_MM_TO_COORD(100)); RND_DAD_BUTTON(dlg, "Grow"); @@ -830,7 +830,7 @@ RND_DAD_END(dlg); RND_DAD_BEGIN_TABLE(dlg, 2); RND_DAD_LABEL(dlg, "Clearance"); - RND_DAD_COORD(dlg, ""); + RND_DAD_COORD(dlg); pse->clearance = RND_DAD_CURRENT(dlg); RND_DAD_MINVAL(dlg, 0); RND_DAD_MAXVAL(dlg, RND_MM_TO_COORD(1000)); @@ -837,17 +837,17 @@ RND_DAD_CHANGE_CB(dlg, pse_chg_instance); RND_DAD_HELP(dlg, "global clearance (affects all layers)"); RND_DAD_LABEL(dlg, "Rotation"); - RND_DAD_REAL(dlg, ""); + RND_DAD_REAL(dlg); pse->rot = RND_DAD_CURRENT(dlg); RND_DAD_MINVAL(dlg, 0); RND_DAD_MAXVAL(dlg, 360); RND_DAD_CHANGE_CB(dlg, pse_chg_instance); RND_DAD_LABEL(dlg, "X-mirror"); - RND_DAD_BOOL(dlg, ""); + RND_DAD_BOOL(dlg); pse->xmirror = RND_DAD_CURRENT(dlg); RND_DAD_CHANGE_CB(dlg, pse_chg_instance); RND_DAD_LABEL(dlg, "S-mirror"); - RND_DAD_BOOL(dlg, ""); + RND_DAD_BOOL(dlg); pse->smirror = RND_DAD_CURRENT(dlg); RND_DAD_CHANGE_CB(dlg, pse_chg_instance); RND_DAD_END(dlg); @@ -951,7 +951,7 @@ RND_DAD_CHANGE_CB(dlg, pse_chg_shape); RND_DAD_HELP(dlg, "Change the shape on this layer type"); RND_DAD_LABEL(dlg, " "); - RND_DAD_COORD(dlg, ""); + RND_DAD_COORD(dlg); pse->proto_clr[n] = RND_DAD_CURRENT(dlg); RND_DAD_MINVAL(dlg, 1); RND_DAD_MAXVAL(dlg, RND_MM_TO_COORD(1000)); @@ -969,7 +969,7 @@ pse->hole_header = RND_DAD_CURRENT(dlg); spring(dlg); RND_DAD_LABEL(dlg, "Hole diameter:"); - RND_DAD_COORD(dlg, ""); + RND_DAD_COORD(dlg); pse->hdia = RND_DAD_CURRENT(dlg); RND_DAD_MINVAL(dlg, 0); RND_DAD_MAXVAL(dlg, RND_MM_TO_COORD(1000)); @@ -977,7 +977,7 @@ RND_DAD_WIDTH_CHR(dlg, 10); spring(dlg); RND_DAD_LABEL(dlg, "Hole/slot plating:"); - RND_DAD_BOOL(dlg, ""); + RND_DAD_BOOL(dlg); pse->hplated = RND_DAD_CURRENT(dlg); RND_DAD_CHANGE_CB(dlg, pse_chg_hole); RND_DAD_HELP(dlg, "A plated hole galvanically connects layers"); @@ -987,7 +987,7 @@ RND_DAD_BEGIN_TABLE(dlg, 4); /* table row 1 */ RND_DAD_LABEL(dlg, "Hole/slot top:"); - RND_DAD_INTEGER(dlg, ""); + RND_DAD_INTEGER(dlg); pse->htop_val = RND_DAD_CURRENT(dlg); RND_DAD_MINVAL(dlg, -(pse->pcb->LayerGroups.cache.copper_len-1)); RND_DAD_MAXVAL(dlg, pse->pcb->LayerGroups.cache.copper_len-1); @@ -1001,7 +1001,7 @@ /* table row 2 */ RND_DAD_LABEL(dlg, "Hole/slot bottom:"); - RND_DAD_INTEGER(dlg, ""); + RND_DAD_INTEGER(dlg); pse->hbot_val = RND_DAD_CURRENT(dlg); RND_DAD_MINVAL(dlg, -(pse->pcb->LayerGroups.cache.copper_len-1)); RND_DAD_MAXVAL(dlg, pse->pcb->LayerGroups.cache.copper_len-1); @@ -1028,13 +1028,13 @@ pse->gen_shp = RND_DAD_CURRENT(dlg); RND_DAD_LABEL(dlg, "Size (circle diameter or square side):"); - RND_DAD_COORD(dlg, ""); + RND_DAD_COORD(dlg); pse->gen_size = RND_DAD_CURRENT(dlg); RND_DAD_MINVAL(dlg, 1); RND_DAD_MAXVAL(dlg, RND_MM_TO_COORD(1000)); RND_DAD_LABEL(dlg, "Drill diameter (0 means no hole):"); - RND_DAD_COORD(dlg, ""); + RND_DAD_COORD(dlg); pse->gen_drill = RND_DAD_CURRENT(dlg); RND_DAD_MINVAL(dlg, 1); RND_DAD_MAXVAL(dlg, RND_MM_TO_COORD(1000)); @@ -1044,11 +1044,11 @@ pse->gen_sides = RND_DAD_CURRENT(dlg); RND_DAD_LABEL(dlg, "Expose top/bottom copper:"); - RND_DAD_BOOL(dlg, ""); + RND_DAD_BOOL(dlg); pse->gen_expose = RND_DAD_CURRENT(dlg); RND_DAD_LABEL(dlg, "Paste exposed copper:"); - RND_DAD_BOOL(dlg, ""); + RND_DAD_BOOL(dlg); pse->gen_paste = RND_DAD_CURRENT(dlg); RND_DAD_LABEL(dlg, ""); Index: trunk/src_plugins/dialogs/dlg_pref.c =================================================================== --- trunk/src_plugins/dialogs/dlg_pref.c (revision 32102) +++ trunk/src_plugins/dialogs/dlg_pref.c (revision 32103) @@ -140,7 +140,7 @@ switch(cn->type) { case RND_CFN_COORD: - RND_DAD_COORD(ctx->dlg, ""); + RND_DAD_COORD(ctx->dlg); item->wid = RND_DAD_CURRENT(ctx->dlg); RND_DAD_MINMAX(ctx->dlg, 0, RND_MAX_COORD); RND_DAD_DEFAULT_NUM(ctx->dlg, cn->val.coord[0]); @@ -148,7 +148,7 @@ RND_DAD_CHANGE_CB(ctx->dlg, change_cb); break; case RND_CFN_BOOLEAN: - RND_DAD_BOOL(ctx->dlg, ""); + RND_DAD_BOOL(ctx->dlg); item->wid = RND_DAD_CURRENT(ctx->dlg); RND_DAD_DEFAULT_NUM(ctx->dlg, cn->val.integer[0]); RND_DAD_HELP(ctx->dlg, cn->description); @@ -155,7 +155,7 @@ RND_DAD_CHANGE_CB(ctx->dlg, change_cb); break; case RND_CFN_INTEGER: - RND_DAD_INTEGER(ctx->dlg, ""); + RND_DAD_INTEGER(ctx->dlg); item->wid = RND_DAD_CURRENT(ctx->dlg); RND_DAD_MINMAX(ctx->dlg, 0, INT_MAX); RND_DAD_DEFAULT_NUM(ctx->dlg, cn->val.integer[0]); @@ -163,7 +163,7 @@ RND_DAD_CHANGE_CB(ctx->dlg, change_cb); break; case RND_CFN_REAL: - RND_DAD_REAL(ctx->dlg, ""); + RND_DAD_REAL(ctx->dlg); item->wid = RND_DAD_CURRENT(ctx->dlg); RND_DAD_MINMAX(ctx->dlg, 0, INT_MAX); ctx->dlg[item->wid].val.dbl = cn->val.real[0]; Index: trunk/src_plugins/dialogs/dlg_pref_board.c =================================================================== --- trunk/src_plugins/dialogs/dlg_pref_board.c (revision 32102) +++ trunk/src_plugins/dialogs/dlg_pref_board.c (revision 32103) @@ -88,7 +88,7 @@ ctx->dlg[ctx->board.wname].val.str = rnd_strdup(RND_EMPTY(PCB->hidlib.name)); RND_DAD_CHANGE_CB(ctx->dlg, pref_board_dlg2brd); RND_DAD_LABEL(ctx->dlg, "Thermal scale"); - RND_DAD_REAL(ctx->dlg, ""); + RND_DAD_REAL(ctx->dlg); ctx->board.wthermscale = RND_DAD_CURRENT(ctx->dlg); RND_DAD_MINMAX(ctx->dlg, 0.01, 100); ctx->dlg[ctx->board.wthermscale].val.dbl = PCB->ThermScale; Index: trunk/src_plugins/dialogs/dlg_pref_confedit.c =================================================================== --- trunk/src_plugins/dialogs/dlg_pref_confedit.c (revision 32102) +++ trunk/src_plugins/dialogs/dlg_pref_confedit.c (revision 32103) @@ -277,12 +277,12 @@ b[0] = RND_DAD_CURRENT(ctx->dlg); break; case RND_CFN_BOOLEAN: - RND_DAD_BOOL(ctx->dlg, ""); + RND_DAD_BOOL(ctx->dlg); ctx->wnewval = RND_DAD_CURRENT(ctx->dlg); RND_DAD_CHANGE_CB(ctx->dlg, pref_conf_editval_cb); break; case RND_CFN_INTEGER: - RND_DAD_INTEGER(ctx->dlg, ""); + RND_DAD_INTEGER(ctx->dlg); ctx->wnewval = RND_DAD_CURRENT(ctx->dlg); RND_DAD_MINMAX(ctx->dlg, -(1<<30), +(1<<30)); RND_DAD_BUTTON(ctx->dlg, "apply"); @@ -290,7 +290,7 @@ b[0] = RND_DAD_CURRENT(ctx->dlg); break; case RND_CFN_REAL: - RND_DAD_REAL(ctx->dlg, ""); + RND_DAD_REAL(ctx->dlg); ctx->wnewval = RND_DAD_CURRENT(ctx->dlg); RND_DAD_MINMAX(ctx->dlg, -(1<<30), +(1<<30)); RND_DAD_BUTTON(ctx->dlg, "apply"); @@ -298,7 +298,7 @@ b[0] = RND_DAD_CURRENT(ctx->dlg); break; case RND_CFN_COORD: - RND_DAD_COORD(ctx->dlg, ""); + RND_DAD_COORD(ctx->dlg); ctx->wnewval = RND_DAD_CURRENT(ctx->dlg); RND_DAD_MINMAX(ctx->dlg, -RND_MM_TO_COORD(1000), +RND_MM_TO_COORD(1000)); RND_DAD_BUTTON(ctx->dlg, "apply"); Index: trunk/src_plugins/dialogs/dlg_pref_sizes.c =================================================================== --- trunk/src_plugins/dialogs/dlg_pref_sizes.c (revision 32102) +++ trunk/src_plugins/dialogs/dlg_pref_sizes.c (revision 32103) @@ -104,13 +104,13 @@ RND_DAD_LABEL(ctx->dlg, "Board size"); RND_DAD_BEGIN_HBOX(ctx->dlg); RND_DAD_LABEL(ctx->dlg, "Width="); - RND_DAD_COORD(ctx->dlg, ""); + RND_DAD_COORD(ctx->dlg); ctx->sizes.wwidth = RND_DAD_CURRENT(ctx->dlg); RND_DAD_MINMAX(ctx->dlg, RND_MM_TO_COORD(1), RND_MAX_COORD); RND_DAD_DEFAULT_NUM(ctx->dlg, PCB->hidlib.size_x); RND_DAD_CHANGE_CB(ctx->dlg, pref_sizes_dlg2brd); RND_DAD_LABEL(ctx->dlg, "Height="); - RND_DAD_COORD(ctx->dlg, ""); + RND_DAD_COORD(ctx->dlg); ctx->sizes.wheight = RND_DAD_CURRENT(ctx->dlg); RND_DAD_MINMAX(ctx->dlg, RND_MM_TO_COORD(1), RND_MAX_COORD); RND_DAD_DEFAULT_NUM(ctx->dlg, PCB->hidlib.size_y); @@ -147,7 +147,7 @@ RND_DAD_LABEL(ctx->dlg, "misc sizes"); RND_DAD_BEGIN_TABLE(ctx->dlg, 2); RND_DAD_LABEL(ctx->dlg, "polygon isle minimum size\n[square um]"); - RND_DAD_REAL(ctx->dlg, ""); + RND_DAD_REAL(ctx->dlg); ctx->sizes.wisle = RND_DAD_CURRENT(ctx->dlg); RND_DAD_MINMAX(ctx->dlg, 0, RND_MAX_COORD); ctx->dlg[ctx->sizes.wisle].val.dbl = (conf_core.design.poly_isle_area / 1000000.0); Index: trunk/src_plugins/dialogs/dlg_pref_win.c =================================================================== --- trunk/src_plugins/dialogs/dlg_pref_win.c (revision 32102) +++ trunk/src_plugins/dialogs/dlg_pref_win.c (revision 32103) @@ -119,7 +119,7 @@ RND_DAD_BEGIN_HBOX(ctx->dlg); RND_DAD_COMPFLAG(ctx->dlg, RND_HATF_FRAME); RND_DAD_LABEL(ctx->dlg, "Load window geometry and enable window placement:"); - RND_DAD_BOOL(ctx->dlg, ""); + RND_DAD_BOOL(ctx->dlg); RND_DAD_HELP(ctx->dlg, "When enabled, pcb-rnd will load window geometry from config files\nand try to resize and place windows accordingly.\nSizes can be saved once (golden arrangement)\nor at every exit (retrain last setup),\nsee below."); ctx->win.wmaster = RND_DAD_CURRENT(ctx->dlg); RND_DAD_CHANGE_CB(ctx->dlg, pref_win_master_cb); @@ -139,7 +139,7 @@ RND_DAD_BUTTON(ctx->dlg, "now"); RND_DAD_CHANGE_CB(ctx->dlg, pref_win_board_now_cb); RND_DAD_LABEL(ctx->dlg, "before close:"); - RND_DAD_BOOL(ctx->dlg, ""); + RND_DAD_BOOL(ctx->dlg); ctx->win.wboard = RND_DAD_CURRENT(ctx->dlg); RND_DAD_CHANGE_CB(ctx->dlg, pref_win_board_cb); RND_DAD_END(ctx->dlg); @@ -154,7 +154,7 @@ RND_DAD_BUTTON(ctx->dlg, "now"); RND_DAD_CHANGE_CB(ctx->dlg, pref_win_project_now_cb); RND_DAD_LABEL(ctx->dlg, "before close:"); - RND_DAD_BOOL(ctx->dlg, ""); + RND_DAD_BOOL(ctx->dlg); ctx->win.wproject = RND_DAD_CURRENT(ctx->dlg); RND_DAD_CHANGE_CB(ctx->dlg, pref_win_project_cb); RND_DAD_END(ctx->dlg); @@ -169,7 +169,7 @@ RND_DAD_BUTTON(ctx->dlg, "now"); RND_DAD_CHANGE_CB(ctx->dlg, pref_win_user_now_cb); RND_DAD_LABEL(ctx->dlg, "before close:"); - RND_DAD_BOOL(ctx->dlg, ""); + RND_DAD_BOOL(ctx->dlg); ctx->win.wuser = RND_DAD_CURRENT(ctx->dlg); RND_DAD_CHANGE_CB(ctx->dlg, pref_win_user_cb); RND_DAD_END(ctx->dlg); Index: trunk/src_plugins/dialogs/dlg_test.c =================================================================== --- trunk/src_plugins/dialogs/dlg_test.c (revision 32102) +++ trunk/src_plugins/dialogs/dlg_test.c (revision 32103) @@ -161,7 +161,7 @@ RND_DAD_ENUM(ctx.dlg, vals); RND_DAD_CHANGE_CB(ctx.dlg, pcb_act_attr_chg); attr_idx = RND_DAD_CURRENT(ctx.dlg); - RND_DAD_INTEGER(ctx.dlg, "text2e"); + RND_DAD_INTEGER(ctx.dlg); RND_DAD_MINVAL(ctx.dlg, 1); RND_DAD_MAXVAL(ctx.dlg, 10); RND_DAD_DEFAULT_NUM(ctx.dlg, 3); @@ -205,7 +205,7 @@ RND_DAD_CHANGE_CB(ctx.dlg, cb_ttbl_append); RND_DAD_BUTTON(ctx.dlg, "jump!"); RND_DAD_CHANGE_CB(ctx.dlg, cb_ttbl_jump); - RND_DAD_BOOL(ctx.dlg, "filter"); + RND_DAD_BOOL(ctx.dlg); RND_DAD_CHANGE_CB(ctx.dlg, cb_ttbl_filt); RND_DAD_END(ctx.dlg); RND_DAD_BEGIN_VBOX(ctx.dlg); Index: trunk/src_plugins/drc_query/dlg.c =================================================================== --- trunk/src_plugins/drc_query/dlg.c (revision 32102) +++ trunk/src_plugins/drc_query/dlg.c (revision 32103) @@ -335,7 +335,7 @@ RND_DAD_END(ctx->dlg); RND_DAD_BEGIN_HBOX(ctx->dlg); RND_DAD_LABEL(ctx->dlg, "Disable drc rule:"); - RND_DAD_BOOL(ctx->dlg, ""); + RND_DAD_BOOL(ctx->dlg); ctx->wdisable = RND_DAD_CURRENT(ctx->dlg); RND_DAD_END(ctx->dlg); RND_DAD_LABEL(ctx->dlg, "DRC violation description:"); Index: trunk/src_plugins/export_openems/excitation.c =================================================================== --- trunk/src_plugins/export_openems/excitation.c (revision 32102) +++ trunk/src_plugins/export_openems/excitation.c (revision 32103) @@ -175,7 +175,7 @@ exc_ctx.exc_data[idx].w[I_FC] = RND_DAD_CURRENT(exc_ctx.dlg); RND_DAD_LABEL(exc_ctx.dlg, "f0"); - RND_DAD_REAL(exc_ctx.dlg, ""); + RND_DAD_REAL(exc_ctx.dlg); RND_DAD_MINMAX(exc_ctx.dlg, 0, FREQ_MAX); RND_DAD_HELP(exc_ctx.dlg, "Center Frequency [Hz]"); RND_DAD_CHANGE_CB(exc_ctx.dlg, exc_val_chg_cb); @@ -218,7 +218,7 @@ { RND_DAD_BEGIN_TABLE(exc_ctx.dlg, 2); RND_DAD_LABEL(exc_ctx.dlg, "f0"); - RND_DAD_REAL(exc_ctx.dlg, ""); + RND_DAD_REAL(exc_ctx.dlg); RND_DAD_MINMAX(exc_ctx.dlg, 0, FREQ_MAX); RND_DAD_HELP(exc_ctx.dlg, "Center Frequency [Hz]"); RND_DAD_CHANGE_CB(exc_ctx.dlg, exc_val_chg_cb); @@ -254,7 +254,7 @@ { RND_DAD_BEGIN_TABLE(exc_ctx.dlg, 2); RND_DAD_LABEL(exc_ctx.dlg, "f0"); - RND_DAD_REAL(exc_ctx.dlg, ""); + RND_DAD_REAL(exc_ctx.dlg); RND_DAD_MINMAX(exc_ctx.dlg, 0, FREQ_MAX); RND_DAD_HELP(exc_ctx.dlg, "Nyquest Rate [Hz]"); RND_DAD_CHANGE_CB(exc_ctx.dlg, exc_val_chg_cb); Index: trunk/src_plugins/export_openems/mesh.c =================================================================== --- trunk/src_plugins/export_openems/mesh.c (revision 32102) +++ trunk/src_plugins/export_openems/mesh.c (revision 32103) @@ -1112,7 +1112,7 @@ RND_DAD_COMPFLAG(ia.dlg, RND_HATF_FRAME); RND_DAD_LABEL(ia.dlg, "XY-mesh"); RND_DAD_BEGIN_HBOX(ia.dlg); - RND_DAD_COORD(ia.dlg, ""); + RND_DAD_COORD(ia.dlg); ia.dens_obj = RND_DAD_CURRENT(ia.dlg); RND_DAD_MINMAX(ia.dlg, 0, RND_MM_TO_COORD(5)); RND_DAD_LABEL(ia.dlg, "copper dens."); @@ -1120,7 +1120,7 @@ RND_DAD_END(ia.dlg); RND_DAD_BEGIN_HBOX(ia.dlg); - RND_DAD_COORD(ia.dlg, ""); + RND_DAD_COORD(ia.dlg); ia.dens_gap = RND_DAD_CURRENT(ia.dlg); RND_DAD_MINMAX(ia.dlg, 0, RND_MM_TO_COORD(5)); RND_DAD_LABEL(ia.dlg, "gap dens."); @@ -1128,7 +1128,7 @@ RND_DAD_END(ia.dlg); RND_DAD_BEGIN_HBOX(ia.dlg); - RND_DAD_COORD(ia.dlg, ""); + RND_DAD_COORD(ia.dlg); ia.min_space = RND_DAD_CURRENT(ia.dlg); RND_DAD_MINMAX(ia.dlg, 0, RND_MM_TO_COORD(5)); RND_DAD_LABEL(ia.dlg, "min. spacing"); @@ -1136,7 +1136,7 @@ RND_DAD_END(ia.dlg); RND_DAD_BEGIN_HBOX(ia.dlg); - RND_DAD_BOOL(ia.dlg, ""); + RND_DAD_BOOL(ia.dlg); ia.smooth = RND_DAD_CURRENT(ia.dlg); RND_DAD_LABEL(ia.dlg, "smooth mesh"); RND_DAD_HELP(ia.dlg, "avoid jumps between different mesh densities,\nuse smooth (gradual) changes"); @@ -1143,7 +1143,7 @@ RND_DAD_END(ia.dlg); RND_DAD_BEGIN_HBOX(ia.dlg); - RND_DAD_BOOL(ia.dlg, ""); + RND_DAD_BOOL(ia.dlg); ia.hor = RND_DAD_CURRENT(ia.dlg); RND_DAD_LABEL(ia.dlg, "horizontal"); RND_DAD_HELP(ia.dlg, "enable adding horizontal mesh lines"); @@ -1150,7 +1150,7 @@ RND_DAD_END(ia.dlg); RND_DAD_BEGIN_HBOX(ia.dlg); - RND_DAD_BOOL(ia.dlg, ""); + RND_DAD_BOOL(ia.dlg); ia.ver = RND_DAD_CURRENT(ia.dlg); RND_DAD_LABEL(ia.dlg, "vertical"); RND_DAD_HELP(ia.dlg, "enable adding vertical mesh lines"); @@ -1157,7 +1157,7 @@ RND_DAD_END(ia.dlg); RND_DAD_BEGIN_HBOX(ia.dlg); - RND_DAD_BOOL(ia.dlg, ""); + RND_DAD_BOOL(ia.dlg); ia.noimpl = RND_DAD_CURRENT(ia.dlg); RND_DAD_LABEL(ia.dlg, "omit implicit"); RND_DAD_HELP(ia.dlg, "add only the mesh lines for boundaries,\nomit in-material meshing"); @@ -1176,7 +1176,7 @@ RND_DAD_END(ia.dlg); RND_DAD_BEGIN_HBOX(ia.dlg); - RND_DAD_COORD(ia.dlg, ""); + RND_DAD_COORD(ia.dlg); ia.def_subs_thick = RND_DAD_CURRENT(ia.dlg); RND_DAD_MINMAX(ia.dlg, 0, RND_MM_TO_COORD(5)); RND_DAD_LABEL(ia.dlg, "def. subst. thick"); @@ -1184,7 +1184,7 @@ RND_DAD_END(ia.dlg); RND_DAD_BEGIN_HBOX(ia.dlg); - RND_DAD_COORD(ia.dlg, ""); + RND_DAD_COORD(ia.dlg); ia.def_copper_thick = RND_DAD_CURRENT(ia.dlg); RND_DAD_MINMAX(ia.dlg, 0, RND_MM_TO_COORD(5)); RND_DAD_LABEL(ia.dlg, "def. copper thick"); @@ -1192,7 +1192,7 @@ RND_DAD_END(ia.dlg); RND_DAD_BEGIN_HBOX(ia.dlg); - RND_DAD_BOOL(ia.dlg, ""); + RND_DAD_BOOL(ia.dlg); ia.air_top = RND_DAD_CURRENT(ia.dlg); RND_DAD_LABEL(ia.dlg, "in air top"); RND_DAD_HELP(ia.dlg, "add mesh lines in air above the top of the board"); @@ -1199,7 +1199,7 @@ RND_DAD_END(ia.dlg); RND_DAD_BEGIN_HBOX(ia.dlg); - RND_DAD_BOOL(ia.dlg, ""); + RND_DAD_BOOL(ia.dlg); ia.air_bot = RND_DAD_CURRENT(ia.dlg); RND_DAD_LABEL(ia.dlg, "in air bottom"); RND_DAD_HELP(ia.dlg, "add mesh lines in air below the bottom of the board"); @@ -1207,7 +1207,7 @@ RND_DAD_BEGIN_HBOX(ia.dlg); - RND_DAD_COORD(ia.dlg, ""); + RND_DAD_COORD(ia.dlg); ia.dens_air = RND_DAD_CURRENT(ia.dlg); RND_DAD_MINMAX(ia.dlg, 0, RND_MM_TO_COORD(5)); RND_DAD_LABEL(ia.dlg, "dens. air"); @@ -1215,7 +1215,7 @@ RND_DAD_END(ia.dlg); RND_DAD_BEGIN_HBOX(ia.dlg); - RND_DAD_COORD(ia.dlg, ""); + RND_DAD_COORD(ia.dlg); ia.max_air = RND_DAD_CURRENT(ia.dlg); RND_DAD_MINMAX(ia.dlg, 0, RND_MM_TO_COORD(5)); RND_DAD_LABEL(ia.dlg, "air thickness"); @@ -1223,7 +1223,7 @@ RND_DAD_END(ia.dlg); RND_DAD_BEGIN_HBOX(ia.dlg); - RND_DAD_BOOL(ia.dlg, ""); + RND_DAD_BOOL(ia.dlg); ia.smoothz = RND_DAD_CURRENT(ia.dlg); RND_DAD_LABEL(ia.dlg, "smooth mesh"); RND_DAD_HELP(ia.dlg, "avoid jumps between different mesh densities,\nuse smooth (gradual) changes"); @@ -1250,7 +1250,7 @@ RND_DAD_BEGIN_HBOX(ia.dlg); RND_DAD_LABEL(ia.dlg, "PML cells:"); - RND_DAD_INTEGER(ia.dlg, ""); + RND_DAD_INTEGER(ia.dlg); ia.pml = RND_DAD_CURRENT(ia.dlg); RND_DAD_MINMAX(ia.dlg, 0, 32); RND_DAD_DEFAULT_NUM(ia.dlg, 8); Index: trunk/src_plugins/import_sch2/import_sch_dlg.c =================================================================== --- trunk/src_plugins/import_sch2/import_sch_dlg.c (revision 32102) +++ trunk/src_plugins/import_sch2/import_sch_dlg.c (revision 32103) @@ -329,7 +329,7 @@ RND_DAD_BEGIN_VBOX(isch_ctx.dlg); /* generic settings */ RND_DAD_BEGIN_HBOX(isch_ctx.dlg); RND_DAD_LABEL(isch_ctx.dlg, "Verbose import:"); - RND_DAD_BOOL(isch_ctx.dlg, ""); + RND_DAD_BOOL(isch_ctx.dlg); isch_ctx.wverbose = RND_DAD_CURRENT(isch_ctx.dlg); RND_DAD_CHANGE_CB(isch_ctx.dlg, isch_generic_chg_cb); RND_DAD_END(isch_ctx.dlg); Index: trunk/src_plugins/io_lihata/write.c =================================================================== --- trunk/src_plugins/io_lihata/write.c (revision 32102) +++ trunk/src_plugins/io_lihata/write.c (revision 32103) @@ -2024,7 +2024,7 @@ RND_DAD_BEGIN_HBOX(sub->dlg); RND_DAD_LABEL(sub->dlg, "Omit font"); RND_DAD_HELP(sub->dlg, "Do not save the font subtree\nWARNING: this will make the board depend on\nthe default font available on systems\nwhere it is loaded; if multiple fonts\nare used, all will be displayed using the default"); - RND_DAD_BOOL(sub->dlg, ""); + RND_DAD_BOOL(sub->dlg); RND_DAD_DEFAULT_NUM(sub->dlg, !!conf_io_lihata.plugins.io_lihata.omit_font); save->womit_font = RND_DAD_CURRENT(sub->dlg); RND_DAD_END(sub->dlg); @@ -2031,7 +2031,7 @@ RND_DAD_BEGIN_HBOX(sub->dlg); RND_DAD_LABEL(sub->dlg, "Omit config"); RND_DAD_HELP(sub->dlg, "Do not save the config subtree\nWARNING: this will lose all DESIGN role\nconfig setting in the resulting file"); - RND_DAD_BOOL(sub->dlg, ""); + RND_DAD_BOOL(sub->dlg); RND_DAD_DEFAULT_NUM(sub->dlg, !!conf_io_lihata.plugins.io_lihata.omit_config); save->womit_config = RND_DAD_CURRENT(sub->dlg); RND_DAD_END(sub->dlg); @@ -2038,7 +2038,7 @@ RND_DAD_BEGIN_HBOX(sub->dlg); RND_DAD_LABEL(sub->dlg, "Omit styles"); RND_DAD_HELP(sub->dlg, "Do not save the routing style subtree\nThe resulting file will have no\nrouting styles"); - RND_DAD_BOOL(sub->dlg, ""); + RND_DAD_BOOL(sub->dlg); RND_DAD_DEFAULT_NUM(sub->dlg, !!conf_io_lihata.plugins.io_lihata.omit_styles); save->womit_styles = RND_DAD_CURRENT(sub->dlg); RND_DAD_END(sub->dlg); Index: trunk/src_plugins/irc/irc.c =================================================================== --- trunk/src_plugins/irc/irc.c (revision 32102) +++ trunk/src_plugins/irc/irc.c (revision 32103) @@ -256,7 +256,7 @@ RND_DAD_BEGIN_HBOX(irc_ctx.dlg); RND_DAD_COMPFLAG(irc_ctx.dlg, RND_HATF_TIGHT | RND_HATF_FRAME); - RND_DAD_BOOL(irc_ctx.dlg, ""); + RND_DAD_BOOL(irc_ctx.dlg); irc_ctx.wscroll = RND_DAD_CURRENT(irc_ctx.dlg); RND_DAD_DEFAULT_NUM(irc_ctx.dlg, 1); RND_DAD_LABEL(irc_ctx.dlg, "scroll"); @@ -266,7 +266,7 @@ RND_DAD_BEGIN_HBOX(irc_ctx.dlg); RND_DAD_COMPFLAG(irc_ctx.dlg, RND_HATF_TIGHT | RND_HATF_FRAME); - RND_DAD_BOOL(irc_ctx.dlg, ""); + RND_DAD_BOOL(irc_ctx.dlg); irc_ctx.wraise = RND_DAD_CURRENT(irc_ctx.dlg); RND_DAD_DEFAULT_NUM(irc_ctx.dlg, 1); RND_DAD_LABEL(irc_ctx.dlg, "raise"); Index: trunk/src_plugins/lib_hid_common/act_dad.c =================================================================== --- trunk/src_plugins/lib_hid_common/act_dad.c (revision 32102) +++ trunk/src_plugins/lib_hid_common/act_dad.c (revision 32103) @@ -24,6 +24,8 @@ * mailing list: pcb-rnd (at) list.repo.hu (send "subscribe") */ +#define RND_DAD_CFG_NOLABEL 1 + #include #include @@ -235,8 +237,8 @@ "dad(dlgname, button, text) - append a button widget\n" "dad(dlgname, button_closes, label, retval, ...) - standard close buttons\n" "dad(dlgname, enum, choices) - append an enum (combo box) widget; choices is a tab separated list\n" - "dad(dlgname, bool, [label]) - append an checkbox widget (default off)\n" - "dad(dlgname, integer|real|coord, min, max, [label]) - append an input field\n" + "dad(dlgname, bool) - append an checkbox widget (default off)\n" + "dad(dlgname, integer|real|coord, min, max) - append an input field\n" "dad(dlgname, string) - append a single line text input field\n" "dad(dlgname, default, val) - set the default value of a widet while creating the dialog\n" "dad(dlgname, help, tooltip) - set the help (tooltip) text for the current widget\n" @@ -321,19 +323,15 @@ } else if (rnd_strcasecmp(cmd, "bool") == 0) { if (dad->running) goto cant_chg; - txt = ""; - RND_ACT_MAY_CONVARG(3, FGW_STR, dad, txt = argv[3].val.str); - RND_DAD_BOOL(dad->dlg, txt); + RND_DAD_BOOL(dad->dlg); rv = RND_DAD_CURRENT(dad->dlg); } else if (rnd_strcasecmp(cmd, "integer") == 0) { long vmin, vmax; if (dad->running) goto cant_chg; - txt = ""; RND_ACT_CONVARG(3, FGW_LONG, dad, vmin = argv[3].val.nat_long); RND_ACT_CONVARG(4, FGW_LONG, dad, vmax = argv[4].val.nat_long); - RND_ACT_MAY_CONVARG(5, FGW_STR, dad, txt = argv[5].val.str); - RND_DAD_INTEGER(dad->dlg, txt); + RND_DAD_INTEGER(dad->dlg); RND_DAD_MINMAX(dad->dlg, vmin, vmax); rv = RND_DAD_CURRENT(dad->dlg); } @@ -340,11 +338,9 @@ else if (rnd_strcasecmp(cmd, "real") == 0) { double vmin, vmax; if (dad->running) goto cant_chg; - txt = ""; RND_ACT_CONVARG(3, FGW_DOUBLE, dad, vmin = argv[3].val.nat_double); RND_ACT_CONVARG(4, FGW_DOUBLE, dad, vmax = argv[4].val.nat_double); - RND_ACT_MAY_CONVARG(5, FGW_STR, dad, txt = argv[5].val.str); - RND_DAD_REAL(dad->dlg, txt); + RND_DAD_REAL(dad->dlg); RND_DAD_MINMAX(dad->dlg, vmin, vmax); rv = RND_DAD_CURRENT(dad->dlg); } @@ -351,11 +347,9 @@ else if (rnd_strcasecmp(cmd, "coord") == 0) { rnd_coord_t vmin, vmax; if (dad->running) goto cant_chg; - txt = ""; RND_ACT_CONVARG(3, FGW_COORD_, dad, vmin = fgw_coord(&argv[3])); RND_ACT_CONVARG(4, FGW_COORD_, dad, vmax = fgw_coord(&argv[4])); - RND_ACT_MAY_CONVARG(5, FGW_STR, dad, txt = argv[5].val.str); - RND_DAD_COORD(dad->dlg, txt); + RND_DAD_COORD(dad->dlg); RND_DAD_MINMAX(dad->dlg, vmin, vmax); rv = RND_DAD_CURRENT(dad->dlg); } Index: trunk/src_plugins/lib_hid_common/dlg_comm_m.c =================================================================== --- trunk/src_plugins/lib_hid_common/dlg_comm_m.c (revision 32102) +++ trunk/src_plugins/lib_hid_common/dlg_comm_m.c (revision 32103) @@ -28,6 +28,8 @@ Even the core will run some of these, through a dispatcher (e.g. action). */ +#define RND_DAD_CFG_NOLABEL 1 + #include #include #include @@ -176,17 +178,17 @@ RND_DAD_COMPFLAG(ctx.dlg, RND_HATF_CLR_STATIC); RND_DAD_BEGIN_TABLE(ctx.dlg, 2); RND_DAD_LABEL(ctx.dlg, "red"); - RND_DAD_INTEGER(ctx.dlg, ""); + RND_DAD_INTEGER(ctx.dlg); RND_DAD_MINMAX(ctx.dlg, 0, 255); RND_DAD_CHANGE_CB(ctx.dlg, color_change_cb); ctx.wr = RND_DAD_CURRENT(ctx.dlg); RND_DAD_LABEL(ctx.dlg, "green"); - RND_DAD_INTEGER(ctx.dlg, ""); + RND_DAD_INTEGER(ctx.dlg); RND_DAD_MINMAX(ctx.dlg, 0, 255); RND_DAD_CHANGE_CB(ctx.dlg, color_change_cb); ctx.wg = RND_DAD_CURRENT(ctx.dlg); RND_DAD_LABEL(ctx.dlg, "blue"); - RND_DAD_INTEGER(ctx.dlg, ""); + RND_DAD_INTEGER(ctx.dlg); RND_DAD_MINMAX(ctx.dlg, 0, 255); RND_DAD_CHANGE_CB(ctx.dlg, color_change_cb); ctx.wb = RND_DAD_CURRENT(ctx.dlg); @@ -259,7 +261,7 @@ RND_DAD_LABEL(dlg, "Do you want to overwrite that file?"); RND_DAD_BEGIN_HBOX(dlg); - RND_DAD_BOOL(dlg, ""); + RND_DAD_BOOL(dlg); wdontask = RND_DAD_CURRENT(dlg); RND_DAD_LABEL(dlg, "do not ask, always overwrite"); RND_DAD_HELP(dlg, "saved in your user config under plugins/dialogs/file_overwrite_dialog/dont_ask"); Index: trunk/src_plugins/lib_hid_common/dlg_log.c =================================================================== --- trunk/src_plugins/lib_hid_common/dlg_log.c (revision 32102) +++ trunk/src_plugins/lib_hid_common/dlg_log.c (revision 32103) @@ -24,6 +24,8 @@ * mailing list: pcb-rnd (at) list.repo.hu (send "subscribe") */ +#define RND_DAD_CFG_NOLABEL 1 + #include #include @@ -154,7 +156,7 @@ RND_DAD_CHANGE_CB(ctx->dlg, btn_export_cb); RND_DAD_BEGIN_HBOX(ctx->dlg); RND_DAD_COMPFLAG(ctx->dlg, RND_HATF_FRAME); - RND_DAD_BOOL(ctx->dlg, ""); + RND_DAD_BOOL(ctx->dlg); ctx->wscroll = RND_DAD_CURRENT(ctx->dlg); RND_DAD_LABEL(ctx->dlg, "scroll"); RND_DAD_END(ctx->dlg); Index: trunk/src_plugins/lib_hid_pcbui/routest.c =================================================================== --- trunk/src_plugins/lib_hid_pcbui/routest.c (revision 32102) +++ trunk/src_plugins/lib_hid_pcbui/routest.c (revision 32103) @@ -180,7 +180,7 @@ RND_DAD_BEGIN_HBOX(rst.sub.dlg); RND_DAD_COMPFLAG(rst.sub.dlg, RND_HATF_HIDE); rst.whbox[n] = RND_DAD_CURRENT(rst.sub.dlg); - RND_DAD_BOOL(rst.sub.dlg, ""); + RND_DAD_BOOL(rst.sub.dlg); rst.wchk[n] = RND_DAD_CURRENT(rst.sub.dlg); RND_DAD_CHANGE_CB(rst.sub.dlg, rst_select_cb); RND_DAD_LABEL(rst.sub.dlg, "unused"); Index: trunk/src_plugins/lib_hid_pcbui/routest_dlg.c =================================================================== --- trunk/src_plugins/lib_hid_pcbui/routest_dlg.c (revision 32102) +++ trunk/src_plugins/lib_hid_pcbui/routest_dlg.c (revision 32103) @@ -263,7 +263,7 @@ RND_DAD_CHANGE_CB(rstdlg_ctx.dlg, rst_change_cb); RND_DAD_LABEL(rstdlg_ctx.dlg, "Line thick.:"); - RND_DAD_COORD(rstdlg_ctx.dlg, ""); + RND_DAD_COORD(rstdlg_ctx.dlg); rstdlg_ctx.wlineth = RND_DAD_CURRENT(rstdlg_ctx.dlg); RND_DAD_HELP(rstdlg_ctx.dlg, "Thickness of line/arc objects"); RND_DAD_MINMAX(rstdlg_ctx.dlg, 1, RND_MAX_COORD); @@ -270,7 +270,7 @@ RND_DAD_CHANGE_CB(rstdlg_ctx.dlg, rst_change_cb); RND_DAD_LABEL(rstdlg_ctx.dlg, "Text scale:"); - RND_DAD_COORD(rstdlg_ctx.dlg, ""); + RND_DAD_COORD(rstdlg_ctx.dlg); rstdlg_ctx.wtxtscale = RND_DAD_CURRENT(rstdlg_ctx.dlg); RND_DAD_HELP(rstdlg_ctx.dlg, "Text size scale in %; 100 means normal size"); RND_DAD_MINMAX(rstdlg_ctx.dlg, 1, RND_MAX_COORD); @@ -277,7 +277,7 @@ RND_DAD_CHANGE_CB(rstdlg_ctx.dlg, rst_change_cb); RND_DAD_LABEL(rstdlg_ctx.dlg, "Clearance:"); - RND_DAD_COORD(rstdlg_ctx.dlg, ""); + RND_DAD_COORD(rstdlg_ctx.dlg); rstdlg_ctx.wclr = RND_DAD_CURRENT(rstdlg_ctx.dlg); RND_DAD_HELP(rstdlg_ctx.dlg, "Object clearance: any object placed with this style\nwill clear this much from sorrunding clearing-enabled polygons\n(unless the object is joined to the polygon)"); RND_DAD_MINMAX(rstdlg_ctx.dlg, 1, RND_MAX_COORD); @@ -284,7 +284,7 @@ RND_DAD_CHANGE_CB(rstdlg_ctx.dlg, rst_change_cb); RND_DAD_LABEL(rstdlg_ctx.dlg, "Text thick.:"); - RND_DAD_COORD(rstdlg_ctx.dlg, ""); + RND_DAD_COORD(rstdlg_ctx.dlg); rstdlg_ctx.wtxtth = RND_DAD_CURRENT(rstdlg_ctx.dlg); RND_DAD_HELP(rstdlg_ctx.dlg, "Text stroke thickness;\nif 0 use the default heuristics that\ncalculates it from text scale"); RND_DAD_MINMAX(rstdlg_ctx.dlg, 1, RND_MAX_COORD); @@ -291,7 +291,7 @@ RND_DAD_CHANGE_CB(rstdlg_ctx.dlg, rst_change_cb); RND_DAD_LABEL(rstdlg_ctx.dlg, "*Via hole:"); - RND_DAD_COORD(rstdlg_ctx.dlg, ""); + RND_DAD_COORD(rstdlg_ctx.dlg); rstdlg_ctx.wviahole = RND_DAD_CURRENT(rstdlg_ctx.dlg); RND_DAD_HELP(rstdlg_ctx.dlg, "Via hole diameter\nwarning: will be replaced with the padstack selector"); RND_DAD_MINMAX(rstdlg_ctx.dlg, 1, RND_MAX_COORD); @@ -298,7 +298,7 @@ RND_DAD_CHANGE_CB(rstdlg_ctx.dlg, rst_change_cb); RND_DAD_LABEL(rstdlg_ctx.dlg, "*Via ring:"); - RND_DAD_COORD(rstdlg_ctx.dlg, ""); + RND_DAD_COORD(rstdlg_ctx.dlg); rstdlg_ctx.wviaring = RND_DAD_CURRENT(rstdlg_ctx.dlg); RND_DAD_HELP(rstdlg_ctx.dlg, "Via ring diameter\nwarning: will be replaced with the padstack selector"); RND_DAD_MINMAX(rstdlg_ctx.dlg, 1, RND_MAX_COORD); Index: trunk/src_plugins/lib_polyhelp/polyhelp.c =================================================================== --- trunk/src_plugins/lib_polyhelp/polyhelp.c (revision 32102) +++ trunk/src_plugins/lib_polyhelp/polyhelp.c (revision 32103) @@ -392,7 +392,7 @@ RND_DAD_BEGIN_TABLE(dlg, 2); RND_DAD_LABEL(dlg, "Spacing"); - RND_DAD_COORD(dlg, ""); + RND_DAD_COORD(dlg); RND_DAD_HELP(dlg, "Distance between centerlines of adjacent hatch lines for vertical and horizontal hatching"); RND_DAD_DEFAULT_NUM(dlg, conf_core.design.line_thickness * 2); RND_DAD_MINMAX(dlg, 1, RND_MM_TO_COORD(100)); @@ -399,22 +399,22 @@ wspc = RND_DAD_CURRENT(dlg); RND_DAD_LABEL(dlg, "Draw contour"); - RND_DAD_BOOL(dlg, ""); + RND_DAD_BOOL(dlg); RND_DAD_HELP(dlg, "Draw the contour of the polygon"); wcont = RND_DAD_CURRENT(dlg); RND_DAD_LABEL(dlg, "Draw horizontal hatch"); - RND_DAD_BOOL(dlg, ""); + RND_DAD_BOOL(dlg); RND_DAD_HELP(dlg, "Draw evenly spaced horizontal hatch lines"); whor = RND_DAD_CURRENT(dlg); RND_DAD_LABEL(dlg, "Draw vertical hatch"); - RND_DAD_BOOL(dlg, ""); + RND_DAD_BOOL(dlg); RND_DAD_HELP(dlg, "Draw evenly spaced vertical hatch lines"); wver = RND_DAD_CURRENT(dlg); RND_DAD_LABEL(dlg, "Clear-line"); - RND_DAD_BOOL(dlg, ""); + RND_DAD_BOOL(dlg); RND_DAD_HELP(dlg, "Hatch lines have clearance"); wclr = RND_DAD_CURRENT(dlg); Index: trunk/src_plugins/order/order_dlg.c =================================================================== --- trunk/src_plugins/order/order_dlg.c (revision 32102) +++ trunk/src_plugins/order/order_dlg.c (revision 32103) @@ -70,11 +70,11 @@ RND_DAD_DEFAULT_NUM(octx->dlg, f->val.lng); break; case RND_HATT_INTEGER: - RND_DAD_INTEGER(octx->dlg, ""); + RND_DAD_INTEGER(octx->dlg); RND_DAD_DEFAULT_NUM(octx->dlg, f->val.lng); break; case RND_HATT_COORD: - RND_DAD_COORD(octx->dlg, ""); + RND_DAD_COORD(octx->dlg); RND_DAD_DEFAULT_NUM(octx->dlg, f->val.crd); break; case RND_HATT_STRING: Index: trunk/src_plugins/propedit/propdlg.c =================================================================== --- trunk/src_plugins/propedit/propdlg.c (revision 32102) +++ trunk/src_plugins/propedit/propdlg.c (revision 32103) @@ -501,13 +501,13 @@ RND_DAD_END(ctx->dlg); RND_DAD_BEGIN_VBOX(ctx->dlg); RND_DAD_LABEL(ctx->dlg, "Data type: coord"); - RND_DAD_COORD(ctx->dlg, ""); + RND_DAD_COORD(ctx->dlg); ctx->wedit[2] = RND_DAD_CURRENT(ctx->dlg); RND_DAD_MINMAX(ctx->dlg, -RND_MAX_COORD, RND_MAX_COORD); RND_DAD_ENTER_CB(ctx->dlg, prop_data_auto_cb); RND_DAD_BEGIN_HBOX(ctx->dlg); RND_DAD_LABEL(ctx->dlg, "abs"); - RND_DAD_BOOL(ctx->dlg, ""); + RND_DAD_BOOL(ctx->dlg); ctx->wabs[2] = RND_DAD_CURRENT(ctx->dlg); RND_DAD_HELP(ctx->dlg, abshelp); RND_DAD_BEGIN_HBOX(ctx->dlg); @@ -519,13 +519,13 @@ RND_DAD_END(ctx->dlg); RND_DAD_BEGIN_VBOX(ctx->dlg); RND_DAD_LABEL(ctx->dlg, "Data type: angle"); - RND_DAD_REAL(ctx->dlg, ""); + RND_DAD_REAL(ctx->dlg); ctx->wedit[3] = RND_DAD_CURRENT(ctx->dlg); RND_DAD_MINMAX(ctx->dlg, -360.0, +360.0); RND_DAD_ENTER_CB(ctx->dlg, prop_data_auto_cb); RND_DAD_BEGIN_HBOX(ctx->dlg); RND_DAD_LABEL(ctx->dlg, "abs"); - RND_DAD_BOOL(ctx->dlg, ""); + RND_DAD_BOOL(ctx->dlg); ctx->wabs[3] = RND_DAD_CURRENT(ctx->dlg); RND_DAD_HELP(ctx->dlg, abshelp); RND_DAD_BEGIN_HBOX(ctx->dlg); @@ -537,13 +537,13 @@ RND_DAD_END(ctx->dlg); RND_DAD_BEGIN_VBOX(ctx->dlg); RND_DAD_LABEL(ctx->dlg, "Data type: double"); - RND_DAD_REAL(ctx->dlg, ""); + RND_DAD_REAL(ctx->dlg); ctx->wedit[4] = RND_DAD_CURRENT(ctx->dlg); RND_DAD_MINMAX(ctx->dlg, -1000, +1000); RND_DAD_ENTER_CB(ctx->dlg, prop_data_auto_cb); RND_DAD_BEGIN_HBOX(ctx->dlg); RND_DAD_LABEL(ctx->dlg, "abs"); - RND_DAD_BOOL(ctx->dlg, ""); + RND_DAD_BOOL(ctx->dlg); ctx->wabs[4] = RND_DAD_CURRENT(ctx->dlg); RND_DAD_HELP(ctx->dlg, abshelp); RND_DAD_BEGIN_HBOX(ctx->dlg); @@ -557,13 +557,13 @@ RND_DAD_BEGIN_VBOX(ctx->dlg); RND_DAD_LABEL(ctx->dlg, "Data type: int"); - RND_DAD_INTEGER(ctx->dlg, ""); + RND_DAD_INTEGER(ctx->dlg); ctx->wedit[5] = RND_DAD_CURRENT(ctx->dlg); RND_DAD_ENTER_CB(ctx->dlg, prop_data_auto_cb); RND_DAD_MINMAX(ctx->dlg, -(1<<30), 1<<30); RND_DAD_BEGIN_HBOX(ctx->dlg); RND_DAD_LABEL(ctx->dlg, "abs"); - RND_DAD_BOOL(ctx->dlg, ""); + RND_DAD_BOOL(ctx->dlg); ctx->wabs[5] = RND_DAD_CURRENT(ctx->dlg); RND_DAD_HELP(ctx->dlg, abshelp); RND_DAD_BEGIN_HBOX(ctx->dlg); @@ -576,7 +576,7 @@ RND_DAD_BEGIN_VBOX(ctx->dlg); RND_DAD_LABEL(ctx->dlg, "Data type: boolean"); - RND_DAD_BOOL(ctx->dlg, ""); + RND_DAD_BOOL(ctx->dlg); ctx->wedit[6] = RND_DAD_CURRENT(ctx->dlg); RND_DAD_BEGIN_HBOX(ctx->dlg); ctx->wabs[6] = 0; Index: trunk/src_plugins/query/dlg_search.c =================================================================== --- trunk/src_plugins/query/dlg_search.c (revision 32102) +++ trunk/src_plugins/query/dlg_search.c (revision 32103) @@ -502,7 +502,7 @@ RND_DAD_COMPFLAG(ctx->dlg, RND_HATF_FRAME | RND_HATF_EXPFILL | RND_HATF_SCROLL); RND_DAD_BEGIN_HBOX(ctx->dlg); RND_DAD_LABEL(ctx->dlg, "Enable the wizard:"); - RND_DAD_BOOL(ctx->dlg, ""); + RND_DAD_BOOL(ctx->dlg); ctx->wwizard = RND_DAD_CURRENT(ctx->dlg); RND_DAD_DEFAULT_NUM(ctx->dlg, 1); RND_DAD_CHANGE_CB(ctx->dlg, search_enable_cb); Index: trunk/src_plugins/query/dlg_search_edit.c =================================================================== --- trunk/src_plugins/query/dlg_search_edit.c (revision 32102) +++ trunk/src_plugins/query/dlg_search_edit.c (revision 32103) @@ -315,19 +315,19 @@ ctx->wright[RIGHT_STR] = RND_DAD_CURRENT(ctx->dlg); RND_DAD_CHANGE_CB(ctx->dlg, srchexpr_right_cb); - RND_DAD_INTEGER(ctx->dlg, ""); + RND_DAD_INTEGER(ctx->dlg); RND_DAD_COMPFLAG(ctx->dlg, RND_HATF_HIDE); ctx->wright[RIGHT_INT] = RND_DAD_CURRENT(ctx->dlg); RND_DAD_MINMAX(ctx->dlg, -(1L<<30), (1L<<30)); RND_DAD_CHANGE_CB(ctx->dlg, srchexpr_right_cb); - RND_DAD_REAL(ctx->dlg, ""); + RND_DAD_REAL(ctx->dlg); RND_DAD_COMPFLAG(ctx->dlg, RND_HATF_HIDE); ctx->wright[RIGHT_DOUBLE] = RND_DAD_CURRENT(ctx->dlg); RND_DAD_MINMAX(ctx->dlg, -(1L<<30), (1L<<30)); RND_DAD_CHANGE_CB(ctx->dlg, srchexpr_right_cb); - RND_DAD_COORD(ctx->dlg, ""); + RND_DAD_COORD(ctx->dlg); RND_DAD_COMPFLAG(ctx->dlg, RND_HATF_HIDE); ctx->wright[RIGHT_COORD] = RND_DAD_CURRENT(ctx->dlg); RND_DAD_MINMAX(ctx->dlg, -RND_MAX_COORD, RND_MAX_COORD); Index: trunk/src_plugins/script/live_script.c =================================================================== --- trunk/src_plugins/script/live_script.c (revision 32102) +++ trunk/src_plugins/script/live_script.c (revision 32103) @@ -250,7 +250,7 @@ RND_DAD_HELP(lvs->dlg, "Reload script source and rerun\n(Ideal with external editor)"); RND_DAD_END(lvs->dlg); RND_DAD_BEGIN_HBOX(lvs->dlg); - RND_DAD_BOOL(lvs->dlg, ""); + RND_DAD_BOOL(lvs->dlg); lvs->wpers = RND_DAD_CURRENT(lvs->dlg); RND_DAD_LABEL(lvs->dlg, "persistent"); RND_DAD_HELP(lvs->dlg, "Persistent mode: keep the script loaded and running\n(useful if the script registers actions)\nNon-persistent mode: run once then unload."); Index: trunk/src_plugins/shape/shape_dialog.c =================================================================== --- trunk/src_plugins/shape/shape_dialog.c (revision 32102) +++ trunk/src_plugins/shape/shape_dialog.c (revision 32103) @@ -161,7 +161,7 @@ RND_DAD_BEGIN_TABLE(shp->dlg, 2); RND_DAD_LABEL(shp->dlg, "Number of corners"); RND_DAD_BEGIN_HBOX(shp->dlg); - RND_DAD_INTEGER(shp->dlg, ""); + RND_DAD_INTEGER(shp->dlg); shp->corners = RND_DAD_CURRENT(shp->dlg); RND_DAD_MINVAL(shp->dlg, 3); RND_DAD_MAXVAL(shp->dlg, 64); @@ -171,7 +171,7 @@ RND_DAD_LABEL(shp->dlg, "Shape radius"); RND_DAD_BEGIN_HBOX(shp->dlg); - RND_DAD_COORD(shp->dlg, ""); + RND_DAD_COORD(shp->dlg); shp->prx = RND_DAD_CURRENT(shp->dlg); RND_DAD_MINMAX(shp->dlg, 0, maxr); RND_DAD_DEFAULT_NUM(shp->dlg, mm2); @@ -181,7 +181,7 @@ RND_DAD_LABEL(shp->dlg, ""); RND_DAD_BEGIN_HBOX(shp->dlg); - RND_DAD_COORD(shp->dlg, ""); + RND_DAD_COORD(shp->dlg); shp->pry = RND_DAD_CURRENT(shp->dlg); RND_DAD_MINMAX(shp->dlg, 0, maxr); RND_DAD_DEFAULT_NUM(shp->dlg, mm2); @@ -191,7 +191,7 @@ RND_DAD_LABEL(shp->dlg, ""); RND_DAD_BEGIN_HBOX(shp->dlg); - RND_DAD_BOOL(shp->dlg, ""); + RND_DAD_BOOL(shp->dlg); shp->pell = RND_DAD_CURRENT(shp->dlg); RND_DAD_CHANGE_CB(shp->dlg, shp_chg_regpoly); RND_DAD_LABEL(shp->dlg, "elliptical"); @@ -199,7 +199,7 @@ RND_DAD_LABEL(shp->dlg, "Rotation angle:"); RND_DAD_BEGIN_HBOX(shp->dlg); - RND_DAD_REAL(shp->dlg, ""); + RND_DAD_REAL(shp->dlg); shp->prot = RND_DAD_CURRENT(shp->dlg); RND_DAD_MINVAL(shp->dlg, -360); RND_DAD_MAXVAL(shp->dlg, 360); @@ -209,7 +209,7 @@ RND_DAD_LABEL(shp->dlg, "Center offset"); RND_DAD_BEGIN_HBOX(shp->dlg); - RND_DAD_COORD(shp->dlg, ""); + RND_DAD_COORD(shp->dlg); shp->pcx = RND_DAD_CURRENT(shp->dlg); RND_DAD_MINMAX(shp->dlg, 0, maxr); RND_DAD_CHANGE_CB(shp->dlg, shp_chg_regpoly); @@ -218,7 +218,7 @@ RND_DAD_LABEL(shp->dlg, ""); RND_DAD_BEGIN_HBOX(shp->dlg); - RND_DAD_COORD(shp->dlg, ""); + RND_DAD_COORD(shp->dlg); shp->pcy = RND_DAD_CURRENT(shp->dlg); RND_DAD_MINMAX(shp->dlg, 0, maxr); RND_DAD_CHANGE_CB(shp->dlg, shp_chg_regpoly); @@ -235,7 +235,7 @@ RND_DAD_LABEL(shp->dlg, "Rectangle size"); RND_DAD_BEGIN_HBOX(shp->dlg); - RND_DAD_COORD(shp->dlg, ""); + RND_DAD_COORD(shp->dlg); shp->w = RND_DAD_CURRENT(shp->dlg); RND_DAD_MINMAX(shp->dlg, 0, maxr); RND_DAD_DEFAULT_NUM(shp->dlg, mm2); @@ -245,7 +245,7 @@ RND_DAD_LABEL(shp->dlg, ""); RND_DAD_BEGIN_HBOX(shp->dlg); - RND_DAD_COORD(shp->dlg, ""); + RND_DAD_COORD(shp->dlg); shp->h = RND_DAD_CURRENT(shp->dlg); RND_DAD_MINMAX(shp->dlg, 0, maxr); RND_DAD_DEFAULT_NUM(shp->dlg, mm2); @@ -255,7 +255,7 @@ RND_DAD_LABEL(shp->dlg, ""); RND_DAD_BEGIN_HBOX(shp->dlg); - RND_DAD_BOOL(shp->dlg, ""); + RND_DAD_BOOL(shp->dlg); shp->rrect = RND_DAD_CURRENT(shp->dlg); RND_DAD_CHANGE_CB(shp->dlg, shp_chg_roundrect); RND_DAD_LABEL(shp->dlg, "rectangular"); @@ -263,7 +263,7 @@ RND_DAD_LABEL(shp->dlg, "Rounding radius"); RND_DAD_BEGIN_HBOX(shp->dlg); - RND_DAD_COORD(shp->dlg, ""); + RND_DAD_COORD(shp->dlg); shp->rx = RND_DAD_CURRENT(shp->dlg); RND_DAD_MINMAX(shp->dlg, 0, maxr); RND_DAD_DEFAULT_NUM(shp->dlg, mm2/10); @@ -273,7 +273,7 @@ RND_DAD_LABEL(shp->dlg, ""); RND_DAD_BEGIN_HBOX(shp->dlg); - RND_DAD_COORD(shp->dlg, ""); + RND_DAD_COORD(shp->dlg); shp->ry = RND_DAD_CURRENT(shp->dlg); RND_DAD_MINMAX(shp->dlg, 0, maxr); RND_DAD_DEFAULT_NUM(shp->dlg, mm2/10); @@ -283,7 +283,7 @@ RND_DAD_LABEL(shp->dlg, ""); RND_DAD_BEGIN_HBOX(shp->dlg); - RND_DAD_BOOL(shp->dlg, ""); + RND_DAD_BOOL(shp->dlg); shp->rell = RND_DAD_CURRENT(shp->dlg); RND_DAD_CHANGE_CB(shp->dlg, shp_chg_roundrect); RND_DAD_LABEL(shp->dlg, "elliptical"); @@ -291,7 +291,7 @@ RND_DAD_LABEL(shp->dlg, "Arc resolution factor:"); RND_DAD_BEGIN_HBOX(shp->dlg); - RND_DAD_REAL(shp->dlg, ""); + RND_DAD_REAL(shp->dlg); shp->rres = RND_DAD_CURRENT(shp->dlg); RND_DAD_MINVAL(shp->dlg, 0.1); RND_DAD_MAXVAL(shp->dlg, 5); @@ -301,7 +301,7 @@ RND_DAD_LABEL(shp->dlg, "Rotation angle:"); RND_DAD_BEGIN_HBOX(shp->dlg); - RND_DAD_REAL(shp->dlg, ""); + RND_DAD_REAL(shp->dlg); shp->rrot = RND_DAD_CURRENT(shp->dlg); RND_DAD_MINVAL(shp->dlg, -360); RND_DAD_MAXVAL(shp->dlg, 360); @@ -311,7 +311,7 @@ RND_DAD_LABEL(shp->dlg, "Center offset"); RND_DAD_BEGIN_HBOX(shp->dlg); - RND_DAD_COORD(shp->dlg, ""); + RND_DAD_COORD(shp->dlg); shp->rcx = RND_DAD_CURRENT(shp->dlg); RND_DAD_MINMAX(shp->dlg, 0, maxr); RND_DAD_CHANGE_CB(shp->dlg, shp_chg_roundrect); @@ -320,7 +320,7 @@ RND_DAD_LABEL(shp->dlg, ""); RND_DAD_BEGIN_HBOX(shp->dlg); - RND_DAD_COORD(shp->dlg, ""); + RND_DAD_COORD(shp->dlg); shp->rcy = RND_DAD_CURRENT(shp->dlg); RND_DAD_MINMAX(shp->dlg, 0, maxr); RND_DAD_CHANGE_CB(shp->dlg, shp_chg_roundrect); @@ -352,7 +352,7 @@ RND_DAD_LABEL(shp->dlg, "Generate filled circle"); RND_DAD_BEGIN_HBOX(shp->dlg); RND_DAD_LABEL(shp->dlg, "Diameter:"); - RND_DAD_COORD(shp->dlg, ""); + RND_DAD_COORD(shp->dlg); shp->dia = RND_DAD_CURRENT(shp->dlg); RND_DAD_MINMAX(shp->dlg, 0, maxr); RND_DAD_DEFAULT_NUM(shp->dlg, mm2); @@ -361,7 +361,7 @@ RND_DAD_LABEL(shp->dlg, "Center offset"); RND_DAD_BEGIN_HBOX(shp->dlg); - RND_DAD_COORD(shp->dlg, ""); + RND_DAD_COORD(shp->dlg); shp->ccx = RND_DAD_CURRENT(shp->dlg); RND_DAD_MINMAX(shp->dlg, 0, maxr); RND_DAD_CHANGE_CB(shp->dlg, shp_chg_circle); @@ -370,7 +370,7 @@ RND_DAD_LABEL(shp->dlg, ""); RND_DAD_BEGIN_HBOX(shp->dlg); - RND_DAD_COORD(shp->dlg, ""); + RND_DAD_COORD(shp->dlg); shp->ccy = RND_DAD_CURRENT(shp->dlg); RND_DAD_MINMAX(shp->dlg, 0, maxr); RND_DAD_CHANGE_CB(shp->dlg, shp_chg_circle);