Index: trunk/src/brave.c
===================================================================
--- trunk/src/brave.c	(revision 21460)
+++ trunk/src/brave.c	(revision 21461)
@@ -225,8 +225,9 @@
 	PCB_DAD_END(dlg);
 
 
-	PCB_DAD_NEW(dlg, "dlg_padstack_edit", "Edit padstack", dlg, pcb_true, NULL);
+	PCB_DAD_NEW(dlg, "Brave features", dlg, pcb_true, NULL);
 	brave2dlg(dlg_hid_ctx);
+	PCB_DAD_RUN(dlg);
 	PCB_DAD_FREE(dlg);
 	return 0;
 }
Index: trunk/src/hid.h
===================================================================
--- trunk/src/hid.h	(revision 21460)
+++ trunk/src/hid.h	(revision 21461)
@@ -396,7 +396,7 @@
 	int (*attribute_dialog)(pcb_hid_attribute_t *attrs, int n_attrs, pcb_hid_attr_val_t *results, const char *title, const char *descr, void *caller_data);
 
 	/* The same API in 3 stages: */
-	void *(*attr_dlg_new)(pcb_hid_attribute_t *attrs, int n_attrs, pcb_hid_attr_val_t *results, const char *title, const char *descr, void *caller_data, pcb_bool modal, void (*button_cb)(void *caller_data, pcb_hid_attr_ev_t ev)); /* returns hid_ctx */
+	void *(*attr_dlg_new)(pcb_hid_attribute_t *attrs, int n_attrs, pcb_hid_attr_val_t *results, const char *title, void *caller_data, pcb_bool modal, void (*button_cb)(void *caller_data, pcb_hid_attr_ev_t ev)); /* returns hid_ctx */
 	int (*attr_dlg_run)(void *hid_ctx);
 	void (*attr_dlg_free)(void *hid_ctx); /* results_ is avalibale after this call */
 
Index: trunk/src/hid_dad.h
===================================================================
--- trunk/src/hid_dad.h	(revision 21460)
+++ trunk/src/hid_dad.h	(revision 21461)
@@ -69,11 +69,11 @@
 	table ## _alloced = 0; \
 } while(0)
 
-#define PCB_DAD_NEW(table, title, descr, caller_data, modal, ev_cb) \
+#define PCB_DAD_NEW(table, title, caller_data, modal, ev_cb) \
 do { \
 	if (table ## _result == NULL) \
 		PCB_DAD_ALLOC_RESULT(table); \
-	table ## _hid_ctx = pcb_gui->attr_dlg_new(table, table ## _len, table ## _result, title, descr, caller_data, modal, ev_cb); \
+	table ## _hid_ctx = pcb_gui->attr_dlg_new(table, table ## _len, table ## _result, title, caller_data, modal, ev_cb); \
 } while(0)
 
 #define PCB_DAD_RUN(table) pcb_hid_dad_run(table ## _hid_ctx, &table ## _ret_override)
Index: trunk/src/hid_nogui.c
===================================================================
--- trunk/src/hid_nogui.c	(revision 21460)
+++ trunk/src/hid_nogui.c	(revision 21461)
@@ -380,7 +380,7 @@
 		return pcb_strdup(answer);
 }
 
-void *pcb_nogui_attr_dlg_new(pcb_hid_attribute_t *attrs_, int n_attrs_, pcb_hid_attr_val_t * results_, const char *title_, const char *descr_, void *caller_data, pcb_bool modal, void (*button_cb)(void *caller_data, pcb_hid_attr_ev_t ev))
+void *pcb_nogui_attr_dlg_new(pcb_hid_attribute_t *attrs_, int n_attrs_, pcb_hid_attr_val_t * results_, const char *title_, void *caller_data, pcb_bool modal, void (*button_cb)(void *caller_data, pcb_hid_attr_ev_t ev))
 {
 	CRASH("attr_dlg_new");
 }
Index: trunk/src/hid_nogui.h
===================================================================
--- trunk/src/hid_nogui.h	(revision 21460)
+++ trunk/src/hid_nogui.h	(revision 21461)
@@ -5,6 +5,6 @@
 pcb_hid_t *pcb_hid_nogui_get_hid(void);
 
 /* For checking if attr dialogs are not available: */
