[Sugar-devel] [PATCH] Disable Start menu item for entries that can't be opened(Bug#328)

James Cameron quozl at laptop.org
Thu Oct 14 19:25:18 EDT 2010


On Thu, Oct 14, 2010 at 11:32:34PM +0530, Mukul Gupta wrote:
> The patch disables the Start and Start With menu items for files
> which can't be opened by any installed activity and instead
> replace it with a hover dropdown with a menu item 'No activity
> installed to start entry'

The patch added four trailing whitespace errors, according to "git am"
... which is where there are space or tab characters at the end of the
line.  I use an editor which shows them.

The patch also changed spaces to tabs, for the affected area.  Once I
removed them and regenerated the diff, I understood the change better.

diff --git a/src/jarabe/journal/palettes.py b/src/jarabe/journal/palettes.py
index 7c3e5ff..14024fd 100644
--- a/src/jarabe/journal/palettes.py
+++ b/src/jarabe/journal/palettes.py
@@ -62,22 +62,30 @@ class ObjectPalette(Palette):
         Palette.__init__(self, primary_text=title,
                          icon=activity_icon)
 
-        if metadata.get('activity_id', ''):
-            resume_label = _('Resume')
-            resume_with_label = _('Resume with')
-        else:
-            resume_label = _('Start')
-            resume_with_label = _('Start with')
-        menu_item = MenuItem(resume_label, 'activity-start')
-        menu_item.connect('activate', self.__start_activate_cb)
-        self.menu.append(menu_item)
-        menu_item.show()
+        if misc.get_activities(metadata):
+            if metadata.get('activity_id', ''):
+                resume_label = _('Resume')
+                resume_with_label = _('Resume with')
+            else:
+                resume_label = _('Start')
+                resume_with_label = _('Start with')
+            menu_item = MenuItem(resume_label, 'activity-start')
+            menu_item.connect('activate', self.__start_activate_cb)
+            self.menu.append(menu_item)
+            menu_item.show()
 
-        menu_item = MenuItem(resume_with_label, 'activity-start')
-        self.menu.append(menu_item)
-        menu_item.show()
-        start_with_menu = StartWithMenu(self._metadata)
-        menu_item.set_submenu(start_with_menu)
+            menu_item = MenuItem(resume_with_label, 'activity-start')
+            self.menu.append(menu_item)
+            menu_item.show()
+            start_with_menu = StartWithMenu(self._metadata)
+            menu_item.set_submenu(start_with_menu)
+
+        else:
+            resume_label = _('No activity installed to start entry')
+            menu_item = MenuItem(resume_label)
+            menu_item.set_sensitive(False)
+            self.menu.append(menu_item)
+            menu_item.show()
 
         client = gconf.client_get_default()
         color = XoColor(client.get_string('/desktop/sugar/user/color'))
-- 
James Cameron
http://quozl.linux.org.au/


More information about the Sugar-devel mailing list