diff options
author | Bruno Coudoin <bcoudoin@src.gnome.org> | 2007-04-21 21:33:46 (GMT) |
---|---|---|
committer | Bruno Coudoin <bcoudoin@src.gnome.org> | 2007-04-21 21:33:46 (GMT) |
commit | 2808511a056ca6a74b047e582f1c36cf1a1371a4 (patch) | |
tree | 2a6bdc1ef724aa8977d0d604bd717ec872264430 | |
parent | 14e49fca18b14ba6238fc93b2130e409d1f46190 (diff) |
removed mypaint, we will add it back when completed removed mypaint set to
* boards/mypaint.xml.in: removed mypaint, we will add it back when completed
* configure.in: removed mypaint
* src/boards/python/gnumch.py: set to a smaller font
* src/boards/python/searace.py: removed on screen debug numbers
svn path=/trunk/; revision=2615
-rw-r--r-- | ChangeLog | 8 | ||||
-rw-r--r-- | boards/mypaint.xml.in | 10 | ||||
-rw-r--r-- | configure.in | 9 | ||||
-rw-r--r-- | po/POTFILES.in | 1 | ||||
-rw-r--r-- | src/boards/python/gnumch.py | 6 | ||||
-rw-r--r-- | src/boards/python/searace.py | 6 |
6 files changed, 15 insertions, 25 deletions
@@ -1,3 +1,11 @@ +2007-04-21 Bruno coudoin <bruno.coudoin@free.fr> + + + * boards/mypaint.xml.in: removed mypaint, we will add it back when completed + * configure.in: removed mypaint + * src/boards/python/gnumch.py: set to a smaller font + * src/boards/python/searace.py: removed on screen debug numbers + 2007-04-15 Bruno coudoin <bruno.coudoin@free.fr> - Added py_gc_file_find_absolute() in the python bindings. diff --git a/boards/mypaint.xml.in b/boards/mypaint.xml.in deleted file mode 100644 index 84bcdd0..0000000 --- a/boards/mypaint.xml.in +++ /dev/null @@ -1,10 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<GCompris> - <Board type="python:mypaint" section="/experimental" name="mypaint" icon="boardicons/mypaint.png" difficulty="1" boarddir="MyPaint" author="Martin Renold (MyPaint)"> - <_title>MyPaint</_title> - <_description>Painting application</_description> - <_prerequisite>mouse manipulation</_prerequisite> - <_goal>Painting activity. Uses pressure device if any.</_goal> - <_manual>Choose brush and colors and draw. have fun!</_manual> - </Board> -</GCompris> diff --git a/configure.in b/configure.in index e18c1af..4bbbbe7 100644 --- a/configure.in +++ b/configure.in @@ -567,10 +567,10 @@ AC_SUBST(CFLAGS) AC_SUBST(LIBS) #mypaint -PKG_CHECK_MODULES(MYPAINT,[ - glib-2.0 >= 2.6.0 - gtk+-2.0 >= 2.6.0 - ]) +#PKG_CHECK_MODULES(MYPAINT,[ +# glib-2.0 >= 2.6.0 +# gtk+-2.0 >= 2.6.0 +# ]) dnl Autoconf output AC_OUTPUT([ gcompris.spec @@ -583,7 +583,6 @@ autopackage/default.apspec src/Makefile src/gcompris/Makefile src/boards/Makefile -src/boards/mypaint/Makefile src/boards/python/Makefile src/boards/python/gcompris/Makefile src/boards/python/gcompris/admin/Makefile diff --git a/po/POTFILES.in b/po/POTFILES.in index 1a0f724..ce9639b 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -168,7 +168,6 @@ boards/money.xml.in boards/money_cents.xml.in boards/mosaic.xml.in boards/mouse.xml.in -boards/mypaint.xml.in boards/numeration.xml.in boards/oscar_and_friends.xml.in boards/paintings.xml.in diff --git a/src/boards/python/gnumch.py b/src/boards/python/gnumch.py index 018bbb8..1538e22 100644 --- a/src/boards/python/gnumch.py +++ b/src/boards/python/gnumch.py @@ -763,7 +763,7 @@ class Gcompris_gnumch: # the board title self.title = self.rootitem.add(gnomecanvas.CanvasText, text = "", - font = gcompris.skin.get_font("gcompris/board/huge bold"), + font = gcompris.skin.get_font("gcompris/board/title bold"), x = self.scrw/2, y = self.top/2) @@ -774,7 +774,7 @@ class Gcompris_gnumch: self.message = self.rootitem.add(gnomecanvas.CanvasText, text = "", justification = gtk.JUSTIFY_CENTER, - font = gcompris.skin.get_font("gcompris/board/huge bold"), + font = gcompris.skin.get_font("gcompris/board/title bold"), x = self.scrw/2, y = self.scrh/2) self.message.hide() @@ -783,7 +783,7 @@ class Gcompris_gnumch: self.trogwarning = self.rootitem.add(gnomecanvas.CanvasText, text = _("T\nR\nO\nG\nG\nL\nE"), justification = gtk.JUSTIFY_CENTER, - font = gcompris.skin.get_font("gcompris/board/huge bold"), + font = gcompris.skin.get_font("gcompris/board/title bold"), x = self.left/2, y = self.scrh/2) self.trogwarning.hide() diff --git a/src/boards/python/searace.py b/src/boards/python/searace.py index bc56775..e3a2ecd 100644 --- a/src/boards/python/searace.py +++ b/src/boards/python/searace.py @@ -941,12 +941,6 @@ class Gcompris_searace: score = wind coord = (x, y, boat_angle, step_x, line_style) # x y angle distance line_style - self.root_weather_item.add( - gnomecanvas.CanvasText, text=int(wind), - y=y, x=x, - fill_color_rgba=0xFF0000FFL, - ) - # ---------- self.root_weather_item.add( gnomecanvas.CanvasLine, |