app/actions/documents-actions.c app/actions/documents-commands.c
2004-05-12 Michael Natterer <mitch@gimp.org> * app/actions/documents-actions.c * app/actions/documents-commands.c * app/actions/edit-actions.c * app/actions/edit-commands.[ch] * app/actions/layers-actions.c * app/actions/layers-commands.c * app/actions/select-actions.c * app/actions/select-commands.[ch] * app/actions/vectors-actions.c * app/actions/vectors-commands.[ch]: added tooltips for actions which are now used for dialog buttons, added callback implementations which formerly lived in various widgets, moved some actions around and did some general cleanups. * menus/image-menu.xml.in: s/edit-stroke/select-stroke/ * menus/Makefile.am * menus/selection-editor-menu.xml: new popup menu. * app/menus/menus.c: register <SelectionEditor> and <UndoEditor> UI managers. * app/widgets/gimpeditor.[ch]: added construct properties "menu-factory", "menu-identifier", "ui-path" and "popup-data". Implement GObject::constructor() and create the UI manager if all needed properties were set. Enables creating action buttons at widget construction time because they need a UI manager. (gimp_editor_add_action_button): changed to take a va_list of "extended" actions which are invoked if the resp. button emits "extended_clicked". Store the actions and their modifier masks in a list attached to the button. * app/widgets/gimpcontainerview.c (gimp_container_view_item_selected): if the view has container *and* context, simply change the context and return. (gimp_container_view_context_changed): don't emit "select_item" manually but simply call gimp_container_view_select_item(). (gimp_container_view_viewable_dropped): use gimp_container_view_item_selected() instead of changing the context directly. * app/widgets/gimpcontainereditor.c (gimp_container_editor_select_item): update the UI manager. * app/widgets/gimpdockable.c: don't try to fiddle with the dialog's menu if it doesn't have a ui_path (happens if the UI manager is just a collection of actions for the dialog buttons and has no menu registered). * app/widgets/gimpimageeditor.c: connect to the image's "flush" signal and update the UI manager in the callback. * app/widgets/gimpitemtreeview.c: use GimpEditor's construct properties to create the UI manager so GimpItemTreeView subclasses can have action buttons. Update the UI manager in gimp_item_tree_view_select_item(). * app/widgets/gimpbufferview.c * app/widgets/gimpcolormapeditor.c * app/widgets/gimpcontainergridview.c * app/widgets/gimpdatafactoryview.c * app/widgets/gimpfontview.c * app/widgets/gimpimageview.c * app/widgets/gimptemplateview.c * app/widgets/gimptoolview.c: changed calls to gimp_editor_add_action_button() accordingly and removed some unneeded select_item() implementations. * app/widgets/gimpchanneltreeview.c * app/widgets/gimpvectorstreeview.[ch] * app/widgets/gimpdocumentview.[ch] * app/widgets/gimplayertreeview.c * app/widgets/gimpselectioneditor.[ch] * app/widgets/gimpundoeditor.[ch]: use action buttons and removed lots of callbacks which went to the resp. action callbacks. * app/widgets/widgets-types.h: removed some now unneeded function prototypes. * app/gui/dialogs-constructors.c: changed (simplified) many dialog constructors accordingly.
This commit is contained in:
Michael Natterer
committed by
Michael Natterer
Michael Natterer
parent
6750667d87
commit
2632cd8f64
@ -41,21 +41,27 @@
|
||||
|
||||
static GimpActionEntry select_actions[] =
|
||||
{
|
||||
{ "select-menu", NULL,
|
||||
N_("_Select") },
|
||||
{ "selection-editor-popup", GIMP_STOCK_TOOL_RECT_SELECT,
|
||||
N_("Selection Editor Menu"), NULL, NULL, NULL,
|
||||
GIMP_HELP_SELECTION_DIALOG },
|
||||
|
||||
{ "select-menu", NULL, N_("_Select") },
|
||||
|
||||
{ "select-all", GIMP_STOCK_SELECTION_ALL,
|
||||
N_("_All"), "<control>A", NULL,
|
||||
N_("_All"), "<control>A",
|
||||
N_("Select all"),
|
||||
G_CALLBACK (select_all_cmd_callback),
|
||||
GIMP_HELP_SELECTION_ALL },
|
||||
|
||||
{ "select-none", GIMP_STOCK_SELECTION_NONE,
|
||||
N_("_None"), "<control><shift>A", NULL,
|
||||
N_("_None"), "<control><shift>A",
|
||||
N_("Select none"),
|
||||
G_CALLBACK (select_none_cmd_callback),
|
||||
GIMP_HELP_SELECTION_NONE },
|
||||
|
||||
{ "select-invert", GIMP_STOCK_INVERT,
|
||||
N_("_Invert"), "<control>I", NULL,
|
||||
N_("_Invert"), "<control>I",
|
||||
N_("Invert selection"),
|
||||
G_CALLBACK (select_invert_cmd_callback),
|
||||
GIMP_HELP_SELECTION_INVERT },
|
||||
|
||||
@ -95,12 +101,20 @@ static GimpActionEntry select_actions[] =
|
||||
GIMP_HELP_SELECTION_BORDER },
|
||||
|
||||
{ "select-save", GIMP_STOCK_SELECTION_TO_CHANNEL,
|
||||
N_("Save to _Channel"), NULL, NULL,
|
||||
N_("Save to _Channel"), NULL,
|
||||
N_("Save selection to channel"),
|
||||
G_CALLBACK (select_save_cmd_callback),
|
||||
GIMP_HELP_SELECTION_TO_CHANNEL },
|
||||
|
||||
{ "select-stroke", GIMP_STOCK_SELECTION_STROKE,
|
||||
N_("_Stroke Selection..."), NULL,
|
||||
N_("Stroke selection"),
|
||||
G_CALLBACK (select_stroke_cmd_callback),
|
||||
GIMP_HELP_SELECTION_STROKE },
|
||||
|
||||
{ "select-to-vectors", GIMP_STOCK_SELECTION_TO_PATH,
|
||||
N_("To _Path"), NULL, NULL,
|
||||
N_("To _Path"), NULL,
|
||||
N_("Selection to path"),
|
||||
G_CALLBACK (vectors_selection_to_vectors_cmd_callback),
|
||||
GIMP_HELP_SELECTION_TO_PATH }
|
||||
};
|
||||
@ -118,40 +132,41 @@ void
|
||||
select_actions_update (GimpActionGroup *group,
|
||||
gpointer data)
|
||||
{
|
||||
GimpImage *gimage;
|
||||
GimpVectors *vectors = NULL;
|
||||
gboolean fs = FALSE;
|
||||
gboolean lp = FALSE;
|
||||
gboolean sel = FALSE;
|
||||
GimpImage *gimage;
|
||||
GimpDrawable *drawable = NULL;
|
||||
GimpVectors *vectors = NULL;
|
||||
gboolean fs = FALSE;
|
||||
gboolean sel = FALSE;
|
||||
|
||||
gimage = action_data_get_image (data);
|
||||
|
||||
if (gimage)
|
||||
{
|
||||
fs = (gimp_image_floating_sel (gimage) != NULL);
|
||||
lp = ! gimp_image_is_empty (gimage);
|
||||
sel = ! gimp_channel_is_empty (gimp_image_get_mask (gimage));
|
||||
drawable = gimp_image_active_drawable (gimage);
|
||||
vectors = gimp_image_get_active_vectors (gimage);
|
||||
|
||||
vectors = gimp_image_get_active_vectors (gimage);
|
||||
fs = (gimp_image_floating_sel (gimage) != NULL);
|
||||
sel = ! gimp_channel_is_empty (gimp_image_get_mask (gimage));
|
||||
}
|
||||
|
||||
#define SET_SENSITIVE(action,condition) \
|
||||
gimp_action_group_set_action_sensitive (group, action, (condition) != 0)
|
||||
|
||||
SET_SENSITIVE ("select-all", lp);
|
||||
SET_SENSITIVE ("select-none", lp && sel);
|
||||
SET_SENSITIVE ("select-invert", lp && sel);
|
||||
SET_SENSITIVE ("select-from-vectors", lp && vectors);
|
||||
SET_SENSITIVE ("select-float", lp && sel);
|
||||
SET_SENSITIVE ("select-all", drawable);
|
||||
SET_SENSITIVE ("select-none", drawable && sel);
|
||||
SET_SENSITIVE ("select-invert", drawable && sel);
|
||||
SET_SENSITIVE ("select-from-vectors", vectors);
|
||||
SET_SENSITIVE ("select-float", drawable && sel);
|
||||
|
||||
SET_SENSITIVE ("select-feather", lp && sel);
|
||||
SET_SENSITIVE ("select-sharpen", lp && sel);
|
||||
SET_SENSITIVE ("select-shrink", lp && sel);
|
||||
SET_SENSITIVE ("select-grow", lp && sel);
|
||||
SET_SENSITIVE ("select-border", lp && sel);
|
||||
SET_SENSITIVE ("select-feather", drawable && sel);
|
||||
SET_SENSITIVE ("select-sharpen", drawable && sel);
|
||||
SET_SENSITIVE ("select-shrink", drawable && sel);
|
||||
SET_SENSITIVE ("select-grow", drawable && sel);
|
||||
SET_SENSITIVE ("select-border", drawable && sel);
|
||||
|
||||
SET_SENSITIVE ("select-save", sel && !fs);
|
||||
SET_SENSITIVE ("select-to-vectors", sel && !fs);
|
||||
SET_SENSITIVE ("select-save", drawable && sel && !fs);
|
||||
SET_SENSITIVE ("select-stroke", drawable && sel);
|
||||
SET_SENSITIVE ("select-to-vectors", drawable && sel && !fs);
|
||||
|
||||
#undef SET_SENSITIVE
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user