2008-02-02 Jim Evins <evins@snaught.com>

2008-02-02  Jim Evins  <evins@snaught.com>

	* src/Makefile.am:
	* src/wdgt-merge-menu.c:
	* src/wdgt-merge-menu.h:
	* src/debug.c: (gl_debug_init):
	* src/debug.h:
	* src/marshal.list:
		New merge menu widget.
	* data/glade/object-editor.glade:
	* src/object-editor-private.h:
	* src/object-editor.c: (gl_object_editor_set_key_names):
	* src/object-editor-edit-page.c:
	(gl_object_editor_prepare_edit_page), (field_selected_cb),
	(insert_button_cb):
		Simplified UI for inserting fields into text objects by launching
		a merge menu and directly inserting fields from the menu.  No more
		selecting field in combobox, then pressing insert button.

git-svn-id: https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@740 f5e0f49d-192f-0410-a22d-a8d8700d0965