diff options
| author | Marco Pesenti Gritti <marco@localhost.localdomain> | 2007-05-14 13:48:36 (GMT) |
|---|---|---|
| committer | Marco Pesenti Gritti <marco@localhost.localdomain> | 2007-05-14 13:48:36 (GMT) |
| commit | c84e21aa9ef2a5223cd4fbf1fb5792d3b031b054 (patch) | |
| tree | 9740276a6650228f6e1ee2dd18d918ad629bca3f | |
| parent | 9e1e85188423e971c34a6d7437090f5fcd867f14 (diff) | |
Hide the tabs bar when there is only one toolbar.
Fix sugar.Browser
| -rw-r--r-- | browser/Makefile.am | 50 | ||||
| -rwxr-xr-x | build-snapshot.sh | 2 | ||||
| -rw-r--r-- | sugar/browser/__init__.py | 5 | ||||
| -rw-r--r-- | sugar/graphics/toolbox.py | 9 |
4 files changed, 37 insertions, 29 deletions
diff --git a/browser/Makefile.am b/browser/Makefile.am index 3805566..8d398d4 100644 --- a/browser/Makefile.am +++ b/browser/Makefile.am @@ -1,30 +1,30 @@ SUBDIRS = components -libsugarbrowser_la_CPPFLAGS = \ - $(WARN_CFLAGS) \ - $(LIB_CFLAGS) \ - $(GECKO_CFLAGS) \ - $(NSPR_CFLAGS) \ - -I$(MOZILLA_INCLUDE_DIR)/chrome \ - -I$(MOZILLA_INCLUDE_DIR)/commandhandler \ - -I$(MOZILLA_INCLUDE_DIR)/content \ - -I$(MOZILLA_INCLUDE_DIR)/dom \ - -I$(MOZILLA_INCLUDE_DIR)/docshell \ - -I$(MOZILLA_INCLUDE_DIR)/exthandler \ - -I$(MOZILLA_INCLUDE_DIR)/gtkembedmoz \ - -I$(MOZILLA_INCLUDE_DIR)/imglib2 \ - -I$(MOZILLA_INCLUDE_DIR)/mimetype \ - -I$(MOZILLA_INCLUDE_DIR)/necko \ - -I$(MOZILLA_INCLUDE_DIR)/pref \ - -I$(MOZILLA_INCLUDE_DIR)/shistory \ - -I$(MOZILLA_INCLUDE_DIR)/uriloader \ - -I$(MOZILLA_INCLUDE_DIR)/webbrwsr \ - -I$(MOZILLA_INCLUDE_DIR)/webbrowserpersist \ - -I$(MOZILLA_INCLUDE_DIR)/widget \ - -I$(MOZILLA_INCLUDE_DIR)/xpcom \ - -I$(srcdir)/components/sessionstore \ - -I$(srcdir)/components/browserhelper \ - -DPLUGIN_DIR=\"$(libdir)/mozilla/plugins\" \ +libsugarbrowser_la_CPPFLAGS = \ + $(WARN_CFLAGS) \ + $(LIB_CFLAGS) \ + $(GECKO_CFLAGS) \ + $(NSPR_CFLAGS) \ + -I$(MOZILLA_INCLUDE_DIR)/chrome \ + -I$(MOZILLA_INCLUDE_DIR)/commandhandler \ + -I$(MOZILLA_INCLUDE_DIR)/content \ + -I$(MOZILLA_INCLUDE_DIR)/dom \ + -I$(MOZILLA_INCLUDE_DIR)/docshell \ + -I$(MOZILLA_INCLUDE_DIR)/exthandler \ + -I$(MOZILLA_INCLUDE_DIR)/gtkembedmoz \ + -I$(MOZILLA_INCLUDE_DIR)/imglib2 \ + -I$(MOZILLA_INCLUDE_DIR)/mimetype \ + -I$(MOZILLA_INCLUDE_DIR)/necko \ + -I$(MOZILLA_INCLUDE_DIR)/pref \ + -I$(MOZILLA_INCLUDE_DIR)/shistory \ + -I$(MOZILLA_INCLUDE_DIR)/uriloader \ + -I$(MOZILLA_INCLUDE_DIR)/webbrwsr \ + -I$(MOZILLA_INCLUDE_DIR)/webbrowserpersist \ + -I$(MOZILLA_INCLUDE_DIR)/widget \ + -I$(MOZILLA_INCLUDE_DIR)/xpcom \ + -I$(top_builddir)/browser/components/sessionstore \ + -I$(top_builddir)/browser/components/browserhelper \ + -DPLUGIN_DIR=\"$(libdir)/mozilla/plugins\" \ -DSHARE_DIR=\"$(pkgdatadir)\" noinst_LTLIBRARIES = libsugarbrowser.la diff --git a/build-snapshot.sh b/build-snapshot.sh index 68c73b3..e41b947 100755 --- a/build-snapshot.sh +++ b/build-snapshot.sh @@ -1,6 +1,6 @@ VERSION=0.63 DATE=`date +%Y%m%d` -RELEASE=2.78 +RELEASE=2.79 TARBALL=sugar-$VERSION-$RELEASE.${DATE}git.tar.bz2 rm sugar-$VERSION.tar.bz2 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) |