diff options
author | Gonzalo Odiard <godiard@sugarlabs.org> | 2010-12-17 20:34:31 (GMT) |
---|---|---|
committer | Martin Langhoff <martin@laptop.org> | 2010-12-20 15:42:04 (GMT) |
commit | 10bf2a861c51904d88d72c3ccd2bf42e0aeec720 (patch) | |
tree | ab8a41d11646f047edd026a36ce94f157af3b6b0 | |
parent | 7282172182de64b3a409e924f2acaff40238eaf1 (diff) |
Use the setting in activity.py to the port in the search toolbar
-rw-r--r-- | activity.py | 8 | ||||
-rw-r--r-- | searchtoolbar.py | 17 |
2 files changed, 13 insertions, 12 deletions
diff --git a/activity.py b/activity.py index 6eed390..924ff86 100644 --- a/activity.py +++ b/activity.py @@ -30,7 +30,6 @@ import webactivity from searchtoolbar import SearchToolbar # Default settings. -HTTP_PORT = '8000' WIKIDB = 'es_PE/es_PE.xml.bz2' HOME_PAGE = '/static/' @@ -41,12 +40,13 @@ class WikipediaActivity(webactivity.WebActivity): print "Starting server...\n" os.chdir(os.environ['SUGAR_BUNDLE_PATH']) - + + self.HTTP_PORT = '8000' server.load_db(WIKIDB) server.run_server({ 'path': WIKIDB, - 'port': int(HTTP_PORT) }) + 'port': int(self.HTTP_PORT) }) - handle.uri = 'http://localhost:%s%s' % (HTTP_PORT, HOME_PAGE) + handle.uri = 'http://localhost:%s%s' % (self.HTTP_PORT, HOME_PAGE) webactivity.WebActivity.__init__(self, handle) diff --git a/searchtoolbar.py b/searchtoolbar.py index 2e2e184..16c9c99 100644 --- a/searchtoolbar.py +++ b/searchtoolbar.py @@ -22,14 +22,6 @@ from sugar.graphics.toolbutton import ToolButton from sugar.graphics.toolcombobox import ToolComboBox from sugar._sugarext import AddressEntry -default_search_providers = { - 'schoolserver': { - 'order': 3, - 'name': _('Wiki'), - 'url': 'http://localhost:8000/search?q=%s', - 'icon': 'zoom-home' - }, -} class SearchToolbar(gtk.Toolbar): def __init__(self, activity): @@ -44,6 +36,15 @@ class SearchToolbar(gtk.Toolbar): self.insert(self._providercombo, -1) self._providercombo.show() + default_search_providers = { + 'schoolserver': { + 'order': 3, + 'name': _('Wiki'), + 'url': 'http://localhost:'+ self._activity.HTTP_PORT + '/search?q=%s', + 'icon': 'zoom-home' + }, + } + self.set_providers(default_search_providers) self._entry = gtk.Entry() |