Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBruno Coudoin <bruno.coudoin@free.fr>2009-10-26 20:09:35 (GMT)
committer Bruno Coudoin <bruno.coudoin@free.fr>2009-10-26 20:09:35 (GMT)
commit7e1280129bad916fa16fb5a46167c40a6b7fd0f4 (patch)
treedfc1053025fff4c2ff54a76a07225bef01859a03
parent482f385a5290d41eeb87dfd9af84bcfb941d08c4 (diff)
fixed draw has no timeline now.
Fixed copyright, there is really nothing left from the old anim.
-rw-r--r--src/anim-activity/anim.py4
-rw-r--r--src/anim-activity/anim.xml.in2
-rw-r--r--src/draw-activity/draw.xml.in6
3 files changed, 7 insertions, 5 deletions
diff --git a/src/anim-activity/anim.py b/src/anim-activity/anim.py
index 3174997..61c39f0 100644
--- a/src/anim-activity/anim.py
+++ b/src/anim-activity/anim.py
@@ -1,6 +1,6 @@
# gcompris - anim
#
-# Copyright (C) 2003, 2008 Bruno Coudoin (redraw code), 2004 Yves Combe (anim code)
+# Copyright (C) 2003, 2009 Bruno Coudoin
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -182,6 +182,8 @@ class Gcompris_anim:
self.timeline = Timeline(self)
self.timeline.draw()
+ if self.gcomprisBoard.mode == 'draw':
+ self.timeline.hide()
self.color = Color(self.rootitem, self.drawing_area)
self.color.draw()
diff --git a/src/anim-activity/anim.xml.in b/src/anim-activity/anim.xml.in
index ff20802..6d52b3c 100644
--- a/src/anim-activity/anim.xml.in
+++ b/src/anim-activity/anim.xml.in
@@ -7,7 +7,7 @@
mode="normal"
difficulty="3"
icon="anim.svg"
- author="Yves Combe (yves@ycombe.net)"
+ author="Bruno Coudoin (bruno.coudoin@free.fr)"
boarddir="">
<_title>Create a drawing or an animation</_title>
<_description>Free drawing and animation tool.</_description>
diff --git a/src/draw-activity/draw.xml.in b/src/draw-activity/draw.xml.in
index 7625fe7..16a2ab9 100644
--- a/src/draw-activity/draw.xml.in
+++ b/src/draw-activity/draw.xml.in
@@ -1,13 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?>
<GCompris>
- <Board
+ <Board
name="draw"
type="python:anim"
section="/math/geometry"
- icon="draw.svg"
+ icon="draw.svg"
mode="draw"
difficulty="2"
- author="Yves Combe (yves@ycombe.net)"
+ author="Bruno Coudoin (bruno.coudoin@free.fr)"
boarddir="">
<_title>A simple vector-drawing tool</_title>
<_description>A creative board where you can draw freely</_description>