Commit f8b4fbd4 authored by Michael Natterer's avatar Michael Natterer 😴 Committed by Michael Natterer

namespaceified and cleaned up a lot. Removed the menu code.

2002-03-17  Michael Natterer  <mitch@gimp.org>

	* app/widgets/gimpcolormapeditor.[ch]: namespaceified and cleaned
	up a lot. Removed the menu code.

	* app/gui/menus.c: added a "<ColormapEditor>" item factory...

	* app/gui/Makefile.am
	* app/gui/colormap-editor-commands.[ch]: ...and callbacks for the
	new factory.

	* app/gui/menus.c: Cleaned up a lot. Removed most static variables.
	Enabled the menu debugging code again. Moved all debug and test
	entries to <Toolbox>/File/Debug. Added an "Open Recent" submenu
	to <Image>/File because it was a one-liner after the cleanup...

	* app/widgets/gimpeditor.c: create the icons in GTK_ICON_SIZE_MENU.
	Need to make this configurable using a style property...
parent ef6c0e6b
2002-03-17 Michael Natterer <mitch@gimp.org>
* app/widgets/gimpcolormapeditor.[ch]: namespaceified and cleaned
up a lot. Removed the menu code.
* app/gui/menus.c: added a "<ColormapEditor>" item factory...
* app/gui/Makefile.am
* app/gui/colormap-editor-commands.[ch]: ...and callbacks for the
new factory.
* app/gui/menus.c: Cleaned up a lot. Removed most static variables.
Enabled the menu debugging code again. Moved all debug and test
entries to <Toolbox>/File/Debug. Added an "Open Recent" submenu
to <Image>/File because it was a one-liner after the cleanup...
* app/widgets/gimpeditor.c: create the icons in GTK_ICON_SIZE_MENU.
Need to make this configurable using a style property...
2002-03-16 Michael Natterer <mitch@gimp.org>
* app/gui/Makefile.am
......
/* 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 "libgimpcolor/gimpcolor.h"
#include "libgimpwidgets/gimpwidgets.h"
#include "gui-types.h"
#include "core/gimp.h"
#include "core/gimpimage.h"
#include "display/gimpdisplay-foreach.h"
#include "widgets/gimpcolormapeditor.h"
#include "widgets/gimpitemfactory.h"
#include "widgets/gimpwidgets-utils.h"
#include "color-notebook.h"
#include "colormap-editor-commands.h"
#include "libgimp/gimpintl.h"
/* local function prototypes */
static void colormap_editor_color_notebook_callback (ColorNotebook *color_notebook,
const GimpRGB *color,
ColorNotebookState state,
gpointer data);
/* public functions */
void
colormap_editor_add_color_cmd_callback (GtkWidget *widget,
gpointer data,
guint action)
{
GimpColormapEditor *editor;
GimpImage *gimage;
editor = (GimpColormapEditor *) gimp_widget_get_callback_context (widget);
if (! editor)
return;
gimage = editor->gimage;
if (! gimage)
return;
memcpy (&gimage->cmap[gimage->num_cols * 3],
&gimage->cmap[editor->col_index * 3],
3);
gimage->num_cols++;
gimp_image_colormap_changed (gimage, -1);
}
void
colormap_editor_edit_color_cmd_callback (GtkWidget *widget,
gpointer data,
guint action)
{
GimpColormapEditor *editor;
GimpImage *gimage;
GimpRGB color;
editor = (GimpColormapEditor *) gimp_widget_get_callback_context (widget);
if (! editor)
return;
gimage = editor->gimage;
if (! gimage)
return;
gimp_rgba_set_uchar (&color,
gimage->cmap[editor->col_index * 3],
gimage->cmap[editor->col_index * 3 + 1],
gimage->cmap[editor->col_index * 3 + 2],
OPAQUE_OPACITY);
if (! editor->color_notebook)
{
editor->color_notebook =
color_notebook_new (_("Edit Indexed Color"),
(const GimpRGB *) &color,
colormap_editor_color_notebook_callback, editor,
FALSE, FALSE);
}
else
{
color_notebook_show (editor->color_notebook);
color_notebook_set_color (editor->color_notebook, &color);
}
}
void
colormap_editor_menu_update (GtkItemFactory *factory,
gpointer data)
{
GimpColormapEditor *editor;
GimpImage *gimage;
gint num_colors = 0;
editor = GIMP_COLORMAP_EDITOR (data);
gimage = editor->gimage;
if (gimage)
{
num_colors = gimage->num_cols;
}
#define SET_SENSITIVE(menu,condition) \
gimp_item_factory_set_sensitive (factory, menu, (condition) != 0)
SET_SENSITIVE ("/Add Color", gimage && num_colors < 256);
SET_SENSITIVE ("/Edit Color...", gimage);
#undef SET_SENSITIVE
}
/* private functions */
static void
colormap_editor_color_notebook_callback (ColorNotebook *color_notebook,
const GimpRGB *color,
ColorNotebookState state,
gpointer data)
{
GimpColormapEditor *editor;
GimpImage *gimage;
editor = GIMP_COLORMAP_EDITOR (data);
gimage = editor->gimage;
switch (state)
{
case COLOR_NOTEBOOK_UPDATE:
break;
case COLOR_NOTEBOOK_OK:
gimp_rgb_get_uchar (color,
&gimage->cmap[editor->col_index * 3 + 0],
&gimage->cmap[editor->col_index * 3 + 1],
&gimage->cmap[editor->col_index * 3 + 2]);
gimp_image_colormap_changed (gimage, editor->col_index);
gdisplays_flush ();
/* Fall through */
case COLOR_NOTEBOOK_CANCEL:
color_notebook_hide (editor->color_notebook);
}
}
/* 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 __COLORMAP_EDITOR_COMMANDS_H__
#define __COLORMAP_EDITOR_COMMANDS_H__
void colormap_editor_add_color_cmd_callback (GtkWidget *widget,
gpointer data,
guint action);
void colormap_editor_edit_color_cmd_callback (GtkWidget *widget,
gpointer data,
guint action);
void colormap_editor_menu_update (GtkItemFactory *factory,
gpointer data);
#endif /* __COLORMAP_EDITOR_COMMANDS_H__ */
/* 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 "libgimpcolor/gimpcolor.h"
#include "libgimpwidgets/gimpwidgets.h"
#include "gui-types.h"
#include "core/gimp.h"
#include "core/gimpimage.h"
#include "display/gimpdisplay-foreach.h"
#include "widgets/gimpcolormapeditor.h"
#include "widgets/gimpitemfactory.h"
#include "widgets/gimpwidgets-utils.h"
#include "color-notebook.h"
#include "colormap-editor-commands.h"
#include "libgimp/gimpintl.h"
/* local function prototypes */
static void colormap_editor_color_notebook_callback (ColorNotebook *color_notebook,
const GimpRGB *color,
ColorNotebookState state,
gpointer data);
/* public functions */
void
colormap_editor_add_color_cmd_callback (GtkWidget *widget,
gpointer data,
guint action)
{
GimpColormapEditor *editor;
GimpImage *gimage;
editor = (GimpColormapEditor *) gimp_widget_get_callback_context (widget);
if (! editor)
return;
gimage = editor->gimage;
if (! gimage)
return;
memcpy (&gimage->cmap[gimage->num_cols * 3],
&gimage->cmap[editor->col_index * 3],
3);
gimage->num_cols++;
gimp_image_colormap_changed (gimage, -1);
}
void
colormap_editor_edit_color_cmd_callback (GtkWidget *widget,
gpointer data,
guint action)
{
GimpColormapEditor *editor;
GimpImage *gimage;
GimpRGB color;
editor = (GimpColormapEditor *) gimp_widget_get_callback_context (widget);
if (! editor)
return;
gimage = editor->gimage;
if (! gimage)
return;
gimp_rgba_set_uchar (&color,
gimage->cmap[editor->col_index * 3],
gimage->cmap[editor->col_index * 3 + 1],
gimage->cmap[editor->col_index * 3 + 2],
OPAQUE_OPACITY);
if (! editor->color_notebook)
{
editor->color_notebook =
color_notebook_new (_("Edit Indexed Color"),
(const GimpRGB *) &color,
colormap_editor_color_notebook_callback, editor,
FALSE, FALSE);
}
else
{
color_notebook_show (editor->color_notebook);
color_notebook_set_color (editor->color_notebook, &color);
}
}
void
colormap_editor_menu_update (GtkItemFactory *factory,
gpointer data)
{
GimpColormapEditor *editor;
GimpImage *gimage;
gint num_colors = 0;
editor = GIMP_COLORMAP_EDITOR (data);
gimage = editor->gimage;
if (gimage)
{
num_colors = gimage->num_cols;
}
#define SET_SENSITIVE(menu,condition) \
gimp_item_factory_set_sensitive (factory, menu, (condition) != 0)
SET_SENSITIVE ("/Add Color", gimage && num_colors < 256);
SET_SENSITIVE ("/Edit Color...", gimage);
#undef SET_SENSITIVE
}
/* private functions */
static void
colormap_editor_color_notebook_callback (ColorNotebook *color_notebook,
const GimpRGB *color,
ColorNotebookState state,
gpointer data)
{
GimpColormapEditor *editor;
GimpImage *gimage;
editor = GIMP_COLORMAP_EDITOR (data);
gimage = editor->gimage;
switch (state)
{
case COLOR_NOTEBOOK_UPDATE:
break;
case COLOR_NOTEBOOK_OK:
gimp_rgb_get_uchar (color,
&gimage->cmap[editor->col_index * 3 + 0],
&gimage->cmap[editor->col_index * 3 + 1],
&gimage->cmap[editor->col_index * 3 + 2]);
gimp_image_colormap_changed (gimage, editor->col_index);
gdisplays_flush ();
/* Fall through */
case COLOR_NOTEBOOK_CANCEL:
color_notebook_hide (editor->color_notebook);
}
}
/* 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 __COLORMAP_EDITOR_COMMANDS_H__
#define __COLORMAP_EDITOR_COMMANDS_H__
void colormap_editor_add_color_cmd_callback (GtkWidget *widget,
gpointer data,
guint action);
void colormap_editor_edit_color_cmd_callback (GtkWidget *widget,
gpointer data,
guint action);
void colormap_editor_menu_update (GtkItemFactory *factory,
gpointer data);
#endif /* __COLORMAP_EDITOR_COMMANDS_H__ */
......@@ -18,6 +18,8 @@ libappgui_a_SOURCES = @STRIP_BEGIN@ \
color-notebook.h \
color-select.c \
color-select.h \
colormap-editor-commands.c \
colormap-editor-commands.h \
commands.c \
commands.h \
convert-dialog.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 "libgimpcolor/gimpcolor.h"
#include "libgimpwidgets/gimpwidgets.h"
#include "gui-types.h"
#include "core/gimp.h"
#include "core/gimpimage.h"
#include "display/gimpdisplay-foreach.h"
#include "widgets/gimpcolormapeditor.h"
#include "widgets/gimpitemfactory.h"
#include "widgets/gimpwidgets-utils.h"
#include "color-notebook.h"
#include "colormap-editor-commands.h"
#include "libgimp/gimpintl.h"
/* local function prototypes */
static void colormap_editor_color_notebook_callback (ColorNotebook *color_notebook,
const GimpRGB *color,
ColorNotebookState state,
gpointer data);
/* public functions */
void
colormap_editor_add_color_cmd_callback (GtkWidget *widget,
gpointer data,
guint action)
{
GimpColormapEditor *editor;
GimpImage *gimage;
editor = (GimpColormapEditor *) gimp_widget_get_callback_context (widget);
if (! editor)
return;
gimage = editor->gimage;
if (! gimage)
return;
memcpy (&gimage->cmap[gimage->num_cols * 3],
&gimage->cmap[editor->col_index * 3],
3);
gimage->num_cols++;
gimp_image_colormap_changed (gimage, -1);
}
void
colormap_editor_edit_color_cmd_callback (GtkWidget *widget,
gpointer data,
guint action)
{
GimpColormapEditor *editor;
GimpImage *gimage;
GimpRGB color;
editor = (GimpColormapEditor *) gimp_widget_get_callback_context (widget);
if (! editor)
return;
gimage = editor->gimage;
if (! gimage)
return;
gimp_rgba_set_uchar (&color,
gimage->cmap[editor->col_index * 3],
gimage->cmap[editor->col_index * 3 + 1],
gimage->cmap[editor->col_index * 3 + 2],
OPAQUE_OPACITY);
if (! editor->color_notebook)
{
editor->color_notebook =
color_notebook_new (_("Edit Indexed Color"),
(const GimpRGB *) &color,
colormap_editor_color_notebook_callback, editor,
FALSE, FALSE);
}
else
{
color_notebook_show (editor->color_notebook);
color_notebook_set_color (editor->color_notebook, &color);
}
}
void
colormap_editor_menu_update (GtkItemFactory *factory,
gpointer data)
{
GimpColormapEditor *editor;
GimpImage *gimage;
gint num_colors = 0;
editor = GIMP_COLORMAP_EDITOR (data);
gimage = editor->gimage;
if (gimage)
{
num_colors = gimage->num_cols;
}
#define SET_SENSITIVE(menu,condition) \
gimp_item_factory_set_sensitive (factory, menu, (condition) != 0)
SET_SENSITIVE ("/Add Color", gimage && num_colors < 256);
SET_SENSITIVE ("/Edit Color...", gimage);
#undef SET_SENSITIVE
}
/* private functions */
static void
colormap_editor_color_notebook_callback (ColorNotebook *color_notebook,
const GimpRGB *color,
ColorNotebookState state,
gpointer data)
{
GimpColormapEditor *editor;
GimpImage *gimage;
editor = GIMP_COLORMAP_EDITOR (data);
gimage = editor->gimage;
switch (state)
{
case COLOR_NOTEBOOK_UPDATE:
break;
case COLOR_NOTEBOOK_OK:
gimp_rgb_get_uchar (color,
&gimage->cmap[editor->col_index * 3 + 0],
&gimage->cmap[editor->col_index * 3 + 1],
&gimage->cmap[editor->col_index * 3 + 2]);
gimp_image_colormap_changed (gimage, editor->col_index);
gdisplays_flush ();
/* Fall through */
case COLOR_NOTEBOOK_CANCEL:
color_notebook_hide (editor->color_notebook);
}
}
/* 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 __COLORMAP_EDITOR_COMMANDS_H__
#define __COLORMAP_EDITOR_COMMANDS_H__
void colormap_editor_add_color_cmd_callback (GtkWidget *widget,
gpointer data,
guint action);
void colormap_editor_edit_color_cmd_callback (GtkWidget *widget,
gpointer data,
guint action);
void colormap_editor_menu_update (GtkItemFactory *factory,
gpointer data);
#endif /* __COLORMAP_EDITOR_COMMANDS_H__ */
......@@ -36,20 +36,10 @@
#include "widgets/gimpitemfactory.h"
#include "display/gimpdisplay.h"
#include "tools/gimpbrightnesscontrasttool.h"
#include "tools/gimpcolorbalancetool.h"
#include "tools/gimpcurvestool.h"
#include "tools/gimphuesaturationtool.h"
#include "tools/gimplevelstool.h"
#include "tools/gimpposterizetool.h"
#include "tools/gimpthresholdtool.h"
#include "tools/tool_manager.h"
#include "brushes-commands.h"
#include "buffers-commands.h"
#include "channels-commands.h"
#include "colormap-editor-commands.h"
#include "commands.h"
#include "data-commands.h"
#include "dialogs-commands.h"
......@@ -79,27 +69,28 @@