sugarlabs/sugar-toolkit-gtk3
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix up the browser. Make BrowserShell a singleton

Browse Source
This commit is contained in:
Marco Pesenti Gritti 2006-04-26 15:58:25 -04:00
parent 9df61cb84b
commit e5a0ba9e2e
1 changed files with 24 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
browser/browser.py
View File

@ -24,7 +24,7 @@ class AddressToolbar(gtk.Toolbar):
address_item.show() address_item.show()
def __open_address_cb(self, address): def __open_address_cb(self, address):
browser_shell.open_browser(address) BrowserShell.get_instance().open_browser(address)
class AddressItem(gtk.ToolItem): class AddressItem(gtk.ToolItem):
def __init__(self, callback): def __init__(self, callback):
@ -210,14 +210,32 @@ class WebActivity(activity.Activity):
if uri.startswith("http://www.google.com"): if uri.startswith("http://www.google.com"):
return False return False
else: else:
browser_shell.open_browser(uri) BrowserShell.get_instance().open_browser(uri)
return True return True
class BrowserShell(dbus.service.Object): class BrowserShell(dbus.service.Object):
def __init__(self, bus_name, object_path='/com/redhat/Sugar/Browser'): instance = None
def get_instance():
if not BrowserShell.instance:
BrowserShell.instance = BrowserShell()
return BrowserShell.instance
get_instance = staticmethod(get_instance)
def __init__(self):
session_bus = dbus.SessionBus()
bus_name = dbus.service.BusName('com.redhat.Sugar.Browser', bus=session_bus)
object_path = '/com/redhat/Sugar/Browser'
dbus.service.Object.__init__(self, bus_name, object_path) dbus.service.Object.__init__(self, bus_name, object_path)
self.__browsers = [] self.__browsers = []
def open_web_activity(self):
web_activity = WebActivity()
web_activity.activity_connect_to_shell()
@dbus.service.method('com.redhat.Sugar.BrowserShell') @dbus.service.method('com.redhat.Sugar.BrowserShell')
def get_links(self): def get_links(self):
links = [] links = []
@ -235,14 +253,9 @@ class BrowserShell(dbus.service.Object):
self.__browsers.append(browser) self.__browsers.append(browser)
browser.activity_connect_to_shell() browser.activity_connect_to_shell()
def main(): def main():
web_activity = WebActivity() BrowserShell.get_instance().open_web_activity()
web_activity.activity_connect_to_shell()
session_bus = dbus.SessionBus()
bus_name = dbus.service.BusName('com.redhat.Sugar.Browser', bus=session_bus)
browser_shell = BrowserShell(bus_name)
try: try:
gtk.main() gtk.main()
except KeyboardInterrupt: except KeyboardInterrupt: