Ticket #1447: 0001-Display-error-message-when-activity-fails-to-launch.patch

src/jarabe/model/shell.py

@@ -572 +572 @@
                 home_activity.get_type())
             home_activity.props.launching = False
             self._remove_activity(home_activity)
+            self.emit('launch-failed', home_activity)
         else:
             logging.error('Model for activity id %s does not exist.',
                 activity_id)
 
-        self.emit('launch-failed', home_activity)
-
+    def notify_activity_ended(self, activity_id):
+        home_activity = self.get_activity_by_id(activity_id)
+        if home_activity:
+            if home_activity.props.launching:
+                logging.debug('Activity %s (%s) ended while still launching, '\
+                              'assuming it failed.', activity_id,
+                              home_activity.get_type())
+                self.notify_launch_failed(activity_id)
+            else:
+                logging.debug("Activity %s ended", activity_id) 
+                self._remove_activity(home_activity)
+        else:
+            # The activity may have already been removed when its window closed.
+            pass
+    
     def _check_activity_launched(self, activity_id):
         home_activity = self.get_activity_by_id(activity_id)
 

src/jarabe/view/launcher.py

@@ -15 +15 @@
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 import logging
+from gettext import gettext as _
 
 import gtk
 import hippo
 import gobject
 
 from sugar import wm
+from sugar.presence import presenceservice
 from sugar.graphics import style
 from sugar.graphics import animator
 from sugar.graphics.xocolor import XoColor
+from sugar.graphics.icon import Icon
 
 from jarabe.model import shell
 from jarabe.view.pulsingicon import CanvasPulsingIcon
@@ -66 +69 @@
     def __size_changed_cb(self, screen):
         self._update_size()
 
+    def show_failed(self, home_activity):
+        self._box.show_failed(home_activity)
+
 class LaunchBox(hippo.CanvasBox):
     def __init__(self, activity_id, icon_path, icon_color):
         gobject.GObject.__init__(self, orientation=hippo.ORIENTATION_VERTICAL)
 
+        self.props.spacing = style.DEFAULT_SPACING
+        self.props.yalign = hippo.ALIGNMENT_CENTER
+
         self._activity_id = activity_id
         self._activity_icon = CanvasPulsingIcon(
             file_name=icon_path,
             pulse_color=icon_color,
             background_color=style.COLOR_WHITE.get_gdk_color())
-        self.append(self._activity_icon, hippo.PACK_EXPAND)
+        self.append(self._activity_icon)
 
         # FIXME support non-xo colors in CanvasPulsingIcon
         self._activity_icon.props.base_color = \
@@ -110 +119 @@
         else:
             self._activity_icon.props.paused = True
 
+    def show_failed(self, home_activity):
+        logging.debug("Displaying failure message on launcher")
+
+        self._activity_icon.props.pulsing = False
+        self._animator.stop()
+
+        text = hippo.CanvasText(text=_('%s failed to start.') % \
+                                home_activity.get_activity_name(),
+                                xalign=hippo.ALIGNMENT_CENTER,
+                                font_desc=style.FONT_BOLD.get_pango_desc(),
+                                color = style.COLOR_BUTTON_GREY.get_int())
+        self.append(text)
+
+        button = gtk.Button(label=_('Close'))
+        button.connect('clicked', self.__close_button_clicked_cb, home_activity)
+        button.props.image = Icon(icon_name='dialog-cancel',
+                                  icon_size=gtk.ICON_SIZE_BUTTON)
+        canvas_button = hippo.CanvasWidget(widget=button,
+                                           xalign=hippo.ALIGNMENT_CENTER)
+        self.append(canvas_button)
+
+    def __close_button_clicked_cb(self, button, home_activity):
+        _destroy_launcher(home_activity)
+
 class _Animation(animator.Animation):
     def __init__(self, icon, start_size, end_size):
         animator.Animation.__init__(self, 0.0, 1.0)
@@ -131 +164 @@
     model.connect('launch-completed', __launch_completed_cb)
 
 def add_launcher(activity_id, icon_path, icon_color):
-
     if activity_id in _launchers:
         return
 
@@ -145 +177 @@
                  home_activity.get_icon_color())
 
 def __launch_failed_cb(home_model, home_activity):
-    _destroy_launcher(home_activity)
+    activity_id = home_activity.get_activity_id()
+
+    if activity_id in _launchers:
+        _launchers[activity_id].show_failed(home_activity)
+    else:
+        logging.error('Launcher for %s is missing', activity_id)
 
 def __launch_completed_cb(home_model, home_activity):
     _destroy_launcher(home_activity)

src/jarabe/view/service.py

@@ -98 +98 @@
     def NotifyLaunchFailure(self, activity_id):
         shell.get_model().notify_launch_failed(activity_id)
 
+    @dbus.service.method(_DBUS_SHELL_IFACE,
+                         in_signature="s", out_signature="")
+    def NotifyActivityEnded(self, activity_id):
+        shell.get_model().notify_activity_ended(activity_id)
+
     @dbus.service.signal(_DBUS_OWNER_IFACE, signature="s")
     def ColorChanged(self, color):
         pass