From c18b73bd20f2e5ad7a76ac3f69feefcac634e50f Mon Sep 17 00:00:00 2001
From: James <olpc@xo-05-28-3A.localdomain>
Date: Sun, 26 Aug 2007 23:07:14 +0000
Subject: Merge branch 'master' of git+ssh://jaberg@dev.laptop.org/git/projects/tamtam

---
(limited to 'Edit')

diff --git a/Edit/EditToolbars.py b/Edit/EditToolbars.py
index abd425d..10c47e8 100644
--- a/Edit/EditToolbars.py
+++ b/Edit/EditToolbars.py
@@ -40,7 +40,7 @@ class mainToolbar(gtk.Toolbar):
 
         self.toolbox = toolbox
         self.edit = edit
-
+        
         self.tooltips = gtk.Tooltips()
 
         #Play button
@@ -88,6 +88,8 @@ class mainToolbar(gtk.Toolbar):
         self.pointerButton = RadioToolButton('edit-pointer', group = None)
         self.pointerButton.set_palette(self._pointerPalette)
         self.pointerButton.connect('toggled', self.edit.handleToolClick, 'default')
+        self.pointerButton.get_child().connect('enter-notify-event', self.edit.blockFocus)
+        self.pointerButton.get_child().connect('leave-notify-event', self.edit.unblockFocus)
         self.insert(self.pointerButton, -1)
         self.pointerButton.show()
 
@@ -96,6 +98,8 @@ class mainToolbar(gtk.Toolbar):
         self.drawButton = RadioToolButton('edit-pencil', group = self.pointerButton)
         self.drawButton.set_palette(self._drawPalette)
         self.drawButton.connect('toggled', self.edit.handleToolClick, 'draw')
+        self.drawButton.get_child().connect('enter-notify-event', self.edit.blockFocus)
+        self.drawButton.get_child().connect('leave-notify-event', self.edit.unblockFocus)
         self.insert(self.drawButton, -1)
         self.drawButton.show()
 
@@ -104,6 +108,8 @@ class mainToolbar(gtk.Toolbar):
         self.paintButton = RadioToolButton('edit-brush', group = self.pointerButton)
         self.paintButton.set_palette(self._paintPalette)
         self.paintButton.connect('toggled', self.edit.handleToolClick, 'paint')
+        self.paintButton.get_child().connect('enter-notify-event', self.edit.blockFocus)
+        self.paintButton.get_child().connect('leave-notify-event', self.edit.unblockFocus)
         self.insert(self.paintButton, -1)
         self.paintButton.show()
 
@@ -120,7 +126,8 @@ class mainToolbar(gtk.Toolbar):
         self._volumeTempoPalette = volumeTempoPalette(_('Volume / Tempo'), self.edit)
         self.volumeTempoButton = ToggleToolButton('voltemp')
         self.volumeTempoButton.set_palette(self._volumeTempoPalette)
-        #self.volumeTempoButton.connect(None)
+        self.volumeTempoButton.get_child().connect('enter-notify-event', self.edit.blockFocus)
+        self.volumeTempoButton.get_child().connect('leave-notify-event', self.edit.unblockFocus)
         self.insert(self.volumeTempoButton, -1)
         self.volumeTempoButton.show()
 
@@ -178,6 +185,8 @@ class generateToolbar(gtk.Toolbar):
         self.generationButton = ToggleToolButton('dice')
         #self.generationButton.connect(None)
         self.generationButton.set_palette(self._generationPalette)
+        self.generationButton.get_child().connect('enter-notify-event', self.edit.blockFocus)
+        self.generationButton.get_child().connect('leave-notify-event', self.edit.unblockFocus)
         self.insert(self.generationButton, -1)
         self.generationButton.show()
 
@@ -185,6 +194,8 @@ class generateToolbar(gtk.Toolbar):
         self._propertiesPalette = propertiesPalette(_('Properties'), self.edit)
         self.propsButton = ToggleToolButton('props')
         self.propsButton.set_palette(self._propertiesPalette)
+        self.propsButton.get_child().connect('enter-notify-event', self.edit.blockFocus)
+        self.propsButton.get_child().connect('leave-notify-event', self.edit.unblockFocus)
         self.insert(self.propsButton, -1)
         self.propsButton.show()
 
diff --git a/Edit/MainWindow.py b/Edit/MainWindow.py
index 2d5e2d8..76c85ae 100644
--- a/Edit/MainWindow.py
+++ b/Edit/MainWindow.py
@@ -969,12 +969,12 @@ class MainWindow( SubActivity ):
             self.updatePagesPlaying()
             
     def blockFocus(self, widget = None, data = None):
-        self.activity.handler_block(self.activity.focusInHandler)
         self.activity.handler_block(self.activity.focusOutHandler)
+        self.activity.handler_block(self.activity.focusInHandler)
 
     def unblockFocus(self, widget = None, data = None):
-        self.activity.handler_unblock(self.activity.focusInHandler)
         self.activity.handler_unblock(self.activity.focusOutHandler)
+        self.activity.handler_unblock(self.activity.focusInHandler)
 
     #-----------------------------------
     # generation functions
diff --git a/Edit/TuneInterface.py b/Edit/TuneInterface.py
index 63141a3..3682a57 100644
--- a/Edit/TuneInterface.py
+++ b/Edit/TuneInterface.py
@@ -184,8 +184,8 @@ class TuneInterface( gtk.EventBox ):
             self.baseWidth = allocation.width
             self.visibleEndX = self.baseWidth
             self.baseHeight = allocation.height
-            self.updateSize()
             self.alloced = True
+            self.updateSize()
     	self.width = allocation.width
     	self.height = allocation.height
         self.drawingArea.set_size_request( self.width, self.height )
--
cgit v0.9.1