-void *pcb_nogui_attr_dlg_new(pcb_hid_attribute_t *attrs_, int n_attrs_, pcb_hid_attr_val_t * results_, const char *title_, const char *descr_, void *caller_data, pcb_bool modal, void (*button_cb)(void *caller_data, pcb_hid_attr_ev_t ev));
+void *pcb_nogui_attr_dlg_new(pcb_hid_attribute_t *attrs_, int n_attrs_, pcb_hid_attr_val_t * results_, const char *title_, void *caller_data, pcb_bool modal, void (*button_cb)(void *caller_data, pcb_hid_attr_ev_t ev));
 
 #endif
Index: trunk/src_plugins/asm/asm.c
===================================================================
--- trunk/src_plugins/asm/asm.c	(revision 21460)
+++ trunk/src_plugins/asm/asm.c	(revision 21461)
@@ -573,7 +573,7 @@
 	PCB_DAD_END(asm_ctx.dlg);
 
 	asm_ctx.active = 1;
-	PCB_DAD_NEW(asm_ctx.dlg, "Hand assembly with pcb-rnd", "Asm", &asm_ctx, pcb_false, asm_close_cb);
+	PCB_DAD_NEW(asm_ctx.dlg, "Hand assembly with pcb-rnd", &asm_ctx, pcb_false, asm_close_cb);
 
 	/* expand all groups by default */
 	for(g = (group_t **)asm_ctx.grps.array, n = 0; n < asm_ctx.grps.used; g++,n++)
Index: trunk/src_plugins/ddraft/constraint_gui.c
===================================================================
--- trunk/src_plugins/ddraft/constraint_gui.c	(revision 21460)
+++ trunk/src_plugins/ddraft/constraint_gui.c	(revision 21461)
@@ -319,7 +319,7 @@
 	/* set up the context */
 	cnstgui_ctx.active = 1;
 
-	PCB_DAD_NEW(cnstgui_ctx.dlg, "Drawing constraints", "constraints", &cnstgui_ctx, pcb_false, cnstgui_close_cb);
+	PCB_DAD_NEW(cnstgui_ctx.dlg, "Drawing constraints", &cnstgui_ctx, pcb_false, cnstgui_close_cb);
 
 	cons_changed();
 
Index: trunk/src_plugins/dialogs/TEMPLATE.c
===================================================================
--- trunk/src_plugins/dialogs/TEMPLATE.c	(revision 21460)
+++ trunk/src_plugins/dialogs/TEMPLATE.c	(revision 21461)
@@ -80,7 +80,7 @@
 	/* set up the context */
 	foo_ctx.active = 1;
 
-	PCB_DAD_NEW(foo_ctx.dlg, "EDIT THIS", "EDIT THIS", &foo_ctx, pcb_false, foo_close_cb);
+	PCB_DAD_NEW(foo_ctx.dlg, "EDIT THIS: title", &foo_ctx, pcb_false, foo_close_cb);
 }
 
 static const char pcb_acts_Foo[] = "Foo(object)\n"; <<<- edit this
Index: trunk/src_plugins/dialogs/TEMPLATE_MODAL.c
===================================================================
--- trunk/src_plugins/dialogs/TEMPLATE_MODAL.c	(revision 21460)
+++ trunk/src_plugins/dialogs/TEMPLATE_MODAL.c	(revision 21461)
@@ -61,7 +61,7 @@
 	/* set up the context */
 	ctx.attrs = dlg;
 
-	PCB_DAD_NEW(dlg, "EDIT THIS", "EDIT THIS", &ctx, pcb_true, NULL);
+	PCB_DAD_NEW(dlg, "EDIT THIS: title", &ctx, pcb_true, NULL);
 	PCB_DAD_RUN(dlg);
 	PCB_DAD_FREE(dlg);
 }
Index: trunk/src_plugins/dialogs/act_dad.c
===================================================================
--- trunk/src_plugins/dialogs/act_dad.c	(revision 21460)
+++ trunk/src_plugins/dialogs/act_dad.c	(revision 21461)
@@ -194,8 +194,8 @@
 	"dad(dlgname, end) - end the last begin\n"
 	"dad(dlgname, flags, flg1, flg2, ...) - change the flags of the last created widget\n"
 	"dad(dlgname, onchange, action) - set the action to be called on widget change\n"
