Hide the tabs bar when there is only one toolbar.

Fix sugar.Browser

2 files changed, 11 insertions, 3 deletions

diff --git a/sugar/browser/__init__.py b/sugar/browser/__init__.py
index d02c90c..b240a10 100644
--- a/sugar/browser/__init__.py
+++ b/sugar/browser/__init__.py
@@ -5,13 +5,14 @@ XUL Runner and gtkmozembed and is produced by the PyGTK
 """
 
 try:
-    from sugar.browser._sugarbrowser import startup, shutdown
     from sugar.browser import _sugarbrowser
 except ImportError:
     from sugar import ltihooks
-    from sugar.browser._sugarbrowser import startup, shutdown
     from sugar.browser import _sugarbrowser
 
+from _sugarbrowser import AddressEntry
+from _sugarbrowser import startup, shutdown, get_download_manager
+
 class Browser(_sugarbrowser.Browser):
     def __init__(self):
         _sugarbrowser.Browser.__init__(self)
diff --git a/sugar/graphics/toolbox.py b/sugar/graphics/toolbox.py
index 968ae56..17b1b5f 100644
--- a/sugar/graphics/toolbox.py
+++ b/sugar/graphics/toolbox.py
@@ -31,6 +31,7 @@ class Toolbox(gtk.VBox):
         self._notebook = gtk.Notebook()
         self._notebook.set_tab_pos(gtk.POS_BOTTOM)
         self._notebook.set_show_border(False)
+        self._notebook.set_show_tabs(False)
         self.pack_start(self._notebook)
         self._notebook.show()
         
@@ -44,6 +45,12 @@ class Toolbox(gtk.VBox):
             
         self._notebook.append_page(toolbar_box, label)
         toolbar_box.show()
-        
+
+        if self._notebook.get_n_pages() > 1:
+            self._notebook.set_show_tabs(True)
+                    
     def remove_toolbar(self, index):
         self._notebook.remove_page(index)
+
+        if self._notebook.get_n_pages() < 2:
+            self._notebook.set_show_tabs(False)