app/core/Makefile.am new files: the QMask stuff stripped from GUI code.
2001-11-30 Michael Natterer <mitch@gimp.org> * app/core/Makefile.am * app/core/gimpimage-qmask.[ch]: new files: the QMask stuff stripped from GUI code. Added gimp_image_qmask_invert(). * app/core/gimpimage.[ch]: removed the QMask functions. * app/display/Makefile.am * app/display/gimpdisplayshell-qmask.[ch]: removed. * app/gui/Makefile.am * app/gui/qmask-commands.[ch]: new files for the new QMask item factory callbacks and the qmask query dialog. * app/gui/menus.c: added a context menu for the QMask button. * app/display/gimpdisplayshell.c * app/display/gimpdisplayshell-handlers.c: don't include the qmask stuff. * app/display/gimpdisplayshell-callbacks.[ch]: Moved the 2 qmask callbacks here. Don't popup the dialog on double_click. Show the contect menu on right-click. * app/display/gimpdisplayshell-callbacks.[ch]: gimp_display_shell_canvas_events(): removed the hack of conntecting "key_press_event" to gtk_true() while a tool is active. Instead, check for (event & GDK_BUTTON1_MASK) in the key_press and key_release handlers and stop signal emission. Save the modifier state on "button_press" and restore it after "button_release". Changed the way context menus are updated/shown: - removed GimpContainerContextFunc. - pass around item factory identifiers (e.g. "<Brushes>") - added voodoo to update the menus before showing them. * app/widgets/gimpitemfactory.[ch]: gimp_item_factory_new(): take a GimpItemFactoryUpdateFunc parameter, attach it as data to the factory and use it to update the menu in gimp_item_factory_popup_with_date(). * app/widgets/gimpwidgets-utils.[ch]: removed gimp_item_factory_popup_with_data() here. * app/widgets/gimpbrushfactoryview.[ch] * app/widgets/gimpbufferview.[ch] * app/widgets/gimpcontainereditor.[ch] * app/widgets/gimpdatafactoryview.[ch] * app/widgets/gimpdocumentview.[ch] * app/widgets/gimpdrawablelistview.[ch]: use item_factory identifier strings all over the place. * app/widgets/gimpdockbook.c: removed the menu update code, it's now in gui/dialogs-commands.c. * app/gui/brushes-commands.[ch] * app/gui/buffers-commands.[c] * app/gui/channels-commands.[ch] * app/gui/dialogs-commands.[ch] * app/gui/documents-commands.[ch] * app/gui/gradient-editor-commands.[ch] * app/gui/gradients-commands.[ch] * app/gui/layers-commands.[ch] * app/gui/palettes-commands.[ch] * app/gui/patterns-commands.[ch]: removed all show_context_menu() functions and made the update functions public. Changed all update functions to use the gimp_item_factory_set_foo() methods instead of gimp_menu_item_set_foo(). * app/gui/menus.c: pass the update functions to the gimp_item_factory_new(). * app/gui/dialogs-constructors.c: pass item factory identifiers to all view constructors. * app/gui/gradient-editor.c: show the context menu using the new method. * app/gui/toolbox.c: no need to include "dialogs-commands.h".
This commit is contained in:
Michael Natterer
committed by
Michael Natterer
Michael Natterer
parent
84f148fef0
commit
bba8413773
@ -52,14 +52,17 @@
|
||||
#include "libgimp/gimpintl.h"
|
||||
|
||||
|
||||
/* local function prototypes */
|
||||
|
||||
static void layers_add_mask_query (GimpLayer *layer);
|
||||
static void layers_scale_layer_query (GimpImage *gimage,
|
||||
GimpLayer *layer);
|
||||
static void layers_resize_layer_query (GimpImage *gimage,
|
||||
GimpLayer *layer);
|
||||
static void layers_menu_set_sensitivity (GimpImage *gimage);
|
||||
|
||||
|
||||
/* public functions */
|
||||
|
||||
void
|
||||
layers_previous_cmd_callback (GtkWidget *widget,
|
||||
gpointer data)
|
||||
@ -1219,20 +1222,10 @@ layers_layer_merge_query (GimpImage *gimage,
|
||||
}
|
||||
|
||||
void
|
||||
layers_show_context_menu (GimpImage *gimage)
|
||||
{
|
||||
GtkItemFactory *item_factory;
|
||||
|
||||
layers_menu_set_sensitivity (gimage);
|
||||
|
||||
item_factory = gtk_item_factory_from_path ("<Layers>");
|
||||
|
||||
gimp_item_factory_popup_with_data (item_factory, gimage);
|
||||
}
|
||||
|
||||
static void
|
||||
layers_menu_set_sensitivity (GimpImage *gimage)
|
||||
layers_menu_update (GtkItemFactory *factory,
|
||||
gpointer data)
|
||||
{
|
||||
GimpImage *gimage;
|
||||
GimpLayer *layer;
|
||||
gboolean fs = FALSE; /* floating sel */
|
||||
gboolean ac = FALSE; /* active channel */
|
||||
@ -1245,8 +1238,7 @@ layers_menu_set_sensitivity (GimpImage *gimage)
|
||||
GList *next = NULL;
|
||||
GList *prev = NULL;
|
||||
|
||||
g_return_if_fail (gimage != NULL);
|
||||
g_return_if_fail (GIMP_IS_IMAGE (gimage));
|
||||
gimage = GIMP_IMAGE (data);
|
||||
|
||||
layer = gimp_image_get_active_layer (gimage);
|
||||
|
||||
@ -1279,43 +1271,43 @@ layers_menu_set_sensitivity (GimpImage *gimage)
|
||||
next_alpha = FALSE;
|
||||
|
||||
#define SET_SENSITIVE(menu,condition) \
|
||||
gimp_menu_item_set_sensitive ("<Layers>/" menu, (condition) != 0)
|
||||
gimp_item_factory_set_sensitive (factory, menu, (condition) != 0)
|
||||
|
||||
SET_SENSITIVE ("New Layer...", gimage);
|
||||
SET_SENSITIVE ("/New Layer...", gimage);
|
||||
|
||||
SET_SENSITIVE ("Stack/Raise Layer",
|
||||
SET_SENSITIVE ("/Stack/Raise Layer",
|
||||
!fs && !ac && gimage && lp && alpha && prev);
|
||||
|
||||
SET_SENSITIVE ("Stack/Lower Layer",
|
||||
SET_SENSITIVE ("/Stack/Lower Layer",
|
||||
!fs && !ac && gimage && lp && next && next_alpha);
|
||||
|
||||
SET_SENSITIVE ("Stack/Layer to Top",
|
||||
SET_SENSITIVE ("/Stack/Layer to Top",
|
||||
!fs && !ac && gimage && lp && alpha && prev);
|
||||
SET_SENSITIVE ("Stack/Layer to Bottom",
|
||||
SET_SENSITIVE ("/Stack/Layer to Bottom",
|
||||
!fs && !ac && gimage && lp && next && next_alpha);
|
||||
|
||||
SET_SENSITIVE ("Duplicate Layer", !fs && !ac && gimage && lp);
|
||||
SET_SENSITIVE ("Anchor Layer", !fs && !ac && gimage && lp);
|
||||
SET_SENSITIVE ("Delete Layer", !ac && gimage && lp);
|
||||
SET_SENSITIVE ("/Duplicate Layer", !fs && !ac && gimage && lp);
|
||||
SET_SENSITIVE ("/Anchor Layer", !fs && !ac && gimage && lp);
|
||||
SET_SENSITIVE ("/Delete Layer", !ac && gimage && lp);
|
||||
|
||||
SET_SENSITIVE ("Layer Boundary Size...", !ac && gimage && lp);
|
||||
SET_SENSITIVE ("Layer to Imagesize", !ac && gimage && lp);
|
||||
SET_SENSITIVE ("Scale Layer...", !ac && gimage && lp);
|
||||
SET_SENSITIVE ("/Layer Boundary Size...", !ac && gimage && lp);
|
||||
SET_SENSITIVE ("/Layer to Imagesize", !ac && gimage && lp);
|
||||
SET_SENSITIVE ("/Scale Layer...", !ac && gimage && lp);
|
||||
|
||||
SET_SENSITIVE ("Merge Visible Layers...", !fs && !ac && gimage && lp);
|
||||
SET_SENSITIVE ("Merge Down", !fs && !ac && gimage && lp && next);
|
||||
SET_SENSITIVE ("Flatten Image", !fs && !ac && gimage && lp);
|
||||
SET_SENSITIVE ("/Merge Visible Layers...", !fs && !ac && gimage && lp);
|
||||
SET_SENSITIVE ("/Merge Down", !fs && !ac && gimage && lp && next);
|
||||
SET_SENSITIVE ("/Flatten Image", !fs && !ac && gimage && lp);
|
||||
|
||||
SET_SENSITIVE ("Add Layer Mask...",
|
||||
SET_SENSITIVE ("/Add Layer Mask...",
|
||||
!fs && !ac && gimage && !lm && lp && alpha && !indexed);
|
||||
SET_SENSITIVE ("Apply Layer Mask", !fs && !ac && gimage && lm && lp);
|
||||
SET_SENSITIVE ("Delete Layer Mask", !fs && !ac && gimage && lm && lp);
|
||||
SET_SENSITIVE ("Mask to Selection", !fs && !ac && gimage && lm && lp);
|
||||
SET_SENSITIVE ("/Apply Layer Mask", !fs && !ac && gimage && lm && lp);
|
||||
SET_SENSITIVE ("/Delete Layer Mask", !fs && !ac && gimage && lm && lp);
|
||||
SET_SENSITIVE ("/Mask to Selection", !fs && !ac && gimage && lm && lp);
|
||||
|
||||
SET_SENSITIVE ("Add Alpha Channel", !fs && !alpha);
|
||||
SET_SENSITIVE ("Alpha to Selection", !fs && !ac && gimage && lp && alpha);
|
||||
SET_SENSITIVE ("/Add Alpha Channel", !fs && !alpha);
|
||||
SET_SENSITIVE ("/Alpha to Selection", !fs && !ac && gimage && lp && alpha);
|
||||
|
||||
SET_SENSITIVE ("Edit Layer Attributes...", !fs && !ac && gimage && lp);
|
||||
SET_SENSITIVE ("/Edit Layer Attributes...", !fs && !ac && gimage && lp);
|
||||
|
||||
#undef SET_SENSITIVE
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user