From 3bf613acb243688e22ea7aa71c72a94ae1540f85 Mon Sep 17 00:00:00 2001
From: Walter Bender <walter.bender@gmail.com>
Date: Mon, 25 Feb 2013 13:56:03 +0000
Subject: turns out that just removing the separators is enough

---
diff --git a/AbacusActivity.py b/AbacusActivity.py
index f6535f3..16e1528 100644
--- a/AbacusActivity.py
+++ b/AbacusActivity.py
@@ -62,6 +62,7 @@ class AbacusActivity(activity.Activity):
         # no sharing
         self.max_participants = 1
 
+        self.sep = []
         abacus_toolbar = Gtk.Toolbar()
         custom_toolbar = Gtk.Toolbar()
         edit_toolbar = Gtk.Toolbar()
@@ -130,7 +131,7 @@ class AbacusActivity(activity.Activity):
                                      tooltip=NAMES['suanpan'],
                                      group=self.decimal)
 
-        separator_factory(abacus_toolbar)
+        self.sep.append(separator_factory(abacus_toolbar))
 
         # TRANS: http://en.wikipedia.org/wiki/Abacus#Native_American_abaci
         self.mayan = radio_factory('nepohualtzintzin', abacus_toolbar,
@@ -150,7 +151,7 @@ class AbacusActivity(activity.Activity):
                                     tooltip=NAMES['binary'],
                                     group=self.decimal)
 
-        separator_factory(abacus_toolbar)
+        self.sep.append(separator_factory(abacus_toolbar))
 
         # TRANS: http://en.wikipedia.org/wiki/Abacus#Russian_abacus
         self.russian = radio_factory('schety', abacus_toolbar,
@@ -174,7 +175,7 @@ class AbacusActivity(activity.Activity):
                                      tooltip=NAMES['caacupe'],
                                      group=self.decimal)
 
-        separator_factory(abacus_toolbar)
+        self.sep.append(separator_factory(abacus_toolbar))
 
         # TRANS: Cuisenaire Rods
         self.cuisenaire = radio_factory('cuisenaire', abacus_toolbar,
@@ -183,7 +184,7 @@ class AbacusActivity(activity.Activity):
                                         tooltip=NAMES['cuisenaire'],
                                         group=self.decimal)
 
-        separator_factory(abacus_toolbar)
+        self.sep.append(separator_factory(abacus_toolbar))
 
         self.custom = radio_factory('custom', abacus_toolbar,
                                     self._radio_cb,
diff --git a/abacus_window.py b/abacus_window.py
index f6d400d..9f44f99 100644
--- a/abacus_window.py
+++ b/abacus_window.py
@@ -791,20 +791,23 @@ class Abacus():
         self.chinese = Suanpan(self, self.bead_colors)
         self.mode = self.chinese
         self.mode.show()
+        self._configure_cb(None)
 
     def _configure_cb(self, event):
         self.width = Gdk.Screen.width()
         self.height = Gdk.Screen.height() - GRID_CELL_SIZE
         if self.width > self.height:
             self.scale = 1.33 * Gdk.Screen.height() / 900.0
-            if Gdk.Screen.width() / 14 >= style.GRID_CELL_SIZE:
-                self.activity.hex.show()
-                self.activity.binary.show()
         else:
-            self.scale = 1.33 * Gdk.Screen.width() / 1200.0
-            if Gdk.Screen.width() / 14 < style.GRID_CELL_SIZE:
-                self.activity.hex.hide()
-                self.activity.binary.hide()
+            self.scale = 1.33 * Gdk.Screen.width() / 1200.0 
+        if Gdk.Screen.width() / 14 < style.GRID_CELL_SIZE:
+            for sep in self.activity.sep:
+                sep.hide()
+                sep.props.draw = False
+        else:
+            for sep in self.activity.sep:
+                sep.show()
+                sep.props.draw = True
         self.canvas.set_size_request(Gdk.Screen.width(), Gdk.Screen.height())
         self.mode.hide()
         self.mode.show(reset=True)
diff --git a/toolbar_utils.py b/toolbar_utils.py
index d8fa9b4..2903f0b 100644
--- a/toolbar_utils.py
+++ b/toolbar_utils.py
@@ -95,3 +95,4 @@ def separator_factory(toolbar, expand=False, visible=True):
     separator.set_expand(expand)
     toolbar.insert(separator, -1)
     separator.show()
+    return separator
--
cgit v0.9.1