From 79fdfc5fb73e94b1791069e5504403f8f16a05af Mon Sep 17 00:00:00 2001 From: Tomeu Date: Wed, 16 May 2007 15:02:41 +0200 Subject: [PATCH 1/4] Don't set_active(0) on realize, as it would trigger 'changed'. --- sugar/graphics/combobox.py | 5 ----- 1 file changed, 5 deletions(-) diff --git a/sugar/graphics/combobox.py b/sugar/graphics/combobox.py index cb25f6df..ce8628a0 100644 --- a/sugar/graphics/combobox.py +++ b/sugar/graphics/combobox.py @@ -40,7 +40,6 @@ class ComboBox(gtk.ComboBox): self.set_model(self._model) self.set_row_separator_func(self._is_separator) - self.connect('realize', self._realize_cb) def do_get_property(self, pspec): if pspec.name == 'value': @@ -49,10 +48,6 @@ class ComboBox(gtk.ComboBox): else: return gtk.ComboBox.do_get_property(self, pspec) - def _realize_cb(self, widget, data=None): - if self.get_active() == -1: - self.set_active(0) - def append_item(self, action_id, text, icon_name=None): if not self._icon_renderer and icon_name: self._icon_renderer = gtk.CellRendererPixbuf() From 7314d5a8c81c293793bf6910b6f1e92e94c935b5 Mon Sep 17 00:00:00 2001 From: Tomeu Vizoso Date: Wed, 16 May 2007 17:01:59 +0200 Subject: [PATCH 2/4] Improve logging. --- sugar/datastore/dbus_helpers.py | 31 ++++--------------------------- 1 file changed, 4 insertions(+), 27 deletions(-) diff --git a/sugar/datastore/dbus_helpers.py b/sugar/datastore/dbus_helpers.py index 96c2dd45..33aa9a6e 100644 --- a/sugar/datastore/dbus_helpers.py +++ b/sugar/datastore/dbus_helpers.py @@ -34,32 +34,13 @@ except Exception, e: _data_store = None logging.error(e) -def get_contents(filename): - if not filename: - return '' - f = open(filename, "r") - try: - contents = f.read() - finally: - f.close() - return contents - def create(properties, filename): - logging.debug('dbus_helpers.create: %s, %s' % (properties, filename)) - try: - logging.debug(get_contents(filename)) - except UnicodeDecodeError: - pass object_id = _data_store.create(dbus.Dictionary(properties), filename) logging.debug('dbus_helpers.create: ' + object_id) return object_id def update(uid, properties, filename, reply_handler=None, error_handler=None): - logging.debug('dbus_helpers.update: %s, %s, %s' % (uid, properties, filename)) - try: - logging.debug(get_contents(filename)) - except UnicodeDecodeError: - pass + logging.debug('dbus_helpers.update') if reply_handler and error_handler: _data_store.update(uid, dbus.Dictionary(properties), filename, reply_handler=reply_handler, @@ -68,20 +49,16 @@ def update(uid, properties, filename, reply_handler=None, error_handler=None): _data_store.update(uid, dbus.Dictionary(properties), filename) def get_properties(uid): - props = _data_store.get_properties(uid) - logging.debug('dbus_helpers.get_properties: %s, %s' % (uid, props)) - return props + logging.debug('dbus_helpers.get_properties: %s' % uid) + return _data_store.get_properties(uid) def get_filename(uid): filename = _data_store.get_filename(uid) logging.debug('dbus_helpers.get_filename: %s, %s' % (uid, filename)) - try: - logging.debug(get_contents(filename)) - except UnicodeDecodeError: - pass return filename def find(query, reply_handler, error_handler): + logging.debug('dbus_helpers.find') if reply_handler and error_handler: return _data_store.find(query, reply_handler=reply_handler, error_handler=error_handler) From 1d31c51eccf37e081f521cc5091fea668824a883 Mon Sep 17 00:00:00 2001 From: Tomeu Vizoso Date: Wed, 16 May 2007 17:55:56 +0200 Subject: [PATCH 3/4] Don't save to the journal on focus-out. --- sugar/activity/activity.py | 6 ------ 1 file changed, 6 deletions(-) diff --git a/sugar/activity/activity.py b/sugar/activity/activity.py index 76e10b9c..b9be5d5f 100644 --- a/sugar/activity/activity.py +++ b/sugar/activity/activity.py @@ -213,18 +213,12 @@ class Activity(Window, gtk.Container): else: self.jobject = None - self.connect('focus-out-event', self._focus_out_event_cb) - def _internal_jobject_create_cb(self): pass def _internal_jobject_error_cb(self, err): logging.debug("Error creating activity datastore object: %s" % err) - def _focus_out_event_cb(self, widget, event): - if self.jobject: - self.save() - def read_file(self): """ Subclasses implement this method if they support resuming objects from From 3a1d514e9fa197e0c13c7763b5ace9fc56342a61 Mon Sep 17 00:00:00 2001 From: Tomeu Vizoso Date: Wed, 16 May 2007 21:30:49 +0200 Subject: [PATCH 4/4] Save to the journal when switching to another activity. --- shell/model/homemodel.py | 19 +++++++++++++++++++ sugar/activity/activity.py | 16 ++++++++++++++++ sugar/activity/activityservice.py | 6 ++++++ 3 files changed, 41 insertions(+) diff --git a/shell/model/homemodel.py b/shell/model/homemodel.py index 99b0512d..a3afdc4d 100644 --- a/shell/model/homemodel.py +++ b/shell/model/homemodel.py @@ -101,6 +101,7 @@ class HomeModel(gobject.GObject): self._remove_activity(window.get_xid()) if not self._activities: self.emit('active-activity-changed', None) + self._notify_activity_activation(self._current_activity, None) def _get_activity_by_xid(self, xid): for act in self._activities.values(): @@ -108,10 +109,25 @@ class HomeModel(gobject.GObject): return act return None + def _notify_activity_activation(self, old_activity, new_activity): + if old_activity == new_activity: + return + + if old_activity: + service = old_activity.get_service() + if service: + service.set_active(False) + + if new_activity: + service = new_activity.get_service() + if service: + service.set_active(True) + def _active_window_changed_cb(self, screen): window = screen.get_active_window() if window == None: self.emit('active-activity-changed', None) + self._notify_activity_activation(self._current_activity, None) return if window.get_window_type() != wnck.WINDOW_NORMAL: return @@ -120,11 +136,14 @@ class HomeModel(gobject.GObject): act = self._get_activity_by_xid(window.get_xid()) if act: if act.get_launched() == True: + self._notify_activity_activation(self._current_activity, act) self._current_activity = act else: + self._notify_activity_activation(self._current_activity, None) self._current_activity = None logging.error('Activity for window %d was not yet launched.' % xid) else: + self._notify_activity_activation(self._current_activity, None) self._current_activity = None logging.error('Model for window %d does not exist.' % xid) diff --git a/sugar/activity/activity.py b/sugar/activity/activity.py index b9be5d5f..421d7ba2 100644 --- a/sugar/activity/activity.py +++ b/sugar/activity/activity.py @@ -146,6 +146,10 @@ class Activity(Window, gtk.Container): 'joined': (gobject.SIGNAL_RUN_FIRST, gobject.TYPE_NONE, ([])) } + __gproperties__ = { + 'active': (bool, None, None, False, gobject.PARAM_READWRITE) + } + def __init__(self, handle, create_jobject=True): """Initialise the Activity @@ -175,6 +179,7 @@ class Activity(Window, gtk.Container): self.connect('destroy', self._destroy_cb) + self._active = False self._activity_id = handle.activity_id self._pservice = presenceservice.get_instance() self._shared_activity = None @@ -213,6 +218,17 @@ class Activity(Window, gtk.Container): else: self.jobject = None + def do_set_property(self, pspec, value): + if pspec.name == 'active': + if self._active != value: + self._active = value + if not self._active and self.jobject: + self.save() + + def do_get_property(self, pspec): + if pspec.name == 'active': + return self._active + def _internal_jobject_create_cb(self): pass diff --git a/sugar/activity/activityservice.py b/sugar/activity/activityservice.py index 04629ba4..b69ba834 100644 --- a/sugar/activity/activityservice.py +++ b/sugar/activity/activityservice.py @@ -15,6 +15,8 @@ # Free Software Foundation, Inc., 59 Temple Place - Suite 330, # Boston, MA 02111-1307, USA. +import logging + import dbus import dbus.service @@ -81,3 +83,7 @@ class ActivityService(dbus.service.Object): def execute(self, command, args): return self._activity.execute(command, args) + @dbus.service.method(_ACTIVITY_INTERFACE) + def set_active(self, active): + logging.debug('ActivityService.set_active: %s.' % active) + self._activity.props.active = active