sugarlabs/sugar-toolkit-gtk3
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' of git+ssh://dev.laptop.org/git/sugar

Browse Source
This commit is contained in:
Marco Pesenti Gritti 2007-06-13 14:39:33 +02:00
commit 396fcb392c
5 changed files with 24 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
bin/sugar-activity
View File

@ -20,7 +20,7 @@ import sys
import os import os
from ConfigParser import ConfigParser from ConfigParser import ConfigParser
from sugar.activity import ActivityRegistry from sugar import activity
from sugar import env from sugar import env
# Setup the environment so that we run inside the Sugar shell # Setup the environment so that we run inside the Sugar shell
@ -51,8 +51,7 @@ def print_help(self):
activity_info = None activity_info = None
if len(sys.argv) > 1: if len(sys.argv) > 1:
registry = ActivityRegistry() activities = activity.get_registry().find_activity(sys.argv[1])
activities = registry.find_activity(sys.argv[1])
if len(activities) > 0: if len(activities) > 0:
activity_info = activities[0] activity_info = activities[0]

4
sugar/activity/__init__.py
View File

@ -36,4 +36,6 @@ class. This class allows for querying the ID of the root
window, requesting sharing across the network, and basic window, requesting sharing across the network, and basic
"what type of application are you" queries. "what type of application are you" queries.
""" """
from sugar.activity.registry import ActivityRegistry
from sugar.activity.registry import get_registry
from sugar.activity.registry import ActivityInfo

5
sugar/activity/registry.py
View File

@ -58,7 +58,10 @@ class ActivityRegistry(object):
info_list = self._registry.GetActivitiesForType(mime_type) info_list = self._registry.GetActivitiesForType(mime_type)
return self._convert_info_list(info_list) return self._convert_info_list(info_list)
_registry = ActivityRegistry() _registry = None
def get_registry(): def get_registry():
global _registry
if not _registry:
_registry = ActivityRegistry()
return _registry return _registry

21
sugar/graphics/combobox.py
View File

@ -1,18 +1,19 @@
# Copyright (C) 2007, One Laptop Per Child # Copyright (C) 2007, One Laptop Per Child
# #
# This program is free software; you can redistribute it and/or modify # This library is free software; you can redistribute it and/or
# it under the terms of the GNU General Public License as published by # modify it under the terms of the GNU Lesser General Public
# the Free Software Foundation; either version 2 of the License, or # License as published by the Free Software Foundation; either
# (at your option) any later version. # version 2 of the License, or (at your option) any later version.
# #
# This program is distributed in the hope that it will be useful, # This library is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of # but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
# GNU General Public License for more details. # Lesser General Public License for more details.
# #
# You should have received a copy of the GNU General Public License # You should have received a copy of the GNU Lesser General Public
# along with this program; if not, write to the Free Software # License along with this library; if not, write to the
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA # Free Software Foundation, Inc., 59 Temple Place - Suite 330,
# Boston, MA 02111-1307, USA.
import sys import sys
import logging import logging

5
sugar/objects/objecttype.py
View File

@ -49,7 +49,10 @@ class ObjectTypeRegistry(object):
type_dict = self._registry.GetTypeForMIME(mime_type) type_dict = self._registry.GetTypeForMIME(mime_type)
return _object_type_from_dict(type_dict) return _object_type_from_dict(type_dict)
_registry = ObjectTypeRegistry() _registry = None
def get_registry(): def get_registry():
global _registry
if not _registry:
_registry = ObjectTypeRegistry()
return _registry return _registry