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

Rename color property in CanvasIcon to xo-color and added properties fill-color and stroke-color.

Browse Source
This commit is contained in:
Tomeu Vizoso 2007-02-23 17:08:37 +01:00
parent 97e64751cc
commit a2e5b9308e
15 changed files with 108 additions and 69 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
shell/view/BuddyIcon.py
View File

@ -20,7 +20,7 @@ from view.BuddyMenu import BuddyMenu
class BuddyIcon(CanvasIcon): class BuddyIcon(CanvasIcon):
def __init__(self, shell, menu_shell, buddy): def __init__(self, shell, menu_shell, buddy):
CanvasIcon.__init__(self, icon_name='theme:stock-buddy', CanvasIcon.__init__(self, icon_name='theme:stock-buddy',
color=buddy.get_color()) xo_color=buddy.get_color())
self._shell = shell self._shell = shell
self._buddy = buddy self._buddy = buddy
@ -30,7 +30,7 @@ class BuddyIcon(CanvasIcon):
def _buddy_presence_change_cb(self, buddy, color=None): def _buddy_presence_change_cb(self, buddy, color=None):
# Update the icon's color when the buddy comes and goes # Update the icon's color when the buddy comes and goes
self.set_property('color', buddy.get_color()) self.props.xo_color = buddy.get_color()
def set_popup_distance(self, distance): def set_popup_distance(self, distance):
self._popup_distance = distance self._popup_distance = distance

8
shell/view/frame/ActivitiesBox.py
View File

@ -31,12 +31,6 @@ class ActivityButton(IconButton):
self._activity = activity self._activity = activity
self._popup_context = popup_context self._popup_context = popup_context
def _mouse_motion_event_cb(self, item, event):
if event.detail == hippo.MOTION_DETAIL_ENTER:
self.set_property('color', self._prelight_color)
elif event.detail == hippo.MOTION_DETAIL_LEAVE:
self.set_property('color', self._normal_color)
def get_bundle_id(self): def get_bundle_id(self):
return self._activity.get_service_name() return self._activity.get_service_name()
@ -47,7 +41,7 @@ class InviteButton(IconButton):
def __init__(self, activity, invite): def __init__(self, activity, invite):
IconButton.__init__(self, icon_name=activity.get_icon()) IconButton.__init__(self, icon_name=activity.get_icon())
self.props.color = activity.get_color() self.props.xo_color = activity.get_color()
self._invite = invite self._invite = invite
def get_activity_id(self): def get_activity_id(self):

2
shell/view/frame/ZoomBox.py
View File

@ -48,7 +48,7 @@ class ActivityButton(IconButton):
icon_name = self._activity_model.get_icon_name() icon_name = self._activity_model.get_icon_name()
icon_color = self._activity_model.get_icon_color() icon_color = self._activity_model.get_icon_color()
IconButton.__init__(self, icon_name=icon_name, color=icon_color) IconButton.__init__(self, icon_name=icon_name, xo_color=icon_color)
def get_popup(self): def get_popup(self):
menu = ActivityMenu(self._activity_model) menu = ActivityMenu(self._activity_model)

4
shell/view/home/FriendView.py
View File

@ -70,7 +70,7 @@ class FriendView(hippo.CanvasBox):
name = self._get_new_icon_name(activity) name = self._get_new_icon_name(activity)
if name: if name:
self._activity_icon.props.icon_name = name self._activity_icon.props.icon_name = name
self._activity_icon.props.color = buddy.get_color() self._activity_icon.props.xo_color = buddy.get_color()
if not self._activity_icon_visible: if not self._activity_icon_visible:
self.append(self._activity_icon, hippo.PACK_EXPAND) self.append(self._activity_icon, hippo.PACK_EXPAND)
self._activity_icon_visible = True self._activity_icon_visible = True
@ -85,4 +85,4 @@ class FriendView(hippo.CanvasBox):
self._buddy_activity_changed_cb(buddy, None) self._buddy_activity_changed_cb(buddy, None)
def _buddy_color_changed_cb(self, buddy, color): def _buddy_color_changed_cb(self, buddy, color):
self._activity_icon.props.color = buddy.get_color() self._activity_icon.props.xo_color = buddy.get_color()

