diff options
| author | Wade Brainerd <wadetb@gmail.com> | 2008-12-31 22:05:37 (GMT) |
|---|---|---|
| committer | Wade Brainerd <wadetb@gmail.com> | 2008-12-31 22:05:37 (GMT) |
| commit | b6204b0afe9ba2b3bc6351705409648406351c7b (patch) | |
| tree | 6e237de8fe0f709375e02edf10556735025e7d8d /lessonscreen.py | |
| parent | cc20790707b816f860a4cb49afa2e6a692e1c5f5 (diff) | |
Progress towards release.
Diffstat (limited to 'lessonscreen.py')
| -rw-r--r-- | lessonscreen.py | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/lessonscreen.py b/lessonscreen.py index b2d46cf..fbe38fd 100644 --- a/lessonscreen.py +++ b/lessonscreen.py @@ -266,21 +266,21 @@ class LessonScreen(gtk.VBox): self.line_marks[0] = self.lessonbuffer.create_mark(None, self.lessonbuffer.get_end_iter(), True) # Determine what modifier keys are needed. - key, level, group = self.keyboard.find_key_by_letter(self.text[0]) + key, state, group = self.keyboard.get_key_state_group_for_letter(self.text[0]) if key: - state = 0 - - # Insert shift key if positive level. - if level > 0: + if state & gtk.gdk.SHIFT_MASK: shift_key = self.keyboard.find_key_by_label('shift') pixbuf = self.keyboard.get_key_pixbuf(shift_key) self.lessonbuffer.insert_pixbuf(self.lessonbuffer.get_end_iter(), pixbuf) self.lessonbuffer.insert(self.lessonbuffer.get_end_iter(), ' ') - - # This is highly questionable but I don't have better solution yet! - state |= gtk.gdk.SHIFT_MASK + if state & gtk.gdk.MOD5_MASK: + altgr_key = self.keyboard.find_key_by_label('altgr') + pixbuf = self.keyboard.get_key_pixbuf(altgr_key) + 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) self.lessonbuffer.insert_pixbuf(self.lessonbuffer.get_end_iter(), pixbuf) |