diff options
author | Walter Bender <walter.bender@gmail.com> | 2011-02-21 23:00:50 (GMT) |
---|---|---|
committer | Walter Bender <walter.bender@gmail.com> | 2011-02-21 23:00:50 (GMT) |
commit | aa2d1d42f01f87b5a0a7e533bb6a93d3720b9d1a (patch) | |
tree | 7c6a4d820e001530082045875676f44e65280203 /TurtleArt/taexporthtml.py | |
parent | e262536e85ce5289bd5eaafa157939ed8657fdab (diff) | |
parent | 860754f7e871617df9d101a51dc64a69b742a0ba (diff) |
Merge git.sugarlabs.org:~walter/turtleart/collaboration-refactoring
Conflicts:
NEWS
TurtleArt/talogo.py
Diffstat (limited to 'TurtleArt/taexporthtml.py')
-rw-r--r-- | TurtleArt/taexporthtml.py | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/TurtleArt/taexporthtml.py b/TurtleArt/taexporthtml.py index 09042f8..2dac7e6 100644 --- a/TurtleArt/taexporthtml.py +++ b/TurtleArt/taexporthtml.py @@ -22,7 +22,7 @@ import pygtk pygtk.require('2.0') import gtk import os.path -from tautils import data_to_string, save_picture, image_to_base64 +from tautils import data_to_string, save_picture, image_to_base64, get_path from gettext import gettext as _ from cgi import escape @@ -90,7 +90,8 @@ def save_html(self, tw, embed_flag=True): tmp = imgdata else: pixbuf = gtk.gdk.pixbuf_new_from_file(p) - imgdata = image_to_base64(pixbuf, tw.activity) + imgdata = image_to_base64(pixbuf, + get_path(tw.activity, 'instance')) tmp = self.html_glue['img2'][0] tmp += imgdata tmp += self.html_glue['img2'][1] @@ -110,7 +111,7 @@ def save_html(self, tw, embed_flag=True): else: if self.embed_images == True: imgdata = image_to_base64(save_picture(self.tw.canvas), - tw.activity) + get_path(tw.activity, 'instance')) else: imgdata = os.path.join(self.tw.load_save_folder, 'image') self.tw.save_as_image(imgdata) |