sugarlabs/sugar-toolkit-gtk3
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

- don't hardcode inactive buddy color

Browse Source 
- shorten signal handler id variable names
- add appeared/disappeared signals to BuddyModel
- deal with buddy disappearance
This commit is contained in:
Dan Williams 2006-09-22 17:24:00 -04:00
parent 6473444e09
commit 2031eb650a
1 changed files with 37 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
shell/model/BuddyModel.py
View File

@ -1,34 +1,47 @@
from sugar.presence import PresenceService
from sugar.canvas.IconColor import IconColor
import gobject
_NOT_PRESENT_COLOR = "#888888,#BBBBBB"
class BuddyModel(gobject.GObject):
__gsignals__ = {
'appeared': (gobject.SIGNAL_RUN_FIRST, gobject.TYPE_NONE, ([])),
'disappeared': (gobject.SIGNAL_RUN_FIRST, gobject.TYPE_NONE, ([]))
}
class BuddyModel:
def __init__(self, name=None, buddy=None):
if name and buddy:
raise RuntimeError("Must specify only _one_ of name or buddy.")
gobject.GObject.__init__(self)
self._ba_handler = None
self._pc_handler = None
self._dis_handler = None
self._cur_activity = None
self._buddy_appeared_handler = None
self._pservice = PresenceService.get_instance()
self._buddy = buddy
self._buddy = None
# If given just a name, try to get the buddy from the PS first
if not self._buddy:
if not buddy:
self._name = name
# FIXME: use public key, not name
self._buddy = self._pservice.get_buddy_by_name(self._name)
buddy = self._pservice.get_buddy_by_name(self._name)
# If successful, copy properties from the PS buddy object
if self._buddy:
if buddy:
self.__update_buddy(buddy)
else:
# Otherwise, connect to the PS's buddy-appeared signal and
# wait for the buddy to appear
self._buddy_appeared_handler = self._pservice.connect('buddy-appeared',
self._ba_handler = self._pservice.connect('buddy-appeared',
self.__buddy_appeared_cb)
self._name = name
# Set color to 'inactive'/'disconnected'
self.__set_color_from_string("#888888,#BBBBBB")
self.__set_color_from_string(_NOT_PRESENT_COLOR)
def __set_color_from_string(self, color_string):
self._color = IconColor(color_string)
@ -45,26 +58,38 @@ class BuddyModel:
def __update_buddy(self, buddy):
if not buddy:
raise ValueError("Buddy cannot be None.")
self._buddy = buddy
self._name = self._buddy.get_name()
self.__set_color_from_string(self._buddy.get_color())
self._buddy.connect('property-changed', self.__buddy_property_changed_cb)
self._pc_handler = self._buddy.connect('property-changed', self.__buddy_property_changed_cb)
self._dis_handler = self._buddy.connect('disappeared', self.__buddy_disappeared_cb)
def __buddy_appeared_cb(self, pservice, buddy):
# FIXME: use public key rather than buddy name
if self._buddy or buddy.get_name() != self._name:
return
if self._buddy_appeared_handler:
if self._ba_handler:
# Once we have the buddy, we no longer need to
# monitor buddy-appeared events
self._pservice.disconnect(self._buddy_appeared_handler)
self._buddy_appeared_handler = None
self._pservice.disconnect(self._ba_handler)
self._ba_handler = None
self.__update_buddy(buddy)
self.emit('appeared')
def __buddy_property_changed_cb(self, buddy, keys):
# all we care about right now is current activity
curact = self._buddy.get_current_activity()
self._cur_activity = self._pservice.get_activity(curact)
def __buddy_disappeared_cb(self, buddy):
if buddy != self._buddy:
return
self._buddy.disconnect(self._pc_handler)
self._buddy.disconnect(self._dis_handler)
self.__set_color_from_string(_NOT_PRESENT_COLOR)
self.emit('disappeared')
self._buddy = None