7
shell/view/home/HomeBox.py
View File

@ -19,6 +19,7 @@ import math
import hippo import hippo
from sugar.graphics import units from sugar.graphics import units
from sugar.graphics import color
from sugar.graphics.xocolor import XoColor from sugar.graphics.xocolor import XoColor
from view.home.activitiesdonut import ActivitiesDonut from view.home.activitiesdonut import ActivitiesDonut
@ -59,7 +60,11 @@ class HomeBox(hippo.CanvasBox, hippo.CanvasItem):
if self._donut: if self._donut:
self.remove(self._donut) self.remove(self._donut)
self._donut = None self._donut = None
self._my_icon.props.color = XoColor('insensitive') self._my_icon.props.stroke_color = color.BUTTON_INACTIVE
self._my_icon.props.fill_color = \
color.BUTTON_INACTIVE_BACKGROUND
self._my_icon.props.background_color = \
color.BUTTON_INACTIVE_BACKGROUND
def do_allocate(self, width, height, origin_changed): def do_allocate(self, width, height, origin_changed):
hippo.CanvasBox.do_allocate(self, width, height, origin_changed) hippo.CanvasBox.do_allocate(self, width, height, origin_changed)

2
shell/view/home/MeshBox.py
View File

@ -33,7 +33,7 @@ class ActivityView(SnowflakeBox):
self._icons = {} self._icons = {}
icon = CanvasIcon(icon_name=model.get_icon_name(), icon = CanvasIcon(icon_name=model.get_icon_name(),
color=model.get_color(), box_width=80) xo_color=model.get_color(), box_width=80)
icon.connect('activated', self._clicked_cb) icon.connect('activated', self._clicked_cb)
self.append(icon, hippo.PACK_FIXED) self.append(icon, hippo.PACK_FIXED)
self.set_root(icon) self.set_root(icon)

2
shell/view/home/MyIcon.py
View File

@ -21,4 +21,4 @@ class MyIcon(CanvasIcon):
def __init__(self, scale): def __init__(self, scale):
CanvasIcon.__init__(self, scale=scale, CanvasIcon.__init__(self, scale=scale,
icon_name='theme:stock-buddy', icon_name='theme:stock-buddy',
color=profile.get_color()) xo_color=profile.get_color())

6
shell/view/home/activitiesdonut.py
View File

@ -55,7 +55,7 @@ class ActivityIcon(CanvasIcon):
self._level = self._level_max self._level = self._level_max
color = self._icon_colors[self._level] color = self._icon_colors[self._level]
CanvasIcon.__init__(self, icon_name=icon_name, color=color, CanvasIcon.__init__(self, icon_name=icon_name, xo_color=color,
scale=units.MEDIUM_ICON_SCALE, cache=True) scale=units.MEDIUM_ICON_SCALE, cache=True)
self._activity = activity self._activity = activity
@ -103,7 +103,7 @@ class ActivityIcon(CanvasIcon):
self._direction = 1 self._direction = 1
self._level = 0 self._level = 0
self.props.color = self._icon_colors[self._level] self.props.xo_color = self._icon_colors[self._level]
self.emit_paint_needed(0, 0, -1, -1) self.emit_paint_needed(0, 0, -1, -1)
return True return True
@ -113,7 +113,7 @@ class ActivityIcon(CanvasIcon):
self._launched = True self._launched = True
self.cleanup() self.cleanup()
self._level = 100.0 self._level = 100.0
self.props.color = self._orig_color self.props.xo_color = self._orig_color
self.emit_paint_needed(0, 0, -1, -1) self.emit_paint_needed(0, 0, -1, -1)
def get_launched(self): def get_launched(self):

2
sugar/activity/activity.py
View File

@ -105,4 +105,4 @@ class Activity(gtk.Window):
self._pservice.unregister_service(self._service) self._pservice.unregister_service(self._service)
def get_bundle_path(): def get_bundle_path():
return os.environ['SUGAR_BUNDLE_BUNDLE_PATH'] return os.environ['SUGAR_BUNDLE_PATH']

