diff options
| author | Marco Pesenti Gritti <marco@localhost.localdomain> | 2006-10-03 22:55:20 (GMT) |
|---|---|---|
| committer | Marco Pesenti Gritti <marco@localhost.localdomain> | 2006-10-03 22:55:20 (GMT) |
| commit | 1f8ff1db1fddbf60fc776c484b980d8926c44538 (patch) | |
| tree | f44ca2aa4df4c905d4861688f622b07fd8fd3299 /sugar | |
| parent | 717bdd66f45e31074952bbf49c78e14153f92c57 (diff) | |
Move all the canvas code that doesn't depend on goocanvas anymore in graphics.
Diffstat (limited to 'sugar')
| -rw-r--r-- | sugar/canvas/IconItem.py | 2 | ||||
| -rw-r--r-- | sugar/graphics/__init__.py | 2 | ||||
| -rw-r--r-- | sugar/graphics/canvasicon.py | 2 | ||||
| -rw-r--r-- | sugar/graphics/colors.py (renamed from sugar/canvas/Colors.py) | 0 | ||||
| -rw-r--r-- | sugar/graphics/iconcolor.py (renamed from sugar/canvas/IconColor.py) | 6 | ||||
| -rw-r--r-- | sugar/graphics/menushell.py (renamed from sugar/canvas/MenuShell.py) | 0 | ||||
| -rw-r--r-- | sugar/graphics/snowflakelayout.py (renamed from sugar/canvas/SnowflakeLayout.py) | 0 | ||||
| -rw-r--r-- | sugar/graphics/timeline.py (renamed from sugar/canvas/Timeline.py) | 0 |
8 files changed, 6 insertions, 6 deletions
diff --git a/sugar/canvas/IconItem.py b/sugar/canvas/IconItem.py index 52b8bc6..dfc1776 100644 --- a/sugar/canvas/IconItem.py +++ b/sugar/canvas/IconItem.py @@ -7,7 +7,7 @@ import rsvg import cairo from sugar.util import GObjectSingletonMeta -from sugar.canvas.IconColor import IconColor +from sugar.graphics.iconcolor import IconColor class _IconCache: def __init__(self): diff --git a/sugar/graphics/__init__.py b/sugar/graphics/__init__.py index b494b9f..b3c54e1 100644 --- a/sugar/graphics/__init__.py +++ b/sugar/graphics/__init__.py @@ -1,7 +1,7 @@ import gtk from sugar.graphics import style -from sugar.canvas.IconColor import IconColor +from sugar.graphics.iconcolor import IconColor if gtk.gdk.screen_width() == 1200: _medium_icon_size = 75 diff --git a/sugar/graphics/canvasicon.py b/sugar/graphics/canvasicon.py index 17a0193..4da0061 100644 --- a/sugar/graphics/canvasicon.py +++ b/sugar/graphics/canvasicon.py @@ -6,7 +6,7 @@ import hippo import rsvg import cairo -from sugar.canvas.IconColor import IconColor +from sugar.graphics.iconcolor import IconColor class _IconCache: def __init__(self): diff --git a/sugar/canvas/Colors.py b/sugar/graphics/colors.py index 8a8f815..8a8f815 100644 --- a/sugar/canvas/Colors.py +++ b/sugar/graphics/colors.py diff --git a/sugar/canvas/IconColor.py b/sugar/graphics/iconcolor.py index 77e67ef..97c13c8 100644 --- a/sugar/canvas/IconColor.py +++ b/sugar/graphics/iconcolor.py @@ -1,6 +1,6 @@ import random -from sugar.canvas import Colors +from sugar.graphics.colors import colors def _parse_string(color_string): if color_string == 'white': @@ -18,8 +18,8 @@ def is_valid(color_string): class IconColor: def __init__(self, color_string=None): if color_string == None or not is_valid(color_string): - n = int(random.random() * (len(Colors.colors) - 1)) - [self._stroke, self._fill] = Colors.colors[n] + n = int(random.random() * (len(colors) - 1)) + [self._stroke, self._fill] = colors[n] else: [self._stroke, self._fill] = _parse_string(color_string) diff --git a/sugar/canvas/MenuShell.py b/sugar/graphics/menushell.py index 58358fb..58358fb 100644 --- a/sugar/canvas/MenuShell.py +++ b/sugar/graphics/menushell.py diff --git a/sugar/canvas/SnowflakeLayout.py b/sugar/graphics/snowflakelayout.py index 611ecaa..611ecaa 100644 --- a/sugar/canvas/SnowflakeLayout.py +++ b/sugar/graphics/snowflakelayout.py diff --git a/sugar/canvas/Timeline.py b/sugar/graphics/timeline.py index a2736cf..a2736cf 100644 --- a/sugar/canvas/Timeline.py +++ b/sugar/graphics/timeline.py |