Merge git://git.sugarlabs.org/log/mainlineHEADmaster

Conflicts:
	logviewer.py

5 files changed, 86 insertions, 74 deletions

diff --git a/activity/activity.info b/activity/activity.info
index 4bd8f73..cb611cb 100644
--- a/activity/activity.info
+++ b/activity/activity.info
@@ -1,6 +1,6 @@
 [Activity]
 name = Log
-activity_version = 24
+activity_version = 25
 bundle_id = org.laptop.Log
 exec = sugar-activity logviewer.LogActivity -s
 icon = activity-log
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)
diff --git a/po/de.po b/po/de.po
index a80ad15..f4457df 100644
--- a/po/de.po
+++ b/po/de.po
@@ -58,8 +58,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-08-18 00:30-0400\n"
-"PO-Revision-Date: 2011-05-03 00:26+0200\n"
+"POT-Creation-Date: 2011-06-29 00:31-0400\n"
+"PO-Revision-Date: 2011-07-17 22:59+0200\n"
 "Last-Translator: Markus <m.slg@gmx.de>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: de\n"
@@ -69,104 +69,125 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: Pootle 2.0.1\n"
 
-#: activity/activity.info:2 logviewer.py:326
+#: activity/activity.info:2
 msgid "Log"
 msgstr "Logbuch"
 
-#: logviewer.py:80
+#: logviewer.py:84
 msgid "Log Files"
 msgstr "Logdateien"
 
-#: logviewer.py:88
+#: logviewer.py:92
 msgid "Other"
 msgstr "Andere"
 
-#: logviewer.py:187
+#: logviewer.py:191
 #, python-format
 msgid "ERROR: Failed to look for files in '%(path)s'."
 msgstr "FEHLER: Konnte Dateien in '%(path)s' nicht finden."
 
-#: logviewer.py:202
+#: logviewer.py:206
 #, python-format
 msgid "ERROR: File '%(file)s' does not exist."
 msgstr "FEHLER: Datei '%(file)s' existiert nicht."
 
-#: logviewer.py:206
+#: logviewer.py:210
 #, python-format
 msgid "ERROR: Unable to read file '%(file)s'."
 msgstr "FEHLER: Kann Datei '%(file)s' nicht lesen."
 
-#: logviewer.py:320
+#: logviewer.py:324
 #, python-format
 msgid "Error: Can't open file '%s'\n"
 msgstr "FEHLER: Kann Datei '%s' nicht öffnen.\n"
 
-#: logviewer.py:362
+#: logviewer.py:371
 msgid "Word Wrap"
 msgstr "Zeilenumbruch"
 
-#: logviewer.py:382
+#: logviewer.py:391
 msgid "Previous"
 msgstr "Vorheriges"
 
-#: logviewer.py:387
+#: logviewer.py:396
 msgid "Next"
 msgstr "Nächstes"
 
-#: logviewer.py:399
+#: logviewer.py:408
 msgid "Delete Log File"
 msgstr "Log-Datei löschen"
 
-#: logviewer.py:413
+#: logviewer.py:422
 msgid "Tools"
 msgstr "Werkzeuge"
 
-#: logviewer.py:470
+#: logviewer.py:479
 msgid "Error"
 msgstr "Fehler"
 
-#: logviewer.py:471
+#: logviewer.py:480
 #, python-format
 msgid "%(error)s when deleting %(file)s"
 msgstr "%(error)s beim Löschen von %(file)s"
 
-#: logviewer.py:483
-msgid "Log Collector: Send XO information"
-msgstr "Log-Sammler: Sende XO-Informationen"
-
 #: logviewer.py:490
+msgid "Log Collector: Capture information"
+msgstr "Log-Sammler: XO-Informationen aufzeichnen"
+
+#: logviewer.py:497
 msgid ""
-"Log collector sends information about the system\n"
-"and running processes to a central server.  Use\n"
-"this option if you want to report a problem."
+"This captures information about the system\n"
+"and running processes to a journal entry.\n"
+"Use this to improve a problem report."
 msgstr ""
-"Der Log-Sammler sendet Informationen über das Systemund laufende Prozesse an "
-"einen zentralen Server.Benutze diese Option, um einen Problembericht zu "
-"senden."
-
-#: logviewer.py:494
-msgid "Send information"
-msgstr "Sende Informationen"
+"Hierdurch werden Informationen über das System\n"
+"und laufende Prozesse in einem Tagebucheintrag erfasst.\n"
+"Benutze das, um einen Problembericht zu verbessern."
 
