From f3460e6da1d73265f7f42bbad94a25b0d25b0f21 Mon Sep 17 00:00:00 2001
From: Walter Bender <walter.bender@gmail.com>
Date: Thu, 04 Aug 2011 11:22:10 +0000
Subject: regrouped examples around type: base 10; variable base; fractions

---
(limited to 'AbacusActivity.py')

diff --git a/AbacusActivity.py b/AbacusActivity.py
index cacdfde..a8132ea 100644
--- a/AbacusActivity.py
+++ b/AbacusActivity.py
@@ -164,27 +164,29 @@ class AbacusActivity(activity.Activity):
             elif hasattr(toolbox, 'props'):
                toolbox.props.visible = False
 
-        # TRANS: http://en.wikipedia.org/wiki/Suanpan (Chinese abacus)
-        self.chinese = _button_factory("suanpan-on", _('Suanpan'),
-                                       self._chinese_cb, abacus_toolbar)
+        # TRANS: simple decimal abacus
+        self.decimal = _button_factory("decimal-off", _('Decimal'),
+                                       self._decimal_cb, abacus_toolbar)
 
         # TRANS: http://en.wikipedia.org/wiki/Soroban (Japanese abacus)
         self.japanese = _button_factory("soroban-off", _('Soroban'),
                                         self._japanese_cb, abacus_toolbar)
+
+        # TRANS: http://en.wikipedia.org/wiki/Suanpan (Chinese abacus)
+        self.chinese = _button_factory("suanpan-on", _('Suanpan'),
+                                       self._chinese_cb, abacus_toolbar)
+
+        _separator_factory(abacus_toolbar)
+
         self.mayan = _button_factory("nepohualtzintzin-off",
         # TRANS: http://en.wikipedia.org/wiki/Abacus#Native_American_abaci
                                      _('Nepohualtzintzin'),
                                      self._mayan_cb, abacus_toolbar)
 
-        _separator_factory(abacus_toolbar)
-
-        # TRANS: simple decimal abacus
-        self.decimal = _button_factory("decimal-off", _('Decimal'),
-                                       self._decimal_cb, abacus_toolbar)
-
         # TRANS: hexidecimal abacus
         self.hex = _button_factory("hexadecimal-off", _('Hexadecimal'),
                                    self._hex_cb, abacus_toolbar)
+
         # TRANS: binary abacus
         self.binary = _button_factory("binary-off", _('Binary'),
                                       self._binary_cb, abacus_toolbar)
@@ -198,6 +200,7 @@ class AbacusActivity(activity.Activity):
         # TRANS: abacus for adding fractions
         self.fraction = _button_factory("fraction-off", _('Fraction'),
                                         self._fraction_cb, abacus_toolbar)
+
         # TRANS: Abacus invented by teachers in Caacupé, Paraguay
         self.caacupe = _button_factory("caacupe-off", _('Caacupé'),
                                         self._caacupe_cb, abacus_toolbar)
@@ -230,6 +233,8 @@ class AbacusActivity(activity.Activity):
         self._base_spin = _spin_factory(10, 1, 24, self._base_spin_cb,
                                         custom_toolbar)
 
+        _separator_factory(custom_toolbar, False, False)
+
         self.custom = _button_factory("new-abacus", _('Custom'),
                                       self._custom_cb, custom_toolbar)
 
--
cgit v0.9.1