From 1f8ff1db1fddbf60fc776c484b980d8926c44538 Mon Sep 17 00:00:00 2001 From: Marco Pesenti Gritti Date: Tue, 03 Oct 2006 22:55:20 +0000 Subject: Move all the canvas code that doesn't depend on goocanvas anymore in graphics. --- diff --git a/shell/conf/Profile.py b/shell/conf/Profile.py index ced73cf..30172ff 100644 --- a/shell/conf/Profile.py +++ b/shell/conf/Profile.py @@ -1,14 +1,14 @@ import os from ConfigParser import ConfigParser -from sugar.canvas import IconColor +from sugar.graphics import iconcolor from sugar import env class _Profile: def __init__(self,): self._path = env.get_profile_path() self._nick_name = None - self._color = IconColor.IconColor() + self._color = iconcolor.IconColor() self._ensure_dirs() @@ -19,8 +19,8 @@ class _Profile: self._nick_name = cp.get('Buddy', 'NickName') if cp.has_option('Buddy', 'Color'): color = cp.get('Buddy', 'Color') - if IconColor.is_valid(color): - self._color = IconColor.IconColor(color) + if iconcolor.is_valid(color): + self._color = iconcolor.IconColor(color) def _ensure_dirs(self): try: diff --git a/shell/model/BuddyModel.py b/shell/model/BuddyModel.py index 0a4f1c9..310cb22 100644 --- a/shell/model/BuddyModel.py +++ b/shell/model/BuddyModel.py @@ -1,5 +1,5 @@ from sugar.presence import PresenceService -from sugar.canvas.IconColor import IconColor +from sugar.graphics.iconcolor import IconColor import gobject _NOT_PRESENT_COLOR = "#888888,#BBBBBB" diff --git a/shell/model/Invites.py b/shell/model/Invites.py index 24f9913..87dd03e 100644 --- a/shell/model/Invites.py +++ b/shell/model/Invites.py @@ -2,7 +2,7 @@ import gobject import conf from sugar.presence import PresenceService -from sugar.canvas.IconColor import IconColor +from sugar.graphics.iconcolor import IconColor class Invite: def __init__(self, issuer, bundle_id, activity_id): diff --git a/shell/model/MeshModel.py b/shell/model/MeshModel.py index d8b8640..a95cecf 100644 --- a/shell/model/MeshModel.py +++ b/shell/model/MeshModel.py @@ -1,7 +1,7 @@ import gobject import conf -from sugar.canvas.IconItem import IconColor +from sugar.graphics.iconcolor import IconColor from sugar.presence import PresenceService from model.BuddyModel import BuddyModel diff --git a/shell/view/ActivityHost.py b/shell/view/ActivityHost.py index 259f3fb..d03e398 100644 --- a/shell/view/ActivityHost.py +++ b/shell/view/ActivityHost.py @@ -4,7 +4,7 @@ import dbus import conf from sugar.activity import Activity from sugar.presence import PresenceService -from sugar.canvas.IconColor import IconColor +from sugar.graphics.iconcolor import IconColor from sugar.p2p import Stream from sugar.p2p import network from sugar.chat import ActivityChat diff --git a/shell/view/frame/Frame.py b/shell/view/frame/Frame.py index 1c82b49..9b43fd1 100644 --- a/shell/view/frame/Frame.py +++ b/shell/view/frame/Frame.py @@ -6,8 +6,8 @@ import wnck from view.frame.ActivitiesBox import ActivitiesBox from view.frame.ZoomBox import ZoomBox from view.frame.PanelWindow import PanelWindow -from sugar.canvas.Timeline import Timeline -from sugar.canvas.MenuShell import MenuShell +from sugar.graphics.timeline import Timeline +from sugar.graphics.menushell import MenuShell from sugar.graphics.grid import Grid class EventFrame(gobject.GObject): diff --git a/shell/view/frame/RightPanel.py b/shell/view/frame/RightPanel.py index 9c16402..366dbfd 100644 --- a/shell/view/frame/RightPanel.py +++ b/shell/view/frame/RightPanel.py @@ -1,7 +1,7 @@ import hippo from sugar.graphics.CanvasIcon import CanvasIcon -from sugar.canvas.IconColor import IconColor +from sugar.graphics.iconcolor import IconColor from sugar.presence import PresenceService from view.BuddyIcon import BuddyIcon from model.BuddyModel import BuddyModel diff --git a/shell/view/home/HomeWindow.py b/shell/view/home/HomeWindow.py index fad4476..e58447c 100644 --- a/shell/view/home/HomeWindow.py +++ b/shell/view/home/HomeWindow.py @@ -4,7 +4,7 @@ import hippo import cairo from sugar.canvas.CanvasView import CanvasView -from sugar.canvas.MenuShell import MenuShell +from sugar.graphics.menushell import MenuShell from view.home.MeshBox import MeshBox from view.home.HomeGroup import HomeGroup from view.home.FriendsBox import FriendsBox diff --git a/shell/view/home/MeshBox.py b/shell/view/home/MeshBox.py index f97de7b..281ddc1 100644 --- a/shell/view/home/MeshBox.py +++ b/shell/view/home/MeshBox.py @@ -5,7 +5,7 @@ import hippo from sugar.graphics.spreadlayout import SpreadLayout from sugar.graphics.canvasicon import CanvasIcon from view.BuddyIcon import BuddyIcon -from sugar.canvas.SnowflakeLayout import SnowflakeLayout +from sugar.graphics.snowflakelayout import SnowflakeLayout import conf class ActivityView(hippo.CanvasBox): diff --git a/shell/view/home/MyIcon.py b/shell/view/home/MyIcon.py index 226520d..0671bec 100644 --- a/shell/view/home/MyIcon.py +++ b/shell/view/home/MyIcon.py @@ -1,6 +1,6 @@ import conf from sugar.canvas.IconItem import IconItem -from sugar.canvas.IconColor import IconColor +from sugar.graphics.iconcolor import IconColor class MyIcon(IconItem): def __init__(self, size): 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 diff --git a/tests/simulator/kiu.py b/tests/simulator/kiu.py index 4c1b6c0..18f30fd 100755 --- a/tests/simulator/kiu.py +++ b/tests/simulator/kiu.py @@ -2,7 +2,7 @@ from sugar.simulator import Bot from sugar.simulator import ShareActivityAction -from sugar.canvas.IconColor import IconColor +from sugar.graphics.iconcolor import IconColor import os, random, gobject class KiuBot(Bot): diff --git a/tests/test-grid.py b/tests/test-grid.py index ea17933..7d03137 100755 --- a/tests/test-grid.py +++ b/tests/test-grid.py @@ -10,11 +10,11 @@ session.start() import gtk import goocanvas -from sugar.canvas.IconColor import IconColor -from sugar.canvas.IconItem import IconItem -from sugar.canvas.CanvasView import CanvasView -from sugar.canvas.CanvasBox import CanvasBox -from sugar.canvas.Grid import Grid +from sugar.graphics.iconcolor import IconColor +from sugar.graphics.IconItem import IconItem +from sugar.graphics.CanvasView import CanvasView +from sugar.graphics.CanvasBox import CanvasBox +from sugar.graphics.Grid import Grid def _new_icon_clicked_cb(icon): box.remove_child(icon) diff --git a/tests/test-icon-layout.py b/tests/test-icon-layout.py index 1e3a20b..45ea385 100755 --- a/tests/test-icon-layout.py +++ b/tests/test-icon-layout.py @@ -15,10 +15,10 @@ import gtk import goocanvas from view.home.IconLayout import IconLayout -from sugar.canvas import IconColor -from sugar.canvas.IconItem import IconItem -from sugar.canvas.CanvasView import CanvasView -from sugar.canvas.Grid import Grid +from sugar.graphics import IconColor +from sugar.graphics.IconItem import IconItem +from sugar.graphics.CanvasView import CanvasView +from sugar.graphics.Grid import Grid def _create_icon(): color = IconColor.IconColor() diff --git a/tests/test-icons.py b/tests/test-icons.py index c424706..f3b6037 100755 --- a/tests/test-icons.py +++ b/tests/test-icons.py @@ -13,9 +13,9 @@ import random import gtk import hippo -from sugar.canvas import IconColor -from sugar.canvas.CanvasIcon import CanvasIcon -from sugar.canvas.CanvasView import CanvasView +from sugar.graphics import IconColor +from sugar.graphics.CanvasIcon import CanvasIcon +from sugar.graphics.CanvasView import CanvasView window = gtk.Window() window.connect("destroy", lambda w: gtk.main_quit()) diff --git a/tests/test-snowflake.py b/tests/test-snowflake.py index eeed46d..022cfe2 100755 --- a/tests/test-snowflake.py +++ b/tests/test-snowflake.py @@ -14,11 +14,11 @@ import random import gtk import goocanvas -from sugar.canvas.SnowflakeLayout import SnowflakeLayout -from sugar.canvas import IconColor -from sugar.canvas.IconItem import IconItem -from sugar.canvas.CanvasView import CanvasView -from sugar.canvas.Grid import Grid +from sugar.graphics.snowflakelayout import SnowflakeLayout +from sugar.graphics import IconColor +from sugar.graphics.IconItem import IconItem +from sugar.graphics.CanvasView import CanvasView +from sugar.graphics.Grid import Grid def _create_snowflake(group, children): color = IconColor.IconColor() diff --git a/tests/test-theme.py b/tests/test-theme.py index 37fe8dc..88386f1 100755 --- a/tests/test-theme.py +++ b/tests/test-theme.py @@ -10,9 +10,9 @@ session.start() import gtk import goocanvas -from sugar.canvas import IconColor -from sugar.canvas.IconItem import IconItem -from sugar.canvas.CanvasView import CanvasView +from sugar.graphics import IconColor +from sugar.graphics.IconItem import IconItem +from sugar.graphics.CanvasView import CanvasView # Main window window = gtk.Window() -- cgit v0.9.1