Commit 29f27bc1 authored by Yves Combe's avatar Yves Combe

add africa card in geography fix atof bug in geography

* add africa card in geography
* fix atof bug in geography
parent 29deba8b
2005-06-20 Yves Combe <yves@ycombe.net>
* add africa card in geography
* fix atof bug in geography
2005-06-16 Yves Combe <yves@ycombe.net>
* Preparation of cairo integration (compilation errors)
......
......@@ -81,9 +81,6 @@ faut vider le tampon du clavier au d
- dans le tableau des correspondances :
+ si on valide le tableau et que les correspondances sont mauvaises,
on n'a pas de message d'erreur comme dans les autres tableaux
+ après ça, si tu laches un objet sur un autre déja posé (pour
écahnger, donc), ce dernier disparait du tableau (sournoisement me
dit-on ;)
......@@ -111,12 +108,13 @@ in this profile. No passwords are managed.
gcompris_edit, gcompris_edit is deleted).
- There is always at least one profile ('default' by default).
The trace mecanism includes the profil (default is none selected) andhe gcompris kids name instead of the unix user name if available.
The trace mecanism includes the profil (default is none selected) and
the gcompris kids name instead of the unix user name if available.
when gcompris -e is run, if an activities is editable, the edit button
in the gcompris bar will apprear.
Each activity is in charge of editing its content. it's content is
always savedn .gcompris/activities_data/<activity_name>/<profile>/<board specific
always saved in .gcompris/activities_data/<activity_name>/<profile>/<board specific
here>
GCompris core provides facilities to the edition. The first facility to
be implemented is to edit text. in the api, we provideompris_edit("some explanation", validator_callback).
......
<?xml version="1.0" encoding="UTF-8"?>
<ShapeGame>
<Title x="200" y="45" justification="GTK_JUSTIFY_CENTER">
<_name>Regions of France</_name>
<Title x="190" y="500" justification="GTK_JUSTIFY_CENTER">
<_name>North of Africa</_name>
</Title>
<Shape name="A" pixmapfile="geography/france_region/alsace.png" sound="france_region/alsace" x="585" y="149" zoomx="0.660000" zoomy="0.660000" position="0">
<tooltip>Alsace</tooltip>
<Shape name="A" pixmapfile="geography/africa/algeria.png" sound="africa/algeria" x="286" y="150" position="0">
<tooltip>Algeria</tooltip>
</Shape>
<Shape name="B" pixmapfile="geography/france_region/aquitaine.png" sound="france_region/aquitaine" x="317" y="371" zoomx="0.660000" zoomy="0.660000" position="0">
<tooltip>Aquitaine</tooltip>
<Shape name="B" pixmapfile="geography/africa/benin.png" sound="africa/benin" x="275" y="341" position="0">
<tooltip>Benin</tooltip>
</Shape>
<Shape name="C" pixmapfile="geography/africa/burkina_faso.png" sound="africa/burkina_faso" x="236" y="310" position="0">
<tooltip>Burkina Faso</tooltip>
</Shape>
<Shape name="D" pixmapfile="geography/africa/cameroon.png" sound="africa/cameroon" x="383" y="377" position="0">
<tooltip>Cameroon</tooltip>
</Shape>
<Shape name="E" pixmapfile="geography/africa/central_african_republic.png" sound="africa/central_african_republic" x="465" y="370" position="0">
<tooltip>Central African Republic</tooltip>
</Shape>
<Shape name="F" pixmapfile="geography/africa/chad.png" sound="africa/chad" x="446" y="281" position="0">
<tooltip>Chad</tooltip>
</Shape>
<Shape name="G" pixmapfile="geography/africa/djibouti.png" sound="africa/djibouti" x="684" y="324" position="0">
<tooltip>Djibouti</tooltip>
</Shape>
<Shape name="H" pixmapfile="geography/africa/egypt.png" sound="africa/egypt" x="559" y="164" position="0">
<tooltip>Egypt</tooltip>
</Shape>
<Shape name="I" pixmapfile="geography/africa/equatorial_guinea.png" sound="africa/equatorial_guinea" x="373" y="436" position="0">
<tooltip>Equatorial Guinea</tooltip>
</Shape>
<Shape name="J" pixmapfile="geography/africa/ethiopia.png" sound="africa/ethiopia" x="662" y="338" position="0">
<tooltip>Ethiopia</tooltip>
</Shape>
<Shape name="K" pixmapfile="geography/africa/gabon.png" sound="africa/gabon" x="388" y="462" position="0">
<tooltip>Gabon</tooltip>
</Shape>
<Shape name="L" pixmapfile="geography/africa/ganbia.png" sound="africa/ganbia" x="101" y="290" position="0">
<tooltip>Ganbia</tooltip>
</Shape>
<Shape name="C" pixmapfile="geography/france_region/auvergne.png" sound="france_region/auvergne" x="443" y="293" zoomx="0.660000" zoomy="0.660000" position="0">
<tooltip>Auvergne</tooltip>
<Shape name="M" pixmapfile="geography/africa/ghana.png" sound="africa/ghana" x="237" y="355" position="0">
<tooltip>Ghana</tooltip>
</Shape>
<Shape name="D" pixmapfile="geography/france_region/basse-normandie.png" sound="france_region/basse-normandie" x="315" y="115" zoomx="0.660000" zoomy="0.660000" position="0">
<tooltip>Basse Normandie</tooltip>
<Shape name="N" pixmapfile="geography/africa/guinea_bissau.png" sound="africa/guinea_bissau" x="103" y="306" position="0">
<tooltip>Guinea Bissau</tooltip>
</Shape>
<Shape name="E" pixmapfile="geography/france_region/bourgogne.png" sound="france_region/bourgogne" x="473" y="207" zoomx="0.660000" zoomy="0.660000" position="0">
<tooltip>Bourgogne</tooltip>
<Shape name="O" pixmapfile="geography/africa/guinea.png" sound="africa/guinea" x="137" y="325" position="0">
<tooltip>Guinea</tooltip>
</Shape>
<Shape name="F" pixmapfile="geography/france_region/bretagne.png" sound="france_region/bretagne" x="226" y="158" zoomx="0.660000" zoomy="0.660000" position="0">
<tooltip>Bretagne</tooltip>
<Shape name="P" pixmapfile="geography/africa/ivory_coast.png" sound="africa/ivory_coast" x="192" y="356" position="0">
<tooltip>Ivory Coast</tooltip>
</Shape>
<Shape name="G" pixmapfile="geography/france_region/centre.png" sound="france_region/centre" x="383" y="188" zoomx="0.660000" zoomy="0.660000" position="0">
<tooltip>Centre</tooltip>
<Shape name="Q" pixmapfile="geography/africa/liberia.png" sound="africa/liberia" x="152" y="366" position="0">
<tooltip>Liberia</tooltip>
</Shape>
<Shape name="H" pixmapfile="geography/france_region/champagne-ardenne.png" sound="france_region/champagne-ardenne" x="487" y="120" zoomx="0.660000" zoomy="0.660000" position="0">
<tooltip>Champagne Ardenne</tooltip>
<Shape name="R" pixmapfile="geography/africa/libya.png" sound="africa/libya" x="432" y="173" position="0">
<tooltip>Libya</tooltip>
</Shape>
<Shape name="I" pixmapfile="geography/france_region/corse.png" sound="france_region/corse" x="662" y="472" zoomx="0.660000" zoomy="0.660000" position="0">
<tooltip>Corse</tooltip>
<Shape name="S" pixmapfile="geography/africa/mali.png" sound="africa/mali" x="219" y="250" position="0">
<tooltip>Mali</tooltip>
</Shape>
<Shape name="J" pixmapfile="geography/france_region/franche-conte.png" sound="france_region/franche-conte" x="542" y="212" zoomx="0.660000" zoomy="0.660000" position="0">
<tooltip>Franche Conté</tooltip>
<Shape name="T" pixmapfile="geography/africa/mauritania.png" sound="africa/mauritania" x="161" y="211" position="0">
<tooltip>Mauritania</tooltip>
</Shape>
<Shape name="K" pixmapfile="geography/france_region/haute-normandie.png" sound="france_region/haute-normandie" x="363" y="95" zoomx="0.660000" zoomy="0.660000" position="0">
<tooltip>Normandie</tooltip>
<Shape name="U" pixmapfile="geography/africa/moroco.png" sound="africa/moroco" x="212" y="101" position="0">
<tooltip>Moroco</tooltip>
</Shape>
<Shape name="L" pixmapfile="geography/france_region/ile-de-france.png" sound="france_region/ile-de-france" x="415" y="132" zoomx="0.660000" zoomy="0.660000" position="0">
<tooltip>Ile de France</tooltip>
<Shape name="V" pixmapfile="geography/africa/nigeria.png" sound="africa/nigeria" x="341" y="344" position="0">
<tooltip>Nigeria</tooltip>
</Shape>
<Shape name="M" pixmapfile="geography/france_region/languedoc-roussillon.png" sound="france_region/languedoc-roussillon" x="443" y="404" zoomx="0.660000" zoomy="0.660000" position="0">
<tooltip>Languedoc Roussillon</tooltip>
<Shape name="W" pixmapfile="geography/africa/niger.png" sound="africa/niger" x="338" y="256" position="0">
<tooltip>Niger</tooltip>
</Shape>
<Shape name="N" pixmapfile="geography/france_region/limousin.png" sound="france_region/limousin" x="384" y="294" zoomx="0.660000" zoomy="0.660000" position="0">
<tooltip>Limousin</tooltip>
<Shape name="X" pixmapfile="geography/africa/rwanda.png" sound="africa/rwanda" x="565" y="474" position="0">
<tooltip>Rwanda</tooltip>
</Shape>
<Shape name="O" pixmapfile="geography/france_region/lorraine.png" sound="france_region/lorraine" x="540" y="127" zoomx="0.660000" zoomy="0.660000" position="0">
<tooltip>Lorraine</tooltip>
<Shape name="Y" pixmapfile="geography/africa/senegal.png" sound="africa/senegal" x="106" y="277" position="0">
<tooltip>Senegal</tooltip>
</Shape>
<Shape name="P" pixmapfile="geography/france_region/midi-pyrenees.png" sound="france_region/midi-pyrenees" x="380" y="396" zoomx="0.660000" zoomy="0.660000" position="0">
<tooltip>Midi Pyrénées</tooltip>
<Shape name="Z" pixmapfile="geography/africa/sierra_leone.png" sound="africa/sierra_leone" x="133" y="340" position="0">
<tooltip>Sierra Leone</tooltip>
</Shape>
<Shape name="Q" pixmapfile="geography/france_region/nord-pas-de-calais.png" sound="france_region/nord-pas-de-calais" x="427" y="33" zoomx="0.660000" zoomy="0.660000" position="0">
<tooltip>Nord Pas de Calais</tooltip>
<Shape name="AA" pixmapfile="geography/africa/somalia.png" sound="africa/somalia" x="720" y="396" position="0">
<tooltip>Somalia</tooltip>
</Shape>
<Shape name="R" pixmapfile="geography/france_region/pays-de-la-loire.png" sound="france_region/pays-de-la-loire" x="300" y="199" zoomx="0.660000" zoomy="0.660000" position="0">
<tooltip>Pays de la Loire</tooltip>
<Shape name="AB" pixmapfile="geography/africa/sudan.png" sound="africa/sudan" x="557" y="306" position="0">
<tooltip>Sudan</tooltip>
</Shape>
<Shape name="S" pixmapfile="geography/france_region/picardie.png" sound="france_region/picardie" x="424" y="83" zoomx="0.660000" zoomy="0.660000" position="0">
<tooltip>Picardie</tooltip>
<Shape name="AC" pixmapfile="geography/africa/togo.png" sound="africa/togo" x="258" y="348" position="0">
<tooltip>Togo</tooltip>
</Shape>
<Shape name="T" pixmapfile="geography/france_region/poitou-charentes.png" sound="france_region/poitou-charentes" x="321" y="269" zoomx="0.660000" zoomy="0.660000" position="0">
<tooltip>Poitou Charentes</tooltip>
<Shape name="AD" pixmapfile="geography/africa/tunisia.png" sound="africa/tunisia" x="367" y="92" position="0">
<tooltip>Tunisia</tooltip>
</Shape>
<Shape name="U" pixmapfile="geography/france_region/provence-alpes-cote_d_azur.png" sound="france_region/provence-alpes-cote_d_azur" x="543" y="379" zoomx="0.660000" zoomy="0.660000" position="0">
<tooltip>Provence Alpes Côte d'Azur</tooltip>
<Shape name="AE" pixmapfile="geography/africa/uganda.png" sound="africa/uganda" x="587" y="436" position="0">
<tooltip>Uganda</tooltip>
</Shape>
<Shape name="V" pixmapfile="geography/france_region/rhone-alpes.png" sound="france_region/rhone-alpes" x="520" y="312" zoomx="0.660000" zoomy="0.660000" position="0">
<tooltip>Rhône Alpes</tooltip>
<Shape name="AF" pixmapfile="geography/africa/western_sahara.png" sound="africa/western_sahara" x="148" y="170" position="0">
<tooltip>Western Sahara</tooltip>
</Shape>
<Shape name="1" pixmapfile="geography/france_region/france-regions.png" type="SHAPE_BACKGROUND" sound="Undefined" x="420" y="260" zoomx="0.660000" zoomy="0.660000" position="0"/>
<Shape name="1" pixmapfile="geography/africa/north_africa.png" type="SHAPE_BACKGROUND" sound="Undefined" x="420" y="260" position="0"/>
</ShapeGame>
<?xml version="1.0" encoding="UTF-8"?>
<ShapeGame>
<Title x="190" y="500" justification="GTK_JUSTIFY_CENTER">
<_name>South of Africa</_name>
</Title>
<Shape name="A" pixmapfile="geography/africa/angola.png" sound="africa/angola" x="327" y="210" position="0">
<tooltip>Angola</tooltip>
</Shape>
<Shape name="C" pixmapfile="geography/africa/botswana.png" sound="africa/botswana" x="388" y="317" position="0">
<tooltip>Botswana</tooltip>
</Shape>
<Shape name="D" pixmapfile="geography/africa/burundi.png" sound="africa/burundi" x="444" y="137" position="0">
<tooltip>Burundi</tooltip>
</Shape>
<Shape name="E" pixmapfile="geography/africa/democratic_republic_of_congo.png" sound="africa/democratic_republic_of_congo" x="364" y="136" position="0">
<tooltip>Democratic Republic of Congo</tooltip>
</Shape>
<Shape name="F" pixmapfile="geography/africa/equatorial_guinea.png" sound="africa/equatorial_guinea" x="253" y="82" position="0">
<tooltip>Equatorial Guinea</tooltip>
</Shape>
<Shape name="G" pixmapfile="geography/africa/gabon.png" sound="africa/gabon" x="266" y="108" position="0">
<tooltip>Gabon</tooltip>
</Shape>
<Shape name="H" pixmapfile="geography/africa/kenya.png" sound="africa/kenya" x="521" y="93" position="0">
<tooltip>Kenya</tooltip>
</Shape>
<Shape name="I" pixmapfile="geography/africa/lesotho.png" sound="africa/lesotho" x="424" y="385" position="0">
<tooltip>Lesotho</tooltip>
</Shape>
<Shape name="J" pixmapfile="geography/africa/madagascar.png" sound="africa/madagascar" x="596" y="287" position="0">
<tooltip>Madagascar</tooltip>
</Shape>
<Shape name="K" pixmapfile="geography/africa/malawi.png" sound="africa/malawi" x="482" y="231" position="0">
<tooltip>Malawi</tooltip>
</Shape>
<Shape name="L" pixmapfile="geography/africa/mozambique.png" sound="africa/mozambique" x="493" y="283" position="0">
<tooltip>Mozambique</tooltip>
</Shape>
<Shape name="M" pixmapfile="geography/africa/namibia.png" sound="africa/namibia" x="328" y="319" position="0">
<tooltip>Namibia</tooltip>
</Shape>
<Shape name="N" pixmapfile="geography/africa/republic_of_congo.png" sound="africa/republic_of_congo" x="296" y="100" position="0">
<tooltip>Republic of Congo</tooltip>
</Shape>
<Shape name="O" pixmapfile="geography/africa/rwanda.png" sound="africa/rwanda" x="445" y="120" position="0">
<tooltip>Rwanda</tooltip>
</Shape>
<Shape name="P" pixmapfile="geography/africa/south_africa.png" sound="africa/south_africa" x="391" y="375" position="0">
<tooltip>South Africa</tooltip>
</Shape>
<Shape name="Q" pixmapfile="geography/africa/swaziland.png" sound="africa/swaziland" x="447" y="357" position="0">
<tooltip>Swaziland</tooltip>
</Shape>
<Shape name="R" pixmapfile="geography/africa/tanzania.png" sound="africa/tanzania" x="492" y="161" position="0">
<tooltip>Tanzania</tooltip>
</Shape>
<Shape name="S" pixmapfile="geography/africa/uganda.png" sound="africa/uganda" x="465" y="83" position="0">
<tooltip>Uganda</tooltip>
</Shape>
<Shape name="T" pixmapfile="geography/africa/zambia.png" sound="africa/zambia" x="420" y="227" position="0">
<tooltip>Zambia</tooltip>
</Shape>
<Shape name="U" pixmapfile="geography/africa/zimbabwe.png" sound="africa/zimbabwe" x="427" y="284" position="0">
<tooltip>Zimbabwe</tooltip>
</Shape>
<Shape name="1" pixmapfile="geography/africa/all_south_africa.png" type="SHAPE_BACKGROUND" sound="Undefined" x="420" y="260" position="0"/>
</ShapeGame>
<?xml version="1.0" encoding="UTF-8"?>
<ShapeGame>
<Title x="200" y="45" justification="GTK_JUSTIFY_CENTER">
<_name>Regions of France</_name>
</Title>
<Shape name="A" pixmapfile="geography/france_region/alsace.png" sound="france_region/alsace" x="585" y="149" zoomx="0.660000" zoomy="0.660000" position="0">
<tooltip>Alsace</tooltip>
</Shape>
<Shape name="B" pixmapfile="geography/france_region/aquitaine.png" sound="france_region/aquitaine" x="317" y="371" zoomx="0.660000" zoomy="0.660000" position="0">
<tooltip>Aquitaine</tooltip>
</Shape>
<Shape name="C" pixmapfile="geography/france_region/auvergne.png" sound="france_region/auvergne" x="443" y="293" zoomx="0.660000" zoomy="0.660000" position="0">
<tooltip>Auvergne</tooltip>
</Shape>
<Shape name="D" pixmapfile="geography/france_region/basse-normandie.png" sound="france_region/basse-normandie" x="315" y="115" zoomx="0.660000" zoomy="0.660000" position="0">
<tooltip>Basse Normandie</tooltip>
</Shape>
<Shape name="E" pixmapfile="geography/france_region/bourgogne.png" sound="france_region/bourgogne" x="473" y="207" zoomx="0.660000" zoomy="0.660000" position="0">
<tooltip>Bourgogne</tooltip>
</Shape>
<Shape name="F" pixmapfile="geography/france_region/bretagne.png" sound="france_region/bretagne" x="226" y="158" zoomx="0.660000" zoomy="0.660000" position="0">
<tooltip>Bretagne</tooltip>
</Shape>
<Shape name="G" pixmapfile="geography/france_region/centre.png" sound="france_region/centre" x="383" y="188" zoomx="0.660000" zoomy="0.660000" position="0">
<tooltip>Centre</tooltip>
</Shape>
<Shape name="H" pixmapfile="geography/france_region/champagne-ardenne.png" sound="france_region/champagne-ardenne" x="487" y="120" zoomx="0.660000" zoomy="0.660000" position="0">
<tooltip>Champagne Ardenne</tooltip>
</Shape>
<Shape name="I" pixmapfile="geography/france_region/corse.png" sound="france_region/corse" x="662" y="472" zoomx="0.660000" zoomy="0.660000" position="0">
<tooltip>Corse</tooltip>
</Shape>
<Shape name="J" pixmapfile="geography/france_region/franche-conte.png" sound="france_region/franche-conte" x="542" y="212" zoomx="0.660000" zoomy="0.660000" position="0">
<tooltip>Franche Conté</tooltip>
</Shape>
<Shape name="K" pixmapfile="geography/france_region/haute-normandie.png" sound="france_region/haute-normandie" x="363" y="95" zoomx="0.660000" zoomy="0.660000" position="0">
<tooltip>Normandie</tooltip>
</Shape>
<Shape name="L" pixmapfile="geography/france_region/ile-de-france.png" sound="france_region/ile-de-france" x="415" y="132" zoomx="0.660000" zoomy="0.660000" position="0">
<tooltip>Ile de France</tooltip>
</Shape>
<Shape name="M" pixmapfile="geography/france_region/languedoc-roussillon.png" sound="france_region/languedoc-roussillon" x="443" y="404" zoomx="0.660000" zoomy="0.660000" position="0">
<tooltip>Languedoc Roussillon</tooltip>
</Shape>
<Shape name="N" pixmapfile="geography/france_region/limousin.png" sound="france_region/limousin" x="384" y="294" zoomx="0.660000" zoomy="0.660000" position="0">
<tooltip>Limousin</tooltip>
</Shape>
<Shape name="O" pixmapfile="geography/france_region/lorraine.png" sound="france_region/lorraine" x="540" y="127" zoomx="0.660000" zoomy="0.660000" position="0">
<tooltip>Lorraine</tooltip>
</Shape>
<Shape name="P" pixmapfile="geography/france_region/midi-pyrenees.png" sound="france_region/midi-pyrenees" x="380" y="396" zoomx="0.660000" zoomy="0.660000" position="0">
<tooltip>Midi Pyrénées</tooltip>
</Shape>
<Shape name="Q" pixmapfile="geography/france_region/nord-pas-de-calais.png" sound="france_region/nord-pas-de-calais" x="427" y="33" zoomx="0.660000" zoomy="0.660000" position="0">
<tooltip>Nord Pas de Calais</tooltip>
</Shape>
<Shape name="R" pixmapfile="geography/france_region/pays-de-la-loire.png" sound="france_region/pays-de-la-loire" x="300" y="199" zoomx="0.660000" zoomy="0.660000" position="0">
<tooltip>Pays de la Loire</tooltip>
</Shape>
<Shape name="S" pixmapfile="geography/france_region/picardie.png" sound="france_region/picardie" x="424" y="83" zoomx="0.660000" zoomy="0.660000" position="0">
<tooltip>Picardie</tooltip>
</Shape>
<Shape name="T" pixmapfile="geography/france_region/poitou-charentes.png" sound="france_region/poitou-charentes" x="321" y="269" zoomx="0.660000" zoomy="0.660000" position="0">
<tooltip>Poitou Charentes</tooltip>
</Shape>
<Shape name="U" pixmapfile="geography/france_region/provence-alpes-cote_d_azur.png" sound="france_region/provence-alpes-cote_d_azur" x="543" y="379" zoomx="0.660000" zoomy="0.660000" position="0">
<tooltip>Provence Alpes Côte d'Azur</tooltip>
</Shape>
<Shape name="V" pixmapfile="geography/france_region/rhone-alpes.png" sound="france_region/rhone-alpes" x="520" y="312" zoomx="0.660000" zoomy="0.660000" position="0">
<tooltip>Rhône Alpes</tooltip>
</Shape>
<Shape name="1" pixmapfile="geography/france_region/france-regions.png" type="SHAPE_BACKGROUND" sound="Undefined" x="420" y="260" zoomx="0.660000" zoomy="0.660000" position="0"/>
</ShapeGame>
......@@ -618,29 +618,23 @@ echo "***************************************************"
echo ""
echo configure complete,
echo with options:
echo "python plugins = $build_python_plugin"
echo "gcompris edit = $build_gcompris_edit"
echo "Force python (--enable-py-build-only) = $py_build_only"
echo "Python plugin = $build_python_plugin"
echo "Optional menu edition (--with-editor) = $build_gcompris_edit"
if test -x "${SDL_LIBS}"; then
echo "SDL LIBS = NOT DETECTED (install sdl-devel)"
echo "SDL LIBS (--with-sdl-prefix) = NOT DETECTED (install sdl-devel)"
else
echo "SDL LIBS = FOUND"
echo "SDL LIBS = found"
fi
echo ""
if test "x$found_randr" = "xno"; then
echo "XRANDR option = NO"
else
echo "XRANDR option = YES"
fi
echo "XRANDR option (--enable-xrandr) = $found_randr"
echo ""
if test "x$use_profils" = "xyes"; then
echo "USE_PROFILS option = YES"
else
echo "USE_PROFILS option = NO"
fi
echo "Profile system (--enable-profils) = $use_profils"
echo
echo gcompris will be installed in ${prefix}
echo to compile and install in in another directory
echo type sh configure --prefix=/usr
......
......@@ -86,6 +86,8 @@ boards/geography/board2_1.xml.in
boards/geography/board3_0.xml.in
boards/geography/board3_1.xml.in
boards/geography/board4_0.xml.in
boards/geography/board4_1.xml.in
boards/geography/board5_0.xml.in
boards/gletters.xml.in
boards/gnumch-equality.xml.in
boards/gnumch-factors.xml.in
......@@ -220,6 +222,7 @@ src/gcompris/gameutil.c
src/gcompris/gcompris-edit.c
src/gcompris/gcompris.c
src/gcompris/gcompris.h
src/gcompris/gcompris_db.c
src/gcompris/help.c
src/gcompris/images_selector.c
src/gcompris/interface.c
......
/* gcompris - shapegame.c
*
* Time-stamp: <2005/04/27 22:16:21 bruno>
* Time-stamp: <2005/06/19 02:11:47 bruno>
*
* Copyright (C) 2000 Bruno Coudoin
*
......@@ -1666,7 +1666,7 @@ add_xml_shape_to_data(xmlDocPtr doc, xmlNodePtr xmlnode, GNode * child)
for(i=0; i<j; i++)
{
points->coords[i] = atof(d[i]);
points->coords[i] = g_ascii_strtod(d[i], NULL);
}
g_strfreev(d);
}
......@@ -1674,12 +1674,12 @@ add_xml_shape_to_data(xmlDocPtr doc, xmlNodePtr xmlnode, GNode * child)
/* get the X coord of the shape */
cx = xmlGetProp(xmlnode,"x");
if(!cx) cx = "100";
x = atof(cx);
x = g_ascii_strtod(cx, NULL);
/* get the Y coord of the shape */
cy = xmlGetProp(xmlnode,"y");
if(!cy) cy = "100";
y = atof(cy);
y = g_ascii_strtod(cy, NULL);
/* Back up the current locale to be sure to load well C formated numbers */
locale = g_strdup(gcompris_get_locale());
......@@ -1688,12 +1688,12 @@ add_xml_shape_to_data(xmlDocPtr doc, xmlNodePtr xmlnode, GNode * child)
/* get the ZOOMX coord of the shape */
czoomx = xmlGetProp(xmlnode,"zoomx");
if(!czoomx) czoomx = "1";
zoomx = atof(czoomx);
zoomx = g_ascii_strtod(czoomx, NULL);
/* get the ZOOMY coord of the shape */
czoomy = xmlGetProp(xmlnode,"zoomy");
if(!czoomy) czoomy = "1";
zoomy = atof(czoomy);
zoomy = g_ascii_strtod(czoomy, NULL);
/* get the POSITION of the shape */
/* Position in the xml means:
......@@ -1911,7 +1911,7 @@ read_xml_file(char *fname)
if(!tmpstr)
shapeBox.x = 15;
else
shapeBox.x = atof(tmpstr);
shapeBox.x = g_ascii_strtod(tmpstr, NULL);
g_warning("shapeBox.x=%f\n", shapeBox.x);
tmpstr = xmlGetProp(doc->children,"shapebox_y");
......@@ -1919,7 +1919,7 @@ read_xml_file(char *fname)
if(!tmpstr)
shapeBox.y = 25;
else
shapeBox.y = atof(tmpstr);
shapeBox.y = g_ascii_strtod(tmpstr, NULL);
g_warning("shapeBox.y=%f\n", shapeBox.y);
tmpstr = xmlGetProp(doc->children,"shapebox_w");
......@@ -1927,7 +1927,7 @@ read_xml_file(char *fname)
if(!tmpstr)
shapeBox.w = 80;
else
shapeBox.w = atof(tmpstr);
shapeBox.w = g_ascii_strtod(tmpstr, NULL);
g_warning("shapeBox.w=%f\n", shapeBox.w);
tmpstr = xmlGetProp(doc->children,"shapebox_h");
......@@ -1935,7 +1935,7 @@ read_xml_file(char *fname)
if(!tmpstr)
shapeBox.h = 430;
else
shapeBox.h = atof(tmpstr);
shapeBox.h = g_ascii_strtod(tmpstr, NULL);
g_warning("shapeBox.h=%f\n", shapeBox.h);
tmpstr = xmlGetProp(doc->children,"shapebox_nb_shape_x");
......
/* gcompris - gameutil.c
*
* Time-stamp: <2005/06/16 22:39:20 yves>
* Time-stamp: <2005/06/18 18:08:20 bruno>
*
* Copyright (C) 2000 Bruno Coudoin
*
......@@ -1108,9 +1108,8 @@ item_event_ok(GnomeCanvasItem *item, GdkEvent *event, DialogBoxCallBack dbcb)
break;
case GDK_BUTTON_PRESS:
if(rootDialogItem)
gtk_object_destroy(GTK_OBJECT(rootDialogItem));
rootDialogItem = NULL;
gcompris_dialog_close();
/* restart the board */
if(gcomprisBoard->plugin->pause_board != NULL)
gcomprisBoard->plugin->pause_board(FALSE);
......
/* gcompris - gcompris.c
*
* Time-stamp: <2005/06/16 08:42:12 yves>
* Time-stamp: <2005/06/19 18:17:03 bruno>
*
* Copyright (C) 2000-2003 Bruno Coudoin
*
......@@ -129,9 +129,9 @@ static struct poptOption options[] = {
{"logs", 'j', POPT_ARG_STRING, &popt_logs_database, 0,
N_("Use alternate database for logs"), NULL},
{"create-db",'\0', POPT_ARG_NONE, &popt_create_db, 0,
N_("Use alternate database for profils"), NULL},
N_("Create the alternate database for profils"), NULL},
{"reread-xml",'\0', POPT_ARG_NONE, &popt_reread_xml, 0,
N_("Use alternate database for profils"), NULL},
N_("Re-read XML Menus and store them in the database"), NULL},
#endif
#ifndef WIN32 /* Not supported on windows */
POPT_AUTOHELP
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment