From a591f475f8c51e8805b231f2e3896c783e4fc1de Mon Sep 17 00:00:00 2001 From: Luke Closs Date: Sat, 26 Apr 2008 05:17:14 -0400 Subject: [PATCH] Make web/index.html the default uri, and remove any extra scraps of code --- OnePageWikiActivity-1.xo | Bin 38847 -> 38857 bytes OnePageWikiActivity.py | 22 ++++++++-------------- XOCom.py | 9 ++++++--- 3 files changed, 14 insertions(+), 17 deletions(-) diff --git a/OnePageWikiActivity-1.xo b/OnePageWikiActivity-1.xo index 896664dfe1823f0af2b2b357629b24ab6b0824c9..86661b7e9ff6f3b53812294a5a87308333d8aeba 100644 GIT binary patch delta 1820 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 diff --git a/OnePageWikiActivity.py b/OnePageWikiActivity.py index e636cac..1725188 100644 --- a/OnePageWikiActivity.py +++ b/OnePageWikiActivity.py @@ -1,34 +1,29 @@ from sugar.activity import activity -from sugar.activity.activity import get_bundle_path from sugar import env -import logging -import sys, os +import os import gtk import gobject - import hulahop hulahop.startup(os.path.join(env.get_profile_path(), 'gecko')) - from XOCom import XOCom -# The XOCom object helps us communicate with the browser -uri = 'file://' + get_bundle_path() + '/web/index.html'; -xocom = XOCom(uri) - class OnePageWikiActivity (activity.Activity): def __init__(self, handle): activity.Activity.__init__(self, handle) self.set_title('OnePageWiki') + # The XOCom object helps us communicate with the browser + # This uses web/index.html as the default page to load + self.xocom = XOCom() + toolbox = activity.ActivityToolbox(self) self.set_toolbox(toolbox) toolbox.show() - self.set_canvas( xocom.create_webview() ) + self.set_canvas( self.xocom.create_webview() ) def write_file(self, filename): - content = xocom.send_to_browser('write') - print "write_file(%s): %s"%(filename, content) + content = self.xocom.send_to_browser('write') if content: fh = open(filename, 'w') fh.write(content) @@ -37,9 +32,8 @@ def write_file(self, filename): def read_file(self, filename): fh = open(filename, 'r') content = fh.read() - print "read_file(%s): %s"%(filename, content) # We must delay this to give the browser time to start up # It would be better if this send_to_browser was instead triggered # once the browser had finished loading. - gobject.timeout_add(2000, xocom.send_to_browser, 'read', content) + gobject.timeout_add(2000, self.xocom.send_to_browser, 'read', content) diff --git a/XOCom.py b/XOCom.py index e75a1f2..03f0ff8 100644 --- a/XOCom.py +++ b/XOCom.py @@ -1,11 +1,15 @@ +from sugar.activity.activity import get_bundle_path from hulahop.webview import WebView from xpcom import components class XOCom: # Constructor gives full XPCom access by default # This should be improved for future apps that may not need/want full access - def __init__(self, uri): - self.uri = uri + def __init__(self, uri=None): + if uri: + self.uri = uri + else: + self.uri = 'file://' + get_bundle_path() + '/web/index.html'; self.give_full_xpcom_access() # Give the browser permission to use XPCom interfaces @@ -58,4 +62,3 @@ def send_to_browser(self, command, parameter=None): result = result.QueryInterface(components.interfaces.nsISupportsString) return result.toString() return None -