New toolbars show plot/deg/sci/digit in primary toolbar, old toolbars show them in misc tab.

2 files changed, 22 insertions, 14 deletions

diff --git a/layout.py b/layout.py
index 9938d2a..a6a0aa4 100644
--- a/layout.py
+++ b/layout.py
@@ -87,32 +87,37 @@ class CalcLayout:
             activity_button = ActivityToolbarButton(self._parent)
             toolbar_box.toolbar.insert(activity_button, 0)
             
-            def append(icon_name, label, page):
+            def append(icon_name, label, page, position):
                 toolbar_button = ToolbarButton()
                 toolbar_button.props.page = page
                 toolbar_button.props.icon_name = icon_name
                 toolbar_button.props.label = label
-                toolbar_box.toolbar.insert(toolbar_button, -1)
+                toolbar_box.toolbar.insert(toolbar_button, position)
 
             append('toolbar-edit',
                    _('Edit'),
-                   EditToolbar(self._parent))
+                   EditToolbar(self._parent),
+                   -1)
                                   
             append('toolbar-algebra',
                    _('Algebra'),
-                   AlgebraToolbar(self._parent))
+                   AlgebraToolbar(self._parent),
+                   -1)
             
             append('toolbar-trigonometry',
                    _('Trigonometry'),
-                   TrigonometryToolbar(self._parent))
+                   TrigonometryToolbar(self._parent),
+                   -1)
 
             append('toolbar-boolean',
                    _('Boolean'),
-                   BooleanToolbar(self._parent))
+                   BooleanToolbar(self._parent),
+                   -1)
 
             append('toolbar-constants',
                    _('Miscellaneous'),
-                   MiscToolbar(self._parent))
+                   MiscToolbar(self._parent, target_toolbar=toolbar_box.toolbar),
+                   5)
             
             separator = gtk.SeparatorToolItem()
             separator.props.draw = False
diff --git a/toolbars.py b/toolbars.py
index 246a8be..d5d7710 100644
--- a/toolbars.py
+++ b/toolbars.py
@@ -263,7 +263,7 @@ class BooleanToolbar(gtk.Toolbar):
         self.show_all()
 
 class MiscToolbar(gtk.Toolbar):
-    def __init__(self, calc):
+    def __init__(self, calc, target_toolbar=None):
         gtk.Toolbar.__init__(self)
 
         self.insert(IconToolButton('constants-pi', _('Pi'),
@@ -279,19 +279,22 @@ class MiscToolbar(gtk.Toolbar):
         self.insert(IconToolButton('constants-goldenratio', _('φ'),
             lambda x: calc.button_pressed(calc.TYPE_TEXT, '1.618033988749895')), -1)
 
-        self.insert(LineSeparator(), -1)
+        if target_toolbar is None:
+            target_toolbar = self
+            
+        target_toolbar.insert(LineSeparator(), -1)
 
-        self.insert(IconToolButton('plot', _('Plot'),
+        target_toolbar.insert(IconToolButton('plot', _('Plot'),
             lambda x: calc.button_pressed(calc.TYPE_FUNCTION, 'plot'),
             lambda x: calc.button_pressed(calc.TYPE_TEXT, 'help(plot)')), -1)
 
-        self.insert(LineSeparator(), -1)
+        target_toolbar.insert(LineSeparator(), -1)
 
         el = [
             {'icon': 'format-deg', 'desc': _('Degrees'), 'html': 'deg'},
             {'icon': 'format-rad', 'desc': _('Radians'), 'html': 'rad'},
         ]
-        self.insert(IconToggleToolButton(el, 
+        target_toolbar.insert(IconToggleToolButton(el, 
                     lambda x: self.update_angle_type(x, calc),
                     _('Degrees / radians')), -1)
 
@@ -299,7 +302,7 @@ class MiscToolbar(gtk.Toolbar):
             {'icon': 'format-sci', 'html': 'sci'},
             {'icon': 'format-exp', 'html': 'exp'},
         ]
-        self.insert(IconToggleToolButton(el,
+        target_toolbar.insert(IconToggleToolButton(el,
                     lambda x: self.update_format_type(x, calc),
                     _('Exponent / Scientific notation')), -1)
 
@@ -309,7 +312,7 @@ class MiscToolbar(gtk.Toolbar):
             {'icon': 'digits-15', 'html': '15'},
             {'icon': 'digits-6', 'html': '6'},
         ]
-        self.insert(IconToggleToolButton(el,
+        target_toolbar.insert(IconToggleToolButton(el,
                     lambda x: self.update_digits(x, calc),
                     _('Number of shown digits')), -1)