104
sugar/graphics/canvasicon.py
View File

@ -27,29 +27,28 @@ import time
from sugar.graphics.timeline import Timeline from sugar.graphics.timeline import Timeline
from sugar.graphics.popup import Popup from sugar.graphics.popup import Popup
from sugar.graphics import color from sugar.graphics import color
from sugar.graphics.xocolor import XoColor
from sugar.graphics import font from sugar.graphics import font
from sugar.graphics import units from sugar.graphics import units
class _IconCacheIcon: class _IconCacheIcon:
def __init__(self, name, color, now): def __init__(self, name, fill_color, stroke_color, now):
self.data_size = None self.data_size = None
self.handle = self._read_icon_data(name, color) self.handle = self._read_icon_data(name, fill_color, stroke_color)
self.last_used = now self.last_used = now
self.usage_count = 1 self.usage_count = 1
def _read_icon_data(self, filename, color): def _read_icon_data(self, filename, fill_color, stroke_color):
icon_file = open(filename, 'r') icon_file = open(filename, 'r')
data = icon_file.read() data = icon_file.read()
icon_file.close() icon_file.close()
if color: if fill_color:
fill = color.get_fill_color() entity = '<!ENTITY fill_color "%s">' % fill_color
stroke = color.get_stroke_color()
entity = '<!ENTITY fill_color "%s">' % fill
data = re.sub('<!ENTITY fill_color .*>', entity, data) data = re.sub('<!ENTITY fill_color .*>', entity, data)
entity = '<!ENTITY stroke_color "%s">' % stroke if stroke_color:
entity = '<!ENTITY stroke_color "%s">' % stroke_color
data = re.sub('<!ENTITY stroke_color .*>', entity, data) data = re.sub('<!ENTITY stroke_color .*>', entity, data)
self.data_size = len(data) self.data_size = len(data)
@ -104,15 +103,15 @@ class _IconCache:
self._cache_size -= self._icons[evict_key].data_size self._cache_size -= self._icons[evict_key].data_size
del self._icons[evict_key] del self._icons[evict_key]
def get_handle(self, name, color): def get_handle(self, name, fill_color, stroke_color):
if name == None: if name == None:
return None return None
if name[0:6] == "theme:": if name[0:6] == "theme:":
name = self._get_real_name_from_theme(name[6:]) name = self._get_real_name_from_theme(name[6:])
if color: if fill_color or stroke_color:
key = (name, color.to_string()) key = (name, fill_color, stroke_color)
else: else:
key = name key = name
@ -125,7 +124,7 @@ class _IconCache:
icon.usage_count += 1 icon.usage_count += 1
icon.last_used = now icon.last_used = now
else: else:
icon = _IconCacheIcon(name, color, now) icon = _IconCacheIcon(name, fill_color, stroke_color, now)
self._icons[key] = icon self._icons[key] = icon
self._cache_size += icon.data_size self._cache_size += icon.data_size
return icon.handle return icon.handle
@ -135,17 +134,21 @@ class CanvasIcon(hippo.CanvasBox, hippo.CanvasItem):
__gtype_name__ = 'CanvasIcon' __gtype_name__ = 'CanvasIcon'
__gproperties__ = { __gproperties__ = {
'icon-name': (str, None, None, None, 'icon-name' : (str, None, None, None,
gobject.PARAM_READWRITE), gobject.PARAM_READWRITE),
'color' : (object, None, None, 'xo-color' : (object, None, None,
gobject.PARAM_READWRITE), gobject.PARAM_READWRITE),
'scale' : (float, None, None, 'fill-color' : (object, None, None,
0.0, 1024.0, 1.0, gobject.PARAM_READWRITE),
gobject.PARAM_READWRITE), 'stroke-color' : (object, None, None,
'cache' : (bool, None, None, False, gobject.PARAM_READWRITE),
gobject.PARAM_READWRITE), 'scale' : (float, None, None,
'tooltip' : (str, None, None, None, 0.0, 1024.0, 1.0,
gobject.PARAM_READWRITE) gobject.PARAM_READWRITE),
'cache' : (bool, None, None, False,
gobject.PARAM_READWRITE),
'tooltip' : (str, None, None, None,
gobject.PARAM_READWRITE)
} }
_cache = _IconCache() _cache = _IconCache()
@ -154,7 +157,8 @@ class CanvasIcon(hippo.CanvasBox, hippo.CanvasItem):
self._buffers = {} self._buffers = {}
self._cur_buffer = None self._cur_buffer = None
self._scale = 1.0 self._scale = 1.0
self._color = None self._fill_color = None
self._stroke_color = None
self._icon_name = None self._icon_name = None
self._cache = False self._cache = False
self._handle = None self._handle = None
@ -186,12 +190,23 @@ class CanvasIcon(hippo.CanvasBox, hippo.CanvasItem):
self._icon_name = value self._icon_name = value
self._handle = None self._handle = None
self.emit_paint_needed(0, 0, -1, -1) self.emit_paint_needed(0, 0, -1, -1)
elif pspec.name == 'color': elif pspec.name == 'xo-color':
if self._color != value and not self._cache: self.props.fill_color = color.HTMLColor(value.get_fill_color())
self._clear_buffers() self.props.stroke_color = color.HTMLColor(value.get_stroke_color())
self._color = value elif pspec.name == 'fill-color':
self._handle = None if self._fill_color != value:
self.emit_paint_needed(0, 0, -1, -1) if not self._cache:
self._clear_buffers()
self._fill_color = value
self._handle = 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._handle = None
self.emit_paint_needed(0, 0, -1, -1)
elif pspec.name == 'scale': elif pspec.name == 'scale':
if self._scale != value and not self._cache: if self._scale != value and not self._cache:
self._clear_buffers() self._clear_buffers()
@ -205,19 +220,38 @@ class CanvasIcon(hippo.CanvasBox, hippo.CanvasItem):
def _get_handle(self): def _get_handle(self):
if not self._handle: if not self._handle:
cache = CanvasIcon._cache cache = CanvasIcon._cache
self._handle = cache.get_handle(self._icon_name, self._color)
fill_color = None
if self._fill_color:
fill_color = self._fill_color.get_html()
stroke_color = None
if self._stroke_color:
stroke_color = self._stroke_color.get_html()
self._handle = cache.get_handle(self._icon_name, fill_color,
stroke_color)
return self._handle return self._handle
def _get_current_buffer_key(self): def _get_current_buffer_key(self):
return (self._icon_name, self._color, self._scale) return (self._icon_name, self._fill_color, self._stroke_color, self._scale)
def do_get_property(self, pspec): def do_get_property(self, pspec):
if pspec.name == 'scale': if pspec.name == 'scale':
return self._scale return self._scale
elif pspec.name == 'icon-name': elif pspec.name == 'icon-name':
return self._icon_name return self._icon_name
elif pspec.name == 'color': elif pspec.name == 'xo-color':
return self._color if self._stroke_color and self._fill_color:
xo_color = XoColor('%s,%s' % (self._stroke_color.get_html(),
self._fill_color.get_html()))
return xo_color
else:
return None
elif pspec.name == 'fill-color':
return self._fill_color
elif pspec.name == 'stroke-color':
return self._stroke_color
elif pspec.name == 'cache': elif pspec.name == 'cache':
return self._cache return self._cache
elif pspec.name == 'tooltip': elif pspec.name == 'tooltip':

