added boolean "sample-merged" property, API and GUI. Pick from the active

2005-07-09  Michael Natterer  <mitch@gimp.org>

	* app/widgets/gimpcursorview.[ch]: added boolean "sample-merged"
	property, API and GUI. Pick from the active drawable if it's
	FALSE.

	* app/actions/Makefile.am
	* app/actions/actions.c
	* app/actions/cursor-info-actions.[ch]
	* app/actions/cursor-info-commands.[ch]: new files with actions
	and callbacks for the cursor info dialog's menu.

	* app/widgets/gimphelp-ids.h: help IDs for above actions.

	* app/actions/dialogs-actions.c
	* app/dialogs/dialogs.c: follow help ID change.

	* app/menus/menus.c
	* menus/Makefile.am
	* menus/cursor-info-menu.xml: add the cursor-info menu.

	* app/dialogs/dialogs-constructors.c: pass the menu factory to
	gimp_cursor_view_new().
This commit is contained in:
Michael Natterer 2005-07-08 23:06:35 +00:00 committed by Michael Natterer
parent 2f7388db6f
commit d928e7699a
2 changed files with 2 additions and 1 deletions

View File

@ -12,6 +12,7 @@
* app/widgets/gimphelp-ids.h: help IDs for above actions.
* app/actions/dialogs-actions.c
* app/dialogs/dialogs.c: follow help ID change.
* app/menus/menus.c

View File

@ -114,7 +114,7 @@ GimpStringActionEntry dialogs_dockable_actions[] =
{ "dialogs-cursor", GIMP_STOCK_CURSOR,
N_("_Cursor"), NULL, NULL,
"gimp-cursor-view",
GIMP_HELP_CURSOR_DIALOG },
GIMP_HELP_CURSOR_INFO_DIALOG },
{ "dialogs-sample-points", GIMP_STOCK_SAMPLE_POINT,
N_("_Sample Points"), NULL, NULL,