notgne2/tuxpaint-pencil-sharpener
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixed rendering problem with NO_SDL_PANGO.

Browse source
This commit is contained in:
Shin-ichi TOYAMA 2008-06-26 15:13:57 +00:00
parent c47ed8808a
commit 14063f43b9
25 changed files with 61 additions and 82 deletions
Download patch file Download diff file Expand all files Collapse all files

13
magic/src/blocks_chalk_drip.c
View file

@ -29,7 +29,6 @@
#include <stdio.h>
#include <string.h>
#include <libintl.h>
#include <stdlib.h>
#include "tp_magic_api.h"
#include "SDL_image.h"
@ -130,11 +129,11 @@ SDL_Surface * blocks_chalk_drip_get_icon(magic_api * api, int which)
char * blocks_chalk_drip_get_name(magic_api * api ATTRIBUTE_UNUSED, int which)
{
if (which == TOOL_BLOCKS)
return(strdup(gettext("Blocks")));
return(strdup(gettext_noop("Blocks")));
else if (which == TOOL_CHALK)
return(strdup(gettext("Chalk")));
return(strdup(gettext_noop("Chalk")));
else if (which == TOOL_DRIP)
return(strdup(gettext("Drip")));
return(strdup(gettext_noop("Drip")));
return(NULL);
}
@ -143,13 +142,13 @@ char * blocks_chalk_drip_get_name(magic_api * api ATTRIBUTE_UNUSED, int which)
char * blocks_chalk_drip_get_description(magic_api * api ATTRIBUTE_UNUSED, int which)
{
if (which == TOOL_BLOCKS)
return(strdup(gettext(
return(strdup(gettext_noop(
"Click and move the mouse around to make the picture blocky.")));
else if (which == TOOL_CHALK)
return(strdup(gettext(
return(strdup(gettext_noop(
"Click and move the mouse around to turn the picture into a chalk drawing.")));
else if (which == TOOL_DRIP)
return(strdup(gettext(
return(strdup(gettext_noop(
"Click and move the mouse around to make the picture drip.")));
return(NULL);

5
magic/src/blur.c
View file

@ -31,7 +31,6 @@
#include <stdio.h>
#include <string.h>
#include <libintl.h>
#include "tp_magic_api.h"
#include "SDL_image.h"
#include "SDL_mixer.h"
@ -74,13 +73,13 @@ SDL_Surface * blur_get_icon(magic_api * api, int which)
// Return our names, localized:
char * blur_get_name(magic_api * api, int which)
{
return(strdup(gettext("Blur")));
return(strdup(gettext_noop("Blur")));
}
// Return our descriptions, localized:
char * blur_get_description(magic_api * api, int which)
{
return(strdup(gettext(
return(strdup(gettext_noop(
"Click and move the mouse around to blur the picture.")));
}

7
magic/src/bricks.c
View file

@ -32,7 +32,6 @@
#include <stdio.h>
#include <string.h>
#include <stdlib.h> /* For RAND_MAX */
#include <libintl.h>
#include "tp_magic_api.h"
#include "SDL_image.h"
#include "SDL_mixer.h"
@ -102,16 +101,16 @@ char * bricks_get_name(magic_api * api, int which)
{
/* Both are named "Bricks", at the moment: */
return(strdup(gettext("Bricks")));
return(strdup(gettext_noop("Bricks")));
}
// Return our descriptions, localized:
char * bricks_get_description(magic_api * api, int which)
{
if (which == TOOL_LARGEBRICKS)
return(strdup(gettext("Click and move to draw large bricks.")));
return(strdup(gettext_noop("Click and move to draw large bricks.")));
else if (which == TOOL_SMALLBRICKS)
return(strdup(gettext("Click and move to draw small bricks.")));
return(strdup(gettext_noop("Click and move to draw small bricks.")));
return(NULL);
}

5
magic/src/calligraphy.c
View file

@ -29,7 +29,6 @@
#include <stdio.h>
#include <string.h>
#include <libintl.h>
#include <stdlib.h>
#include "tp_magic_api.h"
#include "SDL_image.h"
@ -106,14 +105,14 @@ SDL_Surface * calligraphy_get_icon(magic_api * api, int which)
// Return our name, localized:
char * calligraphy_get_name(magic_api * api, int which)
{
return(strdup(gettext("Calligraphy")));
return(strdup(gettext_noop("Calligraphy")));
}
// Return our description, localized:
char * calligraphy_get_description(magic_api * api, int which)
{
return(strdup(
gettext("Click and move the mouse around to draw in calligraphy.")));
gettext_noop("Click and move the mouse around to draw in calligraphy.")));
}

5
magic/src/cartoon.c
View file

@ -29,7 +29,6 @@
#include <stdio.h>
#include <string.h>
#include <libintl.h>
#include <stdlib.h>
#include <math.h>
#include "tp_magic_api.h"
@ -78,13 +77,13 @@ SDL_Surface * cartoon_get_icon(magic_api * api, int which)
// Return our names, localized:
char * cartoon_get_name(magic_api * api, int which)
{
return(strdup(gettext("Cartoon")));
return(strdup(gettext_noop("Cartoon")));
}
// Return our descriptions, localized:
char * cartoon_get_description(magic_api * api, int which)
{
return(strdup(gettext(
return(strdup(gettext_noop(
"Click and move the mouse around to turn the picture into a cartoon.")));
}

5
magic/src/distortion.c
View file

@ -32,7 +32,6 @@
#include <stdio.h>
#include <string.h> // For "strdup()"
#include <libintl.h> // For "gettext()"
#include "tp_magic_api.h" // Tux Paint "Magic" tool API header
#include "SDL_image.h" // For IMG_Load(), to load our PNG icon
@ -119,7 +118,7 @@ SDL_Surface * distortion_get_icon(magic_api * api, int which)
char * distortion_get_name(magic_api * api, int which)
{
return(strdup(gettext("Distortion")));
return(strdup(gettext_noop("Distortion")));
}
@ -127,7 +126,7 @@ char * distortion_get_name(magic_api * api, int which)
char * distortion_get_description(magic_api * api, int which)
{
return(strdup(gettext("Click and drag the mouse to cause a distortion in your picture.")));
return(strdup(gettext_noop("Click and drag the mouse to cause a distortion in your picture.")));
}
// Report whether we accept colors

5
magic/src/emboss.c
View file

@ -29,7 +29,6 @@
#include <stdio.h>
#include <string.h>
#include <libintl.h>
#include "tp_magic_api.h"
#include "SDL_image.h"
#include "SDL_mixer.h"
@ -74,13 +73,13 @@ SDL_Surface * emboss_get_icon(magic_api * api, int which)
// Return our names, localized:
char * emboss_get_name(magic_api * api, int which)
{
return(strdup(gettext("Emboss")));
return(strdup(gettext_noop("Emboss")));
}
// Return our descriptions, localized:
char * emboss_get_description(magic_api * api, int which)
{
return(strdup(gettext("Click and drag the mouse to emboss the picture.")));
return(strdup(gettext_noop("Click and drag the mouse to emboss the picture.")));
}
// Do the effect:

9
magic/src/fade_darken.c
View file

@ -29,7 +29,6 @@
#include <stdio.h>
#include <string.h>
#include <libintl.h>
#include "tp_magic_api.h"
#include "SDL_image.h"
#include "SDL_mixer.h"
@ -114,9 +113,9 @@ SDL_Surface * fade_darken_get_icon(magic_api * api, int which)
char * fade_darken_get_name(magic_api * api ATTRIBUTE_UNUSED, int which)
{
if (which == TOOL_FADE)
return(strdup(gettext("Lighten")));
return(strdup(gettext_noop("Lighten")));
else if (which == TOOL_DARKEN)
return(strdup(gettext("Darken")));
return(strdup(gettext_noop("Darken")));
return(NULL);
}
@ -126,10 +125,10 @@ char * fade_darken_get_description(magic_api * api ATTRIBUTE_UNUSED, int which)
{
if (which == TOOL_FADE)
return(strdup(
gettext("Click and move to fade the colors.")));
gettext_noop("Click and move to fade the colors.")));
else if (which == TOOL_DARKEN)
return(strdup(
gettext("Click and move to darken the colors.")));
gettext_noop("Click and move to darken the colors.")));
return(NULL);
}

5
magic/src/fill.c
View file

@ -33,7 +33,6 @@
#include <stdio.h>
#include <string.h>
#include <libintl.h>
#include "tp_magic_api.h"
#include "SDL_image.h"
@ -85,13 +84,13 @@ SDL_Surface * fill_get_icon(magic_api * api, int which)
// Return our names, localized:
char * fill_get_name(magic_api * api, int which)
{
return(strdup(gettext("Fill")));
return(strdup(gettext_noop("Fill")));
}
// Return our descriptions, localized:
char * fill_get_description(magic_api * api, int which)
{
return(strdup(gettext(
return(strdup(gettext_noop(
"Click in the picture to fill that area with color.")));
}

5
magic/src/flower.c
View file

@ -29,7 +29,6 @@
#include <stdio.h>
#include <string.h>
#include <libintl.h>
#include <stdlib.h>
#include "tp_magic_api.h"
#include "SDL_image.h"
@ -122,13 +121,13 @@ SDL_Surface * flower_get_icon(magic_api * api, int which)
// Return our names, localized:
char * flower_get_name(magic_api * api, int which)
{
return(strdup(gettext("Flower")));
return(strdup(gettext_noop("Flower")));
}
// Return our descriptions, localized:
char * flower_get_description(magic_api * api, int which)
{
return(strdup(gettext("Click and drag to draw a flower stalk. Let go to finish the flower.")));
return(strdup(gettext_noop("Click and drag to draw a flower stalk. Let go to finish the flower.")));
}
// Affect the canvas on drag:

5
magic/src/foam.c
View file

@ -29,7 +29,6 @@
#include <stdio.h>
#include <string.h>
#include <libintl.h>
#include <stdlib.h>
#include "tp_magic_api.h"
#include "SDL_image.h"
@ -102,13 +101,13 @@ SDL_Surface * foam_get_icon(magic_api * api, int which)
// Return our names, localized:
char * foam_get_name(magic_api * api, int which)
{
return(strdup(gettext("Foam")));
return(strdup(gettext_noop("Foam")));
}
// Return our descriptions, localized:
char * foam_get_description(magic_api * api, int which)
{
return(strdup(gettext("Click and drag the mouse to cover an area with foamy bubbles.")));
return(strdup(gettext_noop("Click and drag the mouse to cover an area with foamy bubbles.")));
}
// Do the effect:

5
magic/src/glasstile.c
View file

@ -29,7 +29,6 @@
#include <stdio.h>
#include <string.h>
#include <libintl.h>
#include <stdlib.h>
#include "tp_magic_api.h"
#include "SDL_image.h"
@ -81,13 +80,13 @@ SDL_Surface * glasstile_get_icon(magic_api * api, int which)
// Return our names, localized:
char * glasstile_get_name(magic_api * api, int which)
{
return(strdup(gettext("Glass Tile")));
return(strdup(gettext_noop("Glass Tile")));
}
// Return our descriptions, localized:
char * glasstile_get_description(magic_api * api, int which)
{
return(strdup(gettext("Click and drag the mouse to put glass tile over your picture.")));
return(strdup(gettext_noop("Click and drag the mouse to put glass tile over your picture.")));
}
// Do the effect:

5
magic/src/grass.c
View file

@ -31,7 +31,6 @@
#include <stdio.h>
#include <string.h>
#include <stdlib.h> /* for RAND_MAX */
#include <libintl.h>
#include "tp_magic_api.h"
#include "SDL_image.h"
#include "SDL_mixer.h"
@ -90,13 +89,13 @@ SDL_Surface * grass_get_icon(magic_api * api, int which)
// Return our names, localized:
char * grass_get_name(magic_api * api, int which)
{
return(strdup(gettext("Grass")));
return(strdup(gettext_noop("Grass")));
}
// Return our descriptions, localized:
char * grass_get_description(magic_api * api, int which)
{
return(strdup(gettext("Click and move to draw grass. Don’t forget the dirt!")));
return(strdup(gettext_noop("Click and move to draw grass. Don’t forget the dirt!")));
}

5
magic/src/kalidescope.c
View file

@ -29,7 +29,6 @@
#include <stdio.h>
#include <string.h>
#include <libintl.h>
#include "tp_magic_api.h"
#include "SDL_image.h"
#include "SDL_mixer.h"
@ -75,13 +74,13 @@ SDL_Surface * kalidescope_get_icon(magic_api * api, int which)
// Return our names, localized:
char * kalidescope_get_name(magic_api * api, int which)
{
return(strdup(gettext("Kaleidoscope")));
return(strdup(gettext_noop("Kaleidoscope")));
}
// Return our descriptions, localized:
char * kalidescope_get_description(magic_api * api, int which)
{
return(strdup(gettext("Click and drag the mouse to draw with symmetric brushes (a kaleidoscope).")));
return(strdup(gettext_noop("Click and drag the mouse to draw with symmetric brushes (a kaleidoscope).")));
}
// Do the effect:

5
magic/src/light.c
View file

@ -29,7 +29,6 @@
#include <stdio.h>
#include <string.h>
#include <libintl.h>
#include <stdlib.h>
#include "tp_magic_api.h"
#include "SDL_image.h"
@ -82,13 +81,13 @@ SDL_Surface * light_get_icon(magic_api * api, int which)
// Return our names, localized:
char * light_get_name(magic_api * api, int which)
{
return(strdup(gettext("Light")));
return(strdup(gettext_noop("Light")));
}
// Return our descriptions, localized:
char * light_get_description(magic_api * api, int which)
{
return(strdup(gettext("Click and drag to draw a beam of light on your picture.")));
return(strdup(gettext_noop("Click and drag to draw a beam of light on your picture.")));
}
// Do the effect:

5
magic/src/metalpaint.c
View file

@ -29,7 +29,6 @@
#include <stdio.h>
#include <string.h>
#include <libintl.h>
#include "tp_magic_api.h"
#include "SDL_image.h"
#include "SDL_mixer.h"
@ -75,13 +74,13 @@ SDL_Surface * metalpaint_get_icon(magic_api * api, int which)
// Return our names, localized:
char * metalpaint_get_name(magic_api * api, int which)
{
return(strdup(gettext("Metal Paint")));
return(strdup(gettext_noop("Metal Paint")));
}
// Return our descriptions, localized:
char * metalpaint_get_description(magic_api * api, int which)
{
return(strdup(gettext("Click and drag the mouse to paint with a metallic color.")));
return(strdup(gettext_noop("Click and drag the mouse to paint with a metallic color.")));
}
#define METALPAINT_CYCLE 32

9
magic/src/mirror_flip.c
View file

@ -29,7 +29,6 @@
#include <stdio.h>
#include <string.h>
#include <libintl.h>
#include "tp_magic_api.h"
#include "SDL_image.h"
#include "SDL_mixer.h"
@ -92,9 +91,9 @@ SDL_Surface * mirror_flip_get_icon(magic_api * api, int which)
char * mirror_flip_get_name(magic_api * api, int which)
{
if (which == TOOL_MIRROR)
return(strdup(gettext("Mirror")));
return(strdup(gettext_noop("Mirror")));
else if (which == TOOL_FLIP)
return(strdup(gettext("Flip")));
return(strdup(gettext_noop("Flip")));
return(NULL);
}
@ -104,10 +103,10 @@ char * mirror_flip_get_description(magic_api * api, int which)
{
if (which == TOOL_MIRROR)
return(strdup(
gettext("Click to make a mirror image.")));
gettext_noop("Click to make a mirror image.")));
else
return(strdup(
gettext("Click to flip the picture upside-down.")));
gettext_noop("Click to flip the picture upside-down.")));
return(NULL);
}

5
magic/src/negative.c
View file

@ -29,7 +29,6 @@
#include <stdio.h>
#include <string.h>
#include <libintl.h>
#include "tp_magic_api.h"
#include "SDL_image.h"
#include "SDL_mixer.h"
@ -70,14 +69,14 @@ SDL_Surface * negative_get_icon(magic_api * api, int which)
// Return our name, localized:
char * negative_get_name(magic_api * api, int which)
{
return(strdup(gettext("Negative")));
return(strdup(gettext_noop("Negative")));
}
// Return our description, localized:
char * negative_get_description(magic_api * api, int which)
{
return(strdup(
gettext("Click and move the mouse around to draw a negative.")));
gettext_noop("Click and move the mouse around to draw a negative.")));
}
// Callback that does the negative color effect on a circle centered around x,y

5
magic/src/rainbow.c
View file

@ -29,7 +29,6 @@
#include <stdio.h>
#include <string.h>
#include <libintl.h>
#include "tp_magic_api.h"
#include "SDL_image.h"
#include "SDL_mixer.h"
@ -105,14 +104,14 @@ SDL_Surface * rainbow_get_icon(magic_api * api, int which)
// Return our names, localized:
char * rainbow_get_name(magic_api * api, int which)
{
return(strdup(gettext("Rainbow")));
return(strdup(gettext_noop("Rainbow")));
}
// Return our descriptions, localized:
char * rainbow_get_description(magic_api * api, int which)
{
return(strdup(
gettext("You can draw in rainbow colors!")));
gettext_noop("You can draw in rainbow colors!")));
}
// Do the effect:

5
magic/src/ripples.c
View file

@ -29,7 +29,6 @@
#include <stdio.h>
#include <string.h>
#include <libintl.h>
#include "tp_magic_api.h"
#include "SDL_image.h"
#include "SDL_mixer.h"
@ -79,13 +78,13 @@ SDL_Surface * ripples_get_icon(magic_api * api, int which)
// Return our names, localized:
char * ripples_get_name(magic_api * api, int which)
{
return(strdup(gettext("Ripples")));
return(strdup(gettext_noop("Ripples")));
}
// Return our descriptions, localized:
char * ripples_get_description(magic_api * api, int which)
{
return(strdup(gettext("Click to make ripples appear over your picture.")));
return(strdup(gettext_noop("Click to make ripples appear over your picture.")));
}
// Affect the canvas on drag:

5
magic/src/shift.c
View file

@ -29,7 +29,6 @@
#include <stdio.h>
#include <string.h>
#include <libintl.h>
#include "tp_magic_api.h"
#include "SDL_image.h"
#include "SDL_mixer.h"
@ -102,13 +101,13 @@ SDL_Surface * shift_get_icon(magic_api * api ATTRIBUTE_UNUSED, int which ATTRIBU
// Return our names, localized:
char * shift_get_name(magic_api * api ATTRIBUTE_UNUSED, int which ATTRIBUTE_UNUSED)
{
return(strdup(gettext("Shift")));
return(strdup(gettext_noop("Shift")));
}
// Return our descriptions, localized:
char * shift_get_description(magic_api * api ATTRIBUTE_UNUSED, int which ATTRIBUTE_UNUSED)
{
return(strdup(gettext("Click and drag to shift your picture around on the canvas.")));
return(strdup(gettext_noop("Click and drag to shift your picture around on the canvas.")));
}

5
magic/src/smudge.c
View file

@ -30,7 +30,6 @@
#include <stdio.h>
#include <string.h>
#include <libintl.h>
#include "tp_magic_api.h"
#include "SDL_image.h"
#include "SDL_mixer.h"
@ -75,13 +74,13 @@ SDL_Surface * smudge_get_icon(magic_api * api, int which)
// Return our names, localized:
char * smudge_get_name(magic_api * api, int which)
{
return(strdup(gettext("Smudge")));
return(strdup(gettext_noop("Smudge")));
}
// Return our descriptions, localized:
char * smudge_get_description(magic_api * api, int which)
{
return(strdup(gettext(
return(strdup(gettext_noop(
"Click and move the mouse around to smudge the picture.")));
}

5
magic/src/tint.c
View file

@ -29,7 +29,6 @@
#include <stdio.h>
#include <string.h>
#include <libintl.h>
#include "tp_magic_api.h"
#include "SDL_image.h"
#include "SDL_mixer.h"
@ -75,13 +74,13 @@ SDL_Surface * tint_get_icon(magic_api * api, int which)
// Return our names, localized:
char * tint_get_name(magic_api * api, int which)
{
return(strdup(gettext("Tint")));
return(strdup(gettext_noop("Tint")));
}
// Return our descriptions, localized:
char * tint_get_description(magic_api * api, int which)
{
return(strdup(gettext(
return(strdup(gettext_noop(
"Click and move the mouse around to change the picture’s color.")));
}

5
magic/src/waves.c
View file

@ -29,7 +29,6 @@
#include <stdio.h>
#include <string.h>
#include <libintl.h>
#include <math.h>
#include "tp_magic_api.h"
#include "SDL_image.h"
@ -76,13 +75,13 @@ SDL_Surface * waves_get_icon(magic_api * api, int which)
// Return our names, localized:
char * waves_get_name(magic_api * api, int which)
{
return(strdup(gettext("Waves")));
return(strdup(gettext_noop("Waves")));
}
// Return our descriptions, localized:
char * waves_get_description(magic_api * api, int which)
{
return(strdup(gettext("Click to make the picture wavy. Click toward the top for shorter waves, the bottom for taller waves, the left for small waves, and the right for long waves.")));
return(strdup(gettext_noop("Click to make the picture wavy. Click toward the top for shorter waves, the bottom for taller waves, the left for small waves, and the right for long waves.")));
}

5
src/tp_magic_api.h.in
View file

@ -3,7 +3,10 @@
#include "SDL.h"
#include "SDL_mixer.h"
#include "libintl.h"
#ifndef gettext_noop
#define gettext_noop(String) String
#endif
/* min() and max() variable comparisons: */