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

Merge branch 'master' of git+ssh://dev.laptop.org/git/sugar

Browse Source
This commit is contained in:
Dan Williams 2007-04-25 22:39:39 -04:00
commit 9446c951ac
4 changed files with 26 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
docs/controls.txt
View File

@ -157,14 +157,19 @@ sugar.ScrolledWindow
* Support for markers. Line as default and optional support for other shapes (star for bookmarks, circles for xos...). Generic way of add marks and keep them updated (observer?) * Support for markers. Line as default and optional support for other shapes (star for bookmarks, circles for xos...). Generic way of add marks and keep them updated (observer?)
gtk.Expander
TODO gtk.Separator
**Rollovers** sugar.GroupBox
Grab key
Trays * just a container
Grouping * set_title and set_title_widget (checkbox, radiobutton...)
Tabs * different color and separator under title
Sorting
Expander gtk.TreeView
Clipboard
gtk.Notebook
* Expand to fill the whole space by default but property to turn it off
* Switching tabs with the little arrows should page

2
shell/model/MeshModel.py
View File

@ -193,7 +193,7 @@ class MeshModel(gobject.GObject):
self._check_activity(activity) self._check_activity(activity)
def _check_activity(self, activity): def _check_activity(self, activity):
atype = activity.get_type() atype = activity.props.type
bundle = self._bundle_registry.get_bundle(atype) bundle = self._bundle_registry.get_bundle(atype)
if not bundle: if not bundle:
return return

2
shell/view/frame/FriendsBox.py
View File

@ -81,7 +81,7 @@ class FriendsBox(hippo.CanvasBox):
def __activity_appeared_cb(self, pservice, activity_ps): def __activity_appeared_cb(self, pservice, activity_ps):
activity = self._shell.get_current_activity() activity = self._shell.get_current_activity()
if activity and activity_ps.get_id() == activity.get_id(): if activity and activity_ps.props.id == activity.get_id():
self._set_activity_ps(activity_ps) self._set_activity_ps(activity_ps)
def _set_activity_ps(self, activity_ps): def _set_activity_ps(self, activity_ps):

22
sugar/presence/presenceservice.py
View File

@ -241,8 +241,8 @@ class PresenceService(gobject.GObject):
resp = self._ps.GetActivities() resp = self._ps.GetActivities()
except dbus.exceptions.DBusException, err: except dbus.exceptions.DBusException, err:
logging.warn( logging.warn(
"""Unable to retrieve activity list from presence service: %s""", """Unable to retrieve activity list from presence service: %s"""
err % err
) )
return [] return []
else: else:
@ -263,9 +263,8 @@ class PresenceService(gobject.GObject):
act_op = self._ps.GetActivityById(activity_id) act_op = self._ps.GetActivityById(activity_id)
except dbus.exceptions.DBusException, err: except dbus.exceptions.DBusException, err:
logging.warn( logging.warn(
"""Unable to retrieve activity handle for %r from presence service: %s""", """Unable to retrieve activity handle for %r from presence service: %s"""
activity_id, % (activity_id, err)
err
) )
return None return None
return self._new_object(act_op) return self._new_object(act_op)
@ -280,8 +279,8 @@ class PresenceService(gobject.GObject):
resp = self._ps.GetBuddies() resp = self._ps.GetBuddies()
except dbus.exceptions.DBusException, err: except dbus.exceptions.DBusException, err:
logging.warn( logging.warn(
"""Unable to retrieve buddy-list from presence service: %s""", """Unable to retrieve buddy-list from presence service: %s"""
err % err
) )
return [] return []
else: else:
@ -303,9 +302,8 @@ class PresenceService(gobject.GObject):
buddy_op = self._ps.GetBuddyByPublicKey(dbus.ByteArray(key)) buddy_op = self._ps.GetBuddyByPublicKey(dbus.ByteArray(key))
except dbus.exceptions.DBusException, err: except dbus.exceptions.DBusException, err:
logging.warn( logging.warn(
"""Unable to retrieve buddy handle for %r from presence service: %s""", """Unable to retrieve buddy handle for %r from presence service: %s"""
key, % key, err
err
) )
return None return None
return self._new_object(buddy_op) return self._new_object(buddy_op)
@ -316,8 +314,8 @@ class PresenceService(gobject.GObject):
owner_op = self._ps.GetOwner() owner_op = self._ps.GetOwner()
except dbus.exceptions.DBusException, err: except dbus.exceptions.DBusException, err:
logging.warn( logging.warn(
"""Unable to retrieve local user/owner from presence service: %s""", """Unable to retrieve local user/owner from presence service: %s"""
err % err
) )
raise RuntimeError("Could not get owner object from presence service.") raise RuntimeError("Could not get owner object from presence service.")
return self._new_object(owner_op) return self._new_object(owner_op)