Merge branch 'master' of git+ssh://guillaume@dev.laptop.org/git/sugar

1 files changed, 48 insertions, 40 deletions

diff --git a/services/datastore/demodata.py b/services/datastore/demodata.py
index 61e6a40..07b64d2 100644
--- a/services/datastore/demodata.py
+++ b/services/datastore/demodata.py
@@ -8,31 +8,18 @@ def insert_demo_data(data_store):
         os.makedirs(journal_dir, 0755)
 
     data = [
-        {   'file-path' : os.path.join(journal_dir, 'fishes_in_the_sea.rtf'),
-            'object-type' : 'text',
-            'date'    : str(time.time() - 100000),
-            'title'   : 'Fishes in the Sea',
-            'preview' : 'There are many fishes in the sea, and not only...',
-            'icon'    : 'theme:object-text',
-            'icon-color' : '#C2B00C,#785C78',
-            'keep'    : '0',
-            'buddies' : str([ { 'name'  : 'Marco',
-                                'color' : '#C2B00C,#785C78' },
-                              { 'name'  : 'Dan', 
-                                'color' : '#75C228,#3A6E3A' } ])
-        },
-        {   'file-path' : os.path.join(journal_dir, 'my_cat_and_my_fishes.rtf'),
-            'object-type' : 'text',
+        {   'file-path' : os.path.join(journal_dir, 'my_cat_and_my_fishes.jpeg'),
+            'object-type' : 'picture',
             'date'    : str(time.time() - 200000),
             'title'   : 'My cat and my fishes',
             'preview' : "Don't know why, but my cat looks to like my fishe...",
-            'icon'    : 'theme:object-text',
-            'icon-color' : '#C2B00C,#785C78',
+            'icon'    : 'theme:object-image',
+            'icon-color' : '#472E17, #AB3DAB',
             'keep'    : '1',
-            'buddies' : str([ { 'name'  : 'Eben',
-                                'color' : '#C2B00C,#785C78' },
+            'buddies' : str([ { 'name'  : 'Blizzard',
+                                'color' : '#472E17,#AB3DAB' },
                               { 'name'  : 'Dan', 
-                                'color' : '#75C228,#3A6E3A' } ])
+                                'color' : '#75C228,#3A6E3A'  } ])
         },
         {   'file-path' : os.path.join(journal_dir, 'cat_browsing.hist'),
             'object-type' : 'link',
@@ -40,11 +27,24 @@ def insert_demo_data(data_store):
             'title'   : 'About cats',
             'preview' : "http://en.wikipedia.org/wiki/Cat",
             'icon'    : 'theme:object-link',
-            'icon-color' : '#C2B00C,#785C78',
+            'icon-color' : '#6E3D1E,#F8C2F8',
             'keep'    : '0',
+            'buddies' : str([ { 'name'  : 'Tomeu',
+                                'color' : '#6E3D1E,#F8C2F8' },
+                              { 'name'  : 'Eben',
+                                'color' : '#193828,#216E21' },
+                              { 'name'  : 'Dan', 
+                                'color' : '#75C228,#3A6E3A' } ])
+        },
+        {   'file-path' : os.path.join(journal_dir, 'thai_story.hist'),
+            'object-type' : 'link',
+            'date'    : str(time.time() - 450000),
+            'title'   : 'Thai history',
+            'preview' : "The history of Thailand begins with the migration of the Thais from their ancestoral home in southern China into mainland southeast asia around the 10th century AD.",
+            'icon'    : 'theme:object-link',
+            'icon-color' : '#75C228,#3A6E3A',
+            'keep'    : '1',
             'buddies' : str([ { 'name'  : 'Dan',
-                                'color' : '#C2B00C,#785C78' },
-                              { 'name'  : 'Tomeu', 
                                 'color' : '#75C228,#3A6E3A' } ])
         },
         {   'file-path' : os.path.join(journal_dir, 'our_school.jpeg'),
@@ -57,30 +57,38 @@ def insert_demo_data(data_store):
             'keep'    : '0',
             'buddies' : str([ { 'name'  : 'Marco',
                                 'color' : '#C2B00C,#785C78' },
-                              { 'name'  : 'Eben', 
+                              { 'name'  : 'Dan', 
                                 'color' : '#75C228,#3A6E3A' } ])
         },
-        {   'file-path' : os.path.join(journal_dir, 'thai_story.abw'),
-            'object-type' : 'text',
-            'date'    : str(time.time() - 450000),
-            'title'   : 'Thai history',
-            'preview' : "The history of Thailand begins with the migration of the Thais from their ancestoral home in southern China into mainland southeast asia around the 10th century AD.",
-            'icon'    : 'theme:object-text',
-            'icon-color' : '#C2B00C,#785C78',
-            'keep'    : '1',
-            'buddies' : str([ { 'name'  : 'Marco',
-                                'color' : '#C2B00C,#785C78' } ])
-        },
         {   'file-path' : os.path.join(journal_dir, 'thai_prince.abw'),
-            'object-type' : 'text',
-            'date'    : str(time.time() - 450000),
+            'object-type' : 'link',
+            'date'    : str(time.time() - 450000), 
             'title'   : 'The Thai Prince',
             'preview' : "Prince Dipangkara Rasmijoti of Thailand, (born 29 April 2005), is a member of the Thailand Royal Family, a grandson of King Bhumibol Adulyadej (Rama IX) of Thailand is the fifth son of Maha Vajiralongkorn, Crown Prince of Thailand.",
-            'icon'    : 'theme:object-text',
-            'icon-color' : '#C2B00C,#785C78',
+            'icon'    : 'theme:object-link',
+            'icon-color' : '#193828,#216E21',
             'keep'    : '0',
             'buddies' : str([ { 'name'  : 'Eben', 
-                                'color' : '#75C228,#3A6E3A' } ])
+                                'color' : '#193828,#216E21' },
+                              { 'name'  : 'Dan', 
+                                'color' : '#75C228,#3A6E3A' },
+                              { 'name'  : 'Blizzard',
+                                'color' : '#472E17,#AB3DAB' } ])
+        },
+        {   'file-path' : os.path.join(journal_dir, 'fishes_in_the_sea.history'),
+            'object-type' : 'picture',
+            'date'    : str(time.time() - 100000),
+            'title'   : 'Fishes in the Sea',
+            'preview' : 'There are many fishes in the sea, and not only...',
+            'icon'    : 'theme:object-image',
+            'icon-color' : '#C2B00C,#785C78',
+            'keep'    : '0',
+            'buddies' : str([ { 'name'  : 'Marco',
+                                'color' : '#C2B00C,#785C78' },
+                              { 'name'  : 'Dan', 
+                                'color' : '#75C228,#3A6E3A' },
+                              { 'name'  : 'Blizzard',
+                                'color' : '#472E17,#AB3DAB' } ])
         }
     ]
     for obj in data: