Moving image editor->scale options to a palette

1 files changed, 20 insertions, 24 deletions

diff --git a/widgets.py b/widgets.py
index 0833d5a..a58ffdc 100644
--- a/widgets.py
+++ b/widgets.py
@@ -23,6 +23,7 @@
 #import tempfile
 import gobject
 import gtk
+from sugar.graphics.toolbutton import ToolButton
 
 
 class ImageEditor(gtk.VBox):
@@ -35,24 +36,21 @@ class ImageEditor(gtk.VBox):
     def __init__(self):
         super(ImageEditor, self).__init__()
         self.toolbar = gtk.Toolbar()
-        scale_image = gtk.image_new_from_icon_name("scale",
-                                         gtk.ICON_SIZE_LARGE_TOOLBAR)
-        scale_image.show()
-        scale_item = gtk.ToolItem()
-        scale_item.add(scale_image)
-        scale_item.show()
-        self.toolbar.insert(scale_item, -1)
-        separator = gtk.SeparatorToolItem()
-        separator.set_draw(False)
-        separator.show()
-        self.toolbar.insert(separator, -1)
-        refresh_button = gtk.ToolButton(gtk.STOCK_REFRESH)
+        scale_button = ToolButton("scale")
+        scale_button.set_tooltip('Picture Size')
+        scale_button.show()
+        scale_palette = scale_button.get_palette()
+        scale_button.connect('clicked',
+                             lambda w: scale_palette.popup(immediate=True,
+                                                           state=1))
+
+        box = gtk.HBox()
+        refresh_button = ToolButton(gtk.STOCK_REFRESH)
         refresh_button.show()
-        self.toolbar.insert(refresh_button, -1)
+        box.pack_start(refresh_button, False, False, 0)
         separator = gtk.SeparatorToolItem()
-        separator.set_draw(False)
         separator.show()
-        self.toolbar.insert(separator, -1)
+        box.pack_start(separator, False, False, 0)
         self.width, self.height = 1, 1
         self.width_entry = gtk.SpinButton(gtk.Adjustment(value=0,
                                                          lower=0,
@@ -60,26 +58,24 @@ class ImageEditor(gtk.VBox):
                                                          step_incr=1))
         self.width_entry.connect("value-changed", self.change_width)
         self.width_entry.show()
-        width_item = gtk.ToolItem()
-        width_item.add(self.width_entry)
-        width_item.show()
-        self.toolbar.insert(width_item, -1)
+        box.pack_start(self.width_entry, True, True, 0)
         self.link_values_button = gtk.ToggleToolButton()
         self.link_values_button.set_active(True)
         self.link_values_button.connect("toggled", self.link_unlink)
         self.link_values_button.set_icon_name("link")
         self.link_values_button.show()
-        self.toolbar.insert(self.link_values_button, -1)
+        box.pack_start(self.link_values_button, False, False, 0)
         self.height_entry = gtk.SpinButton(gtk.Adjustment(value=0,
                                                           lower=0,
                                                           upper=50000,
                                                           step_incr=1))
         self.height_entry.connect("value-changed", self.change_height)
         self.height_entry.show()
-        height_item = gtk.ToolItem()
-        height_item.add(self.height_entry)
-        height_item.show()
-        self.toolbar.insert(height_item, -1)
+        box.pack_start(self.height_entry, True, True, 0)
+        scale_palette.set_content(box)
+        box.show_all()
+        self.toolbar.insert(scale_button, -1)
+
         separator = gtk.SeparatorToolItem()
         separator.show()
         self.toolbar.insert(separator, -1)