Reorganize canvas items.
This commit is contained in:
		
							parent
							
								
									2cae66b0ea
								
							
						
					
					
						commit
						f1d588452e
					
				| @ -16,7 +16,7 @@ | ||||
| 
 | ||||
| import hippo | ||||
| 
 | ||||
| from sugar.graphics.canvasicon import CanvasIcon | ||||
| from sugar.graphics.icon import CanvasIcon | ||||
| from sugar.graphics import style | ||||
| from sugar.graphics.xocolor import XoColor | ||||
| 
 | ||||
|  | ||||
| @ -26,8 +26,8 @@ import logging | ||||
| 
 | ||||
| from sugar import env | ||||
| from sugar.graphics import style | ||||
| from sugar.graphics.canvasbutton import CanvasButton | ||||
| from sugar.graphics.canvasentry import CanvasEntry | ||||
| from sugar.graphics.button import CanvasButton | ||||
| from sugar.graphics.entry import CanvasEntry | ||||
| 
 | ||||
| import colorpicker | ||||
| 
 | ||||
|  | ||||
| @ -14,7 +14,7 @@ | ||||
| # along with this program; if not, write to the Free Software | ||||
| # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA | ||||
| 
 | ||||
| from sugar.graphics.canvasicon import CanvasIcon | ||||
| from sugar.graphics.icon import CanvasIcon | ||||
| from sugar.graphics.palette import Palette | ||||
| from view.BuddyMenu import BuddyMenu | ||||
| 
 | ||||
|  | ||||
| @ -20,7 +20,7 @@ from gettext import gettext as _ | ||||
| 
 | ||||
| import gobject | ||||
| 
 | ||||
| from sugar.graphics.canvasicon import CanvasIcon | ||||
| from sugar.graphics.icon import CanvasIcon | ||||
| from view.clipboardmenu import ClipboardMenu | ||||
| from sugar.graphics.xocolor import XoColor | ||||
| from sugar.graphics import style | ||||
|  | ||||
| @ -17,7 +17,8 @@ | ||||
| import gtk | ||||
| 
 | ||||
| from gettext import gettext as _ | ||||
| from sugar.graphics import canvasicon | ||||
| from sugar.graphics.icon import CanvasIcon | ||||
| from sugar.graphics.icon import get_icon_state | ||||
| from sugar.graphics import style | ||||
| from sugar.graphics.palette import Palette | ||||
| 
 | ||||
| @ -27,9 +28,9 @@ _STATUS_CHARGING = 0 | ||||
| _STATUS_DISCHARGING = 1 | ||||
| _STATUS_FULLY_CHARGED = 2 | ||||
| 
 | ||||
| class DeviceView(canvasicon.CanvasIcon): | ||||
| class DeviceView(CanvasIcon): | ||||
|     def __init__(self, model): | ||||
|         canvasicon.CanvasIcon.__init__(self, size=style.MEDIUM_ICON_SIZE) | ||||
|         CanvasIcon.__init__(self, size=style.MEDIUM_ICON_SIZE) | ||||
|         self._model = model | ||||
|         self._palette = BatteryPalette(_('My Battery life')) | ||||
|         self.set_palette(self._palette) | ||||
| @ -40,8 +41,8 @@ class DeviceView(canvasicon.CanvasIcon): | ||||
|         self._update_info() | ||||
| 
 | ||||
|     def _update_info(self): | ||||
|         self.props.icon_name = canvasicon.get_icon_state( | ||||
|                                     _ICON_NAME, self._model.props.level) | ||||
|         name = get_icon_state(_ICON_NAME, self._model.props.level) | ||||
|         self.props.icon_name = name | ||||
| 
 | ||||
|         # Update palette | ||||
|         if self._model.props.charging: | ||||
|  | ||||
| @ -14,7 +14,7 @@ | ||||
| # along with this program; if not, write to the Free Software | ||||
| # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA | ||||
| 
 | ||||
| from sugar.graphics.canvasicon import CanvasIcon | ||||
| from sugar.graphics.icon import CanvasIcon | ||||
| 
 | ||||
| def create(model): | ||||
|     name = 'view.devices.' + model.get_type() | ||||
|  | ||||
| @ -15,11 +15,12 @@ | ||||
| # along with this program; if not, write to the Free Software | ||||
| # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA | ||||
| 
 | ||||
