Merge branch 'master' of git+ssh://dev.laptop.org/git/sugar
This commit is contained in:
commit
823918a69b
@ -30,27 +30,27 @@ class ObjectTypeRegistry(dbus.service.Object):
|
|||||||
|
|
||||||
self._types = {}
|
self._types = {}
|
||||||
|
|
||||||
self._add_primitive('Text', _('Text'), 'theme:text-x-generic',
|
self._add_primitive('Text', _('Text'), 'text-x-generic',
|
||||||
['text/plain', 'text/rtf', 'application/pdf',
|
['text/plain', 'text/rtf', 'application/pdf',
|
||||||
'application/x-pdf', 'text/html',
|
'application/x-pdf', 'text/html',
|
||||||
'application/vnd.oasis.opendocument.text',
|
'application/vnd.oasis.opendocument.text',
|
||||||
'application/rtf', 'text/rtf'])
|
'application/rtf', 'text/rtf'])
|
||||||
|
|
||||||
self._add_primitive('Image', _('Image'), 'theme:image-x-generic',
|
self._add_primitive('Image', _('Image'), 'image-x-generic',
|
||||||
['image/png', 'image/gif', 'image/jpeg'])
|
['image/png', 'image/gif', 'image/jpeg'])
|
||||||
|
|
||||||
self._add_primitive('Audio', _('Audio'), 'theme:audio-x-generic',
|
self._add_primitive('Audio', _('Audio'), 'audio-x-generic',
|
||||||
['audio/ogg'])
|
['audio/ogg'])
|
||||||
|
|
||||||
self._add_primitive('Video', _('Video'), 'theme:video-x-generic',
|
self._add_primitive('Video', _('Video'), 'video-x-generic',
|
||||||
['video/ogg', 'application/ogg'])
|
['video/ogg', 'application/ogg'])
|
||||||
|
|
||||||
self._add_primitive('Etoys project', _('Etoys project'),
|
self._add_primitive('Etoys project', _('Etoys project'),
|
||||||
'theme:application-x-squeak-project',
|
'application-x-squeak-project',
|
||||||
['application/x-squeak-project'])
|
['application/x-squeak-project'])
|
||||||
|
|
||||||
self._add_primitive('Link', _('Link'),
|
self._add_primitive('Link', _('Link'),
|
||||||
'theme:text-uri-list',
|
'text-uri-list',
|
||||||
['text/x-moz-url', 'text/uri-list'])
|
['text/x-moz-url', 'text/uri-list'])
|
||||||
|
|
||||||
def _add_primitive(self, type_id, name, icon, mime_types):
|
def _add_primitive(self, type_id, name, icon, mime_types):
|
||||||
|
@ -103,7 +103,7 @@ class HomeActivity(gobject.GObject):
|
|||||||
if self._activity_info:
|
if self._activity_info:
|
||||||
return self._activity_info.icon
|
return self._activity_info.icon
|
||||||
else:
|
else:
|
||||||
return 'theme:image-missing'
|
return 'image-missing'
|
||||||
|
|
||||||
def get_icon_color(self):
|
def get_icon_color(self):
|
||||||
"""Retrieve the appropriate icon colour for this activity
|
"""Retrieve the appropriate icon colour for this activity
|
||||||
|
@ -24,7 +24,7 @@ class OverlayBox(hippo.CanvasBox):
|
|||||||
|
|
||||||
self._shell = shell
|
self._shell = shell
|
||||||
|
|
||||||
icon = IconButton(icon_name='theme:stock-chat')
|
icon = IconButton(icon_name='stock-chat')
|
||||||
icon.connect('activated', self._overlay_clicked_cb)
|
icon.connect('activated', self._overlay_clicked_cb)
|
||||||
self.append(icon)
|
self.append(icon)
|
||||||
|
|
||||||
|
@ -317,7 +317,7 @@ class ActivitiesDonut(hippo.CanvasBox, hippo.CanvasItem):
|
|||||||
|
|
||||||
try:
|
try:
|
||||||
smaps = ProcSmaps(pid)
|
smaps = ProcSmaps(pid)
|
||||||
_subtract_mappings(smaps, shell_mappings)
|
self._subtract_mappings(smaps, shell_mappings)
|
||||||
for mapping in smaps.mappings:
|
for mapping in smaps.mappings:
|
||||||
if mapping.shared_clean > 0 or mapping.shared_dirty > 0:
|
if mapping.shared_clean > 0 or mapping.shared_dirty > 0:
|
||||||
if num_mappings.has_key(mapping.name):
|
if num_mappings.has_key(mapping.name):
|
||||||
@ -408,7 +408,7 @@ class ActivitiesDonut(hippo.CanvasBox, hippo.CanvasItem):
|
|||||||
if icon.size > _MIN_WEDGE_SIZE:
|
if icon.size > _MIN_WEDGE_SIZE:
|
||||||
icon.size -= (icon.size - _MIN_WEDGE_SIZE) * reduction
|
icon.size -= (icon.size - _MIN_WEDGE_SIZE) * reduction
|
||||||
|
|
||||||
def _subtract_mappings(smaps, mappings_to_remove):
|
def _subtract_mappings(self, smaps, mappings_to_remove):
|
||||||
for mapping in smaps.mappings:
|
for mapping in smaps.mappings:
|
||||||
if mappings_to_remove.has_key(mapping.name):
|
if mappings_to_remove.has_key(mapping.name):
|
||||||
mapping.shared_clean = 0
|
mapping.shared_clean = 0
|
||||||
|
@ -75,9 +75,9 @@ class ActivityToolbar(gtk.Toolbar):
|
|||||||
self.share = ToolComboBox(label_text='Share with:')
|
self.share = ToolComboBox(label_text='Share with:')
|
||||||
self.share.combo.connect('changed', self._share_changed_cb)
|
self.share.combo.connect('changed', self._share_changed_cb)
|
||||||
self.share.combo.append_item(None, _('Private'),
|
self.share.combo.append_item(None, _('Private'),
|
||||||
'theme:zoom-home-mini')
|
'zoom-home-mini')
|
||||||
self.share.combo.append_item(None, _('My Neighborhood'),
|
self.share.combo.append_item(None, _('My Neighborhood'),
|
||||||
'theme:zoom-neighborhood-mini')
|
'zoom-neighborhood-mini')
|
||||||
self.insert(self.share, -1)
|
self.insert(self.share, -1)
|
||||||
self.share.show()
|
self.share.show()
|
||||||
|
|
||||||
|
@ -25,7 +25,7 @@ class CanvasButton(hippo.CanvasButton):
|
|||||||
hippo.CanvasButton.__init__(self, text=label)
|
hippo.CanvasButton.__init__(self, text=label)
|
||||||
|
|
||||||
if icon_name:
|
if icon_name:
|
||||||
icon = Icon(icon_name,icon_size=gtk.ICON_SIZE_BUTTON)
|
icon = Icon(icon_name=icon_name, icon_size=gtk.ICON_SIZE_BUTTON)
|
||||||
self.props.widget.set_image(icon)
|
self.props.widget.set_image(icon)
|
||||||
icon.show()
|
icon.show()
|
||||||
|
|
||||||
|
@ -61,8 +61,8 @@ class ComboBox(gtk.ComboBox):
|
|||||||
del info
|
del info
|
||||||
return fname
|
return fname
|
||||||
|
|
||||||
def append_item(self, action_id, text, icon_name=None):
|
def append_item(self, action_id, text, icon_name=None, file_name=None):
|
||||||
if not self._icon_renderer and icon_name:
|
if not self._icon_renderer and (icon_name or file_name):
|
||||||
self._icon_renderer = gtk.CellRendererPixbuf()
|
self._icon_renderer = gtk.CellRendererPixbuf()
|
||||||
|
|
||||||
settings = self.get_settings()
|
settings = self.get_settings()
|
||||||
@ -77,16 +77,17 @@ class ComboBox(gtk.ComboBox):
|
|||||||
self.pack_end(self._text_renderer, True)
|
self.pack_end(self._text_renderer, True)
|
||||||
self.add_attribute(self._text_renderer, 'text', 1)
|
self.add_attribute(self._text_renderer, 'text', 1)
|
||||||
|
|
||||||
if icon_name:
|
if icon_name or file_name:
|
||||||
if text:
|
if text:
|
||||||
size = gtk.ICON_SIZE_MENU
|
size = gtk.ICON_SIZE_MENU
|
||||||
else:
|
else:
|
||||||
size = gtk.ICON_SIZE_LARGE_TOOLBAR
|
size = gtk.ICON_SIZE_LARGE_TOOLBAR
|
||||||
|
|
||||||
width, height = gtk.icon_size_lookup(size)
|
width, height = gtk.icon_size_lookup(size)
|
||||||
if icon_name[0:6] == "theme:":
|
|
||||||
icon_name = self._get_real_name_from_theme(icon_name[6:], size)
|
if icon_name:
|
||||||
pixbuf = gtk.gdk.pixbuf_new_from_file_at_size(icon_name, width, height)
|
file_name = self._get_real_name_from_theme(icon_name[6:], size)
|
||||||
|
|
||||||
|
pixbuf = gtk.gdk.pixbuf_new_from_file_at_size(file_name, width, height)
|
||||||
else:
|
else:
|
||||||
pixbuf = None
|
pixbuf = None
|
||||||
|
|
||||||
|
@ -182,6 +182,8 @@ class _IconBuffer(object):
|
|||||||
icon_info.file_name = info.get_filename()
|
icon_info.file_name = info.get_filename()
|
||||||
icon_info.attach_x = attach_x
|
icon_info.attach_x = attach_x
|
||||||
icon_info.attach_y = attach_y
|
icon_info.attach_y = attach_y
|
||||||
|
else:
|
||||||
|
logging.warning('No icon with the name %s was found in the theme.' % self.icon_name)
|
||||||
|
|
||||||
return icon_info
|
return icon_info
|
||||||
|
|
||||||
@ -413,9 +415,13 @@ class CanvasIcon(hippo.CanvasBox, hippo.CanvasItem):
|
|||||||
self.props.fill_color = value.get_fill_color()
|
self.props.fill_color = value.get_fill_color()
|
||||||
self.props.stroke_color = value.get_stroke_color()
|
self.props.stroke_color = value.get_stroke_color()
|
||||||
elif pspec.name == 'fill-color':
|
elif pspec.name == 'fill-color':
|
||||||
|
if not isinstance(value, basestring) and value is not None:
|
||||||
|
raise TypeError('fill-color must be a string, not %r' % type(value))
|
||||||
self._buffer.fill_color = value
|
self._buffer.fill_color = value
|
||||||
self.emit_paint_needed(0, 0, -1, -1)
|
self.emit_paint_needed(0, 0, -1, -1)
|
||||||
elif pspec.name == 'stroke-color':
|
elif pspec.name == 'stroke-color':
|
||||||
|
if not isinstance(value, basestring) and value is not None:
|
||||||
|
raise TypeError('stroke-color must be a string, not %r' % type(value))
|
||||||
self._buffer.stroke_color = value
|
self._buffer.stroke_color = value
|
||||||
self.emit_paint_needed(0, 0, -1, -1)
|
self.emit_paint_needed(0, 0, -1, -1)
|
||||||
elif pspec.name == 'size':
|
elif pspec.name == 'size':
|
||||||
|
@ -150,7 +150,7 @@ class CollapsedEntry(CanvasRoundBox):
|
|||||||
self._icon_name = type.icon
|
self._icon_name = type.icon
|
||||||
|
|
||||||
if not self._icon_name:
|
if not self._icon_name:
|
||||||
self._icon_name = 'theme:image-missing'
|
self._icon_name = 'image-missing'
|
||||||
|
|
||||||
return self._icon_name
|
return self._icon_name
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user