Fix all the units except icon scales.

sugar/graphics/style.py

@@ -90,6 +90,7 @@ ZOOM_FACTOR = _compute_zoom_factor()
 
 DEFAULT_SPACING = zoom(8)
 DEFAULT_PADDING = zoom(6)
+GRID_CELL_SIZE = zoom(75)
 LINE_WIDTH = zoom(2)
 
 FONT_SIZE = zoom(7 * _XO_DPI / _get_screen_dpi())

sugar/graphics/toolcombobox.py

@@ -19,7 +19,6 @@ import gtk
 import gobject
 
 from sugar.graphics.combobox import ComboBox
-from sugar.graphics import units
 from sugar.graphics import style
 
 class ToolComboBox(gtk.ToolItem):