Move all misc. tools back into their own (constants) toolbar.

3 files changed, 59 insertions, 19 deletions

diff --git a/icons/toolbar-constants.svg b/icons/toolbar-constants.svg
new file mode 100644
index 0000000..6d158b9
--- /dev/null
+++ b/icons/toolbar-constants.svg
@@ -0,0 +1,26 @@
+<?xml version="1.0" ?><!DOCTYPE svg  PUBLIC '-//W3C//DTD SVG 1.1//EN'  'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd' [
+	<!ENTITY fill_color "#FFFFFF">
+]>
+<svg enable-background="new 0 0 55 55" height="55px" version="1.1" viewBox="0 0 55 55" width="55px" x="0px" xml:space="preserve" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
+<g display="block">
+    <g transform="translate(1,2)">
+        <g transform="scale(.6)">
+            <text x="14" y="39" font-size="40" font-family="Bitstream Vera Sans" font-weight="bold" fill="&fill_color;" stroke="none">π</text>
+        </g>
+    </g>
+    <g transform="translate(20,20)">
+        <g transform="scale(.6)">
+            <text x="14" y="39" font-size="40"  font-family="Bitstream Vera Sans" font-weight="bold" fill="&fill_color;" stroke="none">e</text>
+        </g>
+    </g>
+    <g transform="translate(2,18)">
+        <g transform="scale(.6)">
+            <text x="14" y="39" font-size="35"  font-family="Bitstream Vera Sans" font-weight="bold" fill="&fill_color;" stroke="none">φ</text>
+        </g>
+    </g>
+    <g transform="translate(22,-1)">
+        <g transform="scale(.6)">
+            <text x="14" y="39" font-size="33"  font-family="Bitstream Vera Sans" font-weight="bold" font-style="italic" fill="&fill_color;" stroke="none">γ</text>
+        </g>
+    </g>
+</g></svg>
\ No newline at end of file
diff --git a/layout.py b/layout.py
index 5c76c45..4b9d73a 100644
--- a/layout.py
+++ b/layout.py
@@ -118,10 +118,11 @@ class CalcLayout:
         boolean_toolbar.props.label = _('Boolean')
         toolbar_box.toolbar.insert(boolean_toolbar, -1)
         
-        separator = gtk.SeparatorToolItem()
-        toolbar_box.toolbar.insert(separator, -1)
-
-        MiscToolbar(self._parent, toolbar=toolbar_box.toolbar)
+        constant_toolbar = ToolbarButton()
+        constant_toolbar.props.page = MiscToolbar(self._parent)
+        constant_toolbar.props.icon_name = 'toolbar-constants'
+        constant_toolbar.props.label = _('Miscellaneous')
+        toolbar_box.toolbar.insert(constant_toolbar, -1)
         
         separator = gtk.SeparatorToolItem()
         separator.props.draw = False
diff --git a/toolbars.py b/toolbars.py
index a8048a9..68b9280 100644
--- a/toolbars.py
+++ b/toolbars.py
@@ -117,18 +117,34 @@ class EditToolbar(gtk.Toolbar):
     def __init__(self, calc):
         gtk.Toolbar.__init__(self)
 
+        copy_tool = ToolButton('edit-copy')
+        copy_tool.set_tooltip(_('Copy'))
+        copy_tool.set_accelerator(_('<ctrl>c'))
+        copy_tool.connect('clicked', lambda x: calc.text_copy())
+        self.insert(copy_tool, -1)
+
+        menu_item = MenuItem(_('Cut')) 
+        menu_item.set_accelerator(_('<ctrl>x'))
+        menu_item.connect('activate', lambda x: calc.text_cut())
+        menu_item.show()
+        copy_tool.get_palette().menu.append(menu_item)
+
+        """
         self.insert(IconToolButton('edit-copy', _('Copy'),
             lambda x: calc.text_copy(),
             alt_html='Copy'), -1)
+        """
 
         self.insert(IconToolButton('edit-paste', _('Paste'),
             lambda x: calc.text_paste(),
             alt_html='Paste'), -1)
 
+        """
         self.insert(IconToolButton('edit-cut', _('Cut'),
             lambda x: calc.text_cut(),
             alt_html='Cut'), -1)
-            
+        """
+                        
         self.show_all()
 
 class AlgebraToolbar(gtk.Toolbar):
@@ -247,34 +263,29 @@ class BooleanToolbar(gtk.Toolbar):
         self.show_all()
 
 class MiscToolbar(gtk.Toolbar):
-    def __init__(self, calc, toolbar=None):
+    def __init__(self, calc):
         gtk.Toolbar.__init__(self)
 
-        if toolbar is None:
-            target_toolbar = self
-        else:
-            target_toolbar = toolbar
-
-        target_toolbar.insert(IconToolButton('constants-pi', _('Pi'),
+        self.insert(IconToolButton('constants-pi', _('Pi'),
             lambda x: calc.button_pressed(calc.TYPE_TEXT, 'pi'),
             alt_html='π'), -1)
 
-        target_toolbar.insert(IconToolButton('constants-e', _('e'),
+        self.insert(IconToolButton('constants-e', _('e'),
             lambda x: calc.button_pressed(calc.TYPE_TEXT, 'e')), -1)
 
-        target_toolbar.insert(LineSeparator(), -1)
+        self.insert(LineSeparator(), -1)
 
-        target_toolbar.insert(IconToolButton('plot', _('Plot'),
+        self.insert(IconToolButton('plot', _('Plot'),
             lambda x: calc.button_pressed(calc.TYPE_FUNCTION, 'plot'),
             lambda x: calc.button_pressed(calc.TYPE_TEXT, 'help(plot)')), -1)
 
-        target_toolbar.insert(LineSeparator(), -1)
+        self.insert(LineSeparator(), -1)
 
         el = [
             {'icon': 'format-deg', 'desc': _('Degrees'), 'html': 'deg'},
             {'icon': 'format-rad', 'desc': _('Radians'), 'html': 'rad'},
         ]
-        target_toolbar.insert(IconToggleToolButton(el, 
+        self.insert(IconToggleToolButton(el, 
                     lambda x: self.update_angle_type(x, calc),
                     _('Degrees / radians')), -1)
 
@@ -282,7 +293,7 @@ class MiscToolbar(gtk.Toolbar):
             {'icon': 'format-sci', 'html': 'sci'},
             {'icon': 'format-exp', 'html': 'exp'},
         ]
-        target_toolbar.insert(IconToggleToolButton(el,
+        self.insert(IconToggleToolButton(el,
                     lambda x: self.update_format_type(x, calc),
                     _('Exponent / Scientific notation')), -1)
 
@@ -292,9 +303,11 @@ class MiscToolbar(gtk.Toolbar):
             {'icon': 'digits-15', 'html': '15'},
             {'icon': 'digits-6', 'html': '6'},
         ]
-        target_toolbar.insert(IconToggleToolButton(el,
+        self.insert(IconToggleToolButton(el,
                     lambda x: self.update_digits(x, calc),
                     _('Number of shown digits')), -1)
+                    
+        self.show_all()
 
     def update_angle_type(self, text, calc):
         if text == 'deg':