Commit c5559888 authored by Manish Singh's avatar Manish Singh
Browse files

doh, XLFD stuff is in decipoints

* app/text_tool_cmds.c: doh, XLFD stuff is in decipoints

* app/color_cmds.h: removed

* app/color_cmds.c: pdbgened file now

* app/lut_funcs.h: export ChannelLutType enum

* app/internal_procs.c: register pdbgened color procs

* app/menus.c: reverted keyboard underlines since they need more discussion

-Yosh
parent 43f63f9f
Sat Apr 10 14:43:24 PDT 1999 Manish Singh <yosh@gimp.org>
* app/text_tool_cmds.c: doh, XLFD stuff is in decipoints
* app/color_cmds.h: removed
* app/color_cmds.c: pdbgened file now
* app/lut_funcs.h: export ChannelLutType enum
* app/internal_procs.c: register pdbgened color procs
* app/menus.c: reverted keyboard underlines since they need more
discussion
Sat Apr 10 15:48:46 BST 1999 Adam D. Moss <adam@gimp.org>
* app/ink.c: Velocity-sensitivity added to ink tool.
Fri Apr 9 21:45:10 PDT 1999 Manish Singh <yosh@gimp.org>
* text_tool_cmds.c: new file (from pdbgen)
* app/text_tool_cmds.c: new file (from pdbgen)
* Makefile.am: add new file, use AM_CPPFLAGS instead of CPPFLAGS
* app/Makefile.am: add new file, use AM_CPPFLAGS instead of CPPFLAGS
* internal_procs.c: register pdbgened text_tool procs
* app/internal_procs.c: register pdbgened text_tool procs
* text_tool.c: remove PDB stuff, export text_render and
* app/text_tool.c: remove PDB stuff, export text_render and
text_get_extents and SizeType and SUPERSAMPLE symbols
* text_tool.c: remove PDB stuff
* app/text_tool.c: remove PDB stuff
* blend.[ch]
* bucket_fill.[ch]
* clone.[ch]
* convolve.[ch]: export some enums
* app/blend.[ch]
* app/bucket_fill.[ch]
* app/clone.[ch]
* app/convolve.[ch]: export some enums
* channel.h
* paint_core.h: #define->enum
* app/channel.h
* app/paint_core.h: #define->enum
* channel.c
* gimpparasite.c
* parasitelist.c
* pixel_processor.c: warning cleanup
* app/channel.c
* app/gimpparasite.c
* app/parasitelist.c
* app/pixel_processor.c: warning cleanup
* convert_cmds.c
* paths_cmds.c: slight pdbgen changes
* app/convert_cmds.c
* app/paths_cmds.c: slight pdbgen changes
1999-04-09 Jay Cox <jaycox@earthlink.net>
......
......@@ -78,7 +78,6 @@ gimp_SOURCES = \
color_balance.c \
color_balance.h \
color_cmds.c \
color_cmds.h \
color_notebook.c \
color_notebook.h \
color_panel.c \
......@@ -199,6 +198,7 @@ gimp_SOURCES = \
gimphistogram.c \
gimphistogram.h \
gimphistogramP.h \
gimphistogramF.h \
gimpunit.c \
global_edit.c \
global_edit.h \
......
......@@ -22,6 +22,15 @@
#include "gimplutF.h"
#include "gimphistogramF.h"
typedef enum /*< chop=_LUT >*/
{
VALUE_LUT, /*< nick=VALUE/GRAY >*/
RED_LUT,
GREEN_LUT,
BLUE_LUT,
GRAY_LUT = 0 /*< skip >*/
} ChannelLutType;
/* brightness contrast */
void brightness_contrast_lut_setup (GimpLut *lut,
double brightness, double contrast,
......
This diff is collapsed.
/* 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.
*/
#ifndef __COLOR_CMDS_H__
#define __COLOR_CMDS_H__
#include "procedural_db.h"
extern ProcRecord brightness_contrast_proc;
extern ProcRecord levels_proc;
extern ProcRecord posterize_proc;
#endif /* __COLOR_CMDS_H__ */
......@@ -50,130 +50,119 @@ static GSList *last_opened_raw_filenames = NULL;
static const GtkItemFactoryEntry toolbox_entries[] =
{
{ N_("/_File"), "", NULL, 0, "<Branch>" },
{ N_("/File/_New"), "<control>N", file_new_cmd_callback, 0 },
{ N_("/File/_Open"), "<control>O", file_open_cmd_callback, 0 },
{ N_("/File/_About..."), NULL, about_dialog_cmd_callback, 0 },
{ N_("/File/_Preferences..."), NULL, file_pref_cmd_callback, 0 },
{ N_("/File/_Tip of the day"), NULL, tips_dialog_cmd_callback, 0 },
{ N_("/File/---"), NULL, NULL, 0, "<Separator>" },
{ N_("/File/_Dialogs"), "", NULL, 0, "<Branch>" },
{ N_("/File/Dialogs/_Brushes..."), "<control><shift>B", dialogs_brushes_cmd_callback, 0 },
{ N_("/File/Dialogs/_Patterns..."), "<control><shift>P", dialogs_patterns_cmd_callback, 0 },
{ N_("/File/Dialogs/P_alette..."), "<control>P", dialogs_palette_cmd_callback, 0 },
{ N_("/File/Dialogs/_Gradient..."), "<control>G", dialogs_gradient_editor_cmd_callback, 0 },
{ N_("/File/Dialogs/_Layers & Channels..."), "<control>L", dialogs_lc_cmd_callback, 0 },
{ N_("/File/Dialogs/_Tool Options..."), "<control><shift>T", dialogs_tools_options_cmd_callback, 0 },
{ N_("/File/Dialogs/_Input Devices..."), NULL, dialogs_input_devices_cmd_callback, 0 },
{ N_("/File/Dialogs/_Device Status..."), NULL, dialogs_device_status_cmd_callback, 0 },
{ N_("/File/Dialogs/D_ocument Index..."), NULL, raise_idea_callback, 0 },
{ N_("/File/Dialogs/_Error Console..."), NULL, dialogs_error_console_cmd_callback, 0 },
{ N_("/File/Dialogs/_Module Browser..."), NULL, dialogs_module_browser_cmd_callback, 0 },
{ N_("/File/New"), "<control>N", file_new_cmd_callback, 0 },
{ N_("/File/Open"), "<control>O", file_open_cmd_callback, 0 },
{ N_("/File/About..."), NULL, about_dialog_cmd_callback, 0 },
{ N_("/File/Preferences..."), NULL, file_pref_cmd_callback, 0 },
{ N_("/File/Tip of the day"), NULL, tips_dialog_cmd_callback, 0 },
{ N_("/File/---"), NULL, NULL, 0, "<Separator>" },
{ N_("/File/Dialogs/Brushes..."), "<control><shift>B", dialogs_brushes_cmd_callback, 0 },
{ N_("/File/Dialogs/Patterns..."), "<control><shift>P", dialogs_patterns_cmd_callback, 0 },
{ N_("/File/Dialogs/Palette..."), "<control>P", dialogs_palette_cmd_callback, 0 },
{ N_("/File/Dialogs/Gradient..."), "<control>G", dialogs_gradient_editor_cmd_callback, 0 },
{ N_("/File/Dialogs/Layers & Channels..."), "<control>L", dialogs_lc_cmd_callback, 0 },
{ N_("/File/Dialogs/Tool Options..."), "<control><shift>T", dialogs_tools_options_cmd_callback, 0 },
{ N_("/File/Dialogs/Input Devices..."), NULL, dialogs_input_devices_cmd_callback, 0 },
{ N_("/File/Dialogs/Device Status..."), NULL, dialogs_device_status_cmd_callback, 0 },
{ N_("/File/Dialogs/Document Index..."), NULL, raise_idea_callback, 0 },
{ N_("/File/Dialogs/Error Console..."), NULL, dialogs_error_console_cmd_callback, 0 },
{ N_("/File/Dialogs/Module Browser..."), NULL, dialogs_module_browser_cmd_callback, 0 },
{ N_("/File/---"), NULL, NULL, 0, "<Separator>" }
};
static guint n_toolbox_entries = sizeof (toolbox_entries) / sizeof (toolbox_entries[0]);
static GtkItemFactory *toolbox_factory = NULL;
static const GtkItemFactoryEntry file_menu_separator = { N_("/File/---"), NULL, NULL, 0, "<Separator>" };
static const GtkItemFactoryEntry toolbox_end = { N_("/File/_Quit"), "<control>Q", file_quit_cmd_callback, 0 };
static const GtkItemFactoryEntry toolbox_end = { N_("/File/Quit"), "<control>Q", file_quit_cmd_callback, 0 };
static const GtkItemFactoryEntry image_entries[] =
{
{ N_("/_File"), "", NULL, 0, "<Branch>" },
{ N_("/File/_New"), "<control>N", file_new_cmd_callback, 1 },
{ N_("/File/_Open"), "<control>O", file_open_cmd_callback, 0 },
{ N_("/File/_Save"), "<control>S", file_save_cmd_callback, 0 },
{ N_("/File/Save _as"), NULL, file_save_as_cmd_callback, 0 },
{ N_("/File/_Revert"), NULL, file_revert_cmd_callback, 0 },
{ N_("/File/_Preferences..."), NULL, file_pref_cmd_callback, 0 },
{ N_("/File/New"), "<control>N", file_new_cmd_callback, 1 },
{ N_("/File/Open"), "<control>O", file_open_cmd_callback, 0 },
{ N_("/File/Save"), "<control>S", file_save_cmd_callback, 0 },
{ N_("/File/Save as"), NULL, file_save_as_cmd_callback, 0 },
{ N_("/File/Revert"), NULL, file_revert_cmd_callback, 0 },
{ N_("/File/Preferences..."), NULL, file_pref_cmd_callback, 0 },
{ N_("/File/---"), NULL, NULL, 0, "<Separator>" },
{ N_("/File/_Close"), "<control>W", file_close_cmd_callback, 0 },
{ N_("/File/_Quit"), "<control>Q", file_quit_cmd_callback, 0 },
{ N_("/File/Close"), "<control>W", file_close_cmd_callback, 0 },
{ N_("/File/Quit"), "<control>Q", file_quit_cmd_callback, 0 },
{ N_("/File/---moved"), NULL, NULL, 0, "<Separator>" },
{ N_("/_Edit"), "", NULL, 0, "<Branch>" },
{ N_("/Edit/Cu_t"), "<control>X", edit_cut_cmd_callback, 0 },
{ N_("/Edit/_Copy"), "<control>C", edit_copy_cmd_callback, 0 },
{ N_("/Edit/_Paste"), "<control>V", edit_paste_cmd_callback, 0 },
{ N_("/Edit/Paste _Into"), NULL, edit_paste_into_cmd_callback, 0 },
{ N_("/Edit/C_lear"), "<control>K", edit_clear_cmd_callback, 0 },
{ N_("/Edit/_Fill"), "<control>period", edit_fill_cmd_callback, 0 },
{ N_("/Edit/_Stroke"), NULL, edit_stroke_cmd_callback, 0 },
{ N_("/Edit/_Undo"), "<control>Z", edit_undo_cmd_callback, 0 },
{ N_("/Edit/_Redo"), "<control>R", edit_redo_cmd_callback, 0 },
{ N_("/Edit/Cut"), "<control>X", edit_cut_cmd_callback, 0 },
{ N_("/Edit/Copy"), "<control>C", edit_copy_cmd_callback, 0 },
{ N_("/Edit/Paste"), "<control>V", edit_paste_cmd_callback, 0 },
{ N_("/Edit/Paste Into"), NULL, edit_paste_into_cmd_callback, 0 },
{ N_("/Edit/Clear"), "<control>K", edit_clear_cmd_callback, 0 },
{ N_("/Edit/Fill"), "<control>period", edit_fill_cmd_callback, 0 },
{ N_("/Edit/Stroke"), NULL, edit_stroke_cmd_callback, 0 },
{ N_("/Edit/Undo"), "<control>Z", edit_undo_cmd_callback, 0 },
{ N_("/Edit/Redo"), "<control>R", edit_redo_cmd_callback, 0 },
{ N_("/Edit/---"), NULL, NULL, 0, "<Separator>" },
{ N_("/Edit/Cut _Named"), "<control><shift>X", edit_named_cut_cmd_callback, 0 },
{ N_("/Edit/Cop_y Named"), "<control><shift>C", edit_named_copy_cmd_callback, 0 },
{ N_("/Edit/Past_e Named"), "<control><shift>V", edit_named_paste_cmd_callback, 0 },
{ N_("/Edit/Cut Named"), "<control><shift>X", edit_named_cut_cmd_callback, 0 },
{ N_("/Edit/Copy Named"), "<control><shift>C", edit_named_copy_cmd_callback, 0 },
{ N_("/Edit/Paste Named"), "<control><shift>V", edit_named_paste_cmd_callback, 0 },
{ N_("/Edit/---"), NULL, NULL, 0, "<Separator>" },
{ N_("/_Select"), "", NULL, 0, "<Branch>" },
{ N_("/Select/_Toggle"), "<control>T", select_toggle_cmd_callback, 0 },
{ N_("/Select/_Invert"), "<control>I", select_invert_cmd_callback, 0 },
{ N_("/Select/_All"), "<control>A", select_all_cmd_callback, 0 },
{ N_("/Select/_None"), "<control><shift>A", select_none_cmd_callback, 0 },
{ N_("/Select/_Float"), "<control><shift>L", select_float_cmd_callback, 0 },
{ N_("/Select/_Sharpen"), "<control><shift>H", select_sharpen_cmd_callback, 0 },
{ N_("/Select/_Border"), "<control><shift>B", select_border_cmd_callback, 0 },
{ N_("/Select/F_eather"), "<control><shift>F", select_feather_cmd_callback, 0 },
{ N_("/Select/_Grow"), NULL, select_grow_cmd_callback, 0 },
{ N_("/Select/S_hrink"), NULL, select_shrink_cmd_callback, 0 },
{ N_("/Select/Save To _Channel"), NULL, select_save_cmd_callback, 0 },
{ N_("/_View"), "", NULL, 0, "<Branch>" },
{ N_("/View/Zoom _In"), "equal", view_zoomin_cmd_callback, 0 },
{ N_("/View/Zoom _Out"), "minus", view_zoomout_cmd_callback, 0 },
{ N_("/View/Zoom/1_6:1"), NULL, view_zoom_16_1_callback, 0 },
{ N_("/View/Zoom/_8:1"), NULL, view_zoom_8_1_callback, 0 },
{ N_("/View/Zoom/_4:1"), NULL, view_zoom_4_1_callback, 0 },
{ N_("/View/Zoom/_2:1"), NULL, view_zoom_2_1_callback, 0 },
{ N_("/View/Zoom/_1:1"), "1", view_zoom_1_1_callback, 0 },
{ N_("/Select/Toggle"), "<control>T", select_toggle_cmd_callback, 0 },
{ N_("/Select/Invert"), "<control>I", select_invert_cmd_callback, 0 },
{ N_("/Select/All"), "<control>A", select_all_cmd_callback, 0 },
{ N_("/Select/None"), "<control><shift>A", select_none_cmd_callback, 0 },
{ N_("/Select/Float"), "<control><shift>L", select_float_cmd_callback, 0 },
{ N_("/Select/Sharpen"), "<control><shift>H", select_sharpen_cmd_callback, 0 },
{ N_("/Select/Border"), "<control><shift>B", select_border_cmd_callback, 0 },
{ N_("/Select/Feather"), "<control><shift>F", select_feather_cmd_callback, 0 },
{ N_("/Select/Grow"), NULL, select_grow_cmd_callback, 0 },
{ N_("/Select/Shrink"), NULL, select_shrink_cmd_callback, 0 },
{ N_("/Select/Save To Channel"), NULL, select_save_cmd_callback, 0 },
{ N_("/View/Zoom In"), "equal", view_zoomin_cmd_callback, 0 },
{ N_("/View/Zoom Out"), "minus", view_zoomout_cmd_callback, 0 },
{ N_("/View/Zoom/16:1"), NULL, view_zoom_16_1_callback, 0 },
{ N_("/View/Zoom/8:1"), NULL, view_zoom_8_1_callback, 0 },
{ N_("/View/Zoom/4:1"), NULL, view_zoom_4_1_callback, 0 },
{ N_("/View/Zoom/2:1"), NULL, view_zoom_2_1_callback, 0 },
{ N_("/View/Zoom/1:1"), "1", view_zoom_1_1_callback, 0 },
{ N_("/View/Zoom/1:2"), NULL, view_zoom_1_2_callback, 0 },
{ N_("/View/Zoom/1:4"), NULL, view_zoom_1_4_callback, 0 },
{ N_("/View/Zoom/1:8"), NULL, view_zoom_1_8_callback, 0 },
{ N_("/View/Zoom/1:16"), NULL, view_zoom_1_16_callback, 0 },
{ N_("/View/_Dot for dot"), NULL, view_dot_for_dot_callback, 0, "<ToggleItem>"},
{ N_("/View/_Window Info..."), "<control><shift>I", view_window_info_cmd_callback, 0 },
{ N_("/View/Toggle _Rulers"), "<control><shift>R", view_toggle_rulers_cmd_callback, 0, "<ToggleItem>" },
{ N_("/View/Toggle S_tatusbar"), "<control><shift>S", view_toggle_statusbar_cmd_callback, 0, "<ToggleItem>" },
{ N_("/View/Toggle _Guides"), "<control><shift>T", view_toggle_guides_cmd_callback, 0, "<ToggleItem>" },
{ N_("/View/_Snap To Guides"), NULL, view_snap_to_guides_cmd_callback, 0, "<ToggleItem>" },
{ N_("/View/Dot for dot"), NULL, view_dot_for_dot_callback, 0, "<ToggleItem>"},
{ N_("/View/Window Info..."), "<control><shift>I", view_window_info_cmd_callback, 0 },
{ N_("/View/Toggle Rulers"), "<control><shift>R", view_toggle_rulers_cmd_callback, 0, "<ToggleItem>" },
{ N_("/View/Toggle Statusbar"), "<control><shift>S", view_toggle_statusbar_cmd_callback, 0, "<ToggleItem>" },
{ N_("/View/Toggle Guides"), "<control><shift>T", view_toggle_guides_cmd_callback, 0, "<ToggleItem>" },
{ N_("/View/Snap To Guides"), NULL, view_snap_to_guides_cmd_callback, 0, "<ToggleItem>" },
{ N_("/View/---"), NULL, NULL, 0, "<Separator>" },
{ N_("/View/_New View"), NULL, view_new_view_cmd_callback, 0 },
{ N_("/View/S_hrink Wrap"), "<control>E", view_shrink_wrap_cmd_callback, 0 },
{ N_("/View/New View"), NULL, view_new_view_cmd_callback, 0 },
{ N_("/View/Shrink Wrap"), "<control>E", view_shrink_wrap_cmd_callback, 0 },
{ N_("/_Image"), "", NULL, 0, "<Branch>" },
{ N_("/Image/_Colors"), "", NULL, 0, "<Branch>" },
{ N_("/Image/Colors/_Equalize"), NULL, image_equalize_cmd_callback, 0 },
{ N_("/Image/Colors/_Invert"), NULL, image_invert_cmd_callback, 0 },
{ N_("/Image/Colors/Equalize"), NULL, image_equalize_cmd_callback, 0 },
{ N_("/Image/Colors/Invert"), NULL, image_invert_cmd_callback, 0 },
{ N_("/Image/Colors/---"), NULL, NULL, 0, "<Separator>" },
{ N_("/Image/Colors/_Desaturate"), NULL, image_desaturate_cmd_callback, 0 },
{ N_("/Image/C_hannel Ops"), "", NULL, 0, "<Branch>" },
{ N_("/Image/Channel Ops/_Duplicate"), "<control>D", channel_ops_duplicate_cmd_callback, 0 },
{ N_("/Image/Channel Ops/_Offset"), "<control><shift>O", channel_ops_offset_cmd_callback, 0 },
{ N_("/Image/_Alpha"), "", NULL, 0, "<Branch>" },
{ N_("/Image/Alpha/_Add Alpha Channel"), NULL, layers_add_alpha_channel_cmd_callback, 0 },
{ N_("/Image/Colors/Desaturate"), NULL, image_desaturate_cmd_callback, 0 },
{ N_("/Image/Channel Ops/Duplicate"), "<control>D", channel_ops_duplicate_cmd_callback, 0 },
{ N_("/Image/Channel Ops/Offset"), "<control><shift>O", channel_ops_offset_cmd_callback, 0 },
{ N_("/Image/Alpha/Add Alpha Channel"), NULL, layers_add_alpha_channel_cmd_callback, 0 },
{ N_("/Image/---"), NULL, NULL, 0, "<Separator>" },
{ N_("/Image/_RGB"), NULL, image_convert_rgb_cmd_callback, 0 },
{ N_("/Image/_Grayscale"), NULL, image_convert_grayscale_cmd_callback, 0 },
{ N_("/Image/_Indexed"), NULL, image_convert_indexed_cmd_callback, 0 },
{ N_("/Image/RGB"), NULL, image_convert_rgb_cmd_callback, 0 },
{ N_("/Image/Grayscale"), NULL, image_convert_grayscale_cmd_callback, 0 },
{ N_("/Image/Indexed"), NULL, image_convert_indexed_cmd_callback, 0 },
{ N_("/Image/---"), NULL, NULL, 0, "<Separator>" },
{ N_("/Image/R_esize"), NULL, image_resize_cmd_callback, 0 },
{ N_("/Image/_Scale"), NULL, image_scale_cmd_callback, 0 },
{ N_("/Image/Resize"), NULL, image_resize_cmd_callback, 0 },
{ N_("/Image/Scale"), NULL, image_scale_cmd_callback, 0 },
{ N_("/Image/---"), NULL, NULL, 0, "<Separator>" },
{ N_("/_Layers"), "", NULL, 0, "<Branch>" },
{ N_("/Layers/_Layers & Channels..."), "<control>L", dialogs_lc_cmd_callback, 0 },
{ N_("/Layers/_Raise Layer"), "<control>F", layers_raise_cmd_callback, 0 },
{ N_("/Layers/L_ower Layer"), "<control>B", layers_lower_cmd_callback, 0 },
{ N_("/Layers/_Anchor Layer"), "<control>H", layers_anchor_cmd_callback, 0 },
{ N_("/Layers/_Merge Visible Layers"), "<control>M", layers_merge_cmd_callback, 0 },
{ N_("/Layers/_Flatten Image"), NULL, layers_flatten_cmd_callback, 0 },
{ N_("/Layers/Al_pha To Selection"), NULL, layers_alpha_select_cmd_callback, 0 },
{ N_("/Layers/Ma_sk To Selection"), NULL, layers_mask_select_cmd_callback, 0 },
{ N_("/Layers/A_dd Alpha Channel"), NULL, layers_add_alpha_channel_cmd_callback, 0 },
{ N_("/Layers/Layers & Channels..."), "<control>L", dialogs_lc_cmd_callback, 0 },
{ N_("/Layers/Raise Layer"), "<control>F", layers_raise_cmd_callback, 0 },
{ N_("/Layers/Lower Layer"), "<control>B", layers_lower_cmd_callback, 0 },
{ N_("/Layers/Anchor Layer"), "<control>H", layers_anchor_cmd_callback, 0 },
{ N_("/Layers/Merge Visible Layers"), "<control>M", layers_merge_cmd_callback, 0 },
{ N_("/Layers/Flatten Image"), NULL, layers_flatten_cmd_callback, 0 },
{ N_("/Layers/Alpha To Selection"), NULL, layers_alpha_select_cmd_callback, 0 },
{ N_("/Layers/Mask To Selection"), NULL, layers_mask_select_cmd_callback, 0 },
{ N_("/Layers/Add Alpha Channel"), NULL, layers_add_alpha_channel_cmd_callback, 0 },
/* these are built on the fly */
......@@ -206,29 +195,26 @@ static const GtkItemFactoryEntry image_entries[] =
{ N_("/Tools/Swap Colors"), "X", tools_swap_colors_cmd_callback, 0 },
*/
{ N_("/_Tools"), "", NULL, 0, "<Branch>" },
{ N_("/Tools/_Toolbox"), NULL, toolbox_raise_callback, 0 },
{ N_("/Tools/_Default Colors"), "D", tools_default_colors_cmd_callback, 0 },
{ N_("/Tools/_Swap Colors"), "X", tools_swap_colors_cmd_callback, 0 },
{ N_("/Tools/Toolbox"), NULL, toolbox_raise_callback, 0 },
{ N_("/Tools/Default Colors"), "D", tools_default_colors_cmd_callback, 0 },
{ N_("/Tools/Swap Colors"), "X", tools_swap_colors_cmd_callback, 0 },
{ N_("/Tools/---"), NULL, NULL, 0, "<Separator>" },
{ N_("/Filte_rs"), "", NULL, 0, "<Branch>" },
{ N_("/Filters/_Repeat last"), "<alt>F", filters_repeat_cmd_callback, 0x0 },
{ N_("/Filters/Re-_show last"), "<alt><shift>F", filters_repeat_cmd_callback, 0x1 },
{ N_("/Filters/Repeat last"), "<alt>F", filters_repeat_cmd_callback, 0x0 },
{ N_("/Filters/Re-show last"), "<alt><shift>F", filters_repeat_cmd_callback, 0x1 },
{ N_("/Filters/---"), NULL, NULL, 0, "<Separator>" },
{ N_("/Script-Fu/"), NULL, NULL, 0 },
{ N_("/_Dialogs"), "", NULL, 0, "<Branch>" },
{ N_("/Dialogs/_Brushes..."), "<control><shift>B", dialogs_brushes_cmd_callback, 0 },
{ N_("/Dialogs/_Patterns..."), "<control><shift>P", dialogs_patterns_cmd_callback, 0 },
{ N_("/Dialogs/P_alette..."), "<control>P", dialogs_palette_cmd_callback, 0 },
{ N_("/Dialogs/_Gradient..."), "<control>G", dialogs_gradient_editor_cmd_callback, 0 },
{ N_("/Dialogs/_Layers & Channels..."), "<control>L", dialogs_lc_cmd_callback, 0 },
{ N_("/Dialogs/_Indexed Palette..."), NULL, dialogs_indexed_palette_cmd_callback, 0 },
{ N_("/Dialogs/_Tool Options..."), NULL, dialogs_tools_options_cmd_callback, 0 },
{ N_("/Dialogs/I_nput Devices..."), NULL, dialogs_input_devices_cmd_callback, 0 },
{ N_("/Dialogs/_Device Status..."), NULL, dialogs_device_status_cmd_callback, 0 },
{ N_("/Dialogs/Brushes..."), "<control><shift>B", dialogs_brushes_cmd_callback, 0 },
{ N_("/Dialogs/Patterns..."), "<control><shift>P", dialogs_patterns_cmd_callback, 0 },
{ N_("/Dialogs/Palette..."), "<control>P", dialogs_palette_cmd_callback, 0 },
{ N_("/Dialogs/Gradient..."), "<control>G", dialogs_gradient_editor_cmd_callback, 0 },
{ N_("/Dialogs/Layers & Channels..."), "<control>L", dialogs_lc_cmd_callback, 0 },
{ N_("/Dialogs/Indexed Palette..."), NULL, dialogs_indexed_palette_cmd_callback, 0 },
{ N_("/Dialogs/Tool Options..."), NULL, dialogs_tools_options_cmd_callback, 0 },
{ N_("/Dialogs/Input Devices..."), NULL, dialogs_input_devices_cmd_callback, 0 },
{ N_("/Dialogs/Device Status..."), NULL, dialogs_device_status_cmd_callback, 0 },
};
static guint n_image_entries = sizeof (image_entries) / sizeof (image_entries[0]);
static GtkItemFactory *image_factory = NULL;
......
......@@ -30,7 +30,6 @@
#include "channel_ops.h"
#include "clone.h"
#include "color_balance.h"
#include "color_cmds.h"
#include "color_picker.h"
#include "convolve.h"
#include "crop.h"
......@@ -76,6 +75,7 @@ void register_paths_procs (void);
void register_palette_procs (void);
void register_unit_procs (void);
void register_text_tool_procs (void);
void register_color_procs (void);
void
internal_procs_init ()
......@@ -368,16 +368,16 @@ internal_procs_init ()
procedural_db_register (&equalize_proc); pcount++;
procedural_db_register (&invert_proc); pcount++;
procedural_db_register (&brightness_contrast_proc); pcount++;
procedural_db_register (&curves_spline_proc); pcount++;
procedural_db_register (&curves_explicit_proc); pcount++;
procedural_db_register (&color_balance_proc); pcount++;
procedural_db_register (&histogram_proc); pcount++;
procedural_db_register (&hue_saturation_proc); pcount++;
procedural_db_register (&levels_proc); pcount++;
procedural_db_register (&posterize_proc); pcount++;
procedural_db_register (&threshold_proc); pcount++;
register_color_procs ();
pcount += 3;
register_convert_procs ();
pcount += 4;
......
......@@ -22,6 +22,15 @@
#include "gimplutF.h"
#include "gimphistogramF.h"
typedef enum /*< chop=_LUT >*/
{
VALUE_LUT, /*< nick=VALUE/GRAY >*/
RED_LUT,
GREEN_LUT,
BLUE_LUT,
GRAY_LUT = 0 /*< skip >*/
} ChannelLutType;
/* brightness contrast */
void brightness_contrast_lut_setup (GimpLut *lut,
double brightness, double contrast,
......
......@@ -50,130 +50,119 @@ static GSList *last_opened_raw_filenames = NULL;
static const GtkItemFactoryEntry toolbox_entries[] =
{
{ N_("/_File"), "", NULL, 0, "<Branch>" },
{ N_("/File/_New"), "<control>N", file_new_cmd_callback, 0 },
{ N_("/File/_Open"), "<control>O", file_open_cmd_callback, 0 },
{ N_("/File/_About..."), NULL, about_dialog_cmd_callback, 0 },
{ N_("/File/_Preferences..."), NULL, file_pref_cmd_callback, 0 },
{ N_("/File/_Tip of the day"), NULL, tips_dialog_cmd_callback, 0 },
{ N_("/File/---"), NULL, NULL, 0, "<Separator>" },
{ N_("/File/_Dialogs"), "", NULL, 0, "<Branch>" },
{ N_("/File/Dialogs/_Brushes..."), "<control><shift>B", dialogs_brushes_cmd_callback, 0 },
{ N_("/File/Dialogs/_Patterns..."), "<control><shift>P", dialogs_patterns_cmd_callback, 0 },
{ N_("/File/Dialogs/P_alette..."), "<control>P", dialogs_palette_cmd_callback, 0 },
{ N_("/File/Dialogs/_Gradient..."), "<control>G", dialogs_gradient_editor_cmd_callback, 0 },
{ N_("/File/Dialogs/_Layers & Channels..."), "<control>L", dialogs_lc_cmd_callback, 0 },
{ N_("/File/Dialogs/_Tool Options..."), "<control><shift>T", dialogs_tools_options_cmd_callback, 0 },
{ N_("/File/Dialogs/_Input Devices..."), NULL, dialogs_input_devices_cmd_callback, 0 },
{ N_("/File/Dialogs/_Device Status..."), NULL, dialogs_device_status_cmd_callback, 0 },
{ N_("/File/Dialogs/D_ocument Index..."), NULL, raise_idea_callback, 0 },
{ N_("/File/Dialogs/_Error Console..."), NULL, dialogs_error_console_cmd_callback, 0 },
{ N_("/File/Dialogs/_Module Browser..."), NULL, dialogs_module_browser_cmd_callback, 0 },
{ N_("/File/New"), "<control>N", file_new_cmd_callback, 0 },
{ N_("/File/Open"), "<control>O", file_open_cmd_callback, 0 },
{ N_("/File/About..."), NULL, about_dialog_cmd_callback, 0 },
{ N_("/File/Preferences..."), NULL, file_pref_cmd_callback, 0 },
{ N_("/File/Tip of the day"), NULL, tips_dialog_cmd_callback, 0 },
{ N_("/File/---"), NULL, NULL, 0, "<Separator>" },
{ N_("/File/Dialogs/Brushes..."), "<control><shift>B", dialogs_brushes_cmd_callback, 0 },
{ N_("/File/Dialogs/Patterns..."), "<control><shift>P", dialogs_patterns_cmd_callback, 0 },
{ N_("/File/Dialogs/Palette..."), "<control>P", dialogs_palette_cmd_callback, 0 },
{ N_("/File/Dialogs/Gradient..."), "<control>G", dialogs_gradient_editor_cmd_callback, 0 },
{ N_("/File/Dialogs/Layers & Channels..."), "<control>L", dialogs_lc_cmd_callback, 0 },
{ N_("/File/Dialogs/Tool Options..."), "<control><shift>T", dialogs_tools_options_cmd_callback, 0 },
{ N_("/File/Dialogs/Input Devices..."), NULL, dialogs_input_devices_cmd_callback, 0 },
{ N_("/File/Dialogs/Device Status..."), NULL, dialogs_device_status_cmd_callback, 0 },
{ N_("/File/Dialogs/Document Index..."), NULL, raise_idea_callback, 0 },
{ N_("/File/Dialogs/Error Console..."), NULL, dialogs_error_console_cmd_callback, 0 },
{ N_("/File/Dialogs/Module Browser..."), NULL, dialogs_module_browser_cmd_callback, 0 },
{ N_("/File/---"), NULL, NULL, 0, "<Separator>" }
};
static guint n_toolbox_entries = sizeof (toolbox_entries) / sizeof (toolbox_entries[0]);
static GtkItemFactory *toolbox_factory = NULL;
static const GtkItemFactoryEntry file_menu_separator = { N_("/File/---"), NULL, NULL, 0, "<Separator>" };
static const GtkItemFactoryEntry toolbox_end = { N_("/File/_Quit"), "<control>Q", file_quit_cmd_callback, 0 };
static const GtkItemFactoryEntry toolbox_end = { N_("/File/Quit"), "<control>Q", file_quit_cmd_callback, 0 };
static const GtkItemFactoryEntry image_entries[] =
{
{ N_("/_File"), "", NULL, 0, "<Branch>" },
{ N_("/File/_New"), "<control>N", file_new_cmd_callback, 1 },
{ N_("/File/_Open"), "<control>O", file_open_cmd_callback, 0 },
{ N_("/File/_Save"), "<control>S", file_save_cmd_callback, 0 },
{ N_("/File/Save _as"), NULL, file_save_as_cmd_callback, 0 },
{ N_("/File/_Revert"), NULL, file_revert_cmd_callback, 0 },
{ N_("/File/_Preferences..."), NULL, file_pref_cmd_callback, 0 },
{ N_("/File/New"), "<control>N", file_new_cmd_callback, 1 },
{ N_("/File/Open"), "<control>O", file_open_cmd_callback, 0 },
{ N_("/File/Save"), "<control>S", file_save_cmd_callback, 0 },
{ N_("/File/Save as"), NULL, file_save_as_cmd_callback, 0 },
{ N_("/File/Revert"), NULL, file_revert_cmd_callback, 0 },
{ N_("/File/Preferences..."), NULL, file_pref_cmd_callback, 0 },
{ N_("/File/---"), NULL, NULL, 0, "<Separator>" },
{ N_("/File/_Close"), "<control>W", file_close_cmd_callback, 0 },
{ N_("/File/_Quit"), "<control>Q", file_quit_cmd_callback, 0 },
{ N_("/File/Close"), "<control>W", file_close_cmd_callback, 0 },
{ N_("/File/Quit"), "<control>Q", file_quit_cmd_callback, 0 },
{ N_("/File/---moved"), NULL, NULL, 0, "<Separator>" },
{ N_("/_Edit"), "", NULL, 0, "<Branch>" },
{ N_("/Edit/Cu_t"), "<control>X", edit_cut_cmd_callback, 0 },
{ N_("/Edit/_Copy"), "<control>C", edit_copy_cmd_callback, 0 },
{ N_("/Edit/_Paste"), "<control>V", edit_paste_cmd_callback, 0 },
{ N_("/Edit/Paste _Into"), NULL, edit_paste_into_cmd_callback, 0 },
{ N_("/Edit/C_lear"), "<control>K", edit_clear_cmd_callback, 0 },
{ N_("/Edit/_Fill"), "<control>period", edit_fill_cmd_callback, 0 },
{ N_("/Edit/_Stroke"), NULL, edit_stroke_cmd_callback, 0 },
{ N_("/Edit/_Undo"), "<control>Z", edit_undo_cmd_callback, 0 },
{ N_("/Edit/_Redo"), "<control>R", edit_redo_cmd_callback, 0 },
{ N_("/Edit/Cut"), "<control>X", edit_cut_cmd_callback, 0 },
{ N_("/Edit/Copy"), "<control>C", edit_copy_cmd_callback, 0 },
{ N_("/Edit/Paste"), "<control>V", edit_paste_cmd_callback, 0 },
{ N_("/Edit/Paste Into"), NULL, edit_paste_into_cmd_callback, 0 },
{ N_("/Edit/Clear"), "<control>K", edit_clear_cmd_callback, 0 },
{ N_("/Edit/Fill"), "<control>period", edit_fill_cmd_callback, 0 },
{ N_("/Edit/Stroke"), NULL, edit_stroke_cmd_callback, 0 },
{ N_("/Edit/Undo"), "<control>Z", edit_undo_cmd_callback, 0 },
{ N_("/Edit/Redo"), "<control>R", edit_redo_cmd_callback, 0 },
{ N_("/Edit/---"), NULL, NULL, 0, "<Separator>" },
{ N_("/Edit/Cut _Named"), "<control><shift>X", edit_named_cut_cmd_callback, 0 },
{ N_("/Edit/Cop_y Named"), "<control><shift>C", edit_named_copy_cmd_callback, 0 },
{ N_("/Edit/Past_e Named"), "<control><shift>V", edit_named_paste_cmd_callback, 0 },
{ N_("/Edit/Cut Named"), "<control><shift>X", edit_named_cut_cmd_callback, 0 },
{ N_("/Edit/Copy Named"), "<control><shift>C", edit_named_copy_cmd_callback, 0 },
{ N_("/Edit/Paste Named"), "<control><shift>V", edit_named_paste_cmd_callback, 0 },
{ N_("/Edit/---"), NULL, NULL, 0, "<Separator>" },
{ N_("/_Select"), "", NULL, 0, "<Branch>" },
{ N_("/Select/_Toggle"), "<control>T", select_toggle_cmd_callback, 0 },
{ N_("/Select/_Invert"), "<control>I", select_invert_cmd_callback, 0 },
{ N_("/Select/_All"), "<control>A", select_all_cmd_callback, 0 },
{ N_("/Select/_None"), "<control><shift>A", select_none_cmd_callback, 0 },
{ N_("/Select/_Float"), "<control><shift>L", select_float_cmd_callback, 0 },
{ N_("/Select/_Sharpen"), "<control><shift>H", select_sharpen_cmd_callback, 0 },
{ N_("/Select/_Border"), "<control><shift>B", select_border_cmd_callback, 0 },
{ N_("/Select/F_eather"), "<control><shift>F", select_feather_cmd_callback, 0 },
{ N_("/Select/_Grow"), NULL, select_grow_cmd_callback, 0 },
{ N_("/Select/S_hrink"), NULL, select_shrink_cmd_callback, 0 },
{ N_("/Select/Save To _Channel"), NULL, select_save_cmd_callback, 0 },
{ N_("/_View"), "", NULL, 0, "<Branch>" },
{ N_("/View/Zoom _In"), "equal", view_zoomin_cmd_callback, 0 },
{ N_("/View/Zoom _Out"), "minus", view_zoomout_cmd_callback, 0 },
{ N_("/View/Zoom/1_6:1"), NULL, view_zoom_16_1_callback, 0 },
{ N_("/View/Zoom/_8:1"), NULL, view_zoom_8_1_callback, 0 },
{ N_("/View/Zoom/_4:1"), NULL, view_zoom_4_1_callback, 0 },
{ N_("/View/Zoom/_2:1"), NULL, view_zoom_2_1_callback, 0 },
{ N_("/View/Zoom/_1:1"), "1", view_zoom_1_1_callback, 0 },
{ N_("/Select/Toggle"), "<control>T", select_toggle_cmd_callback, 0 },
{ N_("/Select/Invert"), "<control>I", select_invert_cmd_callback, 0 },
{ N_("/Select/All"), "<control>A", select_all_cmd_callback, 0 },
{ N_("/Select/None"), "<control><shift>A", select_none_cmd_callback, 0 },
{ N_("/Select/Float"), "<control><shift>L", select_float_cmd_callback, 0 },
{ N_("/Select/Sharpen"), "<control><shift>H", select_sharpen_cmd_callback, 0 },
{ N_("/Select/Border"), "<control><shift>B", select_border_cmd_callback, 0 },
{ N_("/Select/Feather"), "<control><shift>F", select_feather_cmd_callback, 0 },
{ N_("/Select/Grow"), NULL, select_grow_cmd_callback, 0 },
{ N_("/Select/Shrink"), NULL, select_shrink_cmd_callback, 0 },
{ N_("/Select/Save To Channel"), NULL, select_save_cmd_callback, 0 },
{ N_("/View/Zoom In"), "equal", view_zoomin_cmd_callback, 0 },
{ N_("/View/Zoom Out"), "minus", view_zoomout_cmd_callback, 0 },
{ N_("/View/Zoom/16:1"), NULL, view_zoom_16_1_callback, 0 },
{ N_("/View/Zoom/8:1"), NULL, view_zoom_8_1_callback, 0 },
{ N_("/View/Zoom/4:1"), NULL, view_zoom_4_1_callback, 0 },
{ N_("/View/Zoom/2:1"), NULL, view_zoom_2_1_callback, 0 },
{ N_("/View/Zoom/1:1"), "1", view_zoom_1_1_callback, 0 },
{ N_("/View/Zoom/1:2"), NULL, view_zoom_1_2_callback, 0 },