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

Updated to use application/vnd.olpc-sugar instead of application/vnd.olpc-x-sugar.

Browse Source
This commit is contained in:
Tomeu Vizoso 2007-08-21 16:59:32 +02:00
parent 3df75e4c6e
commit 544a400afc
3 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
shell/view/clipboardicon.py
View File

@ -54,7 +54,7 @@ class ClipboardIcon(CanvasIcon):
self.palette = ClipboardMenu(self._object_id, self._name, self._percent, self.palette = ClipboardMenu(self._object_id, self._name, self._percent,
self._preview, self._activity, self._preview, self._activity,
formats and formats[0] == 'application/vnd.olpc-x-sugar') formats and formats[0] == 'application/vnd.olpc-sugar')
def do_set_property(self, pspec, value): def do_set_property(self, pspec, value):
if pspec.name == 'selected': if pspec.name == 'selected':
@ -80,7 +80,7 @@ class ClipboardIcon(CanvasIcon):
def set_state(self, name, percent, icon_name, preview, activity): def set_state(self, name, percent, icon_name, preview, activity):
cb_service = clipboardservice.get_instance() cb_service = clipboardservice.get_instance()
obj = cb_service.get_object(self._object_id) obj = cb_service.get_object(self._object_id)
if obj['FORMATS'] and obj['FORMATS'][0] == 'application/vnd.olpc-x-sugar': if obj['FORMATS'] and obj['FORMATS'][0] == 'application/vnd.olpc-sugar':
installable = True installable = True
else: else:
installable = False installable = False
@ -88,7 +88,7 @@ class ClipboardIcon(CanvasIcon):
if icon_name: if icon_name:
self.props.icon_name = icon_name self.props.icon_name = icon_name
else: else:
self.props.icon_name = 'theme:unknown-object' self.props.icon_name = 'theme:application-octet-stream'
self._name = name self._name = name
self._percent = percent self._percent = percent

3
sugar/datastore/datastore.py
View File

@ -116,7 +116,8 @@ class DSObject(object):
return activities return activities
def is_bundle(self): def is_bundle(self):
return self.metadata['mime_type'] == 'application/vnd.olpc-x-sugar' return self.metadata['mime_type'] in ['application/vnd.olpc-x-sugar',
'application/vnd.olpc-sugar']
def resume(self, service_name=None): def resume(self, service_name=None):
if self.is_bundle(): if self.is_bundle():

5
sugar/graphics/objectchooser.py
View File

@ -133,7 +133,7 @@ class CollapsedEntry(CanvasRoundBox):
if self._icon_name: if self._icon_name:
return self._icon_name return self._icon_name
if self._is_bundle(): if self.jobject.is_bundle():
bundle = Bundle(self.jobject.file_path) bundle = Bundle(self.jobject.file_path)
self._icon_name = bundle.get_icon() self._icon_name = bundle.get_icon()
@ -159,9 +159,6 @@ class CollapsedEntry(CanvasRoundBox):
ti = time.strptime(self.jobject.metadata['mtime'], "%Y-%m-%dT%H:%M:%S") ti = time.strptime(self.jobject.metadata['mtime'], "%Y-%m-%dT%H:%M:%S")
return str(Date(time.mktime(ti))) return str(Date(time.mktime(ti)))
def _is_bundle(self):
return self.jobject.metadata['mime_type'] == 'application/vnd.olpc-x-sugar'
def _format_title(self): def _format_title(self):
return '"%s"' % self.jobject.metadata['title'] return '"%s"' % self.jobject.metadata['title']