| from sugar.graphics import canvasicon | ||||
| from sugar.graphics.icon import get_icon_state | ||||
| from sugar.graphics.icon import CanvasIcon | ||||
| from sugar.graphics import style | ||||
| from sugar.graphics import style | ||||
| 
 | ||||
| from model.devices.network import wireless | ||||
| from sugar.graphics.canvasicon import CanvasIcon | ||||
| from model.devices import device | ||||
| 
 | ||||
| _ICON_NAME = 'network-wireless' | ||||
| @ -47,8 +48,7 @@ class DeviceView(CanvasIcon): | ||||
|         self._update_state() | ||||
| 
 | ||||
|     def _update_icon(self): | ||||
|         icon_name = canvasicon.get_icon_state( | ||||
|                     _ICON_NAME, self._model.props.strength) | ||||
|         icon_name = get_icon_state(_ICON_NAME, self._model.props.strength) | ||||
|         if icon_name: | ||||
|             self.props.icon_name = icon_name | ||||
| 
 | ||||
|  | ||||
| @ -17,7 +17,7 @@ | ||||
| import hippo | ||||
| 
 | ||||
| from sugar.graphics.palette import Palette | ||||
| from sugar.graphics.canvasicon import CanvasIcon | ||||
| from sugar.graphics.icon import CanvasIcon | ||||
| from sugar.graphics import style | ||||
| from sugar.presence import presenceservice | ||||
| 
 | ||||
|  | ||||
| @ -17,7 +17,7 @@ | ||||
| import hippo | ||||
| import gobject | ||||
| 
 | ||||
| from sugar.graphics.canvasicon import CanvasIcon | ||||
| from sugar.graphics.icon import CanvasIcon | ||||
| from sugar.graphics import style | ||||
| from sugar.presence import presenceservice | ||||
| from sugar import activity | ||||
|  | ||||
| @ -21,10 +21,10 @@ import gobject | ||||
| from gettext import gettext as _ | ||||
| 
 | ||||
| from sugar.graphics.spreadlayout import SpreadLayout | ||||
| from sugar.graphics.canvasicon import CanvasIcon | ||||
| from sugar.graphics.icon import CanvasIcon | ||||
| from sugar.graphics import style | ||||
| from sugar.graphics import xocolor | ||||
| from sugar.graphics import canvasicon | ||||
| from sugar.graphics.icon import get_icon_state | ||||
| from sugar.graphics import style | ||||
| from sugar import profile | ||||
| 
 | ||||
| @ -86,8 +86,7 @@ class AccessPointView(PulsingIcon): | ||||
|             self.set_tooltip(self._model.props.name) | ||||
| 
 | ||||
|     def _update_icon(self): | ||||
|         icon_name = canvasicon.get_icon_state( | ||||
|                     _ICON_NAME, self._model.props.strength) | ||||
|         icon_name = get_icon_state(_ICON_NAME, self._model.props.strength) | ||||
|         if icon_name: | ||||
|             self.props.icon_name = icon_name | ||||
| 
 | ||||
|  | ||||
| @ -14,7 +14,7 @@ | ||||
| # along with this program; if not, write to the Free Software | ||||
| # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA | ||||
| 
 | ||||
| from sugar.graphics.canvasicon import CanvasIcon | ||||
| from sugar.graphics.icon import CanvasIcon | ||||
| from sugar import profile | ||||
| 
 | ||||
| class MyIcon(CanvasIcon): | ||||
|  | ||||
| @ -24,7 +24,7 @@ import hippo | ||||
| import gobject | ||||
| import gtk | ||||
| 
 | ||||
| from sugar.graphics.canvasicon import CanvasIcon | ||||
| from sugar.graphics.icon import CanvasIcon | ||||
| from sugar.graphics.menuitem import MenuItem | ||||
| from sugar.graphics.palette import Palette | ||||
| from sugar.graphics import style | ||||
|  | ||||
| @ -16,7 +16,7 @@ | ||||
| 
 | ||||
| import gobject | ||||
| 
 | ||||
| from sugar.graphics.canvasicon import CanvasIcon | ||||
| from sugar.graphics.icon import CanvasIcon | ||||
| 
 | ||||
