From 1ee37b850555e3deca77b6900ba97dfbc7b4f75d Mon Sep 17 00:00:00 2001
From: Walter Bender <walter@walter-laptop.(none)>
Date: Sun, 25 Oct 2009 18:11:43 +0000
Subject: fix simplejson import, layers

---
diff --git a/NEWS b/NEWS
index 4a824b9..c8476cd 100644
--- a/NEWS
+++ b/NEWS
@@ -1,9 +1,17 @@
+76
+
+* fixed import error in project
+* fixed bullets in exporthtml
+* added proper scaling for coordinate blocks
+* moved status layer forward
+
 75
 
 * Cartesian coordinates overlay
 * polar coordinates overlay
 * coordinate display on View Toolbar
-
+* Option to rescale coordinate system to 100x100 on View Toolbar
+* Reordered the palettes (moved misc. down)
 
 74
 
diff --git a/TurtleArtActivity.py b/TurtleArtActivity.py
index 816d803..715095f 100644
--- a/TurtleArtActivity.py
+++ b/TurtleArtActivity.py
@@ -339,7 +339,6 @@ class TurtleArtActivity(activity.Activity):
 
             # Set the project toolbar as the initial one selected
             self.toolbox.set_current_toolbar(1)
-            pass
 
         # Create a scrolled window to contain the turtle canvas
         self.sw = gtk.ScrolledWindow()
diff --git a/activity/activity.info b/activity/activity.info
index 4191129..330838e 100644
--- a/activity/activity.info
+++ b/activity/activity.info
@@ -1,6 +1,6 @@
 [Activity]
 name = Turtle Art
-activity_version = 75
+activity_version = 76
 license = MIT
 bundle_id = org.laptop.TurtleArtActivity
 exec = sugar-activity TurtleArtActivity.TurtleArtActivity
diff --git a/taproject.py b/taproject.py
index 05c2a87..88a6f32 100644
--- a/taproject.py
+++ b/taproject.py
@@ -32,8 +32,8 @@ try:
 except (ImportError, AttributeError):
     try:
         import simplejson as json
-        from json import load as jload
-        from json import dump as jdump
+        from simplejson import load as jload
+        from simplejson import dump as jdump
     except:
         # use pickle on old systems
         _old_Sugar_system = True
diff --git a/tasetup.py b/tasetup.py
index cfe8854..2f2b8a3 100644
--- a/tasetup.py
+++ b/tasetup.py
@@ -299,7 +299,7 @@ def setup_misc(tw):
     tw.status_spr = sprNew(tw,0,(tw.height-175), \
             tw.status_shapes['status'],True)
     tw.status_spr.type = 'status'
-    setlayer(tw.status_spr,400)
+    setlayer(tw.status_spr,900)
     # everything should be loaded at this point
     # print tw.status_shapes
     tw.loaded = True
--
cgit v0.9.1