From 3168faedb0353f66171749f78abf980b85a2838e Mon Sep 17 00:00:00 2001
From: Gary Martin <gary@garycmartin.com>
Date: Sat, 12 Sep 2009 20:08:58 +0000
Subject: New toolbars show plot/deg/sci/digit in primary toolbar, old toolbars show them in misc tab.

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

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
--
cgit v0.9.1