Commit b397fa57 authored by Bruno Coudoin's avatar Bruno Coudoin

cleanup

svn path=/branches/gcomprixo/; revision=2864
parent 57a43598
All images have been done by Bruno Coudoin with the gimp except:
Image ID : nur00523, National Undersearch Research Program (NURP) Collection
Location: Tropical Atlantic Ocean, Florida Keys.
Photographer: D. Kesling
Credit : OAR/National Undersea Research Program (NURP); University of North Carolina at Wilmington
Web : http://www.photolib.noaa.gov/nurp/nur03006.htm
Image ID: nur03006, National Undersearch Research Program (NURP) Collection
Location: Florida Keys
Credit : OAR/National Undersea Research Program (NURP)
Web : http://www.photolib.noaa.gov/nurp/nur03006.htm
Image ID: nur03505, National Undersearch Research Program (NURP) Collection
Credit: OAR/National Undersea Research Program (NURP)
Web : http://www.photolib.noaa.gov/nurp/nur03505.htm
Image ID: nur03010, National Undersearch Research Program (NURP) Collection
Credit: OAR/National Undersea Research Program (NURP)
Web : http://www.photolib.noaa.gov/nurp/nur03010.htm
Image ID: nur03011, National Undersearch Research Program (NURP) Collection
Credit: OAR/National Undersea Research Program (NURP)
Web : http://www.photolib.noaa.gov/nurp/nur03011.htm
Image ID: nur03013, National Undersearch Research Program (NURP) Collection
Credit: OAR/National Undersea Research Program (NURP)
Web : http://www.photolib.noaa.gov/nurp/nur03013.htm
difficulty_star.png by Pascal Georges
*.xml
Makefile
Makefile.in
.xvpics
All the images here have been created by Bruno Coudoin using StarDraw and the Gimp.
They are released under the GPL.
plane.png taken from Staroffice gallery
cloud.png taken from the game sticker
tux.png taken from ???
card.png taken from AisleRiot
By Pascal Geaoges:
phone_note.png
By Renaud Blanchard
fishing_boat.png
bicycle.png
......@@ -537,8 +537,7 @@ Makefile.mingw
autopackage/Makefile
autopackage/default.apspec
boards/Makefile
boards/gcompris/Makefile
boards/gcompris/mimetypes/Makefile
boards/mimetypes/Makefile
config.h.mingw
docs/C/Makefile
docs/Makefile
......
......@@ -912,7 +912,7 @@ gboolean load_mime_type_from_file(gchar *fname)
/**
* gc_mime_type_load
* Load all the mime type in PACKAGE_DATA_DIR"/gcompris/mimetypes/ *.xml"
* Load all the mime type in PACKAGE_DATA_DIR"/mimetypes/ *.xml"
*
* Must be called once at GCompris startup.
*
......@@ -928,7 +928,7 @@ void gc_mime_type_load()
return;
}
mime_dir = g_strconcat(properties->package_data_dir, "/gcompris/mimetypes/", NULL);
mime_dir = g_strconcat(properties->package_data_dir, "/mimetypes/", NULL);
mimetypes_hash = g_hash_table_new (g_str_hash, g_str_equal);
mimetypes_ext_hash = g_hash_table_new (g_str_hash, g_str_equal);
......
......@@ -7,7 +7,8 @@ xml_in_files = \
board3_0.xml.in \
board4_0.xml.in \
board5_0.xml.in \
board6_0.xml.in
board6_0.xml.in \
board7_0.xml.in
xml_DATA = $(xml_in_files:.xml.in=.xml)
......@@ -28,6 +29,7 @@ img_DATA = \
carot.png \
car.png \
castle.png \
cocotier.png \
crown.png \
egg.png \
eggpot.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">
<_name>Drag and Drop each item onto its name</_name>
</Title>
<Shape name="A" pixmapfile="imagename/cocotier.png"
x="194" y="90" zoomx="1" zoomy="1" position="0"/>
<Title x="194" y="200" justification="GTK_JUSTIFY_CENTER">
<_name>tree</_name>
</Title>
<Shape name="D" pixmapfile="imagename/postpoint.png"
x="194" y="350" zoomx="1" zoomy="1" position="0"/>
<Title x="194" y="450" justification="GTK_JUSTIFY_CENTER">
<_name>mail box</_name>
</Title>
<Shape name="B" pixmapfile="imagename/sailingboat.png"
x="394" y="90" zoomx="1" zoomy="1" position="0"/>
<Title x="394" y="200" justification="GTK_JUSTIFY_CENTER">
<_name>sailing boat</_name>
</Title>
<Shape name="E" pixmapfile="imagename/light.png"
x="394" y="350" zoomx="1" zoomy="1" position="0"/>
<Title x="394" y="450" justification="GTK_JUSTIFY_CENTER">
<_name>bulb</_name>
</Title>
<Shape name="M" pixmapfile="imagename/bottle.png"
x="594" y="90" zoomx="1" zoomy="1" position="0" />
<Title x="594" y="200" justification="GTK_JUSTIFY_CENTER">
<_name>bottle</_name>
</Title>
<Shape name="F" pixmapfile="imagename/flower.png"
x="594" y="350" zoomx="1" zoomy="1" position="0"/>
<Title x="594" y="450" justification="GTK_JUSTIFY_CENTER">
<_name>flower</_name>
</Title>
</ShapeGame>
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