| class PulsingIcon(CanvasIcon): | ||||
|     __gproperties__ = { | ||||
|  | ||||
| @ -2,11 +2,9 @@ sugardir = $(pythondir)/sugar/graphics | ||||
| sugar_PYTHON =			\
 | ||||
| 	__init__.py		\
 | ||||
| 	animator.py		\
 | ||||
| 	canvasbutton.py		\
 | ||||
| 	canvasicon.py		\
 | ||||
| 	canvasentry.py		\
 | ||||
| 	canvasroundbox.py	\
 | ||||
| 	button.py		\
 | ||||
| 	combobox.py		\
 | ||||
| 	entry.py		\
 | ||||
| 	icon.py			\
 | ||||
| 	iconbutton.py          	\
 | ||||
| 	iconentry.py          	\
 | ||||
| @ -17,6 +15,7 @@ sugar_PYTHON =			\ | ||||
| 	palette.py		\
 | ||||
| 	palettegroup.py		\
 | ||||
| 	panel.py		\
 | ||||
| 	roundbox.py		\
 | ||||
| 	spreadlayout.py		\
 | ||||
| 	style.py		\
 | ||||
| 	toggletoolbutton.py	\
 | ||||
|  | ||||
| @ -16,11 +16,20 @@ | ||||
| # Boston, MA 02111-1307, USA. | ||||
| 
 | ||||
| import os | ||||
| import re | ||||
| import time | ||||
| import logging | ||||
| 
 | ||||
| import gobject | ||||
| import gtk | ||||
| import re | ||||
| import hippo | ||||
| import rsvg | ||||
| import cairo | ||||
| 
 | ||||
| from sugar.graphics.style import Color | ||||
| from sugar.graphics.xocolor import XoColor | ||||
| from sugar.graphics import style | ||||
| from sugar.graphics.palette import Palette, CanvasInvoker | ||||
| 
 | ||||
| class Icon(gtk.Image): | ||||
|     __gtype_name__ = 'SugarIcon' | ||||
| @ -152,3 +161,406 @@ class Icon(gtk.Image): | ||||
|             return self._stroke_color | ||||
|         else: | ||||
|             return gtk.Image.do_get_property(self, pspec) | ||||
| 
 | ||||
| _ICON_REQUEST_SIZE = 50 | ||||
| _BADGE_SIZE = 0.45 | ||||
| 
 | ||||
| class _IconCacheIcon: | ||||
|     def __init__(self, name, fill_color, stroke_color, now): | ||||
|         self.last_used = now | ||||
|         self.usage_count = 1 | ||||
|         self.badge_x = 1.0 - _BADGE_SIZE / 2 | ||||
|         self.badge_y = 1.0 - _BADGE_SIZE / 2 | ||||
| 
 | ||||
|         if name[0:6] == "theme:":  | ||||
|             info = gtk.icon_theme_get_default().lookup_icon( | ||||
|                 name[6:], _ICON_REQUEST_SIZE, 0) | ||||
|             if not info: | ||||
|                 raise ValueError("Icon '" + name + "' not found.") | ||||
| 
 | ||||
|             fname = info.get_filename() | ||||
|             attach_points = info.get_attach_points() | ||||
|             if attach_points is not None: | ||||
|                 self.badge_x = float(attach_points[0][0]) / _ICON_REQUEST_SIZE | ||||
|                 self.badge_y = float(attach_points[0][1]) / _ICON_REQUEST_SIZE | ||||
|             del info | ||||
|         else: | ||||
|             fname = name | ||||
| 
 | ||||
|         self.handle = self._read_icon_data(fname, fill_color, stroke_color) | ||||
| 
 | ||||
|     def _read_icon_data(self, filename, fill_color, stroke_color): | ||||
|         icon_file = open(filename, 'r') | ||||
|         data = icon_file.read() | ||||
|         icon_file.close() | ||||
| 
 | ||||
|         if fill_color: | ||||
|             entity = '<!ENTITY fill_color "%s">' % fill_color | ||||
|             data = re.sub('<!ENTITY fill_color .*>', entity, data) | ||||
| 
 | ||||
|         if stroke_color: | ||||
|             entity = '<!ENTITY stroke_color "%s">' % stroke_color | ||||
|             data = re.sub('<!ENTITY stroke_color .*>', entity, data) | ||||
| 
 | ||||
|         self.data_size = len(data) | ||||
|         return rsvg.Handle(data=data) | ||||
| 
 | ||||
| class _IconCache: | ||||
|     _CACHE_MAX = 50000   # in bytes | ||||
| 
 | ||||
|     def __init__(self): | ||||
|         self._icons = {} | ||||
|         self._cache_size = 0 | ||||
| 
 | ||||
|     def _cache_cleanup(self, key, now): | ||||
|         while self._cache_size > self._CACHE_MAX: | ||||
|             evict_key = None | ||||
|             oldest_key = None | ||||
|             oldest_time = now | ||||
|             for icon_key, icon in self._icons.items(): | ||||
|                 # Don't evict the icon we are about to use if it's in the cache | ||||
|                 if icon_key == key: | ||||
|                     continue | ||||
| 
 | ||||
|                 # evict large icons first | ||||
|                 if icon.data_size > self._CACHE_MAX: | ||||
|                     evict_key = icon_key | ||||
|                     break | ||||
|                 # evict older icons next; those used over 2 minutes ago | ||||
|                 if icon.last_used < now - 120: | ||||
|                     evict_key = icon_key | ||||
|                     break | ||||
|                 # otherwise, evict the oldest | ||||
|                 if oldest_time > icon.last_used: | ||||
|                     oldest_time = icon.last_used | ||||
|                     oldest_key = icon_key | ||||
| 
 | ||||
|             # If there's nothing specific to evict, try evicting | ||||
|             # the oldest thing | ||||
|             if not evict_key: | ||||
|                 if not oldest_key: | ||||
|                     break | ||||
|                 evict_key = oldest_key | ||||
| 
 | ||||
|             self._cache_size -= self._icons[evict_key].data_size | ||||
|             del self._icons[evict_key] | ||||
| 
 | ||||
|     def get_icon(self, name, fill_color, stroke_color): | ||||
|         if not name: | ||||
|             return None | ||||
| 
 | ||||
|         if fill_color or stroke_color: | ||||
|             key = (name, fill_color, stroke_color) | ||||
|         else: | ||||
|             key = name | ||||
| 
 | ||||
|         # If we're over the cache limit, evict something from the cache | ||||
|         now = time.time() | ||||
|         self._cache_cleanup(key, now) | ||||
| 
 | ||||
|         if self._icons.has_key(key): | ||||
|             icon = self._icons[key] | ||||
|             icon.usage_count += 1 | ||||
|             icon.last_used = now | ||||
|         else: | ||||
|             icon = _IconCacheIcon(name, fill_color, stroke_color, now) | ||||
|             self._icons[key] = icon | ||||
|             self._cache_size += icon.data_size | ||||
|         return icon | ||||
| 
 | ||||
| 
 | ||||
| class CanvasIcon(hippo.CanvasBox, hippo.CanvasItem): | ||||
|     __gtype_name__ = 'CanvasIcon' | ||||
| 
 | ||||
|     __gproperties__ = { | ||||
|         'icon-name'     : (str, None, None, None, | ||||
|                            gobject.PARAM_READWRITE), | ||||
|         'xo-color'      : (object, None, None, | ||||
|                            gobject.PARAM_WRITABLE), | ||||
|         'fill-color'    : (object, None, None, | ||||
|                            gobject.PARAM_READWRITE), | ||||
|         'stroke-color'  : (object, None, None, | ||||
|                            gobject.PARAM_READWRITE), | ||||
|         'size'          : (int, None, None, 0, 1024, 0, | ||||
|                            gobject.PARAM_READWRITE), | ||||
|         'scale'         : (int, None, None, 0, 1024, 0, | ||||
|                            gobject.PARAM_READWRITE), | ||||
|         'cache'         : (bool, None, None, False, | ||||
|                            gobject.PARAM_READWRITE), | ||||
|         'active'        : (bool, None, None, True, | ||||
|                            gobject.PARAM_READWRITE), | ||||
|         'badge-name'    : (str, None, None, None, | ||||
|                            gobject.PARAM_READWRITE) | ||||
|     } | ||||
| 
 | ||||
|     _cache = _IconCache() | ||||
| 
 | ||||
|     def __init__(self, **kwargs): | ||||
|         self._buffers = {} | ||||
|         self._cur_buffer = None | ||||
|         self._size = 0 | ||||
|         self._scale = 0 | ||||
|         self._fill_color = None | ||||
|         self._stroke_color = None | ||||
|         self._icon_name = None | ||||
|         self._cache = False | ||||
|         self._icon = None | ||||
|         self._active = True | ||||
|         self._palette = None | ||||
|         self._badge_name = None | ||||
|         self._badge_icon = None | ||||
| 
 | ||||
|         hippo.CanvasBox.__init__(self, **kwargs) | ||||
|          | ||||
|         self.connect_after('motion-notify-event', self._motion_notify_event_cb) | ||||
| 
 | ||||
|     def _clear_buffers(self): | ||||
|         icon_key = self._get_current_buffer_key(self._icon_name) | ||||
|         badge_key = None | ||||
|         if self._badge_name: | ||||
|             badge_key = self._get_current_buffer_key(self._badge_name) | ||||
|         for key in self._buffers.keys(): | ||||
|             if key != icon_key: | ||||
|                 if not badge_key or (key != badge_key): | ||||
|                     del self._buffers[key] | ||||
|         self._buffers = {} | ||||
| 
 | ||||
|     def do_set_property(self, pspec, value): | ||||
|         if pspec.name == 'icon-name': | ||||
|             if self._icon_name != value and not self._cache: | ||||
|                 self._clear_buffers() | ||||
|             self._icon_name = value | ||||
|             self._icon = None | ||||
|             self.emit_paint_needed(0, 0, -1, -1) | ||||
|         elif pspec.name == 'xo-color': | ||||
|             self.props.fill_color = style.Color(value.get_fill_color()) | ||||
|             self.props.stroke_color = style.Color(value.get_stroke_color()) | ||||
|         elif pspec.name == 'fill-color': | ||||
|             if self._fill_color != value: | ||||
|                 if not self._cache: | ||||
|                     self._clear_buffers() | ||||
|                 self._fill_color = value | ||||
|                 self._icon = None | ||||
|                 self._badge_icon = None | ||||
|                 self.emit_paint_needed(0, 0, -1, -1) | ||||
|         elif pspec.name == 'stroke-color': | ||||
|             if self._stroke_color != value: | ||||
|                 if not self._cache: | ||||
|                     self._clear_buffers() | ||||
|                 self._stroke_color = value | ||||
|                 self._icon = None | ||||
|                 self._badge_icon = None | ||||
|                 self.emit_paint_needed(0, 0, -1, -1) | ||||
|         elif pspec.name == 'size': | ||||
|             if self._size != value and not self._cache: | ||||
|                 self._clear_buffers() | ||||
|             self._size = value | ||||
|             self.emit_request_changed() | ||||
|         elif pspec.name == 'scale': | ||||
|             if self._scale != value and not self._cache: | ||||
|                 self._clear_buffers() | ||||
|             self._scale = value | ||||
|             self.emit_request_changed() | ||||
|         elif pspec.name == 'cache': | ||||
|             self._cache = value | ||||
|         elif pspec.name == 'active': | ||||
|             if self._active != value: | ||||
|                 if not self._cache: | ||||
|                     self._clear_buffers() | ||||
|                 self._active = value | ||||
|                 self._icon = None | ||||
|                 self.emit_paint_needed(0, 0, -1, -1) | ||||
|         elif pspec.name == 'badge-name': | ||||
|             if self._badge_name != value and not self._cache: | ||||
|                 self._clear_buffers() | ||||
|             self._badge_name = value | ||||
|             self._badge_icon = None | ||||
|             self.emit_paint_needed(0, 0, -1, -1) | ||||
| 
 | ||||
|     def _choose_colors(self): | ||||
|         fill_color = None | ||||
|         stroke_color = None | ||||
|         if self._active: | ||||
|             if self._fill_color: | ||||
|                 fill_color = self._fill_color.get_svg() | ||||
|             if self._stroke_color: | ||||
|                 stroke_color = self._stroke_color.get_svg() | ||||
|         else: | ||||
|             stroke_color = color.ICON_STROKE_INACTIVE.get_svg() | ||||
|             if self._fill_color: | ||||
|                 fill_color = self._fill_color.get_svg() | ||||
|         return [fill_color, stroke_color] | ||||
| 
 | ||||
|     def _get_icon_from_cache(self, name, icon): | ||||
|         if not icon: | ||||
|             cache = CanvasIcon._cache | ||||
| 
 | ||||
|             [fill_color, stroke_color] = self._choose_colors() | ||||
| 
 | ||||
|             icon = cache.get_icon(name, fill_color, stroke_color) | ||||
|         return icon | ||||
| 
 | ||||
|     def _get_icon(self): | ||||
|         self._icon = self._get_icon_from_cache(self._icon_name, self._icon) | ||||
|         return self._icon | ||||
| 
 | ||||
|     def _get_badge_icon(self): | ||||
|         self._badge_icon = self._get_icon_from_cache(self._badge_name, | ||||
|                                                      self._badge_icon) | ||||
|         return self._badge_icon | ||||
| 
 | ||||
|     def _get_current_buffer_key(self, name): | ||||
|         [fill_color, stroke_color] = self._choose_colors() | ||||
|         return (name, fill_color, stroke_color, self._size) | ||||
| 
 | ||||
|     def do_get_property(self, pspec): | ||||
|         if pspec.name == 'size': | ||||
|             return self._size | ||||
|         elif pspec.name == 'icon-name': | ||||
|             return self._icon_name | ||||
|         elif pspec.name == 'fill-color': | ||||
|             return self._fill_color | ||||
|         elif pspec.name == 'stroke-color': | ||||
|             return self._stroke_color | ||||
|         elif pspec.name == 'cache': | ||||
|             return self._cache | ||||
|         elif pspec.name == 'active': | ||||
|             return self._active | ||||
|         elif pspec.name == 'badge-name': | ||||
|             return self._badge_name | ||||
|         elif pspec.name == 'scale': | ||||
|             return self._scale | ||||
| 
 | ||||
|     def _get_icon_size(self, icon): | ||||
|         if icon: | ||||
|             dimensions = icon.handle.get_dimension_data() | ||||
|             return int(dimensions[0]), int(dimensions[1]) | ||||
|         else: | ||||
|             return [0, 0] | ||||
| 
 | ||||
|     def _get_size(self, icon): | ||||
|         width, height = self._get_icon_size(icon) | ||||
|         if self._scale != 0: | ||||
|             width = int(width * self._scale) | ||||
|             height = int(height * self._scale) | ||||
|         elif self._size != 0: | ||||
|             width = height = self._size | ||||
| 
 | ||||
|         return [width, height] | ||||
| 
 | ||||
|     def _get_buffer(self, cr, name, icon, scale_factor=None): | ||||
|         """Return a cached cairo surface for the SVG icon, or if none exists, | ||||
|         create a new cairo surface with the right size.""" | ||||
|         buf = None | ||||
| 
 | ||||
|         key = self._get_current_buffer_key(name) | ||||
|         if self._buffers.has_key(key): | ||||
|             buf = self._buffers[key] | ||||
|         else: | ||||
|             [icon_w, icon_h] = self._get_icon_size(icon) | ||||
|             [target_w, target_h] = self._get_size(icon) | ||||
| 
 | ||||
|             if scale_factor: | ||||
|                 target_w = int(target_w * scale_factor) | ||||
|                 target_h = int(target_h * scale_factor) | ||||
| 
 | ||||
|             target = cr.get_target() | ||||
|             buf = target.create_similar(cairo.CONTENT_COLOR_ALPHA, | ||||
|                                         target_w, target_h) | ||||
|             ctx = cairo.Context(buf) | ||||
|             ctx.scale(float(target_w) / float(icon_w), | ||||
|                       float(target_h) / float(icon_h)) | ||||
|             icon.handle.render_cairo(ctx) | ||||
| 
 | ||||
|             del ctx | ||||
|             self._buffers[key] = buf | ||||
| 
 | ||||
|         return buf | ||||
| 
 | ||||
|     def do_paint_below_children(self, cr, damaged_box): | ||||
|         icon = self._get_icon() | ||||
|         if icon is None: | ||||
|             return | ||||
| 
 | ||||
|         icon_buf = self._get_buffer(cr, self._icon_name, icon) | ||||
|         [width, height] = self.get_allocation() | ||||
|         icon_x = (width - icon_buf.get_width()) / 2 | ||||
|         icon_y = (height - icon_buf.get_height()) / 2 | ||||
| 
 | ||||
|         cr.set_source_surface(icon_buf, icon_x, icon_y) | ||||
|         cr.paint() | ||||
| 
 | ||||
|         if self._badge_name: | ||||
|             badge_icon = self._get_badge_icon() | ||||
|             if badge_icon: | ||||
|                 badge_buf = self._get_buffer(cr, self._badge_name, badge_icon, _BADGE_SIZE) | ||||
|                 badge_x = (icon_x + icon.badge_x * icon_buf.get_width() - | ||||
|                            badge_buf.get_width() / 2) | ||||
|                 badge_y = (icon_y + icon.badge_y * icon_buf.get_height() - | ||||
|                            badge_buf.get_height() / 2) | ||||
|                 cr.set_source_surface(badge_buf, badge_x, badge_y) | ||||
|                 cr.paint() | ||||
| 
 | ||||
|     def do_get_content_width_request(self): | ||||
|         icon = self._get_icon() | ||||
|         [width, height] = self._get_size(icon) | ||||
|         if self._badge_name is not None: | ||||
|             # If the badge goes outside the bounding box, add space | ||||
|             # on *both* sides (to keep the main icon centered) | ||||
|             if icon.badge_x < 0.0: | ||||
|                 width = int(width * 2 * (1.0 - icon.badge_x)) | ||||
|             elif icon.badge_x + _BADGE_SIZE > 1.0: | ||||
|                 width = int(width * 2 * (icon.badge_x + _BADGE_SIZE - 1.0)) | ||||
|         return (width, width) | ||||
| 
 | ||||
|     def do_get_content_height_request(self, for_width): | ||||
|         icon = self._get_icon() | ||||
|         [width, height] = self._get_size(icon) | ||||
|         if self._badge_name is not None: | ||||
|             if icon.badge_y < 0.0: | ||||
|                 height = int(height * 2 * (1.0 - icon.badge_y)) | ||||
|             elif icon.badge_y + _BADGE_SIZE > 1.0: | ||||
|                 height = int(height * 2 * (icon.badge_y + _BADGE_SIZE - 1.0)) | ||||
|         return (height, height) | ||||
| 
 | ||||
|     def do_button_press_event(self, event): | ||||
|         self.emit_activated() | ||||
|         return True | ||||
| 
 | ||||
|     def _motion_notify_event_cb(self, button, event): | ||||
|         if event.detail == hippo.MOTION_DETAIL_ENTER: | ||||
|             self.prelight(True) | ||||
|         elif event.detail == hippo.MOTION_DETAIL_LEAVE: | ||||
|             self.prelight(False) | ||||
|         return False | ||||
| 
 | ||||
|     def prelight(self, enter): | ||||
|         """ | ||||
|         Override this method for adding prelighting behavior. | ||||
|         """ | ||||
|         pass | ||||
| 
 | ||||
|     def get_palette(self): | ||||
|         return self._palette | ||||
|      | ||||
|     def set_palette(self, palette): | ||||
|         self._palette = palette | ||||
|         if not self._palette.props.invoker: | ||||
|             self._palette.props.invoker = CanvasInvoker(self) | ||||
| 
 | ||||
|     def set_tooltip(self, text): | ||||
|         self.set_palette(Palette(text)) | ||||
|      | ||||
|     palette = property(get_palette, set_palette) | ||||
| 
 | ||||
| def get_icon_state(base_name, perc): | ||||
|         step = 5 | ||||
|         strength = round(perc / step) * step | ||||
|         icon_theme = gtk.icon_theme_get_default() | ||||
| 
 | ||||
|         while strength <= 100: | ||||
|             icon_name = '%s-%03d' % (base_name, strength) | ||||
|             if icon_theme.has_icon(icon_name): | ||||
|                 return 'theme:' + icon_name | ||||
| 
 | ||||
|             strength = strength + step | ||||
|  | ||||
| @ -24,7 +24,7 @@ import sys | ||||
| import gobject | ||||
| import hippo | ||||
| 
 | ||||
| from sugar.graphics.canvasicon import CanvasIcon | ||||
| from sugar.graphics.icon import CanvasIcon | ||||
| from sugar.graphics import style | ||||
|              | ||||
| class IconButton(CanvasIcon, hippo.CanvasItem): | ||||
|  | ||||
| @ -24,9 +24,9 @@ import hippo | ||||
| from sugar.activity.bundle import Bundle | ||||
| from sugar.date import Date | ||||
| from sugar.graphics import style | ||||
| from sugar.graphics.canvasicon import CanvasIcon | ||||
| from sugar.graphics.icon import CanvasIcon | ||||
| from sugar.graphics.xocolor import XoColor | ||||
| from sugar.graphics.canvasroundbox import CanvasRoundBox | ||||
| from sugar.graphics.roundbox import CanvasRoundBox | ||||
| from sugar.datastore import datastore | ||||
| from sugar import activity | ||||
| from sugar.objects import objecttype | ||||
|  | ||||
		Loading…
	
		Reference in New Issue
	
	Block a user
	 Marco Pesenti Gritti
						Marco Pesenti Gritti