Small updates.

3 files changed, 19 insertions, 15 deletions

diff --git a/NEWS b/NEWS
index 4c1c892..99cbd04 100644
--- a/NEWS
+++ b/NEWS
@@ -1,8 +1,5 @@
-2
-
-* More plumbing
-
 1
 
+* More plumbing
 * first version - http://wiki.sugarlabs.org/go/Activities/Toaster
 
diff --git a/ToasterActivity.py b/ToasterActivity.py
index eae490a..bd5b875 100644
--- a/ToasterActivity.py
+++ b/ToasterActivity.py
@@ -1,6 +1,6 @@
 # Copyright (c) 2007 Mitchell N. Charity
 # Copyright (c) 2009, Walter Bender
-# Copyright (c) 2009, Grant Bowman
+# Copyright (c) 2009,2010, Grant Bowman
 #
 # This file is part of Toaster.
 #
@@ -87,6 +87,8 @@ class ToasterActivity(activity.Activity):
         except:
             if os.path.exists('/sys/power/olpc-pm'):
                 self._canvas.set_dpi(200) # OLPC XO
+                # won't work for XO-1.5 - maybe see if /etc/olpc-release exists
+                # decent _get_hardware() function in Measure.activity/measure.py
             else:
                 self._canvas.set_dpi(100) # Just a guess
 
@@ -136,7 +138,7 @@ class ToasterActivity(activity.Activity):
             self.set_toolbox(toolbox)
 
             self.projectToolbar = ProjectToolbar(self)
-            toolbox.add_toolbar( _('Toasters'), self.projectToolbar )
+            toolbox.add_toolbar( _('Toaster'), self.projectToolbar )
 
             toolbox.show()
             toolbox.set_current_toolbar(1)
@@ -148,32 +150,37 @@ class ToasterActivity(activity.Activity):
     def _keyPressCb(self, widget, event)
         keyname = gtk.gdk.keyval_name(event.keyval)
         if (keyname == 'KP_Page_Up'):
-           self._chat += "\nCircle Pressed!"
+           self._chat += "\nCircle Pressed!" # needs function
            self._chat_buffer.set_text(self._chat)
         elif (keyname == 'KP_Page_Down'):
-           self._chat += "\nX Pressed!"
+           self._chat += "\nX Pressed!" # needs function
            self._chat_buffer.set_text(self._chat)
         elif (keyname == 'KP_Home'):
-           self._chat += "\nSquare Pressed!"
+           self._chat += "\nSquare Pressed!" # needs function
            self._chat_buffer.set_text(self._chat)
         elif (keyname == 'KP_End'):
-           self._chat += "\nCheck Pressed!"
+           self._chat += "\nCheck Pressed!" # needs function
            self._chat_buffer.set_text(self._chat)
         elif (keyname == 'KP_Up'):
-           self._chat += "\nUp Pressed!"
+           self._chat += "\nUp Pressed!" # needs function
            self._chat_buffer.set_text(self._chat)
         elif (keyname == 'KP_Down'):
-           self._chat += "\nDown Pressed!"
+           self._chat += "\nDown Pressed!" # needs function
            self._chat_buffer.set_text(self._chat)
         elif (keyname == 'KP_Left'):
-           self._chat += "\nLeft Pressed!"
+           self._chat += "\nLeft Pressed!" # needs function
            self._chat_buffer.set_text(self._chat)
         elif (keyname == 'KP_Right'):
-           self._chat += "\nRight Pressed!"
+           self._chat += "\nRight Pressed!" # needs function
            self._chat_buffer.set_text(self._chat)
 
         return False
 
+#    def read_file(self, filename):
+#        "Read the journal item"
+#    def write_file(self, filename):
+#        "Save meta data for the journal item"
+
 #
 # Project toolbar for pre-0.86 toolbars
 #
diff --git a/activity/activity.info b/activity/activity.info
index bc1d59f..0c4f4c2 100644
--- a/activity/activity.info
+++ b/activity/activity.info
@@ -4,7 +4,7 @@ bundle_id = org.sugarlabs.wiki.Toaster
 exec = sugar-activity ToasterActivity.ToasterActivity
 mime_types = application/x-iso9660-image
 icon = activity-toaster
-activity_version = 2
+activity_version = 1
 show_launcher = yes
 license = GPLv3+
 update_url = http://wiki.sugarlabs.org/go/Activities/Toaster