Move all the canvas code that doesn't depend on goocanvas anymore in graphics.

6 files changed, 21 insertions, 21 deletions

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()