diff options
| author | Bruno Coudoin <bcoudoin@src.gnome.org> | 2005-10-06 23:03:39 (GMT) |
|---|---|---|
| committer | Bruno Coudoin <bcoudoin@src.gnome.org> | 2005-10-06 23:03:39 (GMT) |
| commit | 88afb2e49615ae6ad6c4023981eb5e2e0a9e45c3 (patch) | |
| tree | 0655f0dd7b8e1f6e56d7a829f910c85d5139b3fa | |
| parent | 112a739cc8e00f35de3815ad5a4e30aa29472a72 (diff) | |
Improved gcompris2spip to include url_propre create for gnuedu project
Fixed image reference in hanoi_real (was broken on windows only)
| -rw-r--r-- | ChangeLog | 13 | ||||
| -rw-r--r-- | docs/spip_menuboard.xsl | 2 | ||||
| -rw-r--r-- | docs/spip_oneboard.xsl | 1 | ||||
| -rw-r--r-- | src/boards/hanoi_real.c | 6 |
4 files changed, 15 insertions, 7 deletions
@@ -1,7 +1,16 @@ -2005-10-05 Bruno coudoin <bruno.coudoin@free.fr> +2005-10-07 Bruno coudoin <bruno.coudoin@free.fr> reviewed by: <delete if not using a buddy> + * docs/spip_menuboard.xsl: + * src/boards/hanoi_real.c: (hanoi_create_item): + +2005-10-05 Bruno coudoin <bruno.coudoin@free.fr> + + New image set for the bar game from Franck. + Now we have a different image set by level that show up + the difficulty increase. + * .cvsignore: * boards/images/README: * boards/images/school_bg1.jpg: @@ -16,7 +25,7 @@ 2005-10-05 Yves Combe <yves@ycombe.net> - reviewed by: fix stupid bug, causing crash in memory_tux in edubuntu. + Fix stupid bug, causing crash in memory_tux in edubuntu. * src/boards/memory.c: (start_board), (memory_next_level), (create_item): diff --git a/docs/spip_menuboard.xsl b/docs/spip_menuboard.xsl index 50a5b13..3a815e7 100644 --- a/docs/spip_menuboard.xsl +++ b/docs/spip_menuboard.xsl @@ -42,7 +42,7 @@ <soustitre>__REMOVEME__</soustitre> <descriptif>__REMOVEME__</descriptif> <chapo>__REMOVEME__</chapo> - <url_propre>__REMOVEME__</url_propre> + <url_propre><xsl:value-of select="$language"/><xsl:value-of select="$section"/></url_propre> <ps>__REMOVEME__</ps> <xsl:for-each select="GComprisBoards/GCompris/Board[@name=$name]"> diff --git a/docs/spip_oneboard.xsl b/docs/spip_oneboard.xsl index 18c1fc9..549b45b 100644 --- a/docs/spip_oneboard.xsl +++ b/docs/spip_oneboard.xsl @@ -35,6 +35,7 @@ <id_trad><xsl:value-of select="$traduction_id"/></id_trad> <nom_site>__REMOVEME__</nom_site> <url_site>__REMOVEME__</url_site> + <url_propre><xsl:value-of select="$language"/><xsl:value-of select="$section"/>/<xsl:value-of select="$name"/></url_propre> <extra>__REMOVEME__</extra> <idx>1</idx> <id_version>0</id_version> diff --git a/src/boards/hanoi_real.c b/src/boards/hanoi_real.c index 626f580..12f3d28 100644 --- a/src/boards/hanoi_real.c +++ b/src/boards/hanoi_real.c @@ -351,8 +351,7 @@ static GnomeCanvasItem *hanoi_create_item(GnomeCanvasGroup *parent) } /* The disc support */ - filename = g_strdup_printf("%s/%s.png", PACKAGE_DATA_DIR, "images/disc_support"); - pixmap = gcompris_load_pixmap (filename); + pixmap = gcompris_load_pixmap ("images/disc_support.png"); item = gnome_canvas_item_new (boardRootItem, gnome_canvas_pixbuf_get_type (), @@ -362,7 +361,6 @@ static GnomeCanvasItem *hanoi_create_item(GnomeCanvasGroup *parent) "anchor", GTK_ANCHOR_CENTER, NULL); - g_free(filename); gdk_pixbuf_unref(pixmap); @@ -374,7 +372,7 @@ static GnomeCanvasItem *hanoi_create_item(GnomeCanvasGroup *parent) if(position[i][j]->width != -1) { - filename = g_strdup_printf("%s/%s%d.png", PACKAGE_DATA_DIR, "images/disc", j+1); + filename = g_strdup_printf("%s%d.png", "images/disc", j+1); pixmap = gcompris_load_pixmap (filename); item = gnome_canvas_item_new (boardRootItem, |