diff --git a/ChangeLog b/ChangeLog index 5697273263..694538a6c4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,10 @@ -2004-10-29 Kevin Cozens +2004-10-29 Øyvind Kolås + + * app/actions/drawable-commands.[ch] + * app/actions/drawable-actions.[ch]: alphabetized file pending + addition. + +2004-10-29 Kevin Cozens * plug-ins/script-fu/scripts/test-sphere.scm: Added notes about use of SF-PALETTE. diff --git a/app/actions/drawable-actions.c b/app/actions/drawable-actions.c index ebd1d5536c..4d1b5ffedd 100644 --- a/app/actions/drawable-actions.c +++ b/app/actions/drawable-actions.c @@ -46,16 +46,16 @@ static GimpActionEntry drawable_actions[] = G_CALLBACK (drawable_desaturate_cmd_callback), GIMP_HELP_LAYER_DESATURATE }, - { "drawable-invert", GIMP_STOCK_INVERT, - N_("In_vert"), NULL, NULL, - G_CALLBACK (drawable_invert_cmd_callback), - GIMP_HELP_LAYER_INVERT }, - { "drawable-equalize", NULL, N_("_Equalize"), NULL, NULL, G_CALLBACK (drawable_equalize_cmd_callback), GIMP_HELP_LAYER_EQUALIZE }, + { "drawable-invert", GIMP_STOCK_INVERT, + N_("In_vert"), NULL, NULL, + G_CALLBACK (drawable_invert_cmd_callback), + GIMP_HELP_LAYER_INVERT }, + { "drawable-offset", NULL, N_("_Offset..."), "O", NULL, G_CALLBACK (drawable_offset_cmd_callback), @@ -64,17 +64,17 @@ static GimpActionEntry drawable_actions[] = static GimpToggleActionEntry drawable_toggle_actions[] = { - { "drawable-visible", GIMP_STOCK_VISIBLE, - N_("_Visible"), NULL, NULL, - G_CALLBACK (drawable_visible_cmd_callback), - FALSE, - GIMP_HELP_LAYER_VISIBLE }, - { "drawable-linked", GIMP_STOCK_LINKED, N_("_Linked"), NULL, NULL, G_CALLBACK (drawable_linked_cmd_callback), FALSE, - GIMP_HELP_LAYER_LINKED } + GIMP_HELP_LAYER_LINKED }, + + { "drawable-visible", GIMP_STOCK_VISIBLE, + N_("_Visible"), NULL, NULL, + G_CALLBACK (drawable_visible_cmd_callback), + FALSE, + GIMP_HELP_LAYER_VISIBLE } }; static GimpEnumActionEntry drawable_flip_actions[] = @@ -174,8 +174,8 @@ drawable_actions_update (GimpActionGroup *group, gimp_action_group_set_action_active (group, action, (condition) != 0) SET_SENSITIVE ("drawable-desaturate", drawable && is_rgb); - SET_SENSITIVE ("drawable-invert", drawable && ! is_indexed); SET_SENSITIVE ("drawable-equalize", drawable && ! is_indexed); + SET_SENSITIVE ("drawable-invert", drawable && ! is_indexed); SET_SENSITIVE ("drawable-offset", drawable); SET_SENSITIVE ("drawable-visible", drawable); diff --git a/app/actions/drawable-commands.c b/app/actions/drawable-commands.c index 84672104fe..a6bd66cdcf 100644 --- a/app/actions/drawable-commands.c +++ b/app/actions/drawable-commands.c @@ -62,24 +62,6 @@ drawable_desaturate_cmd_callback (GtkAction *action, gimp_image_flush (gimage); } -void -drawable_invert_cmd_callback (GtkAction *action, - gpointer data) -{ - GimpImage *gimage; - GimpDrawable *drawable; - return_if_no_drawable (gimage, drawable, data); - - if (gimp_drawable_is_indexed (drawable)) - { - g_message (_("Invert does not operate on indexed layers.")); - return; - } - - gimp_drawable_invert (drawable); - gimp_image_flush (gimage); -} - void drawable_equalize_cmd_callback (GtkAction *action, gpointer data) @@ -98,68 +80,6 @@ drawable_equalize_cmd_callback (GtkAction *action, gimp_image_flush (gimage); } -void -drawable_visible_cmd_callback (GtkAction *action, - gpointer data) -{ - GimpImage *gimage; - GimpDrawable *drawable; - gboolean visible; - return_if_no_drawable (gimage, drawable, data); - - visible = gtk_toggle_action_get_active (GTK_TOGGLE_ACTION (action)); - - if (GIMP_IS_LAYER_MASK (drawable)) - drawable = - GIMP_DRAWABLE (gimp_layer_mask_get_layer (GIMP_LAYER_MASK (drawable))); - - if (visible != gimp_item_get_visible (GIMP_ITEM (drawable))) - { - GimpUndo *undo; - gboolean push_undo = TRUE; - - undo = gimp_image_undo_can_compress (gimage, GIMP_TYPE_ITEM_UNDO, - GIMP_UNDO_ITEM_VISIBILITY); - - if (undo && GIMP_ITEM_UNDO (undo)->item == GIMP_ITEM (drawable)) - push_undo = FALSE; - - gimp_item_set_visible (GIMP_ITEM (drawable), visible, push_undo); - gimp_image_flush (gimage); - } -} - -void -drawable_linked_cmd_callback (GtkAction *action, - gpointer data) -{ - GimpImage *gimage; - GimpDrawable *drawable; - gboolean linked; - return_if_no_drawable (gimage, drawable, data); - - linked = gtk_toggle_action_get_active (GTK_TOGGLE_ACTION (action)); - - if (GIMP_IS_LAYER_MASK (drawable)) - drawable = - GIMP_DRAWABLE (gimp_layer_mask_get_layer (GIMP_LAYER_MASK (drawable))); - - if (linked != gimp_item_get_linked (GIMP_ITEM (drawable))) - { - GimpUndo *undo; - gboolean push_undo = TRUE; - - undo = gimp_image_undo_can_compress (gimage, GIMP_TYPE_ITEM_UNDO, - GIMP_UNDO_ITEM_LINKED); - - if (undo && GIMP_ITEM_UNDO (undo)->item == GIMP_ITEM (drawable)) - push_undo = FALSE; - - gimp_item_set_linked (GIMP_ITEM (drawable), linked, push_undo); - gimp_image_flush (gimage); - } -} - void drawable_flip_cmd_callback (GtkAction *action, gint value, @@ -208,6 +128,70 @@ drawable_flip_cmd_callback (GtkAction *action, gimp_image_flush (gimage); } +void +drawable_invert_cmd_callback (GtkAction *action, + gpointer data) +{ + GimpImage *gimage; + GimpDrawable *drawable; + return_if_no_drawable (gimage, drawable, data); + + if (gimp_drawable_is_indexed (drawable)) + { + g_message (_("Invert does not operate on indexed layers.")); + return; + } + + gimp_drawable_invert (drawable); + gimp_image_flush (gimage); +} + +void +drawable_linked_cmd_callback (GtkAction *action, + gpointer data) +{ + GimpImage *gimage; + GimpDrawable *drawable; + gboolean linked; + return_if_no_drawable (gimage, drawable, data); + + linked = gtk_toggle_action_get_active (GTK_TOGGLE_ACTION (action)); + + if (GIMP_IS_LAYER_MASK (drawable)) + drawable = + GIMP_DRAWABLE (gimp_layer_mask_get_layer (GIMP_LAYER_MASK (drawable))); + + if (linked != gimp_item_get_linked (GIMP_ITEM (drawable))) + { + GimpUndo *undo; + gboolean push_undo = TRUE; + + undo = gimp_image_undo_can_compress (gimage, GIMP_TYPE_ITEM_UNDO, + GIMP_UNDO_ITEM_LINKED); + + if (undo && GIMP_ITEM_UNDO (undo)->item == GIMP_ITEM (drawable)) + push_undo = FALSE; + + gimp_item_set_linked (GIMP_ITEM (drawable), linked, push_undo); + gimp_image_flush (gimage); + } +} + +void +drawable_offset_cmd_callback (GtkAction *action, + gpointer data) +{ + GimpImage *gimage; + GimpDrawable *drawable; + GtkWidget *widget; + GtkWidget *dialog; + return_if_no_drawable (gimage, drawable, data); + return_if_no_widget (widget, data); + + dialog = offset_dialog_new (drawable, widget); + gtk_widget_show (dialog); +} + void drawable_rotate_cmd_callback (GtkAction *action, gint value, @@ -251,16 +235,32 @@ drawable_rotate_cmd_callback (GtkAction *action, } void -drawable_offset_cmd_callback (GtkAction *action, - gpointer data) +drawable_visible_cmd_callback (GtkAction *action, + gpointer data) { GimpImage *gimage; GimpDrawable *drawable; - GtkWidget *widget; - GtkWidget *dialog; + gboolean visible; return_if_no_drawable (gimage, drawable, data); - return_if_no_widget (widget, data); - dialog = offset_dialog_new (drawable, widget); - gtk_widget_show (dialog); + visible = gtk_toggle_action_get_active (GTK_TOGGLE_ACTION (action)); + + if (GIMP_IS_LAYER_MASK (drawable)) + drawable = + GIMP_DRAWABLE (gimp_layer_mask_get_layer (GIMP_LAYER_MASK (drawable))); + + if (visible != gimp_item_get_visible (GIMP_ITEM (drawable))) + { + GimpUndo *undo; + gboolean push_undo = TRUE; + + undo = gimp_image_undo_can_compress (gimage, GIMP_TYPE_ITEM_UNDO, + GIMP_UNDO_ITEM_VISIBILITY); + + if (undo && GIMP_ITEM_UNDO (undo)->item == GIMP_ITEM (drawable)) + push_undo = FALSE; + + gimp_item_set_visible (GIMP_ITEM (drawable), visible, push_undo); + gimp_image_flush (gimage); + } } diff --git a/app/actions/drawable-commands.h b/app/actions/drawable-commands.h index 6f105d2284..132d26d197 100644 --- a/app/actions/drawable-commands.h +++ b/app/actions/drawable-commands.h @@ -22,21 +22,21 @@ void drawable_desaturate_cmd_callback (GtkAction *action, gpointer data); -void drawable_invert_cmd_callback (GtkAction *action, - gpointer data); void drawable_equalize_cmd_callback (GtkAction *action, gpointer data); -void drawable_visible_cmd_callback (GtkAction *action, - gpointer data); -void drawable_linked_cmd_callback (GtkAction *action, - gpointer data); void drawable_flip_cmd_callback (GtkAction *action, gint value, gpointer data); +void drawable_invert_cmd_callback (GtkAction *action, + gpointer data); +void drawable_linked_cmd_callback (GtkAction *action, + gpointer data); +void drawable_offset_cmd_callback (GtkAction *action, + gpointer data); void drawable_rotate_cmd_callback (GtkAction *action, gint value, gpointer data); -void drawable_offset_cmd_callback (GtkAction *action, +void drawable_visible_cmd_callback (GtkAction *action, gpointer data);