Ticket #611: sugar-611.patch

src/jarabe/journal/palettes.py

@@ -31 +31 @@
 from jarabe.model import bundleregistry
 from jarabe.model import friends
 from jarabe.model import filetransfer
+from jarabe.model import mimeregistry
 from jarabe.journal import misc
 from jarabe.journal import model
 
@@ -217 +218 @@
             menu_item.show()
 
     def __item_activate_cb(self, menu_item, service_name):
+        mime_type = self._metadata.get('mime_type', '')
+        if mime_type:
+            mime = mimeregistry.get_registry()
+            mime.set_default_activity(mime_type, service_name)
         misc.resume(self._metadata, service_name)
 
 

src/jarabe/model/bundleregistry.py

@@ -31 +31 @@
 from sugar import env
 
 from jarabe import config
+from jarabe.model import mimeregistry
 
 class BundleRegistry(gobject.GObject):
     """Tracks the available activity bundles"""
@@ -244 +245 @@
 
     def get_activities_for_type(self, mime_type):
         result = []
+
+        mime = mimeregistry.get_registry()
+        default_bundle_id = mime.get_default_activity(mime_type)
+        default_bundle = None
+
         for bundle in self._bundles:
             if bundle.get_mime_types() and mime_type in bundle.get_mime_types():
-                if self.get_default_for_type(mime_type) == \
+
+                if bundle.get_bundle_id() == default_bundle_id:
+                    default_bundle = bundle
+                elif self.get_default_for_type(mime_type) == \
                         bundle.get_bundle_id():
                     result.insert(0, bundle)
                 else:
                     result.append(bundle)
+
+        if default_bundle is not None:
+            result.insert(0, default_bundle)
+
         return result
 
     def get_default_for_type(self, mime_type):

(a) /dev/null vs. (b) b/src/jarabe/model/mimeregistry.py

@@ +1 @@
+# Copyright (C) 2009 Aleksey Lim
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+
+import gconf
+
+
+_DEFAULTS_KEY = '/desktop/sugar/journal/defaults'
+_instance = None
+
+
+class MimeRegistry(object):
+
+    def __init__(self):
+        # TODO move here all mime_type related code from jarabe modules
+        self._gconf = gconf.client_get_default()
+
+    def get_default_activity(self, mime_type):
+        return self._gconf.get_string(_DEFAULTS_KEY + '/' + mime_type)
+
+    def set_default_activity(self, mime_type, bundle_id):
+        self._gconf.set_string(_DEFAULTS_KEY + '/' + mime_type, bundle_id)
+
+
+def get_registry():
+    global _instance
+    if _instance is None:
+        _instance = MimeRegistry()
+    return _instance