-	"dad(dlgname, run, longname, shortname) - present dlgname as a non-modal dialog\n"
-	"dad(dlgname, run_modal, longname, shortname) - present dlgname as a modal dialog\n"
+	"dad(dlgname, run, title) - present dlgname as a non-modal dialog\n"
+	"dad(dlgname, run_modal, title) - present dlgname as a modal dialog\n"
 	"dad(dlgname, exists) - returns wheter the named dialog exists (0 or 1)\n"
 	"dad(dlgname, set, widgetID, val) - changes the value of a widget in a running dialog \n"
 	"dad(dlgname, get, widgetID, [unit]) - return the current value of a widget\n"
@@ -506,12 +506,9 @@
 		}
 		return 0;
 	}	else if ((pcb_strcasecmp(cmd, "run") == 0) || (pcb_strcasecmp(cmd, "run_modal") == 0)) {
-		char *sh;
-
 		if (dad->running) goto cant_chg;
 
 		PCB_ACT_CONVARG(3, FGW_STR, dad, txt = argv[3].val.str);
-		PCB_ACT_CONVARG(4, FGW_STR, dad, sh = argv[4].val.str);
 
 		if (dad->level != 0) {
 			pcb_message(PCB_MSG_ERROR, "Invalid DAD dialog structure: %d levels not closed (missing 'end' calls)\n", dad->level);
@@ -518,7 +515,7 @@
 			rv = -1;
 		}
 		else {
-			PCB_DAD_NEW(dad->dlg, txt, sh, dad, (cmd[3] == '_'), dad_close_cb);
+			PCB_DAD_NEW(dad->dlg, txt, dad, (cmd[3] == '_'), dad_close_cb);
 			rv = PCB_DAD_CURRENT(dad->dlg);
 		}
 	}
Index: trunk/src_plugins/dialogs/dlg_about.c
===================================================================
--- trunk/src_plugins/dialogs/dlg_about.c	(revision 21460)
+++ trunk/src_plugins/dialogs/dlg_about.c	(revision 21461)
@@ -92,7 +92,7 @@
 	about_ctx.active = 1;
 
 	/* this is the modal version - please consider using the non-modal version */
-	PCB_DAD_NEW(about_ctx.dlg, "About pcb-rnd", "About", &about_ctx, pcb_false, about_close_cb);
+	PCB_DAD_NEW(about_ctx.dlg, "About pcb-rnd", &about_ctx, pcb_false, about_close_cb);
 }
 
 static const char pcb_acts_About[] = "About()\n";
Index: trunk/src_plugins/dialogs/dlg_comm_m.c
===================================================================
--- trunk/src_plugins/dialogs/dlg_comm_m.c	(revision 21460)
+++ trunk/src_plugins/dialogs/dlg_comm_m.c	(revision 21461)
@@ -47,7 +47,7 @@
 			dlg[ws].default_val.str_value = pcb_strdup(default_str);
 	PCB_DAD_END(dlg);
 
-	PCB_DAD_NEW(dlg, title, NULL, NULL, pcb_true, NULL);
+	PCB_DAD_NEW(dlg, title, NULL, pcb_true, NULL);
 	PCB_DAD_RUN(dlg);
 
 	res->type = FGW_STR | FGW_DYN;
Index: trunk/src_plugins/dialogs/dlg_export.c
===================================================================
--- trunk/src_plugins/dialogs/dlg_export.c	(revision 21460)
+++ trunk/src_plugins/dialogs/dlg_export.c	(revision 21461)
@@ -177,7 +177,7 @@
 	/* set up the context */
 	export_ctx.active = 1;
 
-	PCB_DAD_NEW(export_ctx.dlg, "Export", "Export in various formats", &export_ctx, pcb_false, export_close_cb);
+	PCB_DAD_NEW(export_ctx.dlg, "Export in various formats", &export_ctx, pcb_false, export_close_cb);
 }
 
 static const char pcb_acts_ExportGUI[] = "ExportGUI()\n";
Index: trunk/src_plugins/dialogs/dlg_flag_edit.c
===================================================================
--- trunk/src_plugins/dialogs/dlg_flag_edit.c	(revision 21460)
+++ trunk/src_plugins/dialogs/dlg_flag_edit.c	(revision 21461)
@@ -133,7 +133,7 @@
 
 		ctx.attrs = dlg;
 
-		PCB_DAD_NEW(dlg, "flag_edit", "Edit flags", &ctx, pcb_true, NULL);
+		PCB_DAD_NEW(dlg, "Edit flags", &ctx, pcb_true, NULL);
 
 		val.func = fe_attr_chg;
 		pcb_gui->attr_dlg_property(dlg_hid_ctx, PCB_HATP_GLOBAL_CALLBACK, &val);
