Updated attempt...doesn't work perfectly (text doesn't get selected
when a local file is loaded as the homepage)
- Eben
On Tue, Jun 17, 2008 at 8:09 PM, Eben Eliason <[EMAIL PROTECTED]> wrote:
> This one is a little strange, since I added some code to handle the
> non-XO case when it loads up an about:blank page instead. It's still
> pretty small, though.
>
> - Eben
>
diff --git a/webactivity.py b/webactivity.py
index 8ca7043..75e084d 100755
--- a/webactivity.py
+++ b/webactivity.py
@@ -142,6 +142,7 @@ class WebActivity(activity.Activity):
self.connect('key-press-event', self._key_press_cb)
self.toolbox.set_current_toolbar(_TOOLBAR_BROWSE)
+ self._web_toolbar.entry.grab_focus()
if handle.uri:
self._browser.load_uri(handle.uri)
@@ -278,7 +279,8 @@ class WebActivity(activity.Activity):
if os.path.isfile(_LIBRARY_PATH):
self._browser.load_uri('file://' + _LIBRARY_PATH)
else:
- self._browser.load_uri('about:blank')
+ self._browser.load_uri('file:///test.html')
+ #self._browser.load_uri('http://www.sugarlabs.org/start')
def _session_history_changed_cb(self, session_history, link):
_logger.debug('NewPage: %s.' %link)
diff --git a/webtoolbar.py b/webtoolbar.py
index 3cfbba3..46005b2 100755
--- a/webtoolbar.py
+++ b/webtoolbar.py
@@ -41,8 +41,8 @@ class WebEntry(AddressEntry):
def __init__(self):
gobject.GObject.__init__(self)
- self._address = None
- self._title = None
+ self._address = ''
+ self._title = ''
self._search_view = self._search_create_view()
self._search_window = gtk.Window(gtk.WINDOW_POPUP)
@@ -73,13 +73,16 @@ class WebEntry(AddressEntry):
self.emit('activate')
def _set_address(self, address):
+ if not self._address:
+ self._set_text(address)
+ self.select_region(0, -1)
self._address = address
address = gobject.property(type=str, setter=_set_address)
def _set_title(self, title):
self._title = title
- if title is not None and not self.props.has_focus:
+ if not self.props.has_focus:
self._set_text(title)
title = gobject.property(type=str, setter=_set_title)
@@ -279,12 +282,14 @@ class WebToolbar(gtk.Toolbar):
texttosuburi = cls.getService(interfaces.nsITextToSubURI)
ui_uri = texttosuburi.unEscapeURIForUI(uri.originCharset, uri.spec)
+ if ui_uri == 'about:blank':
+ ui_uri = ''
self._set_address(ui_uri)
self._update_navigation_buttons()
filepicker.cleanup_temp_files()
def _loading_start_cb(self, progress_listener):
- self._set_title(None)
+ self._set_title('')
self._set_loading(True)
self._update_navigation_buttons()
_______________________________________________
Sugar mailing list
[email protected]
http://lists.laptop.org/listinfo/sugar