-#: logviewer.py:519
-msgid "Logs sent"
-msgstr "Logs gesendet"
+#: logviewer.py:501
+msgid "Capture information"
+msgstr "Informationen aufzeichnen"
 
-#: logviewer.py:520
-msgid "The logs were uploaded to the server."
-msgstr "Die Logs wurden auf den Server hochgeladen."
+#: logviewer.py:523
+msgid "Logs not captured"
+msgstr "Logeinträge nicht erfasst."
 
-#: logviewer.py:522
-msgid "Logs not sent"
-msgstr "Logs nicht gesendet"
+#: logviewer.py:524
+msgid "The logs could not be captured."
+msgstr "Die Logeinträge konnten nicht aufgezeichnet werden."
 
-#: logviewer.py:523
-msgid ""
-"The logs could not be uploaded to the server. Please check your network "
-"connection."
-msgstr ""
-"Die Logs konnten nicht auf den Server hochgeladen werden. Überprüfe bitte "
-"deine Netzwerkverbindung."
+#: logviewer.py:534
+#, python-format
+msgid "log-%s"
+msgstr "Log-%s"
+
+#~ msgid ""
+#~ "Log collector sends information about the system\n"
+#~ "and running processes to a central server.  Use\n"
+#~ "this option if you want to report a problem."
+#~ msgstr ""
+#~ "Der Log-Sammler sendet Informationen über das Systemund laufende Prozesse an "
+#~ "einen zentralen Server.Benutze diese Option, um einen Problembericht zu "
+#~ "senden."
+
+#~ msgid "Send information"
+#~ msgstr "Sende Informationen"
+
+#~ msgid "Logs sent"
+#~ msgstr "Logs gesendet"
+
+#~ msgid "The logs were uploaded to the server."
+#~ msgstr "Die Logs wurden auf den Server hochgeladen."
+
+#~ msgid "Logs not sent"
+#~ msgstr "Logs nicht gesendet"
+
+#~ msgid ""
+#~ "The logs could not be uploaded to the server. Please check your network "
+#~ "connection."
+#~ msgstr ""
+#~ "Die Logs konnten nicht auf den Server hochgeladen werden. Überprüfe bitte "
+#~ "deine Netzwerkverbindung."
 
 #~ msgid "Edit"
 #~ msgstr "Bearbeiten"
diff --git a/po/fa_AF.po b/po/fa_AF.po
index 15598e1..ca60ecb 100644
--- a/po/fa_AF.po
+++ b/po/fa_AF.po
@@ -15,15 +15,15 @@ msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2009-08-18 00:30-0400\n"
-"PO-Revision-Date: 2009-07-30 03:31-0400\n"
-"Last-Translator: Sohaib Obaidi <ebtihaj_obaidi@yahoo.com>\n"
+"PO-Revision-Date: 2011-08-04 15:54+0200\n"
+"Last-Translator: Chris <cjl@laptop.org>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: fa_AF\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: Pootle 1.2.1\n"
+"X-Generator: Pootle 2.0.1\n"
 
 #: activity/activity.info:2 logviewer.py:326
 msgid "Log"
@@ -40,7 +40,7 @@ msgstr "دیگر"
 #: logviewer.py:187
 #, python-format
 msgid "ERROR: Failed to look for files in '%(path)s'."
-msgstr "خطا: در تلاش پرونده ها در '%(path(s' ناموفق شد."
+msgstr "خطا: در تلاش پرونده ها در '%(path)s' ناموفق شد."
 
 #: logviewer.py:202
 #, python-format
@@ -56,8 +56,8 @@ msgstr "خطا: پرونده '%(file)s'را خوانده نميتواند."
 #, python-format
 msgid "Error: Can't open file '%s'\n"
 msgstr ""
-"خطا: پرونده '%s'\n"
-"  را باز كرده نميتواند"
+"خطا: پرونده '%s'"
+"  را باز كرده نميتواند\n"
 
 #: logviewer.py:362
 msgid "Word Wrap"
diff --git a/po/ps.po b/po/ps.po
index 6d089ce..55c908f 100644
--- a/po/ps.po
+++ b/po/ps.po
@@ -54,8 +54,8 @@ msgstr "تیروتنه: د دوتنې '%(file)s' د لوست توان نلری"
 #, python-format
 msgid "Error: Can't open file '%s'\n"
 msgstr ""
-"تیروتنه: دوتنه '%s'\n"
-" نشی پرانیستی"
+"تیروتنه: دوتنه '%s'"
+" نشی پرانیستی\n"
 
 #: logviewer.py:362
 msgid "Word Wrap"