e13afaf260
2003-09-26 Michael Natterer <mitch@gimp.org> Cleaned up all places which pick colors to work consistently: the concept of an "active color" has disappeared, instead <ctrl> picks the BG color all over the place (fixes bug #122931). * app/tools/tools-enums.[ch]: added enum GimpColorPickMode which can be one of { FOREGROUND, BACKGROUND }. Reordered enums so non-registered ones are at the end of the file. Removed trailing whitespace. * app/tools/gimpcolorpickeroptions.[ch]: added a "pick-mode" property and a GUI for it. Renamed the "update-active" property to "update-toolbox". * app/tools/gimpcolorpickertool.c: honor the new option. Toggle pick-mode on <ctrl>. * app/tools/gimpcolortool.[ch]: added pick_mode member and change the cursor accordingly. * app/widgets/gimpcolormapeditor.[ch]: added "GdkModifierType state" to the "selected" signal. Removed the signal's default implementation. * app/gui/dialogs-constructors.c: fixed the signal handler which lives here and set BG if <ctrl> was pressed. * app/widgets/gimppaletteeditor.c: removed weird <ctrl> <-> active_color interaction and pick BG on <ctrl>. Don't change the toolbox color when editing a color in the palette. * app/widgets/gimptoolbox-color-area.[ch]: made the whole active_color stuff private. Will remove these artefacts soon... * app/gui/colormap-editor-menu.c * app/gui/palette-editor-menu.c: added separate menu entries for adding a color from the current FG and BG. * app/gui/colormap-editor-commands.c * app/gui/palette-editor-commands.[ch]: changed callbacks accordingly. * cursors/background.xbm * cursors/background_mask.xbm * cursors/foreground.xbm * cursors/foreground_mask.xbm * cursors/gimp-tool-cursors.xcf: moved the FG/BG cursor modifiers closer to the upper right corner. * app/widgets/gimpcursor.c: ignore the cursor modifiers' hotspots since they are not relevant and I didn't save the hotspot in the updated cursor files for that reason.
113 lines
3.4 KiB
C
113 lines
3.4 KiB
C
/* The GIMP -- an image manipulation program
|
|
* Copyright (C) 1995 Spencer Kimball and Peter Mattis
|
|
*
|
|
* This program is free software; you can redistribute it and/or modify
|
|
* it under the terms of the GNU General Public License as published by
|
|
* the Free Software Foundation; either version 2 of the License, or
|
|
* (at your option) any later version.
|
|
*
|
|
* This program is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
* GNU General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU General Public License
|
|
* along with this program; if not, write to the Free Software
|
|
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
|
*/
|
|
|
|
#include "config.h"
|
|
|
|
#include <gtk/gtk.h>
|
|
|
|
#include "libgimpwidgets/gimpwidgets.h"
|
|
|
|
#include "gui-types.h"
|
|
|
|
#include "widgets/gimphelp-ids.h"
|
|
#include "widgets/gimpitemfactory.h"
|
|
#include "widgets/gimppaletteeditor.h"
|
|
|
|
#include "menus.h"
|
|
#include "palette-editor-commands.h"
|
|
#include "palette-editor-menu.h"
|
|
|
|
#include "gimp-intl.h"
|
|
|
|
|
|
GimpItemFactoryEntry palette_editor_menu_entries[] =
|
|
{
|
|
{ { N_("/_Edit Color..."), "",
|
|
palette_editor_edit_color_cmd_callback, 0,
|
|
"<StockItem>", GIMP_STOCK_EDIT },
|
|
NULL,
|
|
GIMP_HELP_PALETTE_EDITOR_EDIT, NULL },
|
|
|
|
MENU_SEPARATOR ("/---"),
|
|
|
|
{ { N_("/_New Color from FG"), "",
|
|
palette_editor_new_color_cmd_callback, 0,
|
|
"<StockItem>", GTK_STOCK_NEW },
|
|
NULL,
|
|
GIMP_HELP_PALETTE_EDITOR_NEW, NULL },
|
|
{ { N_("/_New Color from BG"), "",
|
|
palette_editor_new_color_cmd_callback, TRUE,
|
|
"<StockItem>", GTK_STOCK_NEW },
|
|
NULL,
|
|
GIMP_HELP_PALETTE_EDITOR_NEW, NULL },
|
|
{ { N_("/_Delete Color"), "",
|
|
palette_editor_delete_color_cmd_callback, 0,
|
|
"<StockItem>", GTK_STOCK_DELETE },
|
|
NULL,
|
|
GIMP_HELP_PALETTE_EDITOR_DELETE, NULL },
|
|
|
|
MENU_SEPARATOR ("/---"),
|
|
|
|
{ { N_("/Zoom _Out"), "",
|
|
palette_editor_zoom_out_cmd_callback, 0,
|
|
"<StockItem>", GTK_STOCK_ZOOM_OUT },
|
|
NULL,
|
|
GIMP_HELP_PALETTE_EDITOR_ZOOM_OUT, NULL },
|
|
{ { N_("/Zoom _In"), "",
|
|
palette_editor_zoom_in_cmd_callback, 0,
|
|
"<StockItem>", GTK_STOCK_ZOOM_IN },
|
|
NULL,
|
|
GIMP_HELP_PALETTE_EDITOR_ZOOM_IN, NULL },
|
|
{ { N_("/Zoom _All"), "",
|
|
palette_editor_zoom_all_cmd_callback, 0,
|
|
"<StockItem>", GTK_STOCK_ZOOM_FIT },
|
|
NULL,
|
|
GIMP_HELP_PALETTE_EDITOR_ZOOM_ALL, NULL }
|
|
};
|
|
|
|
gint n_palette_editor_menu_entries = G_N_ELEMENTS (palette_editor_menu_entries);
|
|
|
|
|
|
void
|
|
palette_editor_menu_update (GtkItemFactory *factory,
|
|
gpointer data)
|
|
{
|
|
GimpPaletteEditor *editor;
|
|
GimpDataEditor *data_editor;
|
|
gboolean editable = FALSE;
|
|
|
|
editor = GIMP_PALETTE_EDITOR (data);
|
|
data_editor = GIMP_DATA_EDITOR (data);
|
|
|
|
if (data_editor->data && data_editor->data_editable)
|
|
editable = TRUE;
|
|
|
|
#define SET_SENSITIVE(menu,condition) \
|
|
gimp_item_factory_set_sensitive (factory, menu, (condition) != 0)
|
|
|
|
SET_SENSITIVE ("/Edit Color...", editable && editor->color);
|
|
SET_SENSITIVE ("/New Color from FG", editable);
|
|
SET_SENSITIVE ("/New Color from BG", editable);
|
|
SET_SENSITIVE ("/Delete Color", editable && editor->color);
|
|
|
|
SET_SENSITIVE ("/Zoom Out", data_editor->data);
|
|
SET_SENSITIVE ("/Zoom In", data_editor->data);
|
|
SET_SENSITIVE ("/Zoom All", data_editor->data);
|
|
|
|
#undef SET_SENSITIVE
|
|
}
|