Index: trunk/src_plugins/dialogs/dlg_fontsel.c
===================================================================
--- trunk/src_plugins/dialogs/dlg_fontsel.c	(revision 21460)
+++ trunk/src_plugins/dialogs/dlg_fontsel.c	(revision 21461)
@@ -126,7 +126,7 @@
 	PCB_DAD_END(fontsel_ctx.dlg);
 
 	fontsel_ctx.active = 1;
-	PCB_DAD_NEW(fontsel_ctx.dlg, "Font selection", "", &fontsel_ctx, pcb_true, fontsel_close_cb);
+	PCB_DAD_NEW(fontsel_ctx.dlg, "Font selection", &fontsel_ctx, pcb_true, fontsel_close_cb);
 }
 
 static const char pcb_acts_Fontsel[] = "Fontsel2()\n";
Index: trunk/src_plugins/dialogs/dlg_layer_binding.c
===================================================================
--- trunk/src_plugins/dialogs/dlg_layer_binding.c	(revision 21460)
+++ trunk/src_plugins/dialogs/dlg_layer_binding.c	(revision 21461)
@@ -344,7 +344,7 @@
 
 		ctx.attrs = dlg;
 
-		PCB_DAD_NEW(dlg, "layer_binding", "Layer bindings", &ctx, pcb_true, NULL);
+		PCB_DAD_NEW(dlg, "Layer bindings", &ctx, pcb_true, NULL);
 		val.func = lb_attr_chg;
 		pcb_gui->attr_dlg_property(dlg_hid_ctx, PCB_HATP_GLOBAL_CALLBACK, &val);
 		lb_data2dialog(dlg_hid_ctx, &ctx);
Index: trunk/src_plugins/dialogs/dlg_lib_pstk.c
===================================================================
--- trunk/src_plugins/dialogs/dlg_lib_pstk.c	(revision 21460)
+++ trunk/src_plugins/dialogs/dlg_lib_pstk.c	(revision 21461)
@@ -569,7 +569,7 @@
 	else
 		name = pcb_strdup("pcb-rnd padstacks - board");
 
-	PCB_DAD_NEW(ctx->dlg, name, "", ctx, modal, pstklib_close_cb);
+	PCB_DAD_NEW(ctx->dlg, name, ctx, modal, pstklib_close_cb);
 
 	pstklib_data2dlg(ctx);
 	free(name);
Index: trunk/src_plugins/dialogs/dlg_padstack.c
===================================================================
--- trunk/src_plugins/dialogs/dlg_padstack.c	(revision 21460)
+++ trunk/src_plugins/dialogs/dlg_padstack.c	(revision 21461)
@@ -569,7 +569,7 @@
 		PCB_DAD_END(dlg);
 	PCB_DAD_END(dlg);
 
-	PCB_DAD_NEW(dlg, "dlg_padstack_edit_shape", "Edit padstack shape", pse, pcb_true, NULL);
+	PCB_DAD_NEW(dlg, "Edit padstack shape", pse, pcb_true, NULL);
 	pse->shape_chg = dlg;
 
 /*	pse_ps2dlg(dlg_hid_ctx, pse);*/
@@ -850,7 +850,7 @@
 		PCB_DAD_END(dlg);
 	PCB_DAD_END(dlg);
 
-	PCB_DAD_NEW(dlg, "dlg_padstack_edit", "Edit padstack", pse, pcb_true, NULL);
+	PCB_DAD_NEW(dlg, "Edit padstack", pse, pcb_true, NULL);
 	pse->attrs = dlg;
 	pse_ps2dlg(dlg_hid_ctx, pse);
 	if (target_tab > 0)
Index: trunk/src_plugins/dialogs/dlg_pinout.c
===================================================================
--- trunk/src_plugins/dialogs/dlg_pinout.c	(revision 21460)
+++ trunk/src_plugins/dialogs/dlg_pinout.c	(revision 21461)
@@ -164,7 +164,7 @@
 		sprintf(title, "Subcircuit #%ld (%s) pinout", sc->ID, sc->refdes);
 	else
 		sprintf(title, "Subcircuit #%ld pinout", sc->ID);
-	PCB_DAD_NEW(ctx->dlg, title, "Pinout", ctx, pcb_false, pinout_close_cb);
+	PCB_DAD_NEW(ctx->dlg, title, ctx, pcb_false, pinout_close_cb);
 }
 
 static const char pcb_acts_Pinout[] = "Pinout()\n";
