Renamed Button to IconButton.

sugar/graphics/Makefile.am

@@ -2,7 +2,7 @@ sugardir = $(pythondir)/sugar/graphics
 sugar_PYTHON =			\
 	__init__.py		\
 	bubble.py		\
-	button.py           	\
+	iconbutton.py          	\
 	canvasicon.py		\
 	color.py		\
 	ClipboardBubble.py	\

sugar/graphics/entry.py

@@ -24,7 +24,7 @@ import hippo
 from sugar.graphics import units
 from sugar.graphics import color
 from sugar.graphics import font
-from sugar.graphics.button import Button
+from sugar.graphics.iconbutton import IconButton
 from sugar.graphics.roundbox import RoundBox
 
 class Entry(hippo.CanvasBox, hippo.CanvasItem):
@@ -71,7 +71,7 @@ class Entry(hippo.CanvasBox, hippo.CanvasItem):
         return gtk.Entry()
 
     def add_button(self, icon_name, action_id):
-        button = Button(icon_name=icon_name)
+        button = IconButton(icon_name=icon_name)
 
         button.props.scale = units.SMALL_ICON_SCALE
         

sugar/graphics/iconbutton.py

@@ -29,8 +29,8 @@ from sugar import profile
 STANDARD_SIZE = 0
 SMALL_SIZE    = 1
 
-class Button(hippo.CanvasBox):
-    __gtype_name__ = 'Button'    
+class IconButton(hippo.CanvasBox):
+    __gtype_name__ = 'SugarIconButton'    
 
     __gproperties__ = {
         'icon-name' : (str, None, None, None,

sugar/graphics/label.py

@@ -22,7 +22,6 @@ import gtk
 import hippo
 
 from sugar.graphics.roundbox import RoundBox
-from sugar.graphics.button import Button
 from sugar.graphics import color
 from sugar.graphics import font
 

sugar/graphics/optionmenu.py

@@ -24,7 +24,7 @@ import hippo
 
 from sugar.graphics import units
 from sugar.graphics.roundbox import RoundBox
-from sugar.graphics import button
+from sugar.graphics import iconbutton
 from sugar.graphics import color
 from sugar.graphics import font
 from sugar.graphics.canvasicon import CanvasIcon
@@ -116,8 +116,8 @@ class OptionMenu(hippo.CanvasBox, hippo.CanvasItem):
         self._round_box.append(self._canvas_text, hippo.PACK_EXPAND)
 
         # TODO: Substitute for the right icon.
-        arrow = button.Button(icon_name='theme:stock-close')
-        arrow.props.size = button.SMALL_SIZE
+        arrow = iconbutton.IconButton(icon_name='theme:stock-close')
+        arrow.props.size = iconbutton.SMALL_SIZE
         arrow.props.yalign = hippo.ALIGNMENT_CENTER
         arrow.props.xalign = hippo.ALIGNMENT_START
         self._round_box.append(arrow)