callisto-debian/gimp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

app/core/gimpbrush.c app/core/gimpbuffer.c app/core/gimpimagefile.c

Browse Source 
2006-02-28  Sven Neumann  <sven@gimp.org>

	* app/core/gimpbrush.c
	* app/core/gimpbuffer.c
	* app/core/gimpimagefile.c
	* app/core/gimppattern.c
	* app/dialogs/preferences-dialog.c
	* app/tools/gimpmeasuretool.c
	* app/tools/gimprectangletool.c
	* app/tools/gimprectselecttool.c
	* app/widgets/gimpimagepropview.c
	* app/widgets/gimpsizebox.c
	* app/widgets/gimptemplateeditor.c
	* plug-ins/imagemap/imap_statusbar.c: use U+00D7 MULTIPLICATION SIGN
	instead of x when displaying sizes.
This commit is contained in:
Sven Neumann
2006-02-28 12:15:51 +00:00
committed by Sven Neumann
parent b4cae3a79d
commit 5e7ce540c1
14 changed files with 40 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
ChangeLog
View File

@ -1,3 +1,19 @@
2006-02-28 Sven Neumann <sven@gimp.org>
* app/core/gimpbrush.c
* app/core/gimpbuffer.c
* app/core/gimpimagefile.c
* app/core/gimppattern.c
* app/dialogs/preferences-dialog.c
* app/tools/gimpmeasuretool.c
* app/tools/gimprectangletool.c
* app/tools/gimprectselecttool.c
* app/widgets/gimpimagepropview.c
* app/widgets/gimpsizebox.c
* app/widgets/gimptemplateeditor.c
* plug-ins/imagemap/imap_statusbar.c: use U+00D7 MULTIPLICATION SIGN
instead of x when displaying sizes.
2006-02-28 Sven Neumann <sven@gimp.org>
* plug-ins/common/animationplay.c: coding style cleanup.

2
app/core/gimpbrush.c
View File