13
sugar/graphics/color.py
View File

@ -60,11 +60,18 @@ class RGBColor(object):
return gtk.gdk.Color(int(self._r * 65535), int(self._g * 65535), return gtk.gdk.Color(int(self._r * 65535), int(self._g * 65535),
int(self._b * 65535)) int(self._b * 65535))
class SystemColor(RGBColor): def get_html(self):
def __init__(self, color_id): return '#%x%x%x' % (self._r * 255, self._g * 255, self._b * 255)
rgb = _html_to_rgb(_system_colors[color_id])
class HTMLColor(RGBColor):
def __init__(self, html_color):
rgb = _html_to_rgb(html_color)
RGBColor.__init__(self, *rgb) RGBColor.__init__(self, *rgb)
class SystemColor(HTMLColor):
def __init__(self, color_id):
HTMLColor.__init__(self, _system_colors[color_id])
RED = RGBColor(1.0, 0.0, 0.0) RED = RGBColor(1.0, 0.0, 0.0)
GREEN = RGBColor(0.0, 1.0, 0.0) GREEN = RGBColor(0.0, 1.0, 0.0)
BLUE = RGBColor(0.0, 0.0, 1.0) BLUE = RGBColor(0.0, 0.0, 1.0)

15
sugar/graphics/iconbutton.py
View File

