Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorManuel QuiƱones <manuq@laptop.org>2013-03-20 15:34:13 (GMT)
committer Manuel QuiƱones <manuq@laptop.org>2013-03-20 15:34:13 (GMT)
commita3cda7c49f0b49cce9eeca752b2785d202c40ae7 (patch)
treeca6c3b2de733b1c00721226828cd6b57311ca49b
parent355ca09a8cc9ce72df908bf4c81b190ce47aa08f (diff)
Revert "icon.py: move all imports to the top"
We have circular imports if we do this. This reverts commit 355ca09a8cc9ce72df908bf4c81b190ce47aa08f.
-rw-r--r--src/sugar3/graphics/icon.py8
1 files changed, 5 insertions, 3 deletions
diff --git a/src/sugar3/graphics/icon.py b/src/sugar3/graphics/icon.py
index 68d6f30..a554324 100644
--- a/src/sugar3/graphics/icon.py
+++ b/src/sugar3/graphics/icon.py
@@ -34,9 +34,6 @@ import cairo
from sugar3.graphics import style
from sugar3.graphics.xocolor import XoColor
-from sugar3.graphics.palette import CursorInvoker
-from sugar3.graphics.palette import Palette
-from sugar3.graphics.palette import CellRendererInvoker
from sugar3.util import LRU
_BADGE_SIZE = 0.45
@@ -500,6 +497,7 @@ class EventIcon(Gtk.EventBox):
for key, value in kwargs.iteritems():
self.set_property(key, value)
+ from sugar3.graphics.palette import CursorInvoker
self._palette_invoker = CursorInvoker()
self._palette_invoker.attach(self)
self.connect('destroy', self.__destroy_cb)
@@ -679,6 +677,8 @@ class EventIcon(Gtk.EventBox):
type=object, setter=set_palette_invoker, getter=get_palette_invoker)
def set_tooltip(self, text):
+ from sugar3.graphics.palette import Palette
+
self.set_palette(Palette(text))
@@ -750,6 +750,8 @@ class CellRendererIcon(Gtk.CellRenderer):
}
def __init__(self, tree_view):
+ from sugar3.graphics.palette import CellRendererInvoker
+
self._buffer = _IconBuffer()
self._buffer.cache = True
self._xo_color = None