A bunch of fixes

8 files changed, 67 insertions, 12 deletions

diff --git a/.gitignore b/.gitignore
index 25f9c52..13fb03c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 *~
+*pyc
 Journal-*.xo
diff --git a/activity/activity-journal.svg b/activity/activity-journal.svg
new file mode 100644
index 0000000..8294167
--- /dev/null
+++ b/activity/activity-journal.svg
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!-- Generator: Adobe Illustrator 12.0.1, SVG Export Plug-In . SVG Version: 6.00 Build 51448)  -->

+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [

+	<!ENTITY ns_svg "http://www.w3.org/2000/svg">

+	<!ENTITY ns_xlink "http://www.w3.org/1999/xlink">

+	<!ENTITY stroke_color "#000000">
+	<!ENTITY fill_color "#AAAAAA">
+]>

+<svg  version="1.1" id="Icon" xmlns="&ns_svg;" xmlns:xlink="&ns_xlink;" width="48.773" height="48.406"

+	 viewBox="0 0 48.773 48.406" overflow="visible" enable-background="new 0 0 48.773 48.406" xml:space="preserve">

+<g id="Journal">

+	<path fill="&fill_color;" stroke="&stroke_color;" stroke-width="3.5" d="M35.339,9.326V8.213c0-2.165-2.168-4.306-4.307-4.306H1.75v42.748

+		h29.282c2.786,0,4.307-1.812,4.307-4.308V9.326z"/>

+	<line fill="&fill_color;" stroke="&stroke_color;" stroke-width="3.5" x1="10.96" y1="3.908" x2="10.96" y2="46.656"/>

+</g>

+<path id="Pencil" fill="&fill_color;" stroke="&stroke_color;" stroke-width="3.5" d="M35.339,21.75L46.656,7.152

+	c0.029-0.03,0.187-0.246,0.187-0.246c0.113-0.199,0.184-0.425,0.184-0.682c0-0.074-0.002-0.148-0.016-0.223

+	c-0.107-0.931-0.879-2.066-2.016-2.963c-1.14-0.895-2.425-1.382-3.353-1.274c-0.404,0.048-0.975,0.464-0.975,0.464l-5.328,7.097

+	l-7.848,10.453l-2.568,3.344l-4.274,10.164c-0.052,0.129-0.019,0.276,0.087,0.366c0.107,0.089,0.263,0.101,0.377,0.023l9.628-6.195

+	c0.014-0.014,0.012-0.039,0.028-0.055c0.08-0.062,0.174-0.115,0.236-0.195c0.01-0.01,0.043-0.053,0.049-0.062l2.248-2.793

+	L35.339,21.75z"/>

+</svg>

+
diff --git a/collapsedobject.py b/collapsedobject.py
index 1c6c920..4c17de5 100644
--- a/collapsedobject.py
+++ b/collapsedobject.py
@@ -2,4 +2,4 @@ import hippo
 
 class CollapsedObject(hippo.CanvasBox):
     def __init__(self):
-        hippo.CanvaBox.__init__(self)
+        hippo.CanvasBox.__init__(self)
diff --git a/expandedobject.py b/expandedobject.py
new file mode 100644
index 0000000..8c166b6
--- /dev/null
+++ b/expandedobject.py
@@ -0,0 +1,29 @@
+import datetime
+
+import hippo
+
+from sugar.graphics.frame import Frame
+
+from buddylist import BuddyList
+
+class ExpandedObject(Frame):
+    def __init__(self, model):
+        Frame.__init__(self)
+
+        self._model = model
+
+        self._date = hippo.CanvasText(self._format_date())
+        self.add(self._date)
+
+        self._title = hippo.CanvasText(self._format_title())
+        self.add(self._date)
+
+        self._buddies = BuddyList(model['buddies'])
+        self.add(self._buddies)
+
+    def _format_date(self):
+        date = datetime.fromtimestamp(model['date'])
+        return str(date)
+
+    def _format_title(self):
+        return model['title']
diff --git a/expandendobject.py b/expandendobject.py
index 8c166b6..4724b9c 100644
--- a/expandendobject.py
+++ b/expandendobject.py
@@ -13,13 +13,13 @@ class ExpandedObject(Frame):
         self._model = model
 
         self._date = hippo.CanvasText(self._format_date())
-        self.add(self._date)
+        self.append(self._date)
 
         self._title = hippo.CanvasText(self._format_title())
-        self.add(self._date)
+        self.append(self._date)
 
         self._buddies = BuddyList(model['buddies'])
-        self.add(self._buddies)
+        self.append(self._buddies)
 
     def _format_date(self):
         date = datetime.fromtimestamp(model['date'])
diff --git a/journal.py b/journal.py
index d132b8a..b492f0e 100644
--- a/journal.py
+++ b/journal.py
@@ -4,16 +4,16 @@ from journalentry import JournalEntry
 
 class Journal(hippo.CanvasBox):
     def __init__(self):
-        hippo.CanvaBox.__init__(self)
+        hippo.CanvasBox.__init__(self)
 
         self._model = [
-            [ 'date'    : 0,
+            { 'date'    : 0,
               'title'   : 'Fishes in the Sea',
               'buddies' : [ { 'name'  : 'marco',
                               'color' : '#C2B00C,#785C78' },
                             { 'name'  : 'dan', 
                               'color' : '#75C228,#3A6E3A' } ]
-            ]
+            }
         ]
 
         self.construct_view()
@@ -21,4 +21,4 @@ class Journal(hippo.CanvasBox):
     def construct_view(self):
         for entry_model in self._model:
             entry_view = JournalEntry(entry_model)
-            self.add(entry_view)
+            self.append(entry_view)
diff --git a/journalactivity.py b/journalactivity.py
index 364670f..8db77c5 100755
--- a/journalactivity.py
+++ b/journalactivity.py
@@ -26,11 +26,11 @@ class JournalActivity(Activity):
 
         canvas = hippo.Canvas()
 
-        box = CanvasBox()
+        box = hippo.CanvasBox()
         canvas.set_root(box)
 
         journal = Journal()
-        box.add(journal)
+        box.append(journal)
 
-        window.add(canvas)
+        self.add(canvas)
         canvas.show()
diff --git a/journalentry.py b/journalentry.py
index fd0657a..a3294a5 100644
--- a/journalentry.py
+++ b/journalentry.py
@@ -1,3 +1,4 @@
+import gobject
 import hippo
 
 from collapsedobject import CollapsedObject
@@ -12,7 +13,7 @@ class JournalEntry(hippo.CanvasBox):
     def __init__(self, model):
         self._expanded = False
 
-        hippo.CanvaBox.__init__(self)
+        hippo.CanvasBox.__init__(self)
 
         self._object = None
         self._model = model
@@ -26,6 +27,7 @@ class JournalEntry(hippo.CanvasBox):
                 self._object = ExpandedObject(model)
             else:
                 self._object = CollapsedObject(model)
+            self.append(self._object)
 
     def do_get_property(self, pspec):
         if pspec.name == 'expanded':