From b763e6138064716bba3878901cd35f167c53180a Mon Sep 17 00:00:00 2001
From: Walter Bender <walter@walter-laptop.(none)>
Date: Tue, 03 Feb 2009 02:58:46 +0000
Subject: cleaned up init -- no wait brick until I figure out a better idle

strategy
---
diff --git a/TurtleArtActivity.py b/TurtleArtActivity.py
index b4c889b..d762339 100644
--- a/TurtleArtActivity.py
+++ b/TurtleArtActivity.py
@@ -96,11 +96,10 @@ class TurtleArtActivity(activity.Activity):
         FILE.writelines(versiondata)
         FILE.close()
 
-        self.tw = tawindow.twNew1(canvas,activity.get_bundle_path(), \
+        self.tw = tawindow.twNew(canvas,activity.get_bundle_path(), \
             lang,tboxh,self)
         self.tw.activity = self
         self.tw.window.grab_focus()
-        tawindow.twNew2(self.tw)
         self.tw.save_folder=os.path.join(os.environ['SUGAR_ACTIVITY_ROOT'], \
             'data')
 
diff --git a/tasetup.py b/tasetup.py
index 77ce0fb..3d689e2 100644
--- a/tasetup.py
+++ b/tasetup.py
@@ -210,8 +210,6 @@ def prep_selectors(tw):
     tw.selbuttons = []
 
 def setup_selectors(tw,s):
-#    for s in selectors:
-#    s = selectors[i]
     name,dy,blockdescriptions = s      
     cat = setup_selector(tw, name, tw.y, blockdescriptions)
     tw.y += dy
@@ -249,8 +247,6 @@ def setup_misc(tw):
             tw.status_shapes['status'],True)
     tw.status_spr.type = 'status'
     setlayer(tw.status_spr,400)
-    # everything should be loaded at this point
-    tw.loaded = True
 
 def setup_selector(tw,name,y,blockdescriptions):
     # selector tabs
diff --git a/tawindow.py b/tawindow.py
index dc92f21..ca552cd 100644
--- a/tawindow.py
+++ b/tawindow.py
@@ -44,7 +44,7 @@ from sugar.graphics.objectchooser import ObjectChooser
 # Setup
 #
 
-def twNew1(win, path, lang, tboxh, parent=None):
+def twNew(win, path, lang, tboxh, parent=None):
     tw = taWindow()
     tw.window = win
     tw.path = os.path.join(path,'images',lang)
@@ -75,26 +75,6 @@ def twNew1(win, path, lang, tboxh, parent=None):
     if os.path.exists('/sys/power/olpc-pm'):
         tw.scale = 1
     else: tw.scale = 1.6
-
-    # put a wait brick up
-#    print 'trying to put up wait brick'
-    try:
-        wait_block = gtk.gdk.pixbuf_new_from_file( \
-            os.path.join(activity.get_activity_root(),"data",'wait.png'))
-    except:
-        try: wait_block = gtk.gdk.pixbuf_new_from_file( \
-            os.path.join(tw.path,'flow','wait.svg'))
-        except: print 'couldn not open wait.svg'
-    tw.area.draw_pixbuf(tw.gc, wait_block, 0, 0, (tw.width/2)-22, \
-        (tw.height/2)-43)
-    rect = gtk.gdk.Rectangle(int((tw.width/2)-22), int((tw.height/2)-43), \
-        44, 87)
-    tw.area.invalidate_rect(rect, False)
-    return tw
-
-def millis(): return int(clock()*1000)
-
-def twNew2(tw):
     tw.cm = tw.gc.get_colormap()
     tw.bgcolor = tw.cm.alloc_color('#fff8de')
     tw.msgcolor = tw.cm.alloc_color('black')
@@ -105,10 +85,7 @@ def twNew2(tw):
     tw.draggroup = None
     prep_selectors(tw)
     for s in selectors:
-#        gobject.idle_add(setup_selectors,tw,s)
         setup_selectors(tw,s)
-    tw.loaded = False
-#    gobject.idle_add(setup_misc, tw, tboxh)
     setup_misc(tw)
     tw.step_time = 0
     tw.hide = False
@@ -116,6 +93,7 @@ def twNew2(tw):
     select_category(tw, tw.selbuttons[0])
     tw.turtle = tNew(tw,tw.width,tw.height)
     tw.lc = lcNew(tw)
+    return tw
 
 #
 # Button Press
--
cgit v0.9.1