diff options
| -rw-r--r-- | src/jarabe/model/shell.py | 7 | ||||
| -rw-r--r-- | src/jarabe/view/palettes.py | 5 |
2 files changed, 11 insertions, 1 deletions
diff --git a/src/jarabe/model/shell.py b/src/jarabe/model/shell.py index 7da81d5..b4c1af6 100644 --- a/src/jarabe/model/shell.py +++ b/src/jarabe/model/shell.py @@ -210,6 +210,13 @@ class Activity(gobject.GObject): else: return self._activity_info.get_path() + def get_activity_name(self): + """Returns the activity's bundle name""" + if self._activity_info is None: + return None + else: + return self._activity_info.get_name() + def equals(self, activity): if self._activity_id and activity.get_activity_id(): return self._activity_id == activity.get_activity_id() diff --git a/src/jarabe/view/palettes.py b/src/jarabe/view/palettes.py index c7c56ff..2beceff 100644 --- a/src/jarabe/view/palettes.py +++ b/src/jarabe/view/palettes.py @@ -59,7 +59,10 @@ class CurrentActivityPalette(BasePalette): BasePalette.__init__(self, home_activity) def setup_palette(self): - self.set_primary_text(self._home_activity.get_title()) + self.props.primary_text = self._home_activity.get_activity_name() + + if self._home_activity.get_title() != self.props.primary_text: + self.props.secondary_text = self._home_activity.get_title() menu_item = MenuItem(_('Resume'), 'activity-start') menu_item.connect('activate', self.__resume_activate_cb) |