Reorganize canvas items.

13 files changed, 24 insertions, 24 deletions

diff --git a/shell/intro/colorpicker.py b/shell/intro/colorpicker.py
index f418807..52b9687 100644
--- a/shell/intro/colorpicker.py
+++ b/shell/intro/colorpicker.py
@@ -16,7 +16,7 @@
 
 import hippo
 
-from sugar.graphics.canvasicon import CanvasIcon
+from sugar.graphics.icon import CanvasIcon
 from sugar.graphics import style
 from sugar.graphics.xocolor import XoColor
 
diff --git a/shell/intro/intro.py b/shell/intro/intro.py
index ba633e3..5455813 100644
--- a/shell/intro/intro.py
+++ b/shell/intro/intro.py
@@ -26,8 +26,8 @@ import logging
 
 from sugar import env
 from sugar.graphics import style
-from sugar.graphics.canvasbutton import CanvasButton
-from sugar.graphics.canvasentry import CanvasEntry
+from sugar.graphics.button import CanvasButton
+from sugar.graphics.entry import CanvasEntry
 
 import colorpicker
 
diff --git a/shell/view/BuddyIcon.py b/shell/view/BuddyIcon.py
index 5079fe5..1ab0ed7 100644
--- a/shell/view/BuddyIcon.py
+++ b/shell/view/BuddyIcon.py
@@ -14,7 +14,7 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-from sugar.graphics.canvasicon import CanvasIcon
+from sugar.graphics.icon import CanvasIcon
 from sugar.graphics.palette import Palette
 from view.BuddyMenu import BuddyMenu
 
diff --git a/shell/view/clipboardicon.py b/shell/view/clipboardicon.py
index 5f4c47e..d7756f1 100644
--- a/shell/view/clipboardicon.py
+++ b/shell/view/clipboardicon.py
@@ -20,7 +20,7 @@ from gettext import gettext as _
 
 import gobject
 
-from sugar.graphics.canvasicon import CanvasIcon
+from sugar.graphics.icon import CanvasIcon
 from view.clipboardmenu import ClipboardMenu
 from sugar.graphics.xocolor import XoColor
 from sugar.graphics import style
diff --git a/shell/view/devices/battery.py b/shell/view/devices/battery.py
index 5aafc5c..4ac3c17 100644
--- a/shell/view/devices/battery.py
+++ b/shell/view/devices/battery.py
@@ -17,7 +17,8 @@
 import gtk
 
 from gettext import gettext as _
-from sugar.graphics import canvasicon
+from sugar.graphics.icon import CanvasIcon
+from sugar.graphics.icon import get_icon_state
 from sugar.graphics import style
 from sugar.graphics.palette import Palette
 
@@ -27,9 +28,9 @@ _STATUS_CHARGING = 0
 _STATUS_DISCHARGING = 1
 _STATUS_FULLY_CHARGED = 2
 
-class DeviceView(canvasicon.CanvasIcon):
+class DeviceView(CanvasIcon):
     def __init__(self, model):
-        canvasicon.CanvasIcon.__init__(self, size=style.MEDIUM_ICON_SIZE)
+        CanvasIcon.__init__(self, size=style.MEDIUM_ICON_SIZE)
         self._model = model
         self._palette = BatteryPalette(_('My Battery life'))
         self.set_palette(self._palette)
@@ -40,8 +41,8 @@ class DeviceView(canvasicon.CanvasIcon):
         self._update_info()
 
     def _update_info(self):
-        self.props.icon_name = canvasicon.get_icon_state(
-                                    _ICON_NAME, self._model.props.level)
+        name = get_icon_state(_ICON_NAME, self._model.props.level)
+        self.props.icon_name = name
 
         # Update palette
         if self._model.props.charging:
diff --git a/shell/view/devices/deviceview.py b/shell/view/devices/deviceview.py
index 5bff35a..f58da02 100644
--- a/shell/view/devices/deviceview.py
+++ b/shell/view/devices/deviceview.py
@@ -14,7 +14,7 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-from sugar.graphics.canvasicon import CanvasIcon
+from sugar.graphics.icon import CanvasIcon
 
 def create(model):
     name = 'view.devices.' + model.get_type()
diff --git a/shell/view/devices/network/wireless.py b/shell/view/devices/network/wireless.py
index 9f0abd8..5102f3b 100644
--- a/shell/view/devices/network/wireless.py
+++ b/shell/view/devices/network/wireless.py
@@ -15,11 +15,12 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-from sugar.graphics import canvasicon
+from sugar.graphics.icon import get_icon_state
+from sugar.graphics.icon import CanvasIcon
 from sugar.graphics import style
 from sugar.graphics import style
