Commit e028ab98 authored by Bruno Coudoin's avatar Bruno Coudoin

Reworked shapegame code to:

	- load the vertical selector from the skin
	- allow a color_background_skin in the Title xml board files.
	  It display a background around the title text. It avoid text
	  being bigger than the fixed background.


svn path=/branches/gcomprixogoo/; revision=3693
parent fc0254a6
2009-01-26 Bruno coudoin <bruno.coudoin@free.fr>
Reworked shapegame code to:
- load the vertical selector from the skin
- allow a color_background_skin in the Title xml board files.
It display a background around the title text. It avoid text
being bigger than the fixed background.
* boards/skins/gartoon/hand.svg:
* boards/skins/gartoon/skin.xml:
* configure.in:
* src/babymatch-activity/resources/Makefile.am:
* src/babymatch-activity/resources/babymatch/board1_0.xml.in:
* src/babymatch-activity/resources/babymatch/board2_0.xml.in:
* src/babymatch-activity/resources/babymatch/board3_0.xml.in:
* src/babymatch-activity/resources/babymatch/board4_0.xml.in:
* src/babymatch-activity/resources/babymatch/board5_0.xml.in:
* src/babymatch-activity/resources/babymatch/board6_0.xml.in:
* src/babymatch-activity/resources/babymatch/board7_0.xml.in:
* src/babymatch-activity/resources/shapegame/Makefile.am:
* src/babymatch-activity/shapegame.c: (start_board), (end_board),
(add_shape_to_list_of_shapes), (create_title),
(add_xml_shape_to_data):
* src/babyshapes-activity/resources/babyshapes/board5_0.xml.in:
* src/babyshapes-activity/resources/babyshapes/board6_0.xml.in:
* src/babyshapes-activity/resources/babyshapes/board7_0.xml.in:
* src/chronos-activity/resources/chronos/board1_0.xml.in:
* src/chronos-activity/resources/chronos/board4_3.xml.in:
* src/doubleentry-activity/resources/doubleentry/board3_0.xml.in:
* src/imagename-activity/resources/imagename/board1_0.xml.in:
* src/imagename-activity/resources/imagename/board2_0.xml.in:
* src/imagename-activity/resources/imagename/board3_0.xml.in:
* src/imagename-activity/resources/imagename/board4_0.xml.in:
* src/imagename-activity/resources/imagename/board5_0.xml.in:
* src/imagename-activity/resources/imagename/board6_0.xml.in:
* src/imagename-activity/resources/imagename/board7_0.xml.in:
* src/paintings-activity/resources/paintings/board1_0.xml.in:
* src/paintings-activity/resources/paintings/board1_1.xml.in:
* src/paintings-activity/resources/paintings/board1_10.xml.in:
* src/paintings-activity/resources/paintings/board1_11.xml.in:
* src/paintings-activity/resources/paintings/board1_12.xml.in:
* src/paintings-activity/resources/paintings/board1_2.xml.in:
* src/paintings-activity/resources/paintings/board1_3.xml.in:
* src/paintings-activity/resources/paintings/board1_4.xml.in:
* src/paintings-activity/resources/paintings/board1_5.xml.in:
* src/paintings-activity/resources/paintings/board1_6.xml.in:
* src/paintings-activity/resources/paintings/board1_7.xml.in:
* src/paintings-activity/resources/paintings/board1_8.xml.in:
* src/paintings-activity/resources/paintings/board1_9.xml.in:
* src/paintings-activity/resources/paintings/board2_0.xml.in:
* src/paintings-activity/resources/paintings/board2_1.xml.in:
* src/paintings-activity/resources/paintings/board2_2.xml.in:
* src/paintings-activity/resources/paintings/board2_3.xml.in:
* src/paintings-activity/resources/paintings/board3_0.xml.in:
* src/paintings-activity/resources/paintings/board3_1.xml.in:
* src/paintings-activity/resources/paintings/board4_0.xml.in:
* src/paintings-activity/resources/paintings/board5_0.xml.in:
* src/paintings-activity/resources/paintings/board6_0.xml.in:
2009-01-24 Bruno coudoin <bruno.coudoin@free.fr>
Added a gc_set_default_background() api entry.
......
......@@ -7,7 +7,7 @@
<color id="gcompris/text button" rgba="0XFFFFFFFF"/>
<color id="gcompris/content" rgba="0X424243ff"/>
<color id="gcompris/subtitle" rgba="0X424243ff"/>
<color id="gcompris/shadow" rgba="0XFFFFFFFF"/>
<color id="gcompris/shadow" rgba="0X51515180"/>
<color id="gcompris/imageselectbg_left" rgba="0X000000FF"/>
<color id="gcompris/imageselectbg_right" rgba="0XB4B4B4FF"/>
......
......@@ -557,6 +557,7 @@ src/awele-activity/resources/awele/Makefile
src/babymatch-activity/Makefile
src/babymatch-activity/resources/Makefile
src/babymatch-activity/resources/babymatch/Makefile
src/babymatch-activity/resources/shapegame/Makefile
src/babyshapes-activity/Makefile
src/babyshapes-activity/resources/Makefile
src/babyshapes-activity/resources/babyshapes/Makefile
......
SUBDIRS=babymatch
SUBDIRS=babymatch shapegame
<?xml version="1.0" encoding="UTF-8"?>
<ShapeGame>
<Shape name="1" pixmapfile="skin:gcompris-shapelabel.png" type="SHAPE_BACKGROUND"
x="405" y="460" zoomx="1" zoomy="1" position="0"/>
<Title x="394" y="460" justification="GTK_JUSTIFY_CENTER" color_skin="gcompris/text button">
<Title x="394" y="460" justification="GTK_JUSTIFY_CENTER"
color_skin="gcompris/text button"
color_background_skin="gcompris/shadow">
<_name>Drag and Drop the items to make them match</_name>
</Title>
<Shape name="A" pixmapfile="babymatch/light.svg" type="SHAPE_BACKGROUND"
x="194" y="200" zoomx="1" zoomy="1" position="0"/>
<Shape name="D" pixmapfile="babymatch/lamp.svg"
x="194" y="350" zoomx="1" zoomy="1" position="0"/>
<Shape name="B" pixmapfile="babymatch/postcard.svg" type="SHAPE_BACKGROUND"
<Shape name="B" pixmapfile="babymatch/postcard.svg" type="SHAPE_BACKGROUND"
x="394" y="200" zoomx="1" zoomy="1" position="0"/>
<Shape name="E" pixmapfile="babymatch/postpoint.svg"
<Shape name="E" pixmapfile="babymatch/postpoint.svg"
x="394" y="350" zoomx="1" zoomy="1" position="0"/>
<Shape name="M" pixmapfile="babymatch/fishingboat.svg" type="SHAPE_BACKGROUND"
x="594" y="200" zoomx="1" zoomy="1" position="0" />
<Shape name="F" pixmapfile="babymatch/sailingboat.svg"
<Shape name="F" pixmapfile="babymatch/sailingboat.svg"
x="594" y="350" zoomx="1" zoomy="1" position="0"/>
</ShapeGame>
<?xml version="1.0" encoding="UTF-8"?>
<ShapeGame>
<Shape name="1" pixmapfile="skin:gcompris-shapelabel.png" type="SHAPE_BACKGROUND"
x="405" y="460" zoomx="1" zoomy="1" position="0"/>
<Title x="394" y="460" justification="GTK_JUSTIFY_CENTER" color_skin="gcompris/text button">
<Title x="394" y="460" justification="GTK_JUSTIFY_CENTER" color_skin="gcompris/text button" color_background_skin="gcompris/shadow">
<_name>Drag and Drop the items to make them match</_name>
</Title>
<Shape name="A" pixmapfile="babymatch/bottle.svg" type="SHAPE_BACKGROUND"
x="194" y="200" zoomx="1" zoomy="1" position="0"/>
<Shape name="D" pixmapfile="babymatch/glass.svg"
x="194" y="350" zoomx="1" zoomy="1" position="0"/>
<Shape name="B" pixmapfile="babymatch/egg.svg" type="SHAPE_BACKGROUND"
<Shape name="B" pixmapfile="babymatch/egg.svg" type="SHAPE_BACKGROUND"
x="394" y="200" zoomx="1" zoomy="1" position="0"/>
<Shape name="E" pixmapfile="babymatch/eggpot.svg"
<Shape name="E" pixmapfile="babymatch/eggpot.svg"
x="394" y="350" zoomx="1" zoomy="1" position="0"/>
<Shape name="M" pixmapfile="babymatch/flower.svg" type="SHAPE_BACKGROUND"
x="594" y="200" zoomx="1" zoomy="1" position="0" />
<Shape name="F" pixmapfile="babymatch/flowerpot.svg"
<Shape name="F" pixmapfile="babymatch/flowerpot.svg"
x="594" y="350" zoomx="1" zoomy="1" position="0"/>
</ShapeGame>
<?xml version="1.0" encoding="UTF-8"?>
<ShapeGame>
<Shape name="1" pixmapfile="skin:gcompris-shapelabel.png" type="SHAPE_BACKGROUND"
x="405" y="460" zoomx="1" zoomy="1" position="0"/>
<Title x="394" y="460" justification="GTK_JUSTIFY_CENTER" color_skin="gcompris/text button">
<Title x="394" y="460" justification="GTK_JUSTIFY_CENTER" color_skin="gcompris/text button" color_background_skin="gcompris/shadow">
<_name>Drag and Drop the items to make them match</_name>
</Title>
<Shape name="A" pixmapfile="babymatch/fusee.svg" type="SHAPE_BACKGROUND"
x="194" y="200" zoomx="1" zoomy="1" position="0"/>
<Shape name="D" pixmapfile="babymatch/star.svg"
x="194" y="350" zoomx="1" zoomy="1" position="0"/>
<Shape name="B" pixmapfile="babymatch/sofa.svg" type="SHAPE_BACKGROUND"
<Shape name="B" pixmapfile="babymatch/sofa.svg" type="SHAPE_BACKGROUND"
x="394" y="200" zoomx="1" zoomy="1" position="0"/>
<Shape name="E" pixmapfile="babymatch/house.svg"
<Shape name="E" pixmapfile="babymatch/house.svg"
x="394" y="350" zoomx="1" zoomy="1" position="0"/>
<Shape name="M" pixmapfile="babymatch/lighthouse.svg" type="SHAPE_BACKGROUND"
x="594" y="200" zoomx="1" zoomy="1" position="0" />
<Shape name="F" pixmapfile="babymatch/sailingboat.svg"
<Shape name="F" pixmapfile="babymatch/sailingboat.svg"
x="594" y="350" zoomx="1" zoomy="1" position="0"/>
</ShapeGame>
<?xml version="1.0" encoding="UTF-8"?>
<ShapeGame>
<Shape name="1" pixmapfile="skin:gcompris-shapelabel.png" type="SHAPE_BACKGROUND"
x="405" y="460" zoomx="1" zoomy="1" position="0"/>
<Title x="394" y="460" justification="GTK_JUSTIFY_CENTER" color_skin="gcompris/text button">
<Title x="394" y="460" justification="GTK_JUSTIFY_CENTER" color_skin="gcompris/text button" color_background_skin="gcompris/shadow">
<_name>Drag and Drop the items to make them match</_name>
</Title>
<Shape name="A" pixmapfile="babymatch/apple.svg" type="SHAPE_BACKGROUND"
x="194" y="200" zoomx="1" zoomy="1" position="0"/>
<Shape name="D" pixmapfile="babymatch/tree.svg"
x="194" y="350" zoomx="1" zoomy="1" position="0"/>
<Shape name="B" pixmapfile="babymatch/bicycle.svg" type="SHAPE_BACKGROUND"
<Shape name="B" pixmapfile="babymatch/bicycle.svg" type="SHAPE_BACKGROUND"
x="394" y="200" zoomx="1" zoomy="1" position="0"/>
<Shape name="E" pixmapfile="babymatch/car.svg"
<Shape name="E" pixmapfile="babymatch/car.svg"
x="394" y="350" zoomx="1" zoomy="1" position="0"/>
<Shape name="M" pixmapfile="babymatch/carrot.svg" type="SHAPE_BACKGROUND"
x="594" y="200" zoomx="1" zoomy="1" position="0" />
<Shape name="F" pixmapfile="babymatch/rape.svg"
<Shape name="F" pixmapfile="babymatch/rape.svg"
x="594" y="350" zoomx="1" zoomy="1" position="0"/>
</ShapeGame>
<?xml version="1.0" encoding="UTF-8"?>
<ShapeGame>
<Shape name="1" pixmapfile="skin:gcompris-shapelabel.png" type="SHAPE_BACKGROUND"
x="405" y="460" zoomx="1" zoomy="1" position="0"/>
<Title x="394" y="460" justification="GTK_JUSTIFY_CENTER" color_skin="gcompris/text button">
<Title x="394" y="460" justification="GTK_JUSTIFY_CENTER" color_skin="gcompris/text button" color_background_skin="gcompris/shadow">
<_name>Drag and Drop the items to make them match</_name>
</Title>
<Shape name="A" pixmapfile="babymatch/pencil.svg" type="SHAPE_BACKGROUND"
x="194" y="200" zoomx="1" zoomy="1" position="0"/>
<Shape name="D" pixmapfile="babymatch/postcard.svg"
x="194" y="350" zoomx="1" zoomy="1" position="0"/>
<Shape name="B" pixmapfile="babymatch/tuxhelico.svg" type="SHAPE_BACKGROUND"
<Shape name="B" pixmapfile="babymatch/tuxhelico.svg" type="SHAPE_BACKGROUND"
x="394" y="200" zoomx="1" zoomy="1" position="0"/>
<Shape name="E" pixmapfile="babymatch/tuxplane.svg"
<Shape name="E" pixmapfile="babymatch/tuxplane.svg"
x="394" y="350" zoomx="1" zoomy="1" position="0"/>
<Shape name="M" pixmapfile="babymatch/truck.svg" type="SHAPE_BACKGROUND"
x="594" y="200" zoomx="1" zoomy="1" position="0" />
<Shape name="F" pixmapfile="babymatch/minivan.svg"
<Shape name="F" pixmapfile="babymatch/minivan.svg"
x="594" y="350" zoomx="1" zoomy="1" position="0"/>
</ShapeGame>
<?xml version="1.0" encoding="UTF-8"?>
<ShapeGame>
<Shape name="1" pixmapfile="skin:gcompris-shapelabel.png" type="SHAPE_BACKGROUND"
x="405" y="460" zoomx="1" zoomy="1" position="0"/>
<Title x="394" y="460" justification="GTK_JUSTIFY_CENTER" color_skin="gcompris/text button">
<Title x="394" y="460" justification="GTK_JUSTIFY_CENTER" color_skin="gcompris/text button" color_background_skin="gcompris/shadow">
<_name>Drag and Drop the items to make them match</_name>
</Title>
<Shape name="A" pixmapfile="babymatch/castle.svg" type="SHAPE_BACKGROUND"
x="194" y="200" zoomx="1" zoomy="1" position="0"/>
<Shape name="D" pixmapfile="babymatch/crown.svg"
x="194" y="350" zoomx="1" zoomy="1" position="0"/>
<Shape name="B" pixmapfile="babymatch/sailingboat.svg" type="SHAPE_BACKGROUND"
<Shape name="B" pixmapfile="babymatch/sailingboat.svg" type="SHAPE_BACKGROUND"
x="394" y="200" zoomx="1" zoomy="1" position="0"/>
<Shape name="E" pixmapfile="babymatch/windflag5.svg"
<Shape name="E" pixmapfile="babymatch/windflag5.svg"
x="394" y="350" zoomx="1" zoomy="1" position="0"/>
<Shape name="M" pixmapfile="babymatch/raquette.svg" type="SHAPE_BACKGROUND"
x="594" y="200" zoomx="1" zoomy="1" position="0" />
<Shape name="F" pixmapfile="babymatch/football.svg"
<Shape name="F" pixmapfile="babymatch/football.svg"
x="594" y="350" zoomx="1" zoomy="1" position="0"/>
</ShapeGame>
<?xml version="1.0" encoding="UTF-8"?>
<ShapeGame>
<Shape name="1" pixmapfile="skin:gcompris-shapelabel.png" type="SHAPE_BACKGROUND"
x="405" y="460" zoomx="1" zoomy="1" position="0"/>
<Title x="394" y="460" justification="GTK_JUSTIFY_CENTER" color_skin="gcompris/text button">
<Title x="394" y="460" justification="GTK_JUSTIFY_CENTER" color_skin="gcompris/text button" color_background_skin="gcompris/shadow">
<_name>Drag and Drop the items to make them match</_name>
</Title>
<Shape name="A" pixmapfile="babymatch/sun.svg" type="SHAPE_BACKGROUND"
x="194" y="200" zoomx="1" zoomy="1" position="0"/>
<Shape name="D" pixmapfile="babymatch/lamp.svg"
x="194" y="350" zoomx="1" zoomy="1" position="0"/>
<Shape name="B" pixmapfile="babymatch/sound.svg" type="SHAPE_BACKGROUND"
<Shape name="B" pixmapfile="babymatch/sound.svg" type="SHAPE_BACKGROUND"
x="394" y="200" zoomx="1" zoomy="1" position="0"/>
<Shape name="E" pixmapfile="babymatch/bell.svg"
<Shape name="E" pixmapfile="babymatch/bell.svg"
x="394" y="350" zoomx="1" zoomy="1" position="0"/>
<Shape name="M" pixmapfile="babymatch/umbrella.svg" type="SHAPE_BACKGROUND"
x="594" y="200" zoomx="1" zoomy="1" position="0" />
<Shape name="F" pixmapfile="babymatch/lifebuoy.svg"
<Shape name="F" pixmapfile="babymatch/lifebuoy.svg"
x="594" y="350" zoomx="1" zoomy="1" position="0"/>
</ShapeGame>
imgdir = $(pkgdatadir)/@PACKAGE_DATA_DIR@/shapegame
img_DATA = \
hand.svg
EXTRA_DIST = $(img_DATA)
......@@ -116,6 +116,8 @@ static GooCanvasItem *tooltip_bg_item;
/* The continue button */
static GooCanvasItem *continue_root_item;
static GooCanvasItem *selector_item;
static void start_board (GcomprisBoard *agcomprisBoard);
static void pause_board (gboolean pause);
static void end_board (void);
......@@ -141,7 +143,8 @@ static Shape *create_shape(ShapeType type, char *name, char *tooltip,
static gboolean increment_sublevel(void);
static void create_title(char *name, double x, double y,
GtkAnchorType anchor,
guint32 color_rgba);
guint32 color_rgba,
gchar *color_background);
static gint item_event_ok(GooCanvasItem *item, GooCanvasItem *target,
GdkEvent *event,
gchar *data);
......@@ -278,14 +281,19 @@ static void start_board (GcomprisBoard *agcomprisBoard)
if(default_background)
{
gchar *img;
// Default case, load the default background
img = gc_skin_image_get("gcompris-shapebg.jpg");
gc_set_background(goo_canvas_get_root_item(gcomprisBoard->canvas),
img);
g_free(img);
gc_set_default_background(goo_canvas_get_root_item(gcomprisBoard->canvas));
}
// And the vertical selector
selector_item =
goo_canvas_svg_new (goo_canvas_get_root_item(gcomprisBoard->canvas),
gc_skin_rsvg_get(),
"svg-id", "#SELECTOR",
"pointer-events", GOO_CANVAS_EVENTS_NONE,
NULL);
/* FIXME: This no more works ! */
gc_drag_start(goo_canvas_get_root_item(gcomprisBoard->canvas),
(GcDragFunc) item_event_drag, drag_mode);
shapegame_next_level();
......@@ -311,6 +319,11 @@ end_board ()
gc_locale_reset();
}
if (selector_item)
goo_canvas_item_remove(selector_item);
selector_item = NULL;
gcomprisBoard = NULL;
}
......@@ -724,7 +737,7 @@ add_shape_to_list_of_shapes(Shape *shape)
gdk_pixbuf_unref(scale);
// add the hand
hand = gc_skin_pixmap_load("hand.svg");
hand = gc_pixmap_load("shapegame/hand.svg");
h = ICON_HEIGHT/3;
w = gdk_pixbuf_get_width(hand) * h / gdk_pixbuf_get_height(hand);
scale = gdk_pixbuf_scale_simple(hand, w, h, GDK_INTERP_BILINEAR);
......@@ -1359,7 +1372,8 @@ add_shape_to_canvas(Shape *shape)
static void
create_title(char *name, double x, double y,
GtkAnchorType anchor,
guint32 color_rgba)
guint32 color_rgba,
gchar *color_background)
{
GooCanvasItem *item;
......@@ -1370,10 +1384,30 @@ create_title(char *name, double x, double y,
y,
-1,
anchor,
"font", gc_skin_font_board_medium,
"font", gc_skin_font_board_small,
"fill_color_rgba", color_rgba,
NULL);
/* Display a background if a color is provided */
if(color_background) {
guint32 color_background_rgba = gc_skin_get_color(color_background);
GooCanvasBounds bounds;
int gap = 8;
goo_canvas_item_get_bounds (item, &bounds);
goo_canvas_rect_new (shape_root_item,
x - (bounds.x2 - bounds.x1)/2 - gap,
y - (bounds.y2 - bounds.y1)/2 - gap,
bounds.x2 - bounds.x1 + gap*2,
bounds.y2 - bounds.y1 + gap*2,
"stroke_color_rgba", 0xFFFFFFFFL,
"fill_color_rgba", color_background_rgba,
"line-width", (double) 2,
"radius-x", (double) 10,
"radius-y", (double) 10,
NULL);
}
goo_canvas_item_raise(item, NULL);
}
......@@ -1459,6 +1493,7 @@ add_xml_shape_to_data(xmlDocPtr doc, xmlNodePtr xmlnode, GNode * child, GList **
char *locale;
char *color_text;
guint color_rgba;
char *color_background = NULL;
if(/* if the node has no name */
!xmlnode->name ||
......@@ -1472,14 +1507,6 @@ add_xml_shape_to_data(xmlDocPtr doc, xmlNodePtr xmlnode, GNode * child, GList **
return;
pixmapfile = (char *)xmlGetProp(xmlnode, BAD_CAST "pixmapfile");
if(pixmapfile) {
/* If the pixmapfile starts with skin: then get the skin relative image instead */
if(!strncmp(pixmapfile, "skin:", 5)) {
gchar *oldpixmapfile = pixmapfile;
pixmapfile = gc_skin_image_get(oldpixmapfile+5);
g_free(oldpixmapfile);
}
}
targetfile = (char *)xmlGetProp(xmlnode, BAD_CAST "targetfile");
......@@ -1550,6 +1577,10 @@ add_xml_shape_to_data(xmlDocPtr doc, xmlNodePtr xmlnode, GNode * child, GList **
color_rgba = gc_skin_get_color("gcompris/content"); /* the default */
}
/* get the COLOR of the Title Specified by skin reference */
/* Default is NULL */
color_background = (char *)xmlGetProp(xmlnode, BAD_CAST "color_background_skin");
/* get the name and tooltip of the shape */
name = NULL;
tooltip = NULL;
......@@ -1607,7 +1638,8 @@ add_xml_shape_to_data(xmlDocPtr doc, xmlNodePtr xmlnode, GNode * child, GList **
if(name != NULL) {
newname = g_strcompress(name);
create_title(newname, x, y, anchor_gtk, color_rgba);
create_title(newname, x, y, anchor_gtk,
color_rgba, color_background);
g_free(newname);
}
}
......@@ -1616,6 +1648,7 @@ add_xml_shape_to_data(xmlDocPtr doc, xmlNodePtr xmlnode, GNode * child, GList **
g_free(name);
g_free(targetfile);
g_free(tooltip);
xmlFree(color_background);
}
/* parse the doc, add it to our internal structures and to the clist */
......
<?xml version="1.0" encoding="UTF-8"?>
<ShapeGame shadow_enable="0">
<Title x="394" y="495" justification="GTK_JUSTIFY_CENTER">
<Title x="394" y="495" justification="GTK_JUSTIFY_CENTER" color_skin="gcompris/text button"
color_background_skin="gcompris/shadow">
<_name>Hello ! My name is Lock.</_name>
</Title>
<Shape name="A" pixmapfile="babyshapes/dog1/dog1.png" x="259" y="350" zoomx="1" zoomy="1" position="0"/>
......
<?xml version="1.0" encoding="UTF-8"?>
<ShapeGame shadow_enable="0">
<Title x="394" y="495" justification="GTK_JUSTIFY_CENTER">
<Title x="394" y="495" justification="GTK_JUSTIFY_CENTER" color_skin="gcompris/text button"
color_background_skin="gcompris/shadow">
<_name>Lock on the grass.</_name>
</Title>
<Shape name="A" pixmapfile="babyshapes/dog2/dog1.png" x="617" y="130" zoomx="1" zoomy="1" position="0"/>
......
<?xml version="1.0" encoding="UTF-8"?>
<ShapeGame shadow_enable="0">
<Title x="394" y="495" justification="GTK_JUSTIFY_CENTER">
<Title x="394" y="495" justification="GTK_JUSTIFY_CENTER" color_skin="gcompris/text button"
color_background_skin="gcompris/shadow">
<_name>Lock with colored shapes.</_name>
</Title>
<Shape name="A" pixmapfile="babyshapes/dog3/dog1.png" x="568" y="370" zoomx="1" zoomy="1" position="0"/>
......
<?xml version="1.0" encoding="UTF-8"?>
<ShapeGame>
<Title x="600" y="495" justification="GTK_JUSTIFY_CENTER">
<Title x="600" y="495" justification="GTK_JUSTIFY_CENTER"
color_skin="gcompris/text button"
color_background_skin="gcompris/shadow">
<_name>Moonwalker</_name>
</Title>
<Shape name="A" pixmapfile="chronos/1.png" x="230" y="150" zoomx="1" zoomy="1" position="0" sound="chronos/1.ogg"/>
<Title x="250" y="150" justification="GTK_JUSTIFY_CENTER"><name>1</name></Title>
<Title x="250" y="150" justification="GTK_JUSTIFY_CENTER" color_skin="gcompris/text button" color_background_skin="gcompris/shadow"><name>1</name></Title>
<Shape name="B" pixmapfile="chronos/2.png" x="595" y="150" zoomx="1" zoomy="1" position="0" sound="chronos/2.ogg"/>
<Title x="615" y="150" justification="GTK_JUSTIFY_CENTER"><name>2</name></Title>
<Title x="615" y="150" justification="GTK_JUSTIFY_CENTER" color_skin="gcompris/text button" color_background_skin="gcompris/shadow"><name>2</name></Title>
<Shape name="C" pixmapfile="chronos/3.png" x="230" y="375" zoomx="1" zoomy="1" position="0" sound="chronos/3.ogg"/>
<Title x="250" y="375" justification="GTK_JUSTIFY_CENTER"><name>3</name></Title>
<Title x="250" y="375" justification="GTK_JUSTIFY_CENTER" color_skin="gcompris/text button" color_background_skin="gcompris/shadow"><name>3</name></Title>
<Shape name="D" pixmapfile="chronos/4.png" x="595" y="375" zoomx="1" zoomy="1" position="0" sound="chronos/2.ogg"/>
<Title x="615" y="375" justification="GTK_JUSTIFY_CENTER"><name>4</name></Title>
<Title x="615" y="375" justification="GTK_JUSTIFY_CENTER" color_skin="gcompris/text button" color_background_skin="gcompris/shadow"><name>4</name></Title>
<Shape name="1" pixmapfile="chronos/bg.jpg" type="SHAPE_BACKGROUND"
x="425" y="260" zoomx="1" zoomy="1" position="0"/>
</ShapeGame>
......
......@@ -2,26 +2,26 @@
<ShapeGame>
<Title y="500" x="660" justification="GTK_JUSTIFY_CENTER">
<_name>Gardening</_name>
</Title>
<Shape zoomy="1" zoomx="1" y="140" x="230" position="0" pixmapfile="chronos/garden1.png" name="A"/>
<Title y="25" x="220" justification="GTK_JUSTIFY_CENTER">
<name>1</name>
</Title>
<Shape zoomy="1" zoomx="1" y="140" x="595" position="0" pixmapfile="chronos/garden2.png" name="B"/>
<Title y="25" x="590" justification="GTK_JUSTIFY_CENTER">
<name>2</name>
</Title>
<Shape zoomy="1" zoomx="1" y="365" x="230" position="0" pixmapfile="chronos/garden3.png" name="C"/>
<Title y="480" x="220" justification="GTK_JUSTIFY_CENTER">
<name>3</name>
</Title>
<Shape zoomy="1" zoomx="1" y="365" x="595" position="0" pixmapfile="chronos/garden4.png" name="D"/>
<Title y="480" x="590" justification="GTK_JUSTIFY_CENTER">
<name>4</name>
</Title>
</ShapeGame>
\ No newline at end of file
</ShapeGame>
......@@ -2,11 +2,6 @@
<ShapeGame>
<Title y="50" x="150" justification="GTK_JUSTIFY_CENTER">
<_name>Cars</_name>
<name xml:lang="de">Die Automobil</name>
<name xml:lang="es">L' automóvil</name>
<name xml:lang="it">La macchina</name>
<name xml:lang="nl">De auto</name>
<name xml:lang="fr">L'automobile</name>
</Title>
<Shape zoomy="1" zoomx="1" y="276" x="233" position="0" pixmapfile="chronos/renault1899.png" name="G"/>
<Title y="399" x="233" justification="GTK_JUSTIFY_CENTER">
......@@ -20,4 +15,4 @@
<Title y="490" x="580" justification="GTK_JUSTIFY_CENTER">
<_name>1955 Citroën ds 19</_name>
</Title>
</ShapeGame>
\ No newline at end of file
</ShapeGame>
<?xml version="1.0" encoding="UTF-8"?>
<ShapeGame>
<Shape name="1" pixmapfile="skin:gcompris-shapelabel.png" type="SHAPE_BACKGROUND"
x="395" y="490" zoomx="1" zoomy="1" position="0"/>
<Title x="395" y="490" justification="GTK_JUSTIFY_CENTER" color_skin="gcompris/text button">
<Title x="395" y="490" justification="GTK_JUSTIFY_CENTER" color_skin="gcompris/text button" color_background_skin="gcompris/shadow">
<_name>Click on an item and listen to its target position</_name>
</Title>
<Title x="231" y="90" justification="GTK_JUSTIFY_CENTER"><name>1</name></Title>
......
<?xml version="1.0" encoding="UTF-8"?>
<ShapeGame>
<Shape name="1" pixmapfile="skin:gcompris-shapelabel.png" type="SHAPE_BACKGROUND"
x="405" y="490" zoomx="1" zoomy="1" position="0"/>
<Title x="394" y="490" justification="GTK_JUSTIFY_CENTER" color_skin="gcompris/text button">
<Title x="394" y="490" justification="GTK_JUSTIFY_CENTER" color_skin="gcompris/text button" color_background_skin="gcompris/shadow">
<_name>Drag and Drop each item onto its name</_name>
</Title>
<Shape name="E" pixmapfile="imagename/postpoint.png"
<Shape name="E" pixmapfile="imagename/postpoint.png"
x="194" y="90" zoomx="1" zoomy="1" position="0"/>
<Title x="194" y="200" justification="GTK_JUSTIFY_CENTER">
<_name>mail box</_name>
</Title>
<Shape name="F" pixmapfile="imagename/sailingboat.png"
<Shape name="F" pixmapfile="imagename/sailingboat.png"
x="194" y="340" zoomx="1" zoomy="1" position="0"/>
<Title x="194" y="450" justification="GTK_JUSTIFY_CENTER">
<_name>sailing boat</_name>
......
<?xml version="1.0" encoding="UTF-8"?>
<ShapeGame>
<Shape name="1" pixmapfile="skin:gcompris-shapelabel.png" type="SHAPE_BACKGROUND"
x="405" y="490" zoomx="1" zoomy="1" position="0"/>
<Title x="394" y="490" justification="GTK_JUSTIFY_CENTER" color_skin="gcompris/text button">
<Title x="394" y="490" justification="GTK_JUSTIFY_CENTER" color_skin="gcompris/text button" color_background_skin="gcompris/shadow">
<_name>Drag and Drop each item onto its name</_name>
</Title>
<Shape name="A" pixmapfile="imagename/bottle.png"
......@@ -20,7 +18,7 @@
<Title x="394" y="200" justification="GTK_JUSTIFY_CENTER">
<_name>egg</_name>
</Title>
<Shape name="E" pixmapfile="imagename/eggpot.png"
<Shape name="E" pixmapfile="imagename/eggpot.png"
x="394" y="340" zoomx="1" zoomy="1" position="0"/>
<Title x="394" y="450" justification="GTK_JUSTIFY_CENTER">
<_name>eggcup</_name>
......@@ -30,7 +28,7 @@
<Title x="594" y="200" justification="GTK_JUSTIFY_CENTER">
<_name>flower</_name>
</Title>
<Shape name="F" pixmapfile="imagename/flowerpot.png"
<Shape name="F" pixmapfile="imagename/flowerpot.png"
x="594" y="340" zoomx="1" zoomy="1" position="0"/>
<Title x="594" y="450" justification="GTK_JUSTIFY_CENTER">
<_name>vase</_name>
......
<?xml version="1.0" encoding="UTF-8"?>
<ShapeGame>
<Shape name="1" pixmapfile="skin:gcompris-shapelabel.png" type="SHAPE_BACKGROUND"
x="405" y="490" zoomx="1" zoomy="1" position="0"/>
<Title x="394" y="490" justification="GTK_JUSTIFY_CENTER" color_skin="gcompris/text button">
<Title x="394" y="490" justification="GTK_JUSTIFY_CENTER" color_skin="gcompris/text button" color_background_skin="gcompris/shadow">
<_name>Drag and Drop each item onto its name</_name>
</Title>
<Shape name="A" pixmapfile="imagename/fusee.png"
......@@ -20,7 +18,7 @@
<Title x="394" y="200" justification="GTK_JUSTIFY_CENTER">
<_name>sofa</_name>
</Title>
<Shape name="E" pixmapfile="imagename/house.png"
<Shape name="E" pixmapfile="imagename/house.png"
x="394" y="340" zoomx="1" zoomy="1" position="0"/>
<Title x="394" y="450" justification="GTK_JUSTIFY_CENTER">
<_name>house</_name>
......@@ -30,7 +28,7 @@
<Title x="594" y="200" justification="GTK_JUSTIFY_CENTER">
<_name>light house</_name>
</Title>
<Shape name="F" pixmapfile="imagename/sailingboat.png"
<Shape name="F" pixmapfile="imagename/sailingboat.png"
x="594" y="340" zoomx="1" zoomy="1" position="0"/>
<Title x="594" y="450" justification="GTK_JUSTIFY_CENTER">
<_name>sailing boat</_name>
......
<?xml version="1.0" encoding="UTF-8"?>
<ShapeGame>
<Shape name="1" pixmapfile="skin:gcompris-shapelabel.png" type="SHAPE_BACKGROUND"
x="405" y="490" zoomx="1" zoomy="1" position="0"/>
<Title x="394" y="490" justification="GTK_JUSTIFY_CENTER" color_skin="gcompris/text button">
<Title x="394" y="490" justification="GTK_JUSTIFY_CENTER" color_skin="gcompris/text button" color_background_skin="gcompris/shadow">
<_name>Drag and Drop each item onto its name</_name>
</Title>
<Shape name="A" pixmapfile="imagename/apple.png"
......@@ -20,7 +18,7 @@
<Title x="394" y="200" justification="GTK_JUSTIFY_CENTER">
<_name>bicycle</_name>
</Title>
<Shape name="E" pixmapfile="imagename/car.png"
<Shape name="E" pixmapfile="imagename/car.png"
x="394" y="340" zoomx="1" zoomy="1" position="0"/>
<Title x="394" y="450" justification="GTK_JUSTIFY_CENTER">
<_name>car</_name>
......@@ -30,7 +28,7 @@
<Title x="594" y="200" justification="GTK_JUSTIFY_CENTER">
<_name>carrot</_name>
</Title>
<Shape name="F" pixmapfile="imagename/rape.png"
<Shape name="F" pixmapfile="imagename/rape.png"
x="594" y="340" zoomx="1" zoomy="1" position="0"/>
<Title x="594" y="450" justification="GTK_JUSTIFY_CENTER">
<_name>grater</_name>
......
<?xml version="1.0" encoding="UTF-8"?>
<ShapeGame>
<Shape name="1" pixmapfile="skin:gcompris-shapelabel.png" type="SHAPE_BACKGROUND"
x="405" y="490" zoomx="1" zoomy="1" position="0"/>
<Title x="394" y="490" justification="GTK_JUSTIFY_CENTER" color_skin="gcompris/text button">
<Title x="394" y="490" justification="GTK_JUSTIFY_CENTER" color_skin="gcompris/text button" color_background_skin="gcompris/shadow">
<_name>Drag and Drop each item onto its name</_name>
</Title>
<Shape name="A" pixmapfile="imagename/pencil.png"
......
<?xml version="1.0" encoding="UTF-8"?>
<ShapeGame>
<Shape name="1" pixmapfile="skin:gcompris-shapelabel.png" type="SHAPE_BACKGROUND"
x="405" y="490" zoomx="1" zoomy="1" position="0"/>
<Title x="394" y="490" justification="GTK_JUSTIFY_CENTER" color_skin="gcompris/text button">
<Title x="394" y="490" justification="GTK_JUSTIFY_CENTER" color_skin="gcompris/text button" color_background_skin="gcompris/shadow">
<_name>Drag and Drop each item onto its name</_name>
</Title>
<Shape name="A" pixmapfile="imagename/castle.png"
......@@ -20,7 +18,7 @@