Index: trunk/src_plugins/dialogs/dlg_plugins.c
===================================================================
--- trunk/src_plugins/dialogs/dlg_plugins.c	(revision 21460)
+++ trunk/src_plugins/dialogs/dlg_plugins.c	(revision 21461)
@@ -77,7 +77,7 @@
 		PCB_DAD_LABEL(dlg, str.array);
 	PCB_DAD_END(dlg);
 
-	PCB_DAD_NEW(dlg, "Manage plugins", "", NULL, pcb_true, NULL);
+	PCB_DAD_NEW(dlg, "Manage plugins", NULL, pcb_true, NULL);
 	PCB_DAD_RUN(dlg);
 	PCB_DAD_FREE(dlg);
 
Index: trunk/src_plugins/dialogs/dlg_pref.c
===================================================================
--- trunk/src_plugins/dialogs/dlg_pref.c	(revision 21460)
+++ trunk/src_plugins/dialogs/dlg_pref.c	(revision 21461)
@@ -278,7 +278,7 @@
 	/* set up the context */
 	pref_ctx.active = 1;
 
-	PCB_DAD_NEW(pref_ctx.dlg, "pcb-rnd preferences", "", &pref_ctx, pcb_false, pref_close_cb);
+	PCB_DAD_NEW(pref_ctx.dlg, "pcb-rnd preferences", &pref_ctx, pcb_false, pref_close_cb);
 
 	pcb_dlg_pref_lib_open(&pref_ctx);
 	if (target_tab >= 0)
Index: trunk/src_plugins/dialogs/dlg_pref_lib.c
===================================================================
--- trunk/src_plugins/dialogs/dlg_pref_lib.c	(revision 21460)
+++ trunk/src_plugins/dialogs/dlg_pref_lib.c	(revision 21461)
@@ -258,7 +258,7 @@
 			PCB_DAD_CHANGE_CB(ctx.dlg, libhelp_btn);
 	PCB_DAD_END(ctx.dlg);
 
-	PCB_DAD_NEW(ctx.dlg, "Edit library path", "", &ctx, pcb_true, NULL);
+	PCB_DAD_NEW(ctx.dlg, "Edit library path", &ctx, pcb_true, NULL);
 	if (PCB_DAD_RUN(ctx.dlg) != 0) {
 		PCB_DAD_FREE(ctx.dlg);
 		return -1;
@@ -358,7 +358,7 @@
 	PCB_DAD_END(ctx->dlg);
 
 	ctx->active = 1;
-	PCB_DAD_NEW(ctx->dlg, "pcb-rnd preferences: library help", "", ctx, pcb_false, pref_libhelp_close_cb);
+	PCB_DAD_NEW(ctx->dlg, "pcb-rnd preferences: library help", ctx, pcb_false, pref_libhelp_close_cb);
 }
 
 static void libhelp_btn(void *hid_ctx, void *caller_data, pcb_hid_attribute_t *attr)
Index: trunk/src_plugins/dialogs/dlg_undo.c
===================================================================
--- trunk/src_plugins/dialogs/dlg_undo.c	(revision 21460)
+++ trunk/src_plugins/dialogs/dlg_undo.c	(revision 21461)
@@ -141,7 +141,7 @@
 	/* set up the context */
 	undo_ctx.active = 1;
 
-	PCB_DAD_NEW(undo_ctx.dlg, "pcb-rnd undo list", "", &undo_ctx, pcb_false, undo_close_cb);
+	PCB_DAD_NEW(undo_ctx.dlg, "pcb-rnd undo list", &undo_ctx, pcb_false, undo_close_cb);
 	undo_data2dlg(&undo_ctx);
 }
 
Index: trunk/src_plugins/dialogs/dlg_view.c
===================================================================
--- trunk/src_plugins/dialogs/dlg_view.c	(revision 21460)
+++ trunk/src_plugins/dialogs/dlg_view.c	(revision 21461)
@@ -659,7 +659,7 @@
 		PCB_DAD_END(ctx->dlg);
 	PCB_DAD_END(ctx->dlg);
 
-	PCB_DAD_NEW(ctx->dlg, title, "", ctx, pcb_false, view_close_cb);
+	PCB_DAD_NEW(ctx->dlg, title, ctx, pcb_false, view_close_cb);
 
 	ctx->active = 1;
 }
