dnrops
/
gimp
mirror of https://github.com/GNOME/gimp.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

app/gui/Makefile.am removed... 

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

	* app/gui/Makefile.am
	* app/gui/colormap-dialog.[ch]: removed...

	* app/widgets/Makefile.am
	* app/widgets/widgets-types.h
	* app/widgets/gimpcolormapeditor.[ch]: ...and added here.

	* app/gui/dialogs-constructors.c: changed accordingly.

	* themes/Default/images/Makefile.am
	* themes/Default/images/stock-menu-convert-grayscale.png
	* themes/Default/images/stock-menu-convert-indexed.png
	* themes/Default/images/stock-menu-convert-rgb.png
	* themes/Default/images/stock-menu-merge-down.png
	* themes/Default/images/stock-menu-reshow-filter.png
	* themes/Default/images/stock-menu-rotate-180.png
	* themes/Default/images/stock-menu-rotate-270.png
	* themes/Default/images/stock-menu-rotate-90.png
	* themes/Default/images/stock-menu-scale.png: new icons from Jimmac.

	* themes/Default/images/stock-menu-resize.png: my own doing. Someone
	needs to look at it :)

	* themes/Default/imagerc
	* libgimpwidgets/gimpstock.[ch]: added them.

	* app/gui/menus.c: use them.
This commit is contained in:
Michael Natterer 2002-03-16 17:58:19 +00:00 committed by Michael Natterer
parent c1214ea359
commit ef6c0e6b67
26 changed files with 592 additions and 1442 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
ChangeLog
View File

@ -1,3 +1,33 @@
2002-03-16 Michael Natterer <mitch@gimp.org>
* app/gui/Makefile.am
* app/gui/colormap-dialog.[ch]: removed...
* app/widgets/Makefile.am
* app/widgets/widgets-types.h
* app/widgets/gimpcolormapeditor.[ch]: ...and added here.
* app/gui/dialogs-constructors.c: changed accordingly.
* themes/Default/images/Makefile.am
* themes/Default/images/stock-menu-convert-grayscale.png
* themes/Default/images/stock-menu-convert-indexed.png
* themes/Default/images/stock-menu-convert-rgb.png
* themes/Default/images/stock-menu-merge-down.png
* themes/Default/images/stock-menu-reshow-filter.png
* themes/Default/images/stock-menu-rotate-180.png
* themes/Default/images/stock-menu-rotate-270.png
* themes/Default/images/stock-menu-rotate-90.png
* themes/Default/images/stock-menu-scale.png: new icons from Jimmac.
* themes/Default/images/stock-menu-resize.png: my own doing. Someone
needs to look at it :)
* themes/Default/imagerc
* libgimpwidgets/gimpstock.[ch]: added them.
* app/gui/menus.c: use them.
2002-03-16 Michael Natterer <mitch@gimp.org> 2002-03-16 Michael Natterer <mitch@gimp.org>
* app/display/gimpdisplayshell-filter-dialog.c: treeviewized * app/display/gimpdisplayshell-filter-dialog.c: treeviewized

24
app/dialogs/dialogs-constructors.c
View File

