From c947937c3bb0a2cb8678ef175600954f818b42ff Mon Sep 17 00:00:00 2001
From: Wade Brainerd <wadetb@gmail.com>
Date: Thu, 26 Feb 2009 03:52:23 +0000
Subject: Trap group changes in keyboard.

---
diff --git a/keyboard.py b/keyboard.py
index a708b14..c90de81 100644
--- a/keyboard.py
+++ b/keyboard.py
@@ -387,6 +387,8 @@ class KeyboardWidget(KeyboardData, gtk.DrawingArea):
         # information about key group and state.
         self.active_group = 0
         self.active_state = 0
+
+        self.keymap.connect("keys-changed", self._keys_changed_cb)
         
         self.hilite_letter = None
         
@@ -569,6 +571,10 @@ class KeyboardWidget(KeyboardData, gtk.DrawingArea):
         
         return False
 
+    def _keys_changed_cb(self, keymap):
+        print "keys-changed event"
+        self._make_key_images()
+
     def clear_hilite(self):
         self.hilite_letter = None
         if self.draw_hands:
diff --git a/lessonscreen.py b/lessonscreen.py
index c2a00b1..6861061 100644
--- a/lessonscreen.py
+++ b/lessonscreen.py
@@ -283,17 +283,17 @@ class LessonScreen(gtk.VBox):
             if key:
                 if state & gtk.gdk.SHIFT_MASK:
                     shift_key = self.keyboard.find_key_by_label('shift')
-                    pixbuf = self.keyboard.get_key_pixbuf(shift_key, scale=1.25)
+                    pixbuf = self.keyboard.get_key_pixbuf(shift_key, scale=1)
                     self.lessonbuffer.insert_pixbuf(self.lessonbuffer.get_end_iter(), pixbuf)
                     self.lessonbuffer.insert(self.lessonbuffer.get_end_iter(), ' ')
                 
                 if state & gtk.gdk.MOD5_MASK:
                     altgr_key = self.keyboard.find_key_by_label('altgr')
-                    pixbuf = self.keyboard.get_key_pixbuf(altgr_key, scale=1.25)
+                    pixbuf = self.keyboard.get_key_pixbuf(altgr_key, scale=1)
                     self.lessonbuffer.insert_pixbuf(self.lessonbuffer.get_end_iter(), pixbuf)
                     self.lessonbuffer.insert(self.lessonbuffer.get_end_iter(), ' ')
 
-                pixbuf = self.keyboard.get_key_pixbuf(key, state, group, 1.25)
+                pixbuf = self.keyboard.get_key_pixbuf(key, state, group, 1)
                 self.lessonbuffer.insert_pixbuf(self.lessonbuffer.get_end_iter(), pixbuf)
             
             self.lessonbuffer.apply_tag_by_name('image',
diff --git a/titlescene.py b/titlescene.py
index 297f633..ea3dd7d 100644
--- a/titlescene.py
+++ b/titlescene.py
@@ -40,7 +40,7 @@ class TitleScene(gtk.DrawingArea):
         height_ratio = float(gtk.gdk.screen_height()*TitleScene.BACKGROUND_HEIGHT_RATIO) / pbuf.get_height()
 
         ratio = min(width_ratio, height_ratio)
-        self.backgroundpixbuf = pbuf.scale_simple(pbuf.get_width()*ratio, pbuf.get_height()*ratio, gtk.gdk.INTERP_BILINEAR)
+        self.backgroundpixbuf = pbuf.scale_simple(int(pbuf.get_width()*ratio), int(pbuf.get_height()*ratio), gtk.gdk.INTERP_BILINEAR)
  
         self.set_size_request(self.backgroundpixbuf.get_width(), self.backgroundpixbuf.get_height())
         
--
cgit v0.9.1