From 454ad3c473b3ff5081b18f00b516402794f2741d Mon Sep 17 00:00:00 2001
From: Thorin <toz@thorin-kerrs-macbook-3.local>
Date: Mon, 11 Jun 2012 15:03:02 +0000
Subject: version 4, new toolbar and fixes

---
(limited to 'run.py')

diff --git a/run.py b/run.py
index 242ad90..9fc17bf 100644..100755
--- a/run.py
+++ b/run.py
@@ -35,11 +35,13 @@ import City.City as City
 log = logging.getLogger( 'City run' )
 log.setLevel( logging.DEBUG )
 
+
+log.info('PLATFORM = %s' %platform)
 def buildInstruments(names, imgpath, screensize, scale):
     "returns a list of Instrument objects, loaded with images"
     Instruments = [Instrument(names[i]) for i in range(len(names))]
     imagefiles = ResourceList(imgpath, '.png')
-    startx = 0
+    startx = 30
     for i in Instruments:
         for f in imagefiles:
             if i.name.startswith(f[:4]):
@@ -85,10 +87,12 @@ class jamScene( object ):
         self._syncloop_running = 0
         global schedEvent, now
         schedEvent = self.scene.TimeQueue.schedEvent
-        now = self.scene.cs.perfTime
-        self.screen = screen
+        now = self.scene.cs.perfTime        
+        self.screen = screen        
         screenRect = screen.get_rect()
+        print "SCREENRECT IS .........", screenRect
         self.screenSize = screen.get_size()
+        print "SCREENSIZE IS ---------", self.screenSize
         self.playArea = pygame.Rect(screenRect.left,screenRect.top, screenRect.width, screenRect.height * 0.8)
         if olpcgames.ACTIVITY:
             olpcgames.ACTIVITY.playArea = self.playArea
@@ -128,9 +132,9 @@ class jamScene( object ):
         self.snap_store = (olpcgames.ACTIVITY.snap_store if platform == 'Sugar' else [])
         self.feedbackgroundImage = None
         if self.screenSize == (1200, 780):
-            self.setbackgroundImage(pygame.image.load(ImagePath + "/jam2jamXO_2.png").convert())
+            self.setbackgroundImage(pygame.image.load(ImagePath + "/jam2jamXO_4.png").convert())
         else:
-            bgi = pygame.image.load(ImagePath +  "/jam2jamXO_2.png").convert()
+            bgi = pygame.image.load(ImagePath +  "/jam2jamXO_4.png").convert()
             bgi_scaled = pygame.transform.scale(bgi, self.playArea.size)
             self.setbackgroundImage(bgi_scaled)
         self.panel = pygame.Surface((self.panelArea.width, self.panelArea.height))
--
cgit v0.9.1