diff options
| author | Tomeu Vizoso <tomeu@tomeuvizoso.net> | 2007-02-23 12:09:33 (GMT) |
|---|---|---|
| committer | Tomeu Vizoso <tomeu@tomeuvizoso.net> | 2007-02-23 12:09:33 (GMT) |
| commit | cb0d75eb59da59ff505794d6a1bddb484b4b2e88 (patch) | |
| tree | f811cc494c80532e37616d58e158bfecdfb5f04b /sugar/graphics | |
| parent | b8792c5c32561ca4d617e4e359d031f0f6128af0 (diff) | |
Rename IconColor to XoColor.
Diffstat (limited to 'sugar/graphics')
| -rw-r--r-- | sugar/graphics/Makefile.am | 4 | ||||
| -rw-r--r-- | sugar/graphics/canvasicon.py | 1 | ||||
| -rw-r--r-- | sugar/graphics/iconbutton.py | 6 | ||||
| -rw-r--r-- | sugar/graphics/xocolor.py (renamed from sugar/graphics/iconcolor.py) | 2 |
4 files changed, 6 insertions, 7 deletions
diff --git a/sugar/graphics/Makefile.am b/sugar/graphics/Makefile.am index ee1c578..375857f 100644 --- a/sugar/graphics/Makefile.am +++ b/sugar/graphics/Makefile.am @@ -9,7 +9,6 @@ sugar_PYTHON = \ entry.py \ font.py \ frame.py \ - iconcolor.py \ label.py \ menu.py \ menushell.py \ @@ -21,4 +20,5 @@ sugar_PYTHON = \ spreadbox.py \ timeline.py \ toolbar.py \ - units.py + units.py \ + xocolor.py diff --git a/sugar/graphics/canvasicon.py b/sugar/graphics/canvasicon.py index 67c35aa..7cf1ed2 100644 --- a/sugar/graphics/canvasicon.py +++ b/sugar/graphics/canvasicon.py @@ -24,7 +24,6 @@ import rsvg import cairo import time -from sugar.graphics.iconcolor import IconColor from sugar.graphics.timeline import Timeline from sugar.graphics.popup import Popup from sugar.graphics import color diff --git a/sugar/graphics/iconbutton.py b/sugar/graphics/iconbutton.py index b1992a6..78196d0 100644 --- a/sugar/graphics/iconbutton.py +++ b/sugar/graphics/iconbutton.py @@ -21,7 +21,7 @@ import gobject import hippo from canvasicon import CanvasIcon -from iconcolor import IconColor +from xocolor import XoColor from sugar.graphics import units from sugar import profile @@ -47,11 +47,11 @@ class IconButton(CanvasIcon): if self.props.color: self._normal_color = self.props.color else: - self._normal_color = IconColor('white') + self._normal_color = XoColor('white') self.props.color = self._normal_color self._prelight_color = profile.get_color() - self._inactive_color = IconColor('#808080,#424242') + self._inactive_color = XoColor('#808080,#424242') self._set_size(STANDARD_SIZE) self.connect('button-press-event', self._button_press_event_cb) diff --git a/sugar/graphics/iconcolor.py b/sugar/graphics/xocolor.py index ca1ca6a..07fe80e 100644 --- a/sugar/graphics/iconcolor.py +++ b/sugar/graphics/xocolor.py @@ -595,7 +595,7 @@ def _parse_string(color_string): def is_valid(color_string): return (_parse_string(color_string) != None) -class IconColor: +class XoColor: def __init__(self, color_string=None): if color_string == None or not is_valid(color_string): n = int(random.random() * (len(_colors) - 1)) |