@@ -717,7 +717,7 @@
 
 	PCB_DAD_END(ctx->dlg);
 
-	PCB_DAD_NEW(ctx->dlg, title, "", ctx, pcb_false, view_close_cb);
+	PCB_DAD_NEW(ctx->dlg, title, ctx, pcb_false, view_close_cb);
 
 	ctx->active = 1;
 
Index: trunk/src_plugins/export_openems/mesh.c
===================================================================
--- trunk/src_plugins/export_openems/mesh.c	(revision 21460)
+++ trunk/src_plugins/export_openems/mesh.c	(revision 21461)
@@ -874,7 +874,7 @@
 
 	PCB_DAD_END(ia.dlg);
 
-	PCB_DAD_NEW(ia.dlg, "mesher", "Generate mesh", &ia, 0, ia_close_cb);
+	PCB_DAD_NEW(ia.dlg, "mesher", &ia, 0, ia_close_cb);
 
 	PCB_DAD_SET_VALUE(ia.dlg_hid_ctx, ia.dens_obj, coord_value, PCB_MM_TO_COORD(0.15));
 	PCB_DAD_SET_VALUE(ia.dlg_hid_ctx, ia.dens_gap, coord_value, PCB_MM_TO_COORD(0.5));
Index: trunk/src_plugins/extedit/extedit_dad.c
===================================================================
--- trunk/src_plugins/extedit/extedit_dad.c	(revision 21460)
+++ trunk/src_plugins/extedit/extedit_dad.c	(revision 21461)
@@ -121,7 +121,7 @@
 		PCB_DAD_END(ee.dlg);
 	PCB_DAD_END(ee.dlg);
 
-	PCB_DAD_NEW(ee.dlg, "External editor", "External editor", &ee, pcb_true, NULL);
+	PCB_DAD_NEW(ee.dlg, "External editor", &ee, pcb_true, NULL);
 
 	ee_data2dialog(&ee);
 	res = PCB_DAD_RUN(ee.dlg);
Index: trunk/src_plugins/hid_lesstif/dialogs.c
===================================================================
--- trunk/src_plugins/hid_lesstif/dialogs.c	(revision 21460)
+++ trunk/src_plugins/hid_lesstif/dialogs.c	(revision 21461)
@@ -979,7 +979,7 @@
 	return -1;
 }
 
-void *lesstif_attr_dlg_new(pcb_hid_attribute_t *attrs, int n_attrs, pcb_hid_attr_val_t *results, const char *title, const char *descr, void *caller_data, pcb_bool modal, void (*button_cb)(void *caller_data, pcb_hid_attr_ev_t ev))
+void *lesstif_attr_dlg_new(pcb_hid_attribute_t *attrs, int n_attrs, pcb_hid_attr_val_t *results, const char *title, void *caller_data, pcb_bool modal, void (*button_cb)(void *caller_data, pcb_hid_attr_ev_t ev))
 {
 	Widget topform, main_tbl;
 	int i;
@@ -1073,7 +1073,7 @@
 	int rv;
 	void *hid_ctx;
 	
-	hid_ctx = lesstif_attr_dlg_new(attrs, n_attrs, results, title, descr, caller_data, pcb_true, NULL);
+	hid_ctx = lesstif_attr_dlg_new(attrs, n_attrs, results, title, caller_data, pcb_true, NULL);
 	rv = lesstif_attr_dlg_run(hid_ctx);
 	lesstif_attr_dlg_free(hid_ctx);
 
Index: trunk/src_plugins/hid_lesstif/main.c
===================================================================
--- trunk/src_plugins/hid_lesstif/main.c	(revision 21460)
+++ trunk/src_plugins/hid_lesstif/main.c	(revision 21461)
@@ -3418,7 +3418,7 @@
 
 extern int lesstif_close_confirm_dialog();
 
-extern void *lesstif_attr_dlg_new(pcb_hid_attribute_t *attrs_, int n_attrs_, pcb_hid_attr_val_t *results_, const char *title_, const char *descr_, void *caller_data, pcb_bool modal, void (*button_cb)(void *caller_data, pcb_hid_attr_ev_t ev));
+extern void *lesstif_attr_dlg_new(pcb_hid_attribute_t *attrs_, int n_attrs_, pcb_hid_attr_val_t *results_, const char *title_, void *caller_data, pcb_bool modal, void (*button_cb)(void *caller_data, pcb_hid_attr_ev_t ev));
 
 extern int lesstif_attr_dlg_run(void *hid_ctx);
 extern void lesstif_attr_dlg_free(void *hid_ctx);
Index: trunk/src_plugins/hid_remote/remote.c
===================================================================
--- trunk/src_plugins/hid_remote/remote.c	(revision 21460)
+++ trunk/src_plugins/hid_remote/remote.c	(revision 21461)
@@ -351,7 +351,7 @@
 {
 }
 
-static void *remote_attr_dlg_new(pcb_hid_attribute_t *attrs_, int n_attrs_, pcb_hid_attr_val_t * results_, const char *title_, const char *descr_, void *caller_data, pcb_bool modal, void (*button_cb)(void *caller_data, pcb_hid_attr_ev_t ev))
+static void *remote_attr_dlg_new(pcb_hid_attribute_t *attrs_, int n_attrs_, pcb_hid_attr_val_t * results_, const char *title_, void *caller_data, pcb_bool modal, void (*button_cb)(void *caller_data, pcb_hid_attr_ev_t ev))
 {
 	return NULL;
 }
Index: trunk/src_plugins/lib_gtk_common/dlg_attribute.c
===================================================================
--- trunk/src_plugins/lib_gtk_common/dlg_attribute.c	(revision 21460)
+++ trunk/src_plugins/lib_gtk_common/dlg_attribute.c	(revision 21461)
@@ -719,10 +719,10 @@
 	return 1;
 }
 
