Bump version to 21.

6 files changed, 21 insertions, 2 deletions

diff --git a/NEWS b/NEWS
index a945a12..9c63c38 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,7 @@
+21
+
+* Added a lesson editor.
+
 20
 
 * #1164 Bug while starting the turtle activity
diff --git a/TODO b/TODO
index cc9135e..48ba127 100644
--- a/TODO
+++ b/TODO
@@ -30,6 +30,7 @@ Future Release
 + History screen: List of lessons completed with statistics.
 + Progress screen: Line graphs of Accuracy, WPM over time.
 + Some sort of award when all the lessons are complete, followed by general skill work.
++ Ergonomics lesson.
 
 Balloon Game
 
@@ -37,6 +38,11 @@ Balloon Game
 - Fix flickering
 + Improve graphics.
 - Support for displaying high score in home screen.
++ Swaying strings
++ Moving clouds
++ Show Balloons left, Balloons popped.
++ Put a box behind "Type the words to pop the balloons!" text.
++ Prettier balloon pictures.
 
 Paper Airplane Game
 
diff --git a/activity/activity.info b/activity/activity.info
index 7b139ed..2e09633 100644
--- a/activity/activity.info
+++ b/activity/activity.info
@@ -1,6 +1,6 @@
 [Activity]
 name = Typing Turtle
-activity_version = 20
+activity_version = 21
 host_version = 1
 service_name = org.laptop.community.TypingTurtle
 icon = Activity-typingturtle
diff --git a/editlessonscreen.py b/editlessonscreen.py
index 83040aa..9234fd9 100644
--- a/editlessonscreen.py
+++ b/editlessonscreen.py
@@ -113,6 +113,7 @@ class EditLessonScreen(gtk.VBox):
 
         stepbox.insttext = gtk.TextView(gtk.TextBuffer())
         stepbox.insttext.props.wrap_mode = gtk.WRAP_WORD
+        stepbox.insttext.modify_font(pango.FontDescription('Monospace 10'))
         instscroll = gtk.ScrolledWindow()
         instscroll.set_policy(gtk.POLICY_AUTOMATIC, gtk.POLICY_AUTOMATIC)
         instscroll.add(stepbox.insttext)
@@ -132,6 +133,7 @@ class EditLessonScreen(gtk.VBox):
 
         stepbox.texttext = gtk.TextView(gtk.TextBuffer())
         stepbox.texttext.props.wrap_mode = gtk.WRAP_WORD
+        stepbox.texttext.modify_font(pango.FontDescription('monospace 10'))
         textscroll = gtk.ScrolledWindow()
         textscroll.set_policy(gtk.POLICY_AUTOMATIC, gtk.POLICY_AUTOMATIC)
         textscroll.add(stepbox.texttext)
@@ -293,6 +295,7 @@ class EditLessonScreen(gtk.VBox):
 
             self.wordstext = gtk.TextView(gtk.TextBuffer())
             self.wordstext.props.wrap_mode = gtk.WRAP_WORD
+            self.wordstext.modify_font(pango.FontDescription('Monospace 10'))
             textscroll = gtk.ScrolledWindow()
             textscroll.set_policy(gtk.POLICY_AUTOMATIC, gtk.POLICY_AUTOMATIC)
             textscroll.add(self.wordstext)
diff --git a/keyboard.py b/keyboard.py
index f347790..076f015 100644
--- a/keyboard.py
+++ b/keyboard.py
@@ -409,6 +409,8 @@ class KeyboardWidget(KeyboardData, gtk.DrawingArea):
 
         self.connect("expose-event", self._expose_cb)
         
+        self.modify_font(pango.FontDescription('Monospace 10'))
+        
         # Active language group and modifier state.
         # See http://www.pygtk.org/docs/pygtk/class-gdkkeymap.html for more
         # information about key group and state.
@@ -500,7 +502,8 @@ class KeyboardWidget(KeyboardData, gtk.DrawingArea):
         
         try:
             layout = self.create_pango_layout(unicode(text))
-            draw.draw_layout(gc, x1+8, y2-28, layout)
+            layout.set_font_description(pango.FontDescription('Monospace 12'))
+            draw.draw_layout(gc, x1+8, y2-23, layout)
         except:
             pass
 
diff --git a/lessonscreen.py b/lessonscreen.py
index f8c0b0d..b488df7 100644
--- a/lessonscreen.py
+++ b/lessonscreen.py
@@ -54,6 +54,9 @@ class LessonScreen(gtk.VBox):
         stopbtn.connect('clicked', self.stop_cb)
         
         # TODO- These will be replaced by graphical displays using gtk.DrawingArea.
+        self.wpm = 0
+        self.accuracy = 0
+        
         self.wpmlabel = gtk.Label()
         self.accuracylabel = gtk.Label()