From 82bce73030735492a017113f0486ebe8aae5fae6 Mon Sep 17 00:00:00 2001
From: amartin <olpc@xo-05-28-21.localdomain>
Date: Tue, 28 Aug 2007 11:58:27 +0000
Subject: Jam save/load

---
(limited to 'Jam/Picker.py')

diff --git a/Jam/Picker.py b/Jam/Picker.py
index cfff3e6..f41f1b2 100644
--- a/Jam/Picker.py
+++ b/Jam/Picker.py
@@ -214,7 +214,9 @@ class Instrument( Picker ):
         walloc = widget.get_allocation()
         salloc = self.scrolledWindow.get_allocation()
         loc = ( walloc.x + salloc.x + event.x - self.hadjustment.get_value(), -1 )
-        self.desktop.addBlock( Block.Instrument, widget.data, loc, True )
+
+        block = self.desktop.addBlock( Block.Instrument, widget.data, loc, True )
+        self.desktop.activateInstrument( block )
 
 
 class Drum( Picker ):
@@ -302,6 +304,8 @@ class Loop( Picker ):
                 return -1
             
             id = newPages.pop() # new pageId
+
+            self.owner.noteDB.getPage( id ).local = False # flag as a global page
             
             self.addBlock( id, filename[:-4] )
 
@@ -412,9 +416,9 @@ class Loop( Picker ):
             data[key] = widget.data[key]
 
         newid = self.owner.noteDB.duplicatePages( [ data["id"] ] )[data["id"]] 
+        self.owner.updateLoopImage( newid )
         data["id"] = newid
 
-        self.owner.updateLoopImage( data["id"] )
-        self.desktop.addBlock( Block.Loop, data, loc, True )
+        block = self.desktop.addBlock( Block.Loop, data, loc, True )
 
 
--
cgit v0.9.1