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

don't expose the internal term "component", use "channel" instead. 

2003-03-13  Sven Neumann  <sven@gimp.org>

	* app/gui/channels-commands.c: don't expose the internal term
	"component", use "channel" instead.

2003-03-13  Sven Neumann  <sven@gimp.org>

	* POTFILES.in
	* de.po: updated.
This commit is contained in:
Sven Neumann 2003-03-13 16:49:37 +00:00 committed by Sven Neumann
parent 0a8064f541
commit 2008e01c28
10 changed files with 411 additions and 388 deletions

5
ChangeLog
View File

@ -1,3 +1,8 @@
2003-03-13 Sven Neumann <sven@gimp.org>
* app/gui/channels-commands.c: don't expose the internal term
"component", use "channel" instead.
2003-03-13 Sven Neumann <sven@gimp.org> 2003-03-13 Sven Neumann <sven@gimp.org>
* app/widgets/gimpcellrenderertoggle.c * app/widgets/gimpcellrenderertoggle.c

6
app/actions/channels-commands.c
View File

@ -137,8 +137,8 @@ channels_duplicate_channel_cmd_callback (GtkWidget *widget,
enum_class = g_type_class_ref (GIMP_TYPE_CHANNEL_TYPE); enum_class = g_type_class_ref (GIMP_TYPE_CHANNEL_TYPE);
enum_value = g_enum_get_value (enum_class, component); enum_value = g_enum_get_value (enum_class, component);
g_type_class_unref (enum_class); g_type_class_unref (enum_class);
name = g_strdup_printf (_("%s Component Copy"), name = g_strdup_printf (_("%s Channel Copy"),
gettext (enum_value->value_name)); gettext (enum_value->value_name));
new_channel = gimp_channel_new_from_component (gimage, component, new_channel = gimp_channel_new_from_component (gimage, component,
@ -201,7 +201,7 @@ channels_channel_to_sel (GtkWidget *widget,
} }
gimp_image_mask_select_channel (gimage, gimp_image_mask_select_channel (gimage,
_("Component to Selection"), _("Channel to Selection"),
channel, channel,
0, 0, 0, 0,
op, op,

6
app/gui/channels-commands.c
View File

@ -137,8 +137,8 @@ channels_duplicate_channel_cmd_callback (GtkWidget *widget,
enum_class = g_type_class_ref (GIMP_TYPE_CHANNEL_TYPE); enum_class = g_type_class_ref (GIMP_TYPE_CHANNEL_TYPE);
enum_value = g_enum_get_value (enum_class, component); enum_value = g_enum_get_value (enum_class, component);
g_type_class_unref (enum_class); g_type_class_unref (enum_class);
name = g_strdup_printf (_("%s Component Copy"), name = g_strdup_printf (_("%s Channel Copy"),
gettext (enum_value->value_name)); gettext (enum_value->value_name));
new_channel = gimp_channel_new_from_component (gimage, component, new_channel = gimp_channel_new_from_component (gimage, component,
@ -201,7 +201,7 @@ channels_channel_to_sel (GtkWidget *widget,
} }
gimp_image_mask_select_channel (gimage, gimp_image_mask_select_channel (gimage,
_("Component to Selection"), _("Channel to Selection"),
channel, channel,
0, 0, 0, 0,
op, op,

23
app/widgets/gimpcellrenderertoggle.c
View File

@ -293,6 +293,7 @@ gimp_cell_renderer_toggle_render (GtkCellRenderer *cell,
{ {
GimpCellRendererToggle *toggle; GimpCellRendererToggle *toggle;
GdkRectangle toggle_rect; GdkRectangle toggle_rect;
GdkRectangle draw_rect;
GtkStateType state; GtkStateType state;
gboolean active; gboolean active;
@ -339,26 +340,24 @@ gimp_cell_renderer_toggle_render (GtkCellRenderer *cell,
state = GTK_STATE_INSENSITIVE; state = GTK_STATE_INSENSITIVE;
} }
gtk_paint_shadow (widget->style, if (gdk_rectangle_intersect (expose_area, cell_area, &draw_rect))
window, gtk_paint_shadow (widget->style,
state, window,
active ? GTK_SHADOW_IN : GTK_SHADOW_OUT, state,
cell_area, active ? GTK_SHADOW_IN : GTK_SHADOW_OUT,
widget, NULL, &draw_rect,
toggle_rect.x, toggle_rect.y, widget, NULL,
toggle_rect.width, toggle_rect.height); toggle_rect.x, toggle_rect.y,
toggle_rect.width, toggle_rect.height);
if (active) if (active)
{ {
GdkRectangle draw_rect;
toggle_rect.x += widget->style->xthickness; toggle_rect.x += widget->style->xthickness;
toggle_rect.y += widget->style->ythickness; toggle_rect.y += widget->style->ythickness;
toggle_rect.width -= widget->style->xthickness * 2; toggle_rect.width -= widget->style->xthickness * 2;
toggle_rect.height -= widget->style->ythickness * 2; toggle_rect.height -= widget->style->ythickness * 2;
if (gdk_rectangle_intersect (cell_area, &toggle_rect, &draw_rect) && if (gdk_rectangle_intersect (&draw_rect, &toggle_rect, &draw_rect))
gdk_rectangle_intersect (expose_area, &draw_rect, &draw_rect))
gdk_draw_pixbuf (window, gdk_draw_pixbuf (window,
widget->style->black_gc, widget->style->black_gc,
toggle->pixbuf, toggle->pixbuf,

3
app/widgets/gimppreviewrenderer.c
View File

@ -520,8 +520,7 @@ gimp_preview_renderer_draw (GimpPreviewRenderer *renderer,
render_rect.width, render_rect.width,
render_rect.height, render_rect.height,
GDK_RGB_DITHER_NORMAL, GDK_RGB_DITHER_NORMAL,
expose_area->x - draw_area->x, 0, 0);
expose_area->y - draw_area->y);
} }
} }
else if (renderer->buffer) else if (renderer->buffer)

3
app/widgets/gimpviewrenderer.c
View File

@ -520,8 +520,7 @@ gimp_preview_renderer_draw (GimpPreviewRenderer *renderer,
render_rect.width, render_rect.width,
render_rect.height, render_rect.height,
GDK_RGB_DITHER_NORMAL, GDK_RGB_DITHER_NORMAL,
expose_area->x - draw_area->x, 0, 0);
expose_area->y - draw_area->y);
} }
} }
else if (renderer->buffer) else if (renderer->buffer)

23
libgimpwidgets/gimpcellrenderertoggle.c
View File

@ -293,6 +293,7 @@ gimp_cell_renderer_toggle_render (GtkCellRenderer *cell,
{ {
GimpCellRendererToggle *toggle; GimpCellRendererToggle *toggle;
GdkRectangle toggle_rect; GdkRectangle toggle_rect;
GdkRectangle draw_rect;
GtkStateType state; GtkStateType state;
gboolean active; gboolean active;
@ -339,26 +340,24 @@ gimp_cell_renderer_toggle_render (GtkCellRenderer *cell,
state = GTK_STATE_INSENSITIVE; state = GTK_STATE_INSENSITIVE;
} }
gtk_paint_shadow (widget->style, if (gdk_rectangle_intersect (expose_area, cell_area, &draw_rect))
window, gtk_paint_shadow (widget->style,
state, window,
active ? GTK_SHADOW_IN : GTK_SHADOW_OUT, state,
cell_area, active ? GTK_SHADOW_IN : GTK_SHADOW_OUT,
widget, NULL, &draw_rect,
toggle_rect.x, toggle_rect.y, widget, NULL,
toggle_rect.width, toggle_rect.height); toggle_rect.x, toggle_rect.y,
toggle_rect.width, toggle_rect.height);
if (active) if (active)
{ {
GdkRectangle draw_rect;
toggle_rect.x += widget->style->xthickness; toggle_rect.x += widget->style->xthickness;
toggle_rect.y += widget->style->ythickness; toggle_rect.y += widget->style->ythickness;
toggle_rect.width -= widget->style->xthickness * 2; toggle_rect.width -= widget->style->xthickness * 2;
toggle_rect.height -= widget->style->ythickness * 2; toggle_rect.height -= widget->style->ythickness * 2;
if (gdk_rectangle_intersect (cell_area, &toggle_rect, &draw_rect) && if (gdk_rectangle_intersect (&draw_rect, &toggle_rect, &draw_rect))
gdk_rectangle_intersect (expose_area, &draw_rect, &draw_rect))
gdk_draw_pixbuf (window, gdk_draw_pixbuf (window,
widget->style->black_gc, widget->style->black_gc,
toggle->pixbuf, toggle->pixbuf,

5
po/ChangeLog
View File

@ -1,3 +1,8 @@
2003-03-13 Sven Neumann <sven@gimp.org>
* POTFILES.in
* de.po: updated.
2003-03-12 Pablo Gonzalo del Campo <pablodc@bigfoot.com> 2003-03-12 Pablo Gonzalo del Campo <pablodc@bigfoot.com>
* es.po: Updated Spanish translation by * es.po: Updated Spanish translation by

1
po/POTFILES.in
View File

@ -236,7 +236,6 @@ app/widgets/gimpbufferview.c
app/widgets/gimpchannellistview.c app/widgets/gimpchannellistview.c
app/widgets/gimpcoloreditor.c app/widgets/gimpcoloreditor.c
app/widgets/gimpcolormapeditor.c app/widgets/gimpcolormapeditor.c
app/widgets/gimpcomponentlistitem.c
app/widgets/gimpcontainergridview.c app/widgets/gimpcontainergridview.c
app/widgets/gimpdataeditor.c app/widgets/gimpdataeditor.c
app/widgets/gimpdatafactoryview.c app/widgets/gimpdatafactoryview.c

724
po/de.po
View File

File diff suppressed because it is too large Load Diff