From 2c5815131c4c19096d0f12bd5a497e0cc734c043 Mon Sep 17 00:00:00 2001
From: Walter Bender <walter@sugarlabs.org>
Date: Sun, 22 Aug 2010 17:26:27 +0000
Subject: set default turtle name to nick

---
diff --git a/TurtleArt/tacanvas.py b/TurtleArt/tacanvas.py
index a0298ec..786a2f8 100644
--- a/TurtleArt/tacanvas.py
+++ b/TurtleArt/tacanvas.py
@@ -27,7 +27,7 @@ import cairo
 from sprites import Sprite
 from tasprite_factory import SVG
 from tautils import image_to_base64, data_to_string, round_int
-from taconstants import CANVAS_LAYER, DEFAULT_TURTLE, BLACK, WHITE
+from taconstants import CANVAS_LAYER, BLACK, WHITE
 
 import logging
 _logger = logging.getLogger('turtleart-activity')
@@ -187,7 +187,7 @@ class TurtleGraphics:
             self.seth(0, share)
             self.setxy(0, 0, share)
             self.tw.active_turtle.hide()
-        self.set_turtle(DEFAULT_TURTLE)
+        self.set_turtle(self.tw.default_turtle_name)
         self.tw.svg_string = ''
         self.svg.reset_min_max()
         self.fill = False
diff --git a/TurtleArt/tawindow.py b/TurtleArt/tawindow.py
index cf412fb..4b8ad2f 100644
--- a/TurtleArt/tawindow.py
+++ b/TurtleArt/tawindow.py
@@ -74,7 +74,7 @@ class TurtleArtWindow():
     """ TurtleArt Window class abstraction  """
     timeout_tag = [0]
 
-    def __init__(self, win, path, parent=None, mycolors=None):
+    def __init__(self, win, path, parent=None, mycolors=None, mynick=None):
         self._loaded_project = ""
         self.win = None
         self.parent = parent
@@ -175,13 +175,18 @@ class TurtleArtWindow():
         if self.interactive_mode:
             self.sprite_list = Sprites(self.window, self.area, self.gc)
         else:
-            self.sprite_list = None # Sprites(self.window, None, self.gc)
+            self.sprite_list = None
         self.turtles = Turtles(self.sprite_list)
-        if mycolors == None:
-            Turtle(self.turtles, DEFAULT_TURTLE)
+        if mynick is None:
+            self.default_turtle_name = DEFAULT_TURTLE
         else:
-            Turtle(self.turtles, DEFAULT_TURTLE, mycolors.split(','))
-        self.active_turtle = self.turtles.get_turtle(DEFAULT_TURTLE)
+            self.default_turtle_name = mynick
+        print self.default_turtle_name
+        if mycolors is None:
+            Turtle(self.turtles, self.default_turtle_name)
+        else:
+            Turtle(self.turtles, self.default_turtle_name, mycolors.split(','))
+        self.active_turtle = self.turtles.get_turtle(self.default_turtle_name)
         self.saving_svg = False
         self.svg_string = ''
         self.selected_turtle = None
@@ -1300,7 +1305,7 @@ class TurtleArtWindow():
             k = self.turtles.get_turtle_key(self.selected_turtle)
 
             # Remove turtles by dragging them onto the trash palette.
-            if k != DEFAULT_TURTLE and self._in_the_trash(tx, ty):
+            if k != self.default_turtle_name and self._in_the_trash(tx, ty):
                 self.selected_turtle.hide()
                 self.turtles.remove_from_dict(k)
             else:
diff --git a/TurtleArtActivity.py b/TurtleArtActivity.py
index b46e3cb..d42b733 100644
--- a/TurtleArtActivity.py
+++ b/TurtleArtActivity.py
@@ -971,7 +971,8 @@ class TurtleArtActivity(activity.Activity):
         """ Initialize the turtle art canvas. """
         bundle_path = activity.get_bundle_path()
         self.tw = TurtleArtWindow(canvas, bundle_path, self,
-                                  profile.get_color().to_string())
+                                  profile.get_color().to_string(),
+                                  profile.get_nick_name())
         # self.tw.activity = self
         self.tw.window.grab_focus()
         path = os.path.join(os.environ['SUGAR_ACTIVITY_ROOT'], 'data')
--
cgit v0.9.1