@ -267,7 +267,7 @@ gimp_brush_get_description (GimpViewable *viewable,
{
GimpBrush *brush = GIMP_BRUSH (viewable);
return g_strdup_printf ("%s (%d x %d)",
return g_strdup_printf ("%s (%d × %d)",
GIMP_OBJECT (brush)->name,
brush->mask->width,
brush->mask->height);

2
app/core/gimpbuffer.c
View File

@ -251,7 +251,7 @@ gimp_buffer_get_description (GimpViewable *viewable,
{
GimpBuffer *buffer = GIMP_BUFFER (viewable);
return g_strdup_printf ("%s (%d x %d)",
return g_strdup_printf ("%s (%d × %d)",
GIMP_OBJECT (buffer)->name,
gimp_buffer_get_width (buffer),
gimp_buffer_get_height (buffer));

6
app/core/gimpimagefile.c
View File

@ -513,7 +513,7 @@ gimp_imagefile_get_description (GimpViewable *viewable,
{
gchar *tmp = basename;
basename = g_strdup_printf ("%s (%d x %d)",
basename = g_strdup_printf ("%s (%d × %d)",
tmp,
thumbnail->image_width,
thumbnail->image_height);
@ -607,8 +607,8 @@ gimp_imagefile_get_desc_string (GimpImagefile *imagefile)
if (thumbnail->image_width > 0 && thumbnail->image_height > 0)
{
g_string_append_printf (str,
ngettext ("%d x %d pixel",
"%d x %d pixels",
ngettext ("%d × %d pixel",
"%d × %d pixels",
thumbnail->image_height),
thumbnail->image_width,
thumbnail->image_height);

2
app/core/gimppattern-load.c
View File

@ -174,7 +174,7 @@ gimp_pattern_get_description (GimpViewable *viewable,
{
GimpPattern *pattern = GIMP_PATTERN (viewable);
return g_strdup_printf ("%s (%d x %d)",
return g_strdup_printf ("%s (%d × %d)",
GIMP_OBJECT (pattern)->name,
pattern->mask->width,
pattern->mask->height);

2
app/core/gimppattern.c
View File

@ -174,7 +174,7 @@ gimp_pattern_get_description (GimpViewable *viewable,
{
GimpPattern *pattern = GIMP_PATTERN (viewable);
return g_strdup_printf ("%s (%d x %d)",
return g_strdup_printf ("%s (%d × %d)",
GIMP_OBJECT (pattern)->name,
pattern->mask->width,
pattern->mask->height);

2
app/dialogs/preferences-dialog.c
View File

@ -2084,7 +2084,7 @@ prefs_dialog_new (Gimp *gimp,
gimp_get_screen_resolution (NULL, &xres, &yres);
str = g_strdup_printf (_("From _windowing system (currently %d x %d dpi)"),
str = g_strdup_printf (_("From _windowing system (currently %d × %d dpi)"),
ROUND (xres), ROUND (yres));
button = gtk_radio_button_new_with_mnemonic (group, str);

4
app/tools/gimpmeasuretool.c
View File

@ -765,14 +765,14 @@ gimp_measure_tool_dialog_update (GimpMeasureTool *mtool,
if (shell->unit == GIMP_UNIT_PIXEL)
{
g_snprintf (buf, sizeof (buf), "%.1f %s, %.2f \302\260 (%d x %d)",
g_snprintf (buf, sizeof (buf), "%.1f %s, %.2f \302\260 (%d × %d)",
pixel_distance, _("pixels"), pixel_angle,
pixel_width, pixel_height);
}
else
{
g_snprintf (format, sizeof (format),
"%%.%df %s, %%.2f \302\260 (%%.%df x %%.%df)",
"%%.%df %s, %%.2f \302\260 (%%.%df × %%.%df)",
_gimp_unit_get_digits (image->gimp, shell->unit),
_gimp_unit_get_plural (image->gimp, shell->unit),
_gimp_unit_get_digits (image->gimp, shell->unit),

2
app/tools/gimprectangletool.c
View File

@ -1819,7 +1819,7 @@ gimp_rectangle_tool_motion (GimpTool *tool,
_("Rectangle: "),
(rx2 > max_x ? max_x : rx2) -
(rx1 < min_x ? min_x : rx1),
" x ",
" × ",
(ry2 > max_y ? max_y : ry2) -
(ry1 < min_y ? min_y : ry1));
}

2
app/tools/gimprectselecttool.c
View File

@ -358,7 +358,7 @@ gimp_rect_select_tool_motion (GimpTool *tool,
gimp_tool_pop_status (tool, gdisp);
gimp_tool_push_status_coords (tool, gdisp,
_("Selection: "),
rect_sel->w, " x ", rect_sel->h);
rect_sel->w, " × ", rect_sel->h);
gimp_draw_tool_resume (GIMP_DRAW_TOOL (tool));
}

8
app/widgets/gimpimagepropview.c
View File

@ -320,8 +320,8 @@ gimp_image_prop_view_update (GimpImagePropView *view)
gchar buf[256];
/* pixel size */
g_snprintf (buf, sizeof (buf), ngettext ("%d x %d pixel",
"%d x %d pixels", image->height),
g_snprintf (buf, sizeof (buf), ngettext ("%d × %d pixel",
"%d × %d pixels", image->height),
image->width, image->height);
gtk_label_set_text (GTK_LABEL (view->pixel_size_label), buf);
@ -331,7 +331,7 @@ gimp_image_prop_view_update (GimpImagePropView *view)
unit_factor = _gimp_unit_get_factor (image->gimp, unit);
unit_digits = _gimp_unit_get_digits (image->gimp, unit);
g_snprintf (format_buf, sizeof (format_buf), "%%.%df x %%.%df %s",
g_snprintf (format_buf, sizeof (format_buf), "%%.%df × %%.%df %s",
unit_digits + 1, unit_digits + 1,
_gimp_unit_get_plural (image->gimp, unit));
g_snprintf (buf, sizeof (buf), format_buf,
@ -345,7 +345,7 @@ gimp_image_prop_view_update (GimpImagePropView *view)
g_snprintf (format_buf, sizeof (format_buf), _("pixels/%s"),
_gimp_unit_get_abbreviation (image->gimp, unit));
g_snprintf (buf, sizeof (buf), _("%g x %g %s"),
g_snprintf (buf, sizeof (buf), _("%g × %g %s"),
image->xresolution / unit_factor,
image->yresolution / unit_factor,
unit == GIMP_UNIT_INCH ? _("dpi") : format_buf);

6
app/widgets/gimpsizebox.c
View File

@ -428,8 +428,8 @@ gimp_size_box_update_size (GimpSizeBox *box)
if (priv->pixel_label)
{
gchar *text = g_strdup_printf (ngettext ("%d x %d pixel",
"%d x %d pixels", box->height),
gchar *text = g_strdup_printf (ngettext ("%d × %d pixel",
"%d × %d pixels", box->height),
box->width, box->height);
gtk_label_set_text (GTK_LABEL (priv->pixel_label), text);
g_free (text);
@ -454,7 +454,7 @@ gimp_size_box_update_resolution (GimpSizeBox *box)
gint yres = ROUND (box->yresolution);
if (xres != yres)
text = g_strdup_printf (_("%d x %d dpi"), xres, yres);
text = g_strdup_printf (_("%d × %d dpi"), xres, yres);
else
text = g_strdup_printf (_("%d dpi"), yres);

6
app/widgets/gimptemplateeditor.c
View File

@ -561,8 +561,8 @@ static void
gimp_template_editor_set_pixels (GimpTemplateEditor *editor,
GimpTemplate *template)
{
gchar *text = g_strdup_printf (ngettext ("%d x %d pixel",
"%d x %d pixels", template->height),
gchar *text = g_strdup_printf (ngettext ("%d × %d pixel",
"%d × %d pixels", template->height),
template->width, template->height);
gtk_label_set_text (GTK_LABEL (editor->pixel_label), text);
g_free (text);
@ -665,7 +665,7 @@ gimp_template_editor_template_notify (GimpTemplate *template,
yres = ROUND (template->yresolution);
if (xres != yres)
text = g_strdup_printf (_("%d x %d dpi, %s"), xres, yres, desc);
text = g_strdup_printf (_("%d × %d dpi, %s"), xres, yres, desc);
else
text = g_strdup_printf (_("%d dpi, %s"), yres, desc);

4
plug-ins/imagemap/imap_statusbar.c
View File

@ -129,9 +129,9 @@ void statusbar_clear_xy(StatusBar_t *statusbar)
void
statusbar_set_dimension(StatusBar_t *statusbar, gint w, gint h)
{
char scratch[16];
gchar scratch[16];
sprintf(scratch, "%d x %d", (int) w, (int) h);
snprintf (scratch, sizeof (scratch), "%d × %d", (gint) w, (gint) h);
gtk_entry_set_text(GTK_ENTRY(statusbar->dimension), scratch);
}