new project

25 files changed, 4110 insertions, 0 deletions

diff --git a/BBoardActivity.py b/BBoardActivity.py
new file mode 100644
index 0000000..30479dd
--- /dev/null
+++ b/BBoardActivity.py
@@ -0,0 +1,970 @@
+# -*- coding: utf-8 -*-
+#Copyright (c) 2011, 2012 Walter Bender
+
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3 of the License, or
+# (at your option) any later version.
+#
+# You should have received a copy of the GNU General Public License
+# along with this library; if not, write to the Free Software
+# Foundation, 51 Franklin Street, Suite 500 Boston, MA 02110-1335 USA
+
+
+import gtk
+import gobject
+import subprocess
+import os
+import time
+from shutil import copyfile
+
+from math import sqrt, ceil
+
+from sugar.activity import activity
+from sugar import profile
+try:
+    from sugar.graphics.toolbarbox import ToolbarBox
+    HAVE_TOOLBOX = True
+except ImportError:
+    HAVE_TOOLBOX = False
+
+if HAVE_TOOLBOX:
+    from sugar.activity.widgets import ActivityToolbarButton
+    from sugar.activity.widgets import StopButton
+    from sugar.graphics.toolbarbox import ToolbarButton
+
+from sugar.datastore import datastore
+from sugar.graphics.alert import Alert
+
+import telepathy
+from dbus.service import signal
+from dbus.gobject_service import ExportedGObject
+from sugar.presence import presenceservice
+from sugar.presence.tubeconn import TubeConnection
+
+SERVICE = 'org.sugarlabs.BBoardActivity'
+IFACE = SERVICE
+
+try:
+    _OLD_SUGAR_SYSTEM = False
+    import json
+    from json import load as jload
+    from json import dump as jdump
+except(ImportError, AttributeError):
+    try:
+        import simplejson as json
+        from simplejson import load as jload
+        from simplejson import dump as jdump
+    except ImportError:
+        _OLD_SUGAR_SYSTEM = True
+from StringIO import StringIO
+
+from sprites import Sprites, Sprite
+from exportpdf import save_pdf
+from utils import get_path, lighter_color, svg_str_to_pixbuf, \
+    play_audio_from_file, get_pixbuf_from_journal, genblank, get_hardware, \
+    svg_rectangle
+from toolbar_utils import radio_factory, \
+    button_factory, separator_factory, combo_factory, label_factory
+from grecord import Grecord
+
+from gettext import gettext as _
+
+import logging
+_logger = logging.getLogger("bboard-activity")
+
+try:
+    from sugar.graphics import style
+    GRID_CELL_SIZE = style.GRID_CELL_SIZE
+except ImportError:
+    GRID_CELL_SIZE = 0
+
+# Size and position of title, preview image, and description
+PREVIEWW = 600
+PREVIEWH = 450
+PREVIEWY = 80
+TITLEH = 60
+DESCRIPTIONH = 250
+DESCRIPTIONX = 50
+DESCRIPTIONY = 550
+
+XO1 = 'xo1'
+XO15 = 'xo1.5'
+XO175 = 'xo1.75'
+UNKNOWN = 'unknown'
+
+# sprite layers
+DRAG = 6
+STAR = 5
+TOP = 4
+UNDRAG = 3
+MIDDLE = 2
+BOTTOM = 1
+HIDE = 0
+
+class Slide():
+    ''' A container for a slide '''
+
+    def __init__(self, owner, uid, colors, title, pixbuf, desc):
+        self.owner = owner
+        self.uid = uid
+        self.colors = colors
+        self.title = title
+        self.pixbuf = pixbuf
+        self.desc = desc
+
+
+class BBoardActivity(activity.Activity):
+    ''' Make a slideshow from starred Journal entries. '''
+
+    def __init__(self, handle):
+        ''' Initialize the toolbars and the work surface '''
+        super(BBoardActivity, self).__init__(handle)
+
+        self.datapath = get_path(activity, 'instance')
+
+        self._hw = get_hardware()
+
+        self._setup_toolbars()
+        self._setup_canvas()
+
+        self.slides = []
+        self._setup_workspace()
+
+        self.buddies = []
+        self._setup_presence_service()
+
+        self._thumbs = []
+        self._thumbnail_mode = False
+
+        self._recording = False
+        self._grecord = None
+        self._alert = None
+
+        self._dirty = False
+
+    def _setup_canvas(self):
+        ''' Create a canvas '''
+        self._canvas = gtk.DrawingArea()
+        self._canvas.set_size_request(int(gtk.gdk.screen_width()),
+                                      int(gtk.gdk.screen_height()))
+        self._canvas.show()
+        self.set_canvas(self._canvas)
+        self.show_all()
+
+        self._canvas.set_flags(gtk.CAN_FOCUS)
+        self._canvas.add_events(gtk.gdk.BUTTON_PRESS_MASK)
+        self._canvas.add_events(gtk.gdk.POINTER_MOTION_MASK)
+        self._canvas.add_events(gtk.gdk.BUTTON_RELEASE_MASK)
+        self._canvas.add_events(gtk.gdk.KEY_PRESS_MASK)
+        self._canvas.connect("expose-event", self._expose_cb)
+        self._canvas.connect("button-press-event", self._button_press_cb)
+        self._canvas.connect("button-release-event", self._button_release_cb)
+        self._canvas.connect("motion-notify-event", self._mouse_move_cb)
+
+    def _setup_workspace(self):
+        ''' Prepare to render the datastore entries. '''
+        self.colors = profile.get_color().to_string().split(',')
+
+        # Use the lighter color for the text background
+        if lighter_color(self.colors) == 0:
+            tmp = self.colors[0]
+            self.colors[0] = self.colors[1]
+            self.colors[1] = tmp
+
+        self._width = gtk.gdk.screen_width()
+        self._height = gtk.gdk.screen_height()
+        self._scale = gtk.gdk.screen_height() / 900.
+
+        if not HAVE_TOOLBOX and self._hw[0:2] == 'xo':
+            titlef = 18
+            descriptionf = 12
+        else:
+            titlef = 36
+            descriptionf = 24
+
+        self._find_starred()
+        for ds in self.dsobjects:
+            if 'title' in ds.metadata:
+                title = ds.metadata['title']
+            else:
+                title = None
+            pixbuf = None
+            media_object = False
+            mimetype = None
+            if 'mime_type' in ds.metadata:
+                mimetype = ds.metadata['mime_type']
+            if mimetype[0:5] == 'image':
+                pixbuf = gtk.gdk.pixbuf_new_from_file_at_size(
+                    ds.file_path, int(PREVIEWW * self._scale),
+                    int(PREVIEWH * self._scale))
+                media_object = True
+            else:
+                pixbuf = get_pixbuf_from_journal(ds, 300, 225)
+            if 'description' in ds.metadata:
+                desc = ds.metadata['description']
+            else:
+                desc = None
+            self.slides.append(Slide(True, ds.object_id, self.colors,
+                                     title, pixbuf, desc))
+
+        # Generate the sprites we'll need...
+        self._sprites = Sprites(self._canvas)
+
+        self._help = Sprite(
+            self._sprites,
+            int((self._width - int(PREVIEWW * self._scale)) / 2),
+            int(PREVIEWY * self._scale),
+            gtk.gdk.pixbuf_new_from_file_at_size(
+                os.path.join(activity.get_bundle_path(), 'help.png'),
+                int(PREVIEWW * self._scale), int(PREVIEWH * self._scale)))
+        self._help.hide()
+
+        self._title = Sprite(self._sprites, 0, 0, svg_str_to_pixbuf(
+                genblank(self._width, int(TITLEH * self._scale),
+                          self.colors)))
+        self._title.set_label_attributes(int(titlef * self._scale),
+                                         rescale=False)
+        self._preview = Sprite(self._sprites,
+            int((self._width - int(PREVIEWW * self._scale)) / 2),
+            int(PREVIEWY * self._scale), svg_str_to_pixbuf(genblank(
+                    int(PREVIEWW * self._scale), int(PREVIEWH * self._scale),
+                    self.colors)))
+
+        self._description = Sprite(self._sprites,
+                                   int(DESCRIPTIONX * self._scale),
+                                   int(DESCRIPTIONY * self._scale),
+                                   svg_str_to_pixbuf(
+                genblank(int(self._width - (2 * DESCRIPTIONX * self._scale)),
+                          int(DESCRIPTIONH * self._scale),
+                          self.colors)))
+        self._description.set_label_attributes(int(descriptionf * self._scale))
+
+        self._my_canvas = Sprite(
+            self._sprites, 0, 0, svg_str_to_pixbuf(genblank(
+                    self._width, self._height, (self.colors[0],
+                                                self.colors[0]))))
+        self._my_canvas.set_layer(BOTTOM)
+
+        self._clear_screen()
+
+        self.i = 0
+        self._show_slide()
+
+        self._playing = False
+        self._rate = 10
+
+    def _setup_toolbars(self):
+        ''' Setup the toolbars. '''
+
+        self.max_participants = 6
+
+        if HAVE_TOOLBOX:
+            toolbox = ToolbarBox()
+
+            # Activity toolbar
+            activity_button_toolbar = ActivityToolbarButton(self)
+
+            toolbox.toolbar.insert(activity_button_toolbar, 0)
+            activity_button_toolbar.show()
+
+            self.set_toolbar_box(toolbox)
+            toolbox.show()
+            self.toolbar = toolbox.toolbar
+
+            record_toolbar = gtk.Toolbar()
+            record_toolbar_button = ToolbarButton(
+                label=_('Record a sound'),
+                page=record_toolbar,
+                icon_name='media-audio')
+            record_toolbar.show_all()
+            record_toolbar_button.show()
+        else:
+            # Use pre-0.86 toolbar design
+            primary_toolbar = gtk.Toolbar()
+            toolbox = activity.ActivityToolbox(self)
+            self.set_toolbox(toolbox)
+            toolbox.add_toolbar(_('Page'), primary_toolbar)
+            record_toolbar = gtk.Toolbar()
+            toolbox.add_toolbar(_('Record'), record_toolbar)
+            toolbox.show()
+            toolbox.set_current_toolbar(1)
+            self.toolbar = primary_toolbar
+
+        self._prev_button = button_factory(
+            'go-previous-inactive', self.toolbar, self._prev_cb,
+            tooltip=_('Prev slide'), accelerator='<Ctrl>P')
+
+        self._next_button = button_factory(
+            'go-next', self.toolbar, self._next_cb,
+            tooltip=_('Next slide'), accelerator='<Ctrl>N')
+
+        if HAVE_TOOLBOX:
+            toolbox.toolbar.insert(record_toolbar_button, -1)
+
+        slide_button = radio_factory('slide-view', self.toolbar,
+                                     self._slides_cb, group=None,
+                                     tooltip=_('Slide view'))
+
+        radio_factory('thumbs-view', self.toolbar, self._thumbs_cb,
+                      tooltip=_('Thumbnail view'),
+                      group=slide_button)
+
+        button_factory('view-fullscreen', self.toolbar,
+                       self.do_fullscreen_cb, tooltip=_('Fullscreen'),
+                       accelerator='<Alt>Return')
+
+        separator_factory(self.toolbar)
+
+        journal_button = button_factory(
+            'write-journal', self.toolbar, self._do_journal_cb,
+            tooltip=_('Update description'))
+        self._palette = journal_button.get_palette()
+        msg_box = gtk.HBox()
+
+        sw = gtk.ScrolledWindow()
+        sw.set_size_request(int(gtk.gdk.screen_width() / 2),
+                            2 * style.GRID_CELL_SIZE)
+        sw.set_policy(gtk.POLICY_AUTOMATIC, gtk.POLICY_AUTOMATIC)
+        self._text_view = gtk.TextView()
+        self._text_view.set_left_margin(style.DEFAULT_PADDING)
+        self._text_view.set_right_margin(style.DEFAULT_PADDING)
+        self._text_view.set_wrap_mode(gtk.WRAP_WORD_CHAR)
+        self._text_view.connect('focus-out-event',
+                               self._text_view_focus_out_event_cb)
+        sw.add(self._text_view)
+        sw.show()
+        msg_box.pack_start(sw, expand=False)
+        msg_box.show_all()
+
+        self._palette.set_content(msg_box)
+
+        label_factory(record_toolbar, _('Record a sound') + ':')
+        self._record_button = button_factory(
+            'media-record', record_toolbar,
+            self._record_cb, tooltip=_('Start recording'))
+
+        separator_factory(record_toolbar)
+
+        self._playback_button = button_factory(
+            'media-playback-start-insensitive',  record_toolbar,
+            self._playback_recording_cb, tooltip=_('Nothing to play'))
+
+        self._save_recording_button = button_factory(
+            'sound-save-insensitive', record_toolbar,
+            self._wait_for_transcoding_to_finish, tooltip=_('Nothing to save'))
+
+        if HAVE_TOOLBOX:
+            separator_factory(activity_button_toolbar)
+            self._save_pdf = button_factory(
+                'save-as-pdf', activity_button_toolbar,
+                self._save_as_pdf_cb, tooltip=_('Save as PDF'))
+        else:
+            separator_factory(self.toolbar)
+            self._save_pdf = button_factory(
+                'save-as-pdf', self.toolbar,
+                self._save_as_pdf_cb, tooltip=_('Save as PDF'))
+
+        if HAVE_TOOLBOX:
+            separator_factory(toolbox.toolbar, True, False)
+
+            stop_button = StopButton(self)
+            stop_button.props.accelerator = '<Ctrl>q'
+            toolbox.toolbar.insert(stop_button, -1)
+            stop_button.show()
+
+    def _do_journal_cb(self, button):
+        self._dirty = True
+        if self._palette:
+            if not self._palette.is_up():
+                self._palette.popup(immediate=True,
+                                    state=self._palette.SECONDARY)
+            else:
+                self._palette.popdown(immediate=True)
+            return 
+
+    def _text_view_focus_out_event_cb(self, widget, event):
+        buffer = self._text_view.get_buffer()
+        start_iter = buffer.get_start_iter()
+        end_iter = buffer.get_end_iter()
+        self.slides[self.i].desc = buffer.get_text(start_iter, end_iter)
+        self._show_slide()
+
+    def _destroy_cb(self, win, event):
+        ''' Clean up on the way out. '''
+        gtk.main_quit()
+
+    def _find_starred(self):
+        ''' Find all the favorites in the Journal. '''
+        self.dsobjects, nobjects = datastore.find({'keep': '1'})
+        _logger.debug('found %d starred items', nobjects)
+
+    def _prev_cb(self, button=None):
+        ''' The previous button has been clicked; goto previous slide. '''
+        if self.i > 0:
+            self.i -= 1
+            self._show_slide(direction=-1)
+
+    def _next_cb(self, button=None):
+        ''' The next button has been clicked; goto next slide. '''
+        if self.i < len(self.slides) - 1:
+            self.i += 1
+            self._show_slide()
+
+    def _save_as_pdf_cb(self, button=None):
+        ''' Export an PDF version of the slideshow to the Journal. '''
+        _logger.debug('saving to PDF...')
+        tmp_file = save_pdf(self, profile.get_nick_name())
+
+        _logger.debug('copying PDF file to Journal...')
+        dsobject = datastore.create()
+        dsobject.metadata['title'] = profile.get_nick_name() + ' ' + \
+                                     _('Bboard')
+        dsobject.metadata['icon-color'] = profile.get_color().to_string()
+        dsobject.metadata['mime_type'] = 'application/pdf'
+        dsobject.set_file_path(tmp_file)
+        dsobject.metadata['activity'] = 'org.laptop.sugar.ReadActivity'
+        datastore.write(dsobject)
+        dsobject.destroy()
+        return
+
+    def _clear_screen(self):
+        ''' Clear the screen to the darker of the two XO colors. '''
+        self._title.hide()
+        self._preview.hide()
+        self._description.hide()
+        if hasattr(self, '_thumbs'):
+            for thumbnail in self._thumbs:
+                thumbnail[0].hide()
+        self.invalt(0, 0, self._width, self._height)
+
+        # Reset drag settings
+        self._press = None
+        self._release = None
+        self._dragpos = [0, 0]
+        self._total_drag = [0, 0]
+        self.last_spr_moved = None
+
+    def _show_slide(self, direction=1):
+        ''' Display a title, preview image, and decription for slide
+        i. Play an audio note if there is one recorded for this
+        object. '''
+        self._clear_screen()
+
+        if len(self.slides) == 0:
+            self._prev_button.set_icon('go-previous-inactive')
+            self._next_button.set_icon('go-next-inactive')
+            self._description.set_label(
+                _('Do you have any items in your Journal starred?'))
+            self._help.set_layer(TOP)
+            self._description.set_layer(MIDDLE)
+            return
+
+        self.i += direction
+        if self.i < 0:
+            self.i = len(self.slides) - 1
+        elif self.i > len(self.slides) - 1:
+            self.i = 0
+
+        if self.i == 0:
+            self._prev_button.set_icon('go-previous-inactive')
+        else:
+            self._prev_button.set_icon('go-previous')
+        if self.i == len(self.slides) - 1:
+            self._next_button.set_icon('go-next-inactive')
+        else:
+            self._next_button.set_icon('go-next')
+
+        # _logger.debug('Showing slide %d', self.i)
+        pixbuf = self.slides[self.i].pixbuf
+        if pixbuf is not None:
+            self._preview.set_shape(pixbuf.scale_simple(
+                    int(PREVIEWW * self._scale),
+                    int(PREVIEWH * self._scale),
+                    gtk.gdk.INTERP_NEAREST))
+            self._preview.set_layer(MIDDLE)
+        else:
+            if self._preview is not None:
+                self._preview.hide()
+
+        self._title.set_label(self.slides[self.i].title)
+        self._title.set_layer(MIDDLE)
+
+        if 'description' in self.dsobjects[self.i].metadata:
+            self._description.set_label(self.slides[self.i].desc)
+            self._description.set_layer(MIDDLE)
+            text_buffer = gtk.TextBuffer()
+            text_buffer.set_text(self.slides[self.i].desc)
+            self._text_view.set_buffer(text_buffer)
+        else:
+            self._description.set_label('')
+            self._description.hide()
+
+        audio_obj = self._search_for_audio_note(self.slides[self.i].uid)
+        if audio_obj is not None:
+            _logger.debug('Playing audio note')
+            gobject.idle_add(play_audio_from_file, audio_obj.file_path)
+            self._playback_button.set_icon('media-playback-start')
+            self._playback_button.set_tooltip(_('Play recording'))
+        else:
+            self._playback_button.set_icon('media-playback-start-insensitive')
+            self._playback_button.set_tooltip(_('Nothing to play'))
+
+    def _slides_cb(self, button=None):
+        if self._thumbnail_mode:
+            self._thumbnail_mode = False
+            self.i = self._current_slide
+            self._show_slide()
+
+    def _thumbs_cb(self, button=None):
+        ''' Toggle between thumbnail view and slideshow view. '''
+        if not self._thumbnail_mode:
+            self._current_slide = self.i
+            self._thumbnail_mode = True
+            self._clear_screen()
+
+            self._prev_button.set_icon('go-previous-inactive')
+            self._next_button.set_icon('go-next-inactive')
+
+            n = int(ceil(sqrt(len(self.slides))))
+            if n > 0:
+                w = int(self._width / n)
+            else:
+                w = self._width
+            h = int(w * 0.75)  # maintain 4:3 aspect ratio
+            x_off = int((self._width - n * w) / 2)
+            x = x_off
+            y = 0
+            for i in range(len(self.slides)):
+                self.i = i
+                self._show_thumb(x, y, w, h)
+                x += w
+                if x + w > self._width:
+                    x = x_off
+                    y += h
+            self.i = 0  # Reset position in slideshow to the beginning
+        return False
+
+    def _show_thumb(self, x, y, w, h):
+        ''' Display a preview image and title as a thumbnail. '''
+
+        if len(self._thumbs) < self.i + 1:
+            # Create a Sprite for this thumbnail
+            pixbuf = self.slides[self.i].pixbuf
+            if pixbuf is not None:
+                pixbuf_thumb = pixbuf.scale_simple(int(w), int(h),
+                                                   gtk.gdk.INTERP_TILES)
+            else:
+                pixbuf_thumb = svg_str_to_pixbuf(genblank(int(w), int(h),
+                                                          self.colors))
+            self._thumbs.append([Sprite(self._sprites, x, y, pixbuf_thumb),
+                                     x, y, self.i])
+            self._thumbs[-1][0].set_image(svg_str_to_pixbuf(
+                    svg_rectangle(int(w), int(h), self.colors)), i=1)
+            self._thumbs[-1][0].set_label(str(self.i + 1))
+        self._thumbs[self.i][0].set_layer(TOP)
+
+    def _expose_cb(self, win, event):
+        ''' Callback to handle window expose events '''
+        self.do_expose_event(event)
+        return True
+
+    # Handle the expose-event by drawing
+    def do_expose_event(self, event):
+
+        # Create the cairo context
+        cr = self.canvas.window.cairo_create()
+
+        # Restrict Cairo to the exposed area; avoid extra work
+        cr.rectangle(event.area.x, event.area.y,
+                event.area.width, event.area.height)
+        cr.clip()
+
+        # Refresh sprite list
+        self._sprites.redraw_sprites(cr=cr)
+
+    def write_file(self, file_path):
+        ''' Clean up '''
+        if self._dirty:
+            self._save_descriptions_cb()
+            self._dirty = False
+        if os.path.exists(os.path.join(self.datapath, 'output.ogg')):
+            os.remove(os.path.join(self.datapath, 'output.ogg'))
+
+    def do_fullscreen_cb(self, button):
+        ''' Hide the Sugar toolbars. '''
+        self.fullscreen()
+
+    def invalt(self, x, y, w, h):
+        ''' Mark a region for refresh '''
+        self._canvas.window.invalidate_rect(
+            gtk.gdk.Rectangle(int(x), int(y), int(w), int(h)), False)
+
+    def _spr_to_thumb(self, spr):
+        ''' Find which entry in the thumbnails table matches spr. '''
+        for i, thumb in enumerate(self._thumbs):
+            if spr == thumb[0]:
+                return i
+        return -1
+
+    def _spr_is_thumbnail(self, spr):
+        ''' Does spr match an entry in the thumbnails table? '''
+        if self._spr_to_thumb(spr) == -1:
+            return False
+        else:
+            return True
+
+    def _button_press_cb(self, win, event):
+        ''' The mouse button was pressed. Is it on a thumbnail sprite? '''
+        win.grab_focus()
+        x, y = map(int, event.get_coords())
+
+        self._dragpos = [x, y]
+        self._total_drag = [0, 0]
+
+        spr = self._sprites.find_sprite((x, y))
+        self._press = None
+        self._release = None
+
+        # Are we clicking on a thumbnail?
+        if not self._spr_is_thumbnail(spr):
+            return False
+
+        self.last_spr_moved = spr
+        self._press = spr
+        self._press.set_layer(DRAG)
+        return False
+
+    def _mouse_move_cb(self, win, event):
+        """ Drag a thumbnail with the mouse. """
+        spr = self._press
+        if spr is None:
+            self._dragpos = [0, 0]
+            return False
+        win.grab_focus()
+        x, y = map(int, event.get_coords())
+        dx = x - self._dragpos[0]
+        dy = y - self._dragpos[1]
+        spr.move_relative([dx, dy])
+        # Also move the star
+        self._dragpos = [x, y]
+        self._total_drag[0] += dx
+        self._total_drag[1] += dy
+        return False
+
+    def _button_release_cb(self, win, event):
+        ''' Button event is used to swap slides or goto next slide. '''
+        win.grab_focus()
+        self._dragpos = [0, 0]
+        x, y = map(int, event.get_coords())
+
+        if self._thumbnail_mode:
+            if self._press is None:
+                return
+            # Drop the dragged thumbnail below the other thumbnails so
+            # that you can find the thumbnail beneath it.
+            self._press.set_layer(UNDRAG)
+            i = self._spr_to_thumb(self._press)
+            spr = self._sprites.find_sprite((x, y))
+            if self._spr_is_thumbnail(spr):
+                self._release = spr
+                # If we found a thumbnail and it is not the one we
+                # dragged, swap their positions.
+                if not self._press == self._release:
+                    j = self._spr_to_thumb(self._release)
+                    self._thumbs[i][0] = self._release
+                    self._thumbs[j][0] = self._press
+                    tmp = self.dsobjects[i]
+                    self.dsobjects[i] = self.dsobjects[j]
+                    self.dsobjects[j] = tmp
+                    self._thumbs[j][0].move((self._thumbs[j][1],
+                                             self._thumbs[j][2]))
+            self._thumbs[i][0].move((self._thumbs[i][1], self._thumbs[i][2]))
+            self._press.set_layer(TOP)
+            self._press = None
+            self._release = None
+        else:
+            self._next_cb()
+        return False
+
+    def _unit_combo_cb(self, arg=None):
+        ''' Read value of predefined conversion factors from combo box '''
+        if hasattr(self, '_unit_combo'):
+            active = self._unit_combo.get_active()
+            if active in UNIT_DICTIONARY:
+                self._rate = UNIT_DICTIONARY[active][1]
+
+    def _record_cb(self, button=None):
+        ''' Start/stop audio recording '''
+        if self._grecord is None:
+            _logger.debug('setting up grecord')
+            self._grecord = Grecord(self)
+        if self._recording:  # Was recording, so stop (and save?)
+            _logger.debug('recording...True. Preparing to save.')
+            self._grecord.stop_recording_audio()
+            self._recording = False
+            self._record_button.set_icon('media-record')
+            self._record_button.set_tooltip(_('Start recording'))
+            self._playback_button.set_icon('media-playback-start')
+            self._playback_button.set_tooltip(_('Play recording'))
+            self._save_recording_button.set_icon('sound-save')
+            self._save_recording_button.set_tooltip(_('Save recording'))
+            # Autosave if there was not already a recording
+            if self._search_for_audio_note(
+                self.dsobjects[self.i].object_id) is None:
+                _logger.debug('Autosaving recording')
+                self._notify_successful_save(title=_('Save recording'))
+                gobject.timeout_add(100, self._wait_for_transcoding_to_finish)
+            else:
+                _logger.debug('Waiting for manual save.')
+        else:  # Wasn't recording, so start
+            _logger.debug('recording...False. Start recording.')
+            self._grecord.record_audio()
+            self._recording = True
+            self._record_button.set_icon('media-recording')
+            self._record_button.set_tooltip(_('Stop recording'))
+
+    def _wait_for_transcoding_to_finish(self, button=None):
+        while not self._grecord.transcoding_complete():
+            time.sleep(1)
+        if self._alert is not None:
+            self.remove_alert(self._alert)
+            self._alert = None
+        self._save_recording()
+
+    def _playback_recording_cb(self, button=None):
+        ''' Play back current recording '''
+        _logger.debug('Playback current recording from output.ogg...')
+        play_audio_from_file(os.path.join(self.datapath, 'output.ogg'))
+        return
+
+    def _save_recording(self):
+        if os.path.exists(os.path.join(self.datapath, 'output.ogg')):
+            _logger.debug('Saving recording to Journal...')
+            obj_id = self.dsobjects[self.i].object_id
+            copyfile(os.path.join(self.datapath, 'output.ogg'),
+                     os.path.join(self.datapath, '%s.ogg' % (obj_id)))
+            dsobject = self._search_for_audio_note(obj_id)
+            if dsobject is None:
+                dsobject = datastore.create()
+            if dsobject is not None:
+                _logger.debug(self.dsobjects[self.i].metadata['title'])
+                dsobject.metadata['title'] = _('audio note for %s') % \
+                    (self.dsobjects[self.i].metadata['title'])
+                dsobject.metadata['icon-color'] = \
+                    profile.get_color().to_string()
+                dsobject.metadata['tags'] = obj_id
+                dsobject.metadata['mime_type'] = 'audio/ogg'
+                dsobject.set_file_path(
+                    os.path.join(self.datapath, '%s.ogg' % (obj_id)))
+                    # os.path.join(self.datapath, 'output.ogg'))
+                datastore.write(dsobject)
+                dsobject.destroy()
+        else:
+            _logger.debug('Nothing to save...')
+        return
+
+    def _search_for_audio_note(self, obj_id):
+        ''' Look to see if there is already a sound recorded for this
+        dsobject '''
+        dsobjects, nobjects = datastore.find({'mime_type': ['audio/ogg']})
+        # Look for tag that matches the target object id
+        for dsobject in dsobjects:
+            if 'tags' in dsobject.metadata and \
+               obj_id in dsobject.metadata['tags']:
+                _logger.debug('Found audio note')
+                return dsobject
+        return None
+
+    def _save_descriptions_cb(self, button=None):
+        ''' Find the object in the datastore and write out the changes
+        to the decriptions. '''
+        for s in self.slides:
+            if not s.owner:
+                continue
+            jobject = datastore.get(s.uid)
+            jobject.metadata['description'] = s.desc
+            datastore.write(jobject, update_mtime=False,
+                            reply_handler=self.datastore_write_cb,
+                            error_handler=self.datastore_write_error_cb)
+
+    def datastore_write_cb(self):
+        pass
+
+    def datastore_write_error_cb(self, error):
+        _logger.error('datastore_write_error_cb: %r' % error)
+
+    def _notify_successful_save(self, title='', msg=''):
+        ''' Notify user when saves are completed '''
+        self._alert = Alert()
+        self._alert.props.title = title
+        self._alert.props.msg = msg
+        self.add_alert(self._alert)
+        self._alert.show()
+
+    # Serialize
+
+    def _dump(self, slide):
+        ''' Dump data for sharing.'''
+        data = []
+        data.append(slide.uid, slide.colors, slide.title, slide.desc,
+                    slide.pixbuf)
+        return self._data_dumper(data)
+
+    def _data_dumper(self, data):
+        if _OLD_SUGAR_SYSTEM:
+            return json.write(data)
+        else:
+            io = StringIO()
+            jdump(data, io)
+            return io.getvalue()
+
+    def _load(self, data):
+        ''' Load game data from the journal. '''
+        slide = self._data_loader(data)
+        if len(slide) == 5:
+            if not self._slide_search(slide[0]):
+                self.slides.append(Slide(False, slide[0], slide[1], slide[2],
+                                         slide[4], slide[3]))
+
+    def _slide_search(self, uid):
+        ''' Is this slide in the list already? '''
+        for s in self.slides:
+            if s.uid == uid:
+                return True
+        return False
+
+    def _data_loader(self, data):
+        if _OLD_SUGAR_SYSTEM:
+            return json.read(data)
+        else:
+            io = StringIO(data)
+            return jload(io)
+
+    # Sharing-related methods
+
+    def _setup_presence_service(self):
+        ''' Setup the Presence Service. '''
+        self.pservice = presenceservice.get_instance()
+        self.initiating = None  # sharing (True) or joining (False)
+
+        owner = self.pservice.get_owner()
+        self.owner = owner
+        self.buddies.append(self.owner)
+        self._share = ''
+        self.connect('shared', self._shared_cb)
+        self.connect('joined', self._joined_cb)
+
+    def _shared_cb(self, activity):
+        ''' Either set up initial share...'''
+        if self._shared_activity is None:
+            _logger.error('Failed to share or join activity ... \
+                _shared_activity is null in _shared_cb()')
+            return
+
+        self.initiating = True
+        self.waiting = False
+        _logger.debug('I am sharing...')
+
+        self.conn = self._shared_activity.telepathy_conn
+        self.tubes_chan = self._shared_activity.telepathy_tubes_chan
+        self.text_chan = self._shared_activity.telepathy_text_chan
+
+        self.tubes_chan[telepathy.CHANNEL_TYPE_TUBES].connect_to_signal(
+            'NewTube', self._new_tube_cb)
+
+        _logger.debug('This is my activity: making a tube...')
+        id = self.tubes_chan[telepathy.CHANNEL_TYPE_TUBES].OfferDBusTube(
+            SERVICE, {})
+
+    def _joined_cb(self, activity):
+        ''' ...or join an exisiting share. '''
+        if self._shared_activity is None:
+            _logger.error('Failed to share or join activity ... \
+                _shared_activity is null in _shared_cb()')
+            return
+
+        self.initiating = False
+        _logger.debug('I joined a shared activity.')
+
+        self.conn = self._shared_activity.telepathy_conn
+        self.tubes_chan = self._shared_activity.telepathy_tubes_chan
+        self.text_chan = self._shared_activity.telepathy_text_chan
+
+        self.tubes_chan[telepathy.CHANNEL_TYPE_TUBES].connect_to_signal(\
+            'NewTube', self._new_tube_cb)
+
+        _logger.debug('I am joining an activity: waiting for a tube...')
+        self.tubes_chan[telepathy.CHANNEL_TYPE_TUBES].ListTubes(
+            reply_handler=self._list_tubes_reply_cb,
+            error_handler=self._list_tubes_error_cb)
+
+        self.waiting = True
+
+    def _list_tubes_reply_cb(self, tubes):
+        ''' Reply to a list request. '''
+        for tube_info in tubes:
+            self._new_tube_cb(*tube_info)
+
+    def _list_tubes_error_cb(self, e):
+        ''' Log errors. '''
+        _logger.error('ListTubes() failed: %s', e)
+
+    def _new_tube_cb(self, id, initiator, type, service, params, state):
+        ''' Create a new tube. '''
+        _logger.debug('New tube: ID=%d initator=%d type=%d service=%s '
+                     'params=%r state=%d', id, initiator, type, service,
+                     params, state)
+
+        if (type == telepathy.TUBE_TYPE_DBUS and service == SERVICE):
+            if state == telepathy.TUBE_STATE_LOCAL_PENDING:
+                self.tubes_chan[ \
+                              telepathy.CHANNEL_TYPE_TUBES].AcceptDBusTube(id)
+
+            tube_conn = TubeConnection(self.conn,
+                self.tubes_chan[telepathy.CHANNEL_TYPE_TUBES], id, \
+                group_iface=self.text_chan[telepathy.CHANNEL_INTERFACE_GROUP])
+
+            self.chattube = ChatTube(tube_conn, self.initiating, \
+                self.event_received_cb)
+
+            if self.waiting:
+                self._send_event('j')
+
+    def event_received_cb(self, text):
+        ''' Data is passed as tuples: cmd:text '''
+        if text[0] == 's':  # shared journal objects
+            e, data = text.split(':')
+            self._load(data)
+        elif text[0] == 'j':  # Someone new has joined, so everyone must share
+            for s in self.slides:
+                if s.owner:  # Maybe stagger the timing of the sends?
+                    self._send_event('s:' + str(self._dump(s)))
+
+    def _send_event(self, entry):
+        ''' Send event through the tube. '''
+        if hasattr(self, 'chattube') and self.chattube is not None:
+            self.chattube.SendText(entry)
+
+
+class ChatTube(ExportedGObject):
+    ''' Class for setting up tube for sharing '''
+    def __init__(self, tube, is_initiator, stack_received_cb):
+        super(ChatTube, self).__init__(tube, PATH)
+        self.tube = tube
+        self.is_initiator = is_initiator  # Are we sharing or joining activity?
+        self.stack_received_cb = stack_received_cb
+        self.stack = ''
+
+        self.tube.add_signal_receiver(self.send_stack_cb, 'SendText', IFACE,
+                                      path=PATH, sender_keyword='sender')
+
+    def send_stack_cb(self, text, sender=None):
+        if sender == self.tube.get_unique_name():
+            return
+        self.stack = text
+        self.stack_received_cb(text)
+
+    @signal(dbus_interface=IFACE, signature='s')
+    def SendText(self, text):
+        self.stack = text
diff --git a/COPYING b/COPYING
new file mode 100644
index 0000000..10926e8
--- /dev/null
+++ b/COPYING
@@ -0,0 +1,675 @@
+                    GNU GENERAL PUBLIC LICENSE
+                       Version 3, 29 June 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+                            Preamble
+
+  The GNU General Public License is a free, copyleft license for
+software and other kinds of works.
+
+  The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works.  By contrast,
+the GNU General Public License is intended to guarantee your freedom to
+share and change all versions of a program--to make sure it remains free
+software for all its users.  We, the Free Software Foundation, use the
+GNU General Public License for most of our software; it applies also to
+any other work released this way by its authors.  You can apply it to
+your programs, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+them if you wish), that you receive source code or can get it if you
+want it, that you can change the software or use pieces of it in new
+free programs, and that you know you can do these things.
+
+  To protect your rights, we need to prevent others from denying you
+these rights or asking you to surrender the rights.  Therefore, you have
+certain responsibilities if you distribute copies of the software, or if
+you modify it: responsibilities to respect the freedom of others.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must pass on to the recipients the same
+freedoms that you received.  You must make sure that they, too, receive
+or can get the source code.  And you must show them these terms so they
+know their rights.
+
+  Developers that use the GNU GPL protect your rights with two steps:
+(1) assert copyright on the software, and (2) offer you this License
+giving you legal permission to copy, distribute and/or modify it.
+
+  For the developers' and authors' protection, the GPL clearly explains
+that there is no warranty for this free software.  For both users' and
+authors' sake, the GPL requires that modified versions be marked as
+changed, so that their problems will not be attributed erroneously to
+authors of previous versions.
+
+  Some devices are designed to deny users access to install or run
+modified versions of the software inside them, although the manufacturer
+can do so.  This is fundamentally incompatible with the aim of
+protecting users' freedom to change the software.  The systematic
+pattern of such abuse occurs in the area of products for individuals to
+use, which is precisely where it is most unacceptable.  Therefore, we
+have designed this version of the GPL to prohibit the practice for those
+products.  If such problems arise substantially in other domains, we
+stand ready to extend this provision to those domains in future versions
+of the GPL, as needed to protect the freedom of users.
+
+  Finally, every program is threatened constantly by software patents.
+States should not allow patents to restrict development and use of
+software on general-purpose computers, but in those that do, we wish to
+avoid the special danger that patents applied to a free program could
+make it effectively proprietary.  To prevent this, the GPL assures that
+patents cannot be used to render the program non-free.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+                       TERMS AND CONDITIONS
+
+  0. Definitions.
+
+  "This License" refers to version 3 of the GNU General Public License.
+
+  "Copyright" also means copyright-like laws that apply to other kinds of
+works, such as semiconductor masks.
+
+  "The Program" refers to any copyrightable work licensed under this
+License.  Each licensee is addressed as "you".  "Licensees" and
+"recipients" may be individuals or organizations.
+
+  To "modify" a work means to copy from or adapt all or part of the work
+in a fashion requiring copyright permission, other than the making of an
+exact copy.  The resulting work is called a "modified version" of the
+earlier work or a work "based on" the earlier work.
+
+  A "covered work" means either the unmodified Program or a work based
+on the Program.
+
+  To "propagate" a work means to do anything with it that, without
+permission, would make you directly or secondarily liable for
+infringement under applicable copyright law, except executing it on a
+computer or modifying a private copy.  Propagation includes copying,
+distribution (with or without modification), making available to the
+public, and in some countries other activities as well.
+
+  To "convey" a work means any kind of propagation that enables other
+parties to make or receive copies.  Mere interaction with a user through
+a computer network, with no transfer of a copy, is not conveying.
+
+  An interactive user interface displays "Appropriate Legal Notices"
+to the extent that it includes a convenient and prominently visible
+feature that (1) displays an appropriate copyright notice, and (2)
+tells the user that there is no warranty for the work (except to the
+extent that warranties are provided), that licensees may convey the
+work under this License, and how to view a copy of this License.  If
+the interface presents a list of user commands or options, such as a
+menu, a prominent item in the list meets this criterion.
+
+  1. Source Code.
+
+  The "source code" for a work means the preferred form of the work
+for making modifications to it.  "Object code" means any non-source
+form of a work.
+
+  A "Standard Interface" means an interface that either is an official
+standard defined by a recognized standards body, or, in the case of
+interfaces specified for a particular programming language, one that
+is widely used among developers working in that language.
+
+  The "System Libraries" of an executable work include anything, other
+than the work as a whole, that (a) is included in the normal form of
+packaging a Major Component, but which is not part of that Major
+Component, and (b) serves only to enable use of the work with that
+Major Component, or to implement a Standard Interface for which an
+implementation is available to the public in source code form.  A
+"Major Component", in this context, means a major essential component
+(kernel, window system, and so on) of the specific operating system
+(if any) on which the executable work runs, or a compiler used to
+produce the work, or an object code interpreter used to run it.
+
+  The "Corresponding Source" for a work in object code form means all
+the source code needed to generate, install, and (for an executable
+work) run the object code and to modify the work, including scripts to
+control those activities.  However, it does not include the work's
+System Libraries, or general-purpose tools or generally available free
+programs which are used unmodified in performing those activities but
+which are not part of the work.  For example, Corresponding Source
+includes interface definition files associated with source files for
+the work, and the source code for shared libraries and dynamically
+linked subprograms that the work is specifically designed to require,
+such as by intimate data communication or control flow between those
+subprograms and other parts of the work.
+
+  The Corresponding Source need not include anything that users
+can regenerate automatically from other parts of the Corresponding
+Source.
+
+  The Corresponding Source for a work in source code form is that
+same work.
+
+  2. Basic Permissions.
+
+  All rights granted under this License are granted for the term of
+copyright on the Program, and are irrevocable provided the stated
+conditions are met.  This License explicitly affirms your unlimited
+permission to run the unmodified Program.  The output from running a
+covered work is covered by this License only if the output, given its
+content, constitutes a covered work.  This License acknowledges your
+rights of fair use or other equivalent, as provided by copyright law.
+
+  You may make, run and propagate covered works that you do not
+convey, without conditions so long as your license otherwise remains
+in force.  You may convey covered works to others for the sole purpose
+of having them make modifications exclusively for you, or provide you
+with facilities for running those works, provided that you comply with
+the terms of this License in conveying all material for which you do
+not control copyright.  Those thus making or running the covered works
+for you must do so exclusively on your behalf, under your direction
+and control, on terms that prohibit them from making any copies of
+your copyrighted material outside their relationship with you.
+
+  Conveying under any other circumstances is permitted solely under
+the conditions stated below.  Sublicensing is not allowed; section 10
+makes it unnecessary.
+
+  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
+
+  No covered work shall be deemed part of an effective technological
+measure under any applicable law fulfilling obligations under article
+11 of the WIPO copyright treaty adopted on 20 December 1996, or
+similar laws prohibiting or restricting circumvention of such
+measures.
+
+  When you convey a covered work, you waive any legal power to forbid
+circumvention of technological measures to the extent such circumvention
+is effected by exercising rights under this License with respect to
+the covered work, and you disclaim any intention to limit operation or
+modification of the work as a means of enforcing, against the work's
+users, your or third parties' legal rights to forbid circumvention of
+technological measures.
+
+  4. Conveying Verbatim Copies.
+
+  You may convey verbatim copies of the Program's source code as you
+receive it, in any medium, provided that you conspicuously and
+appropriately publish on each copy an appropriate copyright notice;
+keep intact all notices stating that this License and any
+non-permissive terms added in accord with section 7 apply to the code;
+keep intact all notices of the absence of any warranty; and give all
+recipients a copy of this License along with the Program.
+
+  You may charge any price or no price for each copy that you convey,
+and you may offer support or warranty protection for a fee.
+
+  5. Conveying Modified Source Versions.
+
+  You may convey a work based on the Program, or the modifications to
+produce it from the Program, in the form of source code under the
+terms of section 4, provided that you also meet all of these conditions:
+
+    a) The work must carry prominent notices stating that you modified
+    it, and giving a relevant date.
+
+    b) The work must carry prominent notices stating that it is
+    released under this License and any conditions added under section
+    7.  This requirement modifies the requirement in section 4 to
+    "keep intact all notices".
+
+    c) You must license the entire work, as a whole, under this
+    License to anyone who comes into possession of a copy.  This
+    License will therefore apply, along with any applicable section 7
+    additional terms, to the whole of the work, and all its parts,
+    regardless of how they are packaged.  This License gives no
+    permission to license the work in any other way, but it does not
+    invalidate such permission if you have separately received it.
+
+    d) If the work has interactive user interfaces, each must display
+    Appropriate Legal Notices; however, if the Program has interactive
+    interfaces that do not display Appropriate Legal Notices, your
+    work need not make them do so.
+
+  A compilation of a covered work with other separate and independent
+works, which are not by their nature extensions of the covered work,
+and which are not combined with it such as to form a larger program,
+in or on a volume of a storage or distribution medium, is called an
+"aggregate" if the compilation and its resulting copyright are not
+used to limit the access or legal rights of the compilation's users
+beyond what the individual works permit.  Inclusion of a covered work
+in an aggregate does not cause this License to apply to the other
+parts of the aggregate.
+
+  6. Conveying Non-Source Forms.
+
+  You may convey a covered work in object code form under the terms
+of sections 4 and 5, provided that you also convey the
+machine-readable Corresponding Source under the terms of this License,
+in one of these ways:
+
+    a) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by the
+    Corresponding Source fixed on a durable physical medium
+    customarily used for software interchange.
+
+    b) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by a
+    written offer, valid for at least three years and valid for as
+    long as you offer spare parts or customer support for that product
+    model, to give anyone who possesses the object code either (1) a
+    copy of the Corresponding Source for all the software in the
+    product that is covered by this License, on a durable physical
+    medium customarily used for software interchange, for a price no
+    more than your reasonable cost of physically performing this
+    conveying of source, or (2) access to copy the
+    Corresponding Source from a network server at no charge.
+
+    c) Convey individual copies of the object code with a copy of the
+    written offer to provide the Corresponding Source.  This
+    alternative is allowed only occasionally and noncommercially, and
+    only if you received the object code with such an offer, in accord
+    with subsection 6b.
+
+    d) Convey the object code by offering access from a designated
+    place (gratis or for a charge), and offer equivalent access to the
+    Corresponding Source in the same way through the same place at no
+    further charge.  You need not require recipients to copy the
+    Corresponding Source along with the object code.  If the place to
+    copy the object code is a network server, the Corresponding Source
+    may be on a different server (operated by you or a third party)
+    that supports equivalent copying facilities, provided you maintain
+    clear directions next to the object code saying where to find the
+    Corresponding Source.  Regardless of what server hosts the
+    Corresponding Source, you remain obligated to ensure that it is
+    available for as long as needed to satisfy these requirements.
+
+    e) Convey the object code using peer-to-peer transmission, provided
+    you inform other peers where the object code and Corresponding
+    Source of the work are being offered to the general public at no
+    charge under subsection 6d.
+
+  A separable portion of the object code, whose source code is excluded
+from the Corresponding Source as a System Library, need not be
+included in conveying the object code work.
+
+  A "User Product" is either (1) a "consumer product", which means any
+tangible personal property which is normally used for personal, family,
+or household purposes, or (2) anything designed or sold for incorporation
+into a dwelling.  In determining whether a product is a consumer product,
+doubtful cases shall be resolved in favor of coverage.  For a particular
+product received by a particular user, "normally used" refers to a
+typical or common use of that class of product, regardless of the status
+of the particular user or of the way in which the particular user
+actually uses, or expects or is expected to use, the product.  A product
+is a consumer product regardless of whether the product has substantial
+commercial, industrial or non-consumer uses, unless such uses represent
+the only significant mode of use of the product.
+
+  "Installation Information" for a User Product means any methods,
+procedures, authorization keys, or other information required to install
+and execute modified versions of a covered work in that User Product from
+a modified version of its Corresponding Source.  The information must
+suffice to ensure that the continued functioning of the modified object
+code is in no case prevented or interfered with solely because
+modification has been made.
+
+  If you convey an object code work under this section in, or with, or
+specifically for use in, a User Product, and the conveying occurs as
+part of a transaction in which the right of possession and use of the
+User Product is transferred to the recipient in perpetuity or for a
+fixed term (regardless of how the transaction is characterized), the
+Corresponding Source conveyed under this section must be accompanied
+by the Installation Information.  But this requirement does not apply
+if neither you nor any third party retains the ability to install
+modified object code on the User Product (for example, the work has
+been installed in ROM).
+
+  The requirement to provide Installation Information does not include a
+requirement to continue to provide support service, warranty, or updates
+for a work that has been modified or installed by the recipient, or for
+the User Product in which it has been modified or installed.  Access to a
+network may be denied when the modification itself materially and
+adversely affects the operation of the network or violates the rules and
+protocols for communication across the network.
+
+  Corresponding Source conveyed, and Installation Information provided,
+in accord with this section must be in a format that is publicly
+documented (and with an implementation available to the public in
+source code form), and must require no special password or key for
+unpacking, reading or copying.
+
+  7. Additional Terms.
+
+  "Additional permissions" are terms that supplement the terms of this
+License by making exceptions from one or more of its conditions.
+Additional permissions that are applicable to the entire Program shall
+be treated as though they were included in this License, to the extent
+that they are valid under applicable law.  If additional permissions
+apply only to part of the Program, that part may be used separately
+under those permissions, but the entire Program remains governed by
+this License without regard to the additional permissions.
+
+  When you convey a copy of a covered work, you may at your option
+remove any additional permissions from that copy, or from any part of
+it.  (Additional permissions may be written to require their own
+removal in certain cases when you modify the work.)  You may place
+additional permissions on material, added by you to a covered work,
+for which you have or can give appropriate copyright permission.
+
+  Notwithstanding any other provision of this License, for material you
+add to a covered work, you may (if authorized by the copyright holders of
+that material) supplement the terms of this License with terms:
+
+    a) Disclaiming warranty or limiting liability differently from the
+    terms of sections 15 and 16 of this License; or
+
+    b) Requiring preservation of specified reasonable legal notices or
+    author attributions in that material or in the Appropriate Legal
+    Notices displayed by works containing it; or
+
+    c) Prohibiting misrepresentation of the origin of that material, or
+    requiring that modified versions of such material be marked in
+    reasonable ways as different from the original version; or
+
+    d) Limiting the use for publicity purposes of names of licensors or
+    authors of the material; or
+
+    e) Declining to grant rights under trademark law for use of some
+    trade names, trademarks, or service marks; or
+
+    f) Requiring indemnification of licensors and authors of that
+    material by anyone who conveys the material (or modified versions of
+    it) with contractual assumptions of liability to the recipient, for
+    any liability that these contractual assumptions directly impose on
+    those licensors and authors.
+
+  All other non-permissive additional terms are considered "further
+restrictions" within the meaning of section 10.  If the Program as you
+received it, or any part of it, contains a notice stating that it is
+governed by this License along with a term that is a further
+restriction, you may remove that term.  If a license document contains
+a further restriction but permits relicensing or conveying under this
+License, you may add to a covered work material governed by the terms
+of that license document, provided that the further restriction does
+not survive such relicensing or conveying.
+
+  If you add terms to a covered work in accord with this section, you
+must place, in the relevant source files, a statement of the
+additional terms that apply to those files, or a notice indicating
+where to find the applicable terms.
+
+  Additional terms, permissive or non-permissive, may be stated in the
+form of a separately written license, or stated as exceptions;
+the above requirements apply either way.
+
+  8. Termination.
+
+  You may not propagate or modify a covered work except as expressly
+provided under this License.  Any attempt otherwise to propagate or
+modify it is void, and will automatically terminate your rights under
+this License (including any patent licenses granted under the third
+paragraph of section 11).
+
+  However, if you cease all violation of this License, then your
+license from a particular copyright holder is reinstated (a)
+provisionally, unless and until the copyright holder explicitly and
+finally terminates your license, and (b) permanently, if the copyright
+holder fails to notify you of the violation by some reasonable means
+prior to 60 days after the cessation.
+
+  Moreover, your license from a particular copyright holder is
+reinstated permanently if the copyright holder notifies you of the
+violation by some reasonable means, this is the first time you have
+received notice of violation of this License (for any work) from that
+copyright holder, and you cure the violation prior to 30 days after
+your receipt of the notice.
+
+  Termination of your rights under this section does not terminate the
+licenses of parties who have received copies or rights from you under
+this License.  If your rights have been terminated and not permanently
+reinstated, you do not qualify to receive new licenses for the same
+material under section 10.
+
+  9. Acceptance Not Required for Having Copies.
+
+  You are not required to accept this License in order to receive or
+run a copy of the Program.  Ancillary propagation of a covered work
+occurring solely as a consequence of using peer-to-peer transmission
+to receive a copy likewise does not require acceptance.  However,
+nothing other than this License grants you permission to propagate or
+modify any covered work.  These actions infringe copyright if you do
+not accept this License.  Therefore, by modifying or propagating a
+covered work, you indicate your acceptance of this License to do so.
+
+  10. Automatic Licensing of Downstream Recipients.
+
+  Each time you convey a covered work, the recipient automatically
+receives a license from the original licensors, to run, modify and
+propagate that work, subject to this License.  You are not responsible
+for enforcing compliance by third parties with this License.
+
+  An "entity transaction" is a transaction transferring control of an
+organization, or substantially all assets of one, or subdividing an
+organization, or merging organizations.  If propagation of a covered
+work results from an entity transaction, each party to that
+transaction who receives a copy of the work also receives whatever
+licenses to the work the party's predecessor in interest had or could
+give under the previous paragraph, plus a right to possession of the
+Corresponding Source of the work from the predecessor in interest, if
+the predecessor has it or can get it with reasonable efforts.
+
+  You may not impose any further restrictions on the exercise of the
+rights granted or affirmed under this License.  For example, you may
+not impose a license fee, royalty, or other charge for exercise of
+rights granted under this License, and you may not initiate litigation
+(including a cross-claim or counterclaim in a lawsuit) alleging that
+any patent claim is infringed by making, using, selling, offering for
+sale, or importing the Program or any portion of it.
+
+  11. Patents.
+
+  A "contributor" is a copyright holder who authorizes use under this
+License of the Program or a work on which the Program is based.  The
+work thus licensed is called the contributor's "contributor version".
+
+  A contributor's "essential patent claims" are all patent claims
+owned or controlled by the contributor, whether already acquired or
+hereafter acquired, that would be infringed by some manner, permitted
+by this License, of making, using, or selling its contributor version,
+but do not include claims that would be infringed only as a
+consequence of further modification of the contributor version.  For
+purposes of this definition, "control" includes the right to grant
+patent sublicenses in a manner consistent with the requirements of
+this License.
+
+  Each contributor grants you a non-exclusive, worldwide, royalty-free
+patent license under the contributor's essential patent claims, to
+make, use, sell, offer for sale, import and otherwise run, modify and
+propagate the contents of its contributor version.
+
+  In the following three paragraphs, a "patent license" is any express
+agreement or commitment, however denominated, not to enforce a patent
+(such as an express permission to practice a patent or covenant not to
+sue for patent infringement).  To "grant" such a patent license to a
+party means to make such an agreement or commitment not to enforce a
+patent against the party.
+
+  If you convey a covered work, knowingly relying on a patent license,
+and the Corresponding Source of the work is not available for anyone
+to copy, free of charge and under the terms of this License, through a
+publicly available network server or other readily accessible means,
+then you must either (1) cause the Corresponding Source to be so
+available, or (2) arrange to deprive yourself of the benefit of the
+patent license for this particular work, or (3) arrange, in a manner
+consistent with the requirements of this License, to extend the patent
+license to downstream recipients.  "Knowingly relying" means you have
+actual knowledge that, but for the patent license, your conveying the
+covered work in a country, or your recipient's use of the covered work
+in a country, would infringe one or more identifiable patents in that
+country that you have reason to believe are valid.
+
+  If, pursuant to or in connection with a single transaction or
+arrangement, you convey, or propagate by procuring conveyance of, a
+covered work, and grant a patent license to some of the parties
+receiving the covered work authorizing them to use, propagate, modify
+or convey a specific copy of the covered work, then the patent license
+you grant is automatically extended to all recipients of the covered
+work and works based on it.
+
+  A patent license is "discriminatory" if it does not include within
+the scope of its coverage, prohibits the exercise of, or is
+conditioned on the non-exercise of one or more of the rights that are
+specifically granted under this License.  You may not convey a covered
+work if you are a party to an arrangement with a third party that is
+in the business of distributing software, under which you make payment
+to the third party based on the extent of your activity of conveying
+the work, and under which the third party grants, to any of the
+parties who would receive the covered work from you, a discriminatory
+patent license (a) in connection with copies of the covered work
+conveyed by you (or copies made from those copies), or (b) primarily
+for and in connection with specific products or compilations that
+contain the covered work, unless you entered into that arrangement,
+or that patent license was granted, prior to 28 March 2007.
+
+  Nothing in this License shall be construed as excluding or limiting
+any implied license or other defenses to infringement that may
+otherwise be available to you under applicable patent law.
+
+  12. No Surrender of Others' Freedom.
+
+  If conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot convey a
+covered work so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you may
+not convey it at all.  For example, if you agree to terms that obligate you
+to collect a royalty for further conveying from those to whom you convey
+the Program, the only way you could satisfy both those terms and this
+License would be to refrain entirely from conveying the Program.
+
+  13. Use with the GNU Affero General Public License.
+
+  Notwithstanding any other provision of this License, you have
+permission to link or combine any covered work with a work licensed
+under version 3 of the GNU Affero General Public License into a single
+combined work, and to convey the resulting work.  The terms of this
+License will continue to apply to the part which is the covered work,
+but the special requirements of the GNU Affero General Public License,
+section 13, concerning interaction through a network will apply to the
+combination as such.
+
+  14. Revised Versions of this License.
+
+  The Free Software Foundation may publish revised and/or new versions of
+the GNU General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+  Each version is given a distinguishing version number.  If the
+Program specifies that a certain numbered version of the GNU General
+Public License "or any later version" applies to it, you have the
+option of following the terms and conditions either of that numbered
+version or of any later version published by the Free Software
+Foundation.  If the Program does not specify a version number of the
+GNU General Public License, you may choose any version ever published
+by the Free Software Foundation.
+
+  If the Program specifies that a proxy can decide which future
+versions of the GNU General Public License can be used, that proxy's
+public statement of acceptance of a version permanently authorizes you
+to choose that version for the Program.
+
+  Later license versions may give you additional or different
+permissions.  However, no additional obligations are imposed on any
+author or copyright holder as a result of your choosing to follow a
+later version.
+
+  15. Disclaimer of Warranty.
+
+  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
+APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
+HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
+OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
+THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
+IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
+ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+  16. Limitation of Liability.
+
+  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
+THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
+GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
+USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
+DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
+PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
+EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGES.
+
+  17. Interpretation of Sections 15 and 16.
+
+  If the disclaimer of warranty and limitation of liability provided
+above cannot be given local legal effect according to their terms,
+reviewing courts shall apply local law that most closely approximates
+an absolute waiver of all civil liability in connection with the
+Program, unless a warranty or assumption of liability accompanies a
+copy of the Program in return for a fee.
+
+                     END OF TERMS AND CONDITIONS
+
+            How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+state the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+Also add information on how to contact you by electronic and paper mail.
+
+  If the program does terminal interaction, make it output a short
+notice like this when it starts in an interactive mode:
+
+    <program>  Copyright (C) <year>  <name of author>
+    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    This is free software, and you are welcome to redistribute it
+    under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License.  Of course, your program's commands
+might be different; for a GUI interface, you would use an "about box".
+
+  You should also get your employer (if you work as a programmer) or school,
+if any, to sign a "copyright disclaimer" for the program, if necessary.
+For more information on this, and how to apply and follow the GNU GPL, see
+<http://www.gnu.org/licenses/>.
+
+  The GNU General Public License does not permit incorporating your program
+into proprietary programs.  If your program is a subroutine library, you
+may consider it more useful to permit linking proprietary applications with
+the library.  If this is what you want to do, use the GNU Lesser General
+Public License instead of this License.  But first, please read
+<http://www.gnu.org/philosophy/why-not-lgpl.html>.
+
diff --git a/NEWS b/NEWS
new file mode 100644
index 0000000..3214c10
--- /dev/null
+++ b/NEWS
@@ -0,0 +1,181 @@
+26
+
+ENHANCEMENTS:
+* New translations, including Aymara and Quechua
+
+25
+
+BUG FIX:
+* More robust checking for EOS when transcoding audio recordings
+* Replace timed notify alert with simple alert message that is
+  displayed when saving recording
+
+24
+
+ENHANCEMENTS:
+* New translations
+
+23
+
+ENHANCEMENTS:
+* New translations
+
+BUG FIX:
+* Fixed problems with saving audio recordings
+* Add word wrap to description text view (as per #3686)
+* Always save inline annotaions
+
+22
+
+ENHANCEMENTS:
+* New translations
+* Removed save as HTML option since PDF works so much better
+
+BUG FIX:
+* Clean up audio recordings so as to not leave file clutter around
+
+21
+
+ENHANCEMENTS:
+* New translations
+
+20
+
+ENHANCEMENTS:
+* New translations
+* Update descriptions from within Portfolio (changes not permanent)
+* Mark/unmark favorites from within Portfolio (changes not permanent)
+* Save updates to descriptions and favorites in Journal (changes permanent)
+* Standardize scaling of images
+* Improved built-in help
+
+BUG FIXES
+* Verbose output to logger
+* Autosave audio for first recording
+* Fix font-scaling issues on XO running newer versions of Sugar
+
+19
+
+ENHANCEMENTS:
+* Added export PDF as per Learning Team request
+* Add nickname and date to HTML and PDF output
+
+18
+
+ENHANCEMENTS
+* Added audio notes to exported HTML document
+* Autosave first audio recording
+
+BUG FIXES
+* Individual audio recordings were not properly saved per slide
+
+17
+
+ENHANCEMENT
+* New translations
+
+BUG FIX
+* Update audio playback button depending upon whether or not there is an
+  audio note associated with the current slide
+
+16
+
+ENHANCEMENT
+* Support for audio notes
+* New translations
+* Conversion to Cairo graphics
+
+15
+
+ENHANCEMENT
+* New translations
+
+14
+
+BUG FIX
+* Fixed license address (#3177)
+
+13
+
+ENHANCEMENT
+* New translations
+
+BUG FIX
+* Added missing call to set_tooltips for Radio Buttons
+* Fixed potential divide-by-zero error in Thumbnail view
+
+12
+
+BUG FIX
+* Fix XO 1.75 bug related to accelerometer tracking for slide advance
+  that was causing the activity to hang
+
+11
+
+ENHANCEMENTS
+* Using radio buttons for switching betweem slide view and thumbnail view
+* Update to standard icons
+
+BUG FIX
+* Don't crash when displaying thumbnail of entry with no preview image
+
+10
+
+ENHANCEMENT
+* Add rescan button
+
+9
+
+ENHANCEMENTS
+* Add thumbnail support for reordering slides
+* Add support for using full screen (hiding toolbars) during slide show
+
+8
+
+ENHANCEMENTS
+* Switch from slider to combo box for setting autoplay speeds
+* Updated translations
+
+7
+
+ENHANCEMENT
+* Update to Spanish translations
+
+6
+
+ENHANCEMENTS
+* Advance to next slide with mouse-button click 
+* Added accelerator keys
+
+5
+
+BUG FIXES
+* Fix bug in determining lightest color that caused occasional crashes
+
+4
+
+ENHANCEMENTS
+* save slide show as HTML
+* use the lighter of the two background colors for the text background
+
+3
+
+ENHANCEMENTS
+* Added warning message when no favorites are starred in the Journal
+* Media objects are rendered larger
+* Set scaling factor based on vertical dimension to better fit 'wide' screens
+
+2
+
+ENHANCEMENTS
+* Scale to variable screen sizes
+* If entry is a picture, use it instead of preview image
+
+BUG FIXES
+* Fixed problem when no entries are starred
+* Fix font-scaling issue on XO hardware
+
+1
+
+Simple portfolio program that generates a slide show based on items
+starred in the Sugar Journal
diff --git a/activity/activity-bboard.svg b/activity/activity-bboard.svg
new file mode 100644
index 0000000..bc96f4a
--- /dev/null
+++ b/activity/activity-bboard.svg
@@ -0,0 +1,77 @@
+<?xml version="1.0" ?><!DOCTYPE svg  PUBLIC '-//W3C//DTD SVG 1.1//EN'  'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd' [
+	<!ENTITY stroke_color "#000">
+	<!ENTITY fill_color "#eee">
+]><svg height="55px" viewBox="0 0 55 55" width="55px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" stroke-linecap="round" stroke-linejoin="round" stroke-width="3.5" stroke="&stroke_color;" fill="&fill_color;">
+  <g
+     transform="matrix(0.8501594,0,0,0.8501594,4.1206165,2.9055499)"
+     id="g3041">
+    <rect
+       width="40"
+       height="30"
+       x="7.5"
+       y="5.8274999"
+       id="rect2996"
+       style="fill:&fill_color;;stroke:&stroke_color;;stroke-width:2.34500003;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+    <g
+       transform="translate(-1.0846148,0)"
+       id="g3793">
+      <line
+         style="fill:none;stroke:&stroke_color;;stroke-width:1.78056884;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1"
+         x1="27.69433"
+         x2="23.419287"
+         y1="36.358479"
+         y2="52.31316"
+         id="line2460" />
+      <line
+         style="fill:none;stroke:&stroke_color;;stroke-width:1.78056884;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1"
+         x1="29.474899"
+         x2="33.749943"
+         y1="36.358479"
+         y2="52.313156"
+         id="line2460-2" />
+    </g>
+    <line
+       id="line2460-0"
+       y2="8.168005"
+       y1="8.168005"
+       x2="45.986813"
+       x1="9.0131855"
+       style="fill:none;stroke:&stroke_color;;stroke-width:2.66399026;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1" />
+  </g>
+  <g
+     transform="matrix(0.8501594,0,0,0.8501594,-5.3793836,9.7685917)"
+     id="g3041-1">
+    <rect
+       width="40"
+       height="30"
+       x="7.5"
+       y="5.8274999"
+       id="rect2996-7"
+       style="fill:&fill_color;;stroke:&stroke_color;;stroke-width:2.34500003;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+    <g
+       transform="translate(-1.0846148,0)"
+       id="g3793-7">
+      <line
+         style="fill:none;stroke:&stroke_color;;stroke-width:1.78056884;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1"
+         x1="27.69433"
+         x2="23.419287"
+         y1="36.358479"
+         y2="52.31316"
+         id="line2460-9" />
+      <line
+         style="fill:none;stroke:&stroke_color;;stroke-width:1.78056884;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1"
+         x1="29.474899"
+         x2="33.749943"
+         y1="36.358479"
+         y2="52.313156"
+         id="line2460-2-1" />
+    </g>
+    <line
+       id="line2460-0-2"
+       y2="8.168005"
+       y1="8.168005"
+       x2="45.986813"
+       x1="9.0131855"
+       style="fill:none;stroke:&stroke_color;;stroke-width:2.66399026;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1" />
+  </g>
+</svg>
diff --git a/activity/activity.info b/activity/activity.info
new file mode 100644
index 0000000..9dfe59d
--- /dev/null
+++ b/activity/activity.info
@@ -0,0 +1,8 @@
+[Activity]
+name = BBoard
+activity_version = 1
+license = GPLv3
+bundle_id = org.sugarlabs.BBoardActivity
+exec = sugar-activity BBoardActivity.BBoardActivity
+icon = activity-bboard
+show_launcher = yes
diff --git a/exportpdf.py b/exportpdf.py
new file mode 100644
index 0000000..0650858
--- /dev/null
+++ b/exportpdf.py
@@ -0,0 +1,108 @@
+# -*- coding: utf-8 -*-
+#Copyright (c) 2011 Walter Bender
+
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3 of the License, or
+# (at your option) any later version.
+#
+# You should have received a copy of the GNU General Public License
+# along with this library; if not, write to the Free Software
+# Foundation, 51 Franklin Street, Suite 500 Boston, MA 02110-1335 USA
+
+
+import pygtk
+pygtk.require('2.0')
+import gtk
+from glib import GError
+import os.path
+import time
+import cairo
+import pango
+import pangocairo
+from gettext import gettext as _
+
+from utils import get_pixbuf_from_journal
+
+
+HEAD = 32
+BODY = 12
+PAGE_WIDTH = 504
+PAGE_HEIGHT = 648
+LEFT_MARGIN = 10
+TOP_MARGIN = 20
+
+
+def save_pdf(activity,  nick):
+    ''' Output a PDF document from the title, pictures, and descriptions '''
+
+    if len(activity.dsobjects) == 0:
+        return None
+
+    tmp_file = os.path.join(activity.datapath, 'output.pdf') 
+    pdf_surface = cairo.PDFSurface(tmp_file, 504, 648)
+
+    fd = pango.FontDescription('Sans')
+    cr = cairo.Context(pdf_surface)
+    cr.set_source_rgb(0, 0, 0)
+
+    show_text(cr, fd, nick, HEAD, LEFT_MARGIN, TOP_MARGIN)
+    show_text(cr, fd, time.strftime('%x', time.localtime()),
+              BODY, LEFT_MARGIN, TOP_MARGIN + 3 * HEAD)
+    cr.show_page()
+
+    for i, dsobj in enumerate(activity.dsobjects):
+        if dsobj.metadata['keep'] == '0':
+            continue
+        if 'title' in dsobj.metadata:
+            show_text(cr, fd, dsobj.metadata['title'], HEAD, LEFT_MARGIN,
+                      TOP_MARGIN)
+        else:
+            show_text(cr, fd, _('untitled'), HEAD, LEFT_MARGIN,
+                      TOP_MARGIN)
+
+        try:
+            w = int(PAGE_WIDTH - LEFT_MARGIN * 2)
+            h = int(w * 3 / 4)
+            pixbuf = gtk.gdk.pixbuf_new_from_file_at_size(dsobj.file_path,
+                                                          w, h)
+        except(GError, IOError):
+            try:
+                w = 300
+                h = 225
+                pixbuf = get_pixbuf_from_journal(dsobj, w, h)
+            except(GError, IOError):
+                w = 0
+                h = 0
+                pixbuf = None
+
+        if pixbuf is not None:
+            cr.save()
+            cr = gtk.gdk.CairoContext(cr)
+            cr.set_source_pixbuf(pixbuf, LEFT_MARGIN, TOP_MARGIN + 150)
+            cr.rectangle(LEFT_MARGIN, TOP_MARGIN + 150, w, h)
+            cr.fill()
+            cr.restore()
+
+        if 'description' in dsobj.metadata:
+            show_text(cr, fd, dsobj.metadata['description'], BODY,
+                      LEFT_MARGIN, h + 175)
+        cr.show_page()
+
+    return tmp_file
+
+def show_text(cr, fd, label, size, x, y):
+    cr = pangocairo.CairoContext(cr)
+    pl = cr.create_layout()
+    fd.set_size(int(size * pango.SCALE))
+    pl.set_font_description(fd)
+    if type(label) == str or type(label) == unicode:
+        pl.set_text(label.replace('\0', ' '))
+    else:
+        pl.set_text(str(label))
+    pl.set_width((PAGE_WIDTH - LEFT_MARGIN * 2) * pango.SCALE)
+    cr.save()
+    cr.translate(x, y)
+    cr.update_layout(pl)
+    cr.show_layout(pl)
+    cr.restore()
diff --git a/exportsvg.py b/exportsvg.py
new file mode 100644
index 0000000..68c6cab
--- /dev/null
+++ b/exportsvg.py
@@ -0,0 +1,109 @@
+# -*- coding: utf-8 -*-
+#Copyright (c) 2011 Walter Bender
+
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3 of the License, or
+# (at your option) any later version.
+#
+# You should have received a copy of the GNU General Public License
+# along with this library; if not, write to the Free Software
+# Foundation, 51 Franklin Street, Suite 500 Boston, MA 02110-1335 USA
+
+
+import pygtk
+pygtk.require('2.0')
+import gtk
+from glib import GError
+import os.path
+import time
+import cairo
+import pango
+import pangocairo
+from gettext import gettext as _
+
+from utils import get_pixbuf_from_journal
+
+
+HEAD = 32
+BODY = 12
+PAGE_WIDTH = 504
+PAGE_HEIGHT = 648
+LEFT_MARGIN = 10
+TOP_MARGIN = 20
+
+
+def save_svg(activity,  nick):
+    ''' Output a SVG document from the title, pictures, and descriptions '''
+
+    if len(activity.dsobjects) == 0:
+        return None
+
+    tmp_file = os.path.join(activity.datapath, 'output.svg') 
+    svg_surface = cairo.SVGSurface(tmp_file, 504, 648)
+
+    fd = pango.FontDescription('Sans')
+    cr = cairo.Context(svg_surface)
+    cr.set_source_rgb(0, 0, 0)
+
+    show_text(cr, fd, nick, HEAD, LEFT_MARGIN, TOP_MARGIN)
+    show_text(cr, fd, time.strftime('%x', time.localtime()),
+              BODY, LEFT_MARGIN, TOP_MARGIN + 3 * HEAD)
+    cr.show_page()
+
+    for i, dsobj in enumerate(activity.dsobjects):
+        if dsobj.metadata['keep'] == '0':
+            continue
+        if 'title' in dsobj.metadata:
+            show_text(cr, fd, dsobj.metadata['title'], HEAD, LEFT_MARGIN,
+                      TOP_MARGIN)
+        else:
+            show_text(cr, fd, _('untitled'), HEAD, LEFT_MARGIN,
+                      TOP_MARGIN)
+
+        try:
+            w = int(PAGE_WIDTH - LEFT_MARGIN * 2)
+            h = int(w * 3 / 4)
+            pixbuf = gtk.gdk.pixbuf_new_from_file_at_size(dsobj.file_path,
+                                                          w, h)
+        except(GError, IOError):
+            try:
+                w = 300
+                h = 225
+                pixbuf = get_pixbuf_from_journal(dsobj, w, h)
+            except(GError, IOError):
+                w = 0
+                h = 0
+                pixbuf = None
+
+        if pixbuf is not None:
+            cr.save()
+            cr = gtk.gdk.CairoContext(cr)
+            cr.set_source_pixbuf(pixbuf, LEFT_MARGIN, TOP_MARGIN + 150)
+            cr.rectangle(LEFT_MARGIN, TOP_MARGIN + 150, w, h)
+            cr.fill()
+            cr.restore()
+
+        if 'description' in dsobj.metadata:
+            show_text(cr, fd, dsobj.metadata['description'], BODY,
+                      LEFT_MARGIN, h + 175)
+        cr.show_page()
+
+    return tmp_file
+
+
+def show_text(cr, fd, label, size, x, y):
+    cr = pangocairo.CairoContext(cr)
+    pl = cr.create_layout()
+    fd.set_size(int(size * pango.SCALE))
+    pl.set_font_description(fd)
+    if type(label) == str or type(label) == unicode:
+        pl.set_text(label.replace('\0', ' '))
+    else:
+        pl.set_text(str(label))
+    pl.set_width((PAGE_WIDTH - LEFT_MARGIN * 2) * pango.SCALE)
+    cr.save()
+    cr.translate(x, y)
+    cr.update_layout(pl)
+    cr.show_layout(pl)
+    cr.restore()
diff --git a/grecord.py b/grecord.py
new file mode 100644
index 0000000..ae353be
--- /dev/null
+++ b/grecord.py
@@ -0,0 +1,240 @@
+#Copyright (c) 2008, Media Modifications Ltd.
+#Copyright (c) 2011-12, Walter Bender
+
+#Permission is hereby granted, free of charge, to any person obtaining a copy
+#of this software and associated documentation files (the "Software"), to deal
+#in the Software without restriction, including without limitation the rights
+#to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+#copies of the Software, and to permit persons to whom the Software is
+#furnished to do so, subject to the following conditions:
+
+#The above copyright notice and this permission notice shall be included in
+#all copies or substantial portions of the Software.
+
+#THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+#IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+#FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+#AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+#LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+#OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+#THE SOFTWARE.
+
+import os
+import time
+
+import gtk
+import gst
+
+import logging
+_logger = logging.getLogger("portfolio-activity")
+
+import gobject
+gobject.threads_init()
+
+
+class Grecord:
+
+    def __init__(self, parent):
+        self._activity = parent
+        self._eos_cb = None
+
+        self._can_limit_framerate = False
+        self._playing = False
+
+        self._audio_transcode_handler = None
+        self._transcode_id = None
+
+        self._pipeline = gst.Pipeline("Record")
+        self._create_audiobin()
+
+        bus = self._pipeline.get_bus()
+        bus.add_signal_watch()
+        bus.connect('message', self._bus_message_handler)
+
+    def _create_audiobin(self):
+        src = gst.element_factory_make("alsasrc", "absrc")
+
+        # attempt to use direct access to the 0,0 device, solving some A/V
+        # sync issues
+        src.set_property("device", "plughw:0,0")
+        hwdev_available = src.set_state(gst.STATE_PAUSED) != \
+                          gst.STATE_CHANGE_FAILURE
+        src.set_state(gst.STATE_NULL)
+        if not hwdev_available:
+            src.set_property("device", "default")
+
+        srccaps = gst.Caps("audio/x-raw-int,rate=16000,channels=1,depth=16")
+
+        # Guarantee perfect stream, important for A/V sync
+        rate = gst.element_factory_make("audiorate")
+
+        # Without a buffer here, gstreamer struggles at the start of the
+        # recording and then the A/V sync is bad for the whole video
+        # (possibly a gstreamer/ALSA bug -- even if it gets caught up, it
+        # should be able to resync without problem).
+        queue = gst.element_factory_make("queue", "audioqueue")
+        queue.set_property("leaky", True)  # prefer fresh data
+        queue.set_property("max-size-time", 5000000000)  # 5 seconds
+        queue.set_property("max-size-buffers", 500)
+        queue.connect("overrun", self._log_queue_overrun)
+
+        enc = gst.element_factory_make("wavenc", "abenc")
+
+        sink = gst.element_factory_make("filesink", "absink")
+        sink.set_property("location",
+            os.path.join(self._activity.datapath, 'output.wav'))
+
+        self._audiobin = gst.Bin("audiobin")
+        self._audiobin.add(src, rate, queue, enc, sink)
+
+        src.link(rate, srccaps)
+        gst.element_link_many(rate, queue, enc, sink)
+
+    def _log_queue_overrun(self, queue):
+        cbuffers = queue.get_property("current-level-buffers")
+        cbytes = queue.get_property("current-level-bytes")
+        ctime = queue.get_property("current-level-time")
+
+    def play(self):
+        if self._get_state() == gst.STATE_PLAYING:
+            return
+
+        self._pipeline.set_state(gst.STATE_PLAYING)
+        self._playing = True
+
+    def pause(self):
+        self._pipeline.set_state(gst.STATE_PAUSED)
+        self._playing = False
+
+    def stop(self):
+        self._pipeline.set_state(gst.STATE_NULL)
+        self._playing = False
+
+    def is_playing(self):
+        return self._playing
+
+    def _get_state(self):
+        return self._pipeline.get_state()[1]
+
+    def stop_recording_audio(self):
+        # We should be able to simply pause and remove the audiobin, but
+        # this seems to cause a gstreamer segfault. So we stop the whole
+        # pipeline while manipulating it.
+        # http://dev.laptop.org/ticket/10183
+        self._pipeline.set_state(gst.STATE_NULL)
+        self._pipeline.remove(self._audiobin)
+        self.play()
+
+        audio_path = os.path.join(self._activity.datapath, 'output.wav')
+        if not os.path.exists(audio_path) or os.path.getsize(audio_path) <= 0:
+            # FIXME: inform model of failure?
+            _logger.error('output.wav does not exist or is empty')
+            return
+
+        line = 'filesrc location=' + audio_path + ' name=audioFilesrc ! \
+wavparse name=audioWavparse ! audioconvert name=audioAudioconvert ! \
+vorbisenc name=audioVorbisenc ! oggmux name=audioOggmux ! \
+filesink name=audioFilesink'
+        self._audioline = gst.parse_launch(line)
+
+        vorbis_enc = self._audioline.get_by_name('audioVorbisenc')
+
+        audioFilesink = self._audioline.get_by_name('audioFilesink')
+        audioOggFilepath = os.path.join(self._activity.datapath, 'output.ogg')
+        audioFilesink.set_property("location", audioOggFilepath)
+
+        audioBus = self._audioline.get_bus()
+        audioBus.add_signal_watch()
+        self._audio_transcode_handler = audioBus.connect(
+            'message', self._onMuxedAudioMessageCb, self._audioline)
+        self._transcode_id = gobject.timeout_add(200, self._transcodeUpdateCb,
+                                                 self._audioline)
+        self._audiopos = 0
+        self._audioline.set_state(gst.STATE_PLAYING)
+
+    def transcoding_complete(self):
+        # The EOS message is sometimes either not sent or not received.
+        # So if the position in the stream is not advancing, assume EOS.
+        if self._transcode_id is None:
+            _logger.debug('EOS.... transcoding finished')
+            return True
+        else:
+            position, duration = self._query_position(self._audioline)
+            _logger.debug('position: %s, duration: %s' % (str(position),
+                                                          str(duration)))
+            if position == duration:
+                _logger.debug('We are done, even though we did not see EOS')
+                self._clean_up_transcoding_pipeline(self._audioline)
+                return True
+            elif position == self._audiopos:
+                _logger.debug('No progess, so assume we are done')
+                self._clean_up_transcoding_pipeline(self._audioline)
+                return True
+            self._audiopos = position
+            return False
+
+    def blockedCb(self, x, y, z):
+        pass
+
+    def record_audio(self):
+        # We should be able to add the audiobin on the fly, but unfortunately
+        # this results in several seconds of silence being added at the start
+        # of the recording. So we stop the whole pipeline while adjusting it.
+        # SL#2040
+        self._pipeline.set_state(gst.STATE_NULL)
+        self._pipeline.add(self._audiobin)
+        self.play()
+
+    def _transcodeUpdateCb(self, pipe):
+        position, duration = self._query_position(pipe)
+        if position != gst.CLOCK_TIME_NONE:
+            value = position * 100.0 / duration
+            value = value / 100.0
+        return True
+
+    def _query_position(self, pipe):
+        try:
+            position, format = pipe.query_position(gst.FORMAT_TIME)
+        except:
+            position = gst.CLOCK_TIME_NONE
+
+        try:
+            duration, format = pipe.query_duration(gst.FORMAT_TIME)
+        except:
+            duration = gst.CLOCK_TIME_NONE
+
+        return (position, duration)
+
+    def _onMuxedAudioMessageCb(self, bus, message, pipe):
+        _logger.debug(message.type)
+        if message.type != gst.MESSAGE_EOS:
+            return True
+        self._clean_up_transcoding_pipeline(pipe)
+        return False
+
+    def _clean_up_transcoding_pipeline(self, pipe):
+        gobject.source_remove(self._audio_transcode_handler)
+        self._audio_transcode_handler = None
+        gobject.source_remove(self._transcode_id)
+        self._transcode_id = None
+        pipe.set_state(gst.STATE_NULL)
+        pipe.get_bus().remove_signal_watch()
+        pipe.get_bus().disable_sync_message_emission()
+
+        wavFilepath = os.path.join(self._activity.datapath, 'output.wav')
+        os.remove(wavFilepath)
+        return
+
+    def _bus_message_handler(self, bus, message):
+        t = message.type
+        if t == gst.MESSAGE_EOS:
+            if self._eos_cb:
+                cb = self._eos_cb
+                self._eos_cb = None
+                cb()
+        elif t == gst.MESSAGE_ERROR:
+            # TODO: if we come out of suspend/resume with errors, then
+            # get us back up and running...  TODO: handle "No space
+            # left on the resource.gstfilesink.c" err, debug =
+            # message.parse_error()
+            pass
diff --git a/icons/go-next-inactive.svg b/icons/go-next-inactive.svg
new file mode 100644
index 0000000..9f1fafb
--- /dev/null
+++ b/icons/go-next-inactive.svg
@@ -0,0 +1,3 @@
+<?xml version="1.0" ?><!DOCTYPE svg  PUBLIC '-//W3C//DTD SVG 1.1//EN'  'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd'><svg enable-background="new 0 0 55 55" height="55px" version="1.1" viewBox="0 0 55 55" width="55px" x="0px" xml:space="preserve" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px"><g display="block" id="go-next">
+	<path d="M27.497,50.004C39.927,50.004,50,39.937,50,27.508C50,15.076,39.927,4.997,27.497,4.997   C15.071,4.997,5,15.076,5,27.508C5,39.937,15.071,50.004,27.497,50.004z M20.733,17.551l19.629,9.965L20.733,37.758V17.551z" fill="#808080"/>
+</g></svg>
\ No newline at end of file
diff --git a/icons/go-previous-inactive.svg b/icons/go-previous-inactive.svg
new file mode 100644
index 0000000..e806670
--- /dev/null
+++ b/icons/go-previous-inactive.svg
@@ -0,0 +1,3 @@
+<?xml version="1.0" ?><!DOCTYPE svg  PUBLIC '-//W3C//DTD SVG 1.1//EN'  'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd'><svg enable-background="new 0 0 55 55" height="55px" version="1.1" viewBox="0 0 55 55" width="55px" x="0px" xml:space="preserve" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px"><g display="block" id="go-previous">
+	<path d="M27.503,4.997C15.073,4.997,5,15.064,5,27.493c0,12.432,10.073,22.511,22.503,22.511   C39.929,50.004,50,39.925,50,27.493C50,15.064,39.929,4.997,27.503,4.997z M34.267,37.449l-19.629-9.965l19.629-10.242V37.449z" display="inline" fill="#808080"/>
+</g></svg>
\ No newline at end of file
diff --git a/icons/listen.svg b/icons/listen.svg
new file mode 100644
index 0000000..201a280
--- /dev/null
+++ b/icons/listen.svg
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   version="1.1"
+   width="55"
+   height="55"
+   viewBox="0 0 55 55"
+   id="svg2"
+   style="fill:#ffffff;stroke:#000000;stroke-width:3.5;stroke-linecap:round;stroke-linejoin:round">
+  <metadata
+     id="metadata20">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs18" />
+  <rect
+     width="44.404602"
+     height="30.412962"
+     ry="0"
+     x="6.1161056"
+     y="11.935916"
+     id="rect2997"
+     style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+  <text
+     x="16.159618"
+     y="38.136364"
+     id="text13"
+     style="font-size:38.96828842px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill-opacity:1;stroke:none;font-family:Sans">
+    <tspan
+       x="16.159618"
+       y="38.136364"
+       id="tspan8"
+       style="font-size:38.96828842px;fill:#000000">a</tspan>
+  </text>
+</svg>
diff --git a/icons/media-audio.svg b/icons/media-audio.svg
new file mode 100644
index 0000000..a78405f
--- /dev/null
+++ b/icons/media-audio.svg
@@ -0,0 +1,10 @@
+<?xml version="1.0" ?><!DOCTYPE svg  PUBLIC '-//W3C//DTD SVG 1.1//EN'  'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd' [
+	<!ENTITY stroke_color "#010101">
+	<!ENTITY fill_color "#FFFFFF">
+]><svg enable-background="new 0 0 55 55" height="55px" version="1.1" viewBox="0 0 55 55" width="55px" x="0px" xml:space="preserve" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px"><g display="block" id="record-audio">
+	<g display="inline">
+		<polygon fill="&fill_color;" points="    8.872,38.893 13.296,43.314 38.942,21.406 30.782,13.246   " stroke="&stroke_color;" stroke-linecap="round" stroke-linejoin="round" stroke-width="3.5"/>
+		<circle cx="37.371" cy="14.759" fill="&fill_color;" r="8.757" stroke="&stroke_color;" stroke-linejoin="round" stroke-width="3.5"/>
+		<path d="M10.829,40.85    c-3.607,3.607-1.485,13.146,13.332,4.596C35.687,38.912,43.122,44.297,44.464,51" fill="none" stroke="&stroke_color;" stroke-linecap="round" stroke-linejoin="round" stroke-width="3.5"/>
+	</g>
+</g></svg>
\ No newline at end of file
diff --git a/icons/media-recording.svg b/icons/media-recording.svg
new file mode 100644
index 0000000..2f46799
--- /dev/null
+++ b/icons/media-recording.svg
@@ -0,0 +1,11 @@
+<?xml version="1.0" ?><!DOCTYPE svg  PUBLIC '-//W3C//DTD SVG 1.1//EN'  'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd' [
+	<!ENTITY stroke_color "#010101">
+	<!ENTITY fill_color "#FFFFFF">
+]><svg enable-background="new 0 0 55 55" height="55px" version="1.1" viewBox="0 0 55 55" width="55px" x="0px" xml:space="preserve" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px"><g display="block" id="media-record">
+	<path d="M27.497,5C15.073,5,4.999,15.075,4.999,27.5c0,12.427,10.074,22.5,22.498,22.5   c12.428,0,22.502-10.073,22.502-22.5C49.999,15.075,39.925,5,27.497,5z M27.501,35.389c-4.361,0-7.89-3.534-7.89-7.889   c0-4.356,3.528-7.889,7.89-7.889c4.357,0,7.889,3.532,7.889,7.889C35.39,31.854,31.858,35.389,27.501,35.389z" display="inline" fill="&fill_color;"/>
+<path
+   d="m -23.783783,9.6621618 a 4.5656371,4.7779922 0 1 1 -9.131275,0 4.5656371,4.7779922 0 1 1 9.131275,0 z"
+   transform="matrix(1.7522199,0,0,1.6743434,77.174419,11.322223)"
+   id="path3758"
+   style="fill:#ff0000;fill-opacity:1;stroke:none" />
+</g></svg>
\ No newline at end of file
diff --git a/icons/save-as-html.svg b/icons/save-as-html.svg
new file mode 100644
index 0000000..92f1fd2
--- /dev/null
+++ b/icons/save-as-html.svg
@@ -0,0 +1,128 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   version="1.1"
+   width="55"
+   height="55"
+   viewBox="0 0 55 55"
+   id="svg2"
+   xml:space="preserve"><metadata
+     id="metadata25"><rdf:RDF><cc:Work
+         rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title></dc:title></cc:Work></rdf:RDF></metadata><defs
+     id="defs33">
+	
+	
+	
+
+  
+  
+
+  
+   
+   
+   
+   
+
+	
+
+		
+		
+		
+		
+		
+		
+		
+		
+		
+	</defs><g
+     transform="translate(-24.072147,0)"
+     id="g3014"><g
+       transform="matrix(1.1623273,0,0,1.1623273,5.8946433,-8.9787622)"
+       id="g3116"
+       style="fill:none;stroke:#ffffff;stroke-width:2.15085721;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"><polygon
+         points="39.811,18.343 39.811,38.42 18.435,38.42 18.435,10.583 32.046,10.583 "
+         id="polygon3118"
+         style="fill:none;stroke:#ffffff;stroke-width:2.15085721;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" /><polyline
+         id="polyline3120"
+         points="39.811,18.343 32.046,18.343 32.046,10.583    "
+         style="fill:none;stroke:#ffffff;stroke-width:2.15085721;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" /></g><g
+       transform="matrix(1.1623273,0,0,1.1623273,5.8946433,-8.9787622)"
+       id="g3122"
+       style="fill:none;stroke:#ffffff;stroke-opacity:1"><circle
+         cx="29.122999"
+         cy="28.4"
+         r="6.4689999"
+         id="circle3124"
+         style="fill:none;stroke:#ffffff;stroke-opacity:1" /><g
+         id="g3126"
+         style="fill:none;stroke:#ffffff;stroke-opacity:1"><path
+           d="m 29.124,21.932 c 0,0 3.596,2.971 3.596,6.492 0,3.523 -3.596,6.445 -3.596,6.445"
+           id="path3128"
+           style="fill:none;stroke:#ffffff;stroke-width:0.97500002;stroke-opacity:1" /><path
+           d="m 29.124,21.932 c 0,0 -3.642,2.728 -3.642,6.492 0,3.765 3.642,6.445 3.642,6.445"
+           id="path3130"
+           style="fill:none;stroke:#ffffff;stroke-width:0.97500002;stroke-opacity:1" /><line
+           style="fill:none;stroke:#ffffff;stroke-width:0.97500002;stroke-opacity:1"
+           x1="29.124001"
+           x2="29.124001"
+           y1="21.931999"
+           y2="34.868999"
+           id="line3132" /><line
+           style="fill:none;stroke:#ffffff;stroke-width:0.97500002;stroke-opacity:1"
+           x1="22.653999"
+           x2="35.591"
+           y1="28.4"
+           y2="28.4"
+           id="line3134" /></g></g></g><g
+     id="g3830"><g
+       transform="matrix(0.55205508,0,0,0.55205508,75.618464,18.235971)"
+       id="g4382"><g
+         transform="translate(-80.093659,12.220029)"
+         id="g4308"
+         style="fill:none;stroke:#ffffff;stroke-opacity:1"><g
+           id="g4310"
+           style="fill:none;stroke:#ffffff;stroke-opacity:1"><path
+             d="m 6.736,49.002 h 24.52 c 2.225,0 3.439,-1.447 3.439,-3.441 v -27.28 c 0,-1.73 -1.732,-3.441 -3.439,-3.441 h -4.389"
+             id="path4312"
+             style="fill:none;stroke:#ffffff;stroke-width:3.5;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1" /></g></g><g
+         transform="translate(-80.093659,12.220029)"
+         id="g4314"
+         style="fill:none;stroke:#ffffff;stroke-opacity:1"><g
+           id="g4316"
+           style="fill:none;stroke:#ffffff;stroke-opacity:1"><path
+             d="m 26.867,38.592 c 0,1.836 -1.345,3.201 -3.441,4.047 L 6.736,49.002 V 14.84 l 16.69,-8.599 c 2.228,-0.394 3.441,0.84 3.441,2.834 v 29.517 z"
+             id="path4318"
+             style="fill:none;stroke:#ffffff;stroke-width:3.5;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1" /></g></g><path
+         d="m -70.669659,54.827029 c 0,0 -1.351,-0.543 -2.702,-0.543 -1.351,0 -2.703,0.543 -2.703,0.543"
+         id="path4320"
+         style="fill:none;stroke:#ffffff;stroke-width:2.25;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1" /><path
+         d="m -70.669659,44.226029 c 0,0 -1.239,-0.543 -2.815,-0.543 -1.577,0 -2.59,0.543 -2.59,0.543"
+         id="path4322"
+         style="fill:none;stroke:#ffffff;stroke-width:2.25;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1" /><path
+         d="m -70.669659,33.898029 c 0,0 -1.125,-0.544 -2.927,-0.544 -1.802,0 -2.478,0.544 -2.478,0.544"
+         id="path4324"
+         style="fill:none;stroke:#ffffff;stroke-width:2.25;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1" /><line
+         id="line4326"
+         y2="23.725029"
+         y1="58.753029"
+         x2="-66.884659"
+         x1="-66.884659"
+         style="fill:none;stroke:#ffffff;stroke-width:2.25;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1" /></g><g
+       transform="matrix(1,0,0,-1,-30.386573,49.171266)"
+       id="g4770"><g
+         transform="translate(34.0803,-1006.42)"
+         id="g4772"><polyline
+           id="polyline4774"
+           points="51.562,15.306 41.17,16.188 42.053,5.794"
+           style="fill:none;stroke:#ffffff;stroke-width:3.5;stroke-linecap:round;stroke-linejoin:round"
+           transform="matrix(-0.469241,0.469241,-0.469241,-0.469241,66.2906,1019.03)" /><path
+           d="m 39.363241,1033.1291 -0.05636,9.9115 -8.750608,0.067"
+           id="path4776"
+           style="fill:none;stroke:#ffffff;stroke-width:2.5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" /></g></g></g></svg>
\ No newline at end of file
diff --git a/icons/save-as-pdf.svg b/icons/save-as-pdf.svg
new file mode 100644
index 0000000..c72843e
--- /dev/null
+++ b/icons/save-as-pdf.svg
@@ -0,0 +1,108 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   version="1.1"
+   width="55"
+   height="55"
+   viewBox="0 0 55 55"
+   id="svg2"
+   xml:space="preserve"><metadata
+     id="metadata25"><rdf:RDF><cc:Work
+         rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title></dc:title></cc:Work></rdf:RDF></metadata><defs
+     id="defs33">
+	
+	
+	
+
+  
+  
+
+  
+   
+   
+   
+   
+
+	
+
+		
+		
+		
+		
+		
+		
+		
+		
+		
+	</defs><g
+     transform="matrix(1.1623273,0,0,1.1623273,-18.177504,-8.9787622)"
+     id="g3116"
+     style="fill:none;stroke:#ffffff;stroke-width:2.15085721;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"><polygon
+       points="18.435,10.583 32.046,10.583 39.811,18.343 39.811,38.42 18.435,38.42 "
+       id="polygon3118"
+       style="fill:none;stroke:#ffffff;stroke-width:2.15085721;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" /><polyline
+       style="fill:none;stroke:#ffffff;stroke-width:2.15085721;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       points="39.811,18.343 32.046,18.343 32.046,10.583    "
+       id="polyline3120" /></g><g
+     id="g3830"><g
+       transform="matrix(0.55205508,0,0,0.55205508,75.618464,18.235971)"
+       id="g4382"><g
+         transform="translate(-80.093659,12.220029)"
+         id="g4308"
+         style="fill:none;stroke:#ffffff;stroke-opacity:1"><g
+           id="g4310"
+           style="fill:none;stroke:#ffffff;stroke-opacity:1"><path
+             d="m 6.736,49.002 h 24.52 c 2.225,0 3.439,-1.447 3.439,-3.441 v -27.28 c 0,-1.73 -1.732,-3.441 -3.439,-3.441 h -4.389"
+             id="path4312"
+             style="fill:none;stroke:#ffffff;stroke-width:3.5;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1" /></g></g><g
+         transform="translate(-80.093659,12.220029)"
+         id="g4314"
+         style="fill:none;stroke:#ffffff;stroke-opacity:1"><g
+           id="g4316"
+           style="fill:none;stroke:#ffffff;stroke-opacity:1"><path
+             d="m 26.867,38.592 c 0,1.836 -1.345,3.201 -3.441,4.047 L 6.736,49.002 V 14.84 l 16.69,-8.599 c 2.228,-0.394 3.441,0.84 3.441,2.834 v 29.517 z"
+             id="path4318"
+             style="fill:none;stroke:#ffffff;stroke-width:3.5;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1" /></g></g><path
+         d="m -70.669659,54.827029 c 0,0 -1.351,-0.543 -2.702,-0.543 -1.351,0 -2.703,0.543 -2.703,0.543"
+         id="path4320"
+         style="fill:none;stroke:#ffffff;stroke-width:2.25;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1" /><path
+         d="m -70.669659,44.226029 c 0,0 -1.239,-0.543 -2.815,-0.543 -1.577,0 -2.59,0.543 -2.59,0.543"
+         id="path4322"
+         style="fill:none;stroke:#ffffff;stroke-width:2.25;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1" /><path
+         d="m -70.669659,33.898029 c 0,0 -1.125,-0.544 -2.927,-0.544 -1.802,0 -2.478,0.544 -2.478,0.544"
+         id="path4324"
+         style="fill:none;stroke:#ffffff;stroke-width:2.25;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1" /><line
+         id="line4326"
+         y2="23.725029"
+         y1="58.753029"
+         x2="-66.884659"
+         x1="-66.884659"
+         style="fill:none;stroke:#ffffff;stroke-width:2.25;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1" /></g><g
+       transform="matrix(1,0,0,-1,-30.386573,49.171266)"
+       id="g4770"><g
+         transform="translate(34.0803,-1006.42)"
+         id="g4772"><polyline
+           id="polyline4774"
+           points="51.562,15.306 41.17,16.188 42.053,5.794"
+           style="fill:none;stroke:#ffffff;stroke-width:3.5;stroke-linecap:round;stroke-linejoin:round"
+           transform="matrix(-0.469241,0.469241,-0.469241,-0.469241,66.2906,1019.03)" /><path
+           d="m 39.363241,1033.1291 -0.05636,9.9115 -8.750608,0.067"
+           id="path4776"
+           style="fill:none;stroke:#ffffff;stroke-width:2.5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" /></g></g></g><text
+     x="5.7683401"
+     y="25.907335"
+     id="text3021"
+     xml:space="preserve"
+     style="font-size:11px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"><tspan
+       x="5.7683401"
+       y="25.907335"
+       id="tspan3023"
+       style="fill:#ffffff;fill-opacity:1">pdf</tspan></text>
+</svg>
\ No newline at end of file
diff --git a/icons/save-descriptions.svg b/icons/save-descriptions.svg
new file mode 100644
index 0000000..8f1e1a9
--- /dev/null
+++ b/icons/save-descriptions.svg
@@ -0,0 +1,128 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   version="1.1"
+   width="55"
+   height="55"
+   viewBox="0 0 55 55"
+   id="svg2"
+   xml:space="preserve"><metadata
+   id="metadata25"><rdf:RDF><cc:Work
+       rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+         rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title></dc:title></cc:Work></rdf:RDF></metadata><defs
+   id="defs33">
+	
+	
+	
+
+  
+  
+
+  
+   
+   
+   
+   
+
+	
+
+		
+		
+		
+		
+		
+		
+		
+		
+		
+	</defs>
+<g
+   transform="translate(-0.84693255,-0.49999965)"
+   id="g3136"><g
+     transform="matrix(0.55205508,0,0,0.55205508,75.618464,18.235971)"
+     id="g4382"><g
+       transform="translate(-80.093659,12.220029)"
+       id="g4308"
+       style="fill:none;stroke:#ffffff;stroke-opacity:1"><g
+         id="g4310"
+         style="fill:none;stroke:#ffffff;stroke-opacity:1"><path
+           d="m 6.736,49.002 h 24.52 c 2.225,0 3.439,-1.447 3.439,-3.441 v -27.28 c 0,-1.73 -1.732,-3.441 -3.439,-3.441 h -4.389"
+           id="path4312"
+           style="fill:none;stroke:#ffffff;stroke-width:3.5;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1" /></g></g><g
+       transform="translate(-80.093659,12.220029)"
+       id="g4314"
+       style="fill:none;stroke:#ffffff;stroke-opacity:1"><g
+         id="g4316"
+         style="fill:none;stroke:#ffffff;stroke-opacity:1"><path
+           d="m 26.867,38.592 c 0,1.836 -1.345,3.201 -3.441,4.047 L 6.736,49.002 V 14.84 l 16.69,-8.599 c 2.228,-0.394 3.441,0.84 3.441,2.834 v 29.517 z"
+           id="path4318"
+           style="fill:none;stroke:#ffffff;stroke-width:3.5;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1" /></g></g><path
+       d="m -70.669659,54.827029 c 0,0 -1.351,-0.543 -2.702,-0.543 -1.351,0 -2.703,0.543 -2.703,0.543"
+       id="path4320"
+       style="fill:none;stroke:#ffffff;stroke-width:2.25;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1" /><path
+       d="m -70.669659,44.226029 c 0,0 -1.239,-0.543 -2.815,-0.543 -1.577,0 -2.59,0.543 -2.59,0.543"
+       id="path4322"
+       style="fill:none;stroke:#ffffff;stroke-width:2.25;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1" /><path
+       d="m -70.669659,33.898029 c 0,0 -1.125,-0.544 -2.927,-0.544 -1.802,0 -2.478,0.544 -2.478,0.544"
+       id="path4324"
+       style="fill:none;stroke:#ffffff;stroke-width:2.25;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1" /><line
+       id="line4326"
+       y2="23.725029"
+       y1="58.753029"
+       x2="-66.884659"
+       x1="-66.884659"
+       style="fill:none;stroke:#ffffff;stroke-width:2.25;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1" /></g><g
+     transform="matrix(1,0,0,-1,-24.386573,49.171266)"
+     id="g4770"><g
+       transform="translate(34.0803,-1006.42)"
+       id="g4772"><polyline
+         id="polyline4774"
+         points="51.562,15.306 41.17,16.188 42.053,5.794"
+         style="fill:none;stroke:#ffffff;stroke-width:3.5;stroke-linecap:round;stroke-linejoin:round"
+         transform="matrix(-0.469241,0.469241,-0.469241,-0.469241,66.2906,1019.03)" /><path
+         d="m 39.363241,1033.1291 -0.05636,9.9115 -8.750608,0.067"
+         id="path4776"
+         style="fill:none;stroke:#ffffff;stroke-width:2.5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" /></g></g><g
+     transform="matrix(0.7311828,0,0,0.7311828,0.16582795,-0.1075271)"
+     id="g3092"
+     style="fill:none;stroke:#ffffff;stroke-opacity:1">
+    <g
+   transform="translate(-3.1255,0)"
+   id="write-journal"
+   style="fill:none;stroke:#ffffff;stroke-opacity:1;display:block">
+      <path
+   d="m 8.9375,6 0,43 29.46875,0 c 2.804,0 4.34375,-1.83275 4.34375,-4.34375 l 0,-19.53125 0.1875,-0.25 8.03125,-10.34375 c 0.022,-0.023 0.125,-0.1875 0.125,-0.1875 0.096,-0.161 0.15625,-0.3515 0.15625,-0.5625 0,-0.061 0.012,-0.1295 0,-0.1875 -0.087,-0.763 -0.73225,-1.67525 -1.65625,-2.40625 -0.923,-0.728 -1.95975,-1.12025 -2.71875,-1.03125 -0.326,0.042 -0.78125,0.375 -0.78125,0.375 l -3.15625,4.15625 -0.1875,0.25 0,-4.59375 C 42.75,8.16775 40.55625,6 38.40625,6 L 8.9375,6 z"
+   transform="translate(3.1255,0)"
+   id="path3095"
+   style="fill:none;stroke:#ffffff;stroke-width:3.5;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1" />
+      <line
+   style="fill:none;stroke:#ffffff;stroke-width:3.5;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1"
+   x1="21.341"
+   x2="21.341"
+   y1="6.1209998"
+   y2="48.881001"
+   id="line3097" />
+      <path
+   d="m 7.384,14.464 c 0,0 2.084,0.695 4.17,0.695 2.086,0 4.173,-0.695 4.173,-0.695"
+   id="path3099"
+   style="fill:none;stroke:#ffffff;stroke-width:3.5;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1" />
+      <path
+   d="m 7.384,28.021 c 0,0 1.912,0.695 4.345,0.695 2.433,0 3.999,-0.695 3.999,-0.695"
+   id="path3101"
+   style="fill:none;stroke:#ffffff;stroke-width:3.5;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1" />
+      <path
+   d="m 7.384,41.232 c 0,0 1.736,0.695 4.518,0.695 2.781,0 3.825,-0.695 3.825,-0.695"
+   id="path3103"
+   style="fill:none;stroke:#ffffff;stroke-width:3.5;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1" />
+    </g>
+    <path
+   d="m 42.806917,14.85 -11.91627,15.831262 -3.475,8.266 c -0.046,0.104 -0.018,0.223 0.069,0.295 0.089,0.072 0.211,0.084 0.307,0.02 l 7.826,-5.037 7.18927,-9.175262"
+   id="path3105"
+   style="fill:none;stroke:#ffffff;stroke-width:3.5;stroke-opacity:1" />
+  </g></g></svg>
\ No newline at end of file
diff --git a/icons/slide-view.svg b/icons/slide-view.svg
new file mode 100644
index 0000000..ec98803
--- /dev/null
+++ b/icons/slide-view.svg
@@ -0,0 +1,68 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   version="1.1"
+   width="55"
+   height="55"
+   viewBox="0 0 55 55"
+   id="svg2"
+   style="fill:#eeeeee;stroke:#000000;stroke-width:3.5;stroke-linecap:round;stroke-linejoin:round"><metadata
+   id="metadata14">
+  <rdf:RDF>
+    <cc:Work
+       rdf:about="">
+      <dc:format>image/svg+xml</dc:format>
+      <dc:type
+         rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      <dc:title></dc:title>
+    </cc:Work>
+  </rdf:RDF>
+</metadata>
+<defs
+   id="defs12" />
+
+`  <g
+   transform="matrix(0.8501594,0,0,0.8501594,4.1206165,2.9055499)"
+   id="g3041"
+   style="stroke:#ffffff;stroke-opacity:1">
+  <rect
+     width="40"
+     height="30"
+     x="7.5"
+     y="5.8274999"
+     id="rect2996"
+     style="fill:#eeeeee;stroke:#ffffff;stroke-width:2.34500003;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+  <g
+     transform="translate(-1.0846148,0)"
+     id="g3793"
+     style="stroke:#ffffff;stroke-opacity:1">
+    <line
+       id="line2460"
+       y2="52.31316"
+       y1="36.358479"
+       x2="23.419287"
+       x1="27.69433"
+       style="fill:none;stroke:#ffffff;stroke-width:1.78056884;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1" />
+    <line
+       id="line2460-2"
+       y2="52.313156"
+       y1="36.358479"
+       x2="33.749943"
+       x1="29.474899"
+       style="fill:none;stroke:#ffffff;stroke-width:1.78056884;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1" />
+  </g>
+  <line
+     style="fill:none;stroke:#ffffff;stroke-width:2.66399026;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1"
+     x1="9.0131855"
+     x2="45.986813"
+     y1="8.168005"
+     y2="8.168005"
+     id="line2460-0" />
+</g>
+</svg>
diff --git a/icons/sound-save-insensitive.svg b/icons/sound-save-insensitive.svg
new file mode 100644
index 0000000..a89e4da
--- /dev/null
+++ b/icons/sound-save-insensitive.svg
@@ -0,0 +1,104 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   version="1.1"
+   width="55"
+   height="55"
+   viewBox="0 0 55 55"
+   id="svg2"
+   xml:space="preserve"><metadata
+     id="metadata25"><rdf:RDF><cc:Work
+         rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title></dc:title></cc:Work></rdf:RDF></metadata><defs
+     id="defs23">
+	
+	
+	
+	
+
+	
+</defs><g
+     transform="translate(8,-10)"
+     id="g9"
+     style="fill:none;stroke:#a0a0a0;stroke-opacity:1;display:inline">
+		<g
+   id="g11"
+   style="fill:none;stroke:#a0a0a0;stroke-opacity:1">
+			<polygon
+   points="43.041,35.189 43.041,21.577 35.281,13.812 15.204,13.812 15.204,35.189 "
+   id="polygon13"
+   style="fill:none;stroke:#a0a0a0;stroke-width:2.2750001;stroke-opacity:1" />
+			<polyline
+   style="fill:none;stroke:#a0a0a0;stroke-width:2.2750001;stroke-opacity:1"
+   id="polyline15"
+   points="35.281,13.812 35.281,21.577 43.041,21.577    " />
+		</g>
+	</g><g
+     transform="matrix(0.30966602,0,0,0.30966602,28.772893,7.5815585)"
+     id="g3102"
+     style="fill:none;stroke:#a0a0a0;stroke-width:4.84392834;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline">
+		<path
+   d="m 51.375,27.597 c 0,0 -11.387,13.041 -24.001,13.041 -12.613,0 -23.999,-13.041 -23.999,-13.041 0,0 8.915,-11.234 16.869,-11.234 4.418,0 7.13,2.73 7.13,2.73 0,0 2.716,-2.73 7.132,-2.73 7.953,-0.001 16.869,11.234 16.869,11.234 z"
+   id="path3104"
+   style="fill:none;stroke:#a0a0a0;stroke-width:4.84392834;stroke-linecap:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+		<line
+   style="fill:none;stroke:#a0a0a0;stroke-width:4.84392834;stroke-linecap:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+   x1="3.375"
+   x2="51.375"
+   y1="27.597"
+   y2="27.597"
+   id="line3106" />
+	</g><g
+     transform="matrix(0.55205508,0,0,0.55205508,44.618464,18.235971)"
+     id="g4382"
+     style="stroke:#a0a0a0;stroke-opacity:1"><g
+       transform="translate(-80.093659,12.220029)"
+       id="g4308"
+       style="fill:none;stroke:#a0a0a0;stroke-opacity:1"><g
+         id="g4310"
+         style="fill:none;stroke:#a0a0a0;stroke-opacity:1"><path
+           d="m 6.736,49.002 h 24.52 c 2.225,0 3.439,-1.447 3.439,-3.441 v -27.28 c 0,-1.73 -1.732,-3.441 -3.439,-3.441 h -4.389"
+           id="path4312"
+           style="fill:none;stroke:#a0a0a0;stroke-width:3.5;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1" /></g></g><g
+       transform="translate(-80.093659,12.220029)"
+       id="g4314"
+       style="fill:none;stroke:#a0a0a0;stroke-opacity:1"><g
+         id="g4316"
+         style="fill:none;stroke:#a0a0a0;stroke-opacity:1"><path
+           d="m 26.867,38.592 c 0,1.836 -1.345,3.201 -3.441,4.047 L 6.736,49.002 V 14.84 l 16.69,-8.599 c 2.228,-0.394 3.441,0.84 3.441,2.834 v 29.517 z"
+           id="path4318"
+           style="fill:none;stroke:#a0a0a0;stroke-width:3.5;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1" /></g></g><path
+       d="m -70.669659,54.827029 c 0,0 -1.351,-0.543 -2.702,-0.543 -1.351,0 -2.703,0.543 -2.703,0.543"
+       id="path4320"
+       style="fill:none;stroke:#a0a0a0;stroke-width:2.25;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1" /><path
+       d="m -70.669659,44.226029 c 0,0 -1.239,-0.543 -2.815,-0.543 -1.577,0 -2.59,0.543 -2.59,0.543"
+       id="path4322"
+       style="fill:none;stroke:#a0a0a0;stroke-width:2.25;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1" /><path
+       d="m -70.669659,33.898029 c 0,0 -1.125,-0.544 -2.927,-0.544 -1.802,0 -2.478,0.544 -2.478,0.544"
+       id="path4324"
+       style="fill:none;stroke:#a0a0a0;stroke-width:2.25;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1" /><line
+       style="fill:none;stroke:#a0a0a0;stroke-width:2.25;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1"
+       x1="-66.884659"
+       x2="-66.884659"
+       y1="58.753029"
+       y2="23.725029"
+       id="line4326" /></g><g
+     transform="matrix(0,1,1,0,5.8287336,-30.080438)"
+     id="g4770"
+     style="stroke:#a0a0a0;stroke-opacity:1"><g
+       transform="translate(34.0803,-1006.42)"
+       id="g4772"
+       style="stroke:#a0a0a0;stroke-opacity:1"><polyline
+         transform="matrix(-0.469241,0.469241,-0.469241,-0.469241,66.2906,1019.03)"
+         style="fill:none;stroke:#a0a0a0;stroke-width:3.5;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1"
+         points="51.562,15.306 41.17,16.188 42.053,5.794"
+         id="polyline4774" /><path
+         d="m 39.363241,1033.1291 -0.05636,9.9115 -8.750608,0.067"
+         id="path4776"
+         style="fill:none;stroke:#a0a0a0;stroke-width:2.5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" /></g></g></svg>
\ No newline at end of file
diff --git a/icons/sound-save.svg b/icons/sound-save.svg
new file mode 100644
index 0000000..5ecb69b
--- /dev/null
+++ b/icons/sound-save.svg
@@ -0,0 +1,101 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   version="1.1"
+   width="55"
+   height="55"
+   viewBox="0 0 55 55"
+   id="svg2"
+   xml:space="preserve"><metadata
+     id="metadata25"><rdf:RDF><cc:Work
+         rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title></dc:title></cc:Work></rdf:RDF></metadata><defs
+     id="defs23">
+	
+	
+	
+	
+
+	
+</defs><g
+     transform="translate(8,-10)"
+     id="g9"
+     style="fill:none;stroke:#ffffff;stroke-opacity:1;display:inline">
+		<g
+   id="g11"
+   style="fill:none;stroke:#ffffff;stroke-opacity:1">
+			<polygon
+   points="43.041,35.189 43.041,21.577 35.281,13.812 15.204,13.812 15.204,35.189 "
+   id="polygon13"
+   style="fill:none;stroke:#ffffff;stroke-width:2.2750001;stroke-opacity:1" />
+			<polyline
+   style="fill:none;stroke:#ffffff;stroke-width:2.2750001;stroke-opacity:1"
+   id="polyline15"
+   points="35.281,13.812 35.281,21.577 43.041,21.577    " />
+		</g>
+	</g><g
+     transform="matrix(0.30966602,0,0,0.30966602,28.772893,7.5815585)"
+     id="g3102"
+     style="fill:none;stroke:#ffffff;stroke-width:4.84392834;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline">
+		<path
+   d="m 51.375,27.597 c 0,0 -11.387,13.041 -24.001,13.041 -12.613,0 -23.999,-13.041 -23.999,-13.041 0,0 8.915,-11.234 16.869,-11.234 4.418,0 7.13,2.73 7.13,2.73 0,0 2.716,-2.73 7.132,-2.73 7.953,-0.001 16.869,11.234 16.869,11.234 z"
+   id="path3104"
+   style="fill:none;stroke:#ffffff;stroke-width:4.84392834;stroke-linecap:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+		<line
+   style="fill:none;stroke:#ffffff;stroke-width:4.84392834;stroke-linecap:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+   x1="3.375"
+   x2="51.375"
+   y1="27.597"
+   y2="27.597"
+   id="line3106" />
+	</g><g
+     transform="matrix(0.55205508,0,0,0.55205508,44.618464,18.235971)"
+     id="g4382"><g
+       transform="translate(-80.093659,12.220029)"
+       id="g4308"
+       style="fill:none;stroke:#ffffff;stroke-opacity:1"><g
+         id="g4310"
+         style="fill:none;stroke:#ffffff;stroke-opacity:1"><path
+           d="m 6.736,49.002 h 24.52 c 2.225,0 3.439,-1.447 3.439,-3.441 v -27.28 c 0,-1.73 -1.732,-3.441 -3.439,-3.441 h -4.389"
+           id="path4312"
+           style="fill:none;stroke:#ffffff;stroke-width:3.5;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1" /></g></g><g
+       transform="translate(-80.093659,12.220029)"
+       id="g4314"
+       style="fill:none;stroke:#ffffff;stroke-opacity:1"><g
+         id="g4316"
+         style="fill:none;stroke:#ffffff;stroke-opacity:1"><path
+           d="m 26.867,38.592 c 0,1.836 -1.345,3.201 -3.441,4.047 L 6.736,49.002 V 14.84 l 16.69,-8.599 c 2.228,-0.394 3.441,0.84 3.441,2.834 v 29.517 z"
+           id="path4318"
+           style="fill:none;stroke:#ffffff;stroke-width:3.5;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1" /></g></g><path
+       d="m -70.669659,54.827029 c 0,0 -1.351,-0.543 -2.702,-0.543 -1.351,0 -2.703,0.543 -2.703,0.543"
+       id="path4320"
+       style="fill:none;stroke:#ffffff;stroke-width:2.25;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1" /><path
+       d="m -70.669659,44.226029 c 0,0 -1.239,-0.543 -2.815,-0.543 -1.577,0 -2.59,0.543 -2.59,0.543"
+       id="path4322"
+       style="fill:none;stroke:#ffffff;stroke-width:2.25;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1" /><path
+       d="m -70.669659,33.898029 c 0,0 -1.125,-0.544 -2.927,-0.544 -1.802,0 -2.478,0.544 -2.478,0.544"
+       id="path4324"
+       style="fill:none;stroke:#ffffff;stroke-width:2.25;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1" /><line
+       style="fill:none;stroke:#ffffff;stroke-width:2.25;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1"
+       x1="-66.884659"
+       x2="-66.884659"
+       y1="58.753029"
+       y2="23.725029"
+       id="line4326" /></g><g
+     transform="matrix(0,1,1,0,5.8287336,-30.080438)"
+     id="g4770"><g
+       transform="translate(34.0803,-1006.42)"
+       id="g4772"><polyline
+         transform="matrix(-0.469241,0.469241,-0.469241,-0.469241,66.2906,1019.03)"
+         style="fill:none;stroke:#ffffff;stroke-width:3.5;stroke-linecap:round;stroke-linejoin:round"
+         points="51.562,15.306 41.17,16.188 42.053,5.794"
+         id="polyline4774" /><path
+         d="m 39.363241,1033.1291 -0.05636,9.9115 -8.750608,0.067"
+         id="path4776"
+         style="fill:none;stroke:#ffffff;stroke-width:2.5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" /></g></g></svg>
\ No newline at end of file
diff --git a/icons/thumbs-view.svg b/icons/thumbs-view.svg
new file mode 100644
index 0000000..cb5dc20
--- /dev/null
+++ b/icons/thumbs-view.svg
@@ -0,0 +1,109 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   version="1.1"
+   width="55"
+   height="54.695999"
+   viewBox="0 0 55 54.696"
+   id="svg3000"
+   xml:space="preserve"><metadata
+     id="metadata3021"><rdf:RDF><cc:Work
+         rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title></dc:title></cc:Work></rdf:RDF></metadata><defs
+     id="defs3019">
+	
+
+		
+	
+			
+			
+			
+			
+			
+		
+	
+	
+	
+
+  
+  
+
+  
+   
+   
+   
+   
+
+	
+
+		
+		
+		
+		
+		
+		
+		
+		
+		
+	</defs><g
+     transform="translate(-1.1206348,-0.06663089)"
+     id="g3918"><rect
+       width="20"
+       height="14"
+       x="7.5592799"
+       y="20.414629"
+       id="rect3791-6"
+       style="fill:#606060;fill-opacity:1;stroke:none" /><rect
+       width="20"
+       height="14"
+       x="29.68199"
+       y="36.089016"
+       id="rect3791-6-8"
+       style="fill:#c0c0c0;fill-opacity:1;stroke:none" /><rect
+       width="20"
+       height="14"
+       x="7.5592799"
+       y="36.089016"
+       id="rect3791-6-4"
+       style="fill:#606060;fill-opacity:1;stroke:none" /><rect
+       width="20"
+       height="14"
+       x="29.68199"
+       y="20.414629"
+       id="rect3791-6-41"
+       style="fill:#606060;fill-opacity:1;stroke:none" /><rect
+       width="20"
+       height="14"
+       x="29.68199"
+       y="4.7402458"
+       id="rect3791-6-9"
+       style="fill:#606060;fill-opacity:1;stroke:none" /><rect
+       width="20"
+       height="14"
+       x="7.5592799"
+       y="4.7402458"
+       id="rect3791-6-6"
+       style="fill:#c0c0c0;fill-opacity:1;stroke:none" /></g><g
+     transform="translate(1.745311,0.5838585)"
+     id="g3827"
+     style="stroke:#ffffff;stroke-opacity:1"><polyline
+       id="polyline4774"
+       points="51.562,15.306 41.17,16.188 42.053,5.794"
+       style="fill:none;stroke:#ffffff;stroke-width:3.5;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1"
+       transform="matrix(0.75663262,0.74365257,-0.75663262,0.74365257,-0.33007478,-30.718962)" /><path
+       d="m 22.404268,11.955483 15.981904,0.08932 0.108035,27.867953"
+       id="path4776"
+       style="fill:none;stroke:#ffffff;stroke-width:3.99642467;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" /><polyline
+       id="polyline4774-6"
+       points="51.562,15.306 41.17,16.188 42.053,5.794"
+       style="fill:none;stroke:#ffffff;stroke-width:3.5;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1"
+       transform="matrix(-0.75663262,-0.74365257,0.75663262,-0.74365257,51.839353,84.247245)" /><path
+       d="M 29.10511,41.572799 13.123206,41.483479 13.015171,13.615526"
+       id="path4776-0"
+       style="fill:none;stroke:#ffffff;stroke-width:3.99642467;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" /></g></svg>
\ No newline at end of file
diff --git a/icons/write-journal.svg b/icons/write-journal.svg
new file mode 100644
index 0000000..33f10af
--- /dev/null
+++ b/icons/write-journal.svg
@@ -0,0 +1,36 @@
+<?xml version="1.0" ?><!-- Generator: Adobe Illustrator 13.0.2, SVG Export Plug-In . SVG Version: 6.00 Build 14948)  --><!DOCTYPE svg  PUBLIC '-//W3C//DTD SVG 1.1//EN'  'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd' [
+	<!ENTITY stroke_color "#FFFFFF">
+	<!ENTITY fill_color "#A0A0A0">
+]><svg enable-background="new 0 0 55.125 55" height="55px" id="Layer_1" version="1.1" viewBox="0 0 55.125 55" width="55.125px" x="0px" xml:space="preserve" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
+  <g
+   transform="translate(-0.25691667,0)"
+   style="fill:none;stroke:&stroke_color;;stroke-opacity:1">
+    <g
+   transform="translate(-3.1255,0)"
+   id="write-journal"
+   style="fill:none;stroke:&stroke_color;;stroke-opacity:1;display:block">
+      <path
+   d="m 8.9375,6 0,43 29.46875,0 c 2.804,0 4.34375,-1.83275 4.34375,-4.34375 l 0,-19.53125 0.1875,-0.25 8.03125,-10.34375 c 0.022,-0.023 0.125,-0.1875 0.125,-0.1875 0.096,-0.161 0.15625,-0.3515 0.15625,-0.5625 0,-0.061 0.012,-0.1295 0,-0.1875 -0.087,-0.763 -0.73225,-1.67525 -1.65625,-2.40625 -0.923,-0.728 -1.95975,-1.12025 -2.71875,-1.03125 -0.326,0.042 -0.78125,0.375 -0.78125,0.375 l -3.15625,4.15625 -0.1875,0.25 0,-4.59375 C 42.75,8.16775 40.55625,6 38.40625,6 L 8.9375,6 z"
+   transform="translate(3.1255,0)"
+   style="fill:none;stroke:&stroke_color;;stroke-width:3.5;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1" />
+      <line
+   style="fill:none;stroke:&stroke_color;;stroke-width:3.5;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1"
+   x1="21.341"
+   x2="21.341"
+   y1="6.121"
+   y2="48.881" />
+      <path
+   d="m 7.384,14.464 c 0,0 2.084,0.695 4.17,0.695 2.086,0 4.173,-0.695 4.173,-0.695"
+   style="fill:none;stroke:&stroke_color;;stroke-width:3.5;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1" />
+      <path
+   d="m 7.384,28.021 c 0,0 1.912,0.695 4.345,0.695 2.433,0 3.999,-0.695 3.999,-0.695"
+   style="fill:none;stroke:&stroke_color;;stroke-width:3.5;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1" />
+      <path
+   d="m 7.384,41.232 c 0,0 1.736,0.695 4.518,0.695 2.781,0 3.825,-0.695 3.825,-0.695"
+   style="fill:none;stroke:&stroke_color;;stroke-width:3.5;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1" />
+    </g>
+    <path
+   d="m 42.806917,14.85 -11.91627,15.831262 -3.475,8.266 c -0.046,0.104 -0.018,0.223 0.069,0.295 0.089,0.072 0.211,0.084 0.307,0.02 l 7.826,-5.037 7.18927,-9.175262"
+   style="fill:none;stroke:&stroke_color;;stroke-width:3.5;stroke-opacity:1" />
+  </g>
+</svg>
\ No newline at end of file
diff --git a/setup.py b/setup.py
new file mode 100755
index 0000000..e5026ee
--- /dev/null
+++ b/setup.py
@@ -0,0 +1,32 @@
+#!/usr/bin/env python
+import os
+import sys
+
+if len(sys.argv) > 1 and '--no-sugar' == sys.argv[1]:
+    # Remove the argument from the stack so we don't cause problems
+    # for distutils
+    sys.argv.pop(1)
+    
+    import glob, os.path, string
+    from distutils.core import setup
+    
+    DATA_FILES = [
+        ('icons', glob.glob('icons/*')),
+        ('images', glob.glob('images/*')),
+        ('/usr/share/applications', ['turtleart.desktop'])
+        ]
+
+    setup (name = 'Turtle Art',
+           description = "A LOGO-like tool for teaching programming",
+           author = "Walter Bender",
+           author_email = "walter.bender@gmail.com",
+           version = '0.9.4',
+           packages = ['TurtleArt'],
+           scripts = ['turtleart'],
+           data_files = DATA_FILES,
+           )
+else: 
+    from sugar.activity import bundlebuilder
+
+    if __name__ == "__main__":
+        bundlebuilder.start()
diff --git a/sprites.py b/sprites.py
new file mode 100644
index 0000000..baae94f
--- /dev/null
+++ b/sprites.py
@@ -0,0 +1,454 @@
+# -*- coding: utf-8 -*-
+
+#Copyright (c) 2007-8, Playful Invention Company.
+#Copyright (c) 2008-11 Walter Bender
+
+#Permission is hereby granted, free of charge, to any person obtaining a copy
+#of this software and associated documentation files (the "Software"), to deal
+#in the Software without restriction, including without limitation the rights
+#to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+#copies of the Software, and to permit persons to whom the Software is
+#furnished to do so, subject to the following conditions:
+
+#The above copyright notice and this permission notice shall be included in
+#all copies or substantial portions of the Software.
+
+#THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+#IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+#FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+#AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+#LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+#OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+#THE SOFTWARE.
+
+'''
+
+sprites.py is a simple sprites library for managing graphics objects,
+'sprites', on a gtk.DrawingArea. It manages multiple sprites with
+methods such as move, hide, set_layer, etc.
+
+There are two classes:
+
+class Sprites maintains a collection of sprites
+class Sprite manages individual sprites within the collection.
+
+Example usage:
+        # Import the classes into your program.
+        from sprites import Sprites Sprite
+
+        # Create a new sprite collection associated with your widget
+        self.sprite_list = Sprites(widget)
+
+        # Create a "pixbuf" (in this example, from SVG).
+        my_pixbuf = svg_str_to_pixbuf("<svg>...some svg code...</svg>")
+
+        # Create a sprite at position x1, y1.
+        my_sprite = sprites.Sprite(self.sprite_list, x1, y1, my_pixbuf)
+
+        # Move the sprite to a new position.
+        my_sprite.move((x1+dx, y1+dy))
+
+        # Create another "pixbuf".
+        your_pixbuf = svg_str_to_pixbuf("<svg>...some svg code...</svg>")
+
+        # Create a sprite at position x2, y2.
+        your_sprite = sprites.Sprite(self.sprite_list, x2, y2, my_pixbuf)
+
+        # Assign the sprites to layers.
+        # In this example, your_sprite will be on top of my_sprite.
+        my_sprite.set_layer(100)
+        your_sprite.set_layer(200)
+
+        # Now put my_sprite on top of your_sprite.
+        my_sprite.set_layer(300)
+
+        cr = self.window.cairo_create()
+        # In your activity's do_expose_event, put in a call to redraw_sprites
+        self.sprites.redraw_sprites(event.area, cairo_context)
+
+# method for converting SVG to a gtk pixbuf
+def svg_str_to_pixbuf(svg_string):
+    pl = gtk.gdk.PixbufLoader('svg')
+    pl.write(svg_string)
+    pl.close()
+    pixbuf = pl.get_pixbuf()
+    return pixbuf
+
+'''
+
+import pygtk
+pygtk.require('2.0')
+import gtk
+import pango
+import pangocairo
+import cairo
+
+class Sprites:
+    ''' A class for the list of sprites and everything they share in common '''
+
+    def __init__(self, widget):
+        ''' Initialize an empty array of sprites '''
+        self.widget = widget
+        self.list = []
+        self.cr = None
+
+    def set_cairo_context(self, cr):
+        ''' Cairo context may be set or reset after __init__ '''
+        self.cr = cr
+
+    def get_sprite(self, i):
+        ''' Return a sprint from the array '''
+        if i < 0 or i > len(self.list) - 1:
+            return(None)
+        else:
+            return(self.list[i])
+
+    def length_of_list(self):
+        ''' How many sprites are there? '''
+        return(len(self.list))
+
+    def append_to_list(self, spr):
+        ''' Append a new sprite to the end of the list. '''
+        self.list.append(spr)
+
+    def insert_in_list(self, spr, i):
+        ''' Insert a sprite at position i. '''
+        if i < 0:
+            self.list.insert(0, spr)
+        elif i > len(self.list) - 1:
+            self.list.append(spr)
+        else:
+            self.list.insert(i, spr)
+
+    def remove_from_list(self, spr):
+        ''' Remove a sprite from the list. '''
+        if spr in self.list:
+            self.list.remove(spr)
+
+    def find_sprite(self, pos):
+        ''' Search based on (x, y) position. Return the 'top/first' one. '''
+        list = self.list[:]
+        list.reverse()
+        for spr in list:
+            if spr.hit(pos):
+                return spr
+        return None
+
+    def redraw_sprites(self, area=None, cr=None):
+        ''' Redraw the sprites that intersect area. '''
+        # I think I need to do this to save Cairo some work
+        if cr is None:
+            cr = self.cr
+        else:
+            self.cr = cr
+        if cr is None:
+            print 'sprites.redraw_sprites: no Cairo context'
+            return
+        for spr in self.list:
+            if area == None:
+                spr.draw(cr=cr)
+            else:
+                intersection = spr.rect.intersect(area)
+                if intersection.width > 0 or intersection.height > 0:
+                    spr.draw(cr=cr)
+
+
+class Sprite:
+    ''' A class for the individual sprites '''
+
+    def __init__(self, sprites, x, y, image):
+        ''' Initialize an individual sprite '''
+        self._sprites = sprites
+        self.save_xy = (x, y)  # remember initial (x, y) position
+        self.rect = gtk.gdk.Rectangle(int(x), int(y), 0, 0)
+        self._scale = [12]
+        self._rescale = [True]
+        self._horiz_align = ["center"]
+        self._vert_align = ["middle"]
+        self._fd = None
+        self._bold = False
+        self._italic = False
+        self._color = None
+        self._margins = [0, 0, 0, 0]
+        self.layer = 100
+        self.labels = []
+        self.cached_surfaces = []
+        self._dx = []  # image offsets
+        self._dy = []
+        self.type = None
+        self.set_image(image)
+        self._sprites.append_to_list(self)
+
+    def set_image(self, image, i=0, dx=0, dy=0):
+        ''' Add an image to the sprite. '''
+        while len(self.cached_surfaces) < i + 1:
+            self.cached_surfaces.append(None)
+            self._dx.append(0)
+            self._dy.append(0)
+        self._dx[i] = dx
+        self._dy[i] = dy
+        if isinstance(image, gtk.gdk.Pixbuf):
+            w = image.get_width()
+            h = image.get_height()
+        else:
+            w, h = image.get_size()
+        if i == 0:  # Always reset width and height when base image changes.
+            self.rect.width = w + dx
+            self.rect.height = h + dy
+        else:
+            if w + dx > self.rect.width:
+                self.rect.width = w + dx
+            if h + dy > self.rect.height:
+                self.rect.height = h + dy
+        surface = cairo.ImageSurface(
+            cairo.FORMAT_ARGB32, self.rect.width, self.rect.height)
+        context = cairo.Context(surface)
+        context = gtk.gdk.CairoContext(context)
+        context.set_source_pixbuf(image, 0, 0)
+        context.rectangle(0, 0, self.rect.width, self.rect.height)
+        context.fill()
+        self.cached_surfaces[i] = surface
+
+    def move(self, pos):
+        ''' Move to new (x, y) position '''
+        self.inval()
+        self.rect.x, self.rect.y = int(pos[0]), int(pos[1])
+        self.inval()
+
+    def move_relative(self, pos):
+        ''' Move to new (x+dx, y+dy) position '''
+        self.inval()
+        self.rect.x += int(pos[0])
+        self.rect.y += int(pos[1])
+        self.inval()
+
+    def get_xy(self):
+        ''' Return current (x, y) position '''
+        return (self.rect.x, self.rect.y)
+
+    def get_dimensions(self):
+        ''' Return current size '''
+        return (self.rect.width, self.rect.height)
+
+    def get_layer(self):
+        ''' Return current layer '''
+        return self.layer
+
+    def set_shape(self, image, i=0):
+        ''' Set the current image associated with the sprite '''
+        self.inval()
+        self.set_image(image, i)
+        self.inval()
+
+    def set_layer(self, layer=None):
+        ''' Set the layer for a sprite '''
+        self._sprites.remove_from_list(self)
+        if layer is not None:
+            self.layer = layer
+        for i in range(self._sprites.length_of_list()):
+            if layer < self._sprites.get_sprite(i).layer:
+                self._sprites.insert_in_list(self, i)
+                self.inval()
+                return
+        self._sprites.append_to_list(self)
+        self.inval()
+
+    def set_label(self, new_label, i=0):
+        ''' Set the label drawn on the sprite '''
+        self._extend_labels_array(i)
+        if type(new_label) is str or type(new_label) is unicode:
+            # pango doesn't like nulls
+            self.labels[i] = new_label.replace("\0", " ")
+        else:
+            self.labels[i] = str(new_label)
+        self.inval()
+
+    def set_margins(self, l=0, t=0, r=0, b=0):
+        ''' Set the margins for drawing the label '''
+        self._margins = [l, t, r, b]
+
+    def _extend_labels_array(self, i):
+        ''' Append to the labels attribute list '''
+        if self._fd is None:
+            self.set_font('Sans')
+        if self._color is None:
+            self._color = (0., 0., 0.)
+        while len(self.labels) < i + 1:
+            self.labels.append(" ")
+            self._scale.append(self._scale[0])
+            self._rescale.append(self._rescale[0])
+            self._horiz_align.append(self._horiz_align[0])
+            self._vert_align.append(self._vert_align[0])
+
+    def set_font(self, font):
+        ''' Set the font for a label '''
+        self._fd = pango.FontDescription(font)
+
+    def set_label_color(self, rgb):
+        ''' Set the font color for a label '''
+        COLORTABLE = {'black': '#000000', 'white': '#FFFFFF',
+                      'red': '#FF0000', 'yellow': '#FFFF00',
+                      'green': '#00FF00', 'cyan': '#00FFFF',
+                      'blue': '#0000FF', 'purple': '#FF00FF',
+                      'gray': '#808080'}
+        if rgb.lower() in COLORTABLE:
+            rgb = COLORTABLE[rgb.lower()]
+        # Convert from '#RRGGBB' to floats
+        self._color = (int('0x' + rgb[1:3], 16) / 256.,
+                       int('0x' + rgb[3:5], 16) / 256.,
+                       int('0x' + rgb[5:7], 16) / 256.)
+        return
+
+    def set_label_attributes(self, scale, rescale=True, horiz_align="center",
+                             vert_align="middle", i=0):
+        ''' Set the various label attributes '''
+        self._extend_labels_array(i)
+        self._scale[i] = scale
+        self._rescale[i] = rescale
+        self._horiz_align[i] = horiz_align
+        self._vert_align[i] = vert_align
+
+    def hide(self):
+        ''' Hide a sprite '''
+        self.inval()
+        self._sprites.remove_from_list(self)
+
+    def restore(self):
+        ''' Restore a hidden sprite '''
+        self.set_layer()
+
+    def inval(self):
+        ''' Invalidate a region for gtk '''
+        self._sprites.widget.queue_draw_area(self.rect.x,
+                                             self.rect.y,
+                                             self.rect.width,
+                                             self.rect.height)
+
+    def draw(self, cr=None):
+        ''' Draw the sprite (and label) '''
+        if cr is None:
+            print 'sprite.draw: no Cairo context.'
+            return
+        for i, surface in enumerate(self.cached_surfaces):
+            cr.set_source_surface(surface,
+                                  self.rect.x + self._dx[i],
+                                  self.rect.y + self._dy[i])
+            cr.rectangle(self.rect.x + self._dx[i],
+                         self.rect.y + self._dy[i],
+                         self.rect.width,
+                         self.rect.height)
+            cr.fill()
+        if len(self.labels) > 0:
+            self.draw_label(cr)
+
+    def hit(self, pos):
+        ''' Is (x, y) on top of the sprite? '''
+        x, y = pos
+        if x < self.rect.x:
+            return False
+        if x > self.rect.x + self.rect.width:
+            return False
+        if y < self.rect.y:
+            return False
+        if y > self.rect.y + self.rect.height:
+            return False
+        return True
+
+    def draw_label(self, cr):
+        ''' Draw the label based on its attributes '''
+        # Create a pangocairo context
+        cr = pangocairo.CairoContext(cr)
+        my_width = self.rect.width - self._margins[0] - self._margins[2]
+        if my_width < 0:
+            my_width = 0
+        my_height = self.rect.height - self._margins[1] - self._margins[3]
+        for i in range(len(self.labels)):
+            pl = cr.create_layout()
+            pl.set_text(str(self.labels[i]))
+            self._fd.set_size(int(self._scale[i] * pango.SCALE))
+            pl.set_font_description(self._fd)
+            w = pl.get_size()[0] / pango.SCALE
+            if w > my_width:
+                if self._rescale[i]:
+                    self._fd.set_size(
+                            int(self._scale[i] * pango.SCALE * my_width / w))
+                    pl.set_font_description(self._fd)
+                    w = pl.get_size()[0] / pango.SCALE
+                else:
+                    j = len(self.labels[i]) - 1
+                    while(w > my_width and j > 0):
+                        pl.set_text(
+                            "…" + self.labels[i][len(self.labels[i]) - j:])
+                        self._fd.set_size(int(self._scale[i] * pango.SCALE))
+                        pl.set_font_description(self._fd)
+                        w = pl.get_size()[0] / pango.SCALE
+                        j -= 1
+            if self._horiz_align[i] == "center":
+                x = int(self.rect.x + self._margins[0] + (my_width - w) / 2)
+            elif self._horiz_align[i] == 'left':
+                x = int(self.rect.x + self._margins[0])
+            else: # right
+                x = int(self.rect.x + self.rect.width - w - self._margins[2])
+            h = pl.get_size()[1] / pango.SCALE
+            if self._vert_align[i] == "middle":
+                y = int(self.rect.y + self._margins[1] + (my_height - h) / 2)
+            elif self._vert_align[i] == "top":
+                y = int(self.rect.y + self._margins[1])
+            else: # bottom
+                y = int(self.rect.y + self.rect.height - h - self._margins[3])
+            cr.save()
+            cr.translate(x, y)
+            cr.set_source_rgb(self._color[0], self._color[1], self._color[2])
+            cr.update_layout(pl)
+            cr.show_layout(pl)
+            cr.restore()
+
+    def label_width(self):
+        ''' Calculate the width of a label '''
+        cr = pangocairo.CairoContext(self._sprites.cr)
+        if cr is not None:
+            max = 0
+            for i in range(len(self.labels)):
+                pl = cr.create_layout()
+                pl.set_text(self.labels[i])
+                self._fd.set_size(int(self._scale[i] * pango.SCALE))
+                pl.set_font_description(self._fd)
+                w = pl.get_size()[0] / pango.SCALE
+                if w > max:
+                    max = w
+            return max
+        else:
+            return self.rect.width
+
+    def label_safe_width(self):
+        ''' Return maximum width for a label '''
+        return self.rect.width - self._margins[0] - self._margins[2]
+
+    def label_safe_height(self):
+        ''' Return maximum height for a label '''
+        return self.rect.height - self._margins[1] - self._margins[3]
+
+    def label_left_top(self):
+        ''' Return the upper-left corner of the label safe zone '''
+        return(self._margins[0], self._margins[1])
+
+    def get_pixel(self, pos, i=0):
+        ''' Return the pixel at (x, y) '''
+        x = int(pos[0] - self.rect.x)
+        y = int(pos[1] - self.rect.y)
+        if x < 0 or x > (self.rect.width - 1) or \
+                y < 0 or y > (self.rect.height - 1):
+            return(-1, -1, -1, -1)
+
+        # create a new 1x1 cairo surface
+        cs = cairo.ImageSurface(cairo.FORMAT_RGB24, 1, 1);
+        cr = cairo.Context(cs)
+        cr.set_source_surface(self.cached_surfaces[i], -x, -y)
+        cr.rectangle(0,0,1,1)
+        cr.set_operator(cairo.OPERATOR_SOURCE)
+        cr.fill()
+        cs.flush() # ensure all writing is done
+        # Read the pixel
+        pixels = cs.get_data()
+        return (ord(pixels[2]), ord(pixels[1]), ord(pixels[0]), 0)
+
diff --git a/toolbar_utils.py b/toolbar_utils.py
new file mode 100644
index 0000000..563147e
--- /dev/null
+++ b/toolbar_utils.py
@@ -0,0 +1,164 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2011, Walter Bender
+
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3 of the License, or
+# (at your option) any later version.
+#
+# You should have received a copy of the GNU General Public License
+# along with this library; if not, write to the Free Software
+# Foundation, 51 Franklin Street, Suite 500 Boston, MA 02110-1335 USA
+
+
+import gtk
+
+from sugar.graphics.radiotoolbutton import RadioToolButton
+from sugar.graphics.toolbutton import ToolButton
+from sugar.graphics.combobox import ComboBox
+from sugar.graphics.toolcombobox import ToolComboBox
+
+
+def combo_factory(combo_array, toolbar, callback, cb_arg=None,
+                  tooltip=None, default=None):
+    '''Factory for making a toolbar combo box'''
+    combo = ComboBox()
+    if tooltip is not None and hasattr(combo, 'set_tooltip_text'):
+        combo.set_tooltip_text(tooltip)
+    if cb_arg is not None:
+        combo.connect('changed', callback, cb_arg)
+    else:
+        combo.connect('changed', callback)
+    for i, selection in enumerate(combo_array):
+        combo.append_item(i, selection, None)
+    combo.show()
+    toolitem = gtk.ToolItem()
+    toolitem.add(combo)
+    if hasattr(toolbar, 'insert'):  # the main toolbar
+        toolbar.insert(toolitem, -1)
+    else:  # or a secondary toolbar
+        toolbar.props.page.insert(toolitem, -1)
+    toolitem.show()
+    if default is not None:
+        combo.set_active(combo_array.index(default))
+    return combo
+
+
+def entry_factory(default_string, toolbar, tooltip=None, max=3):
+    ''' Factory for adding a text box to a toolbar '''
+    entry = gtk.Entry()
+    entry.set_text(default_string)
+    if tooltip is not None and hasattr(entry, 'set_tooltip_text'):
+        entry.set_tooltip_text(tooltip)
+    entry.set_width_chars(max)
+    entry.show()
+    toolitem = gtk.ToolItem()
+    toolitem.add(entry)
+    if hasattr(toolbar, 'insert'):  # the main toolbar
+        toolbar.insert(toolitem, -1)
+    else:  # or a secondary toolbar
+        toolbar.props.page.insert(toolitem, -1)
+    toolitem.show()
+    return entry
+
+
+def button_factory(icon_name, toolbar, callback, cb_arg=None, tooltip=None,
+                   accelerator=None):
+    '''Factory for making toolbar buttons'''
+    button = ToolButton(icon_name)
+    if tooltip is not None:
+        button.set_tooltip(tooltip)
+    button.props.sensitive = True
+    if accelerator is not None:
+        button.props.accelerator = accelerator
+    if cb_arg is not None:
+        button.connect('clicked', callback, cb_arg)
+    else:
+        button.connect('clicked', callback)
+    if hasattr(toolbar, 'insert'):  # the main toolbar
+        toolbar.insert(button, -1)
+    else:  # or a secondary toolbar
+        toolbar.props.page.insert(button, -1)
+    button.show()
+    return button
+
+
+def radio_factory(button_name, toolbar, callback, cb_arg=None, tooltip=None,
+                  group=None):
+    ''' Add a radio button to a toolbar '''
+    button = RadioToolButton(group=group)
+    button.set_named_icon(button_name)
+    if callback is not None:
+        if cb_arg is None:
+            button.connect('clicked', callback)
+        else:
+            button.connect('clicked', callback, cb_arg)
+    if hasattr(toolbar, 'insert'):  # Add button to the main toolbar...
+        toolbar.insert(button, -1)
+    else:  # ...or a secondary toolbar.
+        toolbar.props.page.insert(button, -1)
+    button.show()
+    if tooltip is not None:
+        button.set_tooltip(tooltip)
+    return button
+
+
+def label_factory(toolbar, label_text, width=None):
+    ''' Factory for adding a label to a toolbar '''
+    label = gtk.Label(label_text)
+    label.set_line_wrap(True)
+    if width is not None:
+        label.set_size_request(width, -1)  # doesn't work on XOs
+    label.show()
+    toolitem = gtk.ToolItem()
+    toolitem.add(label)
+    if hasattr(toolbar, 'insert'):  # the main toolbar
+        toolbar.insert(toolitem, -1)
+    else:  # or a secondary toolbar
+        toolbar.props.page.insert(toolitem, -1)
+    toolitem.show()
+    return label
+
+
+def separator_factory(toolbar, expand=False, visible=True):
+    ''' add a separator to a toolbar '''
+    separator = gtk.SeparatorToolItem()
+    separator.props.draw = visible
+    separator.set_expand(expand)
+    if hasattr(toolbar, 'insert'):  # the main toolbar
+        toolbar.insert(separator, -1)
+    else:  # or a secondary toolbar
+        toolbar.props.page.insert(separator, -1)
+    separator.show()
+
+
+def image_factory(image, toolbar, tooltip=None):
+    ''' Add an image to the toolbar '''
+    img = gtk.Image()
+    img.set_from_pixbuf(image)
+    img_tool = gtk.ToolItem()
+    img_tool.add(img)
+    if tooltip is not None:
+        img.set_tooltip_text(tooltip)
+    if hasattr(toolbar, 'insert'):  # the main toolbar
+        toolbar.insert(img_tool, -1)
+    else:  # or a secondary toolbar
+        toolbar.props.page.insert(img_tool, -1)
+    img_tool.show()
+    return img
+
+
+def spin_factory(default, min, max, callback, toolbar):
+    spin_adj = gtk.Adjustment(default, min, max, 1, 32, 0)
+    spin = gtk.SpinButton(spin_adj, 0, 0)
+    spin_id = spin.connect('value-changed', callback)
+    spin.set_numeric(True)
+    spin.show()
+    toolitem = gtk.ToolItem()
+    toolitem.add(spin)
+    if hasattr(toolbar, 'insert'):  # the main toolbar
+        toolbar.insert(toolitem, -1)
+    else:
+        toolbar.props.page.insert(toolitem, -1)
+    toolitem.show()
+    return spin
diff --git a/utils.py b/utils.py
new file mode 100644
index 0000000..7a95d11
--- /dev/null
+++ b/utils.py
@@ -0,0 +1,234 @@
+# -*- coding: utf-8 -*-
+#Copyright (c) 2011 Walter Bender
+
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3 of the License, or
+# (at your option) any later version.
+#
+# You should have received a copy of the GNU General Public License
+# along with this library; if not, write to the Free Software
+# Foundation, 51 Franklin Street, Suite 500 Boston, MA 02110-1335 USA
+
+
+import gtk
+import os
+import subprocess
+
+from gettext import gettext as _
+
+XO1 = 'xo1'
+XO15 = 'xo1.5'
+XO175 = 'xo1.75'
+UNKNOWN = 'unknown'
+
+
+def play_audio_from_file(file_path):
+    """ Audio media """
+    command_line = ['gst-launch', 'filesrc', 'location=' + file_path,
+                    '! oggdemux', '! vorbisdec', '! audioconvert',
+                    '! alsasink']
+    subprocess.call(command_line)
+
+
+def get_hardware():
+    """ Determine whether we are using XO 1.0, 1.5, or "unknown" hardware """
+    product = _get_dmi('product_name')
+    if product is None:
+        if os.path.exists('/sys/devices/platform/lis3lv02d/position'):
+            return XO175  # FIXME: temporary check for XO 1.75
+        elif os.path.exists('/etc/olpc-release') or \
+           os.path.exists('/sys/power/olpc-pm'):
+            return XO1
+        else:
+            return UNKNOWN
+    if product != 'XO':
+        return UNKNOWN
+    version = _get_dmi('product_version')
+    if version == '1':
+        return XO1
+    elif version == '1.5':
+        return XO15
+    else:
+        return XO175
+
+
+def _get_dmi(node):
+    ''' The desktop management interface should be a reliable source
+    for product and version information. '''
+    path = os.path.join('/sys/class/dmi/id', node)
+    try:
+        return open(path).readline().strip()
+    except:
+        return None
+
+
+def get_path(activity, subpath):
+    """ Find a Rainbow-approved place for temporary files. """
+    try:
+        return(os.path.join(activity.get_activity_root(), subpath))
+    except:
+        # Early versions of Sugar didn't support get_activity_root()
+        return(os.path.join(os.environ['HOME'], ".sugar/default",
+                            "org.sugarlabs.PortfolioActivity", subpath))
+
+
+def _luminance(color):
+    ''' Calculate luminance value '''
+    return int(color[1:3], 16) * 0.3 + int(color[3:5], 16) * 0.6 + \
+           int(color[5:7], 16) * 0.1
+
+
+def lighter_color(colors):
+    ''' Which color is lighter? Use that one for the text background '''
+    if _luminance(colors[0]) > _luminance(colors[1]):
+        return 0
+    return 1
+
+
+def svg_str_to_pixbuf(svg_string):
+    ''' Load pixbuf from SVG string '''
+    pl = gtk.gdk.PixbufLoader('svg')
+    pl.write(svg_string)
+    pl.close()
+    pixbuf = pl.get_pixbuf()
+    return pixbuf
+
+
+def svg_rectangle(width, height, colors):
+    ''' Generate a rectangle frame in two colors '''
+    return \
+'<?xml version="1.0" encoding="UTF-8" standalone="no"?>\
+<svg\
+   version="1.1"\
+   width="%f"\
+   height="%f">\
+    <g>\
+      <rect\
+         width="%f"\
+         height="%f"\
+         x="2.5"\
+         y="2.5"\
+         style="fill:none;stroke:%s;stroke-width:5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />\
+      <rect\
+         width="%f"\
+         height="%f"\
+         x="7.5"\
+         y="7.5"\
+         style="fill:none;stroke:%s;stroke-width:5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />\
+    </g>\
+</svg>' % (width, height,
+           width - 5, height - 5, colors[1],
+           width - 15, height - 15, colors[0])
+
+
+def load_svg_from_file(file_path, width, height):
+    '''Create a pixbuf from SVG in a file. '''
+    return gtk.gdk.pixbuf_new_from_file_at_size(file_path, width, height)
+
+
+def image_to_base64(pixbuf, path_name):
+    """ Convert an image to base64-encoded data """
+    file_name = os.path.join(path_name, 'imagetmp.png')
+    if pixbuf != None:
+        pixbuf.save(file_name, "png")
+    return file_to_base64(file_name, path_name)
+
+
+def file_to_base64(file_name, path_name):
+    base64 = os.path.join(path_name, 'base64tmp')
+    cmd = "base64 <" + file_name + " >" + base64
+    subprocess.check_call(cmd, shell=True)
+    file_handle = open(base64, 'r')
+    data = file_handle.read()
+    file_handle.close()
+    return data
+
+
+def get_pixbuf_from_journal(dsobject, w, h):
+    """ Load a pixbuf from a Journal object. """
+    pixbufloader = \
+        gtk.gdk.pixbuf_loader_new_with_mime_type('image/png')
+    pixbufloader.set_size(min(300, int(w)), min(225, int(h)))
+    try:
+        pixbufloader.write(dsobject.metadata['preview'])
+        pixbuf = pixbufloader.get_pixbuf()
+    except:
+        pixbuf = None
+    pixbufloader.close()
+    return pixbuf
+
+
+def genblank(w, h, colors, stroke_width=1.0):
+    svg = SVG()
+    svg.set_colors(colors)
+    svg.set_stroke_width(stroke_width)
+    svg_string = svg.header(w, h)
+    svg_string += svg.footer()
+    return svg_string
+
+
+class SVG:
+    ''' SVG generators '''
+
+    def __init__(self):
+        self._scale = 1
+        self._stroke_width = 1
+        self._fill = '#FFFFFF'
+        self._stroke = '#FFFFFF'
+
+    def _svg_style(self, extras=""):
+        return "%s%s%s%s%s%f%s%s%s" % ("style=\"fill:", self._fill, ";stroke:",
+                                       self._stroke, ";stroke-width:",
+                                       self._stroke_width, ";", extras,
+                                       "\" />\n")
+
+    def _svg_rect(self, w, h, rx, ry, x, y):
+        svg_string = "       <rect\n"
+        svg_string += "          width=\"%f\"\n" % (w)
+        svg_string += "          height=\"%f\"\n" % (h)
+        svg_string += "          rx=\"%f\"\n" % (rx)
+        svg_string += "          ry=\"%f\"\n" % (ry)
+        svg_string += "          x=\"%f\"\n" % (x)
+        svg_string += "          y=\"%f\"\n" % (y)
+        self.set_stroke_width(self._stroke_width)
+        svg_string += self._svg_style()
+        return svg_string
+
+    def _background(self, w=80, h=60, scale=1):
+        return self._svg_rect((w - 0.5) * scale, (h - 0.5) * scale,
+                              1, 1, 0.25, 0.25)
+
+    def header(self, w=80, h=60, scale=1, background=True):
+        svg_string = "<?xml version=\"1.0\" encoding=\"UTF-8\""
+        svg_string += " standalone=\"no\"?>\n"
+        svg_string += "<!-- Created with Emacs -->\n"
+        svg_string += "<svg\n"
+        svg_string += "   xmlns:svg=\"http://www.w3.org/2000/svg\"\n"
+        svg_string += "   xmlns=\"http://www.w3.org/2000/svg\"\n"
+        svg_string += "   version=\"1.0\"\n"
+        svg_string += "%s%f%s" % ("   width=\"", scale * w * self._scale,
+                                  "\"\n")
+        svg_string += "%s%f%s" % ("   height=\"", scale * h * self._scale,
+                                  "\">\n")
+        svg_string += "%s%f%s%f%s" % ("<g\n       transform=\"matrix(",
+                                      self._scale, ",0,0,", self._scale,
+                                      ",0,0)\">\n")
+        if background:
+            svg_string += self._background(w, h, scale)
+        return svg_string
+
+    def footer(self):
+        svg_string = "</g>\n"
+        svg_string += "</svg>\n"
+        return svg_string
+
+    def set_scale(self, scale=1.0):
+        self._scale = scale
+
+    def set_colors(self, colors):
+        self._stroke = colors[0]
+        self._fill = colors[1]
+
+    def set_stroke_width(self, stroke_width=1.0):
+        self._stroke_width = stroke_width