diff options
author | Marco Pesenti Gritti <mpg@redhat.com> | 2007-10-13 22:25:53 (GMT) |
---|---|---|
committer | Marco Pesenti Gritti <mpg@redhat.com> | 2007-10-13 22:25:53 (GMT) |
commit | 29bc0a8a20366f0bcea3b8f41433b5135dc77776 (patch) | |
tree | 3e257557645442c51a1205bdc2217d0048928675 /shell | |
parent | e39232a6225b60480ecdaacb639fc81a3a796e06 (diff) |
Fix native applications handling
Diffstat (limited to 'shell')
-rw-r--r-- | shell/kbdconfig | 1 | ||||
-rw-r--r-- | shell/model/homeactivity.py | 9 | ||||
-rwxr-xr-x | shell/view/home/activitiesdonut.py | 13 |
3 files changed, 16 insertions, 7 deletions
diff --git a/shell/kbdconfig b/shell/kbdconfig index 415c69f..073ac80 100644 --- a/shell/kbdconfig +++ b/shell/kbdconfig @@ -5,3 +5,4 @@ <Alt>n=next <Alt>p=prev <Alt>c=close +<Alt>f=fullscreen diff --git a/shell/model/homeactivity.py b/shell/model/homeactivity.py index 72b661b..7365271 100644 --- a/shell/model/homeactivity.py +++ b/shell/model/homeactivity.py @@ -96,14 +96,17 @@ class HomeActivity(gobject.GObject): def get_title(self): """Retrieve the application's root window's suggested title""" - return self._window.get_name() + if self._window: + return self._window.get_name() + else: + return '' - def get_icon_name(self): + def get_icon_path(self): """Retrieve the activity's icon (file) name""" if self._activity_info: return self._activity_info.icon else: - return 'image-missing' + return None def get_icon_color(self): """Retrieve the appropriate icon colour for this activity diff --git a/shell/view/home/activitiesdonut.py b/shell/view/home/activitiesdonut.py index 6ae86bf..e2e7d36 100755 --- a/shell/view/home/activitiesdonut.py +++ b/shell/view/home/activitiesdonut.py @@ -65,7 +65,6 @@ class ActivityIcon(CanvasIcon): } def __init__(self, activity): - icon_name = activity.get_icon_name() self._orig_color = activity.get_icon_color() self._icon_colors = self._compute_icon_colors() @@ -74,8 +73,14 @@ class ActivityIcon(CanvasIcon): self._level = self._level_max color = self._icon_colors[self._level] - CanvasIcon.__init__(self, file_name=icon_name, xo_color=color, - size=style.MEDIUM_ICON_SIZE, cache=True) + CanvasIcon.__init__(self, xo_color=color, cache=True, + size=style.MEDIUM_ICON_SIZE) + + icon_path = activity.get_icon_path() + if icon_path: + self.props.file_name = icon_path + else: + self.props.icon_name = 'image-missing' self._activity = activity self._pulse_id = 0 @@ -85,9 +90,9 @@ class ActivityIcon(CanvasIcon): palette = Palette(_('Starting...')) self.set_palette(palette) - activity.connect('notify::launching', self._launching_changed_cb) if activity.props.launching: self._start_pulsing() + activity.connect('notify::launching', self._launching_changed_cb) else: self._setup_palette() |