1997-11-25 06:05:25 +08:00
|
|
|
/* 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
|
1998-04-13 13:44:11 +08:00
|
|
|
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
1997-11-25 06:05:25 +08:00
|
|
|
*/
|
2000-12-17 05:37:03 +08:00
|
|
|
|
|
|
|
#include "config.h"
|
|
|
|
|
2001-01-16 22:47:09 +08:00
|
|
|
#include <stdio.h>
|
|
|
|
|
2000-12-17 05:37:03 +08:00
|
|
|
#include <gtk/gtk.h>
|
|
|
|
|
|
|
|
#include "apptypes.h"
|
|
|
|
|
1997-11-25 06:05:25 +08:00
|
|
|
#include "appenv.h"
|
|
|
|
#include "color_panel.h"
|
Bit of a large checkin this - it's basically three things: 1 - GimpModules
Sun Jan 11 00:24:21 GMT 1999 Austin Donnelly <austin@greenend.org.uk>
Bit of a large checkin this - it's basically three things:
1 - GimpModules using gmodules to dynamically load and
initialise modules at gimp start of day.
2 - Color selectors now register themselves with a color
notebook.
3 - progress bars have been cleaned up a bit, so now have
progress indictations on all transform tool and gradient
fill operations. Not done bucket fill, but that seems to
be the next candidate.
New directories:
* modules/: new directory for dynamically loadable modules.
New files:
* modules/.cvsignore
* modules/Makefile.am
* modules/colorsel_gtk.c: GTK color selector wrapped up as a
color selector the gimp can use.
* app/gimpprogress.[ch]: progress bars within gimp core, either as
popups, or in the status bar. This is mainly code moved out
of plug-in.c
* app/color_notebook.[ch]: color selector notebook, implementing
very similar interface to color_select.h so it can be used as
a drop-in replacement for it.
* libgimp/color_selector.h: API color selectors need to implement
to become a page in the color_notebook.
* libgimp/gimpmodule.h: API gimp modules need to implement to be
initialised by gimp at start of day.
Modified files:
* Makefile.am: add modules/ to SUBDIRS
* libgimp/Makefile.am: install gimpmodule.h and color_selector.h
* app/gimprc.[ch]: recognise module-path variable.
* gimprc.in: set module-path variable to something sensible
(currently "${gimp_dir}/modules:${gimp_plugin_dir}/modules").
* app/Makefile.am: build color notebook and gimpprogress
* app/app_procs.c: register internal GIMP color selector with
color notebook.
* app/asupsample.c: call progress function less frequently for
better performance.
* app/asupsample.h: progress_func_t typedef moved to gimpprogress.h
* app/blend.c: make callbacks to a progress function
* app/color_area.c: use a color notebook rather than a color selector
* app/color_panel.c: ditto
* app/color_select.c: export color selector interface for notebook
* app/color_select.h: color_select_init() prototype
* app/flip_tool.c: flip the image every time, rather than every
second click.
* app/interface.c: move progress bar stuff out to
gimpprogress.c. Make the code actually work while we're at it.
* app/interface.h: move prototypes for progress functions out to
gimpprogress.h
* app/plug_in.c: load and initialise modules (if possible). Move
progress bar handling code out to gimpprogress.c
* app/plug_in.h: keep only a gimp_progress * for each plugin, not
a whole bunch of GtkWidgets.
* app/scale_tool.c
* app/rotate_tool.c
* app/shear_tool.c
* app/perspective_tool.c: progress bar during operation.
De-sensitise the dialog to discourage the user from running
two transforms in parallel.
* app/transform_core.c: recalculate grid coords when bounding box
changes. Only initialise the action area of the dialog once,
to avoid multiple "ok" / "reset" buttons appearing. Undraw
transform tool with correct matrix to get rid of handle
remains on screen. Call a progress function as we apply the
transform matrix. A few new i18n markups. Invalidate
floating selection marching ants after applying matrix.
* app/transform_core.h: transform_core_do() takes an optional
progress callback argument (and data).
* plug-ins/oilify/oilify.c: send progress bar updates after every
pixel region, not only if they processed a multiple of 5
pixels (which was quite unlikely, and therefore gave a jerky
progress indication).
1999-01-11 08:57:33 +08:00
|
|
|
#include "color_notebook.h"
|
1997-11-25 06:05:25 +08:00
|
|
|
|
2000-04-28 01:27:28 +08:00
|
|
|
|
2001-01-15 14:24:24 +08:00
|
|
|
struct _GimpColorPanel
|
1997-11-25 06:05:25 +08:00
|
|
|
{
|
2001-01-15 14:24:24 +08:00
|
|
|
GimpColorButton parent;
|
1997-11-25 06:05:25 +08:00
|
|
|
|
2001-01-15 14:24:24 +08:00
|
|
|
ColorNotebook *color_notebook;
|
|
|
|
gboolean color_notebook_active;
|
1997-11-25 06:05:25 +08:00
|
|
|
};
|
|
|
|
|
1999-08-22 19:45:31 +08:00
|
|
|
/* local function prototypes */
|
2001-01-20 23:37:26 +08:00
|
|
|
static void gimp_color_panel_class_init (GimpColorPanelClass *klass);
|
|
|
|
static void gimp_color_panel_init (GimpColorPanel *panel);
|
|
|
|
static void gimp_color_panel_destroy (GtkObject *object);
|
|
|
|
static void gimp_color_panel_color_changed (GimpColorButton *button);
|
|
|
|
static void gimp_color_panel_clicked (GtkButton *button);
|
1997-11-25 06:05:25 +08:00
|
|
|
|
2001-01-21 21:41:07 +08:00
|
|
|
static void gimp_color_panel_select_callback (ColorNotebook *notebook,
|
|
|
|
const GimpRGB *color,
|
2001-01-20 23:37:26 +08:00
|
|
|
ColorNotebookState state,
|
|
|
|
gpointer data);
|
1999-08-23 22:19:26 +08:00
|
|
|
|
1997-11-25 06:05:25 +08:00
|
|
|
|
2001-01-15 14:24:24 +08:00
|
|
|
static GimpColorButtonClass *parent_class = NULL;
|
2001-01-15 09:48:53 +08:00
|
|
|
|
1997-11-25 06:05:25 +08:00
|
|
|
|
2001-01-15 14:24:24 +08:00
|
|
|
GtkType
|
|
|
|
gimp_color_panel_get_type (void)
|
1999-08-24 10:52:40 +08:00
|
|
|
{
|
2001-01-15 14:24:24 +08:00
|
|
|
static guint panel_type = 0;
|
1999-08-24 10:52:40 +08:00
|
|
|
|
2001-01-15 14:24:24 +08:00
|
|
|
if (!panel_type)
|
|
|
|
{
|
|
|
|
GtkTypeInfo panel_info =
|
|
|
|
{
|
|
|
|
"GimpColorPanel",
|
|
|
|
sizeof (GimpColorPanel),
|
|
|
|
sizeof (GimpColorPanelClass),
|
|
|
|
(GtkClassInitFunc) gimp_color_panel_class_init,
|
|
|
|
(GtkObjectInitFunc) gimp_color_panel_init,
|
|
|
|
/* reserved_1 */ NULL,
|
|
|
|
/* reserved_2 */ NULL,
|
|
|
|
(GtkClassInitFunc) NULL
|
|
|
|
};
|
|
|
|
|
|
|
|
panel_type = gtk_type_unique (GIMP_TYPE_COLOR_BUTTON, &panel_info);
|
|
|
|
}
|
|
|
|
|
|
|
|
return panel_type;
|
|
|
|
}
|
1999-08-24 10:52:40 +08:00
|
|
|
|
2001-01-15 14:24:24 +08:00
|
|
|
static void
|
|
|
|
gimp_color_panel_class_init (GimpColorPanelClass *klass)
|
|
|
|
{
|
|
|
|
GtkObjectClass *object_class;
|
|
|
|
GtkButtonClass *button_class;
|
|
|
|
GimpColorButtonClass *color_button_class;
|
|
|
|
|
|
|
|
object_class = (GtkObjectClass *) klass;
|
|
|
|
button_class = (GtkButtonClass *) klass;
|
|
|
|
color_button_class = (GimpColorButtonClass *) klass;
|
|
|
|
|
2001-01-21 21:41:07 +08:00
|
|
|
parent_class = gtk_type_class (GIMP_TYPE_COLOR_BUTTON);
|
2001-01-15 14:24:24 +08:00
|
|
|
|
|
|
|
object_class->destroy = gimp_color_panel_destroy;
|
|
|
|
button_class->clicked = gimp_color_panel_clicked;
|
2001-01-15 17:27:48 +08:00
|
|
|
color_button_class->color_changed = gimp_color_panel_color_changed;
|
1999-08-24 10:52:40 +08:00
|
|
|
}
|
|
|
|
|
2001-01-15 14:24:24 +08:00
|
|
|
static void
|
|
|
|
gimp_color_panel_init (GimpColorPanel *panel)
|
|
|
|
{
|
|
|
|
panel->color_notebook = NULL;
|
|
|
|
panel->color_notebook_active = FALSE;
|
|
|
|
}
|
1999-08-23 22:19:26 +08:00
|
|
|
|
2000-04-03 23:40:30 +08:00
|
|
|
static void
|
2001-01-15 14:24:24 +08:00
|
|
|
gimp_color_panel_destroy (GtkObject *object)
|
2000-04-03 23:40:30 +08:00
|
|
|
{
|
2001-01-15 14:24:24 +08:00
|
|
|
GimpColorPanel *panel;
|
2000-04-03 23:40:30 +08:00
|
|
|
|
2001-01-15 14:24:24 +08:00
|
|
|
g_return_if_fail (object != NULL);
|
|
|
|
g_return_if_fail (GIMP_IS_COLOR_PANEL (object));
|
|
|
|
|
|
|
|
panel = GIMP_COLOR_PANEL (object);
|
2000-04-03 23:40:30 +08:00
|
|
|
|
|
|
|
/* make sure we hide and free color_notebook */
|
2001-01-15 14:24:24 +08:00
|
|
|
if (panel->color_notebook)
|
2000-04-03 23:40:30 +08:00
|
|
|
{
|
2001-01-15 14:24:24 +08:00
|
|
|
color_notebook_hide (panel->color_notebook);
|
|
|
|
color_notebook_free (panel->color_notebook);
|
2000-04-03 23:40:30 +08:00
|
|
|
}
|
2001-01-15 14:24:24 +08:00
|
|
|
|
|
|
|
if (GTK_OBJECT_CLASS (parent_class)->destroy)
|
|
|
|
GTK_OBJECT_CLASS (parent_class)->destroy (object);
|
2000-04-03 23:40:30 +08:00
|
|
|
}
|
|
|
|
|
2001-01-15 14:24:24 +08:00
|
|
|
GtkWidget *
|
2001-01-21 21:41:07 +08:00
|
|
|
gimp_color_panel_new (const gchar *title,
|
|
|
|
const GimpRGB *color,
|
2001-01-15 14:24:24 +08:00
|
|
|
GimpColorAreaType type,
|
|
|
|
gint width,
|
|
|
|
gint height)
|
1997-11-25 06:05:25 +08:00
|
|
|
{
|
2001-01-15 14:24:24 +08:00
|
|
|
GimpColorPanel *panel;
|
1997-11-25 06:05:25 +08:00
|
|
|
|
2001-01-15 14:24:24 +08:00
|
|
|
g_return_val_if_fail (color != NULL, NULL);
|
2001-01-15 09:48:53 +08:00
|
|
|
|
2001-01-21 21:41:07 +08:00
|
|
|
panel = gtk_type_new (GIMP_TYPE_COLOR_PANEL);
|
|
|
|
|
|
|
|
GIMP_COLOR_BUTTON (panel)->title = g_strdup (title);
|
1997-11-25 06:05:25 +08:00
|
|
|
|
2001-01-15 14:24:24 +08:00
|
|
|
gimp_color_button_set_type (GIMP_COLOR_BUTTON (panel), type);
|
|
|
|
gimp_color_button_set_color (GIMP_COLOR_BUTTON (panel), color);
|
|
|
|
gtk_widget_set_usize (GTK_WIDGET (panel), width, height);
|
2001-01-21 21:41:07 +08:00
|
|
|
|
2001-01-15 14:24:24 +08:00
|
|
|
return GTK_WIDGET (panel);
|
1997-11-25 06:05:25 +08:00
|
|
|
}
|
|
|
|
|
2001-01-15 14:24:24 +08:00
|
|
|
static void
|
|
|
|
gimp_color_panel_color_changed (GimpColorButton *button)
|
1997-11-25 06:05:25 +08:00
|
|
|
{
|
2001-01-15 14:24:24 +08:00
|
|
|
GimpColorPanel *panel;
|
|
|
|
GimpRGB color;
|
1997-11-25 06:05:25 +08:00
|
|
|
|
2001-01-15 14:24:24 +08:00
|
|
|
panel = GIMP_COLOR_PANEL (button);
|
1997-11-25 06:05:25 +08:00
|
|
|
|
2001-01-15 14:24:24 +08:00
|
|
|
if (panel->color_notebook_active)
|
1997-11-25 06:05:25 +08:00
|
|
|
{
|
2001-01-15 14:24:24 +08:00
|
|
|
gimp_color_button_get_color (GIMP_COLOR_BUTTON (button), &color);
|
|
|
|
color_notebook_set_color (panel->color_notebook, &color);
|
|
|
|
}
|
|
|
|
}
|
1997-11-25 06:05:25 +08:00
|
|
|
|
2001-01-15 14:24:24 +08:00
|
|
|
static void
|
|
|
|
gimp_color_panel_clicked (GtkButton *button)
|
|
|
|
{
|
|
|
|
GimpColorPanel *panel;
|
|
|
|
GimpRGB color;
|
1997-11-25 06:05:25 +08:00
|
|
|
|
2001-01-15 14:24:24 +08:00
|
|
|
panel = GIMP_COLOR_PANEL (button);
|
1999-08-22 19:45:31 +08:00
|
|
|
|
2001-01-15 14:24:24 +08:00
|
|
|
gimp_color_button_get_color (GIMP_COLOR_BUTTON (button), &color);
|
1999-08-22 19:45:31 +08:00
|
|
|
|
2001-01-15 14:24:24 +08:00
|
|
|
if (! panel->color_notebook)
|
|
|
|
{
|
|
|
|
panel->color_notebook =
|
2001-01-21 21:41:07 +08:00
|
|
|
color_notebook_new (GIMP_COLOR_BUTTON (button)->title,
|
|
|
|
(const GimpRGB *) &color,
|
2001-01-15 14:24:24 +08:00
|
|
|
gimp_color_panel_select_callback,
|
|
|
|
panel,
|
|
|
|
FALSE,
|
|
|
|
gimp_color_button_has_alpha (GIMP_COLOR_BUTTON (button)));
|
|
|
|
panel->color_notebook_active = TRUE;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
if (! panel->color_notebook_active)
|
1997-11-25 06:05:25 +08:00
|
|
|
{
|
2001-01-15 14:24:24 +08:00
|
|
|
color_notebook_show (panel->color_notebook);
|
|
|
|
panel->color_notebook_active = TRUE;
|
1997-11-25 06:05:25 +08:00
|
|
|
}
|
2001-01-15 14:24:24 +08:00
|
|
|
color_notebook_set_color (panel->color_notebook, &color);
|
1997-11-25 06:05:25 +08:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
2001-01-21 21:41:07 +08:00
|
|
|
gimp_color_panel_select_callback (ColorNotebook *notebook,
|
|
|
|
const GimpRGB *color,
|
2001-01-15 14:24:24 +08:00
|
|
|
ColorNotebookState state,
|
|
|
|
gpointer data)
|
1997-11-25 06:05:25 +08:00
|
|
|
{
|
2001-01-15 14:24:24 +08:00
|
|
|
GimpColorPanel *panel;
|
1997-11-25 06:05:25 +08:00
|
|
|
|
2001-01-15 14:24:24 +08:00
|
|
|
panel = GIMP_COLOR_PANEL (data);
|
1997-11-25 06:05:25 +08:00
|
|
|
|
2001-01-15 14:24:24 +08:00
|
|
|
if (panel->color_notebook)
|
1997-11-25 06:05:25 +08:00
|
|
|
{
|
1999-08-22 19:45:31 +08:00
|
|
|
switch (state)
|
|
|
|
{
|
|
|
|
case COLOR_NOTEBOOK_UPDATE:
|
|
|
|
break;
|
|
|
|
case COLOR_NOTEBOOK_OK:
|
2001-01-15 14:24:24 +08:00
|
|
|
gimp_color_button_set_color (GIMP_COLOR_BUTTON (panel), color);
|
1999-08-22 19:45:31 +08:00
|
|
|
/* Fallthrough */
|
|
|
|
case COLOR_NOTEBOOK_CANCEL:
|
2001-01-15 14:24:24 +08:00
|
|
|
color_notebook_hide (panel->color_notebook);
|
|
|
|
panel->color_notebook_active = FALSE;
|
1999-08-22 19:45:31 +08:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|