Migrated search ToolbarButton content into the Edit ToolbarButton (feedback from Eben).

2 files changed, 7 insertions, 18 deletions

diff --git a/AbiWordActivity.py b/AbiWordActivity.py
index 419d885..eec6606 100644
--- a/AbiWordActivity.py
+++ b/AbiWordActivity.py
@@ -69,7 +69,7 @@ class AbiWordActivity (activity.Activity):
         toolbar_box.toolbar.insert(activity_button, 0)
 
         edit_toolbar = ToolbarButton()
-        edit_toolbar.props.page = EditToolbar(self)
+        edit_toolbar.props.page = EditToolbar(self, toolbar_box)
         edit_toolbar.props.icon_name = 'toolbar-edit'
         edit_toolbar.props.label = _('Edit')
         toolbar_box.toolbar.insert(edit_toolbar, -1)
@@ -98,13 +98,6 @@ class AbiWordActivity (activity.Activity):
         insert_toolbar.props.label = _('Insert')
         toolbar_box.toolbar.insert(insert_toolbar, -1)
 
-        search_toolbar = ToolbarButton()
-        search_toolbar.props.page = SearchToolbar(self.abiword_canvas,
-                toolbar_box)
-        search_toolbar.props.icon_name = 'search-bar'
-        search_toolbar.props.label = _('Search')
-        toolbar_box.toolbar.insert(search_toolbar, -1)
-
         separator = gtk.SeparatorToolItem()
         toolbar_box.toolbar.insert(separator, -1)
 
diff --git a/toolbar.py b/toolbar.py
index 5928d59..b5a467e 100644
--- a/toolbar.py
+++ b/toolbar.py
@@ -42,10 +42,12 @@ import widgets
 logger = logging.getLogger('write-activity')
 
 class EditToolbar(gtk.Toolbar):
-    def __init__(self, pc):
+    def __init__(self, pc, toolbar_box):
     
         gtk.Toolbar.__init__(self)
 
+        self._abiword_canvas = pc.abiword_canvas
+
         copy = CopyButton()
         copy.props.accelerator = '<Ctrl>C'
         copy.connect('clicked', lambda button: pc.abiword_canvas.copy())
@@ -83,15 +85,9 @@ class EditToolbar(gtk.Toolbar):
         pc.abiword_canvas.connect('selection-cleared', lambda abi, b:
                 copy.set_sensitive(False))
 
-
-class SearchToolbar(gtk.Toolbar):
-
-    def __init__(self, abiword_canvas, text_toolbar):
-
-        gtk.Toolbar.__init__(self)
-
-        self._abiword_canvas = abiword_canvas
-        self._text_toolbar = text_toolbar
+        separator = gtk.SeparatorToolItem()
+        self.insert(separator, -1)
+        separator.show()
 
         # setup the search options
         self._search_entry = iconentry.IconEntry()