From 561e5b3f1fa93500e91aee9536fac3c9c2f3b316 Mon Sep 17 00:00:00 2001
From: Daniel Francis <francis@sugarlabs.org>
Date: Tue, 10 Jul 2012 01:32:53 +0000
Subject: Changing scaling palette for table, adding cell-grid-width/height icons

---
diff --git a/toolbars.py b/toolbars.py
index e7514e7..46a8f77 100644
--- a/toolbars.py
+++ b/toolbars.py
@@ -98,13 +98,21 @@ class ImageToolbar(gtk.Toolbar):
                              lambda w: scale_palette.popup(immediate=True,
                                                            state=1))
 
-        box = gtk.HBox()
+        table = gtk.Table(4, 5, False)
         refresh_button = ToolButton(gtk.STOCK_REFRESH)
         refresh_button.show()
-        box.pack_start(refresh_button, False, False, 0)
-        separator = gtk.SeparatorToolItem()
+        table.attach(refresh_button, 0, 1, 1, 3)
+        separator = gtk.VSeparator()
         separator.show()
-        box.pack_start(separator, False, False, 0)
+        table.attach(separator, 1, 2, 0, 5, xpadding=5)
+        width_icon = gtk.image_new_from_icon_name('cell-width',
+                                                  gtk.ICON_SIZE_DIALOG)
+        width_icon.show()
+        table.attach(width_icon, 2, 3, 0, 2)
+        height_icon = gtk.image_new_from_icon_name('cell-height',
+                                                   gtk.ICON_SIZE_DIALOG)
+        height_icon.show()
+        table.attach(height_icon, 2, 3, 2, 4)
         self.width, self.height = 1, 1
         self.width_entry = gtk.SpinButton(gtk.Adjustment(value=0,
                                                          lower=0,
@@ -112,22 +120,22 @@ class ImageToolbar(gtk.Toolbar):
                                                          step_incr=1))
         #self.width_entry.connect("value-changed", self.change_width)
         self.width_entry.show()
-        box.pack_start(self.width_entry, True, True, 0)
+        table.attach(self.width_entry, 3, 4, 0, 2)
         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()
-        box.pack_start(self.link_values_button, False, False, 0)
+        table.attach(self.link_values_button, 4, 5, 1, 3)
         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()
-        box.pack_start(self.height_entry, True, True, 0)
-        scale_palette.set_content(box)
-        box.show_all()
+        table.attach(self.height_entry, 3, 4, 2, 4)
+        scale_palette.set_content(table)
+        table.show_all()
         self.insert(scale_button, -1)
 
         self._object_rotate_left = ToolButton('object-rotate-left')
--
cgit v0.9.1