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

libgimp/gimpbrushmenu.c use "Browse..." instead of "..." (bug #120600). 

2003-11-02  Sven Neumann  <sven@gimp.org>

	* libgimp/gimpbrushmenu.c
	* libgimp/gimppatternmenu.c: use "Browse..." instead of "..."
	(bug #120600).
This commit is contained in:
Sven Neumann 2003-11-02 17:28:56 +00:00 committed by Sven Neumann
parent 1c35fcf208
commit 2e885de4e8
3 changed files with 51 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,3 +1,9 @@
2003-11-02 Sven Neumann <sven@gimp.org>
* libgimp/gimpbrushmenu.c
* libgimp/gimppatternmenu.c: use "Browse..." instead of "..."
(bug #120600).
2003-11-02 Sven Neumann <sven@gimp.org> 2003-11-02 Sven Neumann <sven@gimp.org>
* plug-ins/common/png.c: handle gamma settings in PNG files using * plug-ins/common/png.c: handle gamma settings in PNG files using

42
libgimp/gimpbrushmenu.c
View File

@ -2,7 +2,7 @@
* Copyright (C) 1995-1997 Peter Mattis and Spencer Kimball * Copyright (C) 1995-1997 Peter Mattis and Spencer Kimball
* *
* gimpbrushmenu.c * gimpbrushmenu.c
* Copyright (C) 1998 Andy Thomas * Copyright (C) 1998 Andy Thomas
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public * modify it under the terms of the GNU Lesser General Public
@ -50,7 +50,7 @@ struct _BrushSelect
GtkWidget *preview; GtkWidget *preview;
GtkWidget *button; GtkWidget *button;
GtkWidget *popup; GtkWidget *popup;
gchar *brush_name; /* Local copy */ gchar *brush_name; /* Local copy */
gdouble opacity; gdouble opacity;
@ -96,7 +96,7 @@ static void gimp_brush_select_popup_close (BrushSelect *brush_sel);
/** /**
* gimp_brush_select_widget_new: * gimp_brush_select_widget_new:
* @title: Title of the dialog to use or %NULL to use the default title. * @title: Title of the dialog to use or %NULL to use the default title.
* @brush_name: Initial brush name or %NULL to use current selection. * @brush_name: Initial brush name or %NULL to use current selection.
* @opacity: Initial opacity. -1 means to use current opacity. * @opacity: Initial opacity. -1 means to use current opacity.
* @spacing: Initial spacing. -1 means to use current spacing. * @spacing: Initial spacing. -1 means to use current spacing.
* @paint_mode: Initial paint mode. -1 means to use current paint mode. * @paint_mode: Initial paint mode. -1 means to use current paint mode.
@ -109,9 +109,9 @@ static void gimp_brush_select_popup_close (BrushSelect *brush_sel);
* *
* Returns: A #GtkWidget that you can use in your UI. * Returns: A #GtkWidget that you can use in your UI.
*/ */
GtkWidget * GtkWidget *
gimp_brush_select_widget_new (const gchar *title, gimp_brush_select_widget_new (const gchar *title,
const gchar *brush_name, const gchar *brush_name,
gdouble opacity, gdouble opacity,
gint spacing, gint spacing,
GimpLayerModeEffects paint_mode, GimpLayerModeEffects paint_mode,
@ -150,15 +150,15 @@ gimp_brush_select_widget_new (const gchar *title,
GDK_BUTTON_PRESS_MASK | GDK_BUTTON_PRESS_MASK |
GDK_BUTTON_RELEASE_MASK | GDK_BUTTON_RELEASE_MASK |
GDK_BUTTON1_MOTION_MASK); GDK_BUTTON1_MOTION_MASK);
gtk_preview_size (GTK_PREVIEW (brush_sel->preview), CELL_SIZE, CELL_SIZE); gtk_preview_size (GTK_PREVIEW (brush_sel->preview), CELL_SIZE, CELL_SIZE);
gtk_container_add (GTK_CONTAINER (frame), brush_sel->preview); gtk_container_add (GTK_CONTAINER (frame), brush_sel->preview);
gtk_widget_show (brush_sel->preview); gtk_widget_show (brush_sel->preview);
g_signal_connect (brush_sel->preview, "event", g_signal_connect (brush_sel->preview, "event",
G_CALLBACK (gimp_brush_select_preview_events), G_CALLBACK (gimp_brush_select_preview_events),
brush_sel); brush_sel);
brush_sel->button = gtk_button_new_with_label (" ... "); brush_sel->button = gtk_button_new_with_label (_("Browse..."));
gtk_box_pack_end (GTK_BOX (hbox), brush_sel->button, FALSE, FALSE, 0); gtk_box_pack_end (GTK_BOX (hbox), brush_sel->button, FALSE, FALSE, 0);
gtk_widget_show (brush_sel->button); gtk_widget_show (brush_sel->button);
@ -221,7 +221,7 @@ gimp_brush_select_widget_close (GtkWidget *widget)
/** /**
* gimp_brush_select_widget_set; * gimp_brush_select_widget_set;
* @widget: A brush select widget. * @widget: A brush select widget.
* @brush_name: Brush name to set; %NULL means no change. * @brush_name: Brush name to set; %NULL means no change.
* @opacity: Opacity to set. -1 means no change. * @opacity: Opacity to set. -1 means no change.
* @spacing: Spacing to set. -1 means no change. * @spacing: Spacing to set. -1 means no change.
* @paint_mode: Paint mode to set. -1 means no change. * @paint_mode: Paint mode to set. -1 means no change.
@ -238,14 +238,14 @@ gimp_brush_select_widget_set (GtkWidget *widget,
GimpLayerModeEffects paint_mode) GimpLayerModeEffects paint_mode)
{ {
BrushSelect *brush_sel; BrushSelect *brush_sel;
brush_sel = g_object_get_data (G_OBJECT (widget), BRUSH_SELECT_DATA_KEY); brush_sel = g_object_get_data (G_OBJECT (widget), BRUSH_SELECT_DATA_KEY);
g_return_if_fail (brush_sel != NULL); g_return_if_fail (brush_sel != NULL);
if (brush_sel->temp_brush_callback) if (brush_sel->temp_brush_callback)
{ {
gimp_brushes_set_popup (brush_sel->temp_brush_callback, gimp_brushes_set_popup (brush_sel->temp_brush_callback,
brush_name, opacity, spacing, paint_mode); brush_name, opacity, spacing, paint_mode);
} }
else else
@ -273,7 +273,7 @@ gimp_brush_select_widget_set (GtkWidget *widget,
if (opacity == -1.0) opacity = init_opacity; if (opacity == -1.0) opacity = init_opacity;
if (spacing == -1) spacing = init_spacing; if (spacing == -1) spacing = init_spacing;
if (paint_mode == -1) paint_mode = init_paint_mode; if (paint_mode == -1) paint_mode = init_paint_mode;
gimp_brush_select_widget_callback (brush_name, opacity, spacing, gimp_brush_select_widget_callback (brush_name, opacity, spacing,
paint_mode, width, height, paint_mode, width, height,
mask_data, FALSE, brush_sel); mask_data, FALSE, brush_sel);
@ -329,7 +329,7 @@ gimp_brush_select_widget_clicked (GtkWidget *widget,
if (brush_sel->temp_brush_callback) if (brush_sel->temp_brush_callback)
{ {
/* calling gimp_brushes_set_popup() raises the dialog */ /* calling gimp_brushes_set_popup() raises the dialog */
gimp_brushes_set_popup (brush_sel->temp_brush_callback, gimp_brushes_set_popup (brush_sel->temp_brush_callback,
brush_sel->brush_name, brush_sel->brush_name,
brush_sel->opacity, brush_sel->opacity,
brush_sel->spacing, brush_sel->spacing,
@ -378,24 +378,24 @@ gimp_brush_select_preview_events (GtkWidget *widget,
{ {
case GDK_BUTTON_PRESS: case GDK_BUTTON_PRESS:
bevent = (GdkEventButton *) event; bevent = (GdkEventButton *) event;
if (bevent->button == 1) if (bevent->button == 1)
{ {
gtk_grab_add (widget); gtk_grab_add (widget);
gimp_brush_select_popup_open (brush_sel, bevent->x, bevent->y); gimp_brush_select_popup_open (brush_sel, bevent->x, bevent->y);
} }
break; break;
case GDK_BUTTON_RELEASE: case GDK_BUTTON_RELEASE:
bevent = (GdkEventButton *) event; bevent = (GdkEventButton *) event;
if (bevent->button == 1) if (bevent->button == 1)
{ {
gtk_grab_remove (widget); gtk_grab_remove (widget);
gimp_brush_select_popup_close (brush_sel); gimp_brush_select_popup_close (brush_sel);
} }
break; break;
default: default:
break; break;
} }
@ -420,9 +420,9 @@ gimp_brush_select_preview_update (GtkWidget *preview,
gint width, height; gint width, height;
/* Draw the brush */ /* Draw the brush */
buf = g_new (guchar, CELL_SIZE); buf = g_new (guchar, CELL_SIZE);
/* Set buffer to white */ /* Set buffer to white */
memset (buf, 255, CELL_SIZE); memset (buf, 255, CELL_SIZE);
for (i = 0; i < CELL_SIZE; i++) for (i = 0; i < CELL_SIZE; i++)
gtk_preview_draw_row (GTK_PREVIEW (preview), gtk_preview_draw_row (GTK_PREVIEW (preview),
@ -510,11 +510,11 @@ gimp_brush_select_popup_open (BrushSelect *brush_sel,
y = (y + brush_sel->height > scr_h) ? scr_h - brush_sel->height : y; y = (y + brush_sel->height > scr_h) ? scr_h - brush_sel->height : y;
gtk_window_move (GTK_WINDOW (brush_sel->popup), x, y); gtk_window_move (GTK_WINDOW (brush_sel->popup), x, y);
/* Draw the brush */ /* Draw the brush */
buf = g_new (guchar, brush_sel->width); buf = g_new (guchar, brush_sel->width);
memset (buf, 255, brush_sel->width); memset (buf, 255, brush_sel->width);
src = brush_sel->mask_data; src = brush_sel->mask_data;
for (y = 0; y < brush_sel->height; y++) for (y = 0; y < brush_sel->height; y++)

48
libgimp/gimppatternmenu.c
View File

@ -2,7 +2,7 @@
* Copyright (C) 1995-1997 Peter Mattis and Spencer Kimball * Copyright (C) 1995-1997 Peter Mattis and Spencer Kimball
* *
* gimppatternmenu.c * gimppatternmenu.c
* Copyright (C) 1998 Andy Thomas * Copyright (C) 1998 Andy Thomas
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public * modify it under the terms of the GNU Lesser General Public
@ -48,7 +48,7 @@ struct _PatternSelect
GtkWidget *preview; GtkWidget *preview;
GtkWidget *button; GtkWidget *button;
GtkWidget *popup; GtkWidget *popup;
gchar *pattern_name; /* Local copy */ gchar *pattern_name; /* Local copy */
gint width; gint width;
@ -88,7 +88,7 @@ static void gimp_pattern_select_popup_close (PatternSelect *pattern_sel)
/** /**
* gimp_pattern_select_widget_new: * gimp_pattern_select_widget_new:
* @title: Title of the dialog to use or %NULL to use the default title. * @title: Title of the dialog to use or %NULL to use the default title.
* @pattern_name: Initial pattern name or %NULL to use current selection. * @pattern_name: Initial pattern name or %NULL to use current selection.
* @callback: A function to call when the selected pattern changes. * @callback: A function to call when the selected pattern changes.
* @data: A pointer to arbitary data to be used in the call to @callback. * @data: A pointer to arbitary data to be used in the call to @callback.
* *
@ -98,9 +98,9 @@ static void gimp_pattern_select_popup_close (PatternSelect *pattern_sel)
* *
* Returns: A #GtkWidget that you can use in your UI. * Returns: A #GtkWidget that you can use in your UI.
*/ */
GtkWidget * GtkWidget *
gimp_pattern_select_widget_new (const gchar *title, gimp_pattern_select_widget_new (const gchar *title,
const gchar *pattern_name, const gchar *pattern_name,
GimpRunPatternCallback callback, GimpRunPatternCallback callback,
gpointer data) gpointer data)
{ {
@ -113,7 +113,7 @@ gimp_pattern_select_widget_new (const gchar *title,
if (! title) if (! title)
title = _("Pattern Selection"); title = _("Pattern Selection");
pattern_sel = g_new0 (PatternSelect, 1); pattern_sel = g_new0 (PatternSelect, 1);
pattern_sel->title = g_strdup (title); pattern_sel->title = g_strdup (title);
@ -133,16 +133,16 @@ gimp_pattern_select_widget_new (const gchar *title,
GDK_BUTTON_PRESS_MASK | GDK_BUTTON_PRESS_MASK |
GDK_BUTTON_RELEASE_MASK | GDK_BUTTON_RELEASE_MASK |
GDK_BUTTON1_MOTION_MASK); GDK_BUTTON1_MOTION_MASK);
gtk_preview_size (GTK_PREVIEW (pattern_sel->preview), CELL_SIZE, CELL_SIZE); gtk_preview_size (GTK_PREVIEW (pattern_sel->preview), CELL_SIZE, CELL_SIZE);
gtk_container_add (GTK_CONTAINER (frame), pattern_sel->preview); gtk_container_add (GTK_CONTAINER (frame), pattern_sel->preview);
gtk_widget_show (pattern_sel->preview); gtk_widget_show (pattern_sel->preview);
g_signal_connect (pattern_sel->preview, "event", g_signal_connect (pattern_sel->preview, "event",
G_CALLBACK (gimp_pattern_select_preview_events), G_CALLBACK (gimp_pattern_select_preview_events),
pattern_sel); pattern_sel);
pattern_sel->button = gtk_button_new_with_label (" ... "); pattern_sel->button = gtk_button_new_with_label (_("Browse... "));
gtk_box_pack_start (GTK_BOX (hbox), pattern_sel->button, FALSE, FALSE, 0); gtk_box_pack_start (GTK_BOX (hbox), pattern_sel->button, FALSE, FALSE, 0);
gtk_widget_show (pattern_sel->button); gtk_widget_show (pattern_sel->button);
g_signal_connect (pattern_sel->button, "clicked", g_signal_connect (pattern_sel->button, "clicked",
@ -158,11 +158,11 @@ gimp_pattern_select_widget_new (const gchar *title,
&pattern_sel->width, &pattern_sel->width,
&pattern_sel->height, &pattern_sel->height,
&pattern_sel->bytes, &pattern_sel->bytes,
&mask_data_size, &mask_data_size,
&pattern_sel->mask_data); &pattern_sel->mask_data);
if (pattern_sel->pattern_name) if (pattern_sel->pattern_name)
gimp_pattern_select_preview_update (pattern_sel->preview, gimp_pattern_select_preview_update (pattern_sel->preview,
pattern_sel->width, pattern_sel->width,
pattern_sel->height, pattern_sel->height,
pattern_sel->bytes, pattern_sel->bytes,
@ -198,7 +198,7 @@ gimp_pattern_select_widget_close (GtkWidget *widget)
/** /**
* gimp_pattern_select_widget_set: * gimp_pattern_select_widget_set:
* @widget: A pattern select widget. * @widget: A pattern select widget.
* @pattern_name: Pattern name to set. NULL means no change. * @pattern_name: Pattern name to set. NULL means no change.
* *
* Sets the current pattern for the pattern select widget. Calls the * Sets the current pattern for the pattern select widget. Calls the
* callback function if one was supplied in the call to * callback function if one was supplied in the call to
@ -229,9 +229,9 @@ gimp_pattern_select_widget_set (GtkWidget *widget,
gchar *name; gchar *name;
name = gimp_patterns_get_pattern_data (pattern_name, name = gimp_patterns_get_pattern_data (pattern_name,
&width, &width,
&height, &height,
&bytes, &bytes,
&mask_data_size, &mask_data_size,
&mask_data); &mask_data);
@ -267,9 +267,9 @@ gimp_pattern_select_widget_callback (const gchar *name,
pattern_sel->width = width; pattern_sel->width = width;
pattern_sel->height = height; pattern_sel->height = height;
pattern_sel->bytes = bytes; pattern_sel->bytes = bytes;
pattern_sel->mask_data = g_memdup (mask_data, width * height * bytes); pattern_sel->mask_data = g_memdup (mask_data, width * height * bytes);
gimp_pattern_select_preview_update (pattern_sel->preview, gimp_pattern_select_preview_update (pattern_sel->preview,
width, height, bytes, mask_data); width, height, bytes, mask_data);
if (pattern_sel->callback) if (pattern_sel->callback)
@ -292,7 +292,7 @@ gimp_pattern_select_widget_clicked (GtkWidget *widget,
} }
else else
{ {
pattern_sel->temp_pattern_callback = pattern_sel->temp_pattern_callback =
gimp_pattern_select_new (pattern_sel->title, gimp_pattern_select_new (pattern_sel->title,
pattern_sel->pattern_name, pattern_sel->pattern_name,
gimp_pattern_select_widget_callback, gimp_pattern_select_widget_callback,
@ -329,7 +329,7 @@ gimp_pattern_select_preview_events (GtkWidget *widget,
{ {
case GDK_BUTTON_PRESS: case GDK_BUTTON_PRESS:
bevent = (GdkEventButton *) event; bevent = (GdkEventButton *) event;
if (bevent->button == 1) if (bevent->button == 1)
{ {
gtk_grab_add (widget); gtk_grab_add (widget);
@ -337,10 +337,10 @@ gimp_pattern_select_preview_events (GtkWidget *widget,
bevent->x, bevent->y); bevent->x, bevent->y);
} }
break; break;
case GDK_BUTTON_RELEASE: case GDK_BUTTON_RELEASE:
bevent = (GdkEventButton *) event; bevent = (GdkEventButton *) event;
if (bevent->button == 1) if (bevent->button == 1)
{ {
gtk_grab_remove (widget); gtk_grab_remove (widget);
@ -436,7 +436,7 @@ gimp_pattern_select_popup_open (PatternSelect *pattern_sel,
gtk_widget_show (frame); gtk_widget_show (frame);
preview = gtk_preview_new (GTK_PREVIEW_COLOR); preview = gtk_preview_new (GTK_PREVIEW_COLOR);
gtk_preview_size (GTK_PREVIEW (preview), gtk_preview_size (GTK_PREVIEW (preview),
pattern_sel->width, pattern_sel->height); pattern_sel->width, pattern_sel->height);
gtk_container_add (GTK_CONTAINER (frame), preview); gtk_container_add (GTK_CONTAINER (frame), preview);
gtk_widget_show (preview); gtk_widget_show (preview);
@ -456,7 +456,7 @@ gimp_pattern_select_popup_open (PatternSelect *pattern_sel,
y = (y + pattern_sel->height > scr_h) ? scr_h - pattern_sel->height : y; y = (y + pattern_sel->height > scr_h) ? scr_h - pattern_sel->height : y;
gtk_window_move (GTK_WINDOW (pattern_sel->popup), x, y); gtk_window_move (GTK_WINDOW (pattern_sel->popup), x, y);
/* Draw the pattern */ /* Draw the pattern */
buf = g_new (guchar, pattern_sel->width * 3); buf = g_new (guchar, pattern_sel->width * 3);
src = pattern_sel->mask_data; src = pattern_sel->mask_data;