gcompris r3677 - in branches/gcomprixogoo: boards/skins/babytoy boards/skins/gartoon src/awele-activity src/bargame-activity src/boards src/connect4-activity src/gcompris src/gnumch-equality-activity src/login-activity src/magic_hat_minus-activity src/maze-activity src/maze-activity/resources/maze src/melody-activity src/railroad-activity src/searace-activity src/sudoku-activity src/traffic-activity
- From: bcoudoin svn gnome org
- To: svn-commits-list gnome org
- Subject: gcompris r3677 - in branches/gcomprixogoo: boards/skins/babytoy boards/skins/gartoon src/awele-activity src/bargame-activity src/boards src/connect4-activity src/gcompris src/gnumch-equality-activity src/login-activity src/magic_hat_minus-activity src/maze-activity src/maze-activity/resources/maze src/melody-activity src/railroad-activity src/searace-activity src/sudoku-activity src/traffic-activity
- Date: Sat, 17 Jan 2009 02:02:40 +0000 (UTC)
Author: bcoudoin
Date: Sat Jan 17 02:02:40 2009
New Revision: 3677
URL: http://svn.gnome.org/viewvc/gcompris?rev=3677&view=rev
Log:
more skin rework
Added:
branches/gcomprixogoo/src/maze-activity/resources/maze/maze-2d-bubble.svg
branches/gcomprixogoo/src/maze-activity/resources/maze/maze-3d-bubble.svg
branches/gcomprixogoo/src/maze-activity/resources/maze/maze-bg.svgz (contents, props changed)
Removed:
branches/gcomprixogoo/boards/skins/babytoy/button_reload.png
branches/gcomprixogoo/boards/skins/babytoy/maze-2d-bubble.png
branches/gcomprixogoo/boards/skins/babytoy/maze-3d-bubble.png
branches/gcomprixogoo/boards/skins/gartoon/button.png
branches/gcomprixogoo/boards/skins/gartoon/button_reload.png
branches/gcomprixogoo/boards/skins/gartoon/button_selected.png
branches/gcomprixogoo/boards/skins/gartoon/button_small.png
branches/gcomprixogoo/boards/skins/gartoon/button_small_selected.png
branches/gcomprixogoo/boards/skins/gartoon/maze-2d-bubble.png
branches/gcomprixogoo/boards/skins/gartoon/maze-3d-bubble.png
branches/gcomprixogoo/src/maze-activity/resources/maze/maze-bg.jpg
Modified:
branches/gcomprixogoo/src/awele-activity/awele.c
branches/gcomprixogoo/src/bargame-activity/bargame.py
branches/gcomprixogoo/src/boards/py-mod-gcompris.c
branches/gcomprixogoo/src/connect4-activity/connect4.py
branches/gcomprixogoo/src/gcompris/bar.c
branches/gcomprixogoo/src/gcompris/gcompris.h
branches/gcomprixogoo/src/gnumch-equality-activity/gnumch.py
branches/gcomprixogoo/src/login-activity/login.py
branches/gcomprixogoo/src/magic_hat_minus-activity/magic_hat.c
branches/gcomprixogoo/src/maze-activity/maze.c
branches/gcomprixogoo/src/maze-activity/resources/maze/Makefile.am
branches/gcomprixogoo/src/melody-activity/melody.py
branches/gcomprixogoo/src/railroad-activity/railroad.c
branches/gcomprixogoo/src/searace-activity/searace.py
branches/gcomprixogoo/src/sudoku-activity/sudoku.py
branches/gcomprixogoo/src/traffic-activity/traffic.c
Modified: branches/gcomprixogoo/src/awele-activity/awele.c
==============================================================================
--- branches/gcomprixogoo/src/awele-activity/awele.c (original)
+++ branches/gcomprixogoo/src/awele-activity/awele.c Sat Jan 17 02:02:40 2009
@@ -141,9 +141,6 @@
if (agcomprisBoard != NULL)
{
- gchar *str;
- GdkPixbuf *pixmap = NULL;
-
gcomprisBoard = agcomprisBoard;
gcomprisBoard->level = 1;
gcomprisBoard->maxlevel = 9;
@@ -151,16 +148,7 @@
gcomprisBoard->number_of_sublevel = 1; /* Go to next level after
* this number of 'play' */
- str = gc_skin_image_get("button_reload.png");
- pixmap = gc_pixmap_load(str);
- g_free(str);
- if(pixmap) {
- gc_bar_set_repeat_icon(pixmap);
- gdk_pixbuf_unref(pixmap);
- gc_bar_set(GC_BAR_LEVEL|GC_BAR_REPEAT_ICON);
- } else {
- gc_bar_set(GC_BAR_LEVEL|GC_BAR_REPEAT);
- }
+ gc_bar_set(GC_BAR_LEVEL|GC_BAR_REPEAT);
gchar *anim_file = "awele/sablier.txt";
animation = gc_anim_load( anim_file );
Modified: branches/gcomprixogoo/src/bargame-activity/bargame.py
==============================================================================
--- branches/gcomprixogoo/src/bargame-activity/bargame.py (original)
+++ branches/gcomprixogoo/src/bargame-activity/bargame.py Sat Jan 17 02:02:40 2009
@@ -75,12 +75,7 @@
def start(self):
# load pixmaps for the ui.
#
- pixmap = gcompris.utils.load_pixmap(gcompris.skin.image_to_skin("button_reload.png"))
- if(pixmap):
- gcompris.bar_set_repeat_icon(pixmap)
- gcompris.bar_set(gcompris.BAR_LEVEL|gcompris.BAR_REPEAT_ICON)
- else:
- gcompris.bar_set(gcompris.BAR_LEVEL|gcompris.BAR_REPEAT)
+ gcompris.bar_set(gcompris.BAR_LEVEL|gcompris.BAR_REPEAT)
gcompris.bar_set_level(self.gcomprisBoard)
gcompris.bar_location(10, -1, 0.7)
Modified: branches/gcomprixogoo/src/boards/py-mod-gcompris.c
==============================================================================
--- branches/gcomprixogoo/src/boards/py-mod-gcompris.c (original)
+++ branches/gcomprixogoo/src/boards/py-mod-gcompris.c Sat Jan 17 02:02:40 2009
@@ -177,15 +177,15 @@
py_gc_bar_set_repeat_icon(PyObject* self, PyObject* args)
{
PyObject* pyObject;
- GdkPixbuf* pixmap;
+ RsvgHandle *svg_handle;
/* Parse arguments */
if(!PyArg_ParseTuple(args, "O:gc_bar_set_repeat_icon", &pyObject))
return NULL;
- pixmap = (GdkPixbuf*) pygobject_get(pyObject);
+ svg_handle = (RsvgHandle*) pygobject_get(pyObject);
/* Call the corresponding C function */
- gc_bar_set_repeat_icon(pixmap);
+ gc_bar_set_repeat_icon(svg_handle);
/* Create and return the result */
Py_INCREF(Py_None);
Modified: branches/gcomprixogoo/src/connect4-activity/connect4.py
==============================================================================
--- branches/gcomprixogoo/src/connect4-activity/connect4.py (original)
+++ branches/gcomprixogoo/src/connect4-activity/connect4.py Sat Jan 17 02:02:40 2009
@@ -72,12 +72,7 @@
# only have to kill it. The canvas deletes all the items it contains automaticaly.
self.rootitem = goocanvas.Group(parent = self.gcomprisBoard.canvas.get_root_item())
- pixmap = gcompris.utils.load_pixmap(gcompris.skin.image_to_skin("button_reload.png"))
- if(pixmap):
- gcompris.bar_set_repeat_icon(pixmap)
- board_bar = board_bar | gcompris.BAR_REPEAT_ICON
- else:
- board_bar = board_bar | gcompris.BAR_REPEAT
+ board_bar = board_bar | gcompris.BAR_REPEAT
gcompris.bar_set(board_bar)
selector = \
Modified: branches/gcomprixogoo/src/gcompris/bar.c
==============================================================================
--- branches/gcomprixogoo/src/gcompris/bar.c (original)
+++ branches/gcomprixogoo/src/gcompris/bar.c Sat Jan 17 02:02:40 2009
@@ -313,13 +313,10 @@
*
* Override the repeat icon to a new one specific to your current board.
* This must be called before calling gc_bar_set with GC_BAR_REPEAT_ICON
- * the given pixmap is not freed.
- *
- * Next call to gc_bar_set with GC_BAR_REPEAT will restore the default icon.
- *
+ * the given svg_handle is not freed.
*/
void
-gc_bar_set_repeat_icon (GdkPixbuf *pixmap)
+gc_bar_set_repeat_icon (RsvgHandle *svg_handle)
{
GooCanvasItem *item;
goo_canvas_item_raise(rootitem, NULL);
@@ -331,7 +328,8 @@
}
g_object_set (item,
- "pixbuf", pixmap,
+ "svg-handle", svg_handle,
+ "svg-id", NULL,
NULL);
}
Modified: branches/gcomprixogoo/src/gcompris/gcompris.h
==============================================================================
--- branches/gcomprixogoo/src/gcompris/gcompris.h (original)
+++ branches/gcomprixogoo/src/gcompris/gcompris.h Sat Jan 17 02:02:40 2009
@@ -90,7 +90,7 @@
RsvgHandle *rsvg_handle,
gchar *id);
void gc_bar_set_level (GcomprisBoard *gcomprisBoard);
-void gc_bar_set_repeat_icon (GdkPixbuf *pixmap);
+void gc_bar_set_repeat_icon (RsvgHandle *svg_handle);
/* Status bar control */
typedef enum
Modified: branches/gcomprixogoo/src/gnumch-equality-activity/gnumch.py
==============================================================================
--- branches/gcomprixogoo/src/gnumch-equality-activity/gnumch.py (original)
+++ branches/gcomprixogoo/src/gnumch-equality-activity/gnumch.py Sat Jan 17 02:02:40 2009
@@ -703,12 +703,7 @@
gcompris.skin.image_to_skin("gcompris-bg.jpg"))
gcompris.bar_set_level(self.board)
- pixmap = gcompris.utils.load_pixmap(gcompris.skin.image_to_skin("button_reload.png"))
- if(pixmap):
- gcompris.bar_set_repeat_icon(pixmap)
- gcompris.bar_set(gcompris.BAR_LEVEL | gcompris.BAR_REPEAT_ICON)
- else:
- gcompris.bar_set(gcompris.BAR_LEVEL | gcompris.BAR_REPEAT)
+ gcompris.bar_set(gcompris.BAR_LEVEL | gcompris.BAR_REPEAT)
# create our rootitem. We put each canvas item here so at the end we only
# need to remove the rootitem
Modified: branches/gcomprixogoo/src/login-activity/login.py
==============================================================================
--- branches/gcomprixogoo/src/login-activity/login.py (original)
+++ branches/gcomprixogoo/src/login-activity/login.py Sat Jan 17 02:02:40 2009
@@ -54,12 +54,7 @@
self.gcomprisBoard.maxlevel=1
self.gcomprisBoard.sublevel=1
self.gcomprisBoard.number_of_sublevel=1
- pixmap = gcompris.utils.load_pixmap(gcompris.skin.image_to_skin("button_reload.png"))
- if(pixmap):
- gcompris.bar_set_repeat_icon(pixmap)
- gcompris.bar_set(gcompris.BAR_REPEAT_ICON)
- else:
- gcompris.bar_set(gcompris.BAR_REPEAT)
+ gcompris.bar_set(gcompris.BAR_REPEAT)
gcompris.bar_set_level(self.gcomprisBoard)
Modified: branches/gcomprixogoo/src/magic_hat_minus-activity/magic_hat.c
==============================================================================
--- branches/gcomprixogoo/src/magic_hat_minus-activity/magic_hat.c (original)
+++ branches/gcomprixogoo/src/magic_hat_minus-activity/magic_hat.c Sat Jan 17 02:02:40 2009
@@ -177,6 +177,7 @@
gcomprisBoard->sublevel = 1;
gcomprisBoard->number_of_sublevel = 1; // Go to next level after this number of 'play'
gc_bar_set(GC_BAR_LEVEL);
+ gc_bar_location(20, -1, 0.7);
if (strcmp(gcomprisBoard->mode, "minus") == 0)
board_mode = MODE_MINUS;
Modified: branches/gcomprixogoo/src/maze-activity/maze.c
==============================================================================
--- branches/gcomprixogoo/src/maze-activity/maze.c (original)
+++ branches/gcomprixogoo/src/maze-activity/maze.c Sat Jan 17 02:02:40 2009
@@ -179,8 +179,6 @@
* =====================================================================*/
static void start_board (GcomprisBoard *agcomprisBoard) {
- GdkPixbuf *pixmap = NULL;
-
if(agcomprisBoard!=NULL) {
gchar *img;
@@ -216,10 +214,11 @@
}
if(!modeIs2D || modeIsInvisible) {
- pixmap = gc_skin_pixmap_load("maze-2d-bubble.png");
- if(pixmap) {
- gc_bar_set_repeat_icon(pixmap);
- gdk_pixbuf_unref(pixmap);
+ RsvgHandle *svg_handle;
+ svg_handle = gc_rsvg_load("maze/maze-2d-bubble.svg");
+ if(svg_handle) {
+ gc_bar_set_repeat_icon(svg_handle);
+ g_object_unref(svg_handle);
gc_bar_set(GC_BAR_LEVEL|GC_BAR_REPEAT_ICON);
} else {
gc_bar_set(GC_BAR_LEVEL|GC_BAR_REPEAT);
@@ -228,6 +227,7 @@
/* 2D Regular mode */
gc_bar_set(GC_BAR_LEVEL);
}
+ gc_bar_location(-1, -1, 0.6);
gamewon = FALSE;
@@ -291,13 +291,9 @@
end=g_random_int()%hoogte;
/* Draw the tux */
- GError *error = NULL;
- RsvgHandle *svg_handle = NULL;
- gchar *filename = gc_file_find_absolute("maze/tux_top_south.svg");
- svg_handle = rsvg_handle_new_from_file (filename, &error);
+ RsvgHandle *svg_handle = gc_rsvg_load("maze/tux_top_south.svg");
tuxitem = goo_canvas_svg_new (tuxgroup, svg_handle,
- NULL);
- g_free(filename);
+ NULL);
g_object_unref (svg_handle);
goo_canvas_item_translate(tuxgroup,
@@ -419,8 +415,6 @@
*
*/
static void repeat () {
- GdkPixbuf *pixmap = NULL;
-
if(modeIsInvisible) {
if(mapActive) {
g_object_set (wallgroup, "visibility", GOO_CANVAS_ITEM_INVISIBLE, NULL);
@@ -439,11 +433,11 @@
return;
if(threeDactive) {
-
- pixmap = gc_skin_pixmap_load("maze-3d-bubble.png");
- if(pixmap) {
- gc_bar_set_repeat_icon(pixmap);
- gdk_pixbuf_unref(pixmap);
+ RsvgHandle *svg_handle;
+ svg_handle = gc_rsvg_load("maze/maze-3d-bubble.svg");
+ if(svg_handle) {
+ gc_bar_set_repeat_icon(svg_handle);
+ g_object_unref(svg_handle);
}
twoDdisplay();
/* Display a warning that you can't move there */
@@ -451,10 +445,11 @@
} else {
- pixmap = gc_skin_pixmap_load("maze-2d-bubble.png");
- if(pixmap) {
- gc_bar_set_repeat_icon(pixmap);
- gdk_pixbuf_unref(pixmap);
+ RsvgHandle *svg_handle;
+ svg_handle = gc_rsvg_load("maze/maze-2d-bubble.svg");
+ if(svg_handle) {
+ gc_bar_set_repeat_icon(svg_handle);
+ g_object_unref(svg_handle);
}
g_object_set (warning_item, "visibility", GOO_CANVAS_ITEM_INVISIBLE, NULL);
threeDdisplay();
@@ -1508,7 +1503,7 @@
{
gc_sound_play_ogg ("sounds/flip.wav", NULL);
gc_set_background(goo_canvas_get_root_item(gcomprisBoard->canvas),
- "maze/maze-bg.jpg");
+ "maze/maze-bg.svgz");
g_object_set (boardRootItem, "visibility",
GOO_CANVAS_ITEM_INVISIBLE, NULL);
threeDactive=TRUE;
Modified: branches/gcomprixogoo/src/maze-activity/resources/maze/Makefile.am
==============================================================================
--- branches/gcomprixogoo/src/maze-activity/resources/maze/Makefile.am (original)
+++ branches/gcomprixogoo/src/maze-activity/resources/maze/Makefile.am Sat Jan 17 02:02:40 2009
@@ -1,7 +1,9 @@
imgdir = $(pkgdatadir)/@PACKAGE_DATA_DIR@/maze
img_DATA = \
door.png \
- maze-bg.jpg \
- tux_top_south.svg
+ maze-bg.svgz \
+ tux_top_south.svg \
+ maze-2d-bubble.svg \
+ maze-3d-bubble.svg
EXTRA_DIST = $(img_DATA)
Added: branches/gcomprixogoo/src/maze-activity/resources/maze/maze-2d-bubble.svg
==============================================================================
--- (empty file)
+++ branches/gcomprixogoo/src/maze-activity/resources/maze/maze-2d-bubble.svg Sat Jan 17 02:02:40 2009
@@ -0,0 +1,93 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+ xmlns:dc="http://purl.org/dc/elements/1.1/";
+ xmlns:cc="http://creativecommons.org/ns#";
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#";
+ xmlns:svg="http://www.w3.org/2000/svg";
+ xmlns="http://www.w3.org/2000/svg";
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd";
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape";
+ width="64"
+ height="64"
+ id="svg2"
+ sodipodi:version="0.32"
+ inkscape:version="0.46"
+ version="1.0"
+ sodipodi:docname="maze-2d-bubble.svg"
+ inkscape:output_extension="org.inkscape.output.svg.inkscape">
+ <defs
+ id="defs4">
+ <inkscape:perspective
+ sodipodi:type="inkscape:persp3d"
+ inkscape:vp_x="0 : 526.18109 : 1"
+ inkscape:vp_y="0 : 1000 : 0"
+ inkscape:vp_z="744.09448 : 526.18109 : 1"
+ inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
+ id="perspective10" />
+ <inkscape:perspective
+ id="perspective2444"
+ inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
+ inkscape:vp_z="744.09448 : 526.18109 : 1"
+ inkscape:vp_y="0 : 1000 : 0"
+ inkscape:vp_x="0 : 526.18109 : 1"
+ sodipodi:type="inkscape:persp3d" />
+ </defs>
+ <sodipodi:namedview
+ id="base"
+ pagecolor="#ffffff"
+ bordercolor="#666666"
+ borderopacity="1.0"
+ inkscape:pageopacity="0.0"
+ inkscape:pageshadow="2"
+ inkscape:zoom="2.8"
+ inkscape:cx="41.121743"
+ inkscape:cy="109.82652"
+ inkscape:document-units="px"
+ inkscape:current-layer="layer1"
+ showgrid="false"
+ showguides="true"
+ inkscape:guide-bbox="true"
+ inkscape:window-width="902"
+ inkscape:window-height="875"
+ inkscape:window-x="349"
+ inkscape:window-y="25">
+ <sodipodi:guide
+ orientation="0,1"
+ position="360.49819,410.12193"
+ id="guide3314" />
+ </sodipodi:namedview>
+ <metadata
+ id="metadata7">
+ <rdf:RDF>
+ <cc:Work
+ rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage"; />
+ </cc:Work>
+ </rdf:RDF>
+ </metadata>
+ <g
+ inkscape:label="Calque 1"
+ inkscape:groupmode="layer"
+ id="layer1"
+ transform="translate(-321.53125,-636.24027)">
+ <g
+ id="g3336"
+ transform="matrix(1.072813,0,0,1.0922667,-23.411652,-64.608834)">
+ <path
+ sodipodi:nodetypes="ccccccccccc"
+ id="rect2478"
+ d="M 325.71558,645.00886 L 343.99681,645.00886 L 344.18187,673.01823 L 359.71046,673.14296 L 359.94936,680.07638 L 337.46144,679.95692 L 337.72828,651.82809 L 333.00734,651.8281 L 333.00207,665.39119 L 325.71558,665.50538 L 325.71558,645.00886 z"
+ style="fill:#2aaf18;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.88885444;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" />
+ <path
+ sodipodi:nodetypes="ccccccccccccccccccccccccccccccccccccccccccccccccccccccccc"
+ id="rect2481"
+ d="M 322.125,641.6465 C 321.80221,641.64652 321.53124,641.91743 321.53125,642.24025 L 321.53125,699.6465 C 321.53125,699.96931 321.80222,700.24023 322.125,700.24025 L 380.59375,700.24025 C 380.91654,700.24027 381.1875,699.96931 381.1875,699.6465 L 381.1875,642.24025 C 381.1875,641.91748 380.91655,641.64651 380.59375,641.6465 L 322.125,641.6465 z M 349.375,644.209 L 365.75,644.30275 L 365.78125,647.81168 L 368.84822,647.8206 L 368.74554,644.32061 L 377,644.5215 C 377.32279,644.5215 377.79463,644.7032 377.79464,645.02596 L 377.73661,667.40543 L 368.84375,667.17775 L 369.04464,651.69114 L 365.87054,651.65989 L 366,672.0215 L 377.71875,672.11525 L 377.96875,694.834 C 377.96875,695.15684 377.69779,695.42778 377.375,695.42775 L 359.96875,695.42775 C 359.64596,695.42776 359.37499,695.15682 359.375,694.834 L 359.375,686.0215 C 359.37501,685.69872 359.64595,685.42778 359.96875,685.42775 L 371.03125,685.42775 L 370.96875,681.834 L 354.625,681.55275 L 354.375,695.55275 C 354.3
75,695.87558 354.13528,696.14653 353.8125,696.1465 L 326.03125,696.1465 C 325.70846,696.14649 325.46874,695.87558 325.46875,695.55275 L 325.46875,686.0215 C 325.46876,685.69872 325.6147,685.86528 325.9375,685.86525 L 340.375,685.92775 L 340.46875,681.5215 L 325.5,681.49025 C 325.1772,681.49024 324.90624,681.25057 324.90625,680.92775 L 324.90625,672.61525 C 324.90626,672.29248 325.17719,672.02153 325.5,672.0215 L 336.71875,672.0215 L 336.71875,653.11525 L 333.65625,653.11525 L 333.65625,666.2715 C 333.65625,666.59434 333.41653,666.86528 333.09375,666.86525 L 324.78125,666.86525 C 324.45846,666.86525 324.21874,666.59432 324.21875,666.2715 L 324.21875,644.2715 L 345.03125,644.24025 L 345.09375,672.0215 L 359.90625,672.0215 L 359.90625,667.5215 L 349.71875,667.5215 L 349.375,644.209 z"
+ style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.89999998;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" />
+ </g>
+ <g
+ id="g2513" />
+ </g>
+</svg>
Added: branches/gcomprixogoo/src/maze-activity/resources/maze/maze-3d-bubble.svg
==============================================================================
--- (empty file)
+++ branches/gcomprixogoo/src/maze-activity/resources/maze/maze-3d-bubble.svg Sat Jan 17 02:02:40 2009
@@ -0,0 +1,125 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+ xmlns:dc="http://purl.org/dc/elements/1.1/";
+ xmlns:cc="http://creativecommons.org/ns#";
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#";
+ xmlns:svg="http://www.w3.org/2000/svg";
+ xmlns="http://www.w3.org/2000/svg";
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd";
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape";
+ width="64"
+ height="64"
+ id="svg2"
+ sodipodi:version="0.32"
+ inkscape:version="0.46"
+ version="1.0"
+ sodipodi:docname="maze-3d-bubble.svg"
+ inkscape:output_extension="org.inkscape.output.svg.inkscape">
+ <defs
+ id="defs4">
+ <inkscape:perspective
+ sodipodi:type="inkscape:persp3d"
+ inkscape:vp_x="0 : 526.18109 : 1"
+ inkscape:vp_y="0 : 1000 : 0"
+ inkscape:vp_z="744.09448 : 526.18109 : 1"
+ inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
+ id="perspective10" />
+ <inkscape:perspective
+ id="perspective2444"
+ inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
+ inkscape:vp_z="744.09448 : 526.18109 : 1"
+ inkscape:vp_y="0 : 1000 : 0"
+ inkscape:vp_x="0 : 526.18109 : 1"
+ sodipodi:type="inkscape:persp3d" />
+ <inkscape:perspective
+ id="perspective3421"
+ inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
+ inkscape:vp_z="744.09448 : 526.18109 : 1"
+ inkscape:vp_y="0 : 1000 : 0"
+ inkscape:vp_x="0 : 526.18109 : 1"
+ sodipodi:type="inkscape:persp3d" />
+ </defs>
+ <sodipodi:namedview
+ id="base"
+ pagecolor="#ffffff"
+ bordercolor="#666666"
+ borderopacity="1.0"
+ inkscape:pageopacity="0.0"
+ inkscape:pageshadow="2"
+ inkscape:zoom="1.4"
+ inkscape:cx="66.560485"
+ inkscape:cy="40.991783"
+ inkscape:document-units="px"
+ inkscape:current-layer="layer1"
+ showgrid="false"
+ showguides="true"
+ inkscape:guide-bbox="true"
+ inkscape:window-width="1109"
+ inkscape:window-height="875"
+ inkscape:window-x="142"
+ inkscape:window-y="25"
+ inkscape:object-nodes="true">
+ <sodipodi:guide
+ orientation="0,1"
+ position="360.49819,410.12193"
+ id="guide3314" />
+ </sodipodi:namedview>
+ <metadata
+ id="metadata7">
+ <rdf:RDF>
+ <cc:Work
+ rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage"; />
+ </cc:Work>
+ </rdf:RDF>
+ </metadata>
+ <g
+ inkscape:label="Calque 1"
+ inkscape:groupmode="layer"
+ id="layer1"
+ transform="translate(-321.53125,-636.24027)">
+ <g
+ id="g2513" />
+ <path
+ sodipodi:type="arc"
+ id="path3437"
+ style="fill:#000000;stroke:none"
+ sodipodi:cx="-364.3884"
+ sodipodi:cy="655.2403"
+ sodipodi:rx="1.5"
+ sodipodi:ry="1.5"
+ d="M -362.8884,655.2403 A 1.5,1.5 0 1 1 -365.8884,655.2403 A 1.5,1.5 0 1 1 -362.8884,655.2403 z" />
+ <g
+ id="g3468"
+ transform="matrix(1.2170472,0,0,1.1262024,13.442252,-82.415196)">
+ <path
+ sodipodi:nodetypes="ccccc"
+ id="rect3453"
+ d="M 261.57818,675.41879 L 296.4843,675.41879 C 298.28186,682.07102 304.75468,689.64939 305.59144,695.06164 L 253.24902,694.91232 L 261.57818,675.41879 z"
+ style="fill:#9b9a9a;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:3;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" />
+ <path
+ sodipodi:nodetypes="ccccc"
+ id="path3427"
+ d="M 254.59881,642.74028 L 254.59881,690.69594 L 260.28125,681.84741 L 260.28125,651.49027 L 254.59881,642.74028 z"
+ style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#000000;stroke-width:2.70000005;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+ <path
+ sodipodi:nodetypes="ccccc"
+ id="path3435"
+ d="M 279.27102,655.32695 L 279.27102,674.19935 L 260.57719,674.19935 L 260.57719,655.29626 L 279.27102,655.32695 z"
+ style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#000000;stroke-width:2.87760663;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+ <path
+ sodipodi:nodetypes="ccccc"
+ id="path3445"
+ d="M 304.3741,642.38313 L 304.3741,690.95455 L 297.78125,681.75812 L 297.85625,651.13312 L 304.3741,642.38313 z"
+ style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#000000;stroke-width:2.70000005;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+ <path
+ sodipodi:nodetypes="ccccc"
+ id="path3447"
+ d="M 279.32464,655.37623 L 279.32464,674.21831 L 297.72715,674.30445 L 297.78125,655.2494 L 279.32464,655.37623 z"
+ style="fill:#2aaf17;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:2.90107107;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+ </g>
+ </g>
+</svg>
Added: branches/gcomprixogoo/src/maze-activity/resources/maze/maze-bg.svgz
==============================================================================
Binary file. No diff available.
Modified: branches/gcomprixogoo/src/melody-activity/melody.py
==============================================================================
--- branches/gcomprixogoo/src/melody-activity/melody.py (original)
+++ branches/gcomprixogoo/src/melody-activity/melody.py Sat Jan 17 02:02:40 2009
@@ -95,13 +95,7 @@
self.maxtheme = len(self.melodylist)-1
self.gcomprisBoard.maxlevel = 9
- #
- pixmap = gcompris.utils.load_pixmap(gcompris.skin.image_to_skin("button_reload.png"))
- if(pixmap):
- gcompris.bar_set_repeat_icon(pixmap)
- gcompris.bar_set(gcompris.BAR_LEVEL|gcompris.BAR_REPEAT_ICON)
- else:
- gcompris.bar_set(gcompris.BAR_LEVEL|gcompris.BAR_REPEAT)
+ gcompris.bar_set(gcompris.BAR_LEVEL|gcompris.BAR_REPEAT)
self.pause(1);
Modified: branches/gcomprixogoo/src/railroad-activity/railroad.c
==============================================================================
--- branches/gcomprixogoo/src/railroad-activity/railroad.c (original)
+++ branches/gcomprixogoo/src/railroad-activity/railroad.c Sat Jan 17 02:02:40 2009
@@ -177,16 +177,7 @@
gcomprisBoard->number_of_sublevel);
- str = gc_skin_image_get("button_reload.png");
- pixmap = gc_pixmap_load(str);
- g_free(str);
- if(pixmap) {
- gc_bar_set_repeat_icon(pixmap);
- gdk_pixbuf_unref(pixmap);
- gc_bar_set(GC_BAR_LEVEL|GC_BAR_REPEAT_ICON);
- } else {
- gc_bar_set(GC_BAR_LEVEL|GC_BAR_REPEAT);
- }
+ gc_bar_set(GC_BAR_LEVEL|GC_BAR_REPEAT);
gc_bar_location(BOARDWIDTH-200, 3, 0.6);
railroad_next_level();
Modified: branches/gcomprixogoo/src/searace-activity/searace.py
==============================================================================
--- branches/gcomprixogoo/src/searace-activity/searace.py (original)
+++ branches/gcomprixogoo/src/searace-activity/searace.py Sat Jan 17 02:02:40 2009
@@ -127,12 +127,7 @@
# And finaly the players boats
self.init_boats()
- pixmap = gcompris.utils.load_pixmap(gcompris.skin.image_to_skin("button_reload.png"))
- if(pixmap):
- gcompris.bar_set_repeat_icon(pixmap)
- gcompris.bar_set(gcompris.BAR_LEVEL|gcompris.BAR_REPEAT_ICON)
- else:
- gcompris.bar_set(gcompris.BAR_LEVEL|gcompris.BAR_REPEAT);
+ gcompris.bar_set(gcompris.BAR_LEVEL|gcompris.BAR_REPEAT);
# The OK Button
Modified: branches/gcomprixogoo/src/sudoku-activity/sudoku.py
==============================================================================
--- branches/gcomprixogoo/src/sudoku-activity/sudoku.py (original)
+++ branches/gcomprixogoo/src/sudoku-activity/sudoku.py Sat Jan 17 02:02:40 2009
@@ -92,12 +92,7 @@
self.gcomprisBoard.maxlevel=len(self.sudoku)
self.gcomprisBoard.sublevel=1
- pixmap = gcompris.utils.load_pixmap(gcompris.skin.image_to_skin("button_reload.png"))
- if(pixmap):
- gcompris.bar_set_repeat_icon(pixmap)
- gcompris.bar_set(gcompris.BAR_LEVEL|gcompris.BAR_REPEAT_ICON)
- else:
- gcompris.bar_set(gcompris.BAR_LEVEL|gcompris.BAR_REPEAT)
+ gcompris.bar_set(gcompris.BAR_LEVEL|gcompris.BAR_REPEAT)
gcompris.set_background(self.gcomprisBoard.canvas.get_root_item(),
gcompris.skin.image_to_skin("gcompris-bg.jpg"))
Modified: branches/gcomprixogoo/src/traffic-activity/traffic.c
==============================================================================
--- branches/gcomprixogoo/src/traffic-activity/traffic.c (original)
+++ branches/gcomprixogoo/src/traffic-activity/traffic.c Sat Jan 17 02:02:40 2009
@@ -154,9 +154,6 @@
*/
static void start_board (GcomprisBoard *agcomprisBoard)
{
- GdkPixbuf *pixmap = NULL;
- char *str;
-
if(agcomprisBoard!=NULL)
{
gcomprisBoard=agcomprisBoard;
@@ -169,16 +166,7 @@
BOARDHEIGHT - 70,
gcomprisBoard->number_of_sublevel);
- str = gc_skin_image_get("button_reload.png");
- pixmap = gc_pixmap_load(str);
- g_free(str);
- if(pixmap) {
- gc_bar_set_repeat_icon(pixmap);
- gdk_pixbuf_unref(pixmap);
- gc_bar_set(GC_BAR_LEVEL|GC_BAR_REPEAT_ICON);
- } else {
- gc_bar_set(GC_BAR_LEVEL|GC_BAR_REPEAT);
- }
+ gc_bar_set(GC_BAR_LEVEL|GC_BAR_REPEAT);
gc_set_background(goo_canvas_get_root_item(gcomprisBoard->canvas),
"traffic/traffic-bg.jpg");
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
