clean up radio buttons

2 files changed, 9 insertions, 15 deletions

diff --git a/activity.py b/activity.py
index 202cf6e..fc0a0ee 100644
--- a/activity.py
+++ b/activity.py
@@ -250,6 +250,7 @@ class PhysicsActivity(activity.Activity):
             button.connect('clicked', self.radioClicked)
             palette = self._build_palette(c)
             if palette is not None:
+                palette.show()
                 button.get_palette().set_content(palette)
             _insert_item(create_toolbar, button, -1)
             button.show()
@@ -267,11 +268,10 @@ class PhysicsActivity(activity.Activity):
     def _build_palette(self, tool):
         if tool.palette_enabled:
             if tool.palette_mode == tools.PALETTE_MODE_ICONS:
-                vbox = Gtk.VBox()
-                for settings in tool.palette_settings:
-                    hbox = Gtk.HBox()
+                grid = Gtk.Grid()
+                for s, settings in enumerate(tool.palette_settings):
                     firstButton = None
-                    for i in range(0, settings['icon_count']):
+                    for i, icon_value in enumerate(settings['icon_values']):
                         if i == 0:
                             button = RadioToolButton(group=None)
                             firstbutton = button
@@ -282,13 +282,12 @@ class PhysicsActivity(activity.Activity):
                                        self._palette_icon_clicked,
                                        tool.name, 
                                        settings['name'],
-                                       settings['icon_values'][i])
-                        if settings['active'] == settings['icons'][i]:
+                                       settings['icons'][i])
+                        grid.attach(button, i, s, 1, 1)
+                        button.show()
+                        if settings['active'] == icon_value:
                             button.set_active(True)
-                        hbox.pack_start(button, False, False, 0)
-                    vbox.add(hbox)
-                vbox.show_all()
-                return vbox
+                return grid
 
         return None
 
diff --git a/tools.py b/tools.py
index 127353b..31c581e 100644
--- a/tools.py
+++ b/tools.py
@@ -39,21 +39,18 @@ PALETTE_MODE_SLIDER_LABEL = 2
 PALETTE_ICON_OBJECT_SETTINGS = [
     {
         'name': 'density',
-        'icon_count': 3,
         'icons': ['feather', 'wood', 'anvil'],
         'icon_values': [0.5, 1.0, 10.0],
         'active': 'wood'
     },
     {
         'name': 'restitution',
-        'icon_count': 3,
         'icons': ['basketball', 'tennis-ball', 'bowling-ball'],
         'icon_values': [1, 0.16, 0.01],
         'active': 'tennis-ball'
     },
     {
         'name': 'friction',
-        'icon_count': 3,
         'icons': ['ice-skate', 'shoe', 'sneaker'],
         'icon_values': [0.5, 1, 2],
         'active': 'grass'
@@ -690,7 +687,6 @@ class MotorTool(Tool):
     palette_settings = [
         {
             'name': 'speed',
-            'icon_count': 4,
             'icons': ['motor-rabbit', 'motor-turtle',  'motor-turtle-2',
                       'motor-rabbit-2'],
             'icon_values': [100, 20, -20, -100],
@@ -890,7 +886,6 @@ class ChainTool(Tool):
     palette_settings = [
         {
             'name': 'chain',
-            'icon_count': 3,
             'icons': ['chain-fine', 'chain-medium', 'chain-coarse'],
             'icon_values': [0, 1, 2],
             'active': 'chain-medium'