diff options
Diffstat (limited to 'messenger.py')
| -rw-r--r-- | messenger.py | 20 |
1 files changed, 13 insertions, 7 deletions
diff --git a/messenger.py b/messenger.py index c03005e..57f6df3 100644 --- a/messenger.py +++ b/messenger.py @@ -31,6 +31,7 @@ SERVICE = 'org.sugarlabs.CartoonBuilder' IFACE = SERVICE PATH = '/org/sugarlabs/CartoonBuilder' + class Slot: def __init__(self, sender=None, raw=None): if sender: @@ -46,7 +47,8 @@ class Slot: def serialize(self): return json.dumps({ 'seqno': self.seqno, - 'oid' : self.oid}) + 'oid': self.oid}) + class Messenger(ExportedGObject): def __init__(self, tube, initiator, view): @@ -87,7 +89,6 @@ class Messenger(ExportedGObject): sender_keyword='sender') self._ping() - self._tube.add_signal_receiver(self._notify_cb, '_notify', IFACE, path=PATH, sender_keyword='sender') self._entered = True @@ -215,14 +216,16 @@ class Messenger(ExportedGObject): def _sound_changed_cb(self, sender, sound): self._send(SOUND, sound.id) -FRAME = 'frame' + +FRAME = 'frame' GROUND = 'ground' -SOUND = 'sound' +SOUND = 'sound' OBJECTS = { - FRAME : char.THEMES[-1].frames, - GROUND : ground.THEMES, - SOUND : sound.THEMES } + FRAME: char.THEMES[-1].frames, + GROUND: ground.THEMES, + SOUND: sound.THEMES} + def object_find(type, oid): if type.startswith(FRAME): @@ -238,6 +241,7 @@ def object_find(type, oid): return i return None + def object_new(type, oid, name, raw): logger.debug('add new object type=%s oid=%s' % (type, oid)) @@ -257,6 +261,7 @@ def object_new(type, oid, name, raw): OBJECTS[type.split(':')[0]].append(object) + def object_serialize(type, oid): object = object_find(type, oid) @@ -267,6 +272,7 @@ def object_serialize(type, oid): % (type, oid)) return ('', '') + def object_select(view, type, oid): if oid: object = object_find(type, oid) |