-void *ghid_attr_dlg_new(pcb_gtk_common_t *com, pcb_hid_attribute_t *attrs, int n_attrs, pcb_hid_attr_val_t *results, const char *title, const char *descr, void *caller_data, pcb_bool modal, void (*button_cb)(void *caller_data, pcb_hid_attr_ev_t ev))
+void *ghid_attr_dlg_new(pcb_gtk_common_t *com, pcb_hid_attribute_t *attrs, int n_attrs, pcb_hid_attr_val_t *results, const char *title, void *caller_data, pcb_bool modal, void (*button_cb)(void *caller_data, pcb_hid_attr_ev_t ev))
 {
 	GtkWidget *content_area;
-	GtkWidget *main_vbox, *vbox;
+	GtkWidget *main_vbox;
 	attr_dlg_t *ctx;
 	resp_ctx_t *resp_ctx = NULL;
 
@@ -757,12 +757,7 @@
 	gtk_container_set_border_width(GTK_CONTAINER(main_vbox), 6);
 	gtk_container_add_with_properties(GTK_CONTAINER(content_area), main_vbox, "expand", TRUE, "fill", TRUE, NULL);
 
-	if (!PCB_HATT_IS_COMPOSITE(attrs[0].type)) {
-		vbox = ghid_category_vbox(main_vbox, descr != NULL ? descr : "", 4, 2, TRUE, TRUE);
-		ghid_attr_dlg_add(ctx, vbox, NULL, 0, 1);
-	}
-	else
-		ghid_attr_dlg_add(ctx, main_vbox, NULL, 0, (attrs[0].pcb_hatt_flags & PCB_HATF_LABEL));
+	ghid_attr_dlg_add(ctx, main_vbox, NULL, 0, (attrs[0].pcb_hatt_flags & PCB_HATF_LABEL));
 
 	gtk_widget_show_all(ctx->dialog);
 
@@ -816,7 +811,7 @@
 	void *hid_ctx;
 	int rc;
 
-	hid_ctx = ghid_attr_dlg_new(com, attrs, n_attrs, results, title, descr, caller_data, pcb_true, NULL);
+	hid_ctx = ghid_attr_dlg_new(com, attrs, n_attrs, results, title, caller_data, pcb_true, NULL);
 	rc = ghid_attr_dlg_run(hid_ctx);
 	ghid_attr_dlg_free(hid_ctx);
 
Index: trunk/src_plugins/lib_gtk_common/dlg_attribute.h
===================================================================
--- trunk/src_plugins/lib_gtk_common/dlg_attribute.h	(revision 21460)
+++ trunk/src_plugins/lib_gtk_common/dlg_attribute.h	(revision 21461)
@@ -2,7 +2,7 @@
 #include "hid.h"
 #include "glue.h"
 
-void *ghid_attr_dlg_new(pcb_gtk_common_t *com, pcb_hid_attribute_t *attrs, int n_attrs, pcb_hid_attr_val_t *results, const char *title, const char *descr, void *caller_data, pcb_bool modal, void (*button_cb)(void *caller_data, pcb_hid_attr_ev_t ev));
+void *ghid_attr_dlg_new(pcb_gtk_common_t *com, pcb_hid_attribute_t *attrs, int n_attrs, pcb_hid_attr_val_t *results, const char *title, void *caller_data, pcb_bool modal, void (*button_cb)(void *caller_data, pcb_hid_attr_ev_t ev));
 int ghid_attr_dlg_run(void *hid_ctx);
 void ghid_attr_dlg_free(void *hid_ctx);
 void ghid_attr_dlg_property(void *hid_ctx, pcb_hat_property_t prop, const pcb_hid_attr_val_t *val);
Index: trunk/src_plugins/lib_gtk_hid/glue_hid.c
===================================================================
--- trunk/src_plugins/lib_gtk_hid/glue_hid.c	(revision 21460)
+++ trunk/src_plugins/lib_gtk_hid/glue_hid.c	(revision 21461)
@@ -359,9 +359,9 @@
 	return ghid_attribute_dialog(&ghidgui->common, attrs, n_attrs, results, title, descr, caller_data);
 }
 
