From aef760b7fa88d0c7f00acbfd64516eb0d180d221 Mon Sep 17 00:00:00 2001
From: Walter Bender <walter@walter-laptop.(none)>
Date: Mon, 15 Feb 2010 22:42:59 +0000
Subject: read sample images from file system

---
diff --git a/talogo.py b/talogo.py
index f545d93..64177a8 100644
--- a/talogo.py
+++ b/talogo.py
@@ -1035,15 +1035,21 @@ class LogoCode:
             if self.tw.running_sugar:
                 try:
                     dsobject = datastore.get(media[6:])
+                    if movie_media_type(dsobject.file_path):
+                        play_movie_from_file(self, dsobject.file_path,
+                                             int(x), int(y), int(w), int(h))
+                    else:
+                        pixbuf = get_pixbuf_from_journal(dsobject,
+                                                         int(w), int(h))
+                    dsobject.destroy()
                 except:
-                    self.tw.showlabel('nojournal', media[6:]) 
-                    print "Couldn't open Journal object %s" % (media[6:])
-                if movie_media_type(dsobject.file_path):
-                    play_movie_from_file(self,
-                        dsobject.file_path, int(x), int(y), int(w), int(h))
-                else:
-                    pixbuf = get_pixbuf_from_journal(dsobject, int(w), int(h))
-                dsobject.destroy()
+                    # Maybe it is a pathname instead.
+                    try:
+                        pixbuf = gtk.gdk.pixbuf_new_from_file_at_size(
+                                                   media[6:], int(w), int(h))
+                    except:
+                        self.tw.showlabel('nojournal', media[6:]) 
+                        print "Couldn't open Journal object %s" % (media[6:])
             else:
                 try:
                     if movie_media_type(media):
diff --git a/tawindow.py b/tawindow.py
index 4a3e0d2..906afe1 100644
--- a/tawindow.py
+++ b/tawindow.py
@@ -2232,9 +2232,16 @@ class TurtleArtWindow():
                             self._block_skin('journalon', blk)
                     dsobject.destroy()
                 except:
-                    print "Warning: Couldn't open dsobject (%s)" %\
-                          (blk.values[0])
-                    self._block_skin('journaloff', blk)
+                    try:
+                        w, h, = calc_image_size(blk.spr)
+                        pixbuf = gtk.gdk.pixbuf_new_from_file_at_size(
+                                     blk.values[0], w, h)
+                        x, y = self._calc_image_offset('', blk.spr)
+                        blk.set_image(pixbuf, x, y)
+                    except:
+                        print "Warning: Couldn't open dsobject (%s)" %\
+                              (blk.values[0])
+                        self._block_skin('journaloff', blk)
             else:
                 if not movie_media_type(blk.values[0][-4:]):
                     try:
--
cgit v0.9.1