+
 from model.devices.network import wireless
-from sugar.graphics.canvasicon import CanvasIcon
 from model.devices import device
 
 _ICON_NAME = 'network-wireless'
@@ -47,8 +48,7 @@ class DeviceView(CanvasIcon):
         self._update_state()
 
     def _update_icon(self):
-        icon_name = canvasicon.get_icon_state(
-                    _ICON_NAME, self._model.props.strength)
+        icon_name = get_icon_state(_ICON_NAME, self._model.props.strength)
         if icon_name:
             self.props.icon_name = icon_name
 
diff --git a/shell/view/frame/FriendsBox.py b/shell/view/frame/FriendsBox.py
index 30f5963..fee5661 100644
--- a/shell/view/frame/FriendsBox.py
+++ b/shell/view/frame/FriendsBox.py
@@ -17,7 +17,7 @@
 import hippo
 
 from sugar.graphics.palette import Palette
-from sugar.graphics.canvasicon import CanvasIcon
+from sugar.graphics.icon import CanvasIcon
 from sugar.graphics import style
 from sugar.presence import presenceservice
 
diff --git a/shell/view/home/FriendView.py b/shell/view/home/FriendView.py
index ed05892..eb1eab5 100644
--- a/shell/view/home/FriendView.py
+++ b/shell/view/home/FriendView.py
@@ -17,7 +17,7 @@
 import hippo
 import gobject
 
-from sugar.graphics.canvasicon import CanvasIcon
+from sugar.graphics.icon import CanvasIcon
 from sugar.graphics import style
 from sugar.presence import presenceservice
 from sugar import activity
diff --git a/shell/view/home/MeshBox.py b/shell/view/home/MeshBox.py
index ff6d290..04ddf4e 100644
--- a/shell/view/home/MeshBox.py
+++ b/shell/view/home/MeshBox.py
@@ -21,10 +21,10 @@ import gobject
 from gettext import gettext as _
 
 from sugar.graphics.spreadlayout import SpreadLayout
-from sugar.graphics.canvasicon import CanvasIcon
+from sugar.graphics.icon import CanvasIcon
 from sugar.graphics import style
 from sugar.graphics import xocolor
-from sugar.graphics import canvasicon
+from sugar.graphics.icon import get_icon_state
 from sugar.graphics import style
 from sugar import profile
 
@@ -86,8 +86,7 @@ class AccessPointView(PulsingIcon):
             self.set_tooltip(self._model.props.name)
 
     def _update_icon(self):
-        icon_name = canvasicon.get_icon_state(
-                    _ICON_NAME, self._model.props.strength)
+        icon_name = get_icon_state(_ICON_NAME, self._model.props.strength)
         if icon_name:
             self.props.icon_name = icon_name
 
diff --git a/shell/view/home/MyIcon.py b/shell/view/home/MyIcon.py
index 894bd83..b46c730 100644
--- a/shell/view/home/MyIcon.py
+++ b/shell/view/home/MyIcon.py
@@ -14,7 +14,7 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-from sugar.graphics.canvasicon import CanvasIcon
+from sugar.graphics.icon import CanvasIcon
 from sugar import profile
 
 class MyIcon(CanvasIcon):
diff --git a/shell/view/home/activitiesdonut.py b/shell/view/home/activitiesdonut.py
index 8aa3933..2a96a96 100644
--- a/shell/view/home/activitiesdonut.py
+++ b/shell/view/home/activitiesdonut.py
@@ -24,7 +24,7 @@ import hippo
 import gobject
 import gtk
 
-from sugar.graphics.canvasicon import CanvasIcon
+from sugar.graphics.icon import CanvasIcon
 from sugar.graphics.menuitem import MenuItem
 from sugar.graphics.palette import Palette
 from sugar.graphics import style
diff --git a/shell/view/pulsingicon.py b/shell/view/pulsingicon.py
index 3820a6d..9e7b3d9 100644
--- a/shell/view/pulsingicon.py
+++ b/shell/view/pulsingicon.py
@@ -16,7 +16,7 @@
 
 import gobject
 
-from sugar.graphics.canvasicon import CanvasIcon
+from sugar.graphics.icon import CanvasIcon
 
 class PulsingIcon(CanvasIcon):
     __gproperties__ = {