From 33de02bc04595ec56fa8ef7c3200dba63c05297b Mon Sep 17 00:00:00 2001 From: Walter Bender Date: Thu, 12 Feb 2009 21:58:53 +0000 Subject: finishing up merge from TAPortfolio --- (limited to 'TurtleArtActivity.py') diff --git a/TurtleArtActivity.py b/TurtleArtActivity.py index d762339..2d9f51b 100644 --- a/TurtleArtActivity.py +++ b/TurtleArtActivity.py @@ -26,11 +26,21 @@ pygtk.require('2.0') import gtk import gobject +import logging +_logger = logging.getLogger('turtleart-activity') + import sugar from sugar.activity import activity from sugar.graphics.toolbutton import ToolButton from sugar.graphics.menuitem import MenuItem from sugar.datastore import datastore + +import telepathy +from dbus.service import method, signal +from dbus.gobject_service import ExportedGObject +from sugar.presence import presenceservice +from sugar.presence.tubeconn import TubeConnection + from sugar import profile from gettext import gettext as _ import locale @@ -38,20 +48,42 @@ import os.path import os import tarfile import sys +from taexporthtml import * from taexportlogo import * +import re + +SERVICE = 'org.laptop.TurtleArtActivity' +IFACE = SERVICE +PATH = '/org/laptop/TurtleArtActivity' class TurtleArtActivity(activity.Activity): def __init__(self, handle): super(TurtleArtActivity,self).__init__(handle) + try: + datapath = os.path.join(activity.get_activity_root(), "data") + except: + # early versions of Sugar (e.g., 656) didn't support + # get_activity_root() + datapath = \ + "/home/olpc/.sugar/default/org.laptop.TurtleArtActivity/data" + toolbox = activity.ActivityToolbox(self) self.set_toolbox(toolbox) + # Notify when the visibility state changes + self.add_events(gtk.gdk.VISIBILITY_NOTIFY_MASK) + self.connect("visibility-notify-event", self.__visibility_notify_cb) + + # Add additional panels self.projectToolbar = ProjectToolbar(self) toolbox.add_toolbar( _('Project'), self.projectToolbar ) - + self.saveasToolbar = SaveAsToolbar(self) + toolbox.add_toolbar( _('Save as'), self.saveasToolbar ) toolbox.show() + + # set the project toolbar as the initial one selected toolbox.set_current_toolbar(1) canvas = gtk.EventBox() @@ -64,10 +96,11 @@ class TurtleArtActivity(activity.Activity): try: version = os.environ['SUGAR_BUNDLE_VERSION'] except: - version = "-unknown" + version = " unknown" lang = locale.getdefaultlocale()[0] - if not lang: lang = 'en' + if not lang: + lang = 'en' lang = lang[0:2] if not os.path.isdir(os.path.join(activity.get_bundle_path(), \ 'images', lang)): @@ -77,22 +110,20 @@ class TurtleArtActivity(activity.Activity): # if so, remove any old png files as they will need to be regenerated filename = "version.dat" versiondata = [] - + newversion = True try: - FILE = open(os.path.join(activity.get_activity_root(), "data", \ - filename), "r") + FILE = open(os.path.join(datapath, filename), "r") if FILE.readline() == lang + version: - pass + newversion = False else: - print "out with the old, in with the new" - os.system("rm " + os.path.join(activity.get_activity_root(), \ - "data", '*.png')) + _logger.debug("out with the old, in with the new") + os.system("rm " + os.path.join(datapath, '*.png')) except: - print "writing new version data" + _logger.debug("writing new version data") + _logger.debug("and creating a tamyblock.py Journal entry") versiondata.append(lang + version) - FILE = open(os.path.join(activity.get_activity_root(), "data", \ - filename), "w") + FILE = open(os.path.join(datapath, filename), "w") FILE.writelines(versiondata) FILE.close() @@ -106,6 +137,154 @@ class TurtleArtActivity(activity.Activity): if self._jobject and self._jobject.file_path: self.read_file(self._jobject.file_path) + ## sharing code + # Get the Presence Service + self.pservice = presenceservice.get_instance() + self.initiating = None # sharing (True) or joining (False) + + # add my buddy object to the list + owner = self.pservice.get_owner() + self.owner = owner + self.tw.buddies.append(self.owner) + self._share = "" + + self.connect('shared', self._shared_cb) + self.connect('joined', self._joined_cb) + + def _shared_cb(self, activity): + if self._shared_activity is None: + _logger.error("Failed to share or join activity ... \ + _shared_activity is null in _shared_cb()") + return + + self.initiating = True + self.waiting_for_blocks = False + _logger.debug('I am sharing...') + + self.conn = self._shared_activity.telepathy_conn + self.tubes_chan = self._shared_activity.telepathy_tubes_chan + self.text_chan = self._shared_activity.telepathy_text_chan + + # call back for "NewTube" signal + self.tubes_chan[telepathy.CHANNEL_TYPE_TUBES].connect_to_signal \ + ('NewTube', self._new_tube_cb) + + _logger.debug('This is my activity: making a tube...') + id = self.tubes_chan[telepathy.CHANNEL_TYPE_TUBES].OfferDBusTube( + SERVICE, {}) + + def _joined_cb(self, activity): + if self._shared_activity is None: + _logger.error("Failed to share or join activity ... \ + _shared_activity is null in _shared_cb()") + return + + self.initiating = False + _logger.debug('I joined a shared activity.') + + self.conn = self._shared_activity.telepathy_conn + self.tubes_chan = self._shared_activity.telepathy_tubes_chan + self.text_chan = self._shared_activity.telepathy_text_chan + + # call back for "NewTube" signal + self.tubes_chan[telepathy.CHANNEL_TYPE_TUBES].connect_to_signal( \ + 'NewTube', self._new_tube_cb) + + _logger.debug('I am joining an activity: waiting for a tube...') + self.tubes_chan[telepathy.CHANNEL_TYPE_TUBES].ListTubes( + reply_handler=self._list_tubes_reply_cb, + error_handler=self._list_tubes_error_cb) + + + # joiner should request current state from sharer + self.waiting_for_blocks = True + + def _list_tubes_reply_cb(self, tubes): + for tube_info in tubes: + self._new_tube_cb(*tube_info) + + def _list_tubes_error_cb(self, e): + _logger.error('ListTubes() failed: %s', e) + + def _new_tube_cb(self, id, initiator, type, service, params, state): + _logger.debug('New tube: ID=%d initator=%d type=%d service=%s ' + 'params=%r state=%d', id, initiator, type, service, + params, state) + + if (type == telepathy.TUBE_TYPE_DBUS and service == SERVICE): + if state == telepathy.TUBE_STATE_LOCAL_PENDING: + self.tubes_chan[telepathy.CHANNEL_TYPE_TUBES].AcceptDBusTube(id) + + tube_conn = TubeConnection(self.conn, + self.tubes_chan[telepathy.CHANNEL_TYPE_TUBES], id, \ + group_iface=self.text_chan[telepathy.CHANNEL_INTERFACE_GROUP]) + + # we'll use a chat tube to send serialized stacks back and forth + self.chattube = ChatTube(tube_conn, self.initiating, \ + self.event_received_cb) + + # now that we have the tube, we can ask for an initialization + if self.waiting_for_blocks is True: + self._send_event("i") + + # handle the receiving of events + def event_received_cb(self, text): + # maybe we can use a stack to share events to new-comers? + # self._share += "text + "\n" + if text[0] == 'p': # button press + e,x,y,mask = re.split(":",text) + # _logger.debug("receiving button press: "+x+" "+y+" "+mask) + if mask == 'T': + tawindow.button_press(self.tw,True,int(x),int(y),False) + else: + tawindow.button_press(self.tw,False,int(x),int(y),False) + elif text[0] == 'r': # block release + e,x,y = re.split(":",text) + # _logger.debug("receiving button release: " + x + " " + y) + tawindow.button_release(self.tw,int(x),int(y),False) + elif text[0] == 'm': # mouse move + e,x,y = re.split(":",text) + _logger.debug("recieving move: " + x + " " + y) + tawindow.mouse_move(self.tw,0,0,False,int(x),int(y)) + elif text[0] == 'k': # typing + e,mask,keyname = re.split(":",text,3) + # _logger.debug("recieving key press: " + mask + " " + keyname) + if mask == 'T': + tawindow.key_press(self.tw,True,keyname,False) + else: + tawindow.key_press(self.tw,False,keyname,False) + elif text[0] == 'i': # request for current state + # sharer should send current state to joiner + if self.initiating is True: + _logger.debug("serialize the project and send to joiner") + text = tawindow.save_string(self.tw) + self._send_event("I:" + text) + tawindow.show_palette(self.tw) + elif text[0] == 'I': # receiving current state + if self.waiting_for_blocks: + _logger.debug("receiving project from sharer") + e,text = re.split(":",text,2) + # unpack data + tawindow.load_string(self.tw,text) + # all caught up + self.waiting_for_blocks = False + + # send events + def _send_event(self, entry): + # nick = profile.get_nick_name() + # nick = nick.upper() + if hasattr(self, 'chattube') and self.chattube is not None: + self.chattube.SendText(entry) + + # Callback method for when the activity's visibility changes + def __visibility_notify_cb(self, window, event): + if event.state == gtk.gdk.VISIBILITY_FULLY_OBSCURED: +# _logger.debug("I am not visible so I should free the audio") + self.tw.lc.ag = None + elif event.state in \ + [gtk.gdk.VISIBILITY_UNOBSCURED, gtk.gdk.VISIBILITY_PARTIAL]: + pass + def update_title_cb(self, widget, event, toolbox): toolbox._activity_toolbar._update_title_cb() toolbox._activity_toolbar._update_title_sid = True @@ -114,19 +293,21 @@ class TurtleArtActivity(activity.Activity): self.jobject_new_patch() def write_file(self, file_path): - print "Writing file %s" % file_path + # just save .ta file + _logger.debug("Writing file %s" % file_path) self.metadata['mime_type'] = 'application/x-tar' import tempfile tar_fd = tarfile.open(file_path, 'w') pngfd, pngfile = tempfile.mkstemp(".png") tafd, tafile = tempfile.mkstemp(".ta") - del pngfd, tafd + del pngfd + del tafd try: tawindow.save_data(self.tw,tafile) tawindow.save_pict(self.tw,pngfile) tar_fd.add(tafile, "ta_code.ta") - tar_fd.add(pngfile, "ta_image.png") + tar_fd.add(pngfile, "ta_image.png") finally: tar_fd.close() @@ -136,24 +317,25 @@ class TurtleArtActivity(activity.Activity): def read_file(self, file_path): import tarfile,os,tempfile,shutil - print "Reading file %s" % file_path - # might be a tar file + _logger.debug("Reading file %s" % file_path) + # should be a tar file if file_path[-5:] == ".gtar": tar_fd = tarfile.open(file_path, 'r') tmpdir = tempfile.mkdtemp() try: - # We'll get 'ta_code.ta' and 'ta_image.png' + # We'll get 'ta_code.ta' and possibly a 'ta_image.png' tar_fd.extractall(tmpdir) tawindow.load_files(self.tw, os.path.join(tmpdir, \ 'ta_code.ta'), os.path.join(tmpdir, 'ta_image.png')) finally: shutil.rmtree(tmpdir) tar_fd.close() - # or just a .ta file + # try to open a .ta file elif file_path[-3:] == ".ta": tawindow.load_files(self.tw, file_path, "") - # run the activity - tawindow.runbutton(self.tw, 0) + + # run the activity + tawindow.runbutton(self.tw, 0) def jobject_new_patch(self): oldj = self._jobject @@ -176,13 +358,151 @@ class TurtleArtActivity(activity.Activity): def clear_journal(self): jobjects, total_count = datastore.find( \ {'activity': 'org.sugarlab.TAPortfolioActivity'}) - print 'found', total_count, 'entries' + _logger.debug('found', total_count, 'entries') for jobject in jobjects[:-1]: - print jobject.object_id + _logger.debug(jobject.object_id) datastore.delete(jobject.object_id) +class ChatTube(ExportedGObject): + + def __init__(self, tube, is_initiator, stack_received_cb): + super(ChatTube, self).__init__(tube, PATH) + self.tube = tube + self.is_initiator = is_initiator # Are we sharing or joining activity? + self.stack_received_cb = stack_received_cb + self.stack = '' + + self.tube.add_signal_receiver(self.send_stack_cb, 'SendText', IFACE, \ + path=PATH, sender_keyword='sender') + + def send_stack_cb(self, text, sender=None): + if sender == self.tube.get_unique_name(): + return + self.stack = text + self.stack_received_cb(text) + + @signal(dbus_interface=IFACE, signature='s') + def SendText(self, text): + self.stack = text + +class SaveAsToolbar(gtk.Toolbar): + def __init__(self, pc): + gtk.Toolbar.__init__(self) + self.activity = pc + + # HTML save source button + self.savehtml = ToolButton( "htmloff" ) + self.savehtml.set_tooltip(_('save as HTML')) + self.savehtml.props.sensitive = True + self.savehtml.connect('clicked', self.do_savehtml) + self.insert(self.savehtml, -1) + self.savehtml.show() + + # Berkeley Logo save source button + self.savelogo = ToolButton( "logo-saveoff" ) + self.savelogo.set_tooltip(_('save Logo')) + self.savelogo.props.sensitive = True + self.savelogo.connect('clicked', self.do_savelogo) + self.insert(self.savelogo, -1) + self.savelogo.show() + + def do_savehtml(self, button): + # write html out to datastore + self.savehtml.set_icon("htmlon") + _logger.debug("saving html code") + # til we add the option + embed_flag = True + + # grab code from stacks + html = save_html(self,self.activity.tw,embed_flag) + if len(html) == 0: + return + + # save the html code to the instance directory + try: + datapath = os.path.join(activity.get_activity_root(), "instance") + except: + # early versions of Sugar (656) didn't support get_activity_root() + datapath = \ + "/home/olpc/.sugar/default/org.laptop.TurtleArtActivity/instance" + + html_file = os.path.join(datapath, "taportfolio.html") + f = file(html_file, "w") + f.write(html) + f.close() + + if embed_flag == False: + # need to make a tarball that includes the images + tar_path = os.path.join(datapath, 'portfolio.tar') + tar_fd = tarfile.open(tar_path, 'w') + try: + tar_fd.add(html_file, "portfolio.html") + import glob + image_list = glob.glob(os.path.join(datapath, 'image*')) + for i in image_list: + tar_fd.add(i, os.path.basename(i)) + finally: + tar_fd.close() + + # Create a datastore object + file_dsobject = datastore.create() + + # Write any metadata (here we specifically set the title of the file + # and specify that this is a plain text file). + file_dsobject.metadata['title'] = "TAportfolio" + file_dsobject.metadata['icon-color'] = profile.get_color().to_string() + if embed_flag == True: + file_dsobject.metadata['mime_type'] = 'text/html' + file_dsobject.set_file_path(html_file) + else: + file_dsobject.metadata['mime_type'] = 'application/x-tar' + file_dsobject.set_file_path(tar_path) + datastore.write(file_dsobject) + file_dsobject.destroy() + gobject.timeout_add(250,self.savehtml.set_icon, "htmloff") + return + + def do_savelogo(self, button): + # write logo code out to datastore + self.savelogo.set_icon("logo-saveon") + # grab code from stacks + logocode = save_logo(self,self.activity.tw) + if len(logocode) == 0: + return + filename = "logosession.lg" + # Create a datastore object + file_dsobject = datastore.create() + + # Write any metadata (here we specifically set the title of the file + # and specify that this is a plain text file). + file_dsobject.metadata['title'] = filename + file_dsobject.metadata['mime_type'] = 'text/plain' + file_dsobject.metadata['icon-color'] = profile.get_color().to_string() + + # save the html code to the instance directory + try: + datapath = os.path.join(activity.get_activity_root(), "instance") + except: + # early versions of Sugar (656) didn't support get_activity_root() + datapath = \ + "/home/olpc/.sugar/default/org.laptop.TurtleArtActivity/instance" + + #Write the actual file to the data directory of this activity's root. + file_path = os.path.join(datapath, filename) + f = open(file_path, 'w') + try: + f.write(logocode) + finally: + f.close() + + #Set the file_path in the datastore. + file_dsobject.set_file_path(file_path) + + datastore.write(file_dsobject) + gobject.timeout_add(250,self.savelogo.set_icon, "logo-saveoff") + return class ProjectToolbar(gtk.Toolbar): @@ -190,22 +510,22 @@ class ProjectToolbar(gtk.Toolbar): gtk.Toolbar.__init__(self) self.activity = pc - # blocks button - self.blocks = ToolButton( "blocksoff" ) - self.blocks.set_tooltip(_('hide palette')) + # palette button (blocks) + self.palette = ToolButton( "blocksoff" ) + self.palette.set_tooltip(_('hide palette')) + self.palette.props.sensitive = True + self.palette.connect('clicked', self.do_palette) + self.insert(self.palette, -1) + self.palette.show() + + # blocks button (hideshow) + self.blocks = ToolButton( "hideshowoff" ) + self.blocks.set_tooltip(_('hide blocks')) self.blocks.props.sensitive = True - self.blocks.connect('clicked', self.do_blocks) + self.blocks.connect('clicked', self.do_hideshow) self.insert(self.blocks, -1) self.blocks.show() - # hide-show button - self.hideshow = ToolButton( "hideshowoff" ) - self.hideshow.set_tooltip(_('hide blocks')) - self.hideshow.props.sensitive = True - self.hideshow.connect('clicked', self.do_hideshow) - self.insert(self.hideshow, -1) - self.hideshow.show() - separator = gtk.SeparatorToolItem() separator.set_draw(True) self.insert(separator, -1) @@ -261,33 +581,26 @@ class ProjectToolbar(gtk.Toolbar): self.insert(self.sampb, -1) self.sampb.show() - separator = gtk.SeparatorToolItem() - separator.set_draw(True) - self.insert(separator, -1) - separator.show() - - # Berkeley Logo save source button - self.savelogo = ToolButton( "logo-saveoff" ) - self.savelogo.set_tooltip(_('save Logo')) - self.savelogo.props.sensitive = True - self.savelogo.connect('clicked', self.do_savelogo) - self.insert(self.savelogo, -1) - self.savelogo.show() - - def do_blocks(self, button): - tawindow.hideshow_palette(self.activity.tw) - if self.activity.tw.palette == False: - self.blocks.set_icon("blockson") - self.blocks.set_tooltip(_('show palette')) + def do_palette(self, button): + if self.activity.tw.palette == True: + tawindow.hideshow_palette(self.activity.tw,False) + self.palette.set_icon("blockson") + self.palette.set_tooltip(_('show palette')) else: - self.blocks.set_icon("blocksoff") - self.blocks.set_tooltip(_('hide palette')) + tawindow.hideshow_palette(self.activity.tw,True) + self.palette.set_icon("blocksoff") + self.palette.set_tooltip(_('hide palette')) def do_hidepalette(self): - print "in do_hidepalette" - self.blocks.set_icon("blockson") - self.blocks.set_tooltip(_('show palette')) - + # print "in do_hidepalette" + self.palette.set_icon("blockson") + self.palette.set_tooltip(_('show palette')) + + def do_showpalette(self): + # print "in do_showpalette" + self.palette.set_icon("blocksoff") + self.palette.set_tooltip(_('hide palette')) + def do_run(self, button): self.runproject.set_icon("run-faston") self.stop.set_icon("stopiton") @@ -311,24 +624,30 @@ class ProjectToolbar(gtk.Toolbar): def do_hideshow(self, button): tawindow.hideshow_button(self.activity.tw) if self.activity.tw.hide == True: # we just hid the blocks - self.hideshow.set_icon("hideshowon") - self.hideshow.set_tooltip(_('show blocks')) + self.blocks.set_icon("hideshowon") + self.blocks.set_tooltip(_('show blocks')) else: - self.hideshow.set_icon("hideshowoff") - self.hideshow.set_tooltip(_('hide blocks')) + self.blocks.set_icon("hideshowoff") + self.blocks.set_tooltip(_('hide blocks')) # update palette buttons too if self.activity.tw.palette == False: - self.blocks.set_icon("blockson") - self.blocks.set_tooltip(_('show palette')) + self.palette.set_icon("blockson") + self.palette.set_tooltip(_('show palette')) else: - self.blocks.set_icon("blocksoff") - self.blocks.set_tooltip(_('hide palette')) + self.palette.set_icon("blocksoff") + self.palette.set_tooltip(_('hide palette')) def do_hide(self): - self.hideshow.set_icon("hideshowon") - self.hideshow.set_tooltip(_('show blocks')) - self.blocks.set_icon("blockson") - self.blocks.set_tooltip(_('show palette')) + self.blocks.set_icon("hideshowon") + self.blocks.set_tooltip(_('show blocks')) + self.palette.set_icon("blockson") + self.palette.set_tooltip(_('show palette')) + + def do_show(self): + self.blocks.set_icon("hideshowoff") + self.blocks.set_tooltip(_('hide blocks')) + self.palette.set_icon("blocksoff") + self.palette.set_tooltip(_('hide palette')) def do_eraser(self, button): self.eraser.set_icon("eraseroff") @@ -338,37 +657,3 @@ class ProjectToolbar(gtk.Toolbar): def do_samples(self, button): tawindow.load_file(self.activity.tw) - def do_savelogo(self, button): - # write logo code out to datastore - self.savelogo.set_icon("logo-saveon") - # grab code from stacks - logocode = save_logo(self,self.activity.tw) - if len(logocode) == 0: - return - filename = "logosession.lg" - - # Create a datastore object - file_dsobject = datastore.create() - - # Write any metadata (here we specifically set the title of the file - # and specify that this is a plain text file). - file_dsobject.metadata['title'] = filename - file_dsobject.metadata['mime_type'] = 'text/plain' - file_dsobject.metadata['icon-color'] = profile.get_color().to_string() - - #Write the actual file to the data directory of this activity's root. - file_path = os.path.join(self.activity.get_activity_root(), \ - 'instance', filename) - f = open(file_path, 'w') - try: - f.write(logocode) - finally: - f.close() - - #Set the file_path in the datastore. - file_dsobject.set_file_path(file_path) - - datastore.write(file_dsobject) - gobject.timeout_add(250,self.savelogo.set_icon, "logo-saveoff") - return - -- cgit v0.9.1