From e8acfd6be35476a19a52c3d3bf6acf66f2c1cb54 Mon Sep 17 00:00:00 2001 From: Marco Pesenti Gritti Date: Thu, 06 Jul 2006 13:58:15 +0000 Subject: Implement abstract activity factory. This makes writing activities way easier and will be necessary to implement the New->"X Activity" thing. --- (limited to 'activities/browser') diff --git a/activities/browser/BrowserShell.py b/activities/browser/BrowserShell.py deleted file mode 100644 index c1e0c44..0000000 --- a/activities/browser/BrowserShell.py +++ /dev/null @@ -1,51 +0,0 @@ -import dbus -import geckoembed -import pygtk -pygtk.require('2.0') -import gtk -import gobject - -import sugar.env -from sugar.presence import Service - -from BrowserActivity import BrowserActivity - -class BrowserShell(dbus.service.Object): - def __init__(self, bus_name, object_path = '/com/redhat/Sugar/Browser'): - dbus.service.Object.__init__(self, bus_name, object_path) - - geckoembed.set_profile_path(sugar.env.get_user_dir()) - self.__browsers = [] - - def start(self): - gtk.main() - - @dbus.service.method('com.redhat.Sugar.BrowserShell') - def get_links(self): - links = [] - for browser in self.__browsers: - embed = browser.get_embed() - link = {} - link['title'] = embed.get_title() - link['address'] = embed.get_address() - links.append(link) - return links - - def _start_browser_cb(self, browser, service): - browser.connect_to_shell(service) - - @dbus.service.method('com.redhat.Sugar.BrowserShell') - def open_browser(self, uri, serialized_service=None): - service = None - if serialized_service is not None: - service = Service.deserialize(serialized_service) - browser = BrowserActivity(uri) - self.__browsers.append(browser) - gobject.idle_add(self._start_browser_cb, browser, service) - - @dbus.service.method('com.redhat.Sugar.BrowserShell') - def open_browser_from_service_foobar(self, uri, serialized_service): - service = Service.deserialize(serialized_service) - browser = BrowserActivity(uri) - self.__browsers.append(browser) - gobject.idle_add(self._start_browser_cb, browser, service) diff --git a/activities/browser/browser.py b/activities/browser/browser.py deleted file mode 100755 index 02267fc..0000000 --- a/activities/browser/browser.py +++ /dev/null @@ -1,19 +0,0 @@ -#!/usr/bin/env python - -import pygtk -pygtk.require('2.0') -import gtk -import dbus - -import sugar.env -from sugar.LogWriter import LogWriter - -from BrowserShell import BrowserShell - -log_writer = LogWriter("Web") -log_writer.start() - -session_bus = dbus.SessionBus() -bus_name = dbus.service.BusName('com.redhat.Sugar.Browser', bus=session_bus) -shell = BrowserShell(bus_name) -shell.start() -- cgit v0.9.1