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

10 files changed, 14 insertions, 14 deletions

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