Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSimon Schampijer <simon@schampijer.de>2011-07-24 16:42:48 (GMT)
committer Simon Schampijer <simon@schampijer.de>2011-07-24 16:44:28 (GMT)
commitf0ebdd7f48619f08631de81c604206fe4565921f (patch)
treed27c27a97d9b59e6bb0320db7fe961bda20df8dd
parent0269f819761cfd803cf4d694298c8ab6a753e242 (diff)
Update window title when the activity title changes - OLPC #10978
The patch updates the window title when the user changes the title in the toolbar or in the Journal. Signed-of-by: Gonzalo Odiard <gonzalo@laptop.org> Acked-By: Simon Schampijer <simon@laptop.org>
-rw-r--r--src/sugar/activity/activity.py7
-rw-r--r--src/sugar/activity/widgets.py2
2 files changed, 9 insertions, 0 deletions
diff --git a/src/sugar/activity/activity.py b/src/sugar/activity/activity.py
index 53e6062..fce1a12 100644
--- a/src/sugar/activity/activity.py
+++ b/src/sugar/activity/activity.py
@@ -340,6 +340,8 @@ class Activity(Window, gtk.Container):
self._jobject.metadata['icon-color'] = \
self.shared_activity.props.color
self.set_title(self._jobject.metadata['title'])
+ self._jobject.metadata.connect('updated',
+ self.__jobject_updated_cb)
def _initialize_journal_object(self):
title = _('%s Activity') % get_bundle_name()
@@ -364,6 +366,11 @@ class Activity(Window, gtk.Container):
return jobject
+ def __jobject_updated_cb(self, jobject):
+ if self.get_title() == jobject['title']:
+ return
+ self.set_title(jobject['title'])
+
def _set_up_sharing(self, mesh_instance, share_scope):
# handle activity share/join
logging.debug('*** Act %s, mesh instance %r, scope %s',
diff --git a/src/sugar/activity/widgets.py b/src/sugar/activity/widgets.py
index e7a47cb..9503d36 100644
--- a/src/sugar/activity/widgets.py
+++ b/src/sugar/activity/widgets.py
@@ -224,6 +224,8 @@ class TitleEntry(gtk.ToolItem):
activity.metadata['title_set_by_user'] = '1'
activity.save()
+ activity.set_title(title)
+
shared_activity = activity.get_shared_activity()
if shared_activity is not None:
shared_activity.props.name = title