diff options
| -rw-r--r-- | TurtleArt/tacollaboration.py | 4 | ||||
| -rw-r--r-- | TurtleArt/taconstants.py | 1 | ||||
| -rw-r--r-- | TurtleArt/taturtle.py | 4 | ||||
| -rw-r--r-- | TurtleArt/tawindow.py | 4 |
4 files changed, 8 insertions, 5 deletions
diff --git a/TurtleArt/tacollaboration.py b/TurtleArt/tacollaboration.py index e928ac1..d4b7529 100644 --- a/TurtleArt/tacollaboration.py +++ b/TurtleArt/tacollaboration.py @@ -29,6 +29,7 @@ import base64 from TurtleArt.tautils import data_to_string, data_from_string, get_path, \ base64_to_image +from TurtleArt.taconstants import DEFAULT_TURTLE_COLORS try: from sugar import profile @@ -339,7 +340,8 @@ class Collaboration(): else: colors = self._activity.get_colors() if colors is None: - colors = '#008000,#00A000' + colors = '%s,%s' % (DEFAULT_TURTLE_COLORS[0], + DEFAULT_TURTLE_COLORS[1]) return colors diff --git a/TurtleArt/taconstants.py b/TurtleArt/taconstants.py index 77ebefb..55a9b34 100644 --- a/TurtleArt/taconstants.py +++ b/TurtleArt/taconstants.py @@ -176,6 +176,7 @@ STANDARD_STROKE_WIDTH = 1.0 BLOCK_SCALE = 2.0 PALETTE_SCALE = 1.5 DEFAULT_TURTLE = 'Yertle' +DEFAULT_TURTLE_COLORS = ['#008000', '#00A000'] HORIZONTAL_PALETTE = 0 VERTICAL_PALETTE = 1 BLACK = -9999 diff --git a/TurtleArt/taturtle.py b/TurtleArt/taturtle.py index a7a3205..f309eef 100644 --- a/TurtleArt/taturtle.py +++ b/TurtleArt/taturtle.py @@ -19,7 +19,7 @@ #OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN #THE SOFTWARE. -from taconstants import TURTLE_LAYER +from taconstants import TURTLE_LAYER, DEFAULT_TURTLE_COLORS from tasprite_factory import SVG, svg_str_to_pixbuf from tacanvas import wrap100, color_table from sprites import Sprite @@ -149,7 +149,7 @@ class Turtle: self.shapes = generate_turtle_pixbufs(self.colors) else: if turtles is not None: - self.colors = ['#008000', '#00A000'] + self.colors = DEFAULT_TURTLE_COLORS self.shapes = turtles.get_pixbufs() def set_shapes(self, shapes): diff --git a/TurtleArt/tawindow.py b/TurtleArt/tawindow.py index b6f1b34..dfaf3a8 100644 --- a/TurtleArt/tawindow.py +++ b/TurtleArt/tawindow.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- #Copyright (c) 2007, Playful Invention Company -#Copyright (c) 2008-10, Walter Bender -#Copyright (c) 2009-10 Raúl Gutiérrez Segalés +#Copyright (c) 2008-11, Walter Bender +#Copyright (c) 2009-11 Raúl Gutiérrez Segalés #Copyright (C) 2010 Emiliano Pastorino <epastorino@plan.ceibal.edu.uy> #Copyright (c) 2011 Collabora Ltd. <http://www.collabora.co.uk/> |