diff options
author | James Cameron <quozl@laptop.org> | 2011-08-05 04:39:16 (GMT) |
---|---|---|
committer | James Cameron <quozl@laptop.org> | 2011-08-05 04:39:16 (GMT) |
commit | 8c73356ca84f785b9e82f3d8eb8ab26852be8fa4 (patch) | |
tree | 3c4e632871545d74664637301b0c96f0746abbe9 /logviewer.py | |
parent | e30a00226eedd2711aabf269e5147562d15562d0 (diff) | |
parent | 38dc501c50f0728fa785b6f249f52bbcf18ce32b (diff) |
Conflicts:
logviewer.py
Diffstat (limited to 'logviewer.py')
-rw-r--r-- | logviewer.py | 29 |
1 files changed, 10 insertions, 19 deletions
diff --git a/logviewer.py b/logviewer.py index 4cd15dd..6f08e73 100644 --- a/logviewer.py +++ b/logviewer.py @@ -28,12 +28,14 @@ import gobject import gio from sugar.activity import activity +from sugar import profile from sugar import env from sugar.graphics import iconentry from sugar.graphics.toolbutton import ToolButton from sugar.graphics.toggletoolbutton import ToggleToolButton from sugar.graphics.palette import Palette from sugar.graphics.alert import NotifyAlert +from sugar.graphics.icon import Icon from logcollect import LogCollect, LogSend from sugar.graphics.toolbarbox import ToolbarButton, ToolbarBox from sugar.activity.widgets import * @@ -323,7 +325,7 @@ class LogBuffer(gtk.TextBuffer): self._written = 0 class LogActivity(activity.Activity): - def __init__(self, handle, create_jobject=True): + def __init__(self, handle, create_jobject=False): activity.Activity.__init__(self, handle, False) # Paths to watch: ~/.sugar/someuser/logs, /var/log @@ -348,25 +350,14 @@ class LogActivity(activity.Activity): self.max_participants = 1 - try: - activity_button = ActivityToolbarButton(self) - except AttributeError: - # in Sugar 0.92, ActivityToolbarButton will only work - # correctly if create_jobject=True for the activity, since - # it relies on metadata being present. Here we workaround - # that by creating a temporary journal object for the - # duration of the call. - self._jobject = datastore.create() - self._jobject.metadata['title'] = 'Log Activity' - activity_button = ActivityToolbarButton(self) - self._jobject = None - toolbar_box.toolbar.insert(activity_button, -1) + activity_button = ToolButton() + color = profile.get_color() + bundle = ActivityBundle(activity.get_bundle_path()) + icon = Icon(file=bundle.get_icon(), xo_color=color) + activity_button.set_icon_widget(icon) + activity_button.show() - # prevent title from being edited, and prevent keep - activity_toolbar = activity_button.get_page() - if 'title' in activity_toolbar: - activity_toolbar.title.set_sensitive(False) - activity_toolbar.keep.set_sensitive(False) + toolbar_box.toolbar.insert(activity_button, -1) separator = gtk.SeparatorToolItem() separator.set_draw(False) |