diff options
| -rw-r--r-- | .gitignore | 2 | ||||
| -rw-r--r-- | activity/activity.info | 4 | ||||
| -rw-r--r-- | chat.py | 13 |
3 files changed, 7 insertions, 12 deletions
@@ -1,2 +1,4 @@ dist 0sugar-launch + +.0sugar-injection
\ No newline at end of file diff --git a/activity/activity.info b/activity/activity.info index 01f3e80..3d01954 100644 --- a/activity/activity.info +++ b/activity/activity.info @@ -1,10 +1,10 @@ [Activity] name = Speak bundle_id = vu.lux.olpc.Speak -exec = bin/0sugar-launch -c sugar-activity -c activity.SpeakActivity +exec = .0sugar-injection/launcher activity.SpeakActivity icon = activity-speak activity_version = 12 show_launcher = yes license = GPLv3+ host_version = 1 -requires = toolkit; gst-plugins-espeak +requires = toolkit/python, gst-plugins-espeak @@ -33,8 +33,7 @@ logger = logging.getLogger('speak') BUDDY_SIZE = min(100, min(gtk.gdk.screen_width(), gtk.gdk.screen_height() - style.LARGE_ICON_SIZE) / 5) -BUDDY_XPAD = 0 -BUDDY_YPAD = 5 +BUDDY_PAD = 5 BUDDIES_WIDTH = int(BUDDY_SIZE * 2.5) BUDDIES_COLOR = style.COLOR_SELECTION_GREY @@ -228,25 +227,19 @@ class View(hippo.Canvas): inner = CanvasRoundBox( background_color = fill_color.get_int(), - padding_top = BUDDY_YPAD, - padding_bottom = BUDDY_YPAD, - padding_left = BUDDY_XPAD, - padding_right = BUDDY_XPAD, ) inner.props.border_color = fill_color.get_int() inner.append(hippo.CanvasWidget(widget=buddy_face), hippo.PACK_EXPAND) + inner.props.border = BUDDY_PAD outer = CanvasRoundBox( background_color = stroke_color.get_int(), box_width = BUDDY_SIZE, box_height = BUDDY_SIZE, - padding_top = BUDDY_YPAD, - padding_bottom = BUDDY_YPAD, - padding_left = BUDDY_XPAD, - padding_right = BUDDY_XPAD ) outer.props.border_color = stroke_color.get_int() outer.append(inner, hippo.PACK_EXPAND) + outer.props.border = BUDDY_PAD return (buddy_face, outer) |