@ -40,6 +40,7 @@
#include "widgets/gimpbrusheditor.h" #include "widgets/gimpbrusheditor.h"
#include "widgets/gimpbrushfactoryview.h" #include "widgets/gimpbrushfactoryview.h"
#include "widgets/gimpbufferview.h" #include "widgets/gimpbufferview.h"
#include "widgets/gimpcolormapeditor.h"
#include "widgets/gimpcontainerlistview.h" #include "widgets/gimpcontainerlistview.h"
#include "widgets/gimpcontainergridview.h" #include "widgets/gimpcontainergridview.h"
#include "widgets/gimpdataeditor.h" #include "widgets/gimpdataeditor.h"
@ -68,7 +69,6 @@
#include "brushes-commands.h" #include "brushes-commands.h"
#include "buffers-commands.h" #include "buffers-commands.h"
#include "channels-commands.h" #include "channels-commands.h"
#include "colormap-dialog.h"
#include "device-status-dialog.h" #include "device-status-dialog.h"
#include "dialogs.h" #include "dialogs.h"
#include "dialogs-constructors.h" #include "dialogs-constructors.h"
@ -94,7 +94,7 @@
/* local function prototypes */ /* local function prototypes */
static void dialogs_indexed_palette_selected (GimpColormapDialog *dialog, static void dialogs_indexed_palette_selected (GimpColormapEditor *editor,
GimpDockable *dockable); GimpDockable *dockable);
static GtkWidget * dialogs_brush_tab_func (GimpDockable *dockable, static GtkWidget * dialogs_brush_tab_func (GimpDockable *dockable,
@ -141,7 +141,7 @@ static void dialogs_path_view_image_changed (GimpContext *context,
GtkWidget *view); GtkWidget *view);
static void dialogs_indexed_palette_image_changed (GimpContext *context, static void dialogs_indexed_palette_image_changed (GimpContext *context,
GimpImage *gimage, GimpImage *gimage,
GimpColormapDialog *ipal); GimpColormapEditor *editor);
/**********************/ /**********************/
@ -777,7 +777,7 @@ dialogs_indexed_palette_new (GimpDialogFactory *factory,
gimage = gimp_context_get_image (context); gimage = gimp_context_get_image (context);
view = gimp_colormap_dialog_new (gimage); view = gimp_colormap_editor_new (gimage);
dockable = dialogs_dockable_new (view, dockable = dialogs_dockable_new (view,
"Indexed Palette", "Colormap", "Indexed Palette", "Colormap",
@ -903,12 +903,12 @@ dialogs_edit_palette_func (GimpData *data)
/* private functions */ /* private functions */
static void static void
dialogs_indexed_palette_selected (GimpColormapDialog *dialog, dialogs_indexed_palette_selected (GimpColormapEditor *editor,
GimpDockable *dockable) GimpDockable *dockable)
{ {
GimpContext *context; GimpContext *context;
context = (GimpContext *) g_object_get_data (G_OBJECT (dialog), context = (GimpContext *) g_object_get_data (G_OBJECT (editor),
"gimp-dialogs-context"); "gimp-dialogs-context");
if (context) if (context)
@ -917,8 +917,8 @@ dialogs_indexed_palette_selected (GimpColormapDialog *dialog,
GimpRGB color; GimpRGB color;
gint index; gint index;
gimage = gimp_colormap_dialog_get_image (dialog); gimage = gimp_colormap_editor_get_image (editor);
index = gimp_colormap_dialog_col_index (dialog); index = gimp_colormap_editor_col_index (editor);
gimp_rgba_set_uchar (&color, gimp_rgba_set_uchar (&color,
gimage->cmap[index * 3], gimage->cmap[index * 3],
@ -1212,9 +1212,9 @@ static void
dialogs_set_indexed_palette_context_func (GimpDockable *dockable, dialogs_set_indexed_palette_context_func (GimpDockable *dockable,
GimpContext *context) GimpContext *context)
{ {
GimpColormapDialog *view; GimpColormapEditor *view;
view = (GimpColormapDialog *) g_object_get_data (G_OBJECT (dockable), view = (GimpColormapEditor *) g_object_get_data (G_OBJECT (dockable),
"gimp-dialogs-view"); "gimp-dialogs-view");
if (view) if (view)
@ -1283,7 +1283,7 @@ dialogs_path_view_image_changed (GimpContext *context,
static void static void
dialogs_indexed_palette_image_changed (GimpContext *context, dialogs_indexed_palette_image_changed (GimpContext *context,
GimpImage *gimage, GimpImage *gimage,
GimpColormapDialog *ipal) GimpColormapEditor *editor)
{ {
gimp_colormap_dialog_set_image (ipal, gimage); gimp_colormap_editor_set_image (editor, gimage);
} }

2
app/gui/Makefile.am
View File

@ -18,8 +18,6 @@ libappgui_a_SOURCES = @STRIP_BEGIN@ \
color-notebook.h \ color-notebook.h \
color-select.c \ color-select.c \
color-select.h \ color-select.h \
colormap-dialog.c \
colormap-dialog.h \
commands.c \ commands.c \
commands.h \ commands.h \
convert-dialog.c \ convert-dialog.c \

934
app/gui/colormap-dialog.c
View File

@ -1,934 +0,0 @@
/* 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 <stdio.h>
#include <stdlib.h>
#include <string.h>
#ifdef __GNUC__
#warning GTK_DISABLE_DEPRECATED
#endif
#undef GTK_DISABLE_DEPRECATED
#include <gtk/gtk.h>
#include <gdk/gdkkeysyms.h>
#include "libgimpcolor/gimpcolor.h"
#include "libgimpmath/gimpmath.h"
#include "libgimpwidgets/gimpwidgets.h"
#include "gui-types.h"
#include "core/gimpcontainer.h"
#include "core/gimpimage.h"
#include "core/gimpmarshal.h"
#include "display/gimpdisplayshell-render.h"
#include "widgets/gimpdnd.h"
#include "color-notebook.h"
#include "colormap-dialog.h"
#include "libgimp/gimpintl.h"
/* Add these features:
*
* load/save colormaps
* requantize
* add color--by clicking in the checked region
* all changes need to flush colormap lookup cache
*/
enum
{
SELECTED,
LAST_SIGNAL
};
static void gimp_colormap_dialog_class_init (GimpColormapDialogClass *klass);
static void gimp_colormap_dialog_init (GimpColormapDialog *colormap_dialog);
static void ipal_create_popup_menu (GimpColormapDialog *ipal);
/* indexed palette routines */
static void ipal_draw (GimpColormapDialog *ipal);
static void ipal_clear (GimpColormapDialog *ipal,
gint start_row);
static void ipal_update_entries (GimpColormapDialog *ipal);
static void ipal_set_index (GimpColormapDialog *ipal,
gint i);
static void ipal_draw_cell (GimpColormapDialog *ipal,
gint col);
/* indexed palette menu callbacks */
static void ipal_add_callback (GtkWidget *widget,
gpointer data);
static void ipal_edit_callback (GtkWidget *widget,
gpointer data);
static void ipal_select_callback (ColorNotebook *color_notebook,
const GimpRGB *color,
ColorNotebookState state,
gpointer data);
/* event callback */
static gint ipal_area_button_press (GtkWidget *widget,
GdkEventButton *bevent,
GimpColormapDialog *ipal);
/* create image menu */
static void ipal_area_size_allocate (GtkWidget *widget,
GtkAllocation *allocation,
GimpColormapDialog *ipal);
static void index_adjustment_change_cb (GtkAdjustment *adjustment,
GimpColormapDialog *ipal);
static void hex_entry_change_cb (GtkEntry *entry,
GimpColormapDialog *ipal);
static void image_mode_changed_cb (GimpImage *gimage,
GimpColormapDialog *ipal);
static void image_colormap_changed_cb (GimpImage *gimage,
gint ncol,
GimpColormapDialog *ipal);
static void ipal_drag_color (GtkWidget *widget,
GimpRGB *color,
gpointer data);
static void ipal_drop_color (GtkWidget *widget,
const GimpRGB *color,
gpointer data);
static guint gimp_colormap_dialog_signals[LAST_SIGNAL] = { 0 };
static GtkVBoxClass *parent_class = NULL;
/* dnd stuff */
static GtkTargetEntry color_palette_target_table[] =
{
GIMP_TARGET_COLOR
};
GType
gimp_colormap_dialog_get_type (void)
{
static GType gcd_type = 0;
if (! gcd_type)
{
static const GTypeInfo gcd_info =
{
sizeof (GimpColormapDialogClass),
(GBaseInitFunc) NULL,
(GBaseFinalizeFunc) NULL,
(GClassInitFunc) gimp_colormap_dialog_class_init,
NULL, /* class_finalize */
NULL, /* class_data */
sizeof (GimpColormapDialog),
0, /* n_preallocs */
(GInstanceInitFunc) gimp_colormap_dialog_init,
};
gcd_type = g_type_register_static (GTK_TYPE_VBOX,
"GimpColormapDialog",
&gcd_info, 0);
}
return gcd_type;
}
static void
gimp_colormap_dialog_class_init (GimpColormapDialogClass* klass)
{
parent_class = g_type_class_peek_parent (klass);
gimp_colormap_dialog_signals[SELECTED] =
g_signal_new ("selected",
G_TYPE_FROM_CLASS (klass),
G_SIGNAL_RUN_FIRST,
G_STRUCT_OFFSET (GimpColormapDialogClass, selected),
NULL, NULL,
gimp_marshal_VOID__VOID,
G_TYPE_NONE, 0);
klass->selected = NULL;
}
static void
gimp_colormap_dialog_init (GimpColormapDialog *colormap_dialog)
{
colormap_dialog->image = NULL;
colormap_dialog->col_index = 0;
colormap_dialog->dnd_col_index = 0;
colormap_dialog->palette = NULL;
colormap_dialog->image_menu = NULL;
colormap_dialog->popup_menu = NULL;
colormap_dialog->option_menu = NULL;
colormap_dialog->xn = 0;
colormap_dialog->yn = 0;
colormap_dialog->cellsize = 0;
colormap_dialog->index_adjustment = NULL;
colormap_dialog->index_spinbutton = NULL;
colormap_dialog->color_entry = NULL;
colormap_dialog->add_item = NULL;
colormap_dialog->color_notebook = NULL;
}
GtkWidget *
gimp_colormap_dialog_new (GimpImage *gimage)
{
GimpColormapDialog *ipal;
GtkWidget *frame;
GtkWidget *table;
g_return_val_if_fail (! gimage || GIMP_IS_IMAGE (gimage), NULL);
ipal = g_object_new (GIMP_TYPE_COLORMAP_DIALOG, NULL);
gtk_box_set_spacing (GTK_BOX (ipal), 2);
ipal_create_popup_menu (ipal);
/* The palette frame */
frame = gtk_frame_new (NULL);
gtk_frame_set_shadow_type (GTK_FRAME (frame), GTK_SHADOW_IN);
gtk_box_pack_start (GTK_BOX (ipal), frame, TRUE, TRUE, 0);
gtk_widget_show (frame);
ipal->palette = gtk_preview_new (GTK_PREVIEW_COLOR);
gtk_widget_set_size_request (ipal->palette, -1, 60);
gtk_preview_set_expand (GTK_PREVIEW (ipal->palette), TRUE);
gtk_widget_add_events (ipal->palette, GDK_BUTTON_PRESS_MASK);
gtk_container_add (GTK_CONTAINER (frame), ipal->palette);
gtk_widget_show (ipal->palette);
g_signal_connect_after (G_OBJECT (ipal->palette), "size_allocate",
G_CALLBACK (ipal_area_size_allocate),
ipal);
g_signal_connect (G_OBJECT (ipal->palette), "button_press_event",
G_CALLBACK (ipal_area_button_press),
ipal);
/* dnd stuff */
gtk_drag_source_set (ipal->palette,
GDK_BUTTON1_MASK | GDK_BUTTON2_MASK,
color_palette_target_table,
G_N_ELEMENTS (color_palette_target_table),
GDK_ACTION_COPY | GDK_ACTION_MOVE);
gimp_dnd_color_source_set (ipal->palette, ipal_drag_color, ipal);
gtk_drag_dest_set (ipal->palette,
GTK_DEST_DEFAULT_HIGHLIGHT |
GTK_DEST_DEFAULT_MOTION |
GTK_DEST_DEFAULT_DROP,
color_palette_target_table,
G_N_ELEMENTS (color_palette_target_table),
GDK_ACTION_COPY);
gimp_dnd_color_dest_set (ipal->palette, ipal_drop_color, ipal);
/* some helpful hints */
table = gtk_table_new (2, 2, FALSE);
gtk_container_set_border_width (GTK_CONTAINER (table), 2);
gtk_table_set_col_spacing (GTK_TABLE (table), 0, 4);
gtk_table_set_row_spacing (GTK_TABLE (table), 0, 2);
gtk_box_pack_end (GTK_BOX (ipal), table, FALSE, FALSE, 0);
gtk_widget_show (table);
ipal->index_spinbutton =
gimp_spin_button_new ((GtkObject **) &ipal->index_adjustment,
0, 0, 0, 1, 10, 10, 1.0, 0);
gimp_table_attach_aligned (GTK_TABLE (table), 0, 0,
_("Color Index:"), 1.0, 0.5,
ipal->index_spinbutton, 1, TRUE);
g_signal_connect (G_OBJECT (ipal->index_adjustment), "value_changed",
G_CALLBACK (index_adjustment_change_cb),
ipal);
ipal->color_entry = gtk_entry_new ();
gtk_entry_set_max_length (GTK_ENTRY (ipal->color_entry), 7);
gimp_table_attach_aligned (GTK_TABLE (table), 0, 1,
_("Hex Triplet:"), 1.0, 0.5,
ipal->color_entry, 1, TRUE);
g_signal_connect (G_OBJECT (ipal->color_entry), "activate",
G_CALLBACK (hex_entry_change_cb),
ipal);
gimp_colormap_dialog_set_image (ipal, gimage);
return GTK_WIDGET (ipal);
}
void
gimp_colormap_dialog_selected (GimpColormapDialog *colormap_dialog)
{
g_return_if_fail (GIMP_IS_COLORMAP_DIALOG (colormap_dialog));
g_signal_emit (G_OBJECT (colormap_dialog),
gimp_colormap_dialog_signals[SELECTED] ,0);
}
void
gimp_colormap_dialog_set_image (GimpColormapDialog *ipal,
GimpImage *gimage)
{
g_return_if_fail (GIMP_IS_COLORMAP_DIALOG (ipal));
g_return_if_fail (! gimage || GIMP_IS_IMAGE (gimage));
if (ipal->image)
{
g_signal_handlers_disconnect_by_func (G_OBJECT (ipal->image),
image_mode_changed_cb,
ipal);
g_signal_handlers_disconnect_by_func (G_OBJECT (ipal->image),
image_colormap_changed_cb,
ipal);
if (! gimage || (gimp_image_base_type (gimage) != GIMP_INDEXED))
{
if (ipal->color_notebook)
color_notebook_hide (ipal->color_notebook);
ipal->index_adjustment->upper = 0;
gtk_adjustment_changed (ipal->index_adjustment);
if (GTK_WIDGET_MAPPED (GTK_WIDGET (ipal)))
ipal_clear (ipal, -1);
}
}
ipal->image = gimage;
ipal->col_index = 0;
ipal->dnd_col_index = 0;
if (gimage)
{
g_signal_connect (G_OBJECT (gimage), "mode_changed",
G_CALLBACK (image_mode_changed_cb),
ipal);
g_signal_connect (G_OBJECT (gimage), "colormap_changed",
G_CALLBACK (image_colormap_changed_cb),
ipal);
if (gimp_image_base_type (gimage) == GIMP_INDEXED)
{
ipal_draw (ipal);
ipal->index_adjustment->upper = ipal->image->num_cols - 1;
gtk_adjustment_changed (ipal->index_adjustment);
gtk_widget_set_sensitive (ipal->add_item,
gimage->num_cols < 256);
}
}
ipal_update_entries (ipal);
}
GimpImage *
gimp_colormap_dialog_get_image (GimpColormapDialog *colormap_dialog)
{
g_return_val_if_fail (GIMP_IS_COLORMAP_DIALOG (colormap_dialog), NULL);
return colormap_dialog->image;
}
gint
gimp_colormap_dialog_col_index (GimpColormapDialog *colormap_dialog)
{
g_return_val_if_fail (GIMP_IS_COLORMAP_DIALOG (colormap_dialog), 0);
return colormap_dialog->col_index;
}
/* private functions */
static void
ipal_create_popup_menu (GimpColormapDialog *ipal)
{
GtkWidget *menu;
GtkWidget *menu_item;
ipal->popup_menu = menu = gtk_menu_new ();
menu_item = gtk_menu_item_new_with_label (_("Add"));
gtk_menu_shell_append (GTK_MENU_SHELL (menu), menu_item);
gtk_widget_show (menu_item);
g_signal_connect (G_OBJECT (menu_item), "activate",
G_CALLBACK (ipal_add_callback),
ipal);
ipal->add_item = menu_item;
menu_item = gtk_menu_item_new_with_label (_("Edit"));
gtk_menu_shell_append (GTK_MENU_SHELL (menu), menu_item);
gtk_widget_show (menu_item);
g_signal_connect (G_OBJECT (menu_item), "activate",
G_CALLBACK (ipal_edit_callback),
ipal);
}
static void
ipal_drag_color (GtkWidget *widget,
GimpRGB *color,
gpointer data)
{
GimpColormapDialog *ipal;
GimpImage *gimage;
ipal = (GimpColormapDialog *) data;
gimage = ipal->image;
if (gimage && (gimp_image_base_type (gimage) == GIMP_INDEXED))
{
guint col;
col = ipal->dnd_col_index;
gimp_rgba_set_uchar (color,
gimage->cmap[col * 3 + 0],
gimage->cmap[col * 3 + 1],
gimage->cmap[col * 3 + 2],
255);
}
}
static void
ipal_drop_color (GtkWidget *widget,
const GimpRGB *color,
gpointer data)
{
GimpColormapDialog *ipal;
GimpImage *gimage;
ipal = (GimpColormapDialog *) data;
gimage = ipal->image;
if (gimage && (gimp_image_base_type (gimage) == GIMP_INDEXED) &&
gimage->num_cols < 256)
{
gimp_rgb_get_uchar (color,
&gimage->cmap[ipal->image->num_cols * 3],
&gimage->cmap[ipal->image->num_cols * 3 + 1],
&gimage->cmap[ipal->image->num_cols * 3 + 2]);
gimage->num_cols++;
gimp_image_colormap_changed (gimage, -1);
}
}
static void
ipal_area_size_allocate (GtkWidget *widget,
GtkAllocation *alloc,
GimpColormapDialog *ipal)
{
if (ipal->image && (gimp_image_base_type (ipal->image) == GIMP_INDEXED))
ipal_draw (ipal);
else
ipal_clear (ipal, -1);
}
#define MIN_CELL_SIZE 4
static void
ipal_draw (GimpColormapDialog *ipal)
{
GimpImage *gimage;
gint i, j, k, l, b;
gint col;
guchar *row;
gint cellsize, ncol, xn, yn, width, height;
GtkWidget *palette;
g_return_if_fail (ipal);
g_return_if_fail (ipal->image);
gimage = ipal->image;
palette = ipal->palette;
width = palette->allocation.width;
height = palette->allocation.height;
ncol = gimage->num_cols;
if (! ncol)
{
ipal_clear (ipal, -1);
return;
}
cellsize = sqrt (width * height / ncol);
while (cellsize >= MIN_CELL_SIZE
&& (xn = width / cellsize) * (yn = height / cellsize) < ncol)
cellsize--;
if (cellsize < MIN_CELL_SIZE)
{
cellsize = MIN_CELL_SIZE;
xn = yn = ceil (sqrt (ncol));
}
yn = ((ncol + xn - 1) / xn);
/*
width = xn * cellsize;
height = yn * cellsize;
*/
ipal->xn = xn;
ipal->yn = yn;
ipal->cellsize = cellsize;
row = g_new (guchar, width * 3);
col = 0;
for (i = 0; i < yn; i++)
{
for (j = 0; j < xn && col < ncol; j++, col++)
{
for (k = 0; k < cellsize; k++)
for (b = 0; b < 3; b++)
row[(j * cellsize + k) * 3 + b] = gimage->cmap[col * 3 + b];
}
for (k = 0; k < cellsize; k++)
{
for (l = j * cellsize; l < width; l++)
for (b = 0; b < 3; b++)
row[l * 3 + b] = (((((i * cellsize + k) & 0x4) ?
(l) :
(l + 0x4)) & 0x4) ?
render_blend_light_check[0] :
render_blend_dark_check[0]);
gtk_preview_draw_row (GTK_PREVIEW (ipal->palette), row, 0,
i * cellsize + k,
width);
}
}
ipal_clear (ipal, yn * cellsize);
ipal_draw_cell (ipal, ipal->col_index);
g_free (row);
gtk_widget_queue_draw (palette);
}
static void
ipal_draw_cell (GimpColormapDialog *ipal,
gint col)
{
guchar *row;
gint cellsize, x, y, k;
g_assert (ipal);
g_assert (ipal->image);
g_assert (col < ipal->image->num_cols);
cellsize = ipal->cellsize;
row = g_new (guchar, cellsize * 3);
x = (col % ipal->xn) * cellsize;
y = (col / ipal->xn) * cellsize;
if (col == ipal->col_index)
{
for(k = 0; k < cellsize; k++)
row[k*3] = row[k*3+1] = row[k*3+2] = (k & 1) * 255;
gtk_preview_draw_row (GTK_PREVIEW (ipal->palette), row, x, y, cellsize);
if (!(cellsize & 1))
for (k = 0; k < cellsize; k++)
row[k*3] = row[k*3+1] = row[k*3+2] = ((x+y+1) & 1) * 255;
gtk_preview_draw_row (GTK_PREVIEW (ipal->palette), row,
x, y+cellsize-1, cellsize);
row[0]=row[1]=row[2]=255;
row[cellsize*3-3] = row[cellsize*3-2] = row[cellsize*3-1]
= 255 * (cellsize & 1);
for (k = 1; k < cellsize - 1; k++)
{
row[k*3] = ipal->image->cmap[col * 3];
row[k*3+1] = ipal->image->cmap[col * 3 + 1];
row[k*3+2] = ipal->image->cmap[col * 3 + 2];
}
for (k = 1; k < cellsize - 1; k+=2)
gtk_preview_draw_row (GTK_PREVIEW (ipal->palette), row,
x, y+k, cellsize);
row[0] = row[1] = row[2] = 0;
row[cellsize*3-3] = row[cellsize*3-2] = row[cellsize*3-1]
= 255 * ((cellsize+1) & 1);
for (k = 2; k < cellsize - 1; k += 2)
gtk_preview_draw_row (GTK_PREVIEW (ipal->palette), row,
x, y+k, cellsize);
}
else
{
for (k = 0; k < cellsize; k++)
{
row[k*3] = ipal->image->cmap[col * 3];
row[k*3+1] = ipal->image->cmap[col * 3 + 1];
row[k*3+2] = ipal->image->cmap[col * 3 + 2];
}
for (k = 0; k < cellsize; k++)
gtk_preview_draw_row (GTK_PREVIEW (ipal->palette), row,
x, y+k, cellsize);
}
gtk_widget_queue_draw_area (ipal->palette,
x, y,
cellsize, cellsize);
}
static void
ipal_clear (GimpColormapDialog *ipal,
gint start_row)
{
gint i, j;
gint offset;
gint width, height;
guchar *row = NULL;
GtkWidget *palette;
g_return_if_fail (ipal);
palette = ipal->palette;
/* Watch out for negative values (at least on Win32) */
width = (int) (gint16) palette->allocation.width;
height = (int) (gint16) palette->allocation.height;
if (start_row < 0)
start_row = 0;
if (start_row >= height)
return;
if (width > 0)
row = g_new (guchar, width * 3);
if (start_row & 0x3)
{
offset = (start_row & 0x4) ? 0x4 : 0x0;
for (j = 0; j < width; j++)
{
row[j * 3 + 0] = row[j * 3 + 1] = row[j * 3 + 2] =
((j + offset) & 0x4) ?
render_blend_dark_check[0] : render_blend_light_check[0];
}
for (j = 0; j < (4 - (start_row & 0x3)) && start_row + j < height; j++)
gtk_preview_draw_row (GTK_PREVIEW (ipal->palette), row,
0, start_row + j, width);
start_row += (4 - (start_row & 0x3));
}
for (i = start_row; i < height; i += 4)
{
offset = (i & 0x4) ? 0x4 : 0x0;
for (j = 0; j < width; j++)
{
row[j * 3 + 0] = row[j * 3 + 1] = row[j * 3 + 2] =
((j + offset) & 0x4) ?
render_blend_dark_check[0] : render_blend_light_check[0];
}
for (j = 0; j < 4 && i + j < height; j++)
gtk_preview_draw_row (GTK_PREVIEW (ipal->palette), row,
0, i + j, width);
}
if (width > 0)
g_free (row);
gtk_widget_queue_draw (palette);
}
static void
ipal_update_entries (GimpColormapDialog *ipal)
{
if (! ipal->image || (gimp_image_base_type (ipal->image) != GIMP_INDEXED))
{
gtk_widget_set_sensitive (ipal->index_spinbutton, FALSE);
gtk_widget_set_sensitive (ipal->color_entry, FALSE);
gtk_adjustment_set_value (ipal->index_adjustment, 0);
gtk_entry_set_text (GTK_ENTRY (ipal->color_entry), "");
}
else
{
gchar *string;
guchar *col;
gtk_adjustment_set_value (ipal->index_adjustment, ipal->col_index);
col = &ipal->image->cmap[ipal->col_index * 3];
string = g_strdup_printf ("#%02x%02x%02x", col[0], col[1], col[2]);
gtk_entry_set_text (GTK_ENTRY (ipal->color_entry), string);
g_free (string);
gtk_widget_set_sensitive (ipal->index_spinbutton, TRUE);
gtk_widget_set_sensitive (ipal->color_entry, TRUE);
}
}
static void
ipal_set_index (GimpColormapDialog *ipal,
gint i)
{
if (i != ipal->col_index)
{
gint old = ipal->col_index;
ipal->col_index = i;
ipal->dnd_col_index = i;
ipal_draw_cell (ipal, old);
ipal_draw_cell (ipal, i);
ipal_update_entries (ipal);
}
}
static void
index_adjustment_change_cb (GtkAdjustment *adjustment,
GimpColormapDialog *ipal)
{
g_return_if_fail (ipal);
if (!ipal->image)
return;
ipal_set_index (ipal, (gint) (adjustment->value + 0.5));
ipal_update_entries (ipal);
}
static void
hex_entry_change_cb (GtkEntry *entry,
GimpColormapDialog *ipal)
{
const gchar *s;
gulong i;
g_return_if_fail (ipal);
g_return_if_fail (ipal->image);
s = gtk_entry_get_text (entry);
if (sscanf (s, "#%lx", &i))
{
guchar *c = &ipal->image->cmap[3 * ipal->col_index];
c[0] = (i & 0xFF0000) >> 16;
c[1] = (i & 0x00FF00) >> 8;
c[2] = (i & 0x0000FF);
gimp_image_colormap_changed (ipal->image, ipal->col_index);
}
ipal_update_entries (ipal);
}
static void
image_mode_changed_cb (GimpImage *gimage,
GimpColormapDialog *ipal)
{
image_colormap_changed_cb (gimage, -1, ipal);
}
static void
image_colormap_changed_cb (GimpImage *gimage,
gint ncol,
GimpColormapDialog *ipal)
{
if (gimp_image_base_type (gimage) == GIMP_INDEXED)
{
if (ncol < 0)
{
ipal_draw (ipal);
}
else
{
ipal_draw_cell (ipal, ncol);
}
gtk_widget_set_sensitive (ipal->add_item, (gimage->num_cols < 256));
if ((ipal->index_adjustment->upper + 1) < gimage->num_cols)
{
ipal->index_adjustment->upper = gimage->num_cols - 1;
gtk_adjustment_changed (ipal->index_adjustment);
}
}
else
{
ipal_clear (ipal, -1);
}
if (ncol == ipal->col_index || ncol == -1)
ipal_update_entries (ipal);
}
static void
ipal_add_callback (GtkWidget *widget,
gpointer data)
{
GimpColormapDialog *ipal = data;
g_return_if_fail (ipal);
g_return_if_fail (ipal->image->num_cols < 256);
memcpy (&ipal->image->cmap[ipal->image->num_cols * 3],
&ipal->image->cmap[ipal->col_index * 3],
3);
ipal->image->num_cols++;
gimp_image_colormap_changed (ipal->image, -1);
}
static void
ipal_edit_callback (GtkWidget *widget,
gpointer data)
{
GimpColormapDialog *ipal = data;
GimpRGB color;
g_return_if_fail (ipal);
gimp_rgba_set_uchar (&color,
ipal->image->cmap[ipal->col_index * 3],
ipal->image->cmap[ipal->col_index * 3 + 1],
ipal->image->cmap[ipal->col_index * 3 + 2],
255);
if (! ipal->color_notebook)
{
ipal->color_notebook
= color_notebook_new (_("Edit Indexed Color"),
(const GimpRGB *) &color,
ipal_select_callback, ipal, FALSE, FALSE);
}
else
{
color_notebook_show (ipal->color_notebook);
color_notebook_set_color (ipal->color_notebook, &color);
}
}
static void
ipal_select_callback (ColorNotebook *color_notebook,
const GimpRGB *color,
ColorNotebookState state,
gpointer data)
{
GimpImage *gimage;
GimpColormapDialog *ipal = data;
g_return_if_fail (ipal);
g_return_if_fail (ipal->image);
g_return_if_fail (ipal->color_notebook);
gimage = ipal->image;
switch (state)
{
case COLOR_NOTEBOOK_UPDATE:
break;
case COLOR_NOTEBOOK_OK:
gimp_rgb_get_uchar (color,
&gimage->cmap[ipal->col_index * 3 + 0],
&gimage->cmap[ipal->col_index * 3 + 1],
&gimage->cmap[ipal->col_index * 3 + 2]);
gimp_image_colormap_changed (gimage, ipal->col_index);
/* Fall through */
case COLOR_NOTEBOOK_CANCEL:
color_notebook_hide (ipal->color_notebook);
}
}
static gint
ipal_area_button_press (GtkWidget *widget,
GdkEventButton *bevent,
GimpColormapDialog *ipal)
{
GimpImage *gimage;
guchar r, g, b;
guint col;
gimage = ipal->image;
if (! (gimage && (gimp_image_base_type (gimage) == GIMP_INDEXED)))
return FALSE;
if (bevent->button < 1 || bevent->button > 3)
return FALSE;
if (!(bevent->y < ipal->cellsize * ipal->yn
&& bevent->x < ipal->cellsize * ipal->xn))
return FALSE;
col = ipal->xn * ((int)bevent->y / ipal->cellsize)
+ ((int)bevent->x / ipal->cellsize);
if (col >= ipal->image->num_cols)
return FALSE;
r = gimage->cmap[col * 3 + 0];
g = gimage->cmap[col * 3 + 1];
b = gimage->cmap[col * 3 + 2];
switch (bevent->button)
{
case 1:
ipal_set_index (ipal, col);
gimp_colormap_dialog_selected (ipal);
break;
case 2:
ipal->dnd_col_index = col;
break;
case 3:
ipal_set_index (ipal, col);
gtk_menu_popup (GTK_MENU (ipal->popup_menu), NULL, NULL,
NULL, NULL, 3,
bevent->time);
break;
default:
break;
}
return FALSE;
}

78
app/gui/colormap-dialog.h
View File

@ -1,78 +0,0 @@
/* 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_DIALOG_H__
#define __COLORMAP_DIALOG_H__
#include <gtk/gtkvbox.h>
#define GIMP_TYPE_COLORMAP_DIALOG (gimp_colormap_dialog_get_type ())
#define GIMP_COLORMAP_DIALOG(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_COLORMAP_DIALOG, GimpColormapDialog))
#define GIMP_COLORMAP_DIALOG_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_COLORMAP_DIALOG, GimpColormapDialogClass))
#define GIMP_IS_COLORMAP_DIALOG(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_COLORMAP_DIALOG))
#define GIMP_IS_COLORMAP_DIALOG_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_COLORMAP_DIALOG))
#define GIMP_COLORMAP_DIALOG_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_COLORMAP_DIALOG, GimpColormapDialogClass))
typedef struct _GimpColormapDialog GimpColormapDialog;
typedef struct _GimpColormapDialogClass GimpColormapDialogClass;
struct _GimpColormapDialog
{
GtkVBox parent_instance;
GimpImage *image;
gint col_index;
gint dnd_col_index;
GtkWidget *palette;
GtkWidget *image_menu;
GtkWidget *popup_menu;
GtkOptionMenu *option_menu;
gint xn;
gint yn;
gint cellsize;
GtkAdjustment *index_adjustment;
GtkWidget *index_spinbutton;
GtkWidget *color_entry;
GtkWidget *add_item;
ColorNotebook *color_notebook;
};
struct _GimpColormapDialogClass
{
GtkVBoxClass parent_class;
void (* selected) (GimpColormapDialog *gcd);
};
GType gimp_colormap_dialog_get_type (void) G_GNUC_CONST;
GtkWidget * gimp_colormap_dialog_new (GimpImage *gimage);
void gimp_colormap_dialog_selected (GimpColormapDialog *gcd);
void gimp_colormap_dialog_set_image (GimpColormapDialog *gcd,
GimpImage *gimage);
GimpImage * gimp_colormap_dialog_get_image (GimpColormapDialog *gcd);
gint gimp_colormap_dialog_col_index (GimpColormapDialog *gcd);
#endif /* __COLORMAP_DIALOG_H__ */

24
app/gui/dialogs-constructors.c
View File

@ -40,6 +40,7 @@
#include "widgets/gimpbrusheditor.h" #include "widgets/gimpbrusheditor.h"
#include "widgets/gimpbrushfactoryview.h" #include "widgets/gimpbrushfactoryview.h"
#include "widgets/gimpbufferview.h" #include "widgets/gimpbufferview.h"
#include "widgets/gimpcolormapeditor.h"
#include "widgets/gimpcontainerlistview.h" #include "widgets/gimpcontainerlistview.h"
#include "widgets/gimpcontainergridview.h" #include "widgets/gimpcontainergridview.h"
#include "widgets/gimpdataeditor.h" #include "widgets/gimpdataeditor.h"
@ -68,7 +69,6 @@
#include "brushes-commands.h" #include "brushes-commands.h"
#include "buffers-commands.h" #include "buffers-commands.h"
#include "channels-commands.h" #include "channels-commands.h"
#include "colormap-dialog.h"
#include "device-status-dialog.h" #include "device-status-dialog.h"
#include "dialogs.h" #include "dialogs.h"
#include "dialogs-constructors.h" #include "dialogs-constructors.h"
@ -94,7 +94,7 @@
/* local function prototypes */ /* local function prototypes */
static void dialogs_indexed_palette_selected (GimpColormapDialog *dialog, static void dialogs_indexed_palette_selected (GimpColormapEditor *editor,
GimpDockable *dockable); GimpDockable *dockable);
static GtkWidget * dialogs_brush_tab_func (GimpDockable *dockable, static GtkWidget * dialogs_brush_tab_func (GimpDockable *dockable,
@ -141,7 +141,7 @@ static void dialogs_path_view_image_changed (GimpContext *context,
GtkWidget *view); GtkWidget *view);
static void dialogs_indexed_palette_image_changed (GimpContext *context, static void dialogs_indexed_palette_image_changed (GimpContext *context,
GimpImage *gimage, GimpImage *gimage,
GimpColormapDialog *ipal); GimpColormapEditor *editor);
/**********************/ /**********************/
@ -777,7 +777,7 @@ dialogs_indexed_palette_new (GimpDialogFactory *factory,
gimage = gimp_context_get_image (context); gimage = gimp_context_get_image (context);
view = gimp_colormap_dialog_new (gimage); view = gimp_colormap_editor_new (gimage);
dockable = dialogs_dockable_new (view, dockable = dialogs_dockable_new (view,
"Indexed Palette", "Colormap", "Indexed Palette", "Colormap",
@ -903,12 +903,12 @@ dialogs_edit_palette_func (GimpData *data)
/* private functions */ /* private functions */
static void static void
dialogs_indexed_palette_selected (GimpColormapDialog *dialog, dialogs_indexed_palette_selected (GimpColormapEditor *editor,
GimpDockable *dockable) GimpDockable *dockable)
{ {
GimpContext *context; GimpContext *context;
context = (GimpContext *) g_object_get_data (G_OBJECT (dialog), context = (GimpContext *) g_object_get_data (G_OBJECT (editor),
"gimp-dialogs-context"); "gimp-dialogs-context");
if (context) if (context)
@ -917,8 +917,8 @@ dialogs_indexed_palette_selected (GimpColormapDialog *dialog,
GimpRGB color; GimpRGB color;
gint index; gint index;
gimage = gimp_colormap_dialog_get_image (dialog); gimage = gimp_colormap_editor_get_image (editor);
index = gimp_colormap_dialog_col_index (dialog); index = gimp_colormap_editor_col_index (editor);
gimp_rgba_set_uchar (&color, gimp_rgba_set_uchar (&color,
gimage->cmap[index * 3], gimage->cmap[index * 3],
@ -1212,9 +1212,9 @@ static void
dialogs_set_indexed_palette_context_func (GimpDockable *dockable, dialogs_set_indexed_palette_context_func (GimpDockable *dockable,
GimpContext *context) GimpContext *context)
{ {
GimpColormapDialog *view; GimpColormapEditor *view;
view = (GimpColormapDialog *) g_object_get_data (G_OBJECT (dockable), view = (GimpColormapEditor *) g_object_get_data (G_OBJECT (dockable),
"gimp-dialogs-view"); "gimp-dialogs-view");
if (view) if (view)
@ -1283,7 +1283,7 @@ dialogs_path_view_image_changed (GimpContext *context,
static void static void
dialogs_indexed_palette_image_changed (GimpContext *context, dialogs_indexed_palette_image_changed (GimpContext *context,
GimpImage *gimage, GimpImage *gimage,
GimpColormapDialog *ipal) GimpColormapEditor *editor)
{ {
gimp_colormap_dialog_set_image (ipal, gimage); gimp_colormap_editor_set_image (editor, gimage);
} }

72
app/gui/menus.c
View File

@ -596,17 +596,17 @@ static GimpItemFactoryEntry image_entries[] =
{ { N_("/Image/Mode/RGB"), "<alt>R", { { N_("/Image/Mode/RGB"), "<alt>R",
image_convert_rgb_cmd_callback, 0, image_convert_rgb_cmd_callback, 0,
"<StockItem>", GTK_STOCK_CONVERT }, "<StockItem>", GIMP_STOCK_CONVERT_RGB },
NULL, NULL,
"image/mode/convert_to_rgb.html", NULL }, "image/mode/convert_to_rgb.html", NULL },
{ { N_("/Image/Mode/Grayscale"), "<alt>G", { { N_("/Image/Mode/Grayscale"), "<alt>G",
image_convert_grayscale_cmd_callback, 0, image_convert_grayscale_cmd_callback, 0,
"<StockItem>", GTK_STOCK_CONVERT }, "<StockItem>", GIMP_STOCK_CONVERT_GRAYSCALE },
NULL, NULL,
"image/mode/convert_to_grayscale.html", NULL }, "image/mode/convert_to_grayscale.html", NULL },
{ { N_("/Image/Mode/Indexed..."), "<alt>I", { { N_("/Image/Mode/Indexed..."), "<alt>I",
image_convert_indexed_cmd_callback, 0, image_convert_indexed_cmd_callback, 0,
"<StockItem>", GTK_STOCK_CONVERT }, "<StockItem>", GIMP_STOCK_CONVERT_INDEXED },
NULL, NULL,
"image/mode/dialogs/convert_to_indexed.html", NULL }, "image/mode/dialogs/convert_to_indexed.html", NULL },
@ -621,12 +621,13 @@ static GimpItemFactoryEntry image_entries[] =
SEPARATOR ("/Image/---"), SEPARATOR ("/Image/---"),
{ { N_("/Image/Canvas Size..."), NULL, { { N_("/Image/Canvas Size..."), NULL,
image_resize_cmd_callback, 0 }, image_resize_cmd_callback, 0,
"<StockItem>", GIMP_STOCK_RESIZE },
NULL, NULL,
"image/dialogs/set_canvas_size.html", NULL }, "image/dialogs/set_canvas_size.html", NULL },
{ { N_("/Image/Scale Image..."), NULL, { { N_("/Image/Scale Image..."), NULL,
image_scale_cmd_callback, 0, image_scale_cmd_callback, 0,
"<StockItem>", GIMP_STOCK_TOOL_SCALE }, "<StockItem>", GIMP_STOCK_SCALE },
NULL, NULL,
"image/dialogs/scale_image.html", NULL }, "image/dialogs/scale_image.html", NULL },
{ { N_("/Image/Crop Image"), NULL, { { N_("/Image/Crop Image"), NULL,
@ -709,7 +710,8 @@ static GimpItemFactoryEntry image_entries[] =
NULL, NULL,
"layers/anchor_layer.html", NULL }, "layers/anchor_layer.html", NULL },
{ { N_("/Layer/Merge Down"), "<control><shift>M", { { N_("/Layer/Merge Down"), "<control><shift>M",
layers_merge_down_cmd_callback, 0 }, layers_merge_down_cmd_callback, 0,
"<StockItem>", GIMP_STOCK_MERGE_DOWN },
NULL, NULL,
"layers/merge_visible_layers.html", NULL }, "layers/merge_visible_layers.html", NULL },
{ { N_("/Layer/Delete Layer"), NULL, { { N_("/Layer/Delete Layer"), NULL,
@ -721,18 +723,20 @@ static GimpItemFactoryEntry image_entries[] =
SEPARATOR ("/Layer/---"), SEPARATOR ("/Layer/---"),
{ { N_("/Layer/Layer Boundary Size..."), NULL, { { N_("/Layer/Layer Boundary Size..."), NULL,
layers_resize_cmd_callback, 0 }, layers_resize_cmd_callback, 0,
"<StockItem>", GIMP_STOCK_RESIZE },
NULL, NULL,
"layers/dialogs/layer_boundary_size.html", NULL }, "layers/dialogs/layer_boundary_size.html", NULL },
{ { N_("/Layer/Scale Layer..."), NULL,
layers_scale_cmd_callback, 0,
"<StockItem>", GIMP_STOCK_TOOL_SCALE },
NULL,
"layers/dialogs/scale_layer.html", NULL },
{ { N_("/Layer/Layer to Imagesize"), NULL, { { N_("/Layer/Layer to Imagesize"), NULL,
layers_resize_to_image_cmd_callback, 0 }, layers_resize_to_image_cmd_callback, 0,
"<StockItem>", GIMP_STOCK_RESIZE },
NULL, NULL,
"layers/layer_to_image_size.html", NULL }, "layers/layer_to_image_size.html", NULL },
{ { N_("/Layer/Scale Layer..."), NULL,
layers_scale_cmd_callback, 0,
"<StockItem>", GIMP_STOCK_SCALE },
NULL,
"layers/dialogs/scale_layer.html", NULL },
/* <Image>/Layer/Transform */ /* <Image>/Layer/Transform */
@ -748,7 +752,8 @@ static GimpItemFactoryEntry image_entries[] =
/* <Image>/Layer/Colors */ /* <Image>/Layer/Colors */
{ { N_("/Layer/Colors/Desaturate"), NULL, { { N_("/Layer/Colors/Desaturate"), NULL,
drawable_desaturate_cmd_callback, 0 }, drawable_desaturate_cmd_callback, 0,
"<StockItem>", GIMP_STOCK_CONVERT_GRAYSCALE },
NULL, NULL,
"layers/colors/desaturate.html", NULL }, "layers/colors/desaturate.html", NULL },
{ { N_("/Layer/Colors/Invert"), NULL, { { N_("/Layer/Colors/Invert"), NULL,
@ -778,11 +783,13 @@ static GimpItemFactoryEntry image_entries[] =
NULL, NULL,
"layers/apply_mask.html", NULL }, "layers/apply_mask.html", NULL },
{ { N_("/Layer/Mask/Delete Layer Mask"), NULL, { { N_("/Layer/Mask/Delete Layer Mask"), NULL,
layers_delete_layer_mask_cmd_callback, 0 }, layers_delete_layer_mask_cmd_callback, 0,
"<StockItem>", GTK_STOCK_DELETE },
NULL, NULL,
"layers/delete_mask.html", NULL }, "layers/delete_mask.html", NULL },
{ { N_("/Layer/Mask/Mask to Selection"), NULL, { { N_("/Layer/Mask/Mask to Selection"), NULL,
layers_mask_select_cmd_callback, 0 }, layers_mask_select_cmd_callback, 0,
"<StockItem>", GIMP_STOCK_SELECTION_REPLACE },
NULL, NULL,
"layers/mask_to_selection.html", NULL }, "layers/mask_to_selection.html", NULL },
@ -793,7 +800,8 @@ static GimpItemFactoryEntry image_entries[] =
NULL, NULL,
"layers/add_alpha_channel.html", NULL }, "layers/add_alpha_channel.html", NULL },
{ { N_("/Layer/Alpha/Alpha to Selection"), NULL, { { N_("/Layer/Alpha/Alpha to Selection"), NULL,
layers_alpha_select_cmd_callback, 0 }, layers_alpha_select_cmd_callback, 0,
"<StockItem>", GIMP_STOCK_SELECTION_REPLACE },
NULL, NULL,
"layers/alpha_to_selection.html", NULL }, "layers/alpha_to_selection.html", NULL },
@ -900,7 +908,7 @@ static GimpItemFactoryEntry image_entries[] =
"filters/repeat_last.html", NULL }, "filters/repeat_last.html", NULL },
{ { N_("/Filters/Re-Show Last"), "<alt><shift>F", { { N_("/Filters/Re-Show Last"), "<alt><shift>F",
filters_repeat_cmd_callback, (guint) TRUE, filters_repeat_cmd_callback, (guint) TRUE,
"<StockItem>", GTK_STOCK_EXECUTE }, "<StockItem>", GIMP_STOCK_RESHOW_FILTER },
NULL, NULL,
"filters/reshow_last.html", NULL }, "filters/reshow_last.html", NULL },
@ -1003,7 +1011,8 @@ static GimpItemFactoryEntry layers_entries[] =
NULL, NULL,
"anchor_layer.html", NULL }, "anchor_layer.html", NULL },
{ { N_("/Merge Down"), "<control><shift>M", { { N_("/Merge Down"), "<control><shift>M",
layers_merge_down_cmd_callback, 0 }, layers_merge_down_cmd_callback, 0,
"<StockItem>", GIMP_STOCK_MERGE_DOWN },
NULL, NULL,
"merge_down.html", NULL }, "merge_down.html", NULL },
{ { N_("/Delete Layer"), "<control>X", { { N_("/Delete Layer"), "<control>X",
@ -1015,18 +1024,20 @@ static GimpItemFactoryEntry layers_entries[] =
SEPARATOR ("/---"), SEPARATOR ("/---"),
{ { N_("/Layer Boundary Size..."), "<control>R", { { N_("/Layer Boundary Size..."), "<control>R",
layers_resize_cmd_callback, 0 }, layers_resize_cmd_callback, 0,
"<StockItem>", GIMP_STOCK_RESIZE },
NULL, NULL,
"dialogs/layer_boundary_size.html", NULL }, "dialogs/layer_boundary_size.html", NULL },
{ { N_("/Scale Layer..."), "<control>S",
layers_scale_cmd_callback, 0,
"<StockItem>", GIMP_STOCK_TOOL_SCALE },
NULL,
"dialogs/scale_layer.html", NULL },
{ { N_("/Layer to Imagesize"), NULL, { { N_("/Layer to Imagesize"), NULL,
layers_resize_to_image_cmd_callback, 0 }, layers_resize_to_image_cmd_callback, 0,
"<StockItem>", GIMP_STOCK_RESIZE },
NULL, NULL,
"layer_to_image_size.html", NULL }, "layer_to_image_size.html", NULL },
{ { N_("/Scale Layer..."), "<control>S",
layers_scale_cmd_callback, 0,
"<StockItem>", GIMP_STOCK_SCALE },
NULL,
"dialogs/scale_layer.html", NULL },
SEPARATOR ("/---"), SEPARATOR ("/---"),
@ -1039,11 +1050,13 @@ static GimpItemFactoryEntry layers_entries[] =
NULL, NULL,
"apply_mask.html", NULL }, "apply_mask.html", NULL },
{ { N_("/Delete Layer Mask"), NULL, { { N_("/Delete Layer Mask"), NULL,
layers_delete_layer_mask_cmd_callback, 0 }, layers_delete_layer_mask_cmd_callback, 0,
"<StockItem>", GTK_STOCK_DELETE },
NULL, NULL,
"delete_mask.html", NULL }, "delete_mask.html", NULL },
{ { N_("/Mask to Selection"), NULL, { { N_("/Mask to Selection"), NULL,
layers_mask_select_cmd_callback, 0 }, layers_mask_select_cmd_callback, 0,
"<StockItem>", GIMP_STOCK_SELECTION_REPLACE },
NULL, NULL,
"mask_to_selection.html", NULL }, "mask_to_selection.html", NULL },
@ -1054,7 +1067,8 @@ static GimpItemFactoryEntry layers_entries[] =
NULL, NULL,
"add_alpha_channel.html", NULL }, "add_alpha_channel.html", NULL },
{ { N_("/Alpha to Selection"), NULL, { { N_("/Alpha to Selection"), NULL,
layers_alpha_select_cmd_callback, 0 }, layers_alpha_select_cmd_callback, 0,
"<StockItem>", GIMP_STOCK_SELECTION_REPLACE },
NULL, NULL,
"alpha_to_selection.html", NULL }, "alpha_to_selection.html", NULL },

72
app/menus/menus.c
View File

@ -596,17 +596,17 @@ static GimpItemFactoryEntry image_entries[] =
{ { N_("/Image/Mode/RGB"), "<alt>R", { { N_("/Image/Mode/RGB"), "<alt>R",
image_convert_rgb_cmd_callback, 0, image_convert_rgb_cmd_callback, 0,
"<StockItem>", GTK_STOCK_CONVERT }, "<StockItem>", GIMP_STOCK_CONVERT_RGB },
NULL, NULL,
"image/mode/convert_to_rgb.html", NULL }, "image/mode/convert_to_rgb.html", NULL },
{ { N_("/Image/Mode/Grayscale"), "<alt>G", { { N_("/Image/Mode/Grayscale"), "<alt>G",
image_convert_grayscale_cmd_callback, 0, image_convert_grayscale_cmd_callback, 0,
"<StockItem>", GTK_STOCK_CONVERT }, "<StockItem>", GIMP_STOCK_CONVERT_GRAYSCALE },
NULL, NULL,
"image/mode/convert_to_grayscale.html", NULL }, "image/mode/convert_to_grayscale.html", NULL },
{ { N_("/Image/Mode/Indexed..."), "<alt>I", { { N_("/Image/Mode/Indexed..."), "<alt>I",
image_convert_indexed_cmd_callback, 0, image_convert_indexed_cmd_callback, 0,
"<StockItem>", GTK_STOCK_CONVERT }, "<StockItem>", GIMP_STOCK_CONVERT_INDEXED },
NULL, NULL,
"image/mode/dialogs/convert_to_indexed.html", NULL }, "image/mode/dialogs/convert_to_indexed.html", NULL },
@ -621,12 +621,13 @@ static GimpItemFactoryEntry image_entries[] =
SEPARATOR ("/Image/---"), SEPARATOR ("/Image/---"),
{ { N_("/Image/Canvas Size..."), NULL, { { N_("/Image/Canvas Size..."), NULL,
image_resize_cmd_callback, 0 }, image_resize_cmd_callback, 0,
"<StockItem>", GIMP_STOCK_RESIZE },
NULL, NULL,
"image/dialogs/set_canvas_size.html", NULL }, "image/dialogs/set_canvas_size.html", NULL },
{ { N_("/Image/Scale Image..."), NULL, { { N_("/Image/Scale Image..."), NULL,
image_scale_cmd_callback, 0, image_scale_cmd_callback, 0,
"<StockItem>", GIMP_STOCK_TOOL_SCALE }, "<StockItem>", GIMP_STOCK_SCALE },
NULL, NULL,
"image/dialogs/scale_image.html", NULL }, "image/dialogs/scale_image.html", NULL },
{ { N_("/Image/Crop Image"), NULL, { { N_("/Image/Crop Image"), NULL,
@ -709,7 +710,8 @@ static GimpItemFactoryEntry image_entries[] =
NULL, NULL,
"layers/anchor_layer.html", NULL }, "layers/anchor_layer.html", NULL },
{ { N_("/Layer/Merge Down"), "<control><shift>M", { { N_("/Layer/Merge Down"), "<control><shift>M",
layers_merge_down_cmd_callback, 0 }, layers_merge_down_cmd_callback, 0,
"<StockItem>", GIMP_STOCK_MERGE_DOWN },
NULL, NULL,
"layers/merge_visible_layers.html", NULL }, "layers/merge_visible_layers.html", NULL },
{ { N_("/Layer/Delete Layer"), NULL, { { N_("/Layer/Delete Layer"), NULL,
@ -721,18 +723,20 @@ static GimpItemFactoryEntry image_entries[] =
SEPARATOR ("/Layer/---"), SEPARATOR ("/Layer/---"),
{ { N_("/Layer/Layer Boundary Size..."), NULL, { { N_("/Layer/Layer Boundary Size..."), NULL,
layers_resize_cmd_callback, 0 }, layers_resize_cmd_callback, 0,
"<StockItem>", GIMP_STOCK_RESIZE },
NULL, NULL,
"layers/dialogs/layer_boundary_size.html", NULL }, "layers/dialogs/layer_boundary_size.html", NULL },
{ { N_("/Layer/Scale Layer..."), NULL,
layers_scale_cmd_callback, 0,
"<StockItem>", GIMP_STOCK_TOOL_SCALE },
NULL,
"layers/dialogs/scale_layer.html", NULL },
{ { N_("/Layer/Layer to Imagesize"), NULL, { { N_("/Layer/Layer to Imagesize"), NULL,
layers_resize_to_image_cmd_callback, 0 }, layers_resize_to_image_cmd_callback, 0,
"<StockItem>", GIMP_STOCK_RESIZE },
NULL, NULL,
"layers/layer_to_image_size.html", NULL }, "layers/layer_to_image_size.html", NULL },
{ { N_("/Layer/Scale Layer..."), NULL,
layers_scale_cmd_callback, 0,
"<StockItem>", GIMP_STOCK_SCALE },
NULL,
"layers/dialogs/scale_layer.html", NULL },
/* <Image>/Layer/Transform */ /* <Image>/Layer/Transform */
@ -748,7 +752,8 @@ static GimpItemFactoryEntry image_entries[] =
/* <Image>/Layer/Colors */ /* <Image>/Layer/Colors */
{ { N_("/Layer/Colors/Desaturate"), NULL, { { N_("/Layer/Colors/Desaturate"), NULL,
drawable_desaturate_cmd_callback, 0 }, drawable_desaturate_cmd_callback, 0,
"<StockItem>", GIMP_STOCK_CONVERT_GRAYSCALE },
NULL, NULL,
"layers/colors/desaturate.html", NULL }, "layers/colors/desaturate.html", NULL },
{ { N_("/Layer/Colors/Invert"), NULL, { { N_("/Layer/Colors/Invert"), NULL,
@ -778,11 +783,13 @@ static GimpItemFactoryEntry image_entries[] =
NULL, NULL,
"layers/apply_mask.html", NULL }, "layers/apply_mask.html", NULL },
{ { N_("/Layer/Mask/Delete Layer Mask"), NULL, { { N_("/Layer/Mask/Delete Layer Mask"), NULL,
layers_delete_layer_mask_cmd_callback, 0 }, layers_delete_layer_mask_cmd_callback, 0,
"<StockItem>", GTK_STOCK_DELETE },
NULL, NULL,
"layers/delete_mask.html", NULL }, "layers/delete_mask.html", NULL },
{ { N_("/Layer/Mask/Mask to Selection"), NULL, { { N_("/Layer/Mask/Mask to Selection"), NULL,
layers_mask_select_cmd_callback, 0 }, layers_mask_select_cmd_callback, 0,
"<StockItem>", GIMP_STOCK_SELECTION_REPLACE },
NULL, NULL,
"layers/mask_to_selection.html", NULL }, "layers/mask_to_selection.html", NULL },
@ -793,7 +800,8 @@ static GimpItemFactoryEntry image_entries[] =
NULL, NULL,
"layers/add_alpha_channel.html", NULL }, "layers/add_alpha_channel.html", NULL },
{ { N_("/Layer/Alpha/Alpha to Selection"), NULL, { { N_("/Layer/Alpha/Alpha to Selection"), NULL,
layers_alpha_select_cmd_callback, 0 }, layers_alpha_select_cmd_callback, 0,
"<StockItem>", GIMP_STOCK_SELECTION_REPLACE },
NULL, NULL,
"layers/alpha_to_selection.html", NULL }, "layers/alpha_to_selection.html", NULL },
@ -900,7 +908,7 @@ static GimpItemFactoryEntry image_entries[] =
"filters/repeat_last.html", NULL }, "filters/repeat_last.html", NULL },
{ { N_("/Filters/Re-Show Last"), "<alt><shift>F", { { N_("/Filters/Re-Show Last"), "<alt><shift>F",
filters_repeat_cmd_callback, (guint) TRUE, filters_repeat_cmd_callback, (guint) TRUE,
"<StockItem>", GTK_STOCK_EXECUTE }, "<StockItem>", GIMP_STOCK_RESHOW_FILTER },
NULL, NULL,
"filters/reshow_last.html", NULL }, "filters/reshow_last.html", NULL },
@ -1003,7 +1011,8 @@ static GimpItemFactoryEntry layers_entries[] =
NULL, NULL,
"anchor_layer.html", NULL }, "anchor_layer.html", NULL },
{ { N_("/Merge Down"), "<control><shift>M", { { N_("/Merge Down"), "<control><shift>M",
layers_merge_down_cmd_callback, 0 }, layers_merge_down_cmd_callback, 0,
"<StockItem>", GIMP_STOCK_MERGE_DOWN },
NULL, NULL,
"merge_down.html", NULL }, "merge_down.html", NULL },
{ { N_("/Delete Layer"), "<control>X", { { N_("/Delete Layer"), "<control>X",
@ -1015,18 +1024,20 @@ static GimpItemFactoryEntry layers_entries[] =
SEPARATOR ("/---"), SEPARATOR ("/---"),
{ { N_("/Layer Boundary Size..."), "<control>R", { { N_("/Layer Boundary Size..."), "<control>R",
layers_resize_cmd_callback, 0 }, layers_resize_cmd_callback, 0,
"<StockItem>", GIMP_STOCK_RESIZE },
NULL, NULL,
"dialogs/layer_boundary_size.html", NULL }, "dialogs/layer_boundary_size.html", NULL },
{ { N_("/Scale Layer..."), "<control>S",
layers_scale_cmd_callback, 0,
"<StockItem>", GIMP_STOCK_TOOL_SCALE },
NULL,
"dialogs/scale_layer.html", NULL },
{ { N_("/Layer to Imagesize"), NULL, { { N_("/Layer to Imagesize"), NULL,
layers_resize_to_image_cmd_callback, 0 }, layers_resize_to_image_cmd_callback, 0,
"<StockItem>", GIMP_STOCK_RESIZE },
NULL, NULL,
"layer_to_image_size.html", NULL }, "layer_to_image_size.html", NULL },
{ { N_("/Scale Layer..."), "<control>S",
layers_scale_cmd_callback, 0,
"<StockItem>", GIMP_STOCK_SCALE },
NULL,
"dialogs/scale_layer.html", NULL },
SEPARATOR ("/---"), SEPARATOR ("/---"),
@ -1039,11 +1050,13 @@ static GimpItemFactoryEntry layers_entries[] =
NULL, NULL,
"apply_mask.html", NULL }, "apply_mask.html", NULL },
{ { N_("/Delete Layer Mask"), NULL, { { N_("/Delete Layer Mask"), NULL,
layers_delete_layer_mask_cmd_callback, 0 }, layers_delete_layer_mask_cmd_callback, 0,
"<StockItem>", GTK_STOCK_DELETE },
NULL, NULL,
"delete_mask.html", NULL }, "delete_mask.html", NULL },
{ { N_("/Mask to Selection"), NULL, { { N_("/Mask to Selection"), NULL,
layers_mask_select_cmd_callback, 0 }, layers_mask_select_cmd_callback, 0,
"<StockItem>", GIMP_STOCK_SELECTION_REPLACE },
NULL, NULL,
"mask_to_selection.html", NULL }, "mask_to_selection.html", NULL },
@ -1054,7 +1067,8 @@ static GimpItemFactoryEntry layers_entries[] =
NULL, NULL,
"add_alpha_channel.html", NULL }, "add_alpha_channel.html", NULL },
{ { N_("/Alpha to Selection"), NULL, { { N_("/Alpha to Selection"), NULL,
layers_alpha_select_cmd_callback, 0 }, layers_alpha_select_cmd_callback, 0,
"<StockItem>", GIMP_STOCK_SELECTION_REPLACE },
NULL, NULL,
"alpha_to_selection.html", NULL }, "alpha_to_selection.html", NULL },

2
app/widgets/Makefile.am
View File

@ -35,6 +35,8 @@ libappwidgets_a_sources = @STRIP_BEGIN@ \
gimpchannellistitem.h \ gimpchannellistitem.h \
gimpchannellistview.c \ gimpchannellistview.c \
gimpchannellistview.h \ gimpchannellistview.h \
gimpcolormapeditor.c \
gimpcolormapeditor.h \
gimpcolorpanel.c \ gimpcolorpanel.c \
gimpcolorpanel.h \ gimpcolorpanel.h \
gimpcomponentlistitem.c \ gimpcomponentlistitem.c \

581
app/widgets/gimpcolormapeditor.c
View File

File diff suppressed because it is too large Load Diff

47
app/widgets/gimpcolormapeditor.h
View File

@ -16,27 +16,28 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/ */
#ifndef __COLORMAP_DIALOG_H__ #ifndef __GIMP_COLORMAP_EDITOR_H__
#define __COLORMAP_DIALOG_H__ #define __GIMP_COLORMAP_EDITOR_H__
#include <gtk/gtkvbox.h> #include "gimpeditor.h"
#include "gui/gui-types.h" /* temp hack */
#define GIMP_TYPE_COLORMAP_DIALOG (gimp_colormap_dialog_get_type ()) #define GIMP_TYPE_COLORMAP_EDITOR (gimp_colormap_editor_get_type ())
#define GIMP_COLORMAP_DIALOG(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_COLORMAP_DIALOG, GimpColormapDialog)) #define GIMP_COLORMAP_EDITOR(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_COLORMAP_EDITOR, GimpColormapEditor))
#define GIMP_COLORMAP_DIALOG_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_COLORMAP_DIALOG, GimpColormapDialogClass)) #define GIMP_COLORMAP_EDITOR_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_COLORMAP_EDITOR, GimpColormapEditorClass))
#define GIMP_IS_COLORMAP_DIALOG(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_COLORMAP_DIALOG)) #define GIMP_IS_COLORMAP_EDITOR(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_COLORMAP_EDITOR))
#define GIMP_IS_COLORMAP_DIALOG_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_COLORMAP_DIALOG)) #define GIMP_IS_COLORMAP_EDITOR_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_COLORMAP_EDITOR))
#define GIMP_COLORMAP_DIALOG_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_COLORMAP_DIALOG, GimpColormapDialogClass)) #define GIMP_COLORMAP_EDITOR_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_COLORMAP_EDITOR, GimpColormapEditorClass))
typedef struct _GimpColormapDialog GimpColormapDialog; typedef struct _GimpColormapEditorClass GimpColormapEditorClass;
typedef struct _GimpColormapDialogClass GimpColormapDialogClass;
struct _GimpColormapDialog struct _GimpColormapEditor
{ {
GtkVBox parent_instance; GimpEditor parent_instance;
GimpImage *image; GimpImage *image;
gint col_index; gint col_index;
@ -55,24 +56,24 @@ struct _GimpColormapDialog
ColorNotebook *color_notebook; ColorNotebook *color_notebook;
}; };
struct _GimpColormapDialogClass struct _GimpColormapEditorClass
{ {
GtkVBoxClass parent_class; GimpEditorClass parent_class;
void (* selected) (GimpColormapDialog *gcd); void (* selected) (GimpColormapEditor *gcd);
}; };
GType gimp_colormap_dialog_get_type (void) G_GNUC_CONST; GType gimp_colormap_editor_get_type (void) G_GNUC_CONST;
GtkWidget * gimp_colormap_dialog_new (GimpImage *gimage); GtkWidget * gimp_colormap_editor_new (GimpImage *gimage);
void gimp_colormap_dialog_selected (GimpColormapDialog *gcd); void gimp_colormap_editor_selected (GimpColormapEditor *editor);
void gimp_colormap_dialog_set_image (GimpColormapDialog *gcd, void gimp_colormap_editor_set_image (GimpColormapEditor *editor,
GimpImage *gimage); GimpImage *gimage);
GimpImage * gimp_colormap_dialog_get_image (GimpColormapDialog *gcd); GimpImage * gimp_colormap_editor_get_image (GimpColormapEditor *editor);
gint gimp_colormap_dialog_col_index (GimpColormapDialog *gcd); gint gimp_colormap_editor_col_index (GimpColormapEditor *editor);
#endif /* __COLORMAP_DIALOG_H__ */ #endif /* __GIMP_COLORMAP_EDITOR_H__ */

1
app/widgets/widgets-types.h
View File

@ -56,6 +56,7 @@ typedef struct _GimpContainerMenuImpl GimpContainerMenuImpl;
typedef struct _GimpMenuItem GimpMenuItem; typedef struct _GimpMenuItem GimpMenuItem;
typedef struct _GimpEditor GimpEditor; typedef struct _GimpEditor GimpEditor;
typedef struct _GimpColormapEditor GimpColormapEditor;
typedef struct _GimpDataEditor GimpDataEditor; typedef struct _GimpDataEditor GimpDataEditor;
typedef struct _GimpBrushEditor GimpBrushEditor; typedef struct _GimpBrushEditor GimpBrushEditor;
typedef struct _GimpGradientEditor GimpGradientEditor; typedef struct _GimpGradientEditor GimpGradientEditor;

36
libgimpwidgets/gimpstock.c
View File

@ -94,10 +94,6 @@ static GtkStockItem gimp_stock_items[] =
{ GIMP_STOCK_RESET, N_("_Reset"), 0, 0, "gimp-libgimp" }, { GIMP_STOCK_RESET, N_("_Reset"), 0, 0, "gimp-libgimp" },
{ GIMP_STOCK_VISIBLE, N_("Visible"), 0, 0, "gimp-libgimp" }, { GIMP_STOCK_VISIBLE, N_("Visible"), 0, 0, "gimp-libgimp" },
{ GIMP_STOCK_NAVIGATION, NULL, 0, 0, "gimp-libgimp" },
{ GIMP_STOCK_QMASK_OFF, NULL, 0, 0, "gimp-libgimp" },
{ GIMP_STOCK_QMASK_ON, NULL, 0, 0, "gimp-libgimp" },
{ GIMP_STOCK_HCHAIN, NULL, 0, 0, "gimp-libgimp" }, { GIMP_STOCK_HCHAIN, NULL, 0, 0, "gimp-libgimp" },
{ GIMP_STOCK_HCHAIN_BROKEN, NULL, 0, 0, "gimp-libgimp" }, { GIMP_STOCK_HCHAIN_BROKEN, NULL, 0, 0, "gimp-libgimp" },
{ GIMP_STOCK_VCHAIN, NULL, 0, 0, "gimp-libgimp" }, { GIMP_STOCK_VCHAIN, NULL, 0, 0, "gimp-libgimp" },
@ -112,6 +108,21 @@ static GtkStockItem gimp_stock_items[] =
{ GIMP_STOCK_PATH_STROKE, NULL, 0, 0, "gimp-libgimp" }, { GIMP_STOCK_PATH_STROKE, NULL, 0, 0, "gimp-libgimp" },
{ GIMP_STOCK_CONVERT_RGB, NULL, 0, 0, "gimp-libgimp" },
{ GIMP_STOCK_CONVERT_GRAYSCALE, NULL, 0, 0, "gimp-libgimp" },
{ GIMP_STOCK_CONVERT_INDEXED, NULL, 0, 0, "gimp-libgimp" },
{ GIMP_STOCK_MERGE_DOWN, NULL, 0, 0, "gimp-libgimp" },
{ GIMP_STOCK_RESHOW_FILTER, NULL, 0, 0, "gimp-libgimp" },
{ GIMP_STOCK_ROTATE_90, NULL, 0, 0, "gimp-libgimp" },
{ GIMP_STOCK_ROTATE_180, NULL, 0, 0, "gimp-libgimp" },
{ GIMP_STOCK_ROTATE_270, NULL, 0, 0, "gimp-libgimp" },
{ GIMP_STOCK_RESIZE, NULL, 0, 0, "gimp-libgimp" },
{ GIMP_STOCK_SCALE, NULL, 0, 0, "gimp-libgimp" },
{ GIMP_STOCK_NAVIGATION, NULL, 0, 0, "gimp-libgimp" },
{ GIMP_STOCK_QMASK_OFF, NULL, 0, 0, "gimp-libgimp" },
{ GIMP_STOCK_QMASK_ON, NULL, 0, 0, "gimp-libgimp" },
{ GIMP_STOCK_TOOL_AIRBRUSH, NULL, 0, 0, "gimp-libgimp" }, { GIMP_STOCK_TOOL_AIRBRUSH, NULL, 0, 0, "gimp-libgimp" },
{ GIMP_STOCK_TOOL_BEZIER_SELECT, NULL, 0, 0, "gimp-libgimp" }, { GIMP_STOCK_TOOL_BEZIER_SELECT, NULL, 0, 0, "gimp-libgimp" },
{ GIMP_STOCK_TOOL_BLEND, NULL, 0, 0, "gimp-libgimp" }, { GIMP_STOCK_TOOL_BLEND, NULL, 0, 0, "gimp-libgimp" },
@ -231,9 +242,20 @@ static struct
} }
gimp_stock_menu_pixbufs[] = gimp_stock_menu_pixbufs[] =
{ {
{ GIMP_STOCK_NAVIGATION, stock_menu_navigation }, { GIMP_STOCK_CONVERT_RGB, stock_menu_convert_rgb },
{ GIMP_STOCK_QMASK_OFF, stock_menu_qmask_off }, { GIMP_STOCK_CONVERT_GRAYSCALE, stock_menu_convert_grayscale },
{ GIMP_STOCK_QMASK_ON, stock_menu_qmask_on } { GIMP_STOCK_CONVERT_INDEXED, stock_menu_convert_indexed },
{ GIMP_STOCK_MERGE_DOWN, stock_menu_merge_down },
{ GIMP_STOCK_RESHOW_FILTER, stock_menu_reshow_filter },
{ GIMP_STOCK_ROTATE_90, stock_menu_rotate_90 },
{ GIMP_STOCK_ROTATE_180, stock_menu_rotate_180 },
{ GIMP_STOCK_ROTATE_270, stock_menu_rotate_270 },
{ GIMP_STOCK_RESIZE, stock_menu_resize },
{ GIMP_STOCK_SCALE, stock_menu_scale },
{ GIMP_STOCK_NAVIGATION, stock_menu_navigation },
{ GIMP_STOCK_QMASK_OFF, stock_menu_qmask_off },
{ GIMP_STOCK_QMASK_ON, stock_menu_qmask_on }
}; };

53
libgimpwidgets/gimpstock.h
View File

@ -28,23 +28,21 @@ G_BEGIN_DECLS
/* For information look into the C source or the html documentation */ /* For information look into the C source or the html documentation */
#define GIMP_STOCK_ANCHOR "gimp-anchor" /* only in button size: */
#define GIMP_STOCK_DUPLICATE "gimp-duplicate"
#define GIMP_STOCK_EDIT "gimp-edit"
#define GIMP_STOCK_LINKED "gimp-linked"
#define GIMP_STOCK_PASTE_AS_NEW "gimp-paste-as-new"
#define GIMP_STOCK_PASTE_INTO "gimp-paste-into"
#define GIMP_STOCK_RESET "gimp-reset"
#define GIMP_STOCK_VISIBLE "gimp-visible"
#define GIMP_STOCK_NAVIGATION "gimp-navigation" #define GIMP_STOCK_ANCHOR "gimp-anchor"
#define GIMP_STOCK_QMASK_OFF "gimp-qmask-off" #define GIMP_STOCK_DUPLICATE "gimp-duplicate"
#define GIMP_STOCK_QMASK_ON "gimp-qmask-on" #define GIMP_STOCK_EDIT "gimp-edit"
#define GIMP_STOCK_LINKED "gimp-linked"
#define GIMP_STOCK_PASTE_AS_NEW "gimp-paste-as-new"
#define GIMP_STOCK_PASTE_INTO "gimp-paste-into"
#define GIMP_STOCK_RESET "gimp-reset"
#define GIMP_STOCK_VISIBLE "gimp-visible"
#define GIMP_STOCK_HCHAIN "gimp-hchain" #define GIMP_STOCK_HCHAIN "gimp-hchain"
#define GIMP_STOCK_HCHAIN_BROKEN "gimp-hchain-broken" #define GIMP_STOCK_HCHAIN_BROKEN "gimp-hchain-broken"
#define GIMP_STOCK_VCHAIN "gimp-vchain" #define GIMP_STOCK_VCHAIN "gimp-vchain"
#define GIMP_STOCK_VCHAIN_BROKEN "gimp-vchain-broken" #define GIMP_STOCK_VCHAIN_BROKEN "gimp-vchain-broken"
#define GIMP_STOCK_SELECTION_REPLACE "gimp-selection-replace" #define GIMP_STOCK_SELECTION_REPLACE "gimp-selection-replace"
#define GIMP_STOCK_SELECTION_ADD "gimp-selection-add" #define GIMP_STOCK_SELECTION_ADD "gimp-selection-add"
@ -55,6 +53,27 @@ G_BEGIN_DECLS
#define GIMP_STOCK_PATH_STROKE "gimp-path-stroke" #define GIMP_STOCK_PATH_STROKE "gimp-path-stroke"
/* only in menu size: */
#define GIMP_STOCK_CONVERT_RGB "gimp-convert-rgb"
#define GIMP_STOCK_CONVERT_GRAYSCALE "gimp-convert-grayscale"
#define GIMP_STOCK_CONVERT_INDEXED "gimp-convert-indexed"
#define GIMP_STOCK_MERGE_DOWN "gimp-merge-down"
#define GIMP_STOCK_RESHOW_FILTER "gimp-reshow-filter"
#define GIMP_STOCK_ROTATE_90 "gimp-rotate-90"
#define GIMP_STOCK_ROTATE_180 "gimp-rotate-180"
#define GIMP_STOCK_ROTATE_270 "gimp-rotate-270"
#define GIMP_STOCK_RESIZE "gimp-resize"
#define GIMP_STOCK_SCALE "gimp-scale"
#define GIMP_STOCK_NAVIGATION "gimp-navigation"
#define GIMP_STOCK_QMASK_OFF "gimp-qmask-off"
#define GIMP_STOCK_QMASK_ON "gimp-qmask-on"
/* only in button size: */
#define GIMP_STOCK_TOOL_AIRBRUSH "gimp-tool-airbrush" #define GIMP_STOCK_TOOL_AIRBRUSH "gimp-tool-airbrush"
#define GIMP_STOCK_TOOL_BEZIER_SELECT "gimp-tool-bezier-select" #define GIMP_STOCK_TOOL_BEZIER_SELECT "gimp-tool-bezier-select"
#define GIMP_STOCK_TOOL_BLEND "gimp-tool-blend" #define GIMP_STOCK_TOOL_BLEND "gimp-tool-blend"
@ -94,8 +113,12 @@ G_BEGIN_DECLS
#define GIMP_STOCK_TOOL_THRESHOLD "gimp-tool-threshold" #define GIMP_STOCK_TOOL_THRESHOLD "gimp-tool-threshold"
#define GIMP_STOCK_TOOL_ZOOM "gimp-tool-zoom" #define GIMP_STOCK_TOOL_ZOOM "gimp-tool-zoom"
/* only in dialog size: */
#define GIMP_STOCK_WILBER_EEK "gimp-wilber-eek" #define GIMP_STOCK_WILBER_EEK "gimp-wilber-eek"
void gimp_stock_init (void); void gimp_stock_init (void);

67
themes/Default/imagerc
View File

@ -106,20 +106,73 @@ style "gimp-icons"
{ "images/stock-button-selection-intersect.png", *, *, * } { "images/stock-button-selection-intersect.png", *, *, * }
} }
# Misc menu icons
#
stock["gimp-convert-rgb"] =
{
{ "images/stock-menu-convert-rgb.png", *, *, "gtk-menu" },
{ "images/stock-menu-convert-rgb.png", *, *, * }
}
stock["gimp-convert-grayscale"] =
{
{ "images/stock-menu-convert-grayscale.png", *, *, "gtk-menu" },
{ "images/stock-menu-convert-grayscale.png", *, *, * }
}
stock["gimp-convert-indexed"] =
{
{ "images/stock-menu-convert-indexed.png", *, *, "gtk-menu" },
{ "images/stock-menu-convert-indexed.png", *, *, * }
}
stock["gimp-merge-down"] =
{
{ "images/stock-menu-merge-down.png", *, *, "gtk-menu" },
{ "images/stock-menu-merge-down.png", *, *, * }
}
stock["gimp-reshow-filter"] =
{
{ "images/stock-menu-reshow-filter.png", *, *, "gtk-menu" },
{ "images/stock-menu-reshow-filter.png", *, *, * }
}
stock["gimp-rotate-90"] =
{
{ "images/stock-menu-rotate-90.png", *, *, "gtk-menu" },
{ "images/stock-menu-rotate-90.png", *, *, * }
}
stock["gimp-rotate-180"] =
{
{ "images/stock-menu-rotate-180.png", *, *, "gtk-menu" },
{ "images/stock-menu-rotate-180.png", *, *, * }
}
stock["gimp-rotate-270"] =
{
{ "images/stock-menu-rotate-270.png", *, *, "gtk-menu" },
{ "images/stock-menu-rotate-270.png", *, *, * }
}
stock["gimp-resize"] =
{
{ "images/stock-menu-resize.png", *, *, "gtk-menu" },
{ "images/stock-menu-resize.png", *, *, * }
}
stock["gimp-scale"] =
{
{ "images/stock-menu-scale.png", *, *, "gtk-menu" },
{ "images/stock-menu-scale.png", *, *, * }
}
# Image window icons # Image window icons
# #
stock["gimp-navigation"] = stock["gimp-navigation"] =
{ {
{ "images/stock-menu-navigation.png", *, *, "gtk-menu" }, { "images/stock-menu-navigation.png", *, *, "gtk-menu" },
{ "images/stock-menu-navigation.png", *, *, * } { "images/stock-menu-navigation.png", *, *, * }
} }
stock["gimp-qmask-off"] = stock["gimp-qmask-off"] =
{ {
{ "images/stock-menu-qmask-off.png", *, *, "gtk-menu" }, { "images/stock-menu-qmask-off.png", *, *, "gtk-menu" },
{ "images/stock-menu-qmask-off.png", *, *, * } { "images/stock-menu-qmask-off.png", *, *, * }
} }
stock["gimp-qmask-on"] = stock["gimp-qmask-on"] =
{ {
{ "images/stock-menu-qmask-on.png", *, *, "gtk-menu" }, { "images/stock-menu-qmask-on.png", *, *, "gtk-menu" },
{ "images/stock-menu-qmask-on.png", *, *, * } { "images/stock-menu-qmask-on.png", *, *, * }
} }
@ -127,22 +180,22 @@ style "gimp-icons"
# X & Y linked or not # X & Y linked or not
# #
stock["gimp-hchain"] = stock["gimp-hchain"] =
{ {
{ "images/stock-button-hchain.png", *, *, "gtk-button" }, { "images/stock-button-hchain.png", *, *, "gtk-button" },
{ "images/stock-button-hchain.png", *, *, * } { "images/stock-button-hchain.png", *, *, * }
} }
stock["gimp-hchain-broken"] = stock["gimp-hchain-broken"] =
{ {
{ "images/stock-button-hchain-broken.png", *, *, "gtk-button" }, { "images/stock-button-hchain-broken.png", *, *, "gtk-button" },
{ "images/stock-button-hchain-broken.png", *, *, * } { "images/stock-button-hchain-broken.png", *, *, * }
} }
stock["gimp-vchain"] = stock["gimp-vchain"] =
{ {
{ "images/stock-button-vchain.png", *, *, "gtk-button" }, { "images/stock-button-vchain.png", *, *, "gtk-button" },
{ "images/stock-button-vchain.png", *, *, * } { "images/stock-button-vchain.png", *, *, * }
} }
stock["gimp-vchain-broken"] = stock["gimp-vchain-broken"] =
{ {
{ "images/stock-button-vchain-broken.png", *, *, "gtk-button" }, { "images/stock-button-vchain-broken.png", *, *, "gtk-button" },
{ "images/stock-button-vchain-broken.png", *, *, * } { "images/stock-button-vchain-broken.png", *, *, * }
} }

11
themes/Default/images/Makefile.am
View File

@ -66,6 +66,17 @@ STOCK_BUTTON_IMAGES = @STRIP_BEGIN@ \
@STRIP_END@ @STRIP_END@
STOCK_MENU_IMAGES = @STRIP_BEGIN@ \ STOCK_MENU_IMAGES = @STRIP_BEGIN@ \
stock-menu-convert-grayscale.png \
stock-menu-convert-indexed.png \
stock-menu-convert-rgb.png \
stock-menu-merge-down.png \
stock-menu-reshow-filter.png \
stock-menu-rotate-180.png \
stock-menu-rotate-270.png \
stock-menu-rotate-90.png \
stock-menu-resize.png \
stock-menu-scale.png \
\
stock-menu-navigation.png \ stock-menu-navigation.png \
stock-menu-qmask-off.png \ stock-menu-qmask-off.png \
stock-menu-qmask-on.png \ stock-menu-qmask-on.png \

BIN
themes/Default/images/stock-menu-convert-grayscale.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 147 B

BIN
themes/Default/images/stock-menu-convert-indexed.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 225 B

BIN
themes/Default/images/stock-menu-convert-rgb.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 171 B

BIN
themes/Default/images/stock-menu-merge-down.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 357 B

BIN
themes/Default/images/stock-menu-reshow-filter.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 556 B

BIN
themes/Default/images/stock-menu-resize.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 286 B

BIN
themes/Default/images/stock-menu-rotate-180.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 556 B

BIN
themes/Default/images/stock-menu-rotate-270.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 405 B

BIN
themes/Default/images/stock-menu-rotate-90.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 418 B

BIN
themes/Default/images/stock-menu-scale.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 255 B