-static void *ghid_attr_dlg_new_(pcb_hid_attribute_t *attrs, int n_attrs, pcb_hid_attr_val_t *results, const char *title, const char *descr, void *caller_data, pcb_bool modal, void (*button_cb)(void *caller_data, pcb_hid_attr_ev_t ev))
+static void *ghid_attr_dlg_new_(pcb_hid_attribute_t *attrs, int n_attrs, pcb_hid_attr_val_t *results, const char *title, void *caller_data, pcb_bool modal, void (*button_cb)(void *caller_data, pcb_hid_attr_ev_t ev))
 {
-	return ghid_attr_dlg_new(&ghidgui->common, attrs, n_attrs, results, title, descr, caller_data, modal, button_cb);
+	return ghid_attr_dlg_new(&ghidgui->common, attrs, n_attrs, results, title, caller_data, modal, button_cb);
 }
 
 static void ghid_beep()
Index: trunk/src_plugins/report/report.c
===================================================================
--- trunk/src_plugins/report/report.c	(revision 21460)
+++ trunk/src_plugins/report/report.c	(revision 21461)
@@ -94,7 +94,7 @@
 		PCB_DAD_LABEL(ctx->dlg, content);
 	PCB_DAD_END(ctx->dlg);
 
-	PCB_DAD_NEW(ctx->dlg, name, "EDIT THIS", ctx, pcb_false, rdialog_close_cb);
+	PCB_DAD_NEW(ctx->dlg, name, ctx, pcb_false, rdialog_close_cb);
 }
 
 
Index: trunk/src_plugins/script/script_act.c
===================================================================
--- trunk/src_plugins/script/script_act.c	(revision 21460)
+++ trunk/src_plugins/script/script_act.c	(revision 21461)
@@ -244,7 +244,7 @@
 	/* set up the context */
 	script_dlg.active = 1;
 
-	PCB_DAD_NEW(script_dlg.dlg, "pcb-rnd Scripts", "", &script_dlg, pcb_false, script_dlg_close_cb);
+	PCB_DAD_NEW(script_dlg.dlg, "pcb-rnd Scripts", &script_dlg, pcb_false, script_dlg_close_cb);
 	script_dlg_s2d(&script_dlg);
 }
 
Index: trunk/src_plugins/shape/shape_dialog.c
===================================================================
--- trunk/src_plugins/shape/shape_dialog.c	(revision 21460)
+++ trunk/src_plugins/shape/shape_dialog.c	(revision 21461)
@@ -338,7 +338,7 @@
 		PCB_DAD_END(shp->dlg);
 	PCB_DAD_END(shp->dlg);
 
-	PCB_DAD_NEW(shp->dlg, "dlg_shape", "Generate shapes", shp, modal, shp_close_cb);
+	PCB_DAD_NEW(shp->dlg, "dlg_shape", shp, modal, shp_close_cb);
 	PCB_DAD_SET_VALUE(shp->dlg_hid_ctx, shp->dia, coord_value, PCB_MM_TO_COORD(25.4)); /* suppress a runtime warning on invalid dia (zero) */
 	shp_chg_circle(shp->dlg_hid_ctx, shp, NULL);
 	shp_chg_roundrect(shp->dlg_hid_ctx, shp, NULL);