diff options
author | Walter Bender <walter.bender@gmail.com> | 2011-11-08 00:12:29 (GMT) |
---|---|---|
committer | Walter Bender <walter.bender@gmail.com> | 2011-11-08 00:12:29 (GMT) |
commit | 4739976d0a96eb21b8f606c69ecc09ca7a1557de (patch) | |
tree | 57170dde71aee01aac39059ebd300a3e5aa9e7e3 /TurtleArt/taexporthtml.py | |
parent | b81f399d5c57465e95cca0fac241975bc75df303 (diff) | |
parent | a7a87c7fa872418f8db1af7badd4c91e0481c2af (diff) |
Merge commit 'refs/merge-requests/3' of git://git.sugarlabs.org/turtleart/mainline into integration
Conflicts:
NEWS
activity/activity.info
Diffstat (limited to 'TurtleArt/taexporthtml.py')
-rw-r--r-- | TurtleArt/taexporthtml.py | 22 |
1 files changed, 12 insertions, 10 deletions
diff --git a/TurtleArt/taexporthtml.py b/TurtleArt/taexporthtml.py index 843b8b0..90dcc4d 100644 --- a/TurtleArt/taexporthtml.py +++ b/TurtleArt/taexporthtml.py @@ -78,40 +78,42 @@ def save_html(self, tw, embed_flag=True): """ htmlcode = '' if len(tw.saved_pictures) > 0: - for i, p in enumerate(tw.saved_pictures): + for i, image_file in enumerate(tw.saved_pictures): htmlcode += HTML_GLUE['slide'][0] + str(i) htmlcode += HTML_GLUE['slide'][1] + \ HTML_GLUE['div'][0] + \ HTML_GLUE['h1'][0] if embed_flag: - f = open(p, 'r') + f = open(image_file, 'r') imgdata = f.read() f.close() - if p.endswith(('.svg')): + if image_file.endswith(('.svg')): tmp = imgdata else: - pixbuf = gtk.gdk.pixbuf_new_from_file(p) - imgdata = image_to_base64(pixbuf, - get_path(tw.activity, 'instance')) + imgdata = image_to_base64(image_file, + get_path(tw.activity, 'instance')) tmp = HTML_GLUE['img2'][0] tmp += imgdata tmp += HTML_GLUE['img2'][1] else: - if p.endswith(('.svg')): - f = open(p, 'r') + if image_file.endswith(('.svg')): + f = open(image_file, 'r') imgdata = f.read() f.close() tmp = imgdata else: tmp = HTML_GLUE['img3'][0] - tmp += p + tmp += image_file tmp += HTML_GLUE['img3'][1] htmlcode += tmp + \ HTML_GLUE['h1'][1] + \ HTML_GLUE['div'][1] else: if embed_flag: - imgdata = image_to_base64(save_picture(self.tw.canvas), + tmp_file = os.path.join(get_path(tw.activity, 'instance'), + 'tmpfile.png') + save_picture(self.tw.canvas, tmp_file) + imgdata = image_to_base64(tmp_file, get_path(tw.activity, 'instance')) else: imgdata = os.path.join(self.tw.load_save_folder, 'image') |