@ -44,14 +44,13 @@ class IconButton(CanvasIcon):
CanvasIcon.__init__(self, cache=True, **kwargs) CanvasIcon.__init__(self, cache=True, **kwargs)
if self.props.color:
self._normal_color = self.props.color
else:
self._normal_color = XoColor('white')
self.props.color = self._normal_color
self._prelight_color = profile.get_color() self._prelight_color = profile.get_color()
self._inactive_color = XoColor('#808080,#424242') self._inactive_color = XoColor('#808080,#424242')
self._normal_color = XoColor('white')
if not self.props.xo_color:
self.props.xo_color = self._normal_color
self._set_size(STANDARD_SIZE) self._set_size(STANDARD_SIZE)
self.connect('button-press-event', self._button_press_event_cb) self.connect('button-press-event', self._button_press_event_cb)
@ -74,9 +73,9 @@ class IconButton(CanvasIcon):
elif pspec.name == 'active': elif pspec.name == 'active':
self._active = value self._active = value
if self._active: if self._active:
self.props.color = self._normal_color self.props.xo_color = self._normal_color
else: else:
self.props.color = self._inactive_color self.props.xo_color = self._inactive_color
else: else:
CanvasIcon.do_set_property(self, pspec, value) CanvasIcon.do_set_property(self, pspec, value)

2
sugar/graphics/menu.py
View File

@ -49,7 +49,7 @@ class MenuItem(hippo.CanvasBox):
icon = CanvasIcon(icon_name=icon_name, icon = CanvasIcon(icon_name=icon_name,
scale=units.SMALL_ICON_SCALE) scale=units.SMALL_ICON_SCALE)
if icon_color: if icon_color:
icon.props.color = icon_color icon.props.xo_color = icon_color
self.append(icon) self.append(icon)
self._canvas_text = hippo.CanvasText(text=label) self._canvas_text = hippo.CanvasText(text=label)

4
tests/test-snowflake-box.py
View File

@ -33,14 +33,14 @@ from sugar.graphics.canvasicon import CanvasIcon
def _create_snowflake(parent, children): def _create_snowflake(parent, children):
color = XoColor() color = XoColor()
icon = CanvasIcon(size=40, color=color, icon = CanvasIcon(size=40, xo_color=color,
icon_name='activity-groupchat') icon_name='activity-groupchat')
parent.append(icon, hippo.PACK_FIXED) parent.append(icon, hippo.PACK_FIXED)
parent.set_root(icon) parent.set_root(icon)
for i in range(0, children): for i in range(0, children):
color = XoColor() color = XoColor()
icon = CanvasIcon(size=60, color=color, icon = CanvasIcon(size=60, xo_color=color,
icon_name='stock-buddy') icon_name='stock-buddy')
parent.append(icon, hippo.PACK_FIXED) parent.append(icon, hippo.PACK_FIXED)

2
tests/test-spread-box.py
View File

@ -33,7 +33,7 @@ from sugar.graphics.canvasicon import CanvasIcon
def _create_icon(): def _create_icon():
color = XoColor() color = XoColor()
icon = CanvasIcon(size=100, color=color, icon = CanvasIcon(size=100, xo_color=color,
icon_name='stock-buddy') icon_name='stock-buddy')
box.add